From de8c7a39884bbc1f24e20fe1cb6c95f9bd72b34b Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Tue, 19 Sep 2023 19:51:49 +0300
Subject: [PATCH] Merge pull request #328

* Vends

* Update tankdispenser.yml
---
 .../Inventories/tankdispenser.yml             | 21 +++---
 .../_NF/Catalog/Fills/AstroVend.yml           | 73 -------------------
 .../Advertisements/astrovend.yml}             |  0
 .../VendingMachines/Inventories/astrovend.yml | 13 ++++
 .../Inventories/bountyvend.yml                | 13 ++++
 .../Inventories/circuitvend.yml               | 21 ++++++
 .../Inventories/contravend.yml                | 22 ++++++
 7 files changed, 80 insertions(+), 83 deletions(-)
 delete mode 100644 Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml
 rename Resources/Prototypes/_NF/Catalog/{Fills/AstroVendAds.yml => VendingMachines/Advertisements/astrovend.yml} (100%)
 create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
 create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
 create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml
 create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
index 986a606b069..f487985450c 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml
@@ -1,16 +1,17 @@
 - type: vendingMachineInventory
   id: TankDispenserEVAInventory
   startingInventory:
-    OxygenTankFilled: 5
-    NitrogenTankFilled: 5
-    EmergencyOxygenTankFilled: 5
-    ExtendedEmergencyOxygenTankFilled: 5
-    DoubleEmergencyOxygenTankFilled: 5
-    EmergencyNitrogenTankFilled: 5
-    ExtendedEmergencyNitrogenTankFilled: 5
-    DoubleEmergencyNitrogenTankFilled: 5
+#    EmergencyOxygenTankFilled: 5
+#    ExtendedEmergencyOxygenTankFilled: 5
+    OxygenTankFilled: 10
+    DoubleEmergencyOxygenTankFilled: 10
+#    EmergencyNitrogenTankFilled: 5
+#    ExtendedEmergencyNitrogenTankFilled: 5
+    NitrogenTankFilled: 10
+    DoubleEmergencyNitrogenTankFilled: 10
+
 - type: vendingMachineInventory
   id: TankDispenserEngineeringInventory
   startingInventory:
-    PlasmaTankFilled: 5
-    OxygenTankFilled: 5
+    PlasmaTankFilled: 10
+    OxygenTankFilled: 10
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml
deleted file mode 100644
index b98d7a2b12c..00000000000
--- a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-- type: vendingMachineInventory
-  id: AstroVendInventory
-  startingInventory:
-    ClothingOuterHardsuitSpatio: 5
-    ClothingShoesBootsMag: 15
-    ClothingOuterHardsuitBasic: 5
-    ClothingOuterHardsuitEVA: 10
-    ClothingHeadHelmetEVA: 15
-    RadioHandheld: 15
-    HandheldGPSBasic: 15
-    AirTank: 10
-    JetpackMiniFilled: 10
-    EncryptionKeyCommand: 30
-
-
-- type: vendingMachineInventory
-  id: CircuitVendInventory
-  startingInventory:
-##    SalvageExpeditionsComputerCircuitboard: 8
-    OreProcessorMachineCircuitboard: 10
-    CircuitImprinterMachineCircuitboard: 6
-    ProtolatheMachineCircuitboard: 6
-    AutolatheMachineCircuitboard: 6
-    ResearchComputerCircuitboard: 6
-    ResearchAndDevelopmentServerMachineCircuitboard: 12
-    TelecomServerCircuitboard: 6
-    ComputerIFFCircuitboard: 4
-    EngineeringTechFabCircuitboard: 4
-    MedicalTechFabCircuitboard: 4
-    ServiceTechFabCircuitboard: 4
-    ScienceTechFabCircuitboard: 4
-    MaterialReclaimerMachineCircuitboard: 4
-    ExosuitFabricatorMachineCircuitboard: 4
-    UniformPrinterMachineCircuitboard: 4
-    HydroponicsTrayMachineCircuitboard: 16
-    DawInstrumentMachineCircuitboard: 4
-
-- type: vendingMachineInventory
-  id: ContraVendInventory
-  startingInventory:
-    CigPackSyndicate: 8
-    Stimpack: 6
-    StimkitFilled: 4
-    SyndicateJawsOfLife: 4
-    ToolboxSyndicateFilled: 4
-    RadioJammer: 8
-    PowerSink: 2
-    BoxEncryptionKeySyndie: 8
-    AgentIDCard: 8
-    StealthBox: 6
-    ClothingMaskGasVoiceChameleon: 6
-    ClothingBackpackChameleonFill: 4
-    HypopenBox: 4
-    Emag: 2
-    StorageImplanter: 4
-    ClothingShoesBootsMagSyndie: 4
-    ClothingShoesChameleonNoSlips: 8
-    ClothingBackpackDuffelSyndicateEVABundle: 12
-    BoxHoloparasite: 2
-
-- type: vendingMachineInventory
-  id: BountyVendInventory
-  startingInventory:
-    PinpointerUniversal: 15
-    WeaponGrapplingGun: 10
-    HandheldGPSBasic: 5
-    JetpackMiniFilled:  10
-    WeaponDisabler: 10
-    WeaponEmpEmitter: 10
-    Zipties: 20
-    Flash: 15
-    ClothingEyesGlassesSunglasses: 12
-    ClothingHeadHatHoshat: 4
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/AstroVendAds.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astrovend.yml
similarity index 100%
rename from Resources/Prototypes/_NF/Catalog/Fills/AstroVendAds.yml
rename to Resources/Prototypes/_NF/Catalog/VendingMachines/Advertisements/astrovend.yml
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
new file mode 100644
index 00000000000..0c40f7272a9
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml
@@ -0,0 +1,13 @@
+- type: vendingMachineInventory
+  id: AstroVendInventory
+  startingInventory:
+    ClothingOuterHardsuitSpatio: 5
+    ClothingShoesBootsMag: 15
+    ClothingOuterHardsuitBasic: 5
+    ClothingOuterHardsuitEVA: 10
+    ClothingHeadHelmetEVA: 15
+    RadioHandheld: 15
+    HandheldGPSBasic: 15
+    AirTankFilled: 10
+    JetpackMiniFilled: 10
+    EncryptionKeyCommand: 30
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
new file mode 100644
index 00000000000..95ce8811267
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/bountyvend.yml
@@ -0,0 +1,13 @@
+- type: vendingMachineInventory
+  id: BountyVendInventory
+  startingInventory:
+    PinpointerUniversal: 15
+    WeaponGrapplingGun: 10
+    HandheldGPSBasic: 5
+    JetpackMiniFilled:  10
+    WeaponDisabler: 10
+    WeaponEmpEmitter: 10
+    Zipties: 20
+    Flash: 15
+    ClothingEyesGlassesSunglasses: 12
+    ClothingHeadHatHoshat: 4
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml
new file mode 100644
index 00000000000..556ea665486
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/circuitvend.yml
@@ -0,0 +1,21 @@
+- type: vendingMachineInventory
+  id: CircuitVendInventory
+  startingInventory:
+##    SalvageExpeditionsComputerCircuitboard: 8
+    OreProcessorMachineCircuitboard: 10
+    CircuitImprinterMachineCircuitboard: 6
+    ProtolatheMachineCircuitboard: 6
+    AutolatheMachineCircuitboard: 6
+    ResearchComputerCircuitboard: 6
+    ResearchAndDevelopmentServerMachineCircuitboard: 12
+    TelecomServerCircuitboard: 6
+    ComputerIFFCircuitboard: 4
+    EngineeringTechFabCircuitboard: 4
+    MedicalTechFabCircuitboard: 4
+    ServiceTechFabCircuitboard: 4
+    ScienceTechFabCircuitboard: 4
+    MaterialReclaimerMachineCircuitboard: 4
+    ExosuitFabricatorMachineCircuitboard: 4
+    UniformPrinterMachineCircuitboard: 4
+    HydroponicsTrayMachineCircuitboard: 16
+    DawInstrumentMachineCircuitboard: 4
diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml
new file mode 100644
index 00000000000..f9bff9fe51a
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml
@@ -0,0 +1,22 @@
+- type: vendingMachineInventory
+  id: ContraVendInventory
+  startingInventory:
+    CigPackSyndicate: 8
+    Stimpack: 6
+    StimkitFilled: 4
+    SyndicateJawsOfLife: 4
+    ToolboxSyndicateFilled: 4
+    RadioJammer: 8
+    PowerSink: 2
+    BoxEncryptionKeySyndie: 8
+    AgentIDCard: 8
+    StealthBox: 6
+    ClothingMaskGasVoiceChameleon: 6
+    ClothingBackpackChameleonFill: 4
+    HypopenBox: 4
+    Emag: 2
+    StorageImplanter: 4
+    ClothingShoesBootsMagSyndie: 4
+    ClothingShoesChameleonNoSlips: 8
+    ClothingBackpackDuffelSyndicateEVABundle: 12
+    BoxHoloparasite: 2