From f8a7a2415a76d18c47b66e75a046ffce8c9435ea Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Sun, 10 May 2026 12:17:45 -0500 Subject: [PATCH 1/9] Added restock for sustenance vendor, increased count of almost all items in vendor, and added restock to cargo purchases --- .../Prototypes/Catalog/Cargo/cargo_food.yml | 10 ++++++ .../Inventories/sustenance.yml | 31 ++++++++++--------- .../Service/vending_machine_restock.yml | 17 ++++++++++ 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 890d64589e..779abe5d3b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -97,3 +97,13 @@ cost: 2000 category: cargoproduct-category-name-food group: market + +- type: cargoProduct + id: CrateFoodSustenance + icon: + sprite: Objects/Consumable/Food/mre.rsi + state: cone + product: VendingMachineRestockSustenanceVendor + cost: 500 + category: cargoproduct-category-name-food + group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index 4913ff6fd2..aef1ee8b45 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -1,25 +1,26 @@ - type: vendingMachineInventory id: SustenanceInventory startingInventory: - DrinkMREFlask: 3 + DrinkMREFlask: 5 # starcup: increased MRE flasks in hopes of making sustenance vendor not be consistently empty FoodSnackNutribrick: 5 FoodSnackMREBrownie: 5 FoodCondimentPacketKetchup: 5 # Begin DeltaV Additions - ReagentTinPowderedMilk: 2 - ReagentTinPowderedMilkSoy: 2 - ReagentTinPowderedJuiceOrange: 1 - ReagentTinPowderedJuiceLime: 1 - ReagentTinPowderedJuiceWatermelon: 1 - ReagentTinPowderedJuiceApple: 1 - ReagentTinPowderedJuiceBerry: 1 - ReagentTinPowderedJuicePineapple: 1 - ReagentTinPowderedJuiceTomato: 1 - ReagentTinPowderedJuiceBanana: 1 - ReagentTinPowderedJuiceCarrot: 1 - ReagentTinPowderedJuiceCherry: 1 - ReagentTinPowderedJuiceGrape: 1 - ReagentTinPowderedJuiceLemon: 1 + # starcup: increased orange juice to lemon juice to three from one can, milk and soy doubled (from 2 to 4) + ReagentTinPowderedMilk: 4 + ReagentTinPowderedMilkSoy: 4 + ReagentTinPowderedJuiceOrange: 3 + ReagentTinPowderedJuiceLime: 3 + ReagentTinPowderedJuiceWatermelon: 3 + ReagentTinPowderedJuiceApple: 3 + ReagentTinPowderedJuiceBerry: 3 + ReagentTinPowderedJuicePineapple: 3 + ReagentTinPowderedJuiceTomato: 3 + ReagentTinPowderedJuiceBanana: 3 + ReagentTinPowderedJuiceCarrot: 3 + ReagentTinPowderedJuiceCherry: 3 + ReagentTinPowderedJuiceGrape: 3 + ReagentTinPowderedJuiceLemon: 3 # End DeltaV Additions contrabandInventory: FoodTinMRE: 3 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 727d1f2e2e..b18d275afc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -494,3 +494,20 @@ - state: green_bit shader: unshaded - state: refill_medical + +# starcup: added sustenance vendor restock +- type: entity + parent: BaseVendingMachineRestock + id: VendingMachineRestockSustenanceVendor + name: Sustenance Vendor restock box + description: A box loaded with the worst of the worst ingredients, food, and drinks for prisoners. So many corners were cut, that they reused an old snack vendor box. + components: + - type: VendingMachineRestock + canRestock: + - SustenanceInventory + - type: Sprite + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_snack From 440bdffa8520ed40c6301d1d408dcbb86c2c96c5 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Sun, 10 May 2026 12:54:52 -0500 Subject: [PATCH 2/9] Fixed the state of the sprite --- Resources/Prototypes/Catalog/Cargo/cargo_food.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 779abe5d3b..eb0897f4f9 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -102,7 +102,7 @@ id: CrateFoodSustenance icon: sprite: Objects/Consumable/Food/mre.rsi - state: cone + state: mre-closed product: VendingMachineRestockSustenanceVendor cost: 500 category: cargoproduct-category-name-food From e9366fba1c4724cb80bbb80ee0ce9918a07f3f96 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Mon, 11 May 2026 06:10:31 -0500 Subject: [PATCH 3/9] change description of the restock box I didn't like it... --- .../Objects/Specific/Service/vending_machine_restock.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b18d275afc..e7f1439ed7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -500,7 +500,7 @@ parent: BaseVendingMachineRestock id: VendingMachineRestockSustenanceVendor name: Sustenance Vendor restock box - description: A box loaded with the worst of the worst ingredients, food, and drinks for prisoners. So many corners were cut, that they reused an old snack vendor box. + description: A box loaded with the worst of the worst in terms of... "sustenance." They couldn't even bother to paint anything unique on the box. Load it into a Sustenance Vendor to begin. components: - type: VendingMachineRestock canRestock: From c0deb45a6983a578b2a06cf4e8af1b75f79bd528 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Mon, 11 May 2026 14:47:45 -0500 Subject: [PATCH 4/9] Add restock to cargo_vending.yml Whoops --- .../Prototypes/Catalog/Cargo/cargo_vending.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 393120430c..d914cd2186 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -323,3 +323,17 @@ cost: 600 category: cargoproduct-category-name-service group: market + +- type: cargoProduct + id: CrateVendingMachineRestockSustenance + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: VendingMachineRestockSustenanceVendor + container: + entity: WrappedParcel + containerId: contents + cost: 600 + category: cargoproduct-category-name-service + group: market + From 32d5f7aa2d8f77f24f60a82f85d29876b9be2113 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Mon, 11 May 2026 15:42:36 -0500 Subject: [PATCH 5/9] attempt to fix arbitrage --- Resources/Prototypes/Catalog/Cargo/cargo_food.yml | 2 +- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index eb0897f4f9..417464913f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -104,6 +104,6 @@ sprite: Objects/Consumable/Food/mre.rsi state: mre-closed product: VendingMachineRestockSustenanceVendor - cost: 500 + cost: 700 category: cargoproduct-category-name-food group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index d914cd2186..c800162f87 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -333,7 +333,7 @@ container: entity: WrappedParcel containerId: contents - cost: 600 + cost: 700 category: cargoproduct-category-name-service group: market From 75a4f8f810a03198d50eb2e845d9a07ccaa9fee5 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Tue, 12 May 2026 16:51:12 -0500 Subject: [PATCH 6/9] FUCK YOU ARBITRAGE --- Resources/Prototypes/Catalog/Cargo/cargo_food.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 417464913f..059c983402 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -104,6 +104,6 @@ sprite: Objects/Consumable/Food/mre.rsi state: mre-closed product: VendingMachineRestockSustenanceVendor - cost: 700 + cost: 800 category: cargoproduct-category-name-food group: market From 7bf95641d113ef5cda7f02de3b42375f52195a4d Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Tue, 12 May 2026 16:52:17 -0500 Subject: [PATCH 7/9] IM STILL MAD AT YOU ARBITRAGE --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index c800162f87..40c4adb2e4 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -333,7 +333,7 @@ container: entity: WrappedParcel containerId: contents - cost: 700 + cost: 800 category: cargoproduct-category-name-service group: market From 3909d6874bdfa243c896f19e49e1011d7da1c808 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Wed, 13 May 2026 16:25:33 -0500 Subject: [PATCH 8/9] increases initial stock quality of the sustenance vend --- .../Prototypes/Entities/Structures/Machines/vending_machines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index e5ecb07ede..ffcb5b0f7c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1140,6 +1140,7 @@ normalState: normal-unshaded ejectState: eject-unshaded denyState: deny-unshaded + initialStockQuality: 0.8 - type: Sprite sprite: Structures/Machines/VendingMachines/sustenance.rsi layers: From 7de47faa19dc4e9056cf7e7a333cdd0cf06151c1 Mon Sep 17 00:00:00 2001 From: bruhmogus <104110869+bruhmogus@users.noreply.github.com> Date: Wed, 13 May 2026 16:25:54 -0500 Subject: [PATCH 9/9] un-increase the general stock of the machine --- .../Inventories/sustenance.yml | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml index aef1ee8b45..4913ff6fd2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml @@ -1,26 +1,25 @@ - type: vendingMachineInventory id: SustenanceInventory startingInventory: - DrinkMREFlask: 5 # starcup: increased MRE flasks in hopes of making sustenance vendor not be consistently empty + DrinkMREFlask: 3 FoodSnackNutribrick: 5 FoodSnackMREBrownie: 5 FoodCondimentPacketKetchup: 5 # Begin DeltaV Additions - # starcup: increased orange juice to lemon juice to three from one can, milk and soy doubled (from 2 to 4) - ReagentTinPowderedMilk: 4 - ReagentTinPowderedMilkSoy: 4 - ReagentTinPowderedJuiceOrange: 3 - ReagentTinPowderedJuiceLime: 3 - ReagentTinPowderedJuiceWatermelon: 3 - ReagentTinPowderedJuiceApple: 3 - ReagentTinPowderedJuiceBerry: 3 - ReagentTinPowderedJuicePineapple: 3 - ReagentTinPowderedJuiceTomato: 3 - ReagentTinPowderedJuiceBanana: 3 - ReagentTinPowderedJuiceCarrot: 3 - ReagentTinPowderedJuiceCherry: 3 - ReagentTinPowderedJuiceGrape: 3 - ReagentTinPowderedJuiceLemon: 3 + ReagentTinPowderedMilk: 2 + ReagentTinPowderedMilkSoy: 2 + ReagentTinPowderedJuiceOrange: 1 + ReagentTinPowderedJuiceLime: 1 + ReagentTinPowderedJuiceWatermelon: 1 + ReagentTinPowderedJuiceApple: 1 + ReagentTinPowderedJuiceBerry: 1 + ReagentTinPowderedJuicePineapple: 1 + ReagentTinPowderedJuiceTomato: 1 + ReagentTinPowderedJuiceBanana: 1 + ReagentTinPowderedJuiceCarrot: 1 + ReagentTinPowderedJuiceCherry: 1 + ReagentTinPowderedJuiceGrape: 1 + ReagentTinPowderedJuiceLemon: 1 # End DeltaV Additions contrabandInventory: FoodTinMRE: 3