diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index b2788cd3c3c..444a067beec 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -582,3 +582,15 @@ ABSTRACT_TYPE(/datum/gear/suit/miscellaneous) description = "A heavy threaded tweed gray jacket. For a different sort of Gentleman." path = /obj/item/clothing/suit/storage/toggle/wizrobe/gentlecoat flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/suit/hazard_vest_colorable + display_name = "colorable hazard vest selection" + path = /obj/item/clothing/suit/storage/hazardvest/colorable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/suit/hazard_vest_colorable/New() + ..() + var/list/hazard_vest = list() + hazard_vest["colorable hazard vest"] = /obj/item/clothing/suit/storage/hazardvest/colorable + hazard_vest["colorable hazard vest, alt"] = /obj/item/clothing/suit/storage/hazardvest/colorable/alt + gear_tweaks += new /datum/gear_tweak/path(hazard_vest) diff --git a/code/modules/clothing/suits/hazardvests.dm b/code/modules/clothing/suits/hazardvests.dm index 384c36cd146..5945c22106d 100644 --- a/code/modules/clothing/suits/hazardvests.dm +++ b/code/modules/clothing/suits/hazardvests.dm @@ -104,3 +104,15 @@ armor = list( bio = ARMOR_BIO_MINOR ) + +/obj/item/clothing/suit/storage/hazardvest/colorable + icon_state = "hazard_colorable" + item_state = "hazard_colorable" + build_from_parts = TRUE + worn_overlay = "stripes" + +/obj/item/clothing/suit/storage/hazardvest/colorable/alt + icon_state = "hazard_colorable_alt" + item_state = "hazard_colorable_alt" + has_accents = TRUE + build_from_parts = FALSE diff --git a/html/changelogs/SimpleMaroon-colorablehazardvests.yml b/html/changelogs/SimpleMaroon-colorablehazardvests.yml new file mode 100644 index 00000000000..7d011147567 --- /dev/null +++ b/html/changelogs/SimpleMaroon-colorablehazardvests.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: SimpleMaroon + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added two colorable hazard vests to the loadout: One with default-colored stripes, and one that you can color the stripes on as well." diff --git a/icons/mob/clothing/suit/hazardvest.dmi b/icons/mob/clothing/suit/hazardvest.dmi index ded0626bbb1..44cebe92cb8 100644 Binary files a/icons/mob/clothing/suit/hazardvest.dmi and b/icons/mob/clothing/suit/hazardvest.dmi differ