diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 3b74106d4361b..44fb8120a4411 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -150,8 +150,10 @@ if(isinhands) return - if(!up) + if(!up && !mask_overlay_icon) // DOPPLER EDIT - ORIGINAL - if(!up) . += mutable_appearance('icons/mob/clothing/head/utility.dmi', visor_state) + else if(!up) // DOPPLER EDIT ADDITION - SEE modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm + . += mutable_appearance(mask_overlay_icon, visor_state) // DOPPLER EDIT ADDITION /obj/item/clothing/head/utility/hardhat/welding/update_overlays() . = ..() diff --git a/modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm b/modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm index 727cfdd4b964b..889eada8dfd05 100644 --- a/modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm +++ b/modular_doppler/modular_cosmetics/code/garment_bag_overrides.dm @@ -7,10 +7,10 @@ /obj/item/storage/bag/garment/hop/PopulateContents() . = ..() - new /obj/item/clothing/under/misc/doppler_uniform/service(src) - new /obj/item/clothing/neck/doppler_mantle/service(src) - new /obj/item/clothing/head/beret/doppler_command/service(src) - new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/service(src) + new /obj/item/clothing/under/misc/doppler_uniform/command(src) + new /obj/item/clothing/neck/doppler_mantle/command(src) + new /obj/item/clothing/head/beret/doppler_command/command(src) + new /obj/item/clothing/head/utility/hardhat/welding/doppler_command/command(src) /obj/item/storage/bag/garment/hos/PopulateContents() . = ..() diff --git a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm index 511494d3fd879..03dae2a276706 100644 --- a/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm +++ b/modular_doppler/modular_cosmetics/code/hats/doppler_command_hats.dm @@ -1,66 +1,54 @@ +// Cool firehelmets + +/obj/item/clothing/head/utility/hardhat/welding + /// If we use a special icon file for the welding mask overlay + var/mask_overlay_icon = null + /obj/item/clothing/head/utility/hardhat/welding/doppler_command - name = "generic doppler command hardhat" - desc = "You shouldn't be seeing this. Yell at Naaka." + name = "generic command hardhat" + desc = "A heavy-duty hardhat for protecting the heads of the heads when everything starts to go wrong." icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi' resistance_flags = FIRE_PROOF | ACID_PROOF icon_state = null hat_type = null + mask_overlay_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi' /obj/item/clothing/head/utility/hardhat/welding/doppler_command/medical - name = "doppler medical hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." + name = "medical command hardhat" icon_state = "hardhat0_med" hat_type = "med" /obj/item/clothing/head/utility/hardhat/welding/doppler_command/science - name = "doppler science hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." + name = "science command hardhat" icon_state = "hardhat0_sci" hat_type = "sci" /obj/item/clothing/head/utility/hardhat/welding/doppler_command/engineering - name = "doppler engineering hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." + name = "engineering command hardhat" icon_state = "hardhat0_eng" hat_type = "eng" /obj/item/clothing/head/utility/hardhat/welding/doppler_command/cargo - name = "doppler cargo hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." + name = "supply command hardhat" icon_state = "hardhat0_cargo" hat_type = "cargo" -/obj/item/clothing/head/utility/hardhat/welding/doppler_command/service - name = "doppler service hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." - icon_state = "hardhat0_serv" - hat_type = "serv" - /obj/item/clothing/head/utility/hardhat/welding/doppler_command/command - name = "doppler command hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." + name = "command hardhat" icon_state = "hardhat0_cmd" hat_type = "cmd" -/obj/item/clothing/head/utility/hardhat/welding/doppler_command/performer - name = "doppler performer hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." - icon_state = "hardhat0_perf" - hat_type = "perf" - /obj/item/clothing/head/utility/hardhat/welding/doppler_command/security - name = "doppler security hardhat" - desc = "Heavy-duty headgear demarkated in standard command colors. A special of Doppler Shift-series stations." + name = "security command hardhat" icon_state = "hardhat0_sec" hat_type = "sec" +/// Beret but cooler - -/// Beret breaker /obj/item/clothing/head/beret/doppler_command - name = "generic doppler command beret" - desc = "You shouldn't be seeing this. Yell at Naaka." + name = "generic command beret" + desc = "A slim beret denoting the wearer as the command for some aspect of the station." icon = 'modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi' icon_state = null @@ -72,41 +60,25 @@ flags_1 = NONE /obj/item/clothing/head/beret/doppler_command/medical - name = "doppler medical beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." + name = "medical command beret" icon_state = "doppler_med" /obj/item/clothing/head/beret/doppler_command/science - name = "doppler science beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." + name = "science command beret" icon_state = "doppler_sci" /obj/item/clothing/head/beret/doppler_command/engineering - name = "doppler engineering beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." + name = "engineering command beret" icon_state = "doppler_eng" /obj/item/clothing/head/beret/doppler_command/cargo - name = "doppler cargo beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." + name = "supply command beret" icon_state = "doppler_cargo" -/obj/item/clothing/head/beret/doppler_command/service - name = "doppler service beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." - icon_state = "doppler_serv" - /obj/item/clothing/head/beret/doppler_command/command - name = "doppler command beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." + name = "command beret" icon_state = "doppler_cmd" -/obj/item/clothing/head/beret/doppler_command/performer - name = "doppler performer beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." - icon_state = "doppler_perf" - /obj/item/clothing/head/beret/doppler_command/security - name = "doppler security beret" - desc = "A cozy, fashionable beret used to connotate command staff on Doppler Shift-series stations." + name = "security command beret" icon_state = "doppler_sec" diff --git a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm index 1dae6fcc99ceb..157179f2d697a 100644 --- a/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm +++ b/modular_doppler/modular_cosmetics/code/neck/doppler_command_mantles.dm @@ -1,49 +1,34 @@ /obj/item/clothing/neck/doppler_mantle - name = "generic doppler mantle" - desc = "You shouldn't be seeing this. Yell at Naaka." + name = "generic command mantle" + desc = "A command mantle made of fire and acid proof materials to protect the wearer." icon = 'modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi' worn_icon = 'modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi' icon_state = "" inhand_icon_state = null w_class = WEIGHT_CLASS_SMALL body_parts_covered = CHEST|ARMS + resistance_flags = FIRE_PROOF | ACID_PROOF /obj/item/clothing/neck/doppler_mantle/medical - name = "doppler medical mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." + name = "medical command mantle" icon_state = "doppler_med" /obj/item/clothing/neck/doppler_mantle/science - name = "doppler science mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." + name = "science command mantle" icon_state = "doppler_sci" /obj/item/clothing/neck/doppler_mantle/engineering - name = "doppler engineering mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." + name = "engineering command mantle" icon_state = "doppler_eng" /obj/item/clothing/neck/doppler_mantle/cargo - name = "doppler cargo mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." + name = "supply command mantle" icon_state = "doppler_cargo" -/obj/item/clothing/neck/doppler_mantle/service - name = "doppler service mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." - icon_state = "doppler_serv" - /obj/item/clothing/neck/doppler_mantle/command - name = "doppler command mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." + name = "command mantle" icon_state = "doppler_cmd" -/obj/item/clothing/neck/doppler_mantle/performer - name = "doppler performer mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." - icon_state = "doppler_perf" - /obj/item/clothing/neck/doppler_mantle/security - name = "doppler security mantle" - desc = "A stylish command mantle from Doppler Shift-series stations." + name = "security command mantle" icon_state = "doppler_sec" diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi index 5380331dec63c..d35fc86f23462 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi and b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hardhats.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi index 1966d0ab836d6..c2ac9f2de5f7d 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi and b/modular_doppler/modular_cosmetics/icons/mob/head/doppler_command_hats.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi b/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi index d498a63f5b507..2b42a8a04307c 100644 Binary files a/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi and b/modular_doppler/modular_cosmetics/icons/mob/neck/doppler_mantles.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi b/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi index bf6428f794234..5e66911e26137 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi and b/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hardhats.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi b/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi index c6b94226e6d73..9f8eee4144746 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi and b/modular_doppler/modular_cosmetics/icons/obj/head/doppler_command_hats.dmi differ diff --git a/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi b/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi index 926edbfa55329..bec78857245a8 100644 Binary files a/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi and b/modular_doppler/modular_cosmetics/icons/obj/neck/doppler_mantles.dmi differ