diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 0c07982866c33..700ff9b58a766 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -340,7 +340,7 @@ uniform = /obj/item/clothing/under/color/grey id = /obj/item/card/id/advanced - ears = /obj/item/radio/headset +/* ears = /obj/item/radio/headset DOPPLER EDIT REMOVAL - Chat on PDA */ belt = /obj/item/modular_computer/pda back = /obj/item/storage/backpack shoes = /obj/item/clothing/shoes/sneakers/black 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/modular_doppler/loadout_categories/categories/ears.dm b/modular_doppler/loadout_categories/categories/ears.dm index 13786ca091f22..f86fe518b2da9 100644 --- a/modular_doppler/loadout_categories/categories/ears.dm +++ b/modular_doppler/loadout_categories/categories/ears.dm @@ -23,7 +23,3 @@ /datum/loadout_item/ears/earmuffs name = "Earmuffs" item_path = /obj/item/clothing/ears/earmuffs - -/datum/loadout_item/ears/frontier - name = "Frontier Radio" - item_path = /obj/item/radio/headset/headset_frontier_colonist 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