From 8239c92df9e0e8fd927ec19b4137498b37f08ef9 Mon Sep 17 00:00:00 2001 From: Data_Redacted Date: Sat, 14 Oct 2023 18:50:21 +0100 Subject: [PATCH 1/9] Added Circuitvend Art *Circuitvend Sprite *Amended vending_machines.yml to show sprite --- .../Structures/Machines/vending_machines.yml | 2 +- .../circuitvend.rsi/broken.png | Bin 0 -> 4235 bytes .../circuitvend.rsi/deny-unshaded.png | Bin 0 -> 16979 bytes .../circuitvend.rsi/eject-unshaded.png | Bin 0 -> 24783 bytes .../VendingMachines/circuitvend.rsi/meta.json | 53 ++++++++++++++++++ .../circuitvend.rsi/normal-unshaded.png | Bin 0 -> 24783 bytes .../VendingMachines/circuitvend.rsi/off.png | Bin 0 -> 4235 bytes .../VendingMachines/circuitvend.rsi/panel.png | Bin 0 -> 259 bytes 8 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/eject-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/panel.png diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 166f3928ebb..399282078cb 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -80,7 +80,7 @@ - type: Advertise pack: AstroVendAds - type: Sprite - sprite: Structures/Machines/VendingMachines/robotics.rsi + sprite: _NF/Structures/Machines/VendingMachines/circuitvend.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..6981007b3c336102ac068fb750fbd79149398cd6 GIT binary patch literal 4235 zcmcImT}V_x6h79bX(&Plrcth~hy+3;5!8#aqEd)d4+&W+5A)N+3Q+K?Pxp zCJ8+y5xo_bl+ceQ_#&dY7G+V=kM&{}Hs8fF&YgSbURUfayK~OWcYfxavoq6CQC^aq zl#xV4$z`SC!(zeEpPJkp873^D-!rC!5A22&G{7hO8NN$Na+jx#w0NYZN(OPK=a$XFI-B$#1mT>7Q)6aV6oA+6vF1l!LHGv1&ix$ut($_7 zwZSgXgr*+w+9e06W6%S7KcNRi6H331CWMi_yYuM%$1k*P>lVwV%AY=7N7wrzHecOB zf-^U~9)L|z2(|!zeEm#AgU>0LyVJs{$}0b2WK7!O-D6$FFptfsc&WI=$W%bylbyX- zc&LJ+<5N1$lBXv|DJv)6b@0h~X6{nX7KWhJK=*W46fr>&*c%79xx zK*v@BOaybYEhm}#ao8@?hS7(#kRPVZP~JyXXJv zO~@*IHBTF^XvXmf=S=D`Y}$Zt05FDB4%~adc3nq2KKRxH0A=KiK#nN@)DtfwCOGHU z4bSPL9^gux!-gXRxD9ne8MqYsnxBl#cs=7BZ$cHU*3-`suj|=ECU{e@4gS^Cl=SP! z02{(+s+)>&<8?iD?1q(*U=gokH_%$osTo*n+cDdl8)~f{3*5X2#j@h^aDP#C+dm0@ Bnb80M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/deny-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..a5524806b40c3102feef26bb00298b61a006ab0e GIT binary patch literal 16979 zcmeHP3s4kC5bZMt5D_sN;x`C>Knp<)2EP&IE{Na54=F8T3`Qe4KOjc%2SPB2Q4y7@ zs3ll>k}7{e6BQJLNHiEk4QfS8MMW%4qVWd>i7}V$#Ubmuv$wn49*T~&%uG*DzwX|d z-regdlk_74n%K9t2Y@DlL$srr+7B-~8|Lq}u!s@>O+uKzzdq34zkT@ZSyRKNPXX{q zS(GwhNWNd&qaTggs_W`F*D0t#ztMB)vRj?UdB!g(4xV-{udLX6TJb7lR&V=VuiFlE z-tOpi@<87#`}nK2OV?~!v-zvFRk_B~ZpXg39+PvhGHZdY-3t3LMY|&W&UtotGdbzP zrEM*vb&zit>g<}dZob>0uj6i39Y{?6HYzCX#-cw@{j$AmgiV#Uv`BfR>0-aC<*5?ItcG3jWiZDG3;L%$r_U)MHh?1~3V zb`;v*>~`|At;Z%*mU%ne*qiF}YnY?!%1#|uCD^s|9&q>5@)3PDnVfHpk6d85 zbG=+sp#PxI_i&zT_X)<^pC?Dz_FM3%a`^UK7vs6v2X!eG$C=w=6FMwF3#s^TLrcd~ z45d-{knxcKULEk#L~k897oa@^Y6p#t)@c0va&t8d(=%mEfc_bpB?vpSGbM?!CVoSj zMuSJ{XhVwVKkPXuYo4|68_3eC9x}gjKs~&vvP^pER{%8#zT2aVEKizamKy}Eg)jIR ze8yBw}7RLM|+jXQZk3;TQOPGEr7xfpZt*~ zQx@H?XMb7zgxMPS4assNprn4>)yFiTs}JcasoCw7Z(OBhE?5h{q0qjhIYo&jNp5{% zzmkc(IY}FmSW48CDBcKw*w~~26>zoUnJF~{(JhdqT?OvLZnMl6_O^hiobZ~7{Dv{{ z3OLN%$ddJq6Ckr^?|DwR|rUwPIB622ls-jSYy%X5KkX4o;^`xe2>FD0b-9-3*_K;xHbnu_5@Jz zsZW8DE2YrJe-!K+*B#2MCd1`TZ2@U`g=`LHjc=9{%>p7VXW4@qYp{={@I#~NuZaPs zg2eL>8p(W>$|xvft7%FoNGMNY4~pb%SG|2?*WgzwAJfMhSEG%R`$%Bw_v|h z1Lh7CgHXKT&0)J3gT(MR9L%VhMx0VZ_`kv8>l$ofVgRlHVSMTqaC3c|6?L|;4m>O5 zeaaFY5<*6q@(PYXT<`ZZSj&k4G<3HELbmC*OQF_(fLzl#{eRi z;B$???0tyE=Q?5Ufnq^?i~(Z!R0m)XDtsfC)dOqnYv(!=z1SLQ~nV0z|yQ$cDf^fnkYSQ{k1 z2bc?jH69ReXr$m%9e^JYmV6hdMPVTu&;i!Mr#=NxF{K|dLPjZ}Sp%OM1C%KIBF+(A z0bGORZU;->J+<&9I{=*#zc>!e{j`O@=f^CL<@(NIZ8h*^IRK3}m#{GBpxSst4SZP+ zz-1_RDb~hd{#-TiB|E^YxxQNX)TaRXCD)u{QpT0YQZk38iZuwVbvu}Q^vTso%}1qNUAX+zfXHR4&+S(Z zsLyv-ifu3b3ZMo-Yvt;t+$A-61RsMWPbijRmZKDTxsjS9kR!XcywojVDdSN=OUkOP z!TkBuEr5)c`U+I*qlRycl0MY|*2>i@QQDGos9S&!f=LRzgo@}Gb5`JaF4Pr(N(<%c zg^VEy48dG|EzSxEVOg3c>Hr!T|EvHx$e`v~0h%tgrBk;6rl7dFdIE%W{#gMsMr!22 zQk$~^M3&k$^*w-}t0(z+l9%HuMj2yeD>*B`m92K0>VS5mLfOL-wKyxFA!h{!KFQTf z%@e9^G*`Z83}AEgS{<7n$KxsH%9%~+5S@_>o-Tn;&I$l?Ug&3tWqw*GZ-eG!SbLlr z1BfCdSC4&+_OuJf)i^7Fa@8zU2VfwhXGaKbcPzadaje}qAkk-YUJwc!e}n0EC;BOtLG|H7j4N7cv1GWTqjbW0+xJtx1=n& y2Abm+T>;Ot;^qvi|Km;KS|&4A4#WQ!z(UqGo7d=J={R?16c?x)sogbrQv82d&*VY? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..7999bba80d0c1e24444e38f0d234a6b77fbbd232 GIT binary patch literal 24783 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/circuitvend.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..1c746cdff2fc3cd81851f6522b760221b2d584c4 GIT binary patch literal 4235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7lx@II9r16JWzzQz$3Dl zfq`2Xgc%uT&5>YW5YYB?aSVyzWKP-v zBe$}U;n|Bf=)z?2r6fccCb#$h4^E7QJ7Vqp#VBSmq3~$H0b0%gv=nE^(%b$tQqpf~`gYTu^aFeXK`lbcNfxSq^dpI>5*U zpb(%o0678#mdskt07_@b0K);ul9aOB%cU3+<74p}gAoOIRg)-L+4&5p1GVf&Hv*>v z9^O2Iu9hS|$Y9kpO$M8vCJgfzE@rrY^Db8XI30jhHHm_^XI*Ew&49ZM02znV0rKi5 zBwB~6{OOxV4D+VUVK{vHAUFh2Wf44_4nQa&pOuu8LQpeJb3q+*0r|Or8i}y!?*s;h zh4=%3rXi5>^B4IczyeG}l!7_zz!ozw3*rM<6JcUx96mh+ z0U*W5J^@({vH%~z=RjPRgUll;1VGV1YElzr}j zW0MQ>qm-?u Date: Thu, 19 Oct 2023 21:42:27 +0100 Subject: [PATCH 2/9] Shredding Sprites Added nanotransen and syndicate shredder sprites -Off -Idle -Shredding money -not shredding anything --- .../Machines/shredder.rsi/meta.json | 41 ++++++++++++++++++ .../Machines/shredder.rsi/normal.png | Bin 0 -> 164 bytes .../Structures/Machines/shredder.rsi/off.png | Bin 0 -> 435 bytes .../Machines/shredder.rsi/shredding-empty.png | Bin 0 -> 263 bytes .../Machines/shredder.rsi/shredding-money.png | Bin 0 -> 438 bytes .../Machines/syndicate_shredder.rsi/meta.json | 41 ++++++++++++++++++ .../syndicate_shredder.rsi/normal.png | Bin 0 -> 164 bytes .../Machines/syndicate_shredder.rsi/off.png | Bin 0 -> 455 bytes .../shredding-empty.png | Bin 0 -> 263 bytes .../shredding-money.png | Bin 0 -> 438 bytes 10 files changed, 82 insertions(+) create mode 100644 Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png create mode 100644 Resources/Textures/_NF/Structures/Machines/shredder.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-empty.png create mode 100644 Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-money.png create mode 100644 Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/normal.png create mode 100644 Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-empty.png create mode 100644 Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-money.png diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json new file mode 100644 index 00000000000..6836e5758b4 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ", + "states": [ + [ + { + "name": "off" + }, + { + "name": "shredding-empty", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + + }, + { + "name": "shredding-money", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] + ] +} + diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..88b4cd207b020a8e0b48ff0efea1460a41c52015 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o z>Fdh=oJ&|pnD>0Cb~RAQ+0(@_B;xSf3yPu)3OueC*D_C2VTstg^=2f)q=c6YtO5%R z-p@+k_e+U^;em0j^8*!8N!7H(~D z+9Y3^R-*%de10LNWIUa**=!h3XZc=AiDg+xDZ6XIdc8gm27`QGRdLZJfWzUya=Co0 z1z{L691gK<`{F#yGJvb|;{ATV@2&+}ut=47Q)(SJ9*>PGx%KVCGXO9ejn0naAcO#* z-|v^cOVbnpr4&h$u-$HZowY!7OT6yx;RJ*b7Xon{vsf&cOeVx}e3689s*@S`Yq3tk zbzN4gRldHL#tA5;t|}`NPSX^nRChn3vO%mG!Zrig$^l!vza`1{PubAjGySa{C^}Jf d-$wi?_yyYIj{898=63)9002ovPDHLkV1iTXx5xkh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-empty.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-empty.png new file mode 100644 index 0000000000000000000000000000000000000000..cfb67811ded35493451e6347deb973d7066f22d6 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#IhU{ygXW}}eHK8WWu7jMAr-gY-ZJECGGK7Hc+J9kV-=4Y--V-Rtt*8156DW` zGCX9EJ8*Vx==p&1MQTF4Z1E-^+oFT;o)X(sL@r%{lKO1KA9Q7Ap^V+IBRy@e- z;msS{a&>-b-QV{7M=vwq)OO#xt>s>tGT)cqc(-ono;#0kWOVOh1nC9>or6!_GcVir wFK~;+ZSBh@XV>gY-}mdKI;Vst0IVHdZ~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-money.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-money.png new file mode 100644 index 0000000000000000000000000000000000000000..22bde9d925ebcbe40ede78cd7dbbc142a6a9918b GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^2|(5O1b?4mTnf4^e z@~HHT*^Y_g_Z)fi@)=rHR3b#UI%QR6OVl4Zr(4o=hqY00`r~6i>U{KlXT{I9v%TsC zv7ssDR=B~#q;@=y0`U0-`#vYF3dvyA(|#pB1KUbh`yc*x+&!ZHJiimR1(Ywz|O z|5TSwj)}<*zOV9kX`yGL#Hy=Vm8VZ2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json new file mode 100644 index 00000000000..6836e5758b4 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ", + "states": [ + [ + { + "name": "off" + }, + { + "name": "shredding-empty", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + + }, + { + "name": "shredding-money", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] + ] +} + diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/normal.png b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..88b4cd207b020a8e0b48ff0efea1460a41c52015 GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o z>Fdh=oJ&|pnD>0Cb~RAQ+0(@_B;xSf3yPu)3OueC*D_C2VTstg^=2f)q=c6YtO5%R z-p@+k_e+U^;em0j@$6TJ?A~|IVoghWMpJyWc+t>n;r~$J=fLsWWhTf&f4wJ96OtWxVjFl762cP13+E~ zZ?D!0|5+5_`KZ;Xz$bPa=Aqsil7K&{dA_FcmuF9cn~NUsG?S66POUjJ4cQnBA9 z0LwHv@AtQB!O*ffHcg6}2EgL$d@3aXMNRY0{7j`}XxZttKqd5}L`8X<*nzkA1w^Q1 z?YG;`0KnK0H4;WdK6%op*RA%6(#Y)6}rNsT+gSSpfWC6A#e^nNg*qS@oj!f@I6f}roLl|cO xV>wVNRkiVCEQ5wF$@Ir|!0$xZeVpWff=~DZk_Ak^3M2pk002ovPDHLkV1nH{XE z)7O>#IhU{ygXW}}eHK8WWu7jMAr-gY-ZJECGGK7Hc+J9kV-=4Y--V-Rtt*8156DW` zGCX9EJ8*Vx==p&1MQTF4Z1E-^+oFT;o)X(sL@r%{lKO1KA9Q7Ap^V+IBRy@e- z;msS{a&>-b-QV{7M=vwq)OO#xt>s>tGT)cqc(-ono;#0kWOVOh1nC9>or6!_GcVir wFK~;+ZSBh@XV>gY-}mdKI;Vst0IVHdZ~y=R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-money.png b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-money.png new file mode 100644 index 0000000000000000000000000000000000000000..22bde9d925ebcbe40ede78cd7dbbc142a6a9918b GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^2|(5O1b?4mTnf4^e z@~HHT*^Y_g_Z)fi@)=rHR3b#UI%QR6OVl4Zr(4o=hqY00`r~6i>U{KlXT{I9v%TsC zv7ssDR=B~#q;@=y0`U0-`#vYF3dvyA(|#pB1KUbh`yc*x+&!ZHJiimR1(Ywz|O z|5TSwj)}<*zOV9kX`yGL#Hy=Vm8VZ2$lO literal 0 HcmV?d00001 From 32dc1a0cfee9f94743cc5f8c8189ccabc0c9f8e4 Mon Sep 17 00:00:00 2001 From: |Data_Redacted| Date: Wed, 25 Oct 2023 00:04:45 +0100 Subject: [PATCH 3/9] Shredder, 2! Even better JSON --- .../Machines/shredder.rsi/meta.json | 64 +++++++++++------- .../Machines/shredder.rsi/normal.png | Bin 164 -> 4234 bytes .../Machines/shredder.rsi/shredding-empty.png | Bin 263 -> 4267 bytes .../Machines/shredder.rsi/shredding-paper.png | Bin 0 -> 4413 bytes .../Machines/syndicate_shredder.rsi/meta.json | 13 ++++ .../syndicate_shredder.rsi/normal.png | Bin 164 -> 4234 bytes .../shredding-empty.png | Bin 263 -> 4267 bytes .../shredding-paper.png | Bin 0 -> 4413 bytes 8 files changed, 51 insertions(+), 26 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-paper.png create mode 100644 Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-paper.png diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json index 6836e5758b4..b570292a272 100644 --- a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json @@ -7,35 +7,47 @@ "license": "CC-BY-NC-SA-3.0", "copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ", "states": [ - [ - { - "name": "off" - }, - { - "name": "shredding-empty", - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] + + { + "name": "off" + }, + { + "name": "shredding-empty", + "delays": [ + [ + 0.1, + 0.1, + 0.1 ] + ] - }, - { - "name": "shredding-money", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + }, + { + "name": "shredding-money", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "shredding-paper", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 ] - } - ] + ] + } ] } diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png index 88b4cd207b020a8e0b48ff0efea1460a41c52015..35075ef7253ba4a70b0e232d068ad7435f3fccfe 100644 GIT binary patch literal 4234 zcmeHKd2ka|7~e7-N`pX)R;pB8ms+j5+1+F}O_rv#Bt0UA#x_Dc+n3#!u+t_RvfCuB zgK}FfhzO&|cnlOBhNC*v0V~dwQatb&JO+zY!9hkm!8#r|*y`I&&(RsDGx}dMlkD5? z_^f=Pw^{G`Ljz^+$K&pqh z+8BX2Oh^F?OPmaO?wQ_APq}m~Kejq`Q`%duo`ol;#s1h>ynFwy7cyR+lQyOI!lm?= zQf|w!_AJ`5d1o!y*5+ziTO>SM_+@Ixj$hWyc)0ks6503Zqn)RJSF=wX=ia@s_175a zFdROAI$So8SytZKa(w-f^~HI)1z%eh-TKkDjjLhHVsa(9v^m!vl4TW;$oj z++MbPZ_2t=%ZpOir@rWtp1XdN>(nF0vr^^U!`FSDdso&^8Q1n=SjuY2;qbT|j-h%` z70)c&Xs_rl&UvGzx->s4t>ucPZ+o8oemil^f~=O>ZLehA-9UHzJasFZn{Rw1yP z?Sp$Fr_Sv8vE>HxTlRkU z(t+hCZv5u`wkvIu)*e{V@?Bfrg_Nh}7GHEdb=lF4f3Rz+(i8Jq<(siN2a0Ro|6ybsbP`pf6OofqVg5s0!M z8WW)iYCH@poR^3Ip$@9J9|oncow#tYlfWg>PAul!v^(N}OQedXD6DQ;=oOmk1e-|A zD>4)&cmxoFD!>z=`mn+$?1YZXqqQcc2wXQ&>+FQj?ZF*#6ymIrHPU2hLW-G)A_HC+ z6$5;gvuqFoz1fK+sv6-bDjts;<7T5A4N{EFW}|2mWipY-f>avADoBuFWsU}s#Bf4I zh)NMvlEb)$3H)+{Y9|P!$A|I@McnRT_^>j_0^);8fC$AHX(|+=Mtdk~X$*l3CiIUU ziWiM3RRtBfAu7Pq7!0d(Mnj0guz#c>TCbNQ3KXn|A!MqcsLYs<A((Bku=EJz}+FU=-k z_WOkZ2>_r;)?&4gR;GXD?GX((2 zvVbE2YqpRUw1OhzhgQ>Qh{~vhx)Rin&Psz45fl?J1#Fy1lU6_@C=Q}*M2ndeEga-H zlnw{{dN!iKm&wr(K-(#WKoC-qa8Orhg!3gHmz^*f=@E&i9;gB2fM!4ni*j5UQF)~h ztX6@>Cu6Z$8LQQ7G1DA}RwG7>U{pc9sG%~n(ah=^ZDV*;4x$!lor(Z-IjV+tL?KY+ zs8^Qj?Sz&Tu6Yit-DsdhpaLgQAp)gMW}cyW6YE6_&c>UVTWE%-N7>7w6lnZ6Yi)e+ z!sMn`ND7MIsEd*_RSlOW-;%HOl0Hm0u8#!|gk%W{h(S@$6JaG)!V(Y;LUeu%HtdjG z`iEv<7=bohtR~V-iwwzv0zU~vmL>}VezV19V;PoC(mIT;$N@DDqOc^0ctl*G2GzO3 zZyMaH{IS`@mq2YF5M?AolOvRw32LxdN;@%zsx74c#z&!UFzSdwen}ZRy3k2T4IhPr ze4$+b&(GjK{GTCkd?LuW_?@6@g068fFfQYX?wX)$TnvoMc%r-hGr9~Tmnj%V|A6A? zs?_KRoJH5H$^Hf9PW{4#{q8vU5L%^2D(+G+Z0hCOHwD}JOg0jxsV;YE+Brk^m2+ox z&aaLk5$AH2czxYJe6VdAc6~-^S54~Yo~~cz%-k#XE$&LsJ-V)O;0El_f=`O>yR*M1 g_p0FjYV6SZ86ivd%$xhSbZa49r3;;H^J`cB1;?uD^Z)<= delta 110 zcmV-!0FnQSA*2D2B$F5r9b*#`6AjOGD|-L{07FScK~z}7?a(0=03ZxS(X9iPBm`K! zwb@w!l3?io1rVSx@0w@6`XT@T;4^(0yZg#aF*7+eBD9RQX6?$g007|D21~yb0>xV` QC;$Ke07*qoM6N<$f;@gFi~s-t diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-empty.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/shredding-empty.png index cfb67811ded35493451e6347deb973d7066f22d6..974d0d76f869954e2d8ea5f531fc7d72fce806c0 100644 GIT binary patch literal 4267 zcmeHKeQXnD7{5(JS;x=`8&hX?9*9i2-d(Tldglsb?W7GB=2qr_D7)Uh?ar;e(z~_Y zlIi%88H@u|zy&3UCKJX~rcRiO6VxFhU-2WGP6Fx_6qwP7BGdP-`-~=LiT<}H?Y;MW z{GRvuz0dQc@1una=cnjz(jy3x;&M8Q;4@GCPMiRLcZn-{;Nwt@r&KB8qG%{A`NT?q zD%Bx?f|%$-kXTosaM|R8=%g#hvLn~lU$f@y@z=w8KmvMu?@ z;->z@^G7?g^0(LHOTKK{pBmGjNa^~cq;v6+-;$4{w;Zo-n)2bLIrm(6ZEANy7~5|SL$kSSk`&!*~sy%v(64hIH`<&B^D^ICUR;o!rdvOCMQ7nNKRk!svLJ1J*^XD!mR6Dbeok&Q&B!)9zN(_5 zqv5?>tJk--Om10)UQRf3?#%PwVYl@Y*{|03oqi+h;sx7t*iqisIX*X7pFtm~iF-MH_4|*-?3>5_%cAwczxY}hNtJPw} zOZiJl!jOW!ZNHy6_p|lv`KSU4~B*5Kx#R)QXzmQ zhuN_9FyIs^?2)8O8>T{_s^^f}4I4_}6wbjZ0D_W6nx#nAX!5{?*~*%XcajuKj42RSZ_d-{P;8qSj0(sE?pAajq;>)?9 zAHexBP_Tn?@gItT5d_AX!Nf#t+?D}_I>qHK(Dmvw z(pkK0ar;^*DsegHd175Zc2OyHc~h@BUV~&!%WpF$(>I delta 210 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 delta 110 zcmV-!0FnQSA*2D2B$F5r9b*#`6AjOGD|-L{07FScK~z}7?a(0=03ZxS(X9iPBm`K! zwb@w!l3?io1rVSx@0w@6`XT@T;4^(0yZg#aF*7+eBD9RQX6?$g007|D21~yb0>xV` QC;$Ke07*qoM6N<$f;@gFi~s-t diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-empty.png b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-empty.png index cfb67811ded35493451e6347deb973d7066f22d6..974d0d76f869954e2d8ea5f531fc7d72fce806c0 100644 GIT binary patch literal 4267 zcmeHKeQXnD7{5(JS;x=`8&hX?9*9i2-d(Tldglsb?W7GB=2qr_D7)Uh?ar;e(z~_Y zlIi%88H@u|zy&3UCKJX~rcRiO6VxFhU-2WGP6Fx_6qwP7BGdP-`-~=LiT<}H?Y;MW z{GRvuz0dQc@1una=cnjz(jy3x;&M8Q;4@GCPMiRLcZn-{;Nwt@r&KB8qG%{A`NT?q zD%Bx?f|%$-kXTosaM|R8=%g#hvLn~lU$f@y@z=w8KmvMu?@ z;->z@^G7?g^0(LHOTKK{pBmGjNa^~cq;v6+-;$4{w;Zo-n)2bLIrm(6ZEANy7~5|SL$kSSk`&!*~sy%v(64hIH`<&B^D^ICUR;o!rdvOCMQ7nNKRk!svLJ1J*^XD!mR6Dbeok&Q&B!)9zN(_5 zqv5?>tJk--Om10)UQRf3?#%PwVYl@Y*{|03oqi+h;sx7t*iqisIX*X7pFtm~iF-MH_4|*-?3>5_%cAwczxY}hNtJPw} zOZiJl!jOW!ZNHy6_p|lv`KSU4~B*5Kx#R)QXzmQ zhuN_9FyIs^?2)8O8>T{_s^^f}4I4_}6wbjZ0D_W6nx#nAX!5{?*~*%XcajuKj42RSZ_d-{P;8qSj0(sE?pAajq;>)?9 zAHexBP_Tn?@gItT5d_AX!Nf#t+?D}_I>qHK(Dmvw z(pkK0ar;^*DsegHd175Zc2OyHc~h@BUV~&!%WpF$(>I delta 210 zcmZ3j*v>RTWwL~TY`w4$gXW}}eHIK149h%S978H@y}f0~*JQxpaPgXj^~Ne5HNFc+ z&stXq@gI38uq*7~3I({A#k0 zK&L-I?d3#Eu^nrBRZgo{tc9MSa)JsK>{)5AwM-R3u~U1+N-M=yik2Vu-SB&K=7yQ` zKa$Dre&6@K&wKCl-uF%RFXSl zeX!f(vhj8f7K+^*%=vj61o^uh=}C)Q;mD>NPwGnBq>uNWeRI#?W4i67FaKff>0iga zzUdCr?cR|GD?;K-br!T{uYGsi(@oI_?%gWq_G>r3UpM;q`^iXE#9OVKo=*7s?3Kvt zHJjdiwCv{HCrZ@W2U~tzx-5+TJW$h#R2!o@7d^S7=PRkX@B4_p7y8q4_^5AAtnGCzNgUi-sY`85jQt=d(j#W$j}3-PyaE%wnt41;D8-alf|6I}kt?t{NkmT1+Sn9FG z)dx8CnFt~$D?02?OA=!a1>iU$GmTsBy&ju$>-xa=vXAQDIWt1;-22i=s46u!uaREj ziaO)Srh2ztjCw6qGC&UOO$h+S@rQICJ`rWO6eBOH0THRLP zw#0aTb|2{SWZD;bvT|7QL`H-^;gIXM(8`9y+|$=; z>MJ_J;FLe2UqWGjZejP=eX8rxb#`|*=TRdg5E||oc=pg!hd|pE@u0o3%)h4?mqSLg zE-NSVJKUh}AV{0wchgJ(C%{%Nk9X>j{-$OG=2;!`u+og1-FhycPc89qnI#)6Oi2Ml zvPi-@iPld600$?~u-{>KdMUpS3F1=VSrlUk98?hsbV!yt9oD-%9ITKjWH@T{^F?xG zodni;SR0jLcwhnotaM1eAh;k`}K)uCIf%ceY=;WSDWtwwRuMxzRq z4M#~_sYc~$;KHV4tTZVc79*4P|dBHG6!l|TmlMa!~@M%f9ofd4s z0Gt8d$+~>r=`9QI;4%eT>7CirL%my`#11YCgz4RQsqo+y=cw!SZ)6YBsdLkS$6qD-Miu!&?babiqntHpl8 zhc>7%W5fWvaTyq0U=m_eqi}*Rap?SlpNTsBf*t_$ypuWcJ5Sd4lfpvX~0U8s(e|z`v9w3Qur#|9^poL4t zUkG&IUv#q~#>~d(=@&3)>?L&u$%Mj#paSuAE*_D%%+Yq)p<4A|%eAOp` zz~Ni_POCbsH74o#K%nB&f-k7C+mif(_OWX}l)Q&U1ib|>gM(*N&(y8D9ax#XrAb>d zME0(JMfh?kd&`ef=hgQTwtu#wIc59kwW7YRs Date: Thu, 26 Oct 2023 23:55:16 +0100 Subject: [PATCH 4/9] Added a non functional Shredder It will gladly take your money, but nothing else --- .../Entities/Structures/Machines/shredder.yml | 29 ++++++++++++++++++ .../shredder.rsi/{off.png => icon.png} | Bin .../Machines/shredder.rsi/meta.json | 2 +- .../Machines/syndicate_shredder.rsi/meta.json | 2 +- 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml rename Resources/Textures/_NF/Structures/Machines/shredder.rsi/{off.png => icon.png} (100%) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml new file mode 100644 index 00000000000..2f524133e2d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml @@ -0,0 +1,29 @@ +- type: entity + id: Shredder + parent: BaseLathe + name: shredder + description: It Shreds. What more is there to say? + components: + - type: Sprite + sprite: _NF\Structures\Machines\Shredder.rsi + snapCardinals: true + layers: + - state: icon + map: ["enum.LatheVisualLayers.IsRunning"] + - state: normal + shader: unshaded + map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: shredding-money + map: ["enum.MaterialStorageVisualLayers.Inserting"] + - type: Machine + board: ShredderMachineCircuitboard + - type: MaterialStorage + dropOnDeconstruct: false + whitelist: + tags: + - Money + - type: Lathe + idleState: icon + runningState: shredding-empty + canEjectStoredMaterials: false + staticRecipes: diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/icon.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/shredder.rsi/off.png rename to Resources/Textures/_NF/Structures/Machines/shredder.rsi/icon.png diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json index b570292a272..53f16bc73cf 100644 --- a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json @@ -34,7 +34,7 @@ 0.1 ] ] - }, + } { "name": "shredding-paper", "delays": [ diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json index 7a593dc0ef4..02f9d0b0f9e 100644 --- a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json @@ -34,7 +34,7 @@ 0.1 ] ] - }, + } { "name": "shredding-paper", "delays": [ From 2c4fc985f0d6bccd8d638554b7476e907bfdd341 Mon Sep 17 00:00:00 2001 From: |Data_Redacted| Date: Fri, 27 Oct 2023 22:30:14 +0100 Subject: [PATCH 5/9] Added Shredder Based off the lathe, the shredder is spawnable and interactable. --- .../Entities/Objects/Devices/production.yml | 16 ++++++++++++ .../Entities/Structures/Machines/shredder.yml | 12 ++++++--- .../_NF/Recipes/Lathes/electronics.yml | 7 +++++ .../Machines/shredder.rsi/meta.json | 24 ++++++++++-------- .../Machines/shredder.rsi/normal.png | Bin 4234 -> 4665 bytes 5 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml new file mode 100644 index 00000000000..7dd6c00ae6d --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -0,0 +1,16 @@ +- type: entity + id: ShredderMachineCircuitboard + parent: BaseMachineCircuitboard + name: shredder machine board + description: A machine printed circuit board for a shredder. + components: + - type: Sprite + state: engineering + - type: MachineBoard + prototype: Shredder + requirements: + MatterBin: 1 + materialRequirements: + Glass: 1 + - type: StaticPrice + price: 100 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml index 2f524133e2d..a59f315c860 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml @@ -2,7 +2,7 @@ id: Shredder parent: BaseLathe name: shredder - description: It Shreds. What more is there to say? + description: It shreds things. What more is there to say? components: - type: Sprite sprite: _NF\Structures\Machines\Shredder.rsi @@ -13,17 +13,21 @@ - state: normal shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] - - state: shredding-money + - state: shredding-empty map: ["enum.MaterialStorageVisualLayers.Inserting"] - type: Machine board: ShredderMachineCircuitboard + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic - type: MaterialStorage dropOnDeconstruct: false whitelist: tags: - - Money + - Currency #<--- Cant seem to insert spesos in here despite the tag - type: Lathe idleState: icon - runningState: shredding-empty + runningState: shredding-money canEjectStoredMaterials: false staticRecipes: + - ShreddedMoney diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml new file mode 100644 index 00000000000..57e2418203b --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -0,0 +1,7 @@ +- type: latheRecipe + id: ShreddedMoney + icon: { sprite: Objects/Misc/module.rsi, state: id_mod } + result: ShredderMachineCircuitboard + completetime: 3 + materials: + Currency: 1 diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json index 53f16bc73cf..89922e9f465 100644 --- a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json @@ -1,15 +1,19 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-NC-SA-3.0", - "copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ", - "states": [ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ", + "states": [ + + { + "name": "icon" + }, { - "name": "off" + "name": "normal" }, { "name": "shredding-empty", @@ -34,7 +38,7 @@ 0.1 ] ] - } + }, { "name": "shredding-paper", "delays": [ diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/normal.png index 35075ef7253ba4a70b0e232d068ad7435f3fccfe..b44d86203c09a2380b0a5d2e94303ebc8a908fd5 100644 GIT binary patch delta 878 zcmV-!1CjiSA-N=wM1MgN!ypK}`-(n6S)%wH)1))~L7!g~%p{p?#uZp+1BCte{e)Ks zB@Vn4$u;Mw;L4Sn1`-WzaEd&5fLzl2QV)kfT7urNRIi56)ihd8M)G!Hy$Y4x zUv5VJBlM1X7n>VZHv*ZE+@RT5F;^+)5!O9kA$CG16dQe-+%9u2y1i}DB8YY*L}h@j z0rZ1_)&*rk=@0cAu`)16)rCCmX(Idq-F#UW0&_N~k?|RSJ4nM&6o&t%ic%^LR`4}s zs7`iK5yw)+B3LMGg;pI*Zu){I4M~cNqu^R_@Ud8RaB4rtTK|H%@>74h8L#!kz#OK751~o|h$aUG}H_ke3JS*_Gqt55#IU|w5EbDe4oaV#N$Bt*!l zp^OSFL}=GYF_EJ4n1_GF@h8b8ldB9yjs;YqLUR0n;D7LYwq{{^%1sK!fbJLD{ul>( zc7bNyw!e>UyLkfmpMfi_?XNa~xlhvTZ7qBR^lt+f*KJMS11@)fp(kB3BuDa7355di zen#Jv0|st^z?wU^);UfefDFxQ`35*R1SX1IX5j~V>4wfWidB6WM*VGWMW}BlQRXX3^X({ zFf}zeGc+00006VoOIv0AK)P0CftFJou9p5Fkby6&oWPfs)n$001UQL_t(o z!|l*P5dZ)L05Bo6(LaeGr0{UJMOXv?00**bECBGv0>}jdGPW(#u>b%707*qoM6N<$ Eg8U3+sQ>@~ delta 807 zcmV+?1K9kzB#I%BM1NZj!!QW@&nb3<1d|8HN!L!=4R-vIK&!T@r4X=|k?|RSJxIeq9K~N#MJW{rixhFl zP@U|eA{|Q=i(sL&6nNgNw7S4z7YA_yOYT;-u&zCH^ld zw21NGxF7HCJ?`ECLaWA9vo8*)nq_2?2{B(-6$f4sKp3NlASN+WPh}T#@El+F@bUF7 z%Co%B{W*qzl%mN1pGX{Mx?vG-5YKH|I_G`j5UWTE@j3C7K^G)`UyL|%qpMfi_>#w(f*eB`Dt`<20hPQ!>>#ip60hc>K_(_)x$&vgtg;EK4 zKcjCd03)|RV9o8VvyamUAV*y--v9@Pz+{=S*FD}n*xTE`XFC1;04)e|@s^{EqW}O6 zc4<_zhXRQLBRFC)HZ?LiEj2P`VJ$Q?VKpsbG&43WHZ);1Wn?j8WjHc9lQRXX3^6!3 zGd43YH8nUfIFsoGaSAk4GBY|gIXW^ilVk=Y3N%zQGdeXnIx;b{k_HU{vt0>b2!DA) zX5;_>00v@9M??Ss00000`9r&Z00009a7bBm000XU000XU0RWnu7ytkO2XskIMF-~! z7#2Ghzd}=X0000rNkl@<_HPj+6tY*r2_(skdHy8;z)RLX lT~+ Date: Sun, 29 Oct 2023 13:09:42 -0400 Subject: [PATCH 6/9] tests fix --- .../Prototypes/_NF/Entities/Structures/Machines/shredder.yml | 2 +- .../_NF/Structures/Machines/syndicate_shredder.rsi/meta.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml index a59f315c860..7c3ec996625 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml @@ -5,7 +5,7 @@ description: It shreds things. What more is there to say? components: - type: Sprite - sprite: _NF\Structures\Machines\Shredder.rsi + sprite: _NF/Structures/Machines/Shredder.rsi snapCardinals: true layers: - state: icon diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json index 02f9d0b0f9e..7a593dc0ef4 100644 --- a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json @@ -34,7 +34,7 @@ 0.1 ] ] - } + }, { "name": "shredding-paper", "delays": [ From 9f3a19c595097ddb0c133d12dc1f486f77d2565b Mon Sep 17 00:00:00 2001 From: checkraze Date: Sun, 29 Oct 2023 13:48:04 -0400 Subject: [PATCH 7/9] fix more --- .../Entities/Structures/Machines/shredder.yml | 2 +- .../Machines/syndicate_shredder.rsi/meta.json | 78 +++++++++---------- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml index 7c3ec996625..51a77e2cd4d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml @@ -5,7 +5,7 @@ description: It shreds things. What more is there to say? components: - type: Sprite - sprite: _NF/Structures/Machines/Shredder.rsi + sprite: _NF/Structures/Machines/shredder.rsi snapCardinals: true layers: - state: icon diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json index 7a593dc0ef4..a998bea965a 100644 --- a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json @@ -7,48 +7,46 @@ "license": "CC-BY-NC-SA-3.0", "copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ", "states": [ - [ - { - "name": "off" - }, - { - "name": "shredding-empty", - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] + { + "name": "off" + }, + { + "name": "shredding-empty", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] - }, - { - "name": "shredding-money", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "shredding-paper", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - } + }, + { + "name": "shredding-money", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "shredding-paper", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] ] + } ] } From bf1440c85c0dcd863671fe8920a4d1fc37181fe0 Mon Sep 17 00:00:00 2001 From: checkraze Date: Sun, 29 Oct 2023 14:09:13 -0400 Subject: [PATCH 8/9] more fix --- .../Prototypes/_NF/Entities/Structures/Machines/shredder.yml | 4 ++-- Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml index 51a77e2cd4d..49566aca0d4 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/shredder.yml @@ -23,8 +23,8 @@ - type: MaterialStorage dropOnDeconstruct: false whitelist: - tags: - - Currency #<--- Cant seem to insert spesos in here despite the tag + components: + - Currency - type: Lathe idleState: icon runningState: shredding-money diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml index 57e2418203b..43bdfb14daf 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml @@ -4,4 +4,4 @@ result: ShredderMachineCircuitboard completetime: 3 materials: - Currency: 1 + Credit: 1 From 573da81629c2b8dd40d0688c130fd9927288313e Mon Sep 17 00:00:00 2001 From: checkraze Date: Sun, 29 Oct 2023 14:14:16 -0400 Subject: [PATCH 9/9] more normal --- .../Textures/_NF/Structures/Machines/shredder.rsi/meta.json | 4 +--- .../_NF/Structures/Machines/syndicate_shredder.rsi/meta.json | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json index 89922e9f465..d068a6d627f 100644 --- a/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/shredder.rsi/meta.json @@ -7,11 +7,9 @@ "license": "CC-BY-NC-SA-3.0", "copyright": "Created by [Data-Redacted] https://github.com/IData-RedactedI/frontier-station-14 ", "states": [ - { - "name": "icon" + "name": "icon" }, - { "name": "normal" }, diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json index a998bea965a..055c7f5258a 100644 --- a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "off" }, + { + "name": "normal" + }, { "name": "shredding-empty", "delays": [