From 9e43ca826119ae376e6c740f42f77171467c18ca Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Sun, 19 Nov 2017 23:16:27 +0800 Subject: [PATCH 1/2] Adds recolorable clothes --- .../icons/polyclothes/item/uniform.dmi | Bin 0 -> 1410 bytes .../icons/polyclothes/mob/uniform.dmi | Bin 0 -> 9530 bytes modular_citadel/polychromic_clothes.dm | 158 ++++++++++++++++++ tgstation.dme | 1 + 4 files changed, 159 insertions(+) create mode 100644 modular_citadel/icons/polyclothes/item/uniform.dmi create mode 100644 modular_citadel/icons/polyclothes/mob/uniform.dmi create mode 100644 modular_citadel/polychromic_clothes.dm diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4406da89fa21b9ed37fb19c43e165851abcc8546 GIT binary patch literal 1410 zcmV-|1%3L7P)005u}0{{R3yb+fl0001oP)t-smeGfe zjg6U^ncv^v`1tq{5fT6Y|9*ac0000eC@4NYK5A-e(9qBZ4+<(41~VH6hV=-0C=3WlsyZ=Fc604=2wJvR{UBW)E4Pr5go;$*l5mvq+C*^|K6I6 zE;+EKuE2K#QAd3KC)j8t@@5=i_FVoUUG9mr(h6euE@W z3(!0*GLEM%0X+--CTWdYf>^0#Msk%3jV45CwhkfcI%pinVn`gw6 zEVf7N1MT2+e}bDk*#H0o#7RU!RCt{2oQrbWFc3v$8AOPjr0?cIY#@QyrT_nZ-Ic+8 zX)R@i>P%-(Em^~5wRdEpkey7G5(GgIP83>0uXVxHb5oS%Y(Afxvh+JZ9d4u^gE593 zs|tuVbLnAvPTo0-D9M7^#^J-{bwrcnvyTk-8XE#bA)wgM-0o z_8{)Eqrnkfjp#8X8Y~Tc%Jh2LDU)V!0R|k!!vBUrC*nP$vr=5lmzRsn<@|!TM1^N` zR@^~c@(<$F_^1TsqD(TF5+9KPD6yL;UJwL95ClOG1mP`HXjfe{hA5$i^z0N`Yom;& zYP=ymH&`0dT7e0Fc_^f3#}x*QHdJXKq-Uov_GrKo2FLaM6oUa`4+ix7Skq&fdUmX> z980F2ovZ7ccke&kTwhIPAVgJZjaM~Md=U5qd|ZBlexmpwda0M6q3Ma@{|ml+y}i9v z(C+T1w&LX;0fTpVpW2KMSh|OY2L%lmQV;||5ClOG-W1lZpkGa4& zd=IhL-N36y8nj%4usJL~y9zrCH$qp09t*o}gDGK&@BzD#$Ka@*9at4-pz00$b(Dnk ze`9i3A)cO{pDV=Evx6mGyhsB9-TrYuJ8*jR7yS-9_Ja6x@$NYJ5Zn_>jQ#759)!jgQQcG<#~iAP9mW2to?*`$k>Y)yOYR<9Y-T z&kt@O^}1ezjmH0mL1)en4dRa@mO=Qk`G{XSDT61SZ%{oBqu0l8+?RFiHvSm~ojLz7 zB<2qrw66SSNrNYSDudQl2%!-Z4Ei(%RWp<}i1@_PN8=g24p#ug@*h*r4puKKL)ZR7 zdTtv0^FY_gM|{+Yc+cppY@eQY`^|p${Iuo8dq!tv+q}HIxW+V?7$1>fvuPUaxCYbW zBQk7Z5gO7);2KX0USxN6tZKFzJ*@G1$Th2L|DoBOIWv40#N;p3zwi9=;!T`}KYY zcV4__^c%zctm$Fe7U-~J8cd9jNPr(u?6?Ng;$t%OE5MyUHC_+|K@c+V1Bk6wrLAXW QlK=n!07*qoM6N<$f^HImmH+?% literal 0 HcmV?d00001 diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3cccdf096420326e792339dbc16f111bad320cef GIT binary patch literal 9530 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.Cm-M$+y5huZwY|zH&oizEM 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 P3You can't do that right now!") + return + if(!in_range(src, user)) + return + if(user.incapacitated() || !istype(user) || !in_range(src, user)) + return + + var/choice = input(user,"polychromic thread options", "Clothing Recolor") in list("Primary Color","Secondary Color","Tertiary Color","*CANCEL*") + switch(choice) + + if("Primary Color") + var/primary_color_input = input(usr,"Choose Primary Color") as color|null + if(primary_color_input) + primary_color = sanitize_hexcolor(primary_color_input, desired_format=6, include_crunch=1) + update_icon() + user.update_inv_w_uniform() + + if("Secondary Color") + var/secondary_color_input = input(usr,"Choose Secondary Color") as color|null + if(secondary_color_input) + secondary_color = sanitize_hexcolor(secondary_color_input, desired_format=6, include_crunch=1) + update_icon() + user.update_inv_w_uniform() + + if("Tertiary Color") + var/tertiary_color_input = input(usr,"Choose Tertiary Color") as color|null + if(tertiary_color_input) + tertiary_color = sanitize_hexcolor(tertiary_color_input, desired_format=6, include_crunch=1) + update_icon() + user.update_inv_w_uniform() + +/obj/item/clothing/under/polychromic/worn_overlays(isinhands, icon_file) + . = ..() + if(!isinhands) + if(hasprimary) + var/mutable_appearance/primary_worn = mutable_appearance('modular_citadel/icons/polyclothes/mob/uniform.dmi', "[item_color]-primary") + primary_worn.color = primary_color + . += primary_worn + if(hassecondary) + var/mutable_appearance/secondary_worn = mutable_appearance('modular_citadel/icons/polyclothes/mob/uniform.dmi', "[item_color]-secondary") + secondary_worn.color = secondary_color + . += secondary_worn + if(hastertiary) + var/mutable_appearance/tertiary_worn = mutable_appearance('modular_citadel/icons/polyclothes/mob/uniform.dmi', "[item_color]-tertiary") + tertiary_worn.color = tertiary_color + . += tertiary_worn + +/obj/item/clothing/under/polychromic/examine(mob/user) + ..() + to_chat(user, "Alt-click to recolor it.") + +/obj/item/clothing/under/polychromic/Initialize() + ..() + update_icon() + +/obj/item/clothing/under/polychromic/shirt + name = "polychromic button-up shirt" + desc = "A fancy button-up shirt made with polychromic threads." + icon_state = "polysuit" + item_color = "polysuit" + item_state = "sl_suit" + hasprimary = TRUE + hassecondary = TRUE + hastertiary = TRUE + primary_color = "#FFFFFF" //RGB in hexcode + secondary_color = "#353535" + tertiary_color = "#353535" + +/obj/item/clothing/under/polychromic/kilt + name = "polychromic kilt" + desc = "It's not a skirt!" + icon_state = "polykilt" + item_color = "polykilt" + item_state = "kilt" + hasprimary = TRUE + hassecondary = TRUE + hastertiary = TRUE + primary_color = "#FFFFFF" //RGB in hexcode + secondary_color = "#F08080" + tertiary_color = "#808080" + +/obj/item/clothing/under/polychromic/skirt + name = "polychromic skirt" + desc = "A fancy skirt made with polychromic threads." + icon_state = "polyskirt" + item_color = "polyskirt" + item_state = "rainbow" + hasprimary = TRUE + hassecondary = TRUE + hastertiary = TRUE + primary_color = "#FFFFFF" //RGB in hexcode + secondary_color = "#F08080" + tertiary_color = "#808080" + +/obj/item/clothing/under/polychromic/shorts + name = "polychromic shorts" + desc = "For ease of movement and style." + icon_state = "polyshorts" + item_color = "polyshorts" + item_state = "rainbow" + hasprimary = TRUE + hassecondary = TRUE + hastertiary = TRUE + primary_color = "#353535" //RGB in hexcode + secondary_color = "#808080" + tertiary_color = "#808080" + +/obj/item/clothing/under/polychromic/jumpsuit + name = "polychromic tri-tone jumpsuit" + desc = "A fancy jumpsuit made with polychromic threads." + icon_state = "polyjump" + item_color = "polyjump" + item_state = "rainbow" + hasprimary = TRUE + hassecondary = TRUE + hastertiary = TRUE + primary_color = "#FFFFFF" //RGB in hexcode + secondary_color = "#808080" + tertiary_color = "#FF3535" \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index b68ee744a2..07cb24d372 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2403,4 +2403,5 @@ #include "interface\skin.dmf" #include "modular_citadel\cit_medkits.dm" #include "modular_citadel\cit_screenshake.dm" +#include "modular_citadel\polychromic_clothes.dm" // END_INCLUDE From f1c54c0b779902ffd4285e145428a3032f181a1b Mon Sep 17 00:00:00 2001 From: Michiyamenotehifunana <31995558+Michiyamenotehifunana@users.noreply.github.com> Date: Tue, 21 Nov 2017 21:27:51 +0800 Subject: [PATCH 2/2] implementation, changed 5 pixels --- .../icons/polyclothes/mob/uniform.dmi | Bin 9530 -> 9550 bytes modular_citadel/polychromic_clothes.dm | 38 +++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi index 3cccdf096420326e792339dbc16f111bad320cef..84c957d7112ade2d36732b7816efcfdaedc600f3 100644 GIT binary patch delta 8858 zcmZ8`2UHVX7wynQ1VK7Tl`g%gC|y8MI?|hfz=udjX;KD6=|zk*Y0{-5Lg+>50i;Op z5|Ac=fDl3mdBgYpZ>_gp)*@?|nVfrP?%Dh7vv0H353L#@BG7m`TXuhMZI}WsiF!Re z`0?(1^u(hS`;=h^ekS7kjud2fZoCpc5vKbjv=0{cLu;|YQFj^`>u!{0v)ip_<*~G*I2>Uf# znr{6hr1(D2S)`q|zutQIh2lJ9yh>5Y#xW@2$H{n4gTv}-Puw$e%SuI4@yCi?Pv`1f z(*2S~EjgzMLPk3s>^(k;jHo%}&mJ`zMN%OBwky*=!yng`Fk_lrH&V2SfMe8Rxf8!J z(m7wG{Uv%AOlMIDVq%nCx(s}-tnB&FqVaUzR9TQSXbYEI5hgvA;xE!YI(iMTTiZ67 z7|tqn=iQ$oe63bq@11RQE0=6L_w52VZR0qZ z4X40+gLC9UX6?{m9P)kuprN55DJ?CHI#1+~f2UPcW8W2-AYewasOMF)e! z(0gLA44$lW`MHp??9I+cM`51&HZ_&WZK?I%A20g3)<79cOG`ToCb}3>_C6xuV&ds{ z+$}$UF()|aR1kd9e%^lv4cHchX~u{M3mX_35&@_XUuL2C*pErj+5GBi38d@k>FI*c zw$Je&3qZxpjJa4ZJ2pTeF$hF8k&AE!sJL2B#*%Y(LTM5Koh~&h$uBP#sdTeB^3fgBC3poFsQ5RW;1M{m)Erx|2@uz@S?{z|17n!MMOm8^EER;8#gkyuU^<|Dwy$1fAW2OrNm&(yn`S!R6iKE*g|;WN3BcRM4CCcmUD zH;mQP$+cwvz zcEwi=gyYfZG!8>4PsvSOQlF&uiCqa7>uoY7`glGs| zG;iX!%;2B5JFM3fu3ZQ2h%E~|fBxLS%q$AZR#D5k%j7hi7r21N@c#9k?Cfl^udWif zKo0P!s!H6Q%z$f$J<8v0`BS6&1DiRVCzRC&9Z6*^%G1q6)~_~R<%Mo6jqI3dfIJ7x zLPSr3f}2nFyJ!}_rSbCeqP(KjdBUqf{LY;ITP;316w*^tthssZj$-FNGU+m8;9YeI{}6y&6312(3TLfJ2_kOAR>%bi%S$!|P} zG*eTHkYBss+p(T%6+A-0&l7^M$88(|G5zK`VK6=%QYTK=m|9C&oah|o-$7ZI6^+oG znFm+wCAX0h8`()%vB7da{%f}HHLZ(OIf8{!ecrKNX~SDnXWnB8=f`tdlA)RqQ8EuPt4?~&nOA-Bk zRP_>88RkQ~j4Y^R_`*(|E7>T2J_xa&K#8qIw|Cmu~PdsP2%Cl>H+uSGwhHJ)` zJkIOp%E`XYY|Bq?l#XtjFnt0_XAI5p43p7w8z#?z&qo@kjChjwb%TNZ-R$MNnLPvs6>36m681V zN>1-;&bOkZNN{l-r@uSKv|L+3L7&^Ycs_@;L1p$#IG^ z7Bd??3HJ|odQTMAoFT)j8~R?B0;JAS+)?UV(_GieIi8xBcw>c%8_0K`fLuw|IO0&U>xJ-DaA+233OYo|G#<3WMX@xT~c_h83T1RQ>+ zuAu?9w2g`odC6rrgPtXSXv`B@yVZ9x@A7rgUNW?y8Mks}k(|XZ7!JgM{pK(wW^>MH zp*O0%0jJF-C;*|)%jI(+`Uis?J*VPfegk< zTz_?vNH3{WvBJ) zU_JyJ@e$G+!bITWPUuY~y!Farb+mOeX6SnMU8hZ882Sz`kPtx?QiC| z?0jYwn~gaAxAGm3^|@`<^^WGJqSS!(`Jd{>^Xn_kEOqid7$klO+v~&y0YILxWxI&u zwJr2S^4i8fd9$)=@@Z90@v6k_^B(;UQlMKypSWwow*KLWEtbw!9Y#bY3kswF>%QLv zf^@5_-7MSPn_8)7dY!C(J{@p^n4r6Oeg5}WeD1EkS#Zkr5uAF2(A+z8> zUGc$MNS{Dz(DKe}-N6Pi+ZMlF&+xH~Jh%DCh5dDPsajEp-4x*$G}pXpm6~#gUQtp` zu)I~YDeOhl$(@=l{=OaqdZRjUAy@)@6GGDYIKA^5w34K4n=Qi(W zB}bn;vN2~Vl5#?C*by{Xt05RURdMY|zffCfn&c&WpL@ca(o>y?=sry=`Q6=J^VR_G zDFQU3=ssk@zzS8jn`;?@9{^@&zwFWXlm;N!;?<@T#)A)C+rp4NsP|%Fh ze_8%w5i<{8GsFt54oZLcdCYZ}2*I20QN)Yl+|oIsqQu2t9ir~|r0#PI0EQ}Z5@CY+ zPf-g^E`z>RLCC3)T&w>$3f~H4>>Ktd)(62Bkv?94lj)?7BN%J63Vw&-wze(?O$CQ2jiE?pld7M+2cQ8`_v7t|2s zaaa#gRPj9tZv_<|r<3vWJjSlG1>U@Sk570r=y!;4)+Wb9zhLgxQ)kL|KJOthGTwS?RP4=(>zO&!4S4G;LENVn4 zOZ0O!bafMO{-=Lk`Zr$om<`?_m9-ghLeUvNEps#9KVEgi5BlWtmJ9?mNB zPbb`cSIod7^2Npv`{ni!U`3D47kl6&<^=VP>SCRbD?m7KlXnjRX_qg7hyNIxn0%`h zH8ufFiujeWA8Ra$o9Yx=U&7TL4_bn;(qUtdULWtyMxQ`cHI)LKLz;^|dn-u<>3wB^q9(4xonCWp$sPpbM)Ym^4Kh@!*a|sCzbsGOx4W3V~ znUx)lkUnH}nrnL>VsM`TDL=V$i8M^gUS%&d?W77C1I}PWsG}3nS${%cCx1wfICiaq z0}*G-j*z%xYxyuC{<)T zOwAcuA*ni#LOC0Yso1%J{o2K~Tc*@UBi>;jWM)f6p}N9nyhNTaPp<;+ZPmQ*+lOiI zXedyO^$yEe#imI8Iq5MVT-7djIQaT1jXY2vMQp^qZP*lp+DY7NtETRp)YX+-l6r1< z^&7fdM=1O%l&R zYN)SahU@sgL?-ew*ppSdXSxYzLFFVQ8-5CukKBqbE*9uUde6WUAe+S;5-9c-OzeH% zesx7jDabn%;Ri9jq}Lu@;Gh#1qHYnXigvYEZyL+s>@Y_dP!scaLWR=6Uv2Hivps1s z{$T^^PhKK+6S>*Z-|3$*-{njyfT%u1A^yXj^kS=2LF|qgNm#$KJnh@4F1zS{bA>B9 zFe!2lm?s0-|1f_QBr?e^W6t0-+Pa(t7%6tCo^J^mD8+u!FlF_z$cPamJH;o)%jL(A~e9Q(XuEH))Z=n9m(_6J7lXoqWl@tqW-aQB9-Y7{Y~ zO*N;;N0*jzOgTN9qN9Cig@_Ol)c+==zS8v6RO+33_2Mz=-xara%$O`Rc=Fwd8-TW` zCii(if8~PbM8v3fU|PHrFAsumzk73u54nqpd&+K591!Y6CF56&nPQzUFA6Q10iWyZ zENRffJ};17zq|-}7R4TGOIMZ3@+6ni=~FbL5(eQ{W@&fYayQ48$!Z{}i;++4L#nn- zE>i4b@MY^U+tJU8(+$rr8*U-HH}7d3QN>yNq3L7Zq?&?WdB}~&m$JXal~Nfi1xURC zYOnsCP`p+*ijF~CrMIJA%MkRrRxCT#--iyc9<-2pn^>KC!zg&snUqnD^>ZufHpwj$ zs4Gi{V60K(@kaV)san|opZ%W>zAJSqoYYI^FKp^0*@`-S8t)^0sNVaOiyOv6#RMB6 zqK8Savx5977byrOUD4iTC?qYeESeGPK}8?iaPds~HdQk1mWij@{!GIrNjnmYtOL%@ z_@tDs?$hZ!$13uG^~Edbl?WPQmh8A0d6}$MRWE;k+2V!Ubf<5nCQoXq-pjGJRGo}} zLEZ3P4#6}f(QwGUxiEsDh_OZ{dk;XL`v$Bckd|Q*HD3`|_F4fvf@(~ySRD@rjR|rk zmrY=M>PKAb3`Iw2C)CDF2Dc-wB4}zo(2Tet^;VR17DhKiW(rFx)H^TGVIiq$wg9m$e1h`@C!Z8NPlY1Sy$BRiNIHUGC*W&Hh_a)Euuro=sI)AVX!B96xIp zpUUdy?Q~2qh7g17*RQ`u-rYo@E=kIvb$OD#WM2m;pdbsvp)b+i&JGaN&zYc8&P1U+ zpr^~r%QINjFDxh^VPs@PA;~D23U_0-o?0+XEH1^yUU~WQ<+CIar*aVX8SnA7jPQ6D z2h+-@k%V6Fb5~cXTenDkAOBJ3kwSU9yNl^TjizS>_?fcOrK;Dq#*XMZ8{49dc;Ni< za*|pU_5F6eK2pWL=BRN~_|eXENqy)QDXAvpT_oM7DjPdbw~o_kEY@jI&XaFE_1> z<)fH^XHQ`{e6>FuDff1t(pWvBia^(jQi6#{NV%A&GHxMg06ZR_+&fs<(a~Y2c^~Sb z!^<|2wdZ~5<^+4;mP4r$@ykF0z2;2Dx@>|k?oZj}pM&q~L1#@At#N6}U3N+F;eJFlxX@UZ69 z(Q}M92r5HM#~Viz&xwU;E?RDz#U>EGOon)LMP5y>KhdZ}`=b_Oe*DnGd_mrIS-+R~ zgMyIuOnO2l^ekWmyoPx2h+l;pA8lo3X0{d~bzvQ(KL?}#uuQouk;pvF&dz?i*zEhg zW&Y>f+!Y|5tc_wHrmuA0)m0=1JP!m4j%btm-a;At=MSkBSZD-!c>^4zM7?r3wjlnf zUp|kGjcsgla^0_6kdES|uWwO3sqbM<=;Yj7EWdWDI>-bLyyt)B?#|)wM{UUPec@bN zoCrbVI)A7AOTM^(zkGq#YjnVZu3v4F7 z9`88E`B0@VS9yRSSg3hv9aZ(Wm(5e1X`W4gmxga#?9XmTVIna-?c35dzwnso@8AC= zLt?!uw%x|W@oFZnAcjlohbd&%yV-B- zjpQmX+k~$5(_%tLA?eA#ifCbc3T3s0i0t%qie>PYIp$sCUONr|O3Ic*Vky$MB^GZ2 zE1lsa{K|$WkivywCe<%Og?}6?e7Sb{O(NfCu$O!s_T==y4xIsLcV6tiq>5S9K!x&a zyWe1{Sip8^iK?#Z+eC?hHQ77#Gs0h>OOzkIAb&@AqK~|pCfY~)wUOQstq+~#BZ2D~ z=^ryQiGbnZ;fDgSJc0WiC(z;M&dv*D*wDjcf@i8%gdJV+O=F0WKJEUDVqaCmg!{S=@*uK@hf zv^TWVKt)ac6yj|fCAfjrS+>0Y(_i1;o`|i{bCURJSx`}EA2m~Ra{}<65<0PI>7$Jw= zi%UKcW|{+mdnm|GW7aPg*5q@qtPE#-cW;(^sSnym*xB3jCl8*3?=C^adF9kJd>Fd1 z;_FwV3abWjF*K111Z2RD3G|q-jMP`cl2%q$2ApFzhyZi|JET7DCXxs!3;S<>a`d## zs*(zOBK;*-9S7)I(YKL)O*xTFt znh&^*ec%pJ1H>ysSO%$lA0B_%wuk~>SjjIUhnD%!66CtD7v-p@Sp)RmAmR>W-(ar(`c-CpMx7x?g`&pZ#rF@x5)30~U2K$xo4LY~8~wfOMR<&mbH zMs^c;xpqV&;w1=)?DtmBO9u-ceixWhPAO3_dy^{CfjPx#CaPFBVPCo-Vqz{Yxc~s^ zHSm%8edBwo8+8G-RMMu!wQo3#vaf0k#1 zej$2)t_(cV%J(4ZPqEFuq188JOwZ4S&A{LJuFgX{hxx^ZZauJD>ZRg5H;}HeInA4I2hPy;%YCE?mb(ANEEGyPLj zLj!YLTN@D8Vzyj{C&Y@ibHTQA5wQiz-*TL zBWYa!sZj09jlOxLzb@fL{1+8lS{WwP)Nw9bk|tJ`pdyg1y8DVzSR7ikN1t4z@V$Zf z9Rj`*s?Bn!MkMt@C=T3h4>7U-=<_u3?yJ8-N+&BMS;`>i^7*WCZ|lelb{5)o9s|l6 zXm(J|en~$B@`g02R+xWvJ9v8v_qf`;(JL?L)bIlrCyULu z_XCBH#o_UXSCczzjI^?a5I0mzt%W)6(U=5StoD)`F$J4+H~V&#_a)Pz*L8hocUP=G zDy{vL4v5cA`L?EMxCK=ME3Sjk4^XH~w@I9#(8VU8ci6=<>@oYCrChfXqfhqmnHJdw zf64kpkoWpE;Pv_@O0(dEM>aGyESGYb)L5f+jH%|A90w)0DD#^zsGQn#P23%1IOQ@P|o36o;K^{;UT(+c|+konJe@}KrF zanrK8KBkaFG(Cihd+)`+&|cR6f?T;J*bl7=DKM0)%msLzop@s&)?^joFN*q)xYM7x z=L}Gj+!fC%)4QmIU4vO}2xUX7y&u}%)sh$o?T7%K(6xO8+QxF@VTj$5e|OUhjtu~S z$o$#qkJdV-smPiwl6_w)iV#YcEFrs*C6QgW3|C3nrLmTbecx&9ON(8}zRvJ9 zWQ#Gx%wWv_`u(5(f1dF?cgB6sd*1t=^EsdMdFPj2i(ZWw705Q#uC#;u^OFH3w@vpc z{rQG!!h_FdR#kp`mN8KpSL@zTr!(JSKW3dR3igs^{ONQE7=0+aKH;A$F5%@~{Xn!| zT8WUW5KHTY(3un#`l{*m#&1l)0q)45cl8b0W{)l{;>GWWA)()Y*@ zCbxf85rP7ThrBt4vu-Jh9@KO4(_KoAsS*#QijIzrVnE0V34@z00t7s@+ZA;9*yM zI@A^48a26FbJCk>O-U6?!WoLO1QLS zF1I?59lkKG8tnbC)9hc;g1--FgoWKHLf_(;t37bTuk9_wIn$-oR<&6P-@kt!0GuqU z^PU`dc=EhzJON3&tX^3^2OAm3HenWR9(ffMy;KY8HfR~OZevBdgPpsn)r;Sm)Uz7k zQ&o1kRc|tviXVwzzj4DY3D>j9!wwl+npw^EPZtJR7{;fju=MIgsz1X>CbX_k?`(1R z`dBf34@u#@cJ0~&5yZCtX2+4889LZ$O&VdaK>3w^CC<~nBkWQ6(D>m(Sa7IN|0*&~ zRpiu-w0b7vDmb*z*1#=lAU+}CiHC>BDA}$x@M@~wld+vr_ zB$L`@YxqPwm*RZtf-kQS3xj1^6bg0I1Ko1tuMd|ex`o}-)3Zj3F-Ds@5eop>VcWNc zGUTs~TUJmQL?*$)!A*e&5~<%#$VccSb93{OvNCFb(9yz}^8B9k59nKYIl1@yH)v>R zylw^D3fkrca*B)T$BK<~RIl`+!Jvf%b4d&LgmUXIe!|-wM_xa$z6MA&zB_mBxVbR$ zY=W<2_F?^XA{wMko)?9)oggUI`3*z-{{8!OYY?vBf)unY9H#y9l`9u-bntW00OM+< zN3*lvE~X}P>q|#kqvUE%L={U<9=@-q69WVGwoH?&2lt-)Vfi$6ODl zJrqBp!%r2_dSr55;XsE!>`i+p;Tvk}w^Pl@Smt9&s?2k0IIf-Wdv-RKfC-iT{fXlc zB()9yR9g6ZWE~J?;Mf-Ll>5VhT&!4m@{swNK!Zf8-hWIWF*5BU&O^qwiP=q6w)5&4 z=m}-q3B8%fubv1VCBfViz+ zsbzfS@Ce7qHCF9mG65F$g$i5;JgjQ9#wR9nb91To_xCO9oEa|itHmcLUpmjkg#8x9 zNSujFa<`!htO&CPG_I0$q-hO8mOz&+hQdv$4 z&=ARptL~)*Jm#A&0lz0E3d4j>x~H5p6X?4V)}{GPG9-MDnBelXr2kAy**^3av@%vC zKA3WQ_N*_6clP)1_XpDowONoM=eigL5)~HgHxyChvXN#&@UNS>&4G6d3wfyY79Gs zPD)tLiniIUZ3nevDg9)y4;LV~BXG3mPh)=h{Tc=5*PHkrv z(({OF2FJfl!}2vh2RsyM9ceDL+?o-g>Uwy#i^!H5&f4^jU7hFFLzfJ^f2xy&{0y~_ z#FNsF5nXAX8S1h-b19SD1N-2U?%|%#Hx&zrnUG^B4Me}t5{K0qqr9IJy$?sM1Pj_C|r(;CAB2d_28lV9bp!Rg&*`lb;qH^ z6?@bGf$}Y07GbQfAJ@uLhGPC6iwpR-HqwB$cW4VJyOQel(S~R34z#L)AN8Sx#k8_v z-+zt6|9x6GyyDeN#>u_-Gdw-EZwlYd>;e8pi zzHGEDij|uCzqolxXCH3g_Z{1phws@ed~dI$@KK^zUttj6 z9ij)cZLscC1}{#^rR8SMjZPd=_Z-o>EZ7vy)f^qS;oEUYsL-0m408yWWI_+N#*-(_ zCD&_PYN+aSjN*4!-}UdHNf7C);!#6)qm-o65~5KB_R`=v9Cy@<#W(oTCGd+;4a799 z(9Uzhk{E#LCf{p7PI)<_;x>mheW^YCj>vd0FrR_hy=2Z3a{V&!bn4d+s07M`C&vvd z8RbghRkS54;R9UkeqHq*$z?0&xYc)LY77*B-*TaW1^q_5BH-8m{8#5!Gmc9h^^ako z_^f&QlRJpCxR^6XJsy%a^k-$xf15hp=J+*4ZFnzpxbGhQhfUJS4mN~7P*#x?t}bmB z=iPk013aGR2V*DZU1H+J7lDC?n2qg7$v}RGY5WZR12d8Ex|Lqy9G5@(iClPN%h6&i zn*MSi90h1W41)6Mj{VWU#ow$r>8E5E5wmcWN`RnbE67 z=IzF&ljX?1x|a9*J|ak3X0#>SE_xT)ZT3(GQ)PFQ#;PW`VJn18DmJ$CDHA6SCMF>x4{#y;)o`&)K+r=Ys5wlWwC90Qk{kME%_rhI%jz zBT*xD5LD-tz@ijjCE#n(%ZF8PsN6V3wOyQsHf_wY-vy$Brx?Vs7LVLCvVf;@4P^-=a%!UGZBosN{{yl23!swRNtpKMv-wq^pxwFKoR(E<{my=){!k_In{BBn zIJ_Ult?w0_?{6wUv-_Umt`1ilzFt>|1zH<9hhf+q$) zFRrg=g*b`#FAC%ll%UxDMX4WVf5gqPt4E}7@i?6{Ekhd1b1x>;lf6t0p}_@Tf~5w( zK?z%QhyvaRqABlef~sOeg7C+IVV}|_daSu^=BM~n5$A+Y*5=0xh!R15Y0TKr(#kex zh0OYU+;pG!jS6fQBL#NFgyiH^QW}Nxo(BeJMjW&70~J>FXCTxptfaB;Nk=vo7Iq_; zFS3ELRut_gj9CC>PNy+8Xn}Oio;X#E?{}qM2;Zi6lRWCcZLyRiF+VOuMC;i@mci!h zZ^t;*Blq)Rj{Ou%rS*_aozC-x4%+sf3FTuV-w!a}&uuHi9Cx4^)E8K;(h+2pf_LE> z&mg7LrqFHEG)N7iw`x5@N8wp%E>BiL{iG;!HNkY-RjENu^t@GuoeHb#+u^0rclq0X zpUFuZEy(r9t1Y-j&;I;flOO3WB?VjRKGZ2X+GstU`8%VT5CR@p@nrCX-;G&*1^}ny zi;a*y$E3Znv`t%rNac}QV+*!8%jD`&$n)Ww47V;S#uDq!r#6s{O6f}G!PsEci^cLE zVOJFpszgDi!y%-)x@YtDq>gw4&>4S?xA!hQqyc}&r6hU_+>q{y2I=~3)emQq@ZYKl zx%v4t!0(ZfSHFH4=37T}V-ECk&p$a=PIq~|nmKb_)FwQ>^Rv8CW%p|PjRHE$2G44? z0cH`ycthmQKV7B z?an*z` zy@kapX6lZ7TmLcvN8ob}mHA852;PTk(u(kelEjC8=UFVOXTr_@y9h#;_>-OIG5mk1 zfPt7T#9f;~Tqi|s*}r9}eC0h@-f>c6xxfD|%C-trtZF!bu7dc-_|*d6gqJHr#2YU9W!V7b+_+_g(Cw3Q`cW z;;=%=ktR9`tv^?9Kmk&d69> z5@g3?E)apVy%I=4EF298Ew=AV7GHGFOD3q?zAfk$Cc+Zapr+obu)YXdP~3MVrw(1I z3o7ci?EBS9awwdS;e3?z;iCbRW?rzOu!)`Ddn!~-$xQ!!cX`GR-}=y zN>X`|5=^WDD?&$M%fXVJuS&Xz!BTvjLSljNFXv~LHajkBiKpa_)-b*Idvx?NA|_H` zqkqkvVlmz7(4B~r)bQToL`KXv6IOin6|BBV2%-gI_osUjJTRbgB!Up=(aHHzaZ9<_~=Q}wkx|S(zV0FV}M40f0@TS2w~)4dRrL3?d(AW(Edf z+w*>YWba3b`v0cqhYOqp?@x&Lo|~sm>BoUkIs&mu3~{&b#!JOX@gy6zGI=LW{NF?z zA9o=9w{@Sgc!J+3uZ7ZXS;A<^n!h)lcF= zADZ^N2@Z(gzbmbAW2EnhkB=|8f%>#f+S=QbWHn*Cm_5_GTpYdBEAaR7E7ly(Ij=Do znhwg}_zI?+`g+AmRgB-IODormsZ;3rK0@Vs840h-&%fsB=WfRm^ConBs#>ZpUR%4F z){E*Tlm8rQYdie@1U2nEcvaSF@V<7+!^N19cHN#i9A~$3jtBmD;PTVI9=J+Hlm*lW z`0fmKWV9s+ikK8KTxV{9g4Y1u*Ukes(|Xb-ub8Uy?o{`hxwP4iTpL@UtAWTZK_#&l ztJyw*X4oQ-%T{7GqMxBMOis?4kgz}2LiF|%V&Q>!)|fYG;A5X!?5gRR&$arc=gn>f z%fA8qF8mw6!`v{9kCC{*>TqQ_Q`C>SNNJ?67awdpXeHmBSe6P1WQosiWPX zxo&=%dY*IJ_Y1w=D2SJ8MSR21Ne05bx$3&7nvbl`x#SFdQ|qE8ev!+YUo%L8Nx0ilp*sZ9$ECIepgqrQOfrphf}#8RrJ9tKPB*8G)%x{WZblhVpf}`kGHq%seE`C zB@cCz=Re%$YONxU#$Yb_E`$-9lahFEy)JV3QVUs(R=nYT5A?fh%q0m`E)HqyWf}Ds zYs_9@IrcVO&bxz;DYuKynj^f64wL+1M^6VlDxs7tZ5VT;|LEL(nmUd0{1i&^hsxU= z>iyV@0g?i5@7E8)`aZ;+CzqbG?Do+2h(5F6r@^MXE}%SlvV)gmjIsI(q)MxL5l>Qb z$2ICfOf2YpZKvuOQ^&h;N9cvfSKIw+o2tX4(aevHj&U5)EZr3pKf`bhuD{gf{W_0C zDJG(f)DgM4SEa1#Xe}@m=L&VVIn{YGX`wz=m^BfrY}x3=2i3sHdvP3Bp+zO~-pae? z{PCJjqQ=8;sDAo)@^~wZ3)_%C6;1EMw)NDgz{L3YE??e%2M5%bkwlT?2TeS8Rj&l4 zQ+36#ippKT{svMApT{8ep{EM1uCMQb7+!IGV?)#2JoPAeB=4SEt7D608eKqRV_Dfb zJ3G5stX}iRf{=TsP3=af?a@g=-5QMn6nck;FXQ9mH9oVcBtI~CX$ylTL58uLM{Ad!!elThEz{%Pl8(|($Tnce=!6cfXt@yRCZ6iu?u42}!+!JCR2TOZc1b|b*TjNFYFEQX?iQIQma zrO9X*EL6)5T(vZq(o+sQd@+Bh0frfztVf%i{bB(5GsP`wLDsoyL*BgpZ)4(vw`Zyr zm$^$aV7@WZXh3*4GBL5@MT8X5^z@&;DZNW>r zEBa7pAesGA-Q8W%=jX>8$wE|fsIl9f`Cc(~C!!galqZsLPvq>=T)u+7ywj))gLQ&- zBq|3VAGy)sne!Jfa%_pMEiMWevxeDDQfOH>)eT&HnYB02BeH*nG9%x-4bgA9HtCqCT*gEVv z+rZ$z-EQ*y7~L9_-`YAC_E*`^I>azf1xsOh81=Fzi66%WYLdjtY0nn$`);nU$H3+O zKw1Hh=@wHm-}l?nkfW1mwDe7nX@R!ZJ6l^@K*X)zp8)j}qEka-BR11Dn@Y}}AA%@| zO>J*`)$Hrsj%p{Tqwg|19E8$)|TdGE@;cVbl`%?8b(G&*80XuxOEH2m}Scg zH)jx^E@KyaaB!gOy2^a->d;mvw3Ej*C{HLhxgGr)70ZM!C-tJ8ML*5?Ie3gamrD*T zi%Q$Iu%XfDdn(j=PtS!O$+p@#bcUnEdLu|%8&LS(f9Y(zy{%W>wyWn{+m0VU(GWyK zqT=9&7^D?u40v&7M2kroL})upiD)2tsdx~wynS zZ}h`rgX!LzELwvPG51A^CMO>Q8qc3gLJdKQ?r+&}=<>{&GxJRwy8@7eW4YwK+aEN_ z+3Q;aO=BBUuLmxN2dwuJKJ*X!@>bY18tO!AOjg>ghAWvEjc`X9^t(apKgzY~J49_SLwptthNAloF-U#LO1~0jWQ>|5P%K_qMdO#M+(T zg1GRh1HJBXM%o>%y0x{LbsT3gB&oPqZG+gaU+-R5Qff^KxI(6hIK>H%=^85f;lFWI8c<4Kf|6iW$#eG2 zEdr+Gi`L7viE>BiOl{k#*LQSa42@2plXNxrC|1stMCO;Z7)9-6UswvOAe%KoW`nwl zA)-Le&d$#9W}kkYTJH!YkK^~Z7u;f)fZ4e@D!|_d%%4<%ALDzUd3*ON4y)1tkbVNa zzxndYkxU9r>4ig&mR=-K{re!F#HaEHBl{v<*@xQ0%j>?85ffD9s2z?Ots0(P`uOP+ z+NGtm-$*38P(OVs)xthT=w!4|e*}X`yufp_$ptUsoTn#@NVqNY+xtPRjC)=xVIs|e z`4vd72{GuPMvLw3n@UQY!c-;wvhMonGWUXlf-uF=kRsaLy3WU2`APKxQ^qvzKTCEB?bk3Nk{Iw~;NjuJA9sB9rRo*~PyR)A#&ud2>UTZH5G z2}yjBO}i5Wr!hm#558FdKywW0YTq^c$$GoE8{zW4wk}opZ^nj)r8}?pEo&Q_WCIZ` z=}6e|(8b@H#f6e@lpeF~C5s^X8wR}^QK+Q>iv=*Lln33_6@jV? z#vYAuEmW(PK`kicGHXuDr2+QZFJEqq!eBSDTjbx|k$vS6)_*~2iY;Q7opU z#D3W{uV{icLFiRc_dlN1{c6flkRw#=o5%-qzH^>nBk90A%5AnZWQmB!2Cse&@;NyU zfo~R5nD^9%eI2w@k~E~dPENw5?AxXv%8eQRWbHhhsGf&WO5QoZXU;v4Gy*|zjcl*2 z5#Bm|8-!2P`v6U@RHaD)Js_48)Vc~a(=uP7!LXCC zy1=eO$YO&A%0fvD%Tf(t**zJ#BN`Qy{i~)Of86T0^4dEtbYq*)KEVe<8;!ug$ZC&e zh^T}7rQN*&oGMa*C0YF!qXEOcZr$XPj3!0{gaaEJ!k+icDME0N!39D|iur+IB>=s2 M?-^=WX*#_AKYKdY{Qv*} diff --git a/modular_citadel/polychromic_clothes.dm b/modular_citadel/polychromic_clothes.dm index 826df3dd48..b14a083f3e 100644 --- a/modular_citadel/polychromic_clothes.dm +++ b/modular_citadel/polychromic_clothes.dm @@ -155,4 +155,40 @@ hastertiary = TRUE primary_color = "#FFFFFF" //RGB in hexcode secondary_color = "#808080" - tertiary_color = "#FF3535" \ No newline at end of file + tertiary_color = "#FF3535" + +//replaces the jumpsuit contents of the mixed wardrobe + +/obj/structure/closet/wardrobe/mixed/PopulateContents() + if(prob(40)) + new /obj/item/clothing/suit/jacket(src) + if(prob(40)) + new /obj/item/clothing/suit/jacket(src) + new /obj/item/clothing/under/polychromic/jumpsuit(src) + new /obj/item/clothing/under/polychromic/jumpsuit(src) + new /obj/item/clothing/under/polychromic/jumpsuit(src) + new /obj/item/clothing/under/polychromic/shirt(src) + new /obj/item/clothing/under/polychromic/shirt(src) + new /obj/item/clothing/under/polychromic/shirt(src) + new /obj/item/clothing/under/polychromic/kilt(src) + new /obj/item/clothing/under/polychromic/kilt(src) + new /obj/item/clothing/under/polychromic/kilt(src) + new /obj/item/clothing/under/polychromic/skirt(src) + new /obj/item/clothing/under/polychromic/skirt(src) + new /obj/item/clothing/under/polychromic/skirt(src) + new /obj/item/clothing/under/polychromic/shorts(src) + new /obj/item/clothing/under/polychromic/shorts(src) + new /obj/item/clothing/under/polychromic/shorts(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/blue(src) + new /obj/item/clothing/mask/bandana/blue(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/shoes/sneakers/black(src) + new /obj/item/clothing/shoes/sneakers/brown(src) + new /obj/item/clothing/shoes/sneakers/white(src) + if(prob(30)) + new /obj/item/clothing/suit/hooded/wintercoat(src) + new /obj/item/clothing/shoes/winterboots(src) + return \ No newline at end of file