diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 7813ee3b2f..86f121fa18 100644 --- 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 7cbec7bad7..85667ef072 100644 --- 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 6d0e56cf8e..704b5e432b 100644 --- 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 0417c23f8e..3324e7d2c3 100644 --- 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 11dfd862b0..3e8f6a9b6b 100644 --- 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 99cc8f2c33..86e7d78e36 100644 --- 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 index 0000000000..23b074ddd1 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 index 0000000000..5fc525a8ca Binary files /dev/null and b/Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_condiment.png differ