Removes the previous non-modular edits on the assistant's outfits (#365)

* initial * common to announcements * gives the AI a chat channel * minor runtime prevention * screenshot test * personal closet does not get a headset * job info for silicons * Revert "common to announcements" This reverts commit d48a957. * Revert "gives the AI a chat channel" This reverts commit 48055fd. * Revert "personal closet does not get a headset" This reverts commit 2b994d5. * forgot this revert * forgot this one too * screenshot test
DopplerShift13 · Jan 27, 2025 · 182ccff · 182ccff
1 parent d91cabf
commit 182ccff
Show file tree

Hide file tree

Showing 36 changed files with 9 additions and 30 deletions.
diff --git a/code/modules/jobs/job_types/assistant/assistant.dm b/code/modules/jobs/job_types/assistant/assistant.dm
@@ -40,28 +40,23 @@ Assistant
 /datum/job/assistant/get_outfit(consistent)
 	if(consistent)
 		return /datum/outfit/job/assistant/preview
-	/// DOPPLER SHIFT REMOVAL BEGIN
-	/*if(!HAS_TRAIT(SSstation, STATION_TRAIT_ASSISTANT_GIMMICKS))
+	if(!HAS_TRAIT(SSstation, STATION_TRAIT_ASSISTANT_GIMMICKS))
 		return ..()
 
 	var/static/list/gimmicks = list()
 	if(!length(gimmicks))
 		for(var/datum/outfit/job/assistant/gimmick/gimmick_outfit as anything in subtypesof(/datum/outfit/job/assistant/gimmick))
 			gimmicks[gimmick_outfit] = gimmick_outfit::outfit_weight
 
-	return pick_weight(gimmicks)*/
-	/// DOPPLER SHIFT REMOVAL END
-	return /datum/outfit/job/assistant/preview /// DOPPLER SHIFT ADDITION
+	return pick_weight(gimmicks)
 
 /datum/outfit/job/assistant
 	name = JOB_ASSISTANT
 	jobtype = /datum/job/assistant
 	id_trim = /datum/id_trim/job/assistant
 	belt = /obj/item/modular_computer/pda/assistant
-	uniform = /obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls/colored /// DOPPLER SHIFT ADDITION
 
-/// DOPPLER SHIFT REMOVAL BEGIN
-/*/datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/target)
+/datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/target)
 	..()
 	give_holiday_hat(target)
 	give_jumpsuit(target)
@@ -88,15 +83,12 @@ Assistant
 	if (target.jumpsuit_style == PREF_SUIT)
 		uniform = GLOB.colored_assistant.jumpsuits[index]
 	else
-		uniform = GLOB.colored_assistant.jumpskirts[index]*/
-/// DOPPLER SHIFT REMOVAL END
+		uniform = GLOB.colored_assistant.jumpskirts[index]
 
 /datum/outfit/job/assistant/consistent
 	name = "Assistant - Consistent"
-	uniform = /obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls
 
-/// DOPPLER SHIFT REMOVAL BEGIN
-/*/datum/outfit/job/assistant/consistent/give_holiday_hat(mob/living/carbon/human/target)
+/datum/outfit/job/assistant/consistent/give_holiday_hat(mob/living/carbon/human/target)
 	return
 
 /datum/outfit/job/assistant/consistent/give_jumpsuit(mob/living/carbon/human/target)
@@ -108,15 +100,13 @@ Assistant
 	// This outfit is used by the assets SS, which is ran before the atoms SS
 	if (SSatoms.initialized == INITIALIZATION_INSSATOMS)
 		H.w_uniform?.update_greyscale()
-		H.update_worn_undersuit()*/
+		H.update_worn_undersuit()
 
 /datum/outfit/job/assistant/preview
 	name = "Assistant - Preview"
 
-/// DOPPLER SHIFT REMOVAL BEGIN
-/*/datum/outfit/job/assistant/preview/give_jumpsuit(mob/living/carbon/human/target)
+/datum/outfit/job/assistant/preview/give_jumpsuit(mob/living/carbon/human/target)
 	if (target.jumpsuit_style == PREF_SUIT)
 		uniform = /obj/item/clothing/under/color/grey
 	else
-		uniform = /obj/item/clothing/under/color/jumpskirt/grey*/
-/// DOPPLER SHIFT REMOVAL END
+		uniform = /obj/item/clothing/under/color/jumpskirt/grey
diff --git a/code/modules/jobs/job_types/assistant/gimmick_assistants.dm b/code/modules/jobs/job_types/assistant/gimmick_assistants.dm
@@ -7,11 +7,8 @@
 	var/outfit_weight = 0
 
 
-/// DOPPLER SHIFT REMOVAL BEGIN
-/*/datum/outfit/job/assistant/gimmick/give_jumpsuit(mob/living/carbon/human/target)
+/datum/outfit/job/assistant/gimmick/give_jumpsuit(mob/living/carbon/human/target)
 	return //dont do colorized and stuff, it messes with our uniforms
-	*/
-/// DOPPLER SHIFT REMOVAL END
 
 /datum/outfit/job/assistant/gimmick/bee
 	name = "Gimmick Assistant - Bee"

diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_headrevolutionary.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_headrevolutionary.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png
diff --git a/...dules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png b/...dules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_on.png b/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_on.png
diff --git a/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor.png b/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor.png
diff --git a/.../modules/unit_tests/screenshots/screenshot_humanoids__datum_species_android.png b/.../modules/unit_tests/screenshots/screenshot_humanoids__datum_species_android.png
diff --git a/...ules/unit_tests/screenshots/screenshot_humanoids__datum_species_anthromorph.png b/...ules/unit_tests/screenshots/screenshot_humanoids__datum_species_anthromorph.png
diff --git a/.../modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png b/.../modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png
diff --git a/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dullahan.png b/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dullahan.png
diff --git a/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png b/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png
diff --git a/...nit_tests/screenshots/screenshot_humanoids__datum_species_ethereal_lustrous.png b/...nit_tests/screenshots/screenshot_humanoids__datum_species_ethereal_lustrous.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_fly.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_fly.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human.png
diff --git a/...es/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid.png b/...es/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid.png
diff --git a/...es/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png b/...es/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png
diff --git a/...sts/screenshots/screenshot_humanoids__datum_species_human_genemod_hemophage.png b/...sts/screenshots/screenshot_humanoids__datum_species_human_genemod_hemophage.png
diff --git a/...sts/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png b/...sts/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png
diff --git a/...tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png b/...tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png
diff --git a/...es/unit_tests/screenshots/screenshot_humanoids__datum_species_human_vampire.png b/...es/unit_tests/screenshots/screenshot_humanoids__datum_species_human_vampire.png
diff --git a/...odules/unit_tests/screenshots/screenshot_humanoids__datum_species_insectoid.png b/...odules/unit_tests/screenshots/screenshot_humanoids__datum_species_insectoid.png
diff --git a/...unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png b/...unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png
diff --git a/...it_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png b/...it_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_monkey.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_monkey.png
diff --git a/...odules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png b/...odules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png
diff --git a/.../modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ramatan.png b/.../modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ramatan.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png
diff --git a/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skeleton.png b/...modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skeleton.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_snail.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_snail.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie.png
diff --git a/...nit_tests/screenshots/screenshot_humanoids__datum_species_zombie_infectious.png b/...nit_tests/screenshots/screenshot_humanoids__datum_species_zombie_infectious.png
diff --git a/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png b/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png
diff --git a/modular_doppler/modular_cosmetics/code/uniform_overrides.dm b/modular_doppler/modular_cosmetics/code/uniform_overrides.dm
@@ -1,11 +1,3 @@
-/datum/colored_assistant/grey
-	jumpsuits = list(/obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls)
-	jumpskirts = list(/obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls) // TODO: jumpskirt variants for all of these
-
-/datum/colored_assistant/random
-	jumpsuits = list(/obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls/random)
-	jumpskirts = list(/obj/item/clothing/under/misc/doppler_uniform/standard/suit/overalls/random) // DITTO: see above
-
 /datum/outfit/job/janitor
 	uniform = /obj/item/clothing/under/rank/civilian/janitor/doppler
 	suit = /obj/item/clothing/suit/apron/janitor_cloak