From f9f5db935785737117a16771fe960f6b8cfef778 Mon Sep 17 00:00:00 2001 From: Jackal298 <129199891+Jackal298@users.noreply.github.com> Date: Fri, 12 Jan 2024 01:47:51 +0300 Subject: [PATCH] Respite and minor changes to mercenary items (#23783) * Respite and minor changes to mercenary items This is try number three, everything should be fine this time * Fix meta * Fix bot * Fix bot 2 * Fix meta 2 * Fix meta 3 --- .../Entities/Clothing/Hands/gloves.yml | 4 ++-- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../Backpacks/merc.rsi/equipped-BACKPACK.png | Bin 883 -> 1007 bytes .../Clothing/Back/Backpacks/merc.rsi/icon.png | Bin 553 -> 737 bytes .../Back/Backpacks/merc.rsi/inhand-left.png | Bin 628 -> 693 bytes .../Back/Backpacks/merc.rsi/inhand-right.png | Bin 610 -> 697 bytes .../Hands/Gloves/Color/olive.rsi/icon.png | Bin 396 -> 0 bytes .../equipped-HAND.png | Bin .../Hands/Gloves/mercbattle.rsi/icon.png | Bin 0 -> 422 bytes .../inhand-left.png | Bin .../inhand-right.png | Bin .../olive.rsi => mercbattle.rsi}/meta.json | 2 +- .../mercfingerless.rsi/equipped-HAND.png | Bin 373 -> 476 bytes .../Hands/Gloves/mercfingerless.rsi/icon.png | Bin 448 -> 465 bytes .../Hands/Gloves/mercfingerless.rsi/meta.json | 2 +- 15 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png rename Resources/Textures/Clothing/Hands/Gloves/{Color/olive.rsi => mercbattle.rsi}/equipped-HAND.png (100%) create mode 100644 Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/icon.png rename Resources/Textures/Clothing/Hands/Gloves/{Color/olive.rsi => mercbattle.rsi}/inhand-left.png (100%) rename Resources/Textures/Clothing/Hands/Gloves/{Color/olive.rsi => mercbattle.rsi}/inhand-right.png (100%) rename Resources/Textures/Clothing/Hands/Gloves/{Color/olive.rsi => mercbattle.rsi}/meta.json (74%) diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 5c7a806b5a..bf08db78f7 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -268,9 +268,9 @@ description: High-quality combat gloves to protect hands from mechanical damage during combat. components: - type: Sprite - sprite: Clothing/Hands/Gloves/Color/olive.rsi + sprite: Clothing/Hands/Gloves/mercbattle.rsi - type: Clothing - sprite: Clothing/Hands/Gloves/Color/olive.rsi + sprite: Clothing/Hands/Gloves/mercbattle.rsi - type: Butcherable butcheringType: Knife spawned: diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index d86c8fbeba..3c034a6674 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -962,7 +962,7 @@ mode: SensorOff - type: entity - parent: UnsensoredClothingUniformBase + parent: ClothingUniformBase id: ClothingUniformJumpsuitMercenary name: mercenary jumpsuit description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png index 7c7f3a6302c3c006b00035d6d36d40a1a4d0ac0f..3ab913e119b2fbef0e9e61808c7c523739fd0b85 100644 GIT binary patch delta 985 zcmV;~119|Q2JZ)uB!9L^L_t(|0qt7POItw@o=T90;vrNjBpAe+`lF#aNwpXCB;HD( zP5*+P`yYsxo_p@aYtxck#Z&a6f`^h;8w)BWV5ndTBve}uzUJH4HDUYqZ8oh*q_Ys; z?#}GYH{b5t2hI?2V+NQ3W`G%B2ABb6fEi#0j0`L-J#qY$On-8}wav(+{e^{uqyDg7 z%A2tzb$VpS^n~$H$X^}uRzR41LoWRz@I+#erl*G}77L0e#+Yx#f1nxXQm0(LkX_HG zN$$DGVltckK=&7RZTT-?GU(G45zRO-HyPVZ{h znB+FTymV)0$A6uXk((5ckJ91c7g}F0(acPkhKGk}XXi8R@Bg5+wSpF(mregOt*kgc z_CEn8xni!RVYPZL)}5aIq{+$KgeRJu7XynwRS}=^ksg|#AAc85j4=;6^y;h3J^zT5^`;|k zk}Kw{hYv@;QYQ1B&d$zhd;1%G+Q^D0#+ZlPwpkHiYy4m9PdrMB_a1if{(FsWeOlcC zrXy~W+k$J<$L(G&e|N^l`ouIYy-MZm^76xYd3mGui7Z-u1+0`C0d=aMNJO>oxNY#A zih=zy1Aoi_Gr$Zm1Iz$3zzi@0%m6dM3@`)C05iZ0Fayj0Gte;xn)}pvmm( z;^Moe*0w7$nU>Gxc7#i$(N|aiRCuR}kb%qE1*FiY zrtZ?o$q^xc*bE8UO?vqvP%B1=ifWAKPkTjQ&40ZiC9XAa#RAngu;B-+ZXrd~K@5H{ zd^1DoTv+7ak%FFxC+YRuH-DU%tIh}dfmeOY+JMKeo;eq_dVyFhOz9jf6t!lwxj`@) z3f&U9cWx>C9Jr~?*vclUMcyK){uyO`a(z^`sVO8_GK zy|7lC)Rl2+LCFiSAqK533zz|BfEi#0m;q*h8DIwfR|b9owD#00000NkvXX Hu0mjf=n>fb delta 860 zcmaFQ{+VrpO1+h*i(^OyPJ5>K_F3jw@L1?fBuT)yPpTEc~)$U-s>(&)R~fr~jI09`OEs#&`2$UbXekyw$c>UoM&I z7{oSbetZ=(&&R!|7}KWJUhI!wV#_AiT9V*fGKpC?&0_vb!&9jzwnUviSHF1W!RZh8 zztQC2U}|bmP{2t!tmJUnEBb7gE<3w>;I7ME?>5@8Nh=%l*zK|W_TBhyyZibL^>4y2 zR`~W!lc~9RD{E$6Qe2DP6mbTwdABZX=wM@MTBi4L$$riQ^VT_5PuB15{>)ly%`mr} z`#I}DPKKo-P0RoNewSCR^VV55dHUz`j@!Q%AI69S6harGr(%*jt zSBf6VEc>!p`@l(`NoDtYr z-_v0J&7_b~W7k|*QSs>Rv70hW%Z!=!@AzS;#e8|z+$OdBsN!?%Q*>&URf``z^z+FX zhAp!%wk`8{Fy-x)$0=&Qk82FP8GZ-r%+b$b<7vOX>h8PD$|b?C+}ZEAU0!xDeO3LD zrWrd9GC726NUkRDWbL`5ET3s+rpT=T9I*Z%d$)ckM@Q$%fnazL zjC~kj2M&1n`G1HPYHh6~TRR6zJQ@`R52|wbKG2pr1O^UxU-4Q3lG(%`&P0>4^~C$M znH9hWs#FSEV(x6VAV$#L-RjhAX-A8tf&Z+Hn3@32eyOw|gTb>-0%R1BXFbFa4}b9F zU1ZJ@m={l{Bhh+`EH6Jfi7;4Ji+xdwwgM`Jgu$D3F@HG;kT5>eT^)8hA=SD8lY!M? zq6p4?0iLU?FBbC8&`BT&h7trKwOXi|<4SEdH|6y7bL3UjK`29^jcjKK`WlIcE}v@jgI8+yglG>_ZPB4t~&qhj&9t{Afy+fMBb6 zAd7FhiGKyNfPfUs0b*1N#22mjDAIm;`KYtz7(Vs-j(q*thRP8q0U|InmKygwg%u&O znJ6*9(-%B>;w-^%_#>Ht?aXqg5vJMbj|ze}O;Rgxef>?b_~?)%CRkKGbs%P+pJ{NF3^8#^7a2S|xcw*UYD07*qoM6N<$f*g5RPyhe` delta 529 zcmV+s0`C3c1*rs(BYy$#Nkl=LopwVq9G#zYE`J}wTf7@YdJ zWg$^JfHw~{#!EaOG`GmtMFtSP-(~q*VR{>kLn!^kWJ3tZ#pV}f^82y=XQO~hB~MCC zI4P1KIc&k@x_?6wzvCpyadPCkZ$a4BIdTSoM)Lfs$4P_9;gbbX;s@UE6HM4{tbkHW zQdA-*u}KCZ5vJ5R|5_o3T@6a!aVe(AT|0y_!6+vdgxIcNOw=H1TX1%krt$dQ8@v=> zLb~oRdc1u>AnX!@c<@9mZ3{A)LoaURP5px7L8{c8$$xc(;+GiU);zihBCUYg?3JSm zg=5|agBRZYH?x2beyEGi;(`=kk7NH0G8FtXE_FS77wv@$SpvEW5Xv zt+i{a*%yC&=DQEu_ry%uxH0htJ3IUI+LSknLMFcatd_t%YYE;BS@eDGWUQ`nrzr%v_EnQ!j=_h)4f z`_X*6rJc+7in*_lwm$HLL+9L`(=T79FWTXLe8%Y_Q>pVsg(2MKOl61n*RjtrIi8xG zt$Jq@H@9*V|2F-3iF$8aWkXj^dHU=150UQr=Kud?H|(xfvG~6BTDEn(&FL!F-1fGj zN560O1ueRpXogsOR^Zv zxOpbuTHx01aP7Kx(AsyFSDCNG-;u3a_m^WCLrgVO{Uf2ibIO(7bu5z~X)vu0o6a35(PhNQ;*Qn6|C!-gZ;a!S%*gbp=g}({(JH zWfLw6PY`KHwQrJSxIV98$;sroVD?+?j%!~pt4u9h`^w?E>+Lt+qq2YAUGsSLvO}+z hZOi&}?=_3qJ;p~LbWRCj$GwASE=HAoIvrceXSj(s_+Vr|iTFrN< zL|xg}WtXRS7fgMu91_kj=k53R->((SO|}1B^rH1e?)Lb!t-lQR-pgI#l38!cP#|{A zY<50#`^ST(e3_@Y=fz7jb2>Yhh;^5rzxeNNh&-dk8>`5W=db6jerm0^WWH8?L)hz6 zH~JkqlwE6GSDR@wSZ}R8{`U1E&S_V7TH81L$!$tK+;r>ew}!93jQ9VJ*mmP5(BwI8 z(JvIMjPyL$^>Vx1N;StPgw_Ufy|XmwNNkf_1MF`*Y10H|@G+C?8TEoOq=6 zqvz%A8q(Y1)?72>Sfh>zrFtykwSt@Rcl={5yVb02t0b;V2+!_bASL1GA}+Y_w zZxl?7&u}g4dUfi{6^0w9H=bGHwmVF(Ns7VTJj5Y+(sGlS>d<#~Ux2>6QPU7Sx%9S5 zxr4H}BX7eKmK%n(*9*^Xy3u%7;&#^l>z~}p&PnXMA+q857G1N-b=HmX>xy3aeEwsW P!TXOq>@8{assbyb!vZ(yb6NlWNHGU6rva=n1 z-!5LfTK-pi|NINlE2pS%+*8mG%Fl}sx|$Um7PjokQ&kT6Gqv`dtxkS^e&?13%;4GT z{&FkRguXbKasKZ{|OqyPo;vW0nUyZPxMm%2`G*&M{k-nw}n9 z&=VG3-^TxJ!$Y8gPVw%?3-`=E7kX5msormMZp3;9GZ`5f?sv7TzuvpeKl?oMNk1Q- z(n;^;-P71RasSJum(EPDZ^+u(e!@1A`PKD5vR~59c7OE59k?C}a*Vq3k4OKVzvj}C zK!vY6J*339Z#7COzHr~TVP9jQlf!fOTOa2zrrb2HU$8MZ-cM+^FvHUIwM-lvz0q?R4m4l8ebIP9EpwK!o5#f!g(i7Y>x8fV`u+O7fZ-{rJ;&ry i&zLw!U2b2`V#g@frIESk+FM2jAn&wUy`?d;i47d{Oz(c#r&7^tAAS9 zRj%?*c>QP2i1qfN`|CHK7yi2^<-3<^`K`CwTch@_y8ABn_&m{kEr!55dG=cjC0yiv zk9nQboxc0&C)e}NYj!Xk5ncaTv|*Ek$a}MyJ)uwM_1qMlF6^+l@Y`e20?GPSmn6hE zc|R^r4ED+PV+b$_zw>6fB#-WKyQf|jlJT$PHr(9v^6K%&SF)~tX|-g=hTPe<2ds0#N%9-~iKMhsbo_${KBRf<2 zRo<~0o{w#hT=uItFd?COWDb+c1NQ@e-mjjYR+?sgo;4@Y>ykx*&9YgH(Rvds`;X;# zDQ2@Bd%Ro1{oDS?#Si|nw5*Zz__a-U!um7Z4RbcPuaGpT{e6WYmGNU8YmWL6v&d_cF1jbT zDDA+P+_TFXHe86@|3^ZoK6T!~?)OHuUi0?+cV~*P>3GAj=JnQY1|aZs^>bP0l+XkK DWWxX` diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png deleted file mode 100644 index db6378de51d8abea50cd7aa69da52349d51f51d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxL|P)Z}kn**=~y{g}u3}fs-rEF{o#Tn21|2){~$8qeo z93NYn35a`$pXmua2UL1de=^$c?a%|h#S5amYPKX0000V+45QUS9RS!VdJ_Q%6atPEzWy>kDZVtef>Wg{S#EeN&kg{ss@B3!Y z=VMQCw5x$SfjWWRCvbSzd*FQjzKN^rep>C9)^^LAup~nKc>GLS<9Kb>npkb1B%*i- zU&+8Q{5F{2Su(O{KwZ6D_oeM z8P7zz16G`3gaK%8NfBeT0h`p=iOG!j7qXaqpPL}BBeS(L0|KdFi#X&= z$r=@(;x;FZ;+v3*MNtk?+{=k{%UU$Bh2)jm*%7=#^j~Z>P$y6)u=@o50I=2}Q=>hc QMF0Q*07*qoM6N<$f)$g(LI3~& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png rename to Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-left.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png rename to Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/meta.json similarity index 74% rename from Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json rename to Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/meta.json index 5b65737755..d24811cb10 100644 --- a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json +++ b/Resources/Textures/Clothing/Hands/Gloves/mercbattle.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and paradise station https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/clothing/gloves.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png index 738cb44dd2818917f8264a8ebda12511f56a642e..f0bf008f0374077bbc8ac02ef1216fbf57c7b163 100644 GIT binary patch delta 450 zcmey$bccC@O8sI_7srqa#l?eoo~nk`9S~Q# zxMLw>cVCKgm#EVA=esS0%!`FCDZRh<_RKk{&b^CrquckWop``%&AEW-fMf!919yYI z<2Ht9hB=Je71hFZ96i9VKR~K zFcWQvDD9oebsJlb`(FyY_wmH^0681~V8ui(Z_$$29Ge%~w08E7k|hH{XA6@3wN^ zgfAKIul(i+eEd=I^Yd(@S+ k#c1kkdC>{ksm_J9Ozc9_Q=SRBon!z4Pgg&ebxsLQ0ML!iY5)KL literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^dcaSW+oe0yszUz34I+rw8J z!p%A=ZC5*wawj}%n!A%hT&-MKTwE>U;`t>l5-T}al4~MYY_(s`fA^eW8#^P5fCB?6 z@nAno*t*ARC%17j-LIIJ|7w>}WnEF<^{C8U*>8SqTH_Nq=l;2u-HDxluh-6A9e?n( zLE?*<7Wa0vZTp`&=UDc=DTnp9?*IJy#`={BeC>;ibF>TcQ*Q3N_0zSfC*TCX&w*SgA>o@H?^>=mIgPmy(l6RlmS(m^1ef8F>%^NjT|9gr> zf3$eb{EO)tq=ZSm>D~IqYT%&ZB zatG@80BMsv$lJie3M?Vfuo9kS_Rs%+hxO)FRb^|Ahc(5~-VAIV*gCL!2OgKY2TrHg zZ@G@gx7_(u%ILb_Z&a)={HwPA&v|jD&oeCgOKxS-YtsCJPuNQ9jF_I{|rKxYMch@qh97b(7=fAqdOmi??>M zNZo3cbtFac?I&gOG4lC*=IfJWHtNVzhuGUNSzT8?dp=iwqC9t zh;D{n%b)