From 39571697a52f5c09e5863c1e01101ca95bddd51d Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 19 Aug 2021 22:37:01 -0700 Subject: [PATCH] Added open/close/stacklayers for Matchbox and inhands (#4496) * Added open/close/stacklayers for Matchbox * Added inhands for matchbox * What am I a clown not gonna leave no indent spaces --- .../Entities/Objects/Tools/matches.yml | 19 ++++++++++++++++++ Resources/Prototypes/tags.yml | 3 +++ .../matches.rsi/matchbox-inhand-left.png | Bin 0 -> 294 bytes .../matches.rsi/matchbox-inhand-right.png | Bin 0 -> 299 bytes .../Tools/matches.rsi/matchbox-open.png | Bin 0 -> 291 bytes .../Objects/Tools/matches.rsi/matchbox.png | Bin 532 -> 477 bytes .../Objects/Tools/matches.rsi/matchbox1.png | Bin 0 -> 116 bytes .../Objects/Tools/matches.rsi/matchbox2.png | Bin 0 -> 110 bytes .../Objects/Tools/matches.rsi/matchbox3.png | Bin 0 -> 111 bytes .../matches.rsi/matchbox_almostempty.png | Bin 524 -> 0 bytes .../Tools/matches.rsi/matchbox_almostfull.png | Bin 524 -> 0 bytes .../Objects/Tools/matches.rsi/matchbox_e.png | Bin 511 -> 0 bytes .../Objects/Tools/matches.rsi/meta.json | 19 ++++++++++++++---- 13 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox-open.png create mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox1.png create mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox2.png create mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox3.png delete mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostempty.png delete mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostfull.png delete mode 100644 Resources/Textures/Objects/Tools/matches.rsi/matchbox_e.png diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index a07d27fc00..1e8c468591 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -14,6 +14,9 @@ id: Matchstick description: A simple match stick, used for lighting fine smokables. components: + - type: Tag + tags: + - Matchstick - type: Sprite netsync: false sprite: Objects/Tools/matches.rsi @@ -46,10 +49,26 @@ components: - type: Matchbox - type: Sprite + netsync: false sprite: Objects/Tools/matches.rsi layers: - state: matchbox + - type: Item + sprite: Objects/Tools/matches.rsi + HeldPrefix: matchbox - type: StorageFill contents: - id: Matchstick amount: 6 + - type: StorageCounter + countTag: Matchstick + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: matchbox-open + - type: StackVisualizer + composite: true + stackLayers: + - matchbox1 + - matchbox2 + - matchbox3 diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 616a6c9f43..9746fdd591 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -130,6 +130,9 @@ - type: Tag id: Machete +- type: Tag + id: Matchstick + - type: Tag id: MonkeyCube diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-left.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c54c85a8e26646c7800ca8998423cb12d12b91c5 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4*8>L*lz1t3ht$khQ(LiO z#pkS}qChFek|4ie28U-i(tw=Ys*s2hm(=3qqRfJl%=|nChKf1CVFg8{-@gPGeEj-E z%Uf6L+?n&i8$t~(8b5fXbKXbuBtub8?+y#&Amhu%UJ7#_O*%3uL?Kwye4~n`vgUrL z&TeDX%_}69^miMt)i5*{J!1AGD6HUXG2?6=hS^7?Q>@f(w*xKq@pN$v@#suWkYHWh zVAe2k0+XT>+YEsq?KKRWTLN7fRtvfnBswy$apO?Bl4P1F($f^^Q0-vwePU2l0{bC8 mmM#@HVW&O;6$SfC3=Bf4OgWQ_%(#K(GI+ZBxvXL*lz1t3ht#ZCv0}cO zT6*GD9-tIsNswPKgTu2MX+TbHRY*jMOKNd)QD#9&W_}(6L&conu!5q}?_YuoK7M_o z<*loA?#%h%4WR}XjUPPHIq#!+lA)-lcZY>>knv?>FNHaeCLNg+q7bZUzEQZBT0JJj=l5-lFHW#!o=y!MZ>LE;q)f4At+P*}7Up s5_A~_92l|%o8GW6vGs_tu`n{MpTKl#o50mgK*Je4UHx3vIVCg!0O=@b;s5{u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox-open.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox-open.png new file mode 100644 index 0000000000000000000000000000000000000000..e6023a052e510643e0e0051742f9eadbfdb0498e GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJSDr48ArY;~60D08M0%P64Y=5( z41zBI%ZhhpOG`^*Q#0dh%ikX4|5Lp0_yMu!`@;*WdEY%9ramIRE?i+y6q*D(eS#S08`i!n*0tnHeIHNF)+DZltXK;>?sLR!FP?1+fO_74N{9e2~YdJ%6mVn2|AlWC;(SzaKh3 zDI-2V)70s?WwxHK)40(JYkSY$(YV>dd(WrUEkp!6W;lO$nzhIC_}p0uhB{oh*3^r0 z57>P2rs&pU{p6K;5bvxVgxX-ZaOW~_SC;tN=`wy|f=4elkCwo_>rHLlUJl}?uQqVb zarpWp)k|lnR)4E}ezij)2^PcITP@aCmN@KmnV78M{zn4$XU}QBm!b+@i*B!qL2=Gw ztR?ODNGcUZM@RVbE#*|L7WRH;Rc*yMELGpFi^>#fXJWNgulmIz(&CXwBoaA(fM1*0qU-|tTQ~p!002ovPDHLkV1n)E6^n@>D@5X69IXxJv$V5rFrPUXj02#Cy+|r8PtZJ8U?7eS+orGUMl_ zi6Tqp{$pMqa6Rw!72wACf*zl_OJ#8dq-_ka`*e<4t;WXkCjg8Zj+RdHV!q7&Q`1;$ zI8vHrVKU1Iqkn@1xP76Z#cOj^7FXDNHji_T&F7zqPwXR(W4=CHCz1$@Vf<>5)rDJR z&s-v%jyP7D<-uf@(XkB9_crj)J8Y~75(FmXLAGvtO#!k0w{tI?;1lDsvmpJ z`wQR{Bf^$*7$60xNVh`i90i;z&BP-{u_8FHe>LwbK)uo6T`oaHF$R*vbtZ&Xs|9#e weY+ij@88-@Ij?MPH+cH?*FaxB5ZG~k0|q&<+^Rb%D*ylh07*qoM6N<$f=&DBHvj+t diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox1.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox1.png new file mode 100644 index 0000000000000000000000000000000000000000..05f79b89f4dfad2e648482f3e64fd08e497e77b6 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcif|7aVyR6nKta@SnlB zB$1Q(&T~fX7y%Zg6MnCaFDzkVP}nPEdZ0FD^D49HziuYVGB7mQPm*(YV`Ew$x7QPB O41=eupUXO@geCyTI3e-? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox2.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox2.png new file mode 100644 index 0000000000000000000000000000000000000000..b2d9f9445ceb0542f97b3fbf700b25e6b9c96fcf GIT binary patch literal 110 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzQ%@Jikcif|XB{~i6a*L!epQZ< zvNzk*HsjH+EH1&67(8A5 KT-G@yGywqVB_y!` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostempty.png b/Resources/Textures/Objects/Tools/matches.rsi/matchbox_almostempty.png deleted file mode 100644 index 3d3035ea8522132ec3ec61136ad03287119f2ffa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 524 zcmV+n0`vWeP)r4EW2+*$_>EK zrfiWDBBx*=PVvDA9#laHgmx3>9GV_sFOJZjllPwckL!KkXjt>wOvR?>=2?HZM(OGl z0Pi0?qg0(DguthzbwmU=q8z_I&GJHx=P%#&^^@fz1NDXqaPv~dPS4$=zPJj~H3m3* zu1KTNU~Bm!0BXwQ>{(V8YCNrP_VwjL9#tKvIk@`+cP>}#)a*R<#Z~ebN{pXBij#=Z zGX=8QEITWoi6kN;X(q0nWbMIiMvtA~VztVRZJ}Jqb7(C0%cKAG4BWjkVXbBxGYHmI z1~U}H`+zz}yVWF0rO0H`w8{3hyW3lg=W+mi*w|p{#m?|E5O<*XMo6imz2sts{d6X9 z00W!|uPOofTHpU{n& z35~1}Spy1U4bCgxfiWO>e5--A7Ly%hH;FKvCg&WB4{F`ssMqq@nUYRb7FfT#M)6`9 zfVcOaQoK~gd(Y$>99{?~ICa<34Np+5~Q|A~O%5t!@xk67I8Pb^KFa0`8)vc>UEZ%fA8Hu(uTr@kTC|+nOszVZ2Yyk%I9U7#0_q~J75odj2z3*>h&T$B zcB$eZsak)ehz=45X|>cOU+z5)3Bibi35d&m;BNOl?|Wa)g-9e4i9{li$bUvg5nZ1v zS>lAmDHw=Td@zCsRS*K9-NZSEj!m$aC1}sdd(WK*wZ3mMta){=Y%}uC(}Gc|!%bcD8IM=WkP6S_SDE0~|bE zpwVcsz48G7HD&tBEKe4ztk<^s`qGgpRCTlfH_w%=a(RK;(kfGDig@qYdHj*|)M3&z z<@2LW5=n3<$1YV^yL*GDznLGH%;SR}nETf|aO?bWYc<=LL9nhen4uWn2h=&*ttLq> z$N2adZPLDW_uDpy@_7K>*Xu05_&)p&WF07M3OQA@mt4%SU+x6P5EH#?6r9K`o~CLJ`(xo`~-I0u+;@I$xQ$N002ovPDHLkV1f${ B?eYKs diff --git a/Resources/Textures/Objects/Tools/matches.rsi/meta.json b/Resources/Textures/Objects/Tools/matches.rsi/meta.json index 4ceb4f63cc..62a0442070 100644 --- a/Resources/Textures/Objects/Tools/matches.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/matches.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8 and modified by Swept", "size": { "x": 32, "y": 32 @@ -27,13 +27,24 @@ "name": "matchbox" }, { - "name": "matchbox_almostempty" + "name": "matchbox-open" }, { - "name": "matchbox_almostfull" + "name": "matchbox1" }, { - "name": "matchbox_e" + "name": "matchbox2" + }, + { + "name": "matchbox3" + }, + { + "name": "matchbox-inhand-left", + "directions": 4 + }, + { + "name": "matchbox-inhand-right", + "directions": 4 }, { "name": "unlit-inhand-left",