Fixup

new-frontiers-14 · Jun 7, 2024 · 17584b0 · 17584b0
1 parent 016fea5
commit 17584b0
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"
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
@@ -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