From 3fce0262f71faa3cd62dc64bf58b234f608f78d3 Mon Sep 17 00:00:00 2001
From: Slushy <SirMcSlushy@gmail.com>
Date: Sun, 12 May 2024 04:47:35 -0400
Subject: [PATCH 1/8] Nonlethal Vending Machine (Practice Rounds & Etc)

---
 .../Inventories/nonlethalvend.yml             |  21 +++++++++
 .../Structures/Machines/vending_machines.yml  |  33 +++++++++++++
 .../nonlethalvend.rsi/broken.png              | Bin 0 -> 1656 bytes
 .../nonlethalvend.rsi/deny-unshaded.png       | Bin 0 -> 990 bytes
 .../nonlethalvend.rsi/eject-unshaded.png      | Bin 0 -> 1345 bytes
 .../nonlethalvend.rsi/meta.json               |  44 ++++++++++++++++++
 .../nonlethalvend.rsi/normal-unshaded.png     | Bin 0 -> 879 bytes
 .../VendingMachines/nonlethalvend.rsi/off.png | Bin 0 -> 1211 bytes
 .../nonlethalvend.rsi/panel.png               | Bin 0 -> 255 bytes
 9 files changed, 98 insertions(+)
 create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.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/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
new file mode 100644
index 00000000000..f8015abed9d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
@@ -0,0 +1,21 @@
+- type: vendingMachineInventory
+  id: NonlethalVendInventory
+  startingInventory:
+    WeaponDisablerPractice: 4
+    WeaponLaserCarbinePractice: 4
+    MagazineBoxPistolPractice: 10
+    MagazineBoxMagnumPractice: 10
+    MagazineBoxLightRiflePractice: 10
+    MagazineBoxCaselessRiflePractice: 10
+    MagazineBoxRiflePractice: 10
+    BoxShotgunPractice: 10
+    BoxDonkSoftBox: 10
+    TargetDarts: 1
+    BoxDarts: 4
+  contrabandInventory:
+    WeaponRifleBB: 2
+    BoxCartridgeBB: 10
+  emaggedInventory:
+    SpeedLoaderPistoladPractice: 2
+    SpeedLoaderMagnumPractice: 2
+    ThrowingKnife: 4
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
index 3208b5fcdfb..51ababb89a1 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
@@ -396,3 +396,36 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+
+- type: entity
+  parent: VendingMachine
+  id: NonlethalVendingMachine
+  name: NonlethalVend
+  description: Try not to aim for the eyes!
+  components:
+    - type: VendingMachine
+      pack: NonlethalVendInventory
+      dispenseOnHitChance: 0.25
+      dispenseOnHitThreshold: 2
+      offState: off
+      brokenState: broken
+      normalState: normal-unshaded
+      ejectState: eject-unshaded
+      denyState: deny-unshaded
+      ejectDelay: 3
+    - type: Advertise
+      pack: LessLethalVendAds
+    - type: Sprite
+      sprite: _NF/Structures/Machines/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"
\ No newline at end of file
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..8eada85b87daee0aeee5c5e91d7d476a2c1dcae8
GIT binary patch
literal 1656
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
CW)!;s

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..e88b7af717adb55b538caa001985ed4ef96c1b1d
GIT binary patch
literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0004oX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmP!xqvQ>CI62aAX}WT;LSL`B4@M6n1KN?V~-2a}in2u&K2
z6c<Oqwcy~-V%5RLSyu;FK@j`_admN0bdeJ8OA0MQ1us0_$9eA@?z;~VY9*#w9Z^8j
zZ8I5@#7uTY47{QTJ`7+Svof=ccxoYyw)J&Scd70oJPZG;UNvViz$X$%nPJ+*>%`NW
zw!wLyIK+ywN_<W{W>SO1k6c$ge&bwlS>Tx=Go73x4iSrm7FJrA6-|wJia4xlI^_!)
zk5$fFoV8MgHTvW)4CeIZ6xV4DBZfu9k$?yV6>Ojc8xh)dQY<9tTx#PVa{UQ%DdgG!
zBgZ_-&>*{h@IUxHTPr^~;Uxtnp!3CXK1P7RE>N#J&iAq7)K38aGjOFh{pA`k^GSNO
zsfCY#zHQ**x~VC9z~v4w_+-eY>`H!GLOu_?pV2pEf&N>dd)1p;;~b|CK$>Q?bORh5
z0;2`WUTgF2uGYEzdB>d}q#qcza_Mu*5BLB8010qNS#tmY4#WTe4#WYKD-Ig~00I6<
zL_t(&Lt_{PqhJ(_f>AIEM!_f;selnm;{+;3R{x<)qQRYW#~9@&9s19CeJ#U{=@SXs
zfe(;t{}Tp=|EGcMKmvXw=s05scaj}&_P|bxJdF%!Z9fx~rU>XNNJ3c%P#nbhAB3S?
zngUAfCprNBy??>**?uR(+46H>cGH2KP#Fe>i|5aS#gIYoy6=o24CPV`Xk|Z90r2+0
zO@{X$KQeG{&}T5LkOH%_6%?Sd3=HQxo`J=X0jLbn$jqlo3LwXRP#Lfuh@o7ZfM5W8
z{PY=2J2*Hnd}ihbV-TA~ND3?m!fGd8gVlf>3RC|u&yJDO0uThqwO<BUz7Z+_L4c?f
z0J01p__Yuc8_4SNcZK{9Txdd-6hMys#HIj(Aw+I91Z7eTXl*}1h2&O4H*dB6zjAdm
zLvY{;iUNaN`-yD_P^B8g2GrH687cKVC4j1Bz=Bjrm2);^2bktBfY4{4RZ;x`2!D1C
zqH0<jd+`6^{2L_49yUOZ{Zy?5Zasp~|6Lft^gf{JAbJ~A{vN{>h`I-eQagCDJ)`YJ
z4T@6$*jzH~r)mnAy~`3zpT7d880K-!2h%U-%>&bX^FX<cf#I7FgbxDLYzflReu5!H
zZYdn;DDod<__F<PC`tviwx6KmhI?md6pVsVFbYP&C>RAJ6)-RW0LeO3v*xA(&;S4c
M07*qoM6N<$g6Qm~=l}o!

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..273b5a11b89c3d892a63877ff3ab74e8398360fd
GIT binary patch
literal 1345
zcmV-H1-|-;P)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*0004oX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmP!xqvQ>CI62aAX}WT;LSL`B4@M6n1KN?V~-2a}in2u&K2
z6c<Oqwcy~-V%5RLSyu;FK@j`_admN0bdeJ8OA0MQ1us0_$9eA@?z;~VY9*#w9Z^8j
zZ8I5@#7uTY47{QTJ`7+Svof=ccxoYyw)J&Scd70oJPZG;UNvViz$X$%nPJ+*>%`NW
zw!wLyIK+ywN_<W{W>SO1k6c$ge&bwlS>Tx=Go73x4iSrm7FJrA6-|wJia4xlI^_!)
zk5$fFoV8MgHTvW)4CeIZ6xV4DBZfu9k$?yV6>Ojc8xh)dQY<9tTx#PVa{UQ%DdgG!
zBgZ_-&>*{h@IUxHTPr^~;Uxtnp!3CXK1P7RE>N#J&iAq7)K38aGjOFh{pA`k^GSNO
zsfCY#zHQ**x~VC9z~v4w_+-eY>`H!GLOu_?pV2pEf&N>dd)1p;;~b|CK$>Q?bORh5
z0;2`WUTgF2uGYEzdB>d}q#qcza_Mu*5BLB8010qNS#tmY4#WTe4#WYKD-Ig~00Uu3
zL_t(|UhUgUXcIvg2k=SpQUwdO9*hTb5a~t5$3;;ZLG<7QYIE@*)Po06h~PnQf*^SD
zP%k|c(iFj4MSNj;(D<MTng%6e8$^oOplB_zpdjMv%+6<XXq|88kzvF4gEBKo*#Ayu
zCp&3&86kuaLI@#*kmgFra!KpA?hIrV?d`;PV%^opLHnCgHaR$;%vg+0F0hdgT=!qO
zbKBDUBkw?|STO1|r;`h8<OA3JZ<D2wjj1)Vw&3iM_JIG%rW1?hf@b6clm4Rz;P>1|
zHs4cVrE?Raez91P&oK6~To#Wtx^m-3g8#{;wy3$lRz8TjAJ}}<0L)HLvAKGkt+=_F
zZ8@J5^;4;oe3r5D<(hb`5&sPAKAAN-0(EkMjeOv;|H={KC!t?oYb>2kv!}1B;;~(u
zHvFq|ZHLC$&yjG4mUSk@Nk}vd=;ZR(+sX&7`;VFde53!<7!I;ynV@%MyU`ICHP?1N
zaM^#<43JecTQfjbBeOjNWECw+zVd~-%dn~HrJ(ZqHtXwsruAl+E<;W8f$RP|8vt3=
zW;y_}YRq;2QRjgCiEznP%G?)a$C<EvA(vtoieY=`^up3?^w^`|Np@2EP2{5H&ajLq
zIUD)FW&f1}Q2#d1s_(-x*qadLgAZZ*o_zittAwwc4%=McwVuT8fo|<1QEX2m7fRE7
zAhz$Y|EL)-G`2&O<%%d+Zuzh%Kjm_wT$y_=%I}?Fo3rsvG-~d?jzLj!Hu8bX{wqgF
zcNK7SPglS<e*NJWt)tL%6=a$ZT=!qOb955+(|^(=u^6f2{r$mAttMMIYm-SfoX=b7
z->TJJ!Qlf3Weexl-8*ddv-;yN76ah&4Zz^}vKmQC4S=jh5{CgGgb+dqA%qY@2qA<t
ziSoa7x<ARq<@$Wzlso79C%IPtNf32ago>~G1Ay;*6X*eOb$vXR?|fHK1K{ia0N^{{
zCFK#qPl7(~4*<UNT|><Pm)FN*_|A6;H3MW7&GrnCRkS$G0OgMAE(7CoeZFtb20&Jg
z(f5GAeBB=aeCNBQ8~}0MyNCM&fY`3beAiGjz}Ni&z<0h&$|FQ~6%v>0^L<n99G!$o
zOG6zgzOT=3WvDmE_x1U$3_Sp{8VL;mA%qaJ6vqAlzf_?5VooV;00000NkvXXu0mjf
DDV2gT

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json
new file mode 100644
index 00000000000..30ce8a13dab
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/meta.json
@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by [Data_Redacted] https://github.com/IData-RedactedI and art edited by Slush [Disord: slush6789]",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken"
+    },
+    {
+      "name": "deny-unshaded",
+      "delays": [
+        [
+          0.5,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "eject-unshaded",
+      "delays": [
+        [
+          0.1,
+          0.4,
+          0.2,
+          0.4,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "normal-unshaded"
+    },
+    {
+      "name": "off"
+    },
+    {
+      "name": "panel"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc887e77b3ea78235c6c36ae081de2efbe17c7a
GIT binary patch
literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004oX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmP!xqvQ>CI62aAX}WT;LSL`B4@M6n1KN?V~-2a}in2u&K2
z6c<Oqwcy~-V%5RLSyu;FK@j`_admN0bdeJ8OA0MQ1us0_$9eA@?z;~VY9*#w9Z^8j
zZ8I5@#7uTY47{QTJ`7+Svof=ccxoYyw)J&Scd70oJPZG;UNvViz$X$%nPJ+*>%`NW
zw!wLyIK+ywN_<W{W>SO1k6c$ge&bwlS>Tx=Go73x4iSrm7FJrA6-|wJia4xlI^_!)
zk5$fFoV8MgHTvW)4CeIZ6xV4DBZfu9k$?yV6>Ojc8xh)dQY<9tTx#PVa{UQ%DdgG!
zBgZ_-&>*{h@IUxHTPr^~;Uxtnp!3CXK1P7RE>N#J&iAq7)K38aGjOFh{pA`k^GSNO
zsfCY#zHQ**x~VC9z~v4w_+-eY>`H!GLOu_?pV2pEf&N>dd)1p;;~b|CK$>Q?bORh5
z0;2`WUTgF2uGYEzdB>d}q#qcza_Mu*5BLB8010qNS#tmY4#WTe4#WYKD-Ig~00ECl
zL_t(oM`IWTqhJ(_f`JB%P#PytF|zs(WfBeUoIA!SKk3ka&g*L#ZcLwu*A9XXFm`Y!
z*#Tz{>?CL|3@|}yih!<yB$R~!#X+3^K^V%#35a&UzxOW~T7!3jF^FB5vJ)!9z;N;W
zd9WBV=w0`n5rm;!oPa0?ynS$!;r+*t43%^A!5G9w2H&k5FvLJ<KqE7sU<eSE2>-l$
z#^B)Kz;NW!EwGr4o*JAD0^fDD8CVbQ2D4d&q`-*~%pn306#^hb@d0GZVIY53$p65F
zCe#T5D3fSFN(c~CNNzT~d8_sRm8+W>f&)+BwS!^@eB{eu`1<V!12-231OKNPU@@wf
z1CA!TSm|dh31Auqo-%|$SquzoV-Nm6oPUF0=n-_l$4{Rb-n@B(l?H*gZ{ITf`2H14
zg8)oCc(FaB?L-ZNAwg6K?0n*mLhpEB4W`4Tr!n}7Ok)uKK93<@Wg&wb|8%f82oPHm
z5_BQCxggR}<Uh#pW&7XYwS%AoXk8hNf>AIEMmk_%007g(uVG#LAp`&b002ovPDHLk
FV1jGvcD?`r

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6176a7c28f38e45e94b723f3af548107123a46f
GIT binary patch
literal 1211
zcmV;s1VsCZP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004oX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmP!xqvQ>CI62aAX}WT;LSL`B4@M6n1KN?V~-2a}in2u&K2
z6c<Oqwcy~-V%5RLSyu;FK@j`_admN0bdeJ8OA0MQ1us0_$9eA@?z;~VY9*#w9Z^8j
zZ8I5@#7uTY47{QTJ`7+Svof=ccxoYyw)J&Scd70oJPZG;UNvViz$X$%nPJ+*>%`NW
zw!wLyIK+ywN_<W{W>SO1k6c$ge&bwlS>Tx=Go73x4iSrm7FJrA6-|wJia4xlI^_!)
zk5$fFoV8MgHTvW)4CeIZ6xV4DBZfu9k$?yV6>Ojc8xh)dQY<9tTx#PVa{UQ%DdgG!
zBgZ_-&>*{h@IUxHTPr^~;Uxtnp!3CXK1P7RE>N#J&iAq7)K38aGjOFh{pA`k^GSNO
zsfCY#zHQ**x~VC9z~v4w_+-eY>`H!GLOu_?pV2pEf&N>dd)1p;;~b|CK$>Q?bORh5
z0;2`WUTgF2uGYEzdB>d}q#qcza_Mu*5BLB8010qNS#tmY4#WTe4#WYKD-Ig~00P@d
zL_t(oN5z*<ZxT@y#cwH;gkoC@r2&FL7gZJ(8&;+ZThfgyNOaB4l`h=r&Oa-^Lle{w
zU_v))jcHk!)J73Ys!$e{h!8=gEhVJT1loJ&0W&Z#GccyV<mH~Z^D^&nhL@Qc0ucg%
zK)qNjlFsFFRFUcFX{MC-_xJZ991eG^H_WO4tycTk?RG=0Rs)mC1eHn!Mn*=UTCIZF
zYzDnvuc&XeTH)yE2oj0J6ShPX4XYhwG8v`-Y&IKH0NHGoDdl}Jx*9+RS&ZN3|Cn|}
z4LBSQrqnZ$PN$g?(lr6Q-OiMHCd3fk1%AK3?sPgy^W)>2Qrh3#+=PvdjgIw14b0BY
z*1cXY6bc2v?Kp^u`T2ROsZ<I=p^$t77K;U<TVGjcFy`FXAfL}eEEZF4;Jjmob>*{{
zPJ;2)U(%&l=AH(6ZbM{z?406()ZSd6A%&y?Ib3yGnQEcA`ICkevJKSse#7C7Rfs(J
zLi%ZVm7M|Dibko&N7V%WrFLNN-~dKLZkT&$BYl@`QzZH<OFcfSC2&wYq`I)M0Efe)
zG*D|NZFCOD%*Q`82aPu7tC|2V){E*(E)D)X)&Bz@Vo9ci8o`CzO|~bX)9IKJB56Qu
zn@J6%J%QunW2S`2PCzNDC4juR!)>|9?YC6N?{oDt+lr6E-0||g*49)l0sL1dPp^Zu
zzBEL2?H70anw{T;ZEjwwwQJfF=!UEWmfu~c8r`M>LBn&ZxnPj$Snw0o@+5bRv?tJw
z|MoD_FLDo~%K8~SjBsHbQb;CXFc?_3Kg#8DfA0em6BF<){+$dgEqWotd(V@D{q$Y%
z{rXye20R{5U8B*!Zt91?fY0Y+GkUYKvLY~W$$61Jaw3t4JOeJ5t3EX~)l9&3`3hZ7
z31~RJlV~P@?}_nvT%G~E1^AiONMH~e3E=0N>|1~d7>!1Dqz<K0Nqz!ofJs#mGjPTL
ZoB;ZQuZZ_HIz|8h002ovPDHLkV1g@OCg}hG

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..231c1f49d7e7b8f122287c949bb59ad4158f6be9
GIT binary patch
literal 255
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DinK$vl=HlH+5aEhmkV@QO1vIOhm1d*PmKm#tfgBlP{#Q~0`
zE4kGC=l%Kr>FMbJIp*eN%ha3`6BWaD&sbm*%6Q_F!2Y{DzrVd@zI=UseEX>crdbvY
zEStDy9NZFJ%R1v2YsRyNOyPe`FJpUUc{ZPuYQA}c!B=L%>eZ(U_Q!P`JbAJ+@vK_-
t3JuwVKFN>&2Ru8_==hN1P(vdlL&qD1PwY2c&H&xV;OXk;vd$@?2>|MaU3dTh

literal 0
HcmV?d00001


From 8f0dcd298033f0ed1c1e43a005e93c67d66c1e71 Mon Sep 17 00:00:00 2001
From: Slushy <SirMcSlushy@gmail.com>
Date: Sun, 12 May 2024 05:01:58 -0400
Subject: [PATCH 2/8] Updated

---
 .../Inventories/nonlethalvend.yml             |   1 +
 .../nonlethalvend.rsi/broken.png              | Bin 1656 -> 1660 bytes
 .../VendingMachines/nonlethalvend.rsi/off.png | Bin 1211 -> 1213 bytes
 3 files changed, 1 insertion(+)

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
index f8015abed9d..93127a26dd5 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
@@ -9,6 +9,7 @@
     MagazineBoxCaselessRiflePractice: 10
     MagazineBoxRiflePractice: 10
     BoxShotgunPractice: 10
+    FoamCrossbow: 8
     BoxDonkSoftBox: 10
     TargetDarts: 1
     BoxDarts: 4
diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/broken.png
index 8eada85b87daee0aeee5c5e91d7d476a2c1dcae8..34d717b17aef139ded18155af374a756013b37ca 100644
GIT binary patch
delta 1218
zcmV;z1U>us4EzkR%K?9!Nkl<ZSVzT|TTGi}7{~ub4&_t?%Beut&5HpFSZfw1F~f$0
zgs9*=BxXt$qgOhkR~~MryYOP(c){HaE?Kf<yI3F^<0*)42@=zxP|izRps;c%r7ed7
zrJvvP^!uQtXE5=Xym{XD`M$pI|9!saJyd}xbar+M9*>9Xi;I7YY>Be6GO3oje{F3I
z{r&wB<2@qTFw)c0KW}VoL?94Aad9!Wx3`g*nTeg99jMi6WMyTg<gcixfY0Z{#KgoG
z(h&QkNj8G{`FW`Zl$V!t2YY*aSXfwKAI)fbdYb)&?BCtpg-WGj@q!@i`(qJR0R50U
zw%Kgh+S<a%$OwOCXJ_GZx%fGC>To!amX=1*Vjn?%n)S@g493RBFg!dAzuzA=nZrcQ
zf!5Ym!D_X#2r4uq`Xt%e**vg}Mx&8x!HChUX~2z*4USe}VIhmEsj1=TCX*>*yr>aS
zDwSw!YeRK)HFruKdc9trap<6-;iZJ5DB10HjsgkRYPEmR>-C%uv4|Rhj*bpNr_=E)
zEEWs<NE8W@2@PvyWu;V$?H?Q*#K6En#CTB!G&D2_Mxzm{tE-^pnCf7m{-&lTwv<mj
zJw3?_C@n3;&_91mp5!QzBD6d=$5uw)_#~E=mMAGx6JTF;;<VumMolBqllT~4YK3dX
ziN0Gmaq)k-4fb8Xn;Ta^%zZ%S(V`-pYimJ)DnD*HbM9Fvvvc5>vGeb4n@YGOBCY@m
zrFrl^6bc3E&pr*!Nv-rGoM#MAAg@4$6~`hry}_BkZdm4$h=dU!hVK4}Vs#-lFFys-
z$M+F%IdG-_C+R6r@YpG+ON%i%bnvPElL*K-ZIgf46L&}bolWRJ(ZJ<)<2`Yi62|i{
zz?ZAS&8uH=Tjtmim=nWKn~>Y%<@WAFhj`L0L!qufb8|D&i!}VqFYXn$`u^Z|NT~e&
zu_HhS5Pf@s2HS8t;aR1#KwzKDcQ<Y$<M&^<PVdPaI|3OQ8T$f=d&5(_96c^C*F&L!
zKk9$#!lf&pNuJ0EP=C=#m;=$4Txfau;u|>s_65w_W?;8ixlJ6703FlOh`SNdPN;j_
zAbBI91nj%>z0^9uHflmnP7c>MH^syiHzGR9lRga(bN$`mk~6*fBin)xgZAnNm)KtJ
z54Nwpf3P%@jX**Hl+{zSK`XQ<*!GE=9oc^$q~{ix(Q@HaOxc2M;@GPolxshqWjkaB
zUU}zDbmx4_?ZxhHwyN&GP^Fx}w5p5S#Ni0UA}Ik6+`&(GWA1AN_Wby=>l<#%c2vBq
zSXO*+`vQ3Jt=HJM;L62Au_PkpB#f1Kp->WrlJap}S63&{UC{0I>}T^)kyk-V0_uP3
z>xI0$JWM^9W&thF8!?~YdVQEm@$UHRZ+%A-U@#a2x`0}2)-VC>?d{SV@#*dD4HIyp
zTFVzzv)P=SfZEzxp`@e)qvK;Np!RePcbEz!czkk#1?aRV_;M?5M#%}FB&5Gtas*O^
z{@4(7mXLr`x|95OE$L4{5uhA6Do#2&ImO#_RaMpgA+)}}j`8vF<ON98BSEvJlAoU+
gcA`cT@IM3m3)f0{-|bMR*8l(j07*qoM6N<$g1@q6_y7O^

delta 1214
zcmV;v1VQ`!4EPMN%K?9wNkl<ZSVzT|OH5-`7{~ub9tEKYlvjaHXIu=RfVF1g$YQV|
zArcjw(S;c$#^_4N=*q`tbQUhgjSF^T&}5QH#>5Fk<2#6>2@=ymp*%Y&1qv31wzP#(
zUcKJ$>%CCu?F&r&B`4oG-@QHOf4=*jM^#XutE)@!`~6&BT3UZ%OO%(FOSSa<tE;OR
z7#N5d?>@;MATu-b!=|Ptgu`K!l$2m|a}(Lw+1T3Jf>x_VPEJl*{>sWqghC-qPELL#
z4Y5atWMf!ZSdeN!MMVX7u)Dj9#l=PT(Tr?18~X{_zrDQ;jYh-b1wq*J$3sy7{g66#
zI2_p6*ud!MDCU3W=HT^u`8jp!a=DO^kwMX7A3=Va_3Z2{#>dAoGBSdlot*=dIgDZs
zw6(PfGcz+Rf(p%uK1ptFE)OiD)9IvIBw{pc8gPAmougG$RK%icYis$r#bSvWPcZ^&
zwHod1?Wn1#;ZCW;Kp?;~jvh2Ryp(VhC8yKLQ6Ry3y&iu?qmlC=9*Pm@?CcZ_1_RH+
zZnv|KM3Eqw=&)8*RY|q@{-L2E3=R&)jHf7|v9VDwo6YceJfP*6?qJdW=H_O$luy0A
zy{QW*D=WkB-+xJ-)F_oAbZ>s1t&Fkh5iBn+Q&OfU!0B=0wCN1SEThts#F(FLgLlP^
z{+l<De_?-xeQRH76AFmC56C=FT#R$=ttiwKBrIpnJppxY9$d3d{$2PxJ(px86hNW0
z4&8xDr9#8m$Dli@+~MP<hml{X!HR1M!N5BEGM<{_l8mGgAclYY10~ub1TQ}d%e!|F
z_PTIo;0Ng`Q25{}Xv<14HN5|+{*wsExE)j26?cC}<E<c!@9E(6`S6CgObPS(rxChe
zgBw>r;kL}NBQP(9pEe<%Kfvwne_Y~8cMmFUC0bfqkXfwbXFK9vakKw6ze7Uh_m3R`
zI)Lcg6ExVm+YP^m&H{mbGGAZ+5?R0g#C3X4=GYO)%F5akK>R*3&CAj64RAdg8u*>=
zZd`x5@`2=ujR5thMA95kT5{3lxmRAq`ByJu!7&S`eTLh_;Rw(%twh3&h;~B5Lng@^
z3ngIxt#72(K8`U9^78Vy9t?_!D{e$|l&5?e9_EYJBTLTm{P%1N-;UU;Z(U-0c_7lh
z_U8W5Of>>Y1yEK`i~W!lT2*ZO#m$cFx6*%eJFIBE_&%l`kv4JcRS?a!AJ4KKwgMMk
zdkH;xpL2Vur-!Yk=TB6tCt=fcbDKCEfq0}O;I1$7>8{Uzitz3ZKJNaE+p--KFDv$y
z5PYF9o_YBN_HBD2B^hZaVZ6kPhLSLvw2$NZ`g(!xg1&%%FPo2wyb971(9qBz<mZ3q
zWBRU*1++eC#zK<o^<k>SyW`Kl^dC)t$z&4f0%~{691zga(ILH&n7+Qg0|HLe==q{*
zwOUgXP*+zcl$MraY+{@R)Sa&74%2}IPfSg+0E7MnUv9<CC^Z3;g!DH{jzGH59~*+s
z5)yFAaFYM7rThsf0+a(s#Z4!tc$+q^uCCrYgx1#9FflQax&WzqBxtr&3JMAioTy3y
c{%3%H0UFeKVtx#_ssI2007*qoM6N<$g7>9f761SM

diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/off.png
index f6176a7c28f38e45e94b723f3af548107123a46f..43ecef8118568f654cb5260ee14ce69a98a70753 100644
GIT binary patch
delta 767
zcmV<b0s#HH3B3uh%K?AgNkl<ZSVzT|&2JJ>6vb~TEeWkHw$KI$3A(6~Xt7~sh_RB!
zZCMzXjT=|GaHl)1EB}WkShud|#@NPG5>0BOh$U4hi%LX@)JXZLghB#x-&|k@24<#=
z=`VS?XYNe6hXXG&GXNqiEiKjZ`8?C<bedIUdU~3a@_sg(g+PBG&@pe2ssOE4`^4#V
zLbY0j$;nALK0b!w;bAD3%V0DbL8sFx>YL4GD3wYOjYgMgL=z3w4wA_vDFBPbLJA<2
zN|93D7o)2Iq@Q8@KL5+KBWl2AvyoEIL?V$OC8TQtR;!hidM3mW-34B+w`RB7ndZmG
zH>I?{y}b=vTU&n}^F$5I&d%069uH(P8Nlt>j|sQi&1yUz2fyDh-@w$=6ohuZP^UlU
zoLAuB-~htmuyO-uZ8OxB&tW14cdq?qdiC8%PXj%-Au>L8M)5*k22E^9A!$Gkm+fX!
zEpEGhvn7RW1J%P{P`JJh!H1ujei~S(GXOiG5bN<#HGzLW@jW=q<zU3`gt<o+rti@<
zMMBR~tj9;S1akQTtMl{oP#7Fx3$=E_!p`BE`M?cAqmAoTO#p}WqWpqOgMXds|AF`6
z7%8DfaB#cH_5_B8hDZsKG$6Lkq!!YiK&4V4B}8@tN>MEVWc4n$<$||fvpW8OtDk5q
zJ`QllEBAj}TT`_J@LwJK!PVNr0IQonx#L%Kejj$Z>*B3l)1E*#WF@e&ah283E-T>E
zKW8=V^RYVS`^ai>f;&dq6X?c&yBXcQ#C`aB-Sny4j5g|nakvzc3F!5D>Yj{Zv3RoQ
z0fWH+UnAd`frT3$Nb;WZ<Y28o3%+@~c`^eom#cTC(P&^l{#{^TadDBZ=*`;Nn!vz$
z`#JWK6AT9B8E`lpHIvEIOu%vBBKtrkpy9|~w3z@tCq^O>c?R$&z}Kus0{zfP0AJT+
x{{)!8=;$aNsl(CHk^BVE07+F5GjPfP`~#Pit_v54wGIFP002ovPDHLkV1m1ab>#p6

delta 765
zcmV<Z0s{TL3A+if%K?AeNkl<ZSVzT|Pj3=Y6vb~Tl!Rhi3#9>qK^IjP78_Qk3tQ5S
zD@b(B&Xq3Q>CQhZze5w$4`4z!YK>`GnAAoQOR7*7m52~Qr7b0-&;;6h=K(V?Ff%Zw
zzvShfx$`pbaE6ze83GXkfk3@jERxRUa#WG&>1n2v_xJbrAsl}WcdR$essOE4``GPv
zL#<W=lgR{?N(DwnMxa`)g4t{ay<V@VZ?#(C=;#O%iNq7OL=z3G9b_^YrT}a<8&d$;
zY?dkIeKEQkKn7Wi-{=3Bc0>(091f<`Gm%cGnG(`90lVGKlzJw_5ZwiSzrXHuI!W{6
z<C{|2-`w1Ujg5bej`c(h%+Ai%y<RUA3I)LJIEab)`FX0TR0=|&kbDCciv^-vUs-1`
z=G@mHpU*=q7E^BEykmxS<+GPgg7Ma0(xq4Co(6huLu7pHoZ^Ah-dvy|g`@#FTy<KR
zYN5ILlZF(s4b=92!{Loph&=d0`e}HTodMX2Myba~)dYY3rFLNN-~dKLZkT&$BYl@`
zQzZH<OFcfSC2&wYq`I)M0Efe)G*D|NZFCOD%*Q`82aPu7tC|2V){E*(E)D)X)&Bz@
zVo9ci8o`CzO|~bX)9IKJB56Qun@J6%J%QunW2S`2PCzNDC4juR!)>|9?YC6N?{oDt
z+lr6E-0^?%z1G%LEdl&jCr__~wZ1e&b?p~-{F<HLg>7zLs<ms{6X=Gl1eV`jryAX+
z0zt!bs<~j0>R9j-)$$~FjI<}vjsNyA(l2rkqssajJ&bT+98yRoU@#b1w?E3|a)0jw
z6B85gE&iPhEG>E=!+Xz@gZ=bf@csH)e+E1rPhEAR(ZFu%hroc(=VLQ^v$C=xFmTCv
zkv?)Fk%&A4E|;r5H8s^tz;*cwT~G;VIKGo;CV=mW@pxRG0lWqHnbk;O5E=>K=bG$W
vfC(6lMs}nQrBX?L0%(9qRS`3A#sHiE`hu^B_cl6400000NkvXXu0mjfFkfy5


From 5416e73b95152c54670edaa81bc76595a241b771 Mon Sep 17 00:00:00 2001
From: Slushy <SirMcSlushy@gmail.com>
Date: Sun, 12 May 2024 05:03:28 -0400
Subject: [PATCH 3/8] Updated

---
 .../nonlethalvend.rsi/normal-unshaded.png       | Bin 879 -> 886 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/normal-unshaded.png
index 3bc887e77b3ea78235c6c36ae081de2efbe17c7a..1a05c9d528e2d1f6513af9c35f7f96e7e2076d49 100644
GIT binary patch
delta 326
zcmV-M0lEI~2KEN9%K-tFlgt5G3_jcMWH?)X4$N*ku#+wVAb;E&^cf5*q`>TK1qG-q
z1H<`_XJ9d807?TInfU}mfT%?H=iM^~2L}g+BbRQ0#ccG{;A{|J@;%1zYazrzEJ9M?
zL<r^(0f-6#kfHbhvgI(4zboW_;6fAXgaDLDG$17e2r48u8{WLt`v1z+%?!bTC-B-q
zGY3GK1OZWLV1Gd>B+H!**#V~c3n26vXjZI00O8NhL1fLfu?PPj&c8v>@dO?4@zZC9
zTaO_0e-}nDz3&NxzYQvXkKqbL-2(_81cDdaGulqnAQ%!vg~04xmSFn)6)?pxk83`d
zemQR*nC6>z8ccr^g786r*piT-3(3s|k&Yt&L545e|0f2o9RwXf>qIyTM!_f;>41R&
Y0EXSI`rt9_2LJ#707*qoM6N<$g7z?u0ssI2

delta 319
zcmV-F0l@zD2JZ&2%K-t8lgt5G30i}9f-#6)n6i^G0w8~tbM(O&#6||+tsF4KKxsfD
zGoN4x5S0l3ynDvr;NZY;<kBs$n2nwqoDBlsb+s8-5AFuDS%jp(i4e>o0uU7fAVcv1
zWXoY7e^<!=z=bB%2>~dRXh2E`5L8HRHoSSO_5YQtn;C)wPvEtKVh4QW%V7BW?FR!l
z7Y76Xrx|}>F{+mXjwZTT>1QknU>XLVGK4@`3=C^y5B@)#e}iD?5p=-EPoEjyym^C_
z27$M4-!lC8{uNAv08Bi1u|1>hL=A!=K~xCreBzEm?|5Jhro*MDG5Cs1V-Ws6k0D-V
zA%h$Lbg(!G5L*%wbRoI9AktCfKgjT9``_TTgP<b=Xk8hNf>AIEMmk_%007g(uVG#L
RAp`&b002ovPDHLkV1l!*iTD5j


From 6e3fcbd0937dcaa0741cc1c7a9fe5b5b6d720736 Mon Sep 17 00:00:00 2001
From: Slushy <SirMcSlushy@gmail.com>
Date: Sun, 12 May 2024 10:35:56 -0400
Subject: [PATCH 4/8] Added the Restocking

---
 .../Service/vending_machine_restock.rsi/meta.json |   5 ++++-
 .../refill_nonlethal.png                          | Bin 0 -> 793 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png

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
index a4a1bfdd17f..dfb84277ec8 100644
--- 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
@@ -1,7 +1,7 @@
 {
     "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| pottedplant by @erhardsteinhauer based on @minnie6969 work",
+    "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| pottedplant by @erhardsteinhauer based on @minnie6969 work, NonlethalVend made by Slush modified from the NonlethalVend",
     "size": {
         "x": 32,
         "y": 32
@@ -28,5 +28,8 @@
         {
             "name": "refill_nfsdtec"
         }
+		{
+			"name": "refill_nonlethal"
+		}
     ]
 }
diff --git a/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png b/Resources/Textures/_NF/Objects/Specific/Service/vending_machine_restock.rsi/refill_nonlethal.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fcf2c6d6e0bfb657a50097b623660dd163ab489
GIT binary patch
literal 793
zcmV+!1LpjRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004oX+uL$Nkc;*
zP;zf(X>4Tx04UFukv&MmP!xqvQ>CI62aAX}WT;LSL`B4@M6n1KN?V~-2a}in2u&K2
z6c<Oqwcy~-V%5RLSyu;FK@j`_admN0bdeJ8OA0MQ1us0_$9eA@?z;~VY9*#w9Z^8j
zZ8I5@#7uTY47{QTJ`7+Svof=ccxoYyw)J&Scd70oJPZG;UNvViz$X$%nPJ+*>%`NW
zw!wLyIK+ywN_<W{W>SO1k6c$ge&bwlS>Tx=Go73x4iSrm7FJrA6-|wJia4xlI^_!)
zk5$fFoV8MgHTvW)4CeIZ6xV4DBZfu9k$?yV6>Ojc8xh)dQY<9tTx#PVa{UQ%DdgG!
zBgZ_-&>*{h@IUxHTPr^~;Uxtnp!3CXK1P7RE>N#J&iAq7)K38aGjOFh{pA`k^GSNO
zsfCY#zHQ**x~VC9z~v4w_+-eY>`H!GLOu_?pV2pEf&N>dd)1p;;~b|CK$>Q?bORh5
z0;2`WUTgF2uGYEzdB>d}q#qcza_Mu*5BLB8010qNS#tmY3ljhU3ljkVnw%H_00B8k
zL_t(oM`IWTqhJ(_f?)+5931}tU|{$^gPGw!hz$~(K7Bfvra3^j9EPFN^aVjdL14##
z=mB#CC?sHxfC|wUfGmbN0xE<RFhOamgLm)VG3@dWVpzZo6~F-)p)|=L4Cpf{Ak7cq
zGBl!@1@gIvg9C$*kPySVb?eBs2L%}F>;K;hG#F$#REVJ-$ZiMXnMh(F01JLXiIC_h
z09pPu;39+fc2Ne9&p{3WS<V4u3xQRjf)%z7;NahJ-~dzvJ0Qvd3JMDU-+%nbz`a4A
z!LULK9PFon7-o4oF!*JFG&+De0v{kc1T-}@8O~q4$Oyt9KC<N?z95J|0-(4D0gxl`
z0iqo6;K2iwM0Cp26CUiKs5l11R%nS3lnY>v7!W{A0;DMb<pL;k6pVsVFbW1UU|;|M
X0d8&ptXZ7z00000NkvXXu0mjftr<cO

literal 0
HcmV?d00001


From 2848c8d506e939877d5c5bb22539255ed4229ce9 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 7 Jun 2024 14:50:13 +0300
Subject: [PATCH 5/8] Update meta.json

---
 .../Specific/Service/vending_machine_restock.rsi/meta.json      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index dfb84277ec8..313b64f1324 100644
--- 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
@@ -27,7 +27,7 @@
         },
         {
             "name": "refill_nfsdtec"
-        }
+        },
 		{
 			"name": "refill_nonlethal"
 		}

From 459d67343ffea9c1b43c67cb061d2b07bc713b4f Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 7 Jun 2024 17:10:29 +0300
Subject: [PATCH 6/8] Cleanup

---
 .../Inventories/cuddlycritter.yml             |  2 +-
 .../Inventories/lesslethalvend.yml            | 22 ++++++----------
 .../Inventories/nonlethalvend.yml             | 25 ++++++++++---------
 .../_NF/Entities/Objects/Fun/darts.yml        | 13 ++++++++++
 4 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml

diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
index 9f8ef8fd7a8..06c97b19fa8 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cuddlycritter.yml
@@ -40,7 +40,7 @@
     CrayonRainbow: 5
     WeaponWaterPistol: 8
     WeaponWaterBlaster: 4
-    TargetDarts: 1
+    TargetDartsFlatpack: 1
     BoxDarts: 2
     ChessBoard: 2
     BackgammonBoard: 2
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
index 4bee76153f4..9086abe8c7d 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/lesslethalvend.yml
@@ -6,23 +6,17 @@
     WeaponRevolverArgentiNonlethal: 10
     WeaponShotgunDoubleBarreledRubber: 10
     WeaponFlareGun: 20
-    BoxDonkSoftBox: 10
-    BoxCartridgeCap: 10
-    MagazineBoxPistolRubber: 10
-    MagazineBoxMagnumRubber: 10
     BoxBeanbag: 8
     MagazineBoxRifleRubber: 8
-    MagazineBoxLightRifleRubber: 4
-    MagazineBoxCaselessRifleRubber: 4
-    SpeedLoaderRifleHeavyRubber: 10
+    MagazineBoxCaselessRifleRubber: 10
+    MagazineBoxLightRifleRubber: 5
+    MagazineBoxPistolRubber: 10
+    MagazineBoxMagnumRubber: 10
   contrabandInventory:
+    SpeedLoaderRifleHeavyRubber: 3
+    SpeedLoaderPistolRubber: 3
+    SpeedLoaderMagnumRubber: 3
     WeaponRifleBB: 2
     BoxCartridgeBB: 10
   emaggedInventory:
-    WeaponLaserCarbinePractice: 4
-    WeaponDisablerPractice: 4
-    MagazineBoxPistolPractice: 10
-    MagazineBoxMagnumPractice: 10
-    MagazineBoxLightRiflePractice: 10
-    MagazineBoxCaselessRiflePractice: 10
-    BoxShotgunPractice: 10
+    ThrowingKnife: 1
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
index 93127a26dd5..9c20b8a4a50 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
@@ -3,20 +3,21 @@
   startingInventory:
     WeaponDisablerPractice: 4
     WeaponLaserCarbinePractice: 4
+    BoxShotgunPractice: 8
+    MagazineBoxRiflePractice: 8
+    MagazineBoxCaselessRiflePractice: 10
+    MagazineBoxLightRiflePractice: 5
     MagazineBoxPistolPractice: 10
     MagazineBoxMagnumPractice: 10
-    MagazineBoxLightRiflePractice: 10
-    MagazineBoxCaselessRiflePractice: 10
-    MagazineBoxRiflePractice: 10
-    BoxShotgunPractice: 10
-    FoamCrossbow: 8
-    BoxDonkSoftBox: 10
-    TargetDarts: 1
+    RevolverCapGun: 2
+    BoxCartridgeCap: 4
+    FoamCrossbow: 2
+    BoxDonkSoftBox: 4
+    TargetDartsFlatpack: 2
     BoxDarts: 4
   contrabandInventory:
-    WeaponRifleBB: 2
-    BoxCartridgeBB: 10
+    SpeedLoaderRifleHeavyPractice: 3
+    SpeedLoaderPistolPractice: 3
+    SpeedLoaderMagnumPractice: 3
   emaggedInventory:
-    SpeedLoaderPistoladPractice: 2
-    SpeedLoaderMagnumPractice: 2
-    ThrowingKnife: 4
+    ThrowingKnife: 1
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml
new file mode 100644
index 00000000000..4d138b0f55d
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/darts.yml
@@ -0,0 +1,13 @@
+- type: entity
+  name: dartboard
+  id: TargetDartsFlatpack
+  parent: BaseNFFlatpack
+  description: A flatpack used for constructing a dart board.
+  components:
+  - type: Flatpack
+    entity: TargetDarts
+  - type: Sprite
+    layers:
+    - state: service_tray
+  - type: StaticPrice
+    price: 40

From 016fea5beb4c0e2ecf1fbb572e3a936dc03cc358 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 7 Jun 2024 17:31:43 +0300
Subject: [PATCH 7/8] Update eject-unshaded.png

---
 .../nonlethalvend.rsi/eject-unshaded.png      | Bin 1345 -> 1072 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/nonlethalvend.rsi/eject-unshaded.png
index 273b5a11b89c3d892a63877ff3ab74e8398360fd..ab098b08edfb9d50611f003dabd573d635fc006b 100644
GIT binary patch
delta 658
zcmX@ewSi-TBnLAC1H+|PO*R`9r!v-O2Ka=ysu)?xPdcQLnQ!dio{*4G9K>m;udi0m
zz_49(D+7aqf<peTkidl|H*dABU2k!DDFefl|4tkJ|7T#>#PI*z8iuv82M_1pSliC<
z{|3VZhRZ8@7(5&;=gpfJ=_nHAD3X|v;O6EgEGh!DHfnl=1dviL3Gxg64+8aI5*NXc
zrrA6VsGhUHBeIx*f$s<iGfvg!lV)IGT;u8D7!u+B_Byvelc501gRF-QznqSKf4t=X
zfA^~CvSrg{X2(Svdc6x?G*hwfp-D`v&8AF+Oeqhmg^bIOZZ1B;!+Y{YW&MHd6DB4s
zGuzq}Uh}f2-BmvKyhC#8+%s{!Cf%u<U+ptFmLGBLv;&8)aMSnG?+PE7>b-rc)IPKL
z?(*oC0}F$0op!kY&HqJ}xW1m?=1XzB8gRote*dD*@bQ(Dp|i75RdNCcuj8_XiYKa!
z3LanockTYq>ir)-J`^<6u76v3z;<W)_A>47kK(>&?+Cti`oQelJIZThe)#LYO?Bv&
zpWh)VHR<AK20ebT2|&k2zQ1t#=i+1hTjIUC18#0RC6;)u;Un{nGX6tr8f`g5MH)W%
z$2L1%cDQ6R!Gu?3?gfT>Z#<6ut>@x@aJEn3@&$pEWFB^|^Xy`#0p)ge8%{Vp{dqu1
zeCMZ{go%ug|JA8qjlR;*<m2o-q4(hVrS^gv7V;52jfy5LHzkY$D(yCWaCi$;&ph=x
zb2m>0>vLvq{s*4~Q>3Jta(d=W-`v5o<lTSnlMb)`?VliZqj|$U{kUf3pYNFs>zMQT
Ww;jw2xGM~dPX<p{KbLh*2~7ZT=rV5r

delta 934
zcmV;X16lmA2*C=F83+ad008AQat^T}l>vVVa7bBm000ie000ie0hKEb8vp<UVM#<m
zRCr$P+e>H@K^O<{N%2wz3$-4M2XheVMa9QOQ5r$?-~(!N@gUTL2T_RNL2rT}c=1p#
zJrvRu!COUqVS3Q`pa_}<C1M*yirAoNEwP{=;_A%KXLD$sZ|9L=!}o(SGfCM0PG)~6
zJ85<qA%qY@2qA=!=1RzNN$a=n3}hAU?ZkLu-POlI`<qcVIXIxqSd30Cu#pd3_g}el
z+tT|Z??9<oFzPg?lM8I*1K0g;lckZ3sWq~;;Ovq1fd9#+6N}}7X5<5t{-X!r_uNM|
z-&0_va}%O|u~?ALF!r)s7LPT$a^rtTg8#{;wy3$lRz8TjAJ}}<0L)HLvAKGkt+=_F
zZ8@J5^;4;oe3r5D<(hb`5&sPAKAAN-0(EkMjeOv;|H={KC!t?oYb>2kv!}1B;;~(u
zHvFq|ZHLC$&yjG4mUSk@Nk}vd=;ZR(+sX&7`;VFde53!<7!I;ynV@%MyU~9U7&X^+
zK5*H8)C`bSG+Q%3RwJ`L17sB~O1|=iy34Ss>ZPFa`Znw9eWvwhm@Y$2^MULBI~xF5
z)n+;XvTDqA|54|F{E2YMRm$8KWyhJYd?A-&7m8tf==8$UZ1mWp;7N8;`%UDc=FYH;
zC^;MXz-9lH15p1q&#LdkGT48c5aojpVf&tZ{vE4?ubU3rT;H{x#O{G^?ITfaPa_vf
z(|jPd@38-<889@qLzLx;C|GX!uqZ#}a-v+BdoIfFonf1^@l7;p?!JyeQF1o&fy@3Y
zM@V-SaCA>sz&C#V;TNr=&~z1Knh#v}U%7L1686)7(j>7MspI|q!AyUxCR;dblSww5
z&s*u=s?}Y=;R6R{3+L9|J8br|`r|Ja1K{!vz~K3^8c9nHfUHImhXEjj5JCtcgb+dq
zA%rxE^1pSuKgq@A`h4G%JLmf+xmN#45Or0Aim&?vfbV=0=mBtbeLR-$d{<Bd;OqVX
z;5*+X<q^V9f<EpK0KR|oT|><Pm)FN*_|A6;H3MW7&GrnCRkS$G0OgMAE(7CoeZFtb
z20&Jg(f5GAeBB=aeCNBQ8~}0MyNCM&fY`3beAiGjz}Ni&z<0h&$|FQ~6%v>0^L<n9
z9G!$oOG6zgzOT=3WvDmE_x1U$3_Sp{8VL;mA%qaJ6vqAlzf=;S`eIHgZU6uP07*qo
IM6N<$f+L>Lo&W#<


From 17584b0409b68231b49170b6ab5813328d9f3e3c Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 7 Jun 2024 17:52:23 +0300
Subject: [PATCH 8/8] Fixup

---
 .../_NF/Catalog/Cargo/cargo_vending.yml       | 10 +++
 .../_NF/Catalog/Fills/Crates/vending.yml      | 11 ++++
 .../Inventories/nonlethalvend.yml             |  2 +-
 .../Service/vending_machine_restock.yml       | 17 +++++
 .../Structures/Machines/vending_machines.yml  | 66 +++++++++----------
 .../vending_machine_restock.rsi/meta.json     |  2 +-
 6 files changed, 73 insertions(+), 35 deletions(-)

diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml
index c3599c4d97c..47ab0cdd1b5 100644
--- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_vending.yml
@@ -56,6 +56,16 @@
   category: cargoproduct-category-name-security
   group: market
 
+- type: cargoProduct
+  id: CrateVendingMachineRestockNonLethalVend
+  icon:
+    sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockNonLethalVendFilled
+  cost: 100 # Frontier
+  category: cargoproduct-category-name-security
+  group: market
+
 - type: cargoProduct
   id: CrateVendingMachineRestockAutoTuneVend
   abstract: true
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
index ef165874ac3..a4972ba8759 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/vending.yml
@@ -53,6 +53,17 @@
       - id: VendingMachineRestockLessLethalVend
         amount: 2
 
+- type: entity
+  id: CrateVendingMachineRestockNonLethalVendFilled
+  parent: CratePlasticBiodegradable
+  name: NonLethalVend restock crate
+  description: Contains two restock boxes for the NonLethalVend vending machine.
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockNonLethalVend
+        amount: 2
+
 - type: entity
   id: CrateVendingMachineRestockAutoTuneVendFilled
   parent: CratePlasticBiodegradable
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
index 9c20b8a4a50..1dbc5afea58 100644
--- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml
@@ -1,5 +1,5 @@
 - type: vendingMachineInventory
-  id: NonlethalVendInventory
+  id: NonLethalVendInventory
   startingInventory:
     WeaponDisablerPractice: 4
     WeaponLaserCarbinePractice: 4
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 ea1594b4336..8265a9b2935 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
@@ -127,6 +127,23 @@
       shader: unshaded
     - state: refill_lesslethal
 
+- type: entity
+  parent: SecuredVendingMachineRestock
+  id: VendingMachineRestockNonLethalVend
+  name: NonLethalVend restock box
+  description: A box containing practice bullets for the Non Lethal vending machine. A label reads THE BOX IS TAMPER PROOF AND WILL DESTROY IT'S CONTENT ON HARM.
+  components:
+  - type: VendingMachineRestock
+    canRestock:
+    - NonLethalVendInventory
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Service/vending_machine_restock.rsi
+    layers:
+    - state: base
+    - state: green_bit
+      shader: unshaded
+    - state: refill_nonlethal
+
 - type: entity
   parent: SecuredVendingMachineRestock
   id: VendingMachineRestockAutoTuneVend
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
index 4ea695f2a79..1d4f7bea910 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml
@@ -235,6 +235,39 @@
       energy: 1.6
       color: "#ff033e"
 
+- type: entity
+  parent: VendingMachine
+  id: NonLethalVendingMachine
+  name: NonLethalVend
+  description: Try not to aim for the eyes!
+  components:
+    - type: VendingMachine
+      pack: NonLethalVendInventory
+      dispenseOnHitChance: 0.25
+      dispenseOnHitThreshold: 2
+      offState: off
+      brokenState: broken
+      normalState: normal-unshaded
+      ejectState: eject-unshaded
+      denyState: deny-unshaded
+      ejectDelay: 3
+    - type: Advertise
+      pack: LessLethalVendAds
+    - type: Sprite
+      sprite: _NF/Structures/Machines/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"
+
 - type: entity
   parent: [BaseStructureUnanchorable, VendingMachine]
   id: VendingMachineAutoTuneVend
@@ -396,36 +429,3 @@
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AccessReader
     access: [["HeadOfSecurity"]]
-
-- type: entity
-  parent: VendingMachine
-  id: NonlethalVendingMachine
-  name: NonlethalVend
-  description: Try not to aim for the eyes!
-  components:
-    - type: VendingMachine
-      pack: NonlethalVendInventory
-      dispenseOnHitChance: 0.25
-      dispenseOnHitThreshold: 2
-      offState: off
-      brokenState: broken
-      normalState: normal-unshaded
-      ejectState: eject-unshaded
-      denyState: deny-unshaded
-      ejectDelay: 3
-    - type: Advertise
-      pack: LessLethalVendAds
-    - type: Sprite
-      sprite: _NF/Structures/Machines/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"
\ No newline at end of file
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
index 313b64f1324..d3fe3db9937 100644
--- 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
@@ -1,7 +1,7 @@
 {
     "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| pottedplant by @erhardsteinhauer based on @minnie6969 work, NonlethalVend made by Slush modified from the NonlethalVend",
+    "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| pottedplant by @erhardsteinhauer based on @minnie6969 work, NonlethalVend made by Slush modified from the NonLethalVend",
     "size": {
         "x": 32,
         "y": 32