Nonlethal Vending Machine (Practice Rounds & Etc) (new-frontiers-14#1352

)

* Nonlethal Vending Machine (Practice Rounds & Etc)

* Updated

* Updated

* Added the Restocking

* Update meta.json

* Cleanup

* Update eject-unshaded.png

* Fixup

---------

Co-authored-by: Dvir <[email protected]>

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

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

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

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

Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nonlethalvend.yml

@@ -0,0 +1,23 @@
+- type: vendingMachineInventory
+  id: NonLethalVendInventory
+  startingInventory:
+    WeaponDisablerPractice: 4
+    WeaponLaserCarbinePractice: 4
+    BoxShotgunPractice: 8
+    MagazineBoxRiflePractice: 8
+    MagazineBoxCaselessRiflePractice: 10
+    MagazineBoxLightRiflePractice: 5
+    MagazineBoxPistolPractice: 10
+    MagazineBoxMagnumPractice: 10
+    RevolverCapGun: 2
+    BoxCartridgeCap: 4
+    FoamCrossbow: 2
+    BoxDonkSoftBox: 4
+    TargetDartsFlatpack: 2
+    BoxDarts: 4
+  contrabandInventory:
+    SpeedLoaderRifleHeavyPractice: 3
+    SpeedLoaderPistolPractice: 3
+    SpeedLoaderMagnumPractice: 3
+  emaggedInventory:
+    ThrowingKnife: 1

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

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

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

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
@@ -27,6 +27,9 @@
         },
         {
             "name": "refill_nfsdtec"
-        }
+        },
+		{
+			"name": "refill_nonlethal"
+		}
     ]
 }

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"
+    }
+  ]
+}