diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index ef2d0fca2d3..00f0a631fc6 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -239,9 +239,9 @@ allowed_roles = list("Head of Security", "Warden", "Investigator", "Security Officer", "Security Cadet", "Security Personnel") /datum/gear/faction/zavodskoicape - display_name = "zavodskoi dominian great house cape selection" - description = "A selection of Zavodskoi-colored Dominian great house capes." - slot = slot_wear_suit + display_name = "zavodskoi dominian cape selection" + path = /obj/item/clothing/accessory/poncho/dominia_cape/zavod + flags = GEAR_HAS_DESC_SELECTION faction = "Zavodskoi Interstellar" culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi) @@ -257,6 +257,14 @@ zavodskoicape["zavodskoi dominia cape, zhao"] = /obj/item/clothing/accessory/poncho/dominia_cape/zhao/zavod gear_tweaks += new /datum/gear_tweak/path(zavodskoicape) +/datum/gear/faction/zavodskoicape_colorable + display_name = "zavodskoi dominian cape, colorable" + path = /obj/item/clothing/accessory/poncho/dominia_cape/zavod/colorable + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + description = "A Zavodskoi Dominian cape with a colorable stripe that can be used to represent either a generic cape or a Minor House." + faction = "Zavodskoi Interstellar" + culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi) + // PMCG /datum/gear/faction/pmc_sunglasses display_name = "PMCG security HUD selection" diff --git a/code/modules/client/preference_setup/loadout/items/suit.dm b/code/modules/client/preference_setup/loadout/items/suit.dm index dc3a447726e..d40be2e16f1 100644 --- a/code/modules/client/preference_setup/loadout/items/suit.dm +++ b/code/modules/client/preference_setup/loadout/items/suit.dm @@ -309,6 +309,20 @@ dominiacape["dominian cape, military"] = /obj/item/clothing/accessory/poncho/dominia_cape/mantle gear_tweaks += new /datum/gear_tweak/path(dominiacape) +/datum/gear/suit/dominia_cape_colorable + display_name = "dominian cape selection, colorable" + path = /obj/item/clothing/accessory/poncho/dominia_cape/colorable + flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + description = "A black or white Dominian cape with a colorable stripe that can be used to represent either a generic cape or a Minor House." + culture_restriction = list(/singleton/origin_item/culture/dominia, /singleton/origin_item/culture/dominian_unathi) + +/datum/gear/suit/dominia_cape_colorable/New() + ..() + var/list/dominiacape = list() + dominiacape["dominian cape"] = /obj/item/clothing/accessory/poncho/dominia_cape/colorable + dominiacape["white dominian cape"] = /obj/item/clothing/accessory/poncho/dominia_cape/white/colorable + gear_tweaks += new /datum/gear_tweak/path(dominiacape) + /datum/gear/suit/dominia_medical_cape display_name = "tribunalist medical cape" path = /obj/item/clothing/accessory/poncho/dominia_cape/hospital diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index 1def90ff2be..6fc0c94302f 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -184,6 +184,21 @@ item_state = "zhao_capez" cape_backing_state = "capez_backing" +/obj/item/clothing/accessory/poncho/dominia_cape/colorable + icon_state = "dominian_cape_colorable" + item_state = "dominian_cape_colorable" + has_accents = TRUE + +/obj/item/clothing/accessory/poncho/dominia_cape/white/colorable + icon_state = "dominian_capew_colorable" + item_state = "dominian_capew_colorable" + has_accents = TRUE + +/obj/item/clothing/accessory/poncho/dominia_cape/zavod/colorable + icon_state = "dominian_capez_colorable" + item_state = "dominian_capez_colorable" + has_accents = TRUE + /obj/item/clothing/accessory/poncho/dominia_cape/mantle name = "dominian military cape" diff --git a/html/changelogs/SimpleMaroon-colorabledominiancapes.yml b/html/changelogs/SimpleMaroon-colorabledominiancapes.yml new file mode 100644 index 00000000000..d409ae047a1 --- /dev/null +++ b/html/changelogs/SimpleMaroon-colorabledominiancapes.yml @@ -0,0 +1,60 @@ +################################ +# 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: + - imageadd: "Added black, white, and Zavodskoi-brown Dominian capes with colorable stripes to the loadout. You can say that the cape is in the color of a Minor House through the description if you desire." + - qol: "The Zavodskoi Dominian cape selection in the loadout no longer explicitly gives reference to Great Houses only." + - bugfix: "The Zavodskoi Dominian cape selection in the loadout can now choose a spawn slot like intended." diff --git a/icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi b/icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi index b6c7b9c12b6..4260a2d4f19 100644 Binary files a/icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi and b/icons/obj/item/clothing/accessory/poncho/dominia_cape.dmi differ