From 9ba4ce164be4f52726b18dcba79c2aaed4105bbd Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Thu, 4 Sep 2025 03:05:21 -0400 Subject: [PATCH] Bombers can now be dyed in washing machines (#30307) * Bombers can now be dyed * Bombers can now be dyed --- code/__DEFINES/dye_keys.dm | 1 + code/_globalvars/lists/dye_registry.dm | 11 +++++++++++ code/modules/clothing/suits/misc_suits.dm | 2 ++ 3 files changed, 14 insertions(+) diff --git a/code/__DEFINES/dye_keys.dm b/code/__DEFINES/dye_keys.dm index 9c0c814b341..f785ccee09f 100644 --- a/code/__DEFINES/dye_keys.dm +++ b/code/__DEFINES/dye_keys.dm @@ -6,6 +6,7 @@ #define DYE_REGISTRY_FANNYPACK "fannypack" #define DYE_REGISTRY_BEANIE "beanie" #define DYE_REGISTRY_BEDSHEET "bedsheet" +#define DYE_REGISTRY_BOMBER "bomber" #define DYE_REGISTRY_PLASMAMEN "plasmamen" #define DYE_REGISTRY_PLASMAMEN_HELMET "plasmamen_helmet" #define DYE_REGISTRY_SYNDICATE_SUIT "syndicate_suit" diff --git a/code/_globalvars/lists/dye_registry.dm b/code/_globalvars/lists/dye_registry.dm index 77d716f8059..6112ae20e86 100644 --- a/code/_globalvars/lists/dye_registry.dm +++ b/code/_globalvars/lists/dye_registry.dm @@ -157,6 +157,17 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_SYNDICATE = /obj/item/bedsheet/syndie, DYE_CENTCOM = /obj/item/bedsheet/centcom ), + DYE_REGISTRY_BOMBER = list( + DYE_RED = /obj/item/clothing/suit/jacket/bomber/sec, + DYE_ORANGE = /obj/item/clothing/suit/jacket/bomber/chem, + DYE_YELLOW = /obj/item/clothing/suit/jacket/bomber/engi, + DYE_GREEN = /obj/item/clothing/suit/jacket/bomber/hydro, + DYE_BLUE = /obj/item/clothing/suit/jacket/bomber/atmos, + DYE_PURPLE = /obj/item/clothing/suit/jacket/bomber/sci, + DYE_BLACK = /obj/item/clothing/suit/jacket/bomber/coroner, + DYE_WHITE = /obj/item/clothing/suit/jacket/bomber/med, + DYE_SYNDICATE = /obj/item/clothing/suit/jacket/bomber/syndicate + ), DYE_REGISTRY_PLASMAMEN = list( DYE_RED = /obj/item/clothing/under/plasmaman/security, DYE_ORANGE = /obj/item/clothing/under/plasmaman, diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index a56f9a4e7b4..7b231b2190a 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -1023,6 +1023,8 @@ icon_state = "bomber" item_state = "bomber" icon_override = 'icons/mob/clothing/suits/coat.dmi' + dyeing_key = DYE_REGISTRY_BOMBER + dyeable = TRUE allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) actions_types = list(/datum/action/item_action/zipper)