diff --git a/code/modules/client/preference_setup/loadout/loadout_factions.dm b/code/modules/client/preference_setup/loadout/loadout_factions.dm index 88f08cb0dec..7757a6ffedf 100644 --- a/code/modules/client/preference_setup/loadout/loadout_factions.dm +++ b/code/modules/client/preference_setup/loadout/loadout_factions.dm @@ -178,6 +178,21 @@ zavod_sec_coat["zavodskoi security coat, alt"] = /obj/item/clothing/suit/storage/security/officer/zav/alt gear_tweaks += new /datum/gear_tweak/path(zavod_sec_coat) +/datum/gear/faction/zavod_warden_coat + display_name = "zavodskoi warden coat selection" + description = "A selection of Zavodskoi warden coats." + path = /obj/item/clothing/suit/storage/toggle/warden/zavod + slot = slot_wear_suit + faction = "Zavodskoi Interstellar" + allowed_roles = list("Head of Security", "Warden") + +/datum/gear/faction/zavod_warden_coat/New() + ..() + var/list/zavod_warden_coat = list() + zavod_warden_coat["zavodskoi warden coat"] = /obj/item/clothing/suit/storage/toggle/warden/zavod + zavod_warden_coat["zavodskoi warden coat, alt"] = /obj/item/clothing/suit/storage/toggle/warden/zavod/alt + gear_tweaks += new /datum/gear_tweak/path(zavod_warden_coat) + /datum/gear/faction/zavod_sunglasses display_name = "zavodskoi security HUD selection" description = "A selection of Zavodskoi security HUDs." diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 0bc91347c14..17ecaec20f3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -110,7 +110,8 @@ /datum/gear/head/warden/New() ..() var/list/wardenhead = list() - wardenhead["warden hat, zavod"] = /obj/item/clothing/head/warden + wardenhead["warden hat, zavod"] = /obj/item/clothing/head/warden/zavod + wardenhead["warden hat, zavod alt"] = /obj/item/clothing/head/warden/zavod/alt wardenhead["warden hat, idris"] = /obj/item/clothing/head/warden/idris wardenhead["warden hat, pmc"] = /obj/item/clothing/head/warden/pmc wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 602e7760948..bdad0929c77 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -153,6 +153,10 @@ /obj/item/clothing/head/warden/zavod icon_state = "zav_warden_hat" item_state = "zav_warden_hat" + +/obj/item/clothing/head/warden/zavod/alt + icon_state = "zav_warden_hat_alt" + item_state = "zav_warden_hat_alt" /obj/item/clothing/head/warden/pmc icon_state = "pmc_warden_hat" diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index dcbd7fc497f..338af9b430d 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -183,6 +183,10 @@ obj/item/clothing/suit/apron/overalls/blue /obj/item/clothing/suit/storage/toggle/warden/zavod icon_state = "zav_warden_coat" item_state = "zav_warden_coat" + +/obj/item/clothing/suit/storage/toggle/warden/zavod/alt + icon_state = "zav_warden_coat_alt" + item_state = "zav_warden_coat_alt" /obj/item/clothing/suit/storage/toggle/warden/pmc icon_state = "pmc_warden_coat" diff --git a/html/changelogs/nope-wardencoat.yml b/html/changelogs/nope-wardencoat.yml new file mode 100644 index 00000000000..80f03ae291f --- /dev/null +++ b/html/changelogs/nope-wardencoat.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Nope63 + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Added an alt version for the Zavodskoi warden coat and hat, as well as the ability to select them from the loadout." + - bugfix: "Removed the parent version of the warden hat, which was mistakenly labelled as the Zavod warden hat." diff --git a/icons/obj/contained_items/department_uniforms/security.dmi b/icons/obj/contained_items/department_uniforms/security.dmi index a11c57bb2d8..2175f3f0705 100644 Binary files a/icons/obj/contained_items/department_uniforms/security.dmi and b/icons/obj/contained_items/department_uniforms/security.dmi differ