From 7d0bed5e4f91fe1108c4eeb497417536f7d4a9d0 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Wed, 5 Feb 2020 21:50:32 +0000 Subject: [PATCH] add new clothes --- .../closets/secure/closets_yw.dm | 3 ++- .../loadout/loadout_head_yw.dm | 4 ++++ .../loadout/loadout_suit_yw.dm | 4 ++++ code/modules/clothing/head/jobs_yw.dm | 8 ++++++++ .../under/accessories/accessory_yw.dm | 7 +++++++ icons/mob/head_yw.dmi | Bin 2778 -> 3197 bytes icons/mob/ties_yw.dmi | Bin 0 -> 687 bytes icons/obj/clothing/hats_yw.dmi | Bin 3807 -> 3922 bytes icons/obj/clothing/ties_yw.dmi | Bin 0 -> 431 bytes vorestation.dme | 6 +++++- 10 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 code/modules/client/preference_setup/loadout/loadout_head_yw.dm create mode 100644 code/modules/client/preference_setup/loadout/loadout_suit_yw.dm create mode 100644 code/modules/clothing/head/jobs_yw.dm create mode 100644 code/modules/clothing/under/accessories/accessory_yw.dm create mode 100644 icons/mob/ties_yw.dmi create mode 100644 icons/obj/clothing/ties_yw.dmi diff --git a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm index b9baafaa6b..6aafe31f4a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/closets_yw.dm @@ -21,12 +21,13 @@ /obj/item/weapon/melee/baton/loaded, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/sunglasses/medhud, - /obj/item/clothing/head/beret/centcom/officer, + /obj/item/clothing/head/beret/blueshield, /obj/item/clothing/head/helmet/dermal, /obj/item/clothing/under/yw/blueshield, /obj/item/clothing/under/yw/blueshield2, /obj/item/clothing/suit/armor/yw/blueshield, /obj/item/clothing/suit/armor/yw/blueshieldcoat, + /obj/item/clothing/accessory/poncho/roles/cloak/blueshield, /obj/item/clothing/shoes/laceup, /obj/item/clothing/accessory/holster/leg, /obj/item/clothing/shoes/boots/jackboots, diff --git a/code/modules/client/preference_setup/loadout/loadout_head_yw.dm b/code/modules/client/preference_setup/loadout/loadout_head_yw.dm new file mode 100644 index 0000000000..e0178fa705 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_head_yw.dm @@ -0,0 +1,4 @@ +/datum/gear/head/beret/blueshield + display_name = "beret, blueshield" + path = /obj/item/clothing/head/beret/blueshield + allowed_roles = list("Blueshield Guard") \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm new file mode 100644 index 0000000000..bd62bf72b0 --- /dev/null +++ b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm @@ -0,0 +1,4 @@ +/datum/gear/suit/roles/poncho/cloak/blueshield + display_name = "cloak, blueshield" + path = /obj/item/clothing/accessory/poncho/roles/cloak/blueshield + allowed_roles = list("Blueshield Guard") \ No newline at end of file diff --git a/code/modules/clothing/head/jobs_yw.dm b/code/modules/clothing/head/jobs_yw.dm new file mode 100644 index 0000000000..57712f8798 --- /dev/null +++ b/code/modules/clothing/head/jobs_yw.dm @@ -0,0 +1,8 @@ +/obj/item/clothing/head/beret/blueshield + name = "bodyguard's beret" + desc = "A dark blue beret adorned with a silver patch. The mark of a professional bodyguard." + item_state_slots = list(slot_r_hand_str = "beret_white", slot_l_hand_str = "beret_white") + icon = 'icons/obj/clothing/hats_yw.dmi' + icon_state = "beret_blueshield" + icon_override = 'icons/mob/head_yw.dmi' + item_state = "beret_blueshield" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/accessory_yw.dm b/code/modules/clothing/under/accessories/accessory_yw.dm new file mode 100644 index 0000000000..6dd9cd7e50 --- /dev/null +++ b/code/modules/clothing/under/accessories/accessory_yw.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/accessory/poncho/roles/cloak/blueshield + name = "bodyguard's cloak" + desc = "A dark blue cloak with silver trim around the neck. The mark of a professional bodyguard, and ideal for concealing holsters or other items." + icon = 'icons/obj/clothing/ties_yw.dmi' + icon_state = "cloak_blueshield" + icon_override = 'icons/mob/ties_yw.dmi' + item_state = "cloak_blueshield" \ No newline at end of file diff --git a/icons/mob/head_yw.dmi b/icons/mob/head_yw.dmi index 76d6e80edd3f04f5d434f562df6db698a711f5ee..124168cd68ffe033953059cddaa4b6ca7b8db295 100644 GIT binary patch literal 3197 zcmb_fdo)z-8s9D<)aZ+�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 CDLX;{ literal 2778 zcmb_eXIPWT7XBaziUllTBOpQLf(sT{Q2~KZBoqmLwjX!z{d<4xy+3B&nR(`%GtZp&yfXw(50~|t zx|#q0tUu<8ItgJb)QVTDL%sj5;2;Qysos7GsGs74gwL`G~~tF(k4RIje3Xk+xcYU*vxir=vB|U*zVeGafR}a=Cyj6 z!`>K0*H#X>_~3Dkrl;q(vyV+)002$(V<-pjY|u{7)NquW{Epy zm~X28ZH@LSf{NjQGew48+gvCaY+PsbY)Ah^4e<;WF~4u$)#Z%19}g=knWJ?`C95yk zji?0>{JPys-(TxsnI~+!!~Hodr{s(N72AXT5~Z>(pwZmM=K6&?LSxkL-u6lmC;eH< z*Ndk8ArX^(@!5gBYWUZmH0_&38#E)#f>_wKT;4;Vcxc1(mkCIJZgE6lwj^>G@(uuw zBO7lpEDj&K%8&UdibrT&?HO&hmUd|Y^BBUr-Vou%V74wWm!>2BM@`c;w5mlA%8P{rkFmFKuJm9Dt0t#u}|gd z?9g)!Xs9posf1Q;R{?3cIlRr>>=Mq$2+MT4oLLEPx=`u2TfNO(`$mVy0VR1~fr&gH zD_hL2hf_o&@k{6%7pVqEYr~AazVEh+U(@;z;E3hL^H2QdWaFVL$I|m;>kSlJ^*MF8 zJ&jYOS+l`JvBpeRA4k@ri5H&mvM2F$``CgcxfoF;uu)3LwfEiCbI3a_;ITL7gN<)F zB&IYo%VJQbMb71(t#jjr@^%<-oR2nSGm2}I^-GVclqY-|5qR1u8MR+=2?^icG!;m+ zit1~Q8krb(v+}WnO~^u0Lw9K1*GyqzDNf^DtU!fR~GZTVh4bL~56myq0hDuuwkw9rhfFOJ3$v|Kk8>zRch3nn+f-#^ThHNw^V} z87@Q1KN_T6XEkr-l|jk-v`Yt~iA4rhw^^|Eo;{dRflY7B`B@QEQ!vLs-o(nvW2W9% ziCkhp<)hhwQ6f@*p16PlzmlY|U&3UjYJ^VUm#}rfe}Pu~4E4VA(4M=4765GWsWips zceWWErfts7pm_{u(AHh1Bk=g51Tb1#Bynp8)Z8mi)t=aGAl)yu$1LV5lRV#hS@Q&m zFXjcS@X(3d%L%P;!?V58^dfJ_(^i-{kXLD)^2ti5g;8CPXOX{Y4Uaf>5!PT;zw9Tk zge?WS5YrV;(i#n7IwwllZ#bFF25ew0pR_2 z##Km?>Q_h-d=KITqH|@o?j)#)YRT=2L9}oWO8MKPaarYj*azK>?zzaqi;5u3-pqN1 z%U|V+^g!8cTJsVK&X|8&Vo9l+*1wgR(oQr?zb*mex&6bO{>%bQ17im=9q(sL z{_>;=QtPV7=p-Ra@70DO_-9C%QvyM(r_XeSp8zA7u}<499K_l6DetcZq8%dZrq@+#MKo&9LmH%yO%w-)iZj?vGAO5i0Qx_gQw5K(9$sHdBxWEU`4ki1eVnszAd#r+H$`b&2TPN)fibC-OSX zd+3~%SeXMv(xcw9ErF<1n>P8z$qYr1MsXt&45P}$rg`iO6jFsSHSCEW%2L;9YJAt; zGn8xX%>zdu#(fHBGli-5-O5gwZh5uLS2^NEQL_Qn?a zyD`jhgnQ_>UjFRj3myXr>47(~7b}~L!DX2&TPVkocofTbyQ}5DDgSpt8E`wSIEb2h zV8(0p7T>>eXG>M{e>2?;Dkf9Xtqoo~PPB^@3(bpInW%<-7E~-pE8DQ?Dn+i?7^y$6$Kq1V4IbpbhRY=4^B;W#m;>w69&ZmHm@eG^(2Q+rRt6y;w*MR?eZJI9MTulpb62@ocsC`aP%c)?6U}e- z2HM#`be(Yl?dh7aorT|we1%^$`h^7^4tA0>Vh<6dTF0vx&YJw)i~P&(r4q&%O*>)P TG4KxhtOCcJJW%ALXRrJTYsYA7 diff --git a/icons/mob/ties_yw.dmi b/icons/mob/ties_yw.dmi new file mode 100644 index 0000000000000000000000000000000000000000..1609af6fb22534fe2f0b300dd19c35bb84512f48 GIT binary patch literal 687 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 diff --git a/icons/obj/clothing/ties_yw.dmi b/icons/obj/clothing/ties_yw.dmi new file mode 100644 index 0000000000000000000000000000000000000000..49ebe2fd36cd385de97a043937eb541ca64e6ba4 GIT binary patch literal 431 zcmV;g0Z{&lP)=A|H`fF*NH*9c%HE@F1GyI?mH@F9WL+A!dFC2sLxfIcN( zfCBqsfTL;wpb0es--f|}2n{fb9>Eg=%-&}pi42H}SlJ}=h%Eud09@iDa>D)@hlu~n ZdIOR92PWHB-)R5<002ovPDHLkV1m9)qC5Zq literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index 50831210fc..3e7fe345c9 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1688,12 +1688,14 @@ #include "code\modules\client\preference_setup\loadout\loadout_gloves_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_head.dm" #include "code\modules\client\preference_setup\loadout\loadout_head_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_head_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "code\modules\client\preference_setup\loadout\loadout_shoes_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_smoking.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit.dm" #include "code\modules\client\preference_setup\loadout\loadout_suit_vr.dm" +#include "code\modules\client\preference_setup\loadout\loadout_suit_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform_vr.dm" #include "code\modules\client\preference_setup\loadout\loadout_uniform_yw.dm" @@ -1739,6 +1741,7 @@ #include "code\modules\clothing\head\hood.dm" #include "code\modules\clothing\head\hood_yw.dm" #include "code\modules\clothing\head\jobs.dm" +#include "code\modules\clothing\head\jobs_yw.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\misc_vr.dm" @@ -1836,6 +1839,7 @@ #include "code\modules\clothing\under\syndicate.dm" #include "code\modules\clothing\under\accessories\accessory.dm" #include "code\modules\clothing\under\accessories\accessory_vr.dm" +#include "code\modules\clothing\under\accessories\accessory_yw.dm" #include "code\modules\clothing\under\accessories\armband.dm" #include "code\modules\clothing\under\accessories\armor.dm" #include "code\modules\clothing\under\accessories\badges.dm" @@ -1983,8 +1987,8 @@ #include "code\modules\food\food\sandwich.dm" #include "code\modules\food\food\snacks.dm" #include "code\modules\food\food\snacks_vr.dm" -#include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\thecake.dm" +#include "code\modules\food\food\z_custom_food_vr.dm" #include "code\modules\food\food\drinks\bottle.dm" #include "code\modules\food\food\drinks\cup.dm" #include "code\modules\food\food\drinks\drinkingglass.dm"