diff --git a/code/modules/jobs/job_types/assistant/assistant.dm b/code/modules/jobs/job_types/assistant/assistant.dm index 280e316276ba1..a0cb2699d82da 100644 --- a/code/modules/jobs/job_types/assistant/assistant.dm +++ b/code/modules/jobs/job_types/assistant/assistant.dm @@ -40,8 +40,7 @@ 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() @@ -49,19 +48,15 @@ Assistant 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 index 6a254cfdd2b83..a0e8bd47d3c89 100644 --- 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 index 26a0bade8b5d9..b674172ff1d2d 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_headrevolutionary.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_headrevolutionary.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png index 26a0bade8b5d9..b674172ff1d2d 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_provocateur.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png index b315a994b92f9..54d7b4f95b413 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png and b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png b/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png index 72edff149e8dd..912f16e6839b2 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png and b/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_emissive.png differ 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 index 61d8a1c37cdfd..8468461cc6e58 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_on.png and b/code/modules/unit_tests/screenshots/screenshot_high_luminosity_eyes_light_on.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor.png index 1863962b999b7..1ad767d2b642f 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_abductor.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_android.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_android.png index 99e012c6b43b5..bd701ab56bc96 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_android.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_android.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_anthromorph.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_anthromorph.png index c78b279ebf618..c8996c05aca4f 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_anthromorph.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_anthromorph.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png index 10f0c43bd5ffc..d5acce0dc45c7 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dullahan.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dullahan.png index ff6bfb262e926..0f47126c1dbec 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dullahan.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dullahan.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png index 0365eb694071f..06def11641257 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal_lustrous.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal_lustrous.png index 775748e30321e..5e827763c69f4 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal_lustrous.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ethereal_lustrous.png differ 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 index 4b5f553f94fa9..5eb33850ae426 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_fly.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_fly.png differ 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 index 501ea81452664..475c07f50deed 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid.png index 7002bc129aebd..7e24044101925 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_felinid.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png index fab2713fac237..1fbfa6cf0d41e 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_hemophage.png index fab2713fac237..1fbfa6cf0d41e 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_hemophage.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_hemophage.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png index fab2713fac237..1fbfa6cf0d41e 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_genemod_primitive.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png index e21e9543ce2b8..e9251e73cc549 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_krokodil_addict.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_vampire.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_vampire.png index 909e5c1ace7d3..da991c8a20d6d 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_vampire.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_human_vampire.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_insectoid.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_insectoid.png index 3e18057dc3d65..047136342c260 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_insectoid.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_insectoid.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png index c8c165b24c2f3..3de016d13c6e9 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_ashwalker.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png index 709e7cf617b8c..d11be14f9831c 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_lizard_silverscale.png differ 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 index b4b18ca1ac6b3..b485876672899 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_monkey.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_monkey.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png index 9c7790148ec13..309d1a6e84856 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_plasmaman.png differ 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 index 83803391cf85c..abdb8e82734ce 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ramatan.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ramatan.png index 3c6d75946571d..76179e1856480 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ramatan.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ramatan.png differ 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 index e0b90fcc65f0f..7f31e342050c8 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_shadow.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skeleton.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skeleton.png index 09dfd8b5d1795..54625a5dd0493 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skeleton.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skeleton.png differ 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 index 9a0ca2fc7e3a9..2a080e4e19776 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_snail.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_snail.png differ 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 index e21e9543ce2b8..e9251e73cc549 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie_infectious.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie_infectious.png index e21e9543ce2b8..e9251e73cc549 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie_infectious.png and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_zombie_infectious.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png b/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png index 7bad634aea94f..8bffe88816fc9 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png and b/code/modules/unit_tests/screenshots/screenshot_saturnx_invisibility.png differ diff --git a/modular_doppler/modular_cosmetics/code/uniform_overrides.dm b/modular_doppler/modular_cosmetics/code/uniform_overrides.dm index f0317ee07659d..b8447ff58247a 100644 --- 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