From 31e7a9bcfd1935d4a10f704f58be5ee2f7f6cacc Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Sun, 1 Oct 2023 15:49:10 -0500 Subject: [PATCH] Adds vending restocks for ChefVend and Condiment Stations (#19305) Co-authored-by: Jeff --- .../Catalog/Cargo/cargo_vending.yml | 22 ++++++++++++ .../Catalog/Fills/Crates/vending.yml | 18 ++++++++++ .../Spawners/vending_machine_restock.yml | 2 ++ .../Service/vending_machine_restock.yml | 32 ++++++++++++++++++ .../Structures/Machines/vending_machines.yml | 2 +- .../vending_machine_restock.rsi/meta.json | 6 ++++ .../refill_chef.png | Bin 0 -> 498 bytes .../refill_condiment.png | Bin 0 -> 352 bytes 8 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_chef.png create mode 100644 Resources/Textures/Objects/Specific/Service/vending_machine_restock.rsi/refill_condiment.png 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 0000000000000000000000000000000000000000..23b074ddd1064d86e64fac06926657d627f08715 GIT binary patch literal 498 zcmV2zo|E&27z)?Y$ zC_t}M>Ra3X(;^BO#ee{087u1_)~8S3J;7C(fzkw3qrkzzfkjDyp)%hli}m% z{|qf1bIRAO+ueoD5mb)?2?+_&ZR?s|DJUp{?PFqQWjK50G(&UuR@MUt4*a2M6o`t7 z@=WThd17ZN&(F!l4Y%vv+t&;`_g;IGUC;uGmjB3(plTEd3JUTUXIgzo%gAA1VPS#W z^XunNhDA$OF?{>0#N5!(@DJGmRE+{q2vimaKM4wO=I7%RfZOx*$wP)c2d}>=EbYYz z0jlQ$2?-w2#WTxZ85o%{Ff%hV{QmWeVeg(D46~M8#+n9TQGl-$1o?#Mq8OA5__;o` zCB=D`3JMA^JbU(nVfKPu<$Dia#hD8TSx%Azpy3WI2e`rIz@I<=Sl_+-j`@Fd71*Aut*O08018A=PT*k^lez07*qoM6N<$f_6dQZ~y=R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5fc525a8ca6f3c41537cac84d4a4a535965ba877 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFsggHIEF;HC#Ogx9I!a>&A7)Z z!Gy)lIiaHUz`MJ<|I1sJ&Qi40>`Z*Or?Ozz#$8;?-B*e+_0QY?qd!M;MZ;!8# z-=^N!n9TlGwjpLwlao`d`*cNJ!^VX>cFZ_<_3G4pd<>Sy4j+E}f6Y(s1A&gyH5}Fl zzly&7k3T}BL5A5&IHbR6fBpY|$HS_PjE$3z7=|upNGqIbCcoj=krLrLUNEzf^D5&DMTpXzP5}|E7m5tsOf^dtZWu4w!s&UIwM9q$CgTm6+0&*Sv(LV^ trhiEVOQf!+qQg4XA76T*fnmbJAopdi;^xl0zrc`V@O1TaS?83{1OU!PkNf}t literal 0 HcmV?d00001