Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 13 commits into from
Jan 27, 2025
26 changes: 8 additions & 18 deletions code/modules/jobs/job_types/assistant/assistant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions modular_doppler/modular_cosmetics/code/uniform_overrides.dm
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading