diff --git a/code/modules/client/preference_setup/loadout/items/pants.dm b/code/modules/client/preference_setup/loadout/items/pants.dm index 953b5ab91a2..4303147c533 100644 --- a/code/modules/client/preference_setup/loadout/items/pants.dm +++ b/code/modules/client/preference_setup/loadout/items/pants.dm @@ -24,6 +24,7 @@ ABSTRACT_TYPE(/datum/gear/pants) pants["high visibility pants"] = /obj/item/clothing/pants/highvis pants["high visibility pants, alt"] = /obj/item/clothing/pants/highvis_alt pants["high visibility pants, red"] = /obj/item/clothing/pants/highvis_red + pants["high visibility pants, orange"] = /obj/item/clothing/pants/highvis_orange pants["track pants"] = /obj/item/clothing/pants/track pants["blue track pants"] = /obj/item/clothing/pants/track/blue pants["green track pants"] = /obj/item/clothing/pants/track/green diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index 98083190e4c..84a766738a0 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -45,6 +45,7 @@ jackets["high visibility jacket"] = /obj/item/clothing/suit/storage/toggle/highvis jackets["high visibility jacket, alt"] = /obj/item/clothing/suit/storage/toggle/highvis_alt jackets["high visibility jacket, red"] = /obj/item/clothing/suit/storage/toggle/highvis_red + jackets["high visibility jacket, orange"] = /obj/item/clothing/suit/storage/toggle/highvis_orange jackets["black vest"] = /obj/item/clothing/suit/storage/toggle/leather_vest jackets["brown vest"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless jackets["leather coat"] = /obj/item/clothing/suit/storage/leathercoat diff --git a/code/modules/clothing/pants/pants.dm b/code/modules/clothing/pants/pants.dm index d93f6436add..54e81d3ceec 100644 --- a/code/modules/clothing/pants/pants.dm +++ b/code/modules/clothing/pants/pants.dm @@ -126,6 +126,20 @@ ABSTRACT_TYPE(/obj/item/clothing/pants) I.AddOverlays(emissive_overlay) return I +/obj/item/clothing/pants/highvis_orange + name = "high visibility pants" + desc = "A pair of orange pants with reflective stripes. For use in different departments, commonly found in civilian industrial services, in dark or secluded areas where visibility is critical for safety." + icon = 'icons/clothing/kit/highvis.dmi' + icon_state = "pants_highvis_orange" + item_state = "pants_highvis_orange" + +/obj/item/clothing/pants/highvis_orange/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) + var/image/I = ..() + if(slot == slot_pants_str) + var/image/emissive_overlay = emissive_appearance(mob_icon, "[icon_state][species_sprite_adaption_type]-emis", alpha = src.alpha) + I.AddOverlays(emissive_overlay) + return I + /obj/item/clothing/pants/camo name = "camouflage pants" desc = "A pair of woodland camouflage pants. Probably not the best choice for a space station." diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index b6790493c6b..2891dc7fc3c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -447,6 +447,23 @@ I.AddOverlays(emissive_overlay) return I +/obj/item/clothing/suit/storage/toggle/highvis_orange + name = "high visibility jacket" + desc = "An orange jacket with reflective stripes. For use in different departments, commonly found in civilian industrial services, in dark or secluded areas where visibility is critical for safety." + icon = 'icons/clothing/kit/highvis.dmi' + icon_state = "jacket_highvis_orange" + item_state = "jacket_highvis_orange" + body_parts_covered = UPPER_TORSO|ARMS + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/toggle/highvis_orange/get_mob_overlay(mob/living/carbon/human/H, mob_icon, mob_state, slot) + var/image/I = ..() + if(slot == slot_wear_suit_str) + var/image/emissive_overlay = emissive_appearance(mob_icon, "[opened ? "jacket_highvis_orange_open_su-emis" : "jacket_highvis_orange_su-emis"]", alpha = src.alpha) + I.AddOverlays(emissive_overlay) + return I + + /obj/item/clothing/suit/storage/toggle/track name = "track jacket" desc = "a track jacket, for the athletic." diff --git a/html/changelogs/fabiank3-new-orange-hazard-clothing.yml b/html/changelogs/fabiank3-new-orange-hazard-clothing.yml new file mode 100644 index 00000000000..40ca634456e --- /dev/null +++ b/html/changelogs/fabiank3-new-orange-hazard-clothing.yml @@ -0,0 +1,6 @@ +author: FabianK3 + +delete-after: True + +changes: + - rscadd: "Added an orange version of the high visibility jacket and pants. They are available in the loadout." diff --git a/icons/clothing/kit/highvis.dmi b/icons/clothing/kit/highvis.dmi index e4e4c73ec61..cfd2d76c12b 100644 Binary files a/icons/clothing/kit/highvis.dmi and b/icons/clothing/kit/highvis.dmi differ