From 6a7e26225c0b4981af0d6c68b36b0e492e0e6fc7 Mon Sep 17 00:00:00 2001 From: TheStryker Date: Sun, 27 Sep 2020 20:11:08 +0800 Subject: [PATCH] Adds Gadpathurian clothes to the loadout. (#10045) --- aurorastation.dme | 1 + .../loadout/loadout_accessories.dm | 16 ++++- .../preference_setup/loadout/loadout_head.dm | 13 ++++ .../preference_setup/loadout/loadout_mask.dm | 2 +- .../preference_setup/loadout/loadout_suit.dm | 7 +- .../loadout/loadout_uniform.dm | 5 ++ code/modules/clothing/factions/gadpathur.dm | 66 ++++++++++++++++++ html/changelogs/stryker-gadpathur.yml | 4 ++ .../accessories/gadpathur_brassard.dmi | Bin 0 -> 1354 bytes icons/clothing/head/gadpathur_beret.dmi | Bin 0 -> 443 bytes icons/clothing/head/gadpathur_cap.dmi | Bin 0 -> 421 bytes icons/clothing/suits/coats/gadpathur_coat.dmi | Bin 0 -> 644 bytes .../under/uniforms/gadpathur_uniform.dmi | Bin 0 -> 644 bytes 13 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 code/modules/clothing/factions/gadpathur.dm create mode 100644 html/changelogs/stryker-gadpathur.yml create mode 100644 icons/clothing/accessories/gadpathur_brassard.dmi create mode 100644 icons/clothing/head/gadpathur_beret.dmi create mode 100644 icons/clothing/head/gadpathur_cap.dmi create mode 100644 icons/clothing/suits/coats/gadpathur_coat.dmi create mode 100644 icons/clothing/under/uniforms/gadpathur_uniform.dmi diff --git a/aurorastation.dme b/aurorastation.dme index 6b8454329e39..cb416059dace 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1364,6 +1364,7 @@ #include "code\modules\clothing\factions\dominia.dm" #include "code\modules\clothing\factions\elyra.dm" #include "code\modules\clothing\factions\europa.dm" +#include "code\modules\clothing\factions\gadpathur.dm" #include "code\modules\clothing\factions\himeo.dm" #include "code\modules\clothing\factions\konyang.dm" #include "code\modules\clothing\factions\vysoka.dm" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 21e9f0387793..5146e7d4ac1f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -272,4 +272,18 @@ /datum/gear/accessory/whalebone display_name = "europan bone charm" path = /obj/item/clothing/accessory/whalebone - flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/gadpathur + display_name = "gadpathurian cadre brassard selection" + description = "A selection of cadre brassards from Gadpathur." + path = /obj/item/clothing/accessory/armband/gadpathur + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/gadpathur/New() + ..() + var/gadpathur = list() + gadpathur["cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur + gadpathur["industrial cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/ind + gadpathur["medical cadre brassard"] = /obj/item/clothing/accessory/armband/gadpathur/med + gear_tweaks += new/datum/gear_tweak/path(gadpathur) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 4a69d9b852a2..85b3786013af 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -289,3 +289,16 @@ display_name = "bucket hat" path = /obj/item/clothing/head/buckethat flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/head/gadpathur + display_name = "gadpathurian headgear selection" + description = "A selection of headgear from Gadpathur." + path = /obj/item/clothing/head/soft/gadpathur + flags = GEAR_HAS_DESC_SELECTION + +/datum/gear/head/gadpathur/New() + ..() + var/gadpathur = list() + gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/soft/gadpathur + gadpathur["gadpathurian beret"] = /obj/item/clothing/head/soft/gadpathur/beret + gear_tweaks += new/datum/gear_tweak/path(gadpathur) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index b882a3e71f8d..188a0566b5ae 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -19,4 +19,4 @@ /datum/gear/mask/cloth display_name = "cloth mask" path = /obj/item/clothing/mask/cloth - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index a2b76e729577..d0cf4d1b9c91 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -332,4 +332,9 @@ /datum/gear/suit/submariner display_name = "submariner jacket" path = /obj/item/clothing/suit/storage/toggle/overlay/submariner - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/suit/gadpathur + display_name = "gadpathurian overcoat" + path = /obj/item/clothing/suit/storage/gadpathur + flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 76d396032fe0..1988e4e2d5fb 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -321,3 +321,8 @@ hanbok["magenta-blue hanbok"] = /obj/item/clothing/under/konyang hanbok["white-pink hanbok"] = /obj/item/clothing/under/konyang/pink gear_tweaks += new/datum/gear_tweak/path(hanbok) + +/datum/gear/uniform/gadpathur + display_name = "gadpathurian fatigues" + path = /obj/item/clothing/under/uniform/gadpathur + flags = GEAR_HAS_DESC_SELECTION \ No newline at end of file diff --git a/code/modules/clothing/factions/gadpathur.dm b/code/modules/clothing/factions/gadpathur.dm new file mode 100644 index 000000000000..dccd8df56cf4 --- /dev/null +++ b/code/modules/clothing/factions/gadpathur.dm @@ -0,0 +1,66 @@ +/obj/item/clothing/under/uniform/gadpathur + name = "gadpathurian fatigues" + desc = "A simple black cloth shirt and brown NBC-treated pants commonly worn by Gadpathurians." + desc_fluff = "Gadpathur is, perhaps, the only planet with a government-mandated planetary costume. These uniforms can be \ + found throughout the planet and are one of the most common markers of Gadpathurians abroad, due to the distinctive black \ + shirt of the uniform. While some personalization is common on these uniforms, they mostly remain the same regardless of \ + which cadre one belongs to." + icon = 'icons/clothing/under/uniforms/gadpathur_uniform.dmi' + icon_state = "gadpathur_uniform" + item_state = "gadpathur_uniform" + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/gadpathur + name = "gadpathurian overcoat" + desc = "A simple canvas overcoat typically worn by Gadpathurians. The dull colors of it make manufacturing easier." + desc_fluff = "Due to the extremely hostile surface conditions of Gadpathur, overcoats such as this one are a common sight \ + in order to protect against hazards. They are typically chemically treated to better resist chemicals and radiation, \ + and are often the difference between life and death on the planet's surface." + icon = 'icons/clothing/suits/coats/gadpathur_coat.dmi' + icon_state = "gadpathur_coat" + item_state = "gadpathur_coat" + contained_sprite = TRUE + +/obj/item/clothing/head/soft/gadpathur + name = "cadre cap" + desc = "A snugly-fitting cap with the traditional Gadpathurian red-and-orange sun on its face. It has no other identifying features." + desc_fluff = "Soft headgear is commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \ + Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \ + to - in order to not give away unwanted information to observers." + icon = 'icons/clothing/head/gadpathur_cap.dmi' + icon_state = "gadpathur_cap" + item_state = "gadpathur_cap" + contained_sprite = TRUE + +/obj/item/clothing/head/soft/gadpathur/beret + name = "cadre beret" + desc = "A canvas beret with the traditional Gadpathurian red-and-orange sun on its badge. It has no other identifying marks." + desc_fluff = "Berets are commonly worn by cadre members while indoors on Gadpathur or while traveling abroad from the planet. \ + Gadpathurian cadres universally avoid decorating their headgear beyond the barest essentials - such as the cadre one belongs \ + to - in order to not give away unwanted information to observers." + icon = 'icons/clothing/head/gadpathur_beret.dmi' + icon_state = "gadpathur_beret" + item_state = "gadpathur_beret" + +/obj/item/clothing/accessory/armband/gadpathur + name = "cadre brassard" + desc = "Gadpathurian cadres use these brassards, worn on their uniforms or their coats, to distinguish themselves." + desc_fluff = "Stop reading the fluff description of an accessory friend, we must fight the Solarian imperialists!" + icon = 'icons/clothing/accessories/gadpathur_brassard.dmi' + icon_state = "gadpathur_brassard" + item_state = "gadpathur_brassard" + contained_sprite = TRUE + +/obj/item/clothing/accessory/armband/gadpathur/med + name = "medical cadre brassard" + desc = "Gadpathurian cadres use these brassards, worn on their uniforms or their coats, to distinguish themselves. This one depicts a golden cross \ + on a white background." + icon_state = "gadpathur_brassard_med" + item_state = "gadpathur_brassard_med" + +/obj/item/clothing/accessory/armband/gadpathur/ind + name = "industrial cadre brassard" + desc = "Gadpathurian cadres use these brassards, worn on their uniforms or their coats, to distinguish themselves. This one depicts a crossed hammer and\ + shovel with golden heads." + icon_state = "gadpathur_brassard_ind" + item_state = "gadpathur_brassard_ind" \ No newline at end of file diff --git a/html/changelogs/stryker-gadpathur.yml b/html/changelogs/stryker-gadpathur.yml new file mode 100644 index 000000000000..38c8938e8d34 --- /dev/null +++ b/html/changelogs/stryker-gadpathur.yml @@ -0,0 +1,4 @@ +author: The Stryker, NewOriginalSchwann +delete-after: True +changes: + - rscadd: "Adds Gadpathurian clothes (uniform, hats, cadre brassards, overcoat) under their appropriate categories in the loadout. Descriptions done by Schwann." \ No newline at end of file diff --git a/icons/clothing/accessories/gadpathur_brassard.dmi b/icons/clothing/accessories/gadpathur_brassard.dmi new file mode 100644 index 0000000000000000000000000000000000000000..90e1c39ef7fd1bc81479eba956d0439ece74afa8 GIT binary patch literal 1354 zcmXX_e>l^59RDu2trn@Hlik`PKihRUE#~Knj&Ugx;rt&;YNw1Hi_y2?%j|oj{&{^~ulMu3U+?GhdOz>1{XQN#I6Mvj03Eug zyB`3cG!z(Kt);;so@bcm*}eZK|2;yX(Aq+uN~JnGJG;5L5eNh#k!WaW81H2w{2Dvi ziiLJ$Eu2-BT8MA+ z2@R_AIr)fo*FXG5kq((jIpZb&6e%v=*yL<#wf*s>_HoawyvD$EL#`~eBU}`36IXLC zMp5ASOwehu;dNs&tE{3fEw=~8Mm1f$vEHE9VP84HKt$Rd$Wmu-W4_^x(e@!#>z!Y-7dk~#BT@vCI3eSDw9^6YswlY!Mjs-D7&gTPw)_-*OUH-}3 z$+t1_@3-h*I9gku&9aG8B8Uhrzkj`(N)wu$P(&}>_AnxpCoXJyGYJ3>ZGGs?iN_Td zgLv71!sbqS@rmP;CxKWe9!cIIGQ3PtZH@gcZlmX zau|FM_YIL`dr#6T)K7?{^u+r!aK89^mluO@6{Red+n2Nkn``_|JIJART(J4a=+vX< zf|leq>Fl;iy>*U#Prd@D@lX@`_h%zz6qc_$NF`R;DV9uq(u=cSmU?KZh6wwTtMsbuaxen`KGu9EP0#?Q1qEO=dj)`b1|89* zg9tyQV5yRyrrzP_P`V)(JX9%hCN}1?ww_eM?nI@^4 z)h{B|P5C%X{G74%>dtt~hYp%n$4$4z3NFeNek>EohRAoV1CYn>SZcLN(O5jclEc=n zV0ml2o?@z75aHk-&-$(IeapwVPY7%)hZf%8+I8cqB~GnED8VI4XJDdlL_3x(RV`Gw zCe)@tksNmEh~;v*9922)bAl7hBrWQ${E3q!$Oj7LvU0i_BOw@$pk_%&mLVtxIje-= z#5t0f=EBg30m^VKd88p13{1rlR?Vb;Xq(?Ig_QW|hebAn91We5Pu%ZOJips$E4!%B z6_bqRL%UrV0@S{xw06DXcMpWS-mo=EUr*&MW`|>E+Pv!}P7OkDS8&#t!MY6NO8W5p4;5*+Bbf^9t!WtZ*0=*tJ|0xf_E2g2|qA z^{8W^4B7*|%FR<{ZV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLpZzAh9H)v?x9)wJ5bDJ|k6$i!&v&s2F4d7iU^gVs0vkZHQ9~ zLcJl1dSwMyKNql@0GY%tI`6D{4*&oF#Ysd#R7i>KmOTo?FbsvQrE}y!_sA5wItt!9 z^ZGtu$6Tp6_XZF28Wt~8?;ZdE002ovPDHLkV1ji~vn&7r literal 0 HcmV?d00001 diff --git a/icons/clothing/head/gadpathur_cap.dmi b/icons/clothing/head/gadpathur_cap.dmi new file mode 100644 index 0000000000000000000000000000000000000000..b009bbb657ed1695c67e2a50e8d1d3cdb79683c8 GIT binary patch literal 421 zcmV;W0b2fvP)vN0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLpZzAh9H)v?x9~u^>JpRf&r;C9|j)q@Rm3ttc@!6~s2gp#h=V z5Jk1Jf~%hk*gXKe9V~v_5za0E006N`L_t(YiS3rn4Z<)CMiZ$6kWdE5&jRV!0h-o~ zzyh!fbCV-(rB<%Q1^L}R$uCZFux!jp+=XY)vvsQin*z%V>XJSD9Ufy%>N@c^Z$rUG>e3Poc~q$%Uwnh8Qln(Q45+O5s&~cXfY2D zl+`w|FO+wz`(#MDJl0@h~EGJ00DGTPE!Ct=GbNc004Y?R9JLG zWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3K9+Ju#&qu_U9kC_Xtqu_V5@REdi-C9|j)WB?auT2W$dDu``} zO9w)^A&PQk1y?^8u!{gR!!3WuwPNM~00E3iL_t(YiS3rbj)Nc&hM|{U1+s_UMAF`o z_5m7Q@7wAN>`U}HJo2`SZXz=yE9tGt_D?oF)Za(fO2$-uG8WREYIY2)H zFkvmPrmv-qK4ge~4Orfp-tq;|+zfZkV+gMloYMZmLk7ElL_YzGpSKxi2rni8`U!xZ zF@u3F51bG{GlVZE2tcM(oi{U-JG=&U)#nD5#KAKC z=WgJ#CjBCz@5>iBlC)o>GGKu8iyT1vMS4m$E|T_(bOsT3p7x6*P%{SaQgWLorbK`) z2RxlYUdkN;aKA_aH&_a^U#!K=y+*)6WdZbG!uru|7r1y9UZq}7=`T)Nk$AD zpf+#-Z1(^O?g`ohbV9IYV`W0*0;t@!h9UgFLC~m;RH=E&^2qymm`E>#JoKML+3r)I0*>&8Z=PJbP}h2I(eZbzxokSpn-B~8&b+AA8XAiIF#@eY+!U~xV~8HM}UEZ zAH9Gxkg);!NGT3IAyJBf1OxVGZ~@e?%dJ-Yo{*}7z@hK^Pvkr7KMsA3fxJY4OHsBk z(3Bkpy0$?;(Y6H&p!*F#jRD910+82DvEuE8;%C6VI-~dOdV2xchaUQ_+%?~nyXH%J z0^hr9zW59QT=#fb^Hm@;N`kQ#!w^C