From 2715685f13d376eb43996d05aca447431b2be403 Mon Sep 17 00:00:00 2001 From: Vordenburg <114301317+Vordenburg@users.noreply.github.com> Date: Tue, 18 Jul 2023 16:56:34 -0400 Subject: [PATCH] Use new TG stamp icons (#18123) To match TG DMI, rename states: * -iaa to -ok * -cent to -centcom --- .../Prototypes/Entities/Objects/Misc/paper.yml | 8 ++++---- .../Objects/Misc/bureaucracy.rsi/meta.json | 10 +++++----- ...r_stamp-cent.png => paper_stamp-centcom.png} | Bin .../{paper_stamp-iaa.png => paper_stamp-ok.png} | Bin .../Objects/Misc/bureaucracy.rsi/stamp-cap.png | Bin 261 -> 187 bytes .../Objects/Misc/bureaucracy.rsi/stamp-ce.png | Bin 248 -> 187 bytes .../Objects/Misc/bureaucracy.rsi/stamp-cent.png | Bin 225 -> 0 bytes .../Misc/bureaucracy.rsi/stamp-centcom.png | Bin 0 -> 187 bytes .../Misc/bureaucracy.rsi/stamp-chaplain.png | Bin 268 -> 180 bytes .../Misc/bureaucracy.rsi/stamp-clown.png | Bin 238 -> 187 bytes .../Objects/Misc/bureaucracy.rsi/stamp-cmo.png | Bin 238 -> 187 bytes .../Objects/Misc/bureaucracy.rsi/stamp-deny.png | Bin 239 -> 180 bytes .../Objects/Misc/bureaucracy.rsi/stamp-hop.png | Bin 270 -> 187 bytes .../Objects/Misc/bureaucracy.rsi/stamp-hos.png | Bin 254 -> 187 bytes .../Objects/Misc/bureaucracy.rsi/stamp-iaa.png | Bin 272 -> 0 bytes .../Objects/Misc/bureaucracy.rsi/stamp-mime.png | Bin 237 -> 192 bytes .../Objects/Misc/bureaucracy.rsi/stamp-ok.png | Bin 0 -> 180 bytes .../Objects/Misc/bureaucracy.rsi/stamp-qm.png | Bin 239 -> 184 bytes .../Objects/Misc/bureaucracy.rsi/stamp-rd.png | Bin 245 -> 187 bytes .../Misc/bureaucracy.rsi/stamp-syndicate.png | Bin 676 -> 182 bytes .../Misc/bureaucracy.rsi/stamp-warden.png | Bin 246 -> 187 bytes 21 files changed, 9 insertions(+), 9 deletions(-) rename Resources/Textures/Objects/Misc/bureaucracy.rsi/{paper_stamp-cent.png => paper_stamp-centcom.png} (100%) rename Resources/Textures/Objects/Misc/bureaucracy.rsi/{paper_stamp-iaa.png => paper_stamp-ok.png} (100%) delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-centcom.png delete mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png create mode 100644 Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ok.png diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index bcbbc4403f..a0db6663dd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -467,10 +467,10 @@ components: - type: Stamp stampedName: stamp-component-stamped-name-centcom - stampState: "paper_stamp-cent" + stampState: "paper_stamp-centcom" - type: Sprite sprite: Objects/Misc/bureaucracy.rsi - state: stamp-cent + state: stamp-centcom - type: entity name: chaplain's rubber stamp @@ -627,10 +627,10 @@ components: - type: Stamp stampedName: stamp-component-stamped-name-approved - stampState: "paper_stamp-iaa" + stampState: "paper_stamp-ok" - type: Sprite sprite: Objects/Misc/bureaucracy.rsi - state: stamp-iaa + state: stamp-ok - type: entity name: DENIED rubber stamp diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 0ab6ce3316..3c27037c67 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. stamp-syndicate is a modified version of stamp-warden. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. paper_stamp-syndicate by Veritius. paper_receipt, paper_receipt_horizontal by eoineoineoin. pen_centcom is a resprited version of pen_cap by PuroSlavKing (Github). New stamp- icons taken from tgstation at https://github.com/tgstation/tgstation/commit/fb1012102257b7b0a08d861fd2b8ba963c416e93. stamp-warden is a darker version of stamp-hos.", "size": { "x": 32, "y": 32 @@ -106,7 +106,7 @@ "name": "paper_stamp-ce" }, { - "name": "paper_stamp-cent" + "name": "paper_stamp-centcom" }, { "name": "paper_stamp-chaplain" @@ -127,7 +127,7 @@ "name": "paper_stamp-hos" }, { - "name": "paper_stamp-iaa" + "name": "paper_stamp-ok" }, { "name": "paper_stamp-mime" @@ -255,7 +255,7 @@ "name": "stamp-ce" }, { - "name": "stamp-cent" + "name": "stamp-centcom" }, { "name": "stamp-chaplain" @@ -276,7 +276,7 @@ "name": "stamp-hos" }, { - "name": "stamp-iaa" + "name": "stamp-ok" }, { "name": "stamp-mime" diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-cent.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-centcom.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-cent.png rename to Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-centcom.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-iaa.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ok.png similarity index 100% rename from Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-iaa.png rename to Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ok.png diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png index 77d4f2b9b72811560eb16a5394788cef52299e39..51d7bdea376395ed0ec85935e50ce32c2062e5fa 100644 GIT binary patch delta 171 zcmZo=+RZpYqMn7Bfq|hhB>gy$QVj43aRt&K;N35(pe=9Zt*WYO8aLnG-rl8jS!ifz z+0re`!}&e|6)=_r`2{mLJiCzw@7cBR2z|B=?KU Svlyp=+~Dcz=d#Wzp$P!m(m9|2 delta 245 zcmV}&X_{Jqf#>n4D$241pss5GilT7p>2w31hqrv+2f!EuKomtzBN2_DX&Om607I9} v&uPYGw|TG4Wd0qf{gTB(984*tl=_<&@((e9%o!=700000NkvXXu0mjfSQ2UH diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png index 67a010fe47bb873c0043386aaa6af4696ce83338..60eb5af338068527df970b7538433531796cb9ce 100644 GIT binary patch delta 171 zcmeytxSMf;L_G^L0|P^2NcwRgr5NB7;tHgJKvh-M-rhbmG_=51b$Y(>gLw@9Te<)5 zaQOf8)T4_JY5_^G|nd{NPJSzVVHW}DqCw6!|gMf8Cq7+ zfvhaX!mJa1_M8(u*tdcyF@s4@Pj3a&sbj~wPB5vwX=-YEq_J(v^y%U}TMw`@Ow{J~ T{`O7r0>}}bu6{1-oD!M<5UxDo delta 232 zcmVN!!bL7PW9E1r zy45%E1!yLXz68bBfKIldO$Fi^7)Fi9Iz!oC;)dD1Z`cKtQc9pK@MVFQ^jOU;^c8-S zjL+x2nH^$wfPWDOxIfKu0k%iS>9Q6D5XqeLnRCl5AwXg+iD9*p7DS;1d7gWKRTS~+ zI@-1cpznJCnx+Zr8T19dFP|7QE@2$U0HkReG!oGWhGCGD1A!y(6~3-N=j-kF{q#%j i4v*l`Dy5WCi+KYPJTD73vq;zg0000T;V9G-(U-Qe}ygx3|8o4=b?cvRewYY>~`4 ZX}e9zhB`rKegfUh;OXk;vd$@?2>`YkTXp~d diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-centcom.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-centcom.png new file mode 100644 index 0000000000000000000000000000000000000000..65b72e7293cceb5dc6b1eb19087b021cef6f8665 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iWS0D`nUJQI$3`&07sz5N6 z!QS59Wh+ByXy}&zrhXo2F+c^3B|(0{3=Yq3qyae|o-U3d8t0P}BtAJrGEO~za^yhW^Utgy$k`C|*aRt&qpsK2BXJ=<`Zyy>Onw6DRUthm|{rc)} zes_U#j3q&S!3+-1ZlnP@?w&4=AsXkC6C^%4xG+pT9}(E0bs#9NX_=C(V5q}|yMjjr zjtLk}bO>P-G-2LNS5Xudf#X0000GrvZ`=s^(g#$*SQ6wH%;50sMjDXg;pyTSqH#VsLE@8w4#U**R@qvs7;c}*%+Rum z4rFC97G|CBv*(=P!M+tti5X0KdU`9EP8~beb%IIdO;c0TBaLlSrcW2=*?NGLVWKv- U_qT6~7eJ2iboFyt=akR{0KHW{O#lD@ delta 222 zcmV<403rXo0qy~i7=H)`0001UdV2H#006Z~L_t(|ob8h_4#F@DMPDkW4jr2-L}Cm# z>CDWTI&&1(bVTYEveR}n3x$d;2`Y=<^cBV5Uv>hDq9_H34j0w1fVj8$21XR1Yn+L z0LF1l@=Th*w)slaGyv3f4S;hl=}Q)^U|E)uav*U9(g$JK91LFNWr(*W+pZw&5VHk#jrIeE1rD!xd&GLHIn7C{J;30w} z(MaeFEGdyB-DltxBl#Is22{ilN(|wiM+h)_&*;5I0@pe)&sTE+=$zxX?`+!!z;PS^ ztn1pO*>nTv<&|L=0Op)Cg&oU(&fl!AFcLa_K zxTOasx`!|(nlOrsi-$0#CMUb5Fq%0!IvR>Z%U-&4NvJLA0TTmPGl#r_Z1;7L?VhfF JF6*2UngE+002ovPDHLkV1lr0W4r(W diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png index 61c7cb1bffb3a1c706cbf39ec1e7597d38b212e0..13ee43de611a68db4a8c86b6a57576b52df79da4 100644 GIT binary patch delta 171 zcmeBU+RZpYqMn7Bfq|hhB>gy$QVj43aRt&K;9tnl@L%4_TUAw6d;NdYxcT<>_MxGn zTfhESZrU6TRKQpgIXB{{*(>Rb-$;ygpBCE;_7FO2QfSkafpdg8?Ms9}Rd%3^O S&vZQna)YOi zRV670py_h>HcsjFJHT@V&0z8w=(UpBR2)nxrIh-a2WfOPfOTLM@&Et;07*qoM6N<$ Ef~!4hjQ{`u diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png index a0ac58acc1e34bcd9907930c8878059e0bce345c..8abc7845a24c0e92697da64c872d21f091f9dda4 100644 GIT binary patch delta 171 zcmeyzxSMf;L_G^L0|P^2NcwRgr5NB7;tHgJKvh-M-rnAUfgvy#@#(->#;NCxvbk0<+&+_;p=A{v zz{+AQ%sSy`&q29!jVqY)GME-FT)2Yi)Ujh-Czw>;G&MCn(%3d-`gC!gtp`{c<{aeC Udf>{v2xusSr>mdKI;Vst0CFEXYXATM delta 238 zcmVYdMIzAXTTZa4OmzOL%c0sxfOQd%pq z2v6QLjR#1RgwHrK3%{=w) zHy=9-N+~6xl{W1r{!i9hxM=+8X>_G%eUhOiR%Qc5YMe&+=i W*E(=4S?}-w0000r77oD@(Y(h{H4EZQ85N7jd1L)u(mg;>AX-2XUHl?>cl2=xS(a^d_BtcXzir&(;I1 Y3>LEd%{iA`y+JPVboFyt=akR{06SPb>;M1& delta 221 zcmV<303!du0qp^h7=H)`0001UdV2H#006W}L_t(|obA&g7K1PhfZ-qB6as;uSD+jL z$rZRf7eHVtcmp1)Q`=)qHQC!tKHa2g(tt6>D1;DV2q9{6WYWN{-J}I{T_+8F^Y;#@wBEo@2hE@oWXBqc(Wu9jMwrvB_ zw;`zm=gXhUvIL+g3gB}+zgoc6zVDiFAaMlepT8^%0LO6vFiq3zT;KP<-w0!jF-GbE XpsqM>!HkKG00000NkvXXu0mjf%KBmY diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ok.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ok.png new file mode 100644 index 0000000000000000000000000000000000000000..cc15310029ed3a6791c1d17b5ceba2196488e5b1 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S0D`pj0+i5RaNcn?L$LD zv$C@4>+9FAU(eUp5e||o3GxeOaCmkj4ajl#ba4#PIG>y#@yWr3Ve0vazz(egL2*sX zlxzh<9WLAzJSuQZz;L2N2&14$>S8CrMFjfBI^xSRz=pMfjOG``uY-Cjob|L)^q20t$*GM Oa)GC-pUXO@geCyB05{|S delta 223 zcmV<503iRk0q+5j7=H)`0001UdV2H#006d0L_t(|obA%F4TCTch2h_n6qI-c%sMPU zS{5*~WDCYXN_vzHs1u-c8WN#&_C=z(udyua&QCsrQc4N*-iO}%AnB2%7Is}1j4=RQ z+BP{va)5sk2bkyiya2;6Fpi@rfJp6JsGU3K69SahQd%o%fmn$xXqqMfWXAAXmhT@} z*A;+inxc9}y}+002ovPDHLkV1l#gW556a diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png index aedcf31eda1f81bc27e0d9692986b0173f97c68d..3ac05501c6f52058658e40bdf87bb9283fa0df59 100644 GIT binary patch delta 171 zcmey$xSMf;L_G^L0|P^2NcwRgr5NB7;tHgJKt;hpRaMo-G|S%J-hm-0G&D5AYJFYg z?#< z6*vYxW6puXAuth4fk9CN9c;P+vrk22|NhyZ4JeAD2nZqU-uqpm@sKn>&k_@V8vuCr zJub^65;6m!DDcyCpMh6h^KM&_0TGq8du8oCj}Ra?hTIs51YSvOLDMulz#~cc%roOS z00l-u|MqSrbnV-v6v00000NkvXXu0mjf4u4#d diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png index 1ca9c5ebf96b6591e5bd2c7ec5f0a6201598b07d..baa4c4431270e05b34efe51d82d5a52674bf31d1 100644 GIT binary patch delta 166 zcmZ3&x{YyyL_G^L0|P^2NcwRgB^Tfm;tHgJKvh-M-rhbmG&G5sxtf`|g_(ICyW%zm z-q@2hF+gd?k|4ie28U-i(tsQ{PZ!4!jq}L~5}y=w7^a@Tb+b$Bz_p8Q%N8vX33V_~ z4rG{l{)LR(n+`33Hnj(j9yMt#$jMpLk+gcjf(7ytUAmc>nVinL1&mK6xfV`qvXKGV N@9FC2vd$@?2>`AzHYfl9 delta 664 zcmV;J0%!fU0i*?x7=H)`0001UdV2H#00D7nLqkw$V`BgSD3NuMJxjw-6o%h^h@zE( zb`WvMP>VwgML`^;f?cXZTfwSJa+|b5l7^cUDXxNxL%~6G@oVrO=qk7>2!bMrIQawo zTBO8tn?j4UC)}Ke_n!A~@40|Kqcg(}CIQ2Acs8AqRtsxV|9?Azh`@&!Mr3ANOS#27 zddANqRZ=`8M6cd;U1O-I+6?dw5YIA;JH+$EnJvc>yhj{iWw}UvLLBFGK;m1WD;~cI zE_wVVnCG(#fM4{KN*%0pFe`I|c#1e`=vCG_kGM%lHCJ+!$7xN#MiyzLAVEPDo6zAP zLD{64b@wHkzJFy@$iwJwp$1Nl63XO_lUk*&DrJpyl|CIcG57!Tw6&ROuX`v3^u4<7 z=Ooa-4>ano`+MrTjWZzd0$iJIe}(2W_f2}etwoQ4@D6Z!)7F#&;A$5bd$wdQH>ChA zzor2n7r<}<7`+Du*S%S__Hq6Mnw-l42i?8Za6HqaiRF0;3@?8Umz-002e;BoWvwpH9dC0000M0~T2{W9S$++( z*e_d^=}kHhfGQYEg8YIR9G=}s19Ch(T^vI+&L<~Gd^&K3Vd{CCY@<~Sx6fo|Xj#n; zWMwfHW}Wb}M^Q|zaRpOa2GhcY3s*2{>FITyU{ZP0)YSAyW80MJ)5UqV9$;ngoy4ts TaQ8enprH(&u6{1-oD!MX&i31-W$UBlGNdmmEJhMbJc9G^# zBVuB+0l45XA`mqI-@*EaNb&pO0G>{#%^I60@Je-!kE{4@247&`w)SlsktlcG_x%F9 zs`7h28^;k$(*%ZLDAFvNz`FUBrfEQ3*P!dVqAwX*!935AaulxMgXMFTf8E^w{GV@u gN0}r^k|cNM50zph@5{CX;Q#;t07*qoM6N<$f|o&O9{>OV