From 8239c92df9e0e8fd927ec19b4137498b37f08ef9 Mon Sep 17 00:00:00 2001 From: Data_Redacted Date: Sat, 14 Oct 2023 18:50:21 +0100 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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, 2 Nov 2023 23:40:32 +0000 Subject: [PATCH 04/10] Added the LessLethalVending Machine --- .../advertisements/vending/lesslethalvend.ftl | 20 ++++++++ .../Advertisements/lesslethalvend.yml | 23 +++++++++ .../Inventories/lesslethalvend.yml | 24 ++++++++++ .../Structures/Machines/vending_machines.yml | 33 +++++++++++++ .../nonlethalvend.rsi/broken.png | Bin 0 -> 1763 bytes .../nonlethalvend.rsi/deny - unshaded.png | Bin 0 -> 1035 bytes .../nonlethalvend.rsi/eject - unshaded.png | Bin 0 -> 1212 bytes .../nonlethalvend.rsi/meta.json | 44 ++++++++++++++++++ .../nonlethalvend.rsi/normal - unshaded.png | Bin 0 -> 932 bytes .../VendingMachines/nonlethalvend.rsi/off.png | Bin 0 -> 1225 bytes .../nonlethalvend.rsi/panel.png | Bin 0 -> 245 bytes 11 files changed, 144 insertions(+) create mode 100644 Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny - unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject - unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal - unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl new file mode 100644 index 00000000000..52512c18225 --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/vending/lesslethalvend.ftl @@ -0,0 +1,20 @@ +advertisement-lesslethalvend-1 = Brighten someone else's day with a rubber bullet! +advertisement-lesslethalvend-2 = Less Lethal (tm). Its the way to go! +advertisement-lesslethalvend-3 = Beanbags aren't just for sitting on! +advertisement-lesslethalvend-4 = Shock your friends with a tazer TODAY! +advertisement-lesslethalvend-5 = Warning: must be over 3 months old to purchase +advertisement-lesslethalvend-6 = Dont belive their lies +advertisement-lesslethalvend-7 = Tire out your foes with the peaceful option TODAY! +advertisement-lesslethalvend-8 = Less Lethal (tm) means more FUN +advertisement-lesslethalvend-9 = BUY BUY BUY BUY NOW! +advertisement-lesslethalvend-10 = Only a complete idiot buys lethal, go Less Lethal (tm) TODAY! +advertisement-lesslethalvend-11 = Beat those evildoers with a stick. NOW +advertisement-lesslethalvend-12 = Proudly parnered with the NFSD +advertisement-lesslethalvend-13 = Vote Space Kennidy, sponsored by the Less Lethal Group +advertisement-lesslethalvend-14 = Less death means we pass the saving on to YOU! +advertisement-lesslethalvend-15 = Proud to be the No. 1 weapon machine on Frontier Station +advertisement-lesslethalvend-16 = Warning: do not eat the rubber bullets. +advertisement-lesslethalvend-17 = Buy the handy dandy beanbag shell. Its organic! +advertisement-lesslethalvend-18 = Warning: do not eat the beanbag shells. +advertisement-lesslethalvend-19 = Buy your rubbers here TODAY! +advertisement-lesslethalvend-20 = Could you be our 1,000,000th customer? diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml new file mode 100644 index 00000000000..8ac32fbf921 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/lesslethalvend.yml @@ -0,0 +1,23 @@ +- type: advertisementsPack + id: LessLethalVendAds + advertisements: + - advertisement-lesslethalvend-1 + - advertisement-lesslethalvend-2 + - advertisement-lesslethalvend-3 + - advertisement-lesslethalvend-4 + - advertisement-lesslethalvend-5 + - advertisement-lesslethalvend-6 + - advertisement-lesslethalvend-7 + - advertisement-lesslethalvend-8 + - advertisement-lesslethalvend-9 + - advertisement-lesslethalvend-10 + - advertisement-lesslethalvend-11 + - advertisement-lesslethalvend-12 + - advertisement-lesslethalvend-13 + - advertisement-lesslethalvend-14 + - advertisement-lesslethalvend-15 + - advertisement-lesslethalvend-16 + - advertisement-lesslethalvend-17 + - advertisement-lesslethalvend-18 + - advertisement-lesslethalvend-19 + - advertisement-lesslethalvend-20 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml new file mode 100644 index 00000000000..b54fa8fe8db --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -0,0 +1,24 @@ +- type: vendingMachineInventory + id: LessLethalVendInventory + startingInventory: + WeaponDisabler: 4 + WeaponTaser: 4 + BoxDonkSoftBox: 10 + BoxCartridgeCap: 10 + MagazineBoxPistolRubber: 10 + MagazineBoxMagnumRubber: 10 + MagazineBoxLightRifleRubber: 4 + MagazineBoxCaselessRifleBigRubber: 4 + MagazineBoxCaselessRifleRubber: 4 + + contrabandInventory: + + emaggedInventory: + WeaponLaserCarbinePractice: 4 + WeaponDisablerPractice: 4 + MagazineBoxPistolPractice: 10 + MagazineBoxMagnumPractice: 10 + MagazineBoxLightRiflePractice: 10 + MagazineBoxCaselessRiflePractice: 10 + + diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 399282078cb..62655782b08 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -199,3 +199,36 @@ radius: 1.5 energy: 1.6 color: "#ff033e" + +- type: entity + parent: VendingMachine + id: LessLethalVendingMachine + name: LessLethalVend + description: Making violence safe since '08 + components: + - type: VendingMachine + pack: LessLethalInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 3 + - type: Advertise + pack: LessLethalAds + - type: Sprite + sprite: _NF/Structures/VendingMachines/nonlethalvend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#ff033e" diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..c69d15ddf86ff5b69da2b147b367854f9e9c75e9 GIT binary patch literal 1763 zcmV<91|0c`P)EX>4Tx04R}tkv&MmP!xqvQ>CI62aAX}WT;LSL`B4@RIvyaN?V~-2a}in2u&K2 z6c<1NmzipIL;+Q^ zj8r@(W^*fI;1xaaVF2Tpm6)j~(hC`Q*4I7tQr$&(mUrKu)vM%92KYqcDANs#c%689 z)6zNb6NgwyQi#uq#|*k4@gvt|m)|%S9Ts?I$jGGTh(p9;v5n<6W+g)S3h7rdi5=cUXj4C!zhJ^_28Yw1HbRP5Y4>|rMxny!} zfRSS!6{wILKlmT~o~>D!oN$wZF`)Cswm(LIz%J0J+4lFbZ8uH;|1)rQ8|DGnEC!zV$|qdEmRJse6dYnhYZD`X_X4na zUW+Q;c5z$LZ`jzq{!GN(ar z2qVo}pvrmB86xWP01);W31cjR)y5-Of@ucjIxfV_%(Yd?fK8X=@!49IxdO~KC(%WR zC*_#6$>Q8&8pUH8EwYrjy$NZ~y#Oq81-RR#!K6)B&VX3!C~lrsAZdRVYf0Rp^#WkE zH>m84y$vm(02aWjZv+}kYK~S0AQkj8qSpb?6Ut)J9Zk*WdvvkZmXsc>R*EiE4x4bMD42aD)%^Tr2n1MvB~AC+Z5YpJVT2}_5yrWUdpluQc2phqxU)o1>i zRR|glgBLHM>3Mc+eSZ=Ia%^;ZIv|KT5OoMfGfFCslFj6Og~j(CnMo|3#9}sL zi+-W%f=U>us0$ull0R%(7cKxfQ?z&ObE)zMQ>~E8mFq4=k?0uR-Q7f_0O$Mq zh$hoG=igQA4oQ+oCSt5zZO`WyHt2t+1KAkohDSjV@r~cX+SfMn+0OiJX}xDVt6kf1 zCU!8>*vIQHH&m?yHwU07SVRMeCN{jVn4FxYCi*o1-}TD;JYb}K<9hs|B#~r})i335 z#(}Vfp|E9oLIkk0aH86rGm5@rod;=KvkIHFR+W2n?*Wul0wtY7Q(Kq6+W%SE5k3jP zBCogR`$#VuZQj0i!KaGv+2)(NVrU4n*<3W^@o6aG{T5i!km1m!yuISlHU#{c=>MQ^N002ovPDHLk FV1iMdKFt6C literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny - unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny - unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..dd265621e1104563ae7257a73f1fce24b22c5f4d GIT binary patch literal 1035 zcmV+m1oZofP)EX>4Tx04R}tkv&MmP!xqvQ>CI62aAX}WT;LSL`B4@RIvyaN?V~-2a}in2u&K2 z6c<1NmzipIL;+Q^ zj8r@(W^*fI;1xaaVF2Tpm6)j~(hC`Q*4I7tQr$&(mUrKu)vM%92KYqcDANs#c%689 z)6zNb6NgwyQi#uq#|*k4@gvt|m)|%S9Ts?I$jGGTh(p9;v5n<6W+g)S3h7rdi5=cUXj4C!zhJ^_28Yw1HbRP5Y4>|rMxny!} zfRSS!6{wILKlmT~o~>D!oN$wZF`)Cswm(LIz%J0J+4lFbZ8uH;|1)rZB|usI9Ei6-++mFYr^(veTBQR2eD|uM;tR>@pLOwZ z0gk8$GJ5{hp0?CbSfqx+;%^*dFZ!-Gpi#<`PGm?YGBiqg?%mGVeeYLSX_WF!H!12(S6Hrfm==EzA|jrr*AHcSIMjr50KG!>jAE^K%r3Bx1EX>4Tx04R}tkv&MmP!xqvQ>CI62aAX}WT;LSL`B4@RIvyaN?V~-2a}in2u&K2 z6c<1NmzipIL;+Q^ zj8r@(W^*fI;1xaaVF2Tpm6)j~(hC`Q*4I7tQr$&(mUrKu)vM%92KYqcDANs#c%689 z)6zNb6NgwyQi#uq#|*k4@gvt|m)|%S9Ts?I$jGGTh(p9;v5n<6W+g)S3h7rdi5=cUXj4C!zhJ^_28Yw1HbRP5Y4>|rMxny!} zfRSS!6{wILKlmT~o~>D!oN$wZF`)Cswm(LIz%J0J+4lFbZ8uH;|1)r z7fh_S*jCVV&_Q$xqI9aD>EvJ$+7!e=h~VI4kxt^`lCgpg)j_Z#=+uI>MWcgMr8rp> z#Wpxpv>{+(OeBA%oI~4_(AHdX?{azXzMtieyLb0}cfWVP_q*f103n1BLI@#*kfx&5 zYH;XypHc5gzrLT>4%~ii1inmS@y;#HP6t)j*K3`uqkVTn9shRaq$Xm7sII?FL?=TB z_ixxXIutNQhXO`39%GsHEeD{IO(7PEBNmCHl1<_2rMS88!@>e8*;G~gv8j?aHdWF@ zU8Jh|x)t%v@)7{x+P$LyfNU;TwZGICM)}zjbnV$^ZWEP*RoAZ>fL#6$03aL=r=QUN=B|Eh+_!&Abl z5S8^UrJ(qa(`ZA&Ts~hufn7-8T+cXu{VrhsyB`Cg?W^l~zxgJ({z78+CaA3MSQT`> zzuV9NJbIOONoTe&w{=#%cD9yJHvcM2qAx<5e5GE`It-PV`33{}M+&=QmIe{;0Q{Q*sx z1HA4JaJ>rhvOl0DQjpjE0a8{$s`vw>t%CS}K9K@Tqr~n1^F1E`xBt&)030+Z5JCtc aUga<4k8o2q276@y0000EX>4Tx04R}tkv&MmP!xqvQ>CI62aAX}WT;LSL`B4@RIvyaN?V~-2a}in2u&K2 z6c<1NmzipIL;+Q^ zj8r@(W^*fI;1xaaVF2Tpm6)j~(hC`Q*4I7tQr$&(mUrKu)vM%92KYqcDANs#c%689 z)6zNb6NgwyQi#uq#|*k4@gvt|m)|%S9Ts?I$jGGTh(p9;v5n<6W+g)S3h7rdi5=cUXj4C!zhJ^_28Yw1HbRP5Y4>|rMxny!} zfRSS!6{wILKlmT~o~>D!oN$wZF`)Cswm(LIz%J0J+4lFbZ8uH;|1)rNklX@hzjJgVv z7-Gdiod1i1IR8`40sr2=U}z2A$-=J1!WsDH1yqKU|@jAegF22ffedd79lC>rvaFuxB%D99}L`F91Q%QX28YO)vBqN1{_Uv zvC_|25>V7VWe9<@*Tx?Fe>nffe~P2v@f#}k1jKW{fPr! z62c0k0m%iCjw1gV85kIr?SC^cmCEX>4Tx04R}tkv&MmP!xqvQ>CI62aAX}WT;LSL`B4@RIvyaN?V~-2a}in2u&K2 z6c<1NmzipIL;+Q^ zj8r@(W^*fI;1xaaVF2Tpm6)j~(hC`Q*4I7tQr$&(mUrKu)vM%92KYqcDANs#c%689 z)6zNb6NgwyQi#uq#|*k4@gvt|m)|%S9Ts?I$jGGTh(p9;v5n<6W+g)S3h7rdi5=cUXj4C!zhJ^_28Yw1HbRP5Y4>|rMxny!} zfRSS!6{wILKlmT~o~>D!oN$wZF`)Cswm(LIz%J0J+4lFbZ8uH;|1)rPe_w-7{@=h zt6=up%lB6b@@HVZ3?4w+~f zO&2Z6Ttm0L+jRf%UkB&5_uV^q-?{Qo&*k_0 zN&I@XOX8Q?@;m^GVC2L-ZYNsT&f%+?MCr_BeR_ z-mi2NTi9gzU%;jpph!Y}tu03$fI91TN!+HB`sKDfFTZD0T>+V(pU74N0Arygstr#i z@u9_0fSg}$7v{A!=(Bq+Dk4y&Fj*k{)og&ALN^Kt(tZ zi_Zh#bUJza$(PmlbM2-NSc|2SNetOS^)`DBfr@cpebZ86c>TO6Pb~-ZYB{j}^>V#b zfpP?NLcRJ)Scx{2b6`0U-53HTIZ}6tL^6$FHere1(Tsp94s;xFD6Rp0pCoUF(^klM3 z4#d;>7tHaFPG$lDO+_@@?Yww7R2~94p&tK2tjOQp-L2|yx7#hT$3jcmCSfQN<#0sJA1V=POj%00000NkvXXu0mjfY1uWR literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..faddc5335140321e9fdbcf422b41356805cba160 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7f6y z#WAE}&fAN&T!$P4SRaUsyx(**th!lbTG%|tgIc$5vRZp5I(kfJj);6Ex$GA66BVJE z4Q2mKb~k=lCSCDi-`$zXPZS#%m^c(*#4=6}#V>}(zUTEce&2V3?ZT(8uliz55C8mf z;OQ^R*>6~))@@$%{f5O!{tMH!AC+0~b*y2?*4-5qFzwyz@9NAtx5T0+GAY?__GE~< kXK|gs!;nG$i2Y9WvkY2~c Date: Fri, 3 Nov 2023 02:12:14 +0000 Subject: [PATCH 05/10] Update It works --- .../VendingMachines/Inventories/lesslethalvend.yml | 6 +++--- .../Structures/Machines/vending_machines.yml | 4 ++-- .../broken.png | Bin .../deny-unshaded.png} | Bin .../eject-unshaded.png} | Bin .../meta.json | 0 .../normal-unshaded.png} | Bin .../off.png | Bin .../panel.png | Bin 9 files changed, 5 insertions(+), 5 deletions(-) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{nonlethalvend.rsi => lesslethalvend.rsi}/broken.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{nonlethalvend.rsi/deny - unshaded.png => lesslethalvend.rsi/deny-unshaded.png} (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{nonlethalvend.rsi/eject - unshaded.png => lesslethalvend.rsi/eject-unshaded.png} (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{nonlethalvend.rsi => lesslethalvend.rsi}/meta.json (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{nonlethalvend.rsi/normal - unshaded.png => lesslethalvend.rsi/normal-unshaded.png} (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{nonlethalvend.rsi => lesslethalvend.rsi}/off.png (100%) rename Resources/Textures/_NF/Structures/Machines/VendingMachines/{nonlethalvend.rsi => lesslethalvend.rsi}/panel.png (100%) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index b54fa8fe8db..efdec594753 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -1,14 +1,14 @@ - type: vendingMachineInventory id: LessLethalVendInventory startingInventory: - WeaponDisabler: 4 - WeaponTaser: 4 + WeaponDisabler: 10 + WeaponTaser: 10 + WeaponPistolMk58Nonlethal: 20 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 MagazineBoxPistolRubber: 10 MagazineBoxMagnumRubber: 10 MagazineBoxLightRifleRubber: 4 - MagazineBoxCaselessRifleBigRubber: 4 MagazineBoxCaselessRifleRubber: 4 contrabandInventory: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 62655782b08..8fc9b1cb3cf 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -207,7 +207,7 @@ description: Making violence safe since '08 components: - type: VendingMachine - pack: LessLethalInventory + pack: LessLethalVendInventory dispenseOnHitChance: 0.25 dispenseOnHitThreshold: 2 offState: off @@ -219,7 +219,7 @@ - type: Advertise pack: LessLethalAds - type: Sprite - sprite: _NF/Structures/VendingMachines/nonlethalvend.rsi + sprite: _NF/Structures/Machines/VendingMachines/lesslethalvend.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/broken.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/broken.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny - unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/deny-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/deny - unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/deny-unshaded.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject - unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/eject-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject - unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/eject-unshaded.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/meta.json diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal - unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/normal-unshaded.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal - unshaded.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/normal-unshaded.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/off.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/off.png diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/panel.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/panel.png rename to Resources/Textures/_NF/Structures/Machines/VendingMachines/lesslethalvend.rsi/panel.png From c92c542424b210d7ab18a536ce50053306e42c82 Mon Sep 17 00:00:00 2001 From: |Data_Redacted| Date: Fri, 3 Nov 2023 02:35:19 +0000 Subject: [PATCH 06/10] Fix --- .../_NF/Entities/Structures/Machines/vending_machines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 8fc9b1cb3cf..657504d8563 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -217,7 +217,7 @@ denyState: deny-unshaded ejectDelay: 3 - type: Advertise - pack: LessLethalAds + pack: LessLethalVendAds - type: Sprite sprite: _NF/Structures/Machines/VendingMachines/lesslethalvend.rsi layers: From 33b9a91e312eb9be4c372d36c7f1a860f667534f Mon Sep 17 00:00:00 2001 From: |Data_Redacted| Date: Fri, 3 Nov 2023 17:18:20 +0000 Subject: [PATCH 07/10] Added restock to the vender --- .../_NF/Catalog/Cargo/cargo_vending.yml | 10 +++++++++ .../_NF/Catalog/Fills/Crates/vending.yml | 9 ++++++++ .../Inventories/lesslethalvend.yml | 1 - .../Service/vending_machine_restock.yml | 18 +++++++++++++++ .../vending_machine_restock.rsi/base.png | Bin 0 -> 241 bytes .../vending_machine_restock.rsi/green_bit.png | Bin 0 -> 175 bytes .../vending_machine_restock.rsi/meta.json | 21 ++++++++++++++++++ .../refill_lesslethal.png | Bin 0 -> 790 bytes 8 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_lesslethal.png diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml index 90c71335695..c630f3fcc63 100644 --- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml @@ -45,3 +45,13 @@ cost: 100 category: Fun group: market + +- type: cargoProduct + id: CrateVendingMachineRestockLessLethalVend + icon: + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockLessLethalVendFilled + cost: 100 + category: Security + group: market diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml index 32bed41754a..61bd0217956 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml @@ -33,3 +33,12 @@ contents: - id: VendingMachineRestockCuddlyCritterVend amount: 2 + +- type: entity + id: CrateVendingMachineRestockLessLethalVendFilled + parent: CratePlasticBiodegradable + components: + - type: StorageFill + contents: + - id: VendingMachineRestockLessLethalVend + amount: 1 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index efdec594753..0cf41a1d71e 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -2,7 +2,6 @@ id: LessLethalVendInventory startingInventory: WeaponDisabler: 10 - WeaponTaser: 10 WeaponPistolMk58Nonlethal: 20 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml index b4f02cd2475..0cb54c67c91 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -113,3 +113,21 @@ - state: green_bit shader: unshaded - state: refill_parts # TODO Update this later with a new sprite + +- type: entity + parent: SecuredVendingMachineRestock + id: VendingMachineRestockLessLethalVend + name: LessLethalVend restock box + description: A box containing rubber bullets and disruptors for the Less Lethal vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM. + components: + - type: VendingMachineRestock + canRestock: + - LessLethalVendInventory + - type: Sprite + sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_lesslethal + - type: CargoSellBlacklist diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/base.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..01a8c4ed215cd3473a68bc2ec243281307e9007f GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NS%G|&0G|+7 zAg$-6XJ&2Z>gDI@AM70%>K7Ur7Mm24oSBkSRNc}wZSJCl(b`Nvb&MrJe!&b5&u*jv zIoX~rjv*T7lM^Id8urRCaV0Qa-QBpr#KeSS8N-qLa$N!|=5Vq+eY$kv!4piz>3;3p z5%2HuUStv8(6l0=N8kkmvksG^2!}(>CW|W^S_`JKF(q|3izYDXC2Wvb*5D}oXv0YZ hRvxbag9(954EOhV{`}>#VlmKK22WQ%mvv4FO#tw0O9=n~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/green_bit.png new file mode 100644 index 0000000000000000000000000000000000000000..e362ff17152e40bd6447a9263d5ba02dccb23bb0 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;*0X`wF zg=Hc~j~+EJ(w#nidPqpfA_j&A1_logkCc=Y2IH9w3~7#zj!>FVdQ&MBb@0Ew$F`Tzg` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json new file mode 100644 index 00000000000..0ac580f8d77 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original source: https://github.com/tgstation/tgstation/blob/master/icons/obj/vending_restock.dmi @ commit 014c44ef6279beb02a5f3e76824439fa57181c22 - Additions and cleanup by @Vordenburg. LessLethalVend by @|Data_Redacted|", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "green_bit" + }, + { + "name": "refill_lesslethal" + } + + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_lesslethal.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_lesslethal.png new file mode 100644 index 0000000000000000000000000000000000000000..63fbb2afdd56b30a9de4fc88192424ff1b7890de GIT binary patch literal 790 zcmV+x1L^#UP)EX>4Tx04R}tkv&MmP!xqvQ>CI62aAX}WT;LSL`B4@RIvyaN?V~-2a}in2u&K2 z6c<1NmzipIL;+Q^ zj8r@(W^*fI;1xaaVF2Tpm6)j~(hC`Q*4I7tQr$&(mUrKu)vM%92KYqcDANs#c%689 z)6zNb6NgwyQi#uq#|*k4@gvt|m)|%S9Ts?I$jGGTh(p9;v5n<6W+g)S3h7rdi5=cUXj4C!zhJ^_28Yw1HbRP5Y4>|rMxny!} zfRSS!6{wILKlmT~o~>D!oN$wZF`)Cswm(LIz%J0J+4lFbZ8uH;|1)rw;7?FqKzP;JUGMhFE0=_i{k_x1YU z4RAOdj(_4bXT*i1@nS`%IU@jw;Hnpe6w09+31#xaY^P)k_L!0bp&&3aq$x`Z_W z^X5?*qMiv8HGbw&dP$(E?PeyLGV^E$JS9*sZf2rw3cj+60bsmXk^4P69FCvh3PJ6V UC+MSd82|tP07*qoM6N<$g5MfYX8-^I literal 0 HcmV?d00001 From 1ba36bfd37580ae1cb51c317aca555590f79eb80 Mon Sep 17 00:00:00 2001 From: |Data_Redacted| Date: Mon, 6 Nov 2023 13:11:36 +0000 Subject: [PATCH 08/10] More ammo types and some fun weapons -Added *Beanbag and Mosin rubbers *Darts to the contraband inventory (I think its funny) *Practice shotgun shells to emag *Added a flare gun as a alternative to the double barrel -May need to tweak the prices of weapons in the vend, flare, pisol, and disabler at $5000 currently --- .../VendingMachines/Inventories/lesslethalvend.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 0cf41a1d71e..51f54c45cf0 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -3,14 +3,21 @@ startingInventory: WeaponDisabler: 10 WeaponPistolMk58Nonlethal: 20 + WeaponShotgunDoubleBarreled: 10 + WeaponFlareGun: 20 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 MagazineBoxPistolRubber: 10 MagazineBoxMagnumRubber: 10 + BoxBeanbag: 8 + MagazineBoxRifleRubber: 8 MagazineBoxLightRifleRubber: 4 MagazineBoxCaselessRifleRubber: 4 contrabandInventory: + DartYellow: 20 + DartPurple: 20 + DartBlue: 20 emaggedInventory: WeaponLaserCarbinePractice: 4 @@ -19,5 +26,6 @@ MagazineBoxMagnumPractice: 10 MagazineBoxLightRiflePractice: 10 MagazineBoxCaselessRiflePractice: 10 + BoxPractice: 10 From d4e3c97af0697b84d2fa9faa75ce794641a16fb5 Mon Sep 17 00:00:00 2001 From: |Data_Redacted| Date: Mon, 6 Nov 2023 13:48:31 +0000 Subject: [PATCH 09/10] Updated Costs and added RubberMosin --- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 2 ++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 2 ++ .../Entities/Objects/Weapons/Guns/flare_gun.yml | 3 +++ .../VendingMachines/Inventories/lesslethalvend.yml | 5 +++-- .../Entities/Objects/Weapons/Guns/Guns/snipers.yml | 12 ++++++++++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index f59af15bfd6..aa5a6ee5082 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -317,6 +317,8 @@ - type: GuideHelp guides: - Security + - type: StaticPrice + price: 800 - type: entity name: practice disabler diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 7bfd914d94f..76b88502768 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -191,3 +191,5 @@ whitelist: tags: - CartridgePistol + - type: StaticPrice + price: 550 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml index d41346380c3..97146067eb1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml @@ -36,3 +36,6 @@ quickEquip: false slots: - Belt + + - type: StaticPrice #Dunno if I should be doing this outside of the _NF file + price: 150 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 51f54c45cf0..17f3a45d371 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -2,8 +2,9 @@ id: LessLethalVendInventory startingInventory: WeaponDisabler: 10 - WeaponPistolMk58Nonlethal: 20 - WeaponShotgunDoubleBarreled: 10 + Kardashev-MosinNonlethal: 20 + WeaponPistolMk58Nonlethal: 10 + WeaponShotgunDoubleBarreledRubber: 10 WeaponFlareGun: 20 BoxDonkSoftBox: 10 BoxCartridgeCap: 10 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml new file mode 100644 index 00000000000..c7518a112b3 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Guns/snipers.yml @@ -0,0 +1,12 @@ + +- type: entity + id: Kardashev-MosinNonlethal + parent: WeaponSniperMosin + suffix: Non-lethal + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgeLightRifle + capacity: 10 + proto: CartridgeLightRifleRubber From 88ca024263a4a1b45e2bdcc10da62a167581a57c Mon Sep 17 00:00:00 2001 From: |Data_Redacted| Date: Mon, 6 Nov 2023 14:05:39 +0000 Subject: [PATCH 10/10] Fix --- .../_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml index 17f3a45d371..53875ccee24 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml @@ -27,6 +27,5 @@ MagazineBoxMagnumPractice: 10 MagazineBoxLightRiflePractice: 10 MagazineBoxCaselessRiflePractice: 10 - BoxPractice: 10 - + BoxShotgunPractice: 10