Merge branch 'new-frontiers-14:master' into ore_bag.yml

new-frontiers-14 · Oct 17, 2023 · 3da8f19 · 3da8f19
2 parents d554978 + e9725a8
commit 3da8f19
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl
@@ -8,4 +8,10 @@ ent-CrateVendingMachineRestockCircuitVendFilled = CircuitVend restock crate
     .desc = Contains two restock boxes for a CircuitVend vending machine.
 
 ent-CrateVendingMachineRestockCuddlyCritterVendFilled = CuddlyCritterVend restock crate
-    .desc = Contains two restock boxes for a CuddlyCritterVend vending machine.
+    .desc = Contains two restock boxes for a CuddlyCritterVend vending machine.
+
+ent-CrateVendingMachineRestockChefvendFilled = ChefVend restock crate
+    .desc = Contains two restock boxes for a Chefvend vending machine.
+
+ent-CrateVendingMachineRestockCondimentStationFilled = Condiment Station restock crate
+    .desc = Contains two restock boxes for a condiment station.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -23,7 +23,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockChefvendFilled
-  cost: 680
+  cost: 100
   category: Service
   group: market
 
@@ -54,7 +54,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockCondimentStationFilled
-  cost: 300
+  cost: 100
   category: Service
   group: market
 

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -9,12 +9,12 @@
 
 - type: entity
   id: CrateVendingMachineRestockChefvendFilled
-  name: ChefVend restock crate
-  parent: CratePlastic
+  parent: CratePlasticBiodegradable
   components:
   - type: StorageFill
     contents:
       - id: VendingMachineRestockChefvend
+        amount: 2
 
 - type: entity
   id: CrateVendingMachineRestockClothesFilled
@@ -29,12 +29,12 @@
 
 - type: entity
   id: CrateVendingMachineRestockCondimentStationFilled
-  name: Condiment Station restock crate
-  parent: CratePlastic
+  parent: CratePlasticBiodegradable
   components:
   - type: StorageFill
     contents:
       - id: VendingMachineRestockCondimentStation
+        amount: 2
 
 - type: entity
   id: CrateVendingMachineRestockDinnerwareFilled