Adds vending restocks for ChefVend and Condiment Stations (#19305)

Co-authored-by: Jeff <velcroboy333@hotmail.com>

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 7813ee3b2ffdb57825dad9143d7922b4d1f64a26..86f121fa18a83abfd07e118ce17d6b8ca61179d3 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -16,6 +16,17 @@
   category: Service
   group: market
 
+- type: cargoProduct
+  id: CrateVendingMachineRestockChefvend
+  name: ChefVend restock crate
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockChefvendFilled
+  cost: 680
+  category: Service
+  group: market
+
 - type: cargoProduct
   id: CrateVendingMachineRestockClothes
   icon:
@@ -36,6 +47,17 @@
   category: Service
   group: market
 
+- type: cargoProduct
+  id: CrateVendingMachineRestockCondimentStation
+  name: Condiment Station restock crate
+  icon:
+    sprite: Objects/Specific/Service/vending_machine_restock.rsi
+    state: base
+  product: CrateVendingMachineRestockCondimentStationFilled
+  cost: 300
+  category: Service
+  group: market
+
 - type: cargoProduct
   id: CrateVendingMachineRestockEngineering
   icon:

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index 7cbec7bad7b12f803e8c8c2262c810d66789dd82..85667ef072fe3e053ee89554cb91ee895d1493c1 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -6,6 +6,15 @@
     contents:
       - id: VendingMachineRestockBooze
 
+- type: entity
+  id: CrateVendingMachineRestockChefvendFilled
+  name: ChefVend restock crate
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockChefvend
+
 - type: entity
   id: CrateVendingMachineRestockClothesFilled
   parent: CratePlastic
@@ -15,6 +24,15 @@
       - id: VendingMachineRestockClothes
       - id: VendingMachineRestockCostumes
 
+- type: entity
+  id: CrateVendingMachineRestockCondimentStationFilled
+  name: Condiment Station restock crate
+  parent: CratePlastic
+  components:
+  - type: StorageFill
+    contents:
+      - id: VendingMachineRestockCondimentStation
+
 - type: entity
   id: CrateVendingMachineRestockDinnerwareFilled
   parent: CratePlastic

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml b/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml
index 6d0e56cf8ed0a9d19587665ecd5cd12e18bc4f37..704b5e432ba0aec5d06d90b47e2939b9851a617c 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/vending_machine_restock.yml
@@ -20,6 +20,7 @@
       - VendingMachineRestockRobustSoftdrinks
       - VendingMachineRestockHotDrinks
       - VendingMachineRestockHappyHonk
+      - VendingMachineRestockCondimentStation
 
 - type: entity
   id: SpawnVendingMachineRestockFood
@@ -41,6 +42,7 @@
       - VendingMachineRestockDonut
       - VendingMachineRestockGetmoreChocolateCorp
       - VendingMachineRestockHappyHonk
+      - VendingMachineRestockCondimentStation
 
 - type: entity
   id: SpawnVendingMachineRestockDrink

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
index 0417c23f8eb422c40f004fb07606277775c89e4a..3324e7d2c31621bff8140149dc76219429d60c61 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml
@@ -77,6 +77,38 @@
       shader: unshaded
     - state: refill_chinese
 
+- type: entity
+  parent: BaseVendingMachineRestock
+  id: VendingMachineRestockChefvend
+  name: ChefVend restock box
+  description: Refill the ChefVend. Just don't break any more of the eggs.
+  components:
+  - type: VendingMachineRestock
+    canRestock:
+    - ChefvendInventory
+  - type: Sprite
+    layers:
+    - state: base
+    - state: green_bit
+      shader: unshaded
+    - state: refill_chef
+
+- type: entity
+  parent: BaseVendingMachineRestock
+  id: VendingMachineRestockCondimentStation
+  name: Condiment Station restock box
+  description: Refill the Condiment Station. Mmmm, cold sauce.
+  components:
+  - type: VendingMachineRestock
+    canRestock:
+    - CondimentInventory
+  - type: Sprite
+    layers:
+    - state: base
+    - state: green_bit
+      shader: unshaded
+    - state: refill_condiment
+
 - type: entity
   parent: BaseVendingMachineRestock
   id: VendingMachineRestockClothes

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
index 11dfd862b0f1bcdd4f513fa0a4cf0263bd5067fb..3e8f6a9b6b19e3ce2ab31def1a8288c9ad3c72ed 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -222,7 +222,7 @@
 - type: entity
   parent: VendingMachine
   id: VendingMachineChefvend
-  name: Chefvend
+  name: ChefVend
   description: An ingredient vendor for all your cheffin needs.
   components:
   - type: VendingMachine

diff --git a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
index 99cc8f2c332fd74e1ad5d32f4255288319070d9c..86e7d78e36e0289ecb1a68f724527fbf16356c0d 100644 (file)
--- a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/meta.json
@@ -24,6 +24,9 @@
     {
       "name": "refill_booze"
     },
+    {
+      "name": "refill_chef"
+    },
     {
       "name": "refill_chinese"
     },
@@ -33,6 +36,9 @@
     {
       "name": "refill_cola"
     },
+    {
+      "name": "refill_condiment"
+    },
     {
       "name": "refill_costume"
     },

diff --git a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_chef.png b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_chef.png
new file mode 100644 (file)
index 0000000..23b074d
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_chef.png differ

diff --git a/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_condiment.png b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_condiment.png
new file mode 100644 (file)
index 0000000..5fc525a
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_condiment.png differ