From 373ac16044a09d5268c1abf5c339f3d02e76c017 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Wed, 31 Aug 2022 08:09:54 -0500 Subject: [PATCH] Adds the hazard jumpsuit, resprites workboots and replaces the hi-vis vest (#10864) * Hazard Jumpsuits * fixes the thing not compiling, ports the pre-engi resprite /tg/ hazard vest * Properly adds the jumpsuit to engidrobe, workboots resprite --- .../VendingMachines/Inventories/engidrobe.yml | 1 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../hazard.rsi/equipped-OUTERCLOTHING.png | Bin 891 -> 480 bytes .../OuterClothing/Vests/hazard.rsi/icon.png | Bin 364 -> 332 bytes .../OuterClothing/Vests/hazard.rsi/meta.json | 2 +- .../Boots/workboots.rsi/equipped-FEET.png | Bin 634 -> 535 bytes .../Shoes/Boots/workboots.rsi/icon.png | Bin 397 -> 273 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 867 bytes .../Jumpsuit/engineering_hazard.rsi/icon.png | Bin 0 -> 378 bytes .../engineering_hazard.rsi/inhand-left.png | Bin 0 -> 509 bytes .../engineering_hazard.rsi/inhand-right.png | Bin 0 -> 532 bytes .../Jumpsuit/engineering_hazard.rsi/meta.json | 26 ++++++++++++++++++ 12 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml index 44e2fbe4b0..d8cf14b343 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml @@ -6,6 +6,7 @@ ClothingBackpackEngineering: 3 ClothingUniformJumpsuitEngineering: 3 ClothingUniformJumpskirtEngineering: 3 + ClothingUniformJumpsuitEngineeringHazard: 3 ClothingShoesColorBlack: 3 ClothingOuterVestHazard: 3 ClothingShoesBootsWork: 3 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 5e1d7d4384..696976dfc3 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -197,6 +197,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/engineering.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitEngineeringHazard + name: hazard jumpsuit + description: Woven in a grungy, warm orange. Lets others around you know that you really mean business when it comes to work. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoP diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png index b30ea919fc4328f150c8f980a93d7ac9c77037d1..17e322a6956675baa4699d41cd411f2926325562 100644 GIT binary patch delta 465 zcmV;?0WSXg2H*pb8Gi!+005o0f$RVP00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z001FSOjJdkEd%#$I`m5t#ySSf$|e8*ng9PYy}KXs@s#xPC;$Ke-q0Jx0000BbW%=J z|NsC0|NsC0|Nj6=PXY1(000SaNLh0L01m?d01m?e$8V@)0Dk}hF-b&0R9HvtmfMnq zAPfZqa{vDiUQUwQ3JkDQGy6zCATih?S_W!gas^ia{#8H{=;4)R-UQ?vB0apa&JTUh z1GrtW%#VVH8a)SrCqkn!V}lS=Xd%U*@k~f5#+dpbgB9dbbIYk@jc0PLrIgwS8H|7) z$B%$^Mb8LBet!_?8f*n#*a`k##77wNHjp)_AFl!KfEjF_;EfsdkF*Q6Uoz)`M#6sd zn_R&afGfBHa0QbCaoWouFGY(~ zPFKynEglAp6NTHmwp>^IdpWyk+gGee!lnnytnJ;D+%+N(RY}3 zOk^wIe&8l`K(|3UlVLkU-V#Qj;7;G44`b}IB%e>eaZXNqZ+50_(#nGjMzeeOZGG+Z z<^5aZ7ki{VtQ9uj47ifOu+-_$ruq7!LeBM{7u9E}z1T5r7H8Ef|67dznLtWpv}Saeodaw^y*2) z{KxEXgI7#`d?jd}f!{fg=l|JW3T51jbu2XG4DDUar10gZV3=^^zZ^TFb9|@&*R^s%J+NeDwb#BMS4qv3Ea28y$>d3C->e$o3;m;#{@vy(vk-qgk6Qp<^l$Nm0+IHnE zcMsDqhT#9 z)zvM%Vokc?s@Vytw%v~&v6ZQ9+4tP;tLB3$_MG&7(dCbhvhVha>W^@L5hJwt!Q;>B qbMG;KVwf_g;S4*L#EMA4v*%Y>ghfs$=3fcSR1BW3elF{r5}E*QkC>GJ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png index 37a4b2f1b6f08fbe9fa0eb01125c8b9d93058939..57fe7a1def94229c0dae6652e92aed62f9eb91bc 100644 GIT binary patch delta 316 zcmaFEbcShyWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ0) zTwUhxxmI7ig*r7^j#;toH03;VO7;K$ng9PAFJ2(Ccenhfk5j&U(&+CI2kMx;@?{f{ z;x7sE3;vG+7_Quzu@ET5S>RD0S{WKuj#%180?n&EAw9_+kz>~FBj{J7ZmH?2D*&F)78&qol`;+02FJ6 A*8l(j delta 348 zcmV-i0i*uR0_*~i8Gi-<0047(dh`GQ0W(QNK~#90?bb0%!$1_k@qfh7CA34q2BEYE zSxOx;xH)uj=tofs1tEj<0|bPEQ1AnE6bHx54uWGh>2xhEp)E*AaS_2dh{Zx3P7;f9 zZ@hQh`|)@@&WJB(Y%_MYT3rJ)Km#;D70~UKla_BMn{qARPJg<+^2S_h0IxkUgk=)+ zowY(i-${gJ;p9=ZroWdIZ&&$(`#0wCpx@NJMS;AnJ5J$e8>Iw1k~ z#z#IaaRD=a$yF9`Uu`h0>{BZ35sNC*i!vudi~52R zY0te;livN9u)^obmB0TU?kwJ5u3lJMdRuVq@AAT$vUJmBy?4)Ua^c&&Nc*WI|e>cxxjj>Yolm+s||INx)(yV8C3 zpNad#Ytqg6*C%C}=r_F$e0?&q+&#sj@7lNMH&3^J78XPTe;GHvN?&nxrckNrEd2ZGbWx0mzECM`8>U?)MTCuH^Z|7Oslq7 zP0_UH*E&#CWwgFXeQE|{fx)3GPt3)-XX-Ply`Owy>#msK-St&J7yWwF_4V$*kjd`d xv-Z~Ml%_GBIy&croVC&wFZ=CJ+qgb5-o9`==~Iv0WMF(Uc)I$ztaD0e0syIm<~slY literal 634 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~=?yaSW-L^LEz8yjuYhZuYDA z7EV$&On7W6wC#JJ;HOJF^(SmRKVkU?>6G-d$|eeF$5thzq^?e#z;(#0cgjJ@3#GnZ zq4#fJ%70+beM)rK|A!~cyYsV6q#n+xJS>)=%y@$-M};A}p_e6rd&5MA97Z#t2HgX0 zOdD8lcra{ZkmfvqRZ+V9gSF?TKR+pYg!{&M5T{Yo4Xw zmSs4wbI*!r`{OR(4F1jeL56$sQLe0vZFdtlMI0>Fxx2PU;>+%%?a-PiHvr?4=}-Svc)*vCi9{y-X{7 zFPAoc%;~f^&Cl{k=Xk|7mtA^%`~I(g;k!8KZLEDB*Vo5W7oYp%_MiEkoY0SVbq!Td zUR}8kRB3besE`I{l?JG00u zzlPhH;qTx2Rq8(|=VK6HGrLq8csKmQ-QzkAzdpZxvvK>@|J>&{u9CO+FaE(+Eg{eN z)ynEzQA=a*>$877-?7R(t}2diYm9CEKl`+#8)Hp*z4sD38&9DaTRwlehp!4F)I5s} zsy9W1u76)@XvMTx|9A0vJx`5$rCc>XQl4C#vHLt{-J1QfYnI;Ut~q+`1;-u+@AVJn Ur`a|20n-$Nr>mdKI;Vst01L_Q+MwKTQfb`Gb>|(!qWWRr+^e&NswRge-L2Uyno4lpa^GyM`SSr1K(i~W;~w1 zA_XW|=IP=XV&VUG!a=?R3LMUk$NpFT{}gr6N49f$s`VOn!!L~sez@5S{E|@ET(!;B zBg8vUb4nK5jDu69iWuY=k}Fm;zqeZ8dRNKm^x1|@Lc5nSs5P8!z9E~SX#X>@XUupmV delta 381 zcmV-@0fPRK0*wQZ8Gi-<0047(dh`GQ0aQsuK~#90?U%n!gHRO4Ka4{iU@)PCK{iT# z0XEt-3(X?toN<&^s^~O%xKP81}pHY#pAhgG6b*7WF0}JOQA5-?Ymr{dFDV>iVYE1qT7J z_q`->-ff-Ei*`l;tc}7X!|Z+q$5cxNZlB%}CK()4Mb9Yb4+5axr$IY>eER~cv-!K{ zkG+K(0kFkci}8vBfMcrd0MJ8OE77qQKQKkRwdR7^d{xpeFSJU%D$MgUZeEf91rk64 b{Cj{c=Pa{`0RIGG00000NkvXXu0mjfPhhPw diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..4fbcd00264170efeaa5188b559b35451b17de735 GIT binary patch literal 867 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~q1o(uwE_7fx=*zIqmElwX!mY-}1D8V(#dkd~Gf7Z-Q#koFN@hKY_0At52z+1ZVa zjSEeffR=PLrHBJ5g_0n@;Q#mmLrjeHTcBFb0*}aI1_r*vAk26?e?D($_g*CN@=663kdCRt`<$jd$ zb=HSm1#7p?&2?$MwM{SDywbH!`dQS^99_nXFW0@UTadA3bLr&wwm;{e>@VAv$IzRp zcg$je#e$M;>o3jye(v{;V?THO3~z8rnbZGKWN~?Mzqf?#PD3UEck|5Ry`Q%#e&B1( zd2`aN!k43L+j=GLN6wBeOSu0}W$83vcFNRN4KX;za`cakz#-11d=Vk6KOTPh^!cet zj^eXV`>THaO{*(oKfCCa>;py-udjR)y2T1Ng)(g7NdBQ*#PDx#CLaTrzV}r|J*C#z z-ILq8WtK8bYW%rhbiwY;^S=Dl>kWVV%bQ`|e7onrq8EtFT%Kj1E66X6+ZSd$p2>$*IDiUX4XgiSIz<=Jjce zC%;;>J^QvO+M!?hK;xYo@=WJ`2&{@{@_bxu@%)<-p8(^`X}5PfExRY9oL^<*Ti(Lx i-mw3|e>R`X>TJSWuRLelxC@v789ZJ6T-G@yGywpH(}TYN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1432e6bea185417da047a19194ae35033b698a3c GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil=1AIbUCpt3BoF;cElVSDh)hELl)~r;zdGqFr4u;ET88kFB&SoM1MG8=Gv8Rh;h=u>#zKeX#3Oug2gO-Xcd-3Cce(c=}jm~5I1?rkD)%+|O z<~9KgO9Yr67Mzrwp+4_$j`sH_2e<<}($zYjJ9!08nGurYWotZVLU+fW94|Z3fS_}g z8$FwBjqk_{tc}UN@HH;OqH~SXYU6vy$eso>-wXhCN;6|#tQkqU|rQ2Gi57X@F#Nrwu)Lhu2^!Qx<1mw>tnf`daV z3W{TU9n$*W)}{yb!tb+$oWL)ab8kBIfQX2Qh=_=Yh=`=IxqyqJ$bD5$oAEX#>!uJ;-ER_KCe6q#1+d!$U~3Q74!Xb3ISd?mJBWMOE$h5)Oin<1F_n||_4a+Qi?z<{#OxCQ z7+M4ht;j-<-2bDzub6bQG?Q`X!*hgTNH&`#pU+dNRH)Tz#Bt2@<1ssDjUT_uIcnsaoMoJ#2AbW!~G-N)S(uqTdZ}S zh=_=Yh=_=Yi1^KF8f`ik_$`*xXfGQ8cGGC@{$9489(#KNtft3(Pltb-_4L@w6JR+# z_ObzO7Sm(zegwgGdhBfjtft3aHUKm|77-iIn2{!MSG{SL00000NkvXXu0mjf@wV~< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2ff1950af25815f666d1ea4686bfa1502978d0b0 GIT binary patch literal 532 zcmV+v0_**WP)9x6Ty{>LJiclyH=Qulx!q{iWd-a3jsG4yp68nB7(Ot^a8|%!G%HH3}|-+ zp^Gk((t^@ua=Ms|)y%}4Nl?y_=eG&-&IiwV=gcNAh=_=Yh=_=YhzLNdh8eF#QDpM! zE@;&-Q50peP0JhP72A85jYhWK?>5+IBz4|`B|&8&GB#|xt_8Gy}E_ildN+;=km4Y4C{ALh@Sy93gTI~R}Z z>9H$|PtB8e;wJ#G^a-esE~y8}vBPG`o7L$B8(j$=OD zopX3KaAp_GlXqeR-oG8Ndl+zVFubqt>;&vLhkW~0a;^ch=AF2R=6cDL!vU)+@ManQ z+`-R2^kTObpYkoQh=_=Yh=_=Yh!1?57~6PqF7S|V6JuM}4FLZp#x|_}F7|C=TtuNA z;M>I5MrJyk$G3@b5!O4vw~4W>LZ1NmH!+^Z`mOmkF}78x0X|KPZ50Zv39N{`Hva(r WWF~Oa30l_x0000