From 60ae0a77ea60b0c0ad27e5e99a735139c53ff3e3 Mon Sep 17 00:00:00 2001 From: Jaraci <57604458+Jaraci@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:47:55 +0100 Subject: [PATCH] Reclassifies Dominia sashes as generic coloured sashes, adds colourable sash variant (#11737) --- .../loadout/loadout_accessories.dm | 31 ++++++----- code/modules/clothing/factions/dominia.dm | 42 +-------------- .../clothing/under/accessories/accessory.dm | 49 ++++++++++++++++++ html/changelogs/omicega-sashes.yml | 42 +++++++++++++++ icons/clothing/accessories/dominia_sash.dmi | Bin 1081 -> 0 bytes icons/clothing/accessories/sash.dmi | Bin 0 -> 1223 bytes 6 files changed, 110 insertions(+), 54 deletions(-) create mode 100644 html/changelogs/omicega-sashes.yml delete mode 100644 icons/clothing/accessories/dominia_sash.dmi create mode 100644 icons/clothing/accessories/sash.dmi diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 20724e1a8ef..37bacc0a405 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -297,21 +297,26 @@ gadpathur["medical cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/med gear_tweaks += new/datum/gear_tweak/path(gadpathur) -/datum/gear/accessory/dominia/sash - display_name = "dominian house sash selection" - description = "A selection of sashes representing the Great Houses of Dominia." - path = /obj/item/clothing/accessory/dominia/sash +/datum/gear/accessory/sash_coloured + display_name = "sash (colourable)" + path = /obj/item/clothing/accessory/sash/colourable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION -/datum/gear/accessory/dominia/sash/New() +/datum/gear/accessory/sash + display_name = "sash selection" + description = "A selection of sashes in various colours." + path = /obj/item/clothing/accessory/sash + +/datum/gear/accessory/sash/New() ..() - var/dominia = list() - dominia["dominian sash"] = /obj/item/clothing/accessory/dominia/sash - dominia["strelitz sash"] = /obj/item/clothing/accessory/dominia/sash/strelitz - dominia["volvalaad sash"] = /obj/item/clothing/accessory/dominia/sash/volvalaad - dominia["kazhkz sash"] = /obj/item/clothing/accessory/dominia/sash/kazhkz - dominia["caladius sash"] = /obj/item/clothing/accessory/dominia/sash/caladius - dominia["zhao sash"] =/obj/item/clothing/accessory/dominia/sash/zhao - gear_tweaks += new/datum/gear_tweak/path(dominia) + var/sash = list() + sash["yellow sash"] = /obj/item/clothing/accessory/sash + sash["red sash"] = /obj/item/clothing/accessory/sash/red + sash["blue sash"] = /obj/item/clothing/accessory/sash/blue + sash["orange sash"] = /obj/item/clothing/accessory/sash/orange + sash["purple sash"] = /obj/item/clothing/accessory/sash/purple + sash["white sash"] =/obj/item/clothing/accessory/sash/white + gear_tweaks += new/datum/gear_tweak/path(sash) /datum/gear/accessory/passcard display_name = "human passcard selection" diff --git a/code/modules/clothing/factions/dominia.dm b/code/modules/clothing/factions/dominia.dm index a7cdb21cabd..91b95b71ae6 100644 --- a/code/modules/clothing/factions/dominia.dm +++ b/code/modules/clothing/factions/dominia.dm @@ -518,44 +518,4 @@ /obj/item/clothing/under/dominia/dress/fancy/sleeveless/kazhkz name = "sleeveless house kazhkz Morozi dress" - house = "kazhkz" - -/obj/item/clothing/accessory/dominia/sash - name = "dominian sash" - desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one seems to represent Dominia as a whole, however." - desc_fluff = "Sashes such as this one are a common sight throughout the Empire of Dominia, though they are hardly as fashionable as the typical cape. While they are \ - often used in formal uniforms - such as for attendants and domestic staff - these sashes can also be found used in positions where wearing a cape is impractical, such as the medical field." - icon = 'icons/clothing/accessories/dominia_sash.dmi' - item_state = "dominia_sash" - icon_state = "dominia_sash" - contained_sprite = TRUE - -/obj/item/clothing/accessory/dominia/sash/strelitz - name = "strelitz sash" - desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Strelitz." - item_state = "strelitz_sash" - icon_state = "strelitz_sash" - -/obj/item/clothing/accessory/dominia/sash/volvalaad - name = "volvalaad sash" - desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Volvalaad." - item_state = "volvalaad_sash" - icon_state = "volvalaad_sash" - -/obj/item/clothing/accessory/dominia/sash/kazhkz - name = "kazhkz sash" - desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Kazhkz." - item_state = "kazhkz_sash" - icon_state = "kazhkz_sash" - -/obj/item/clothing/accessory/dominia/sash/caladius - name = "caladius sash" - desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Caladius." - item_state = "caladius_sash" - icon_state = "caladius_sash" - -/obj/item/clothing/accessory/dominia/sash/zhao - name = "zhao sash" - desc = "A sash worn by commoners affiliated with a Dominian great house, intended for use when a cape is impractical. This one marks its wearer as an affiliate of House Zhao." - item_state = "zhao_sash" - icon_state = "zhao_sash" \ No newline at end of file + house = "kazhkz" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index b973b0ebeb8..28b2468d462 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -361,6 +361,55 @@ icon_state = "cargoponcho" item_state = "cargoponcho" +/* + * Sashes + */ + +/obj/item/clothing/accessory/sash + name = "yellow sash" + desc = "A yellow sash, designed to be worn over one shoulder and come down to the opposing hip." + desc_fluff = "Sashes such as this one are a common sight throughout the Empire of Dominia, though they are hardly as fashionable as the typical cape." + icon = 'icons/clothing/accessories/sash.dmi' + item_state = "sash" + icon_state = "sash" + contained_sprite = TRUE + +/obj/item/clothing/accessory/sash/red + name = "red sash" + desc = "A red sash, designed to be worn over one shoulder and come down to the opposing hip." + item_state = "red_sash" + icon_state = "red_sash" + +/obj/item/clothing/accessory/sash/blue + name = "blue sash" + desc = "A blue sash, designed to be worn over one shoulder and come down to the opposing hip." + item_state = "blue_sash" + icon_state = "blue_sash" + +/obj/item/clothing/accessory/sash/orange + name = "orange sash" + desc = "An orange sash, designed to be worn over one shoulder and come down to the opposing hip." + item_state = "orange_sash" + icon_state = "orange_sash" + +/obj/item/clothing/accessory/sash/purple + name = "purple sash" + desc = "A purple sash, designed to be worn over one shoulder and come down to the opposing hip." + item_state = "purple_sash" + icon_state = "purple_sash" + +/obj/item/clothing/accessory/sash/white + name = "white sash" + desc = "A white sash, designed to be worn over one shoulder and come down to the opposing hip." + item_state = "white_sash" + icon_state = "white_sash" + +/obj/item/clothing/accessory/sash/colourable + name = "sash" + desc = "A sash, designed to be worn over one shoulder and come down to the opposing hip." + item_state = "sash_colourable" + icon_state = "sash_colourable" + /* * Cloak */ diff --git a/html/changelogs/omicega-sashes.yml b/html/changelogs/omicega-sashes.yml new file mode 100644 index 00000000000..1333f23ee16 --- /dev/null +++ b/html/changelogs/omicega-sashes.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: Omicega + +# 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: + - tweak: "The ostensibly Dominian sash selection is now a more generic coloured sash selection." + - rscadd: "Added a wholly colourable sash variant to the loadout screen, to allow for colours beyond the existing selection." diff --git a/icons/clothing/accessories/dominia_sash.dmi b/icons/clothing/accessories/dominia_sash.dmi deleted file mode 100644 index b97559942e2f99efe93b4a7be5b9925f9b5c388e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1081 zcmV-91jhS`P)P)t-sz`($g zeoLi{PfQpXf*2SWB}^+qg@jfVw{Z!6Gntq;yo!W`uc@ihv0B^6VyH7S!6+y!Nu4)V zvDk$O|Cs=-NYAob*VNC?|NsAO)QT(s0004WQchCV=-0C=2@lFJH%Fc3x8$yWs3mp12nnEw;Z{~6~00^{FRdp}+u{CIQpiV%hK$hPA|MAr1?p^vgrh4J*tM~tJ`foVP_K+KY{{FG+?Js!^ z*?E3`fa0Z%6=?!jyR&@A&40SZF);p6j^04e54>$F*?Y<<)Q2aNyQb#{ipkwg=@~8- z%h7)-xX=4z{EpuW5fKp)5fKp)`3kfC57mVTndb+zFzX9Z-H8u&{gAn(d$YMcK`(ZF zlBIiw?qJssq1rCF-V3ij4AqX|J7hmWZv2r?K=pqpUfNiZ7O$rILKNp2O0_uU<{w*7 z{hzmOC3{uMLVXyhzR=sYlFce;RR5=#-QARGuz9GyP_fv%X>gzS$C&u72=4P#hfYL9 zL_|bHL_~hVvQUoOd_Taq)Qw)(SL*tuJ42Sr z`TNJNx4+~aWas()02D86tVkcY+MVTdZvN9PE`jlfa`Xm#KfqtxO7`Aj66(W~$z9|7 z0p3=3H>G#9uvm`%Q^9@SAEVweAR;0n@*nvFv92N^#!i1&00000NkvXXu0mjfN-!59 diff --git a/icons/clothing/accessories/sash.dmi b/icons/clothing/accessories/sash.dmi new file mode 100644 index 0000000000000000000000000000000000000000..567409a7ac552e68c5bf2492d28e46da04e0a5ff GIT binary patch literal 1223 zcmV;&1UUPNP)fFDZ*Bkpc$}5eO$viB5C!0Ma*Ck)(jT|o6s5SRSCH7GCXgmF zN$T~RDyW;5>24l;Awb8Dw_`N;GE(Kul zrUMM$)PUh@6Bs?YyE85V@6s>-Kl#>o&Z?%IZu1SvK*@UAZCuy@00UP^L_t(|ob8?6 za;i`aMk}HsQlu8qQTzU{d8oUWO}@;Do}bQIx5-XIh8A??;PsDHZ&`cDUO_JY$Q7vb0VOXwmZXxa)%k;x z>kOqd7PclvJG$6neLssxw*-b^cHo>}ndU^L~tp zXGO5it8;1q000000001Z2E(9w+~)TK>b=qshr?TH{ZKDOm)?H=_^{6TE;d#vE4usY zz5lJ=4cBBX+D~_4flxUUV$UIY zE2oeRk4*1ceLqk*xYbmB!=;J!=)Wac=lvKT@vHy<00000004mB!JPl2=0b!R$9JJ& z&KFX1C%&-fhm4K#tr?q*uwu_Anc8E>gFQb)&34IIFL?7|)a)4TA$tY6_#;=K=Km;p z(Xk|rT&?B{DY?#2N@J7Dztm9kf9}jX*_%=pvSFa+3*DJ_vN;7!&HpKkZZ%ai*gVvH zp~7TW(_o$VV@y0Nf^}Zap#uN_000000DxyOO{&Lj{vY5WbED7aQ)>OxZbg^go-cmx za=wd=UCN5?zIyZB)$Dyu) z^ak?(0H4e|+53x0$c9IzcP;-9aOdn+Q}vG)O{_=%Ex|hP$H+eh0000000000{uY<3 zCAnVm)^9h}9k>0*__*Fo=hu&%?b*ad_4ghBF%RB)R~WK>Q3kRu#QLQ9KM?)r|002ovPDHLkV1o4;V=4du literal 0 HcmV?d00001