[In Progress] SolGov to DREAM conversion

code/modules/paperwork/fax.dm

@@ -64,7 +64,7 @@
 		list(fax_name = "Nanotrasen Central Command", fax_id = "nanotrasen", color = "green", emag_needed = FALSE),
 		list(fax_name = "Outpost Authority", fax_id = "outpost", color = "orange", emag_needed = FALSE),
 		list(fax_name = "IRMG Mothership", fax_id = "inteq", color = "yellow", emag_needed = FALSE),
-		list(fax_name = "Terran Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE),
+		list(fax_name = "DREAM Frontier Affairs", fax_id = "solgov", color = "teal", emag_needed = FALSE),
 		list(fax_name = "Roumain Council of Huntsmen", fax_id = "roumain", color = "brown", emag_needed = FALSE),
 		list(fax_name = "Confederated League Leadership", fax_id = "minutemen", color = "blue", emag_needed = FALSE),
 		list(fax_name = "PGF Military High Command", fax_id = "gezena", color = "olive", emag_needed = FALSE),

modular_pentest/modules/faction_dream/code/modules/antagonists/ert/dream.dm

@@ -2,16 +2,16 @@
 // ** Dream **
 // ********************************************************************
 /datum/antagonist/ert/solgov
-	name = "Dreamer Emergency Response Personnel"
+	name = "DREAM Emergency Response Personnel"
 	outfit = /datum/outfit/job/solgov/ert
 	random_names = FALSE
-	role = "Dreamer ERT"
+	role = "DREAM ERT"
 
 /datum/antagonist/ert/solgov/inspector
-	name = "Dreamer Inspector"
+	name = "DREAM Inspector"
 	outfit = /datum/outfit/job/solgov/ert/inspector
-	role = "Dreamer Inspector"
+	role = "DREAM Inspector"
 
 /datum/antagonist/ert/solgov/inspector/greet()
-	to_chat(owner, "<B><font size=3 color=red>You are a Inspector for Dream.</font></B>")
+	to_chat(owner, "<B><font size=3 color=red>You are a Inspector for DREAM.</font></B>")
 	to_chat(owner, "The Department of Administrative Affairs is sending you to [station_name()] with the task: [ert_team.mission.explanation_text]")

modular_pentest/modules/faction_dream/code/modules/areas/ship_areas.dm

@@ -0,0 +1,6 @@
+// Solgov to DREAM conversion
+
+/area/ship/crew/solgov
+	name = "DREAM Consulate"
+	icon_state = "solgov"
+	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR

modular_pentest/modules/faction_dream/code/modules/clothing/factions/_solgov_to_dream.dm

@@ -1,193 +1,193 @@
 // Uniforms
 
 /obj/item/clothing/under/solgov
-	name = "\improper SolGov tunic"
-	desc = "Standard combat tunic used by Sonnensoldners."
+	name = "\improper DREAM tunic"
+	desc = "Standard tunic commonly worn by Dreamers."
 
 /obj/item/clothing/under/solgov/terragov
-	name = "\improper TerraGov tunic"
-	desc = "Specialized combat tunic utilized by Sonnensoldners serving the Terran Regency."
+	name = "\improper DREAM tunic"
+	desc = "Special tunic commonly worn by Dreamers."
 
 /obj/item/clothing/under/solgov/dress
-	name = "\improper SolGov dress"
-	desc = "A formal SolGov white dress, used by civilians and officials alike."
+	name = "\improper DREAM dress"
+	desc = "A formal white dress commonly worn by Dreamers."
 
 /obj/item/clothing/under/solgov/formal
-	name = "\improper SolGov formal suit"
-	desc = "A formal SolGov uniform, commonly used by representatives and officials."
+	name = "\improper DREAM formal suit"
+	desc = "A formal suit commonly worn by DREAM officials. Paired with pants."
 
 /obj/item/clothing/under/solgov/formal/skirt
-	name = "\improper SolGov formal suitskirt"
-	desc = "A formal SolGov uniform, commonly used by representatives and officials."
+	name = "\improper DREAM formal suitskirt"
+	desc = "A formal suit commonly worn by DREAM officials. Paired with a skirt."
 
 /obj/item/clothing/under/solgov/formal/terragov
-	name = "\improper TerraGov formal uniform"
-	desc = "A formal SolGov uniform, for special occasions. This one is colored in original TerraGov green."
-
+	name = "\improper DREAM formal uniform"
+	desc = "A formal uniform for special occasions."
 
 /obj/item/clothing/under/solgov/formal/captain
-	name = "\improper SolGov captain uniform"
-	desc = "A formal SolGov uniform, utilized by captains of SolGov vessels."
+	name = "\improper DREAM captain uniform"
+	desc = "A formal uniform worn by captains of DREAM vessels."
 
 /obj/item/clothing/under/plasmaman/solgov
-	name = "\improper SolGov envirosuit"
-	desc = "The pride of Solarian plasmamen everywhere- though this tends to be a somewhat exclusive club, due to Sol's aggressive workplace safety regulations."
+	name = "\improper DREAM envirosuit"
+	desc = "A sleek envirosuit with the DREAM insignia on it."
 
 /obj/item/clothing/head/helmet/space/plasmaman/solgov
-	name = "\improper SolGov envirosuit helmet"
-	desc = "A generic white envirohelmet with a secondary blue."
+	name = "\improper DREAM envirosuit helmet"
+	desc = "A sleek envirohelmet with the DREAM insignia on it."
 
 // Oversuits
 
 /obj/item/clothing/suit/armor/vest/solgov
-	name = "\improper Sonnensoldner gambison"
-	desc = "A standard armor vest fielded for SolGov's Sonnensoldners."
+	name = "\improper DREAM anjia" // yay get some of that Chinese flavor
+	desc = "A flexible plated vest for Dreamers."
 
 /obj/item/clothing/suit/armor/vest/solgov/overseer
-	name = "\improper SolGov Overseer robe"
-	desc = "An elaborately designed robe utilized by SolGov overseers."
+	name = "\improper DREAM robe"
+	desc = "A robe worn by Dreamers."
 
 /obj/item/clothing/suit/armor/vest/solgov/captain
-	name = "\improper SolGov Captain coat"
-	desc = "An armored coat typically used by SolGov captains."
+	name = "\improper DREAM Captain coat"
+	desc = "An armored coat worn by DREAM captains."
 
 /obj/item/clothing/suit/armor/vest/solgov/Initialize()
 	. = ..()
 	allowed |= list(/obj/item/gun/ballistic/automatic/assault/swiss_cheese, /obj/item/tank)
 
 /obj/item/clothing/head/helmet/space/solgov
-	name = "\improper SolGov Vacuum Helmet"
-	desc = "This space-proof helmet is meant to be worn with a matching T-MA suit."
+	name = "\improper DREAM Vacuum Helmet"
+	desc = "This space-proof helmet with the DREAM insignia on it."
 
 /obj/item/clothing/suit/space/solgov
-	name = "\improper SolGov Vacuum Suit"
-	desc = "Originally designed by independent contractors on Luna for the purposes of survival in hazardous environments, the lightweight Tortoise Microlite Armored Suit now sees widespread use by SolGov's exploration teams."
+	name = "\improper DREAM Vacuum Suit"
+	desc = "Originally designed by independent contractors on Luna for the purposes of survival in hazardous environments, the lightweight Tortoise Microlite Armored Suit now sees widespread use by DREAM's exploration teams."
 
 /obj/item/clothing/head/helmet/space/hardsuit/solgov
-	name = "\improper SolGov hardsuit helmet"
-	desc = "An armored spaceproof helmet, its visor is reminiscent of knights of yore."
+	name = "\improper DREAM hardsuit helmet"
+	desc = "An armored spaceproof helmet with the DREAM insignia."
 
 /obj/item/clothing/suit/space/hardsuit/solgov
 
-	name = "\improper SolGov hardsuit"
-	desc = "An armored spaceproof suit. A powered exoskeleton keeps the suit light and mobile."
+	name = "\improper DREAM hardsuit"
+	desc = "An armored spaceproof suit with the DREAM insignia. A powered exoskeleton keeps the suit light and mobile."
 
 /obj/item/clothing/suit/hazardvest/solgov
-	name = "SolGov hazard vest"
-	desc = "A high-visibility vest used in work zones by solarian engineers."
+	name = "DREAM hazard vest"
+	desc = "A high-visibility vest used in work zones by DREAM engineers."
 
 /obj/item/clothing/suit/solgov
-	name = "SolGov robe"
-	desc = "A set of plain SolGov robes, commonly used by civilians."
+	name = "DREAM robe"
+	desc = "A set of plain robes commonly worn by Dreamers."
 
 /obj/item/clothing/suit/solgov/dress
-	name = "SolGov dress"
-	desc = "A plain SolGov dress, commonly used by civilians."
+	name = "DREAM dress"
+	desc = "A plain dress commonly worn by Dreamers."
 
 /obj/item/clothing/suit/solgov/suit
-	name = "SolGov suit"
-	desc = "A formal SolGov suit, commonly used by civilians."
+	name = "DREAM suit"
+	desc = "A formal suit commonly worn by Dreamers."
 
 /obj/item/clothing/suit/solgov/bureaucrat
-	name = "SolGov bureaucrat robe"
-	desc = "A set of unique SolGov robes, utilized by Solarian Bureaucrats."
+	name = "DREAM recruiter robe" // NOTE THIS IS NO LONGER A BUREAUCRAT, BUT A RECRUITER
+	desc = "A set of robes designed to be worn by DREAM recruiters."
 
 /obj/item/clothing/suit/solgov/overcoat
-	name = "SolGov overcoat"
-	desc = "A traditional solarian overcoat, used by cilivians and ship crews alike."
+	name = "DREAM overcoat"
+	desc = "A traditional overcoat commonly worn by Dreamers."
 
 /obj/item/clothing/suit/solgov/jacket
-	name = "SolGov jacket"
-	desc = "A plain SolGov jacket, commonly used by civilians."
+	name = "DREAM jacket"
+	desc = "A plain jacket commonly worn by Dreamers."
 
 /obj/item/clothing/suit/toggle/solgov
-	name = "\improper SolGov coat"
-	desc = "An armored coat worn for special occasions. This one is dyed in SolGov blue."
+	name = "\improper DREAM coat"
+	desc = "An armored coat for special occasions."
 
 /obj/item/clothing/suit/toggle/solgov/terragov
-	name = "\improper Terragov coat"
-	desc = "An armored coat worn for special occasions. This one is still dyed in original TerraGov green."
+	name = "\improper DREAM coat"
+	desc = "An armored coat for special occasions."
 
 /obj/item/clothing/suit/armor/solgov_trenchcoat
-	name = "\improper SolGov trenchcoat"
-	desc = "A SolGov official's trenchcoat. Has a lot of pockets."
+	name = "\improper DREAM trenchcoat"
+	desc = "A DREAM official's trenchcoat. Has a lot of pockets."
 
 /obj/item/clothing/suit/hooded/wintercoat/solgov
-	name = "solgov winter coat"
-	desc = "An environment-resistant wintercoat in the colors of the Solarian Confederation."
+	name = "DREAM winter coat"
+	desc = "An environment-resistant wintercoat."
 
 /obj/item/clothing/head/hooded/winterhood/solgov
 	icon_state = "hood_solgov"
 
-
+/obj/item/clothing/suit/space/hardsuit/solgov/suns
+	desc = "A well decorated spaceworthy suit." // removed reference to SolGov in the description
 
 // Headgear
 
 /obj/item/clothing/head/solgov
-	name = "\improper SolGov officer's cap"
-	desc = "A blue cap worn by high-ranking officers of SolGov."
+	name = "\improper DREAM officer's cap"
+	desc = "A cap worn by high-ranking officers of DREAM."
 
 /obj/item/clothing/head/solgov/terragov
-	name = "\improper TerraGov officer's cap"
-	desc = "A cap worn by high-ranking officers of SolGov. This one is still in original TerraGov green."
+	name = "\improper DREAM officer's cap"
+	desc = "A cap worn by high-ranking officers of DREAM."
 
 /obj/item/clothing/head/solgov/sonnensoldner
-	name = "\improper Sonnensoldner Hat"
-	desc = "A standard-issue SolGov hat adorned with a feather, commonly used by Sonnensoldners."
+	name = "\improper Dreamer Hat"
+	desc = "A hat commonly worn by Dreamers."
 
 /obj/item/clothing/head/solgov/captain
-	name = "\improper SolGov bicorne hat"
-	desc = "A unique bicorne hat given to Solarian Captains on expeditionary missions."
+	name = "\improper DREAM bicorne hat"
+	desc = "A DREAM Captain's hat. It smells like patchouli."
 
 /obj/item/clothing/head/beret/solgov
-	name = "\improper SolGov beret"
-	desc = "A beret with SolGov's emblem emblazoned on it. Colored in SolGov blue."
+	name = "\improper DREAM beret"
+	desc = "A beret with DREAM's emblem emblazoned on it."
 
 /obj/item/clothing/head/beret/solgov/plain
-	name = "\improper SolGov beret"
-	desc = "A plain blue beret. It looks like it's missing something."
+	name = "\improper DREAM beret"
+	desc = "A plain beret. It looks like it's missing something."
 
 /obj/item/clothing/head/beret/solgov/terragov
-	name = "\improper TerraGov beret"
-	desc = "A beret with SolGov's emblem emblazoned on it. It's still colored in original TerraGov green."
+	name = "\improper DREAM beret"
+	desc = "A beret with DREAM's emblem emblazoned on it."
 
 /obj/item/clothing/head/beret/solgov/terragov/plain
-	name = "\improper TerraGov beret"
-	desc = "A plain beret colored in original TerraGov green. It looks like it's missing something."
+	name = "\improper DREAM beret"
+	desc = "A plain beret. It looks like it's missing something."
 
 /obj/item/clothing/head/fedora/solgov
-	name = "solarian hat"
-	desc = "A slick blue hat used by both solarian civilians and physicists."
+	name = "DREAM fedora"
+	desc = "A fedora with the DREAM insignia on it. Why would anyone wear this?"
 
 /obj/item/clothing/head/flatcap/solgov
-	name = "solarian flat cap"
-	desc = "A working solarian's hat, commonly used by Logistics Deck Officers."
+	name = "Dreamer flat cap"
+	desc = "A working Dreamer's hat."
 
 /obj/item/clothing/head/hardhat/solgov
 
 /obj/item/clothing/head/solgov_surgery
-	name = "SolGov surgery cap"
-	desc = "It's a surgery cap utilized by solarian doctors."
+	name = "DREAM surgery cap"
+	desc = "It's a surgery cap utilized by DREAM physicians."
 
 // Neckwear
 
 /obj/item/clothing/neck/stripedsolgovscarf
-	name = "striped solgov scarf"
+	name = "striped Dreamer scarf"
 
 /obj/item/clothing/neck/cloak/overseer
-	name = "SolGov overseer's cloak"
-	desc = "Worn by the Overseer. It smells faintly of bureaucracy."
+	name = "DREAM cloak"
+	desc = "A cloak for Dreamers. It smells faintly of patchouli."
 
 /obj/item/clothing/neck/cloak/solgov
-	name = "SolGov weibel"
-	desc = "Worn by SolGov officials. It smells faintly of bureaucracy."
+	name = "DREAM cloak"
+	desc = "Worn by DREAM officials. It smells faintly of patchouli."
 
 /obj/item/clothing/neck/cloak/solgovcap
-	name = "SolGov captain's cloak"
-	desc = "Worn by SolGov captains. It smells faintly of bureaucracy."
+	name = "DREAM captain's cloak"
+	desc = "Worn by DREAM captains. It smells faintly of patchouli."
 
-// Accesories
+// Accessories
 
 /obj/item/clothing/accessory/waistcoat/solgov
-	name = "solgov waistcoat"
-	desc = "A standard issue waistcoat in solgov colors."
+	name = "DREAM waistcoat"
+	desc = "A standard issue waistcoat in DREAM colors."

modular_pentest/modules/faction_dream/code/modules/clothing/misc_clothing.dm

@@ -0,0 +1,8 @@
+// More DREAM conversion - Misc Clothing Overrides //
+
+/datum/blackmarket_item/clothing/terragov
+	desc = "These were supposed to be shipped to a museum celebrating Terran history. Honestly, we're doing them a favour. Clothes are meant to be worn rather than kept in some dusty box."
+
+/obj/item/clothing/under/dress/sailor
+	desc = "A traditional Lunar dress popularized by DREAM sailors. Despite its roots as a formal uniform, it is now often worn by civilians outside of its naval context. The crisp cloth evokes feelings of order and discipline."
+

modular_pentest/modules/faction_dream/code/modules/clothing/outfits/ert/dream_ert.dm

@@ -1,5 +1,5 @@
 /datum/outfit/job/solgov/ert
-	name = "ERT - Dreamer Shock Trooper"
+	name = "ERT - DREAM Shock Trooper"
 	id_assignment = "Shock Trooper"
 	jobtype = /datum/job/officer
 	job_icon = "sonnensoldner"
@@ -18,9 +18,8 @@
 	box = /obj/item/storage/box/survival
 	l_hand = /obj/item/melee/duelenergy/halberd
 
-
 /datum/outfit/job/solgov/ert/inspector
-	name = "ERT - Dreamer Inspector"
+	name = "ERT - DREAM Inspector"
 	id_assignment = "Inspector"
 	jobtype = /datum/job/head_of_personnel
 	job_icon = "solgovrepresentative"