From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com>
Date: Tue, 3 Jun 2025 16:01:07 +0000 (-0400)
Subject: Cargo food crate adjustments (#38006)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=442094da5b89baabbb22e768fcc3fa9233db13b2;p=space-station-14.git

Cargo food crate adjustments (#38006)

* Adjusted cargo food prices; removed large pizza/softdrinks crates

* Adjusted salvage_rewards.yml and cargo_gifts.yml around the removal of large pizza/soda crates
---

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index 2a74478e94..890d64589e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -4,17 +4,7 @@
     sprite: Objects/Consumable/Food/Baked/pizza.rsi
     state: margherita-slice
   product: CrateFoodPizza
-  cost: 450
-  category: cargoproduct-category-name-food
-  group: market
-
-- type: cargoProduct
-  id: FoodPizzaLarge
-  icon:
-    sprite: Objects/Consumable/Food/Baked/pizza.rsi
-    state: margherita
-  product: CrateFoodPizzaLarge
-  cost: 1800
+  cost: 1600
   category: cargoproduct-category-name-food
   group: market
 
@@ -24,7 +14,7 @@
     sprite: Objects/Consumable/Food/snacks.rsi
     state: nutribrick
   product: CrateFoodMRE
-  cost: 1000
+  cost: 1400
   category: cargoproduct-category-name-food
   group: market
 
@@ -64,17 +54,7 @@
     sprite: Objects/Consumable/Drinks/cola.rsi
     state: icon
   product: CrateFoodSoftdrinks
-  cost: 1200
-  category: cargoproduct-category-name-food
-  group: market
-
-- type: cargoProduct
-  id: FoodSoftdrinksLarge
-  icon:
-    sprite: Objects/Consumable/Drinks/colabottle.rsi
-    state: icon
-  product: CrateFoodSoftdrinksLarge
-  cost: 2400
+  cost: 1500
   category: cargoproduct-category-name-food
   group: market
 
@@ -94,7 +74,7 @@
     sprite: Objects/Consumable/Food/burger.rsi
     state: bigbite
   product: CrateFoodHappyHonkBigBite
-  cost: 1400
+  cost: 2800
   category: cargoproduct-category-name-food
   group: market
 
@@ -104,7 +84,7 @@
     sprite: Objects/Consumable/Food/frozen.rsi
     state: sandwich
   product: CrateFoodIceCream
-  cost: 1200
+  cost: 2000
   category: cargoproduct-category-name-food
   group: market
 
@@ -114,6 +94,6 @@
     sprite: Objects/Consumable/Food/frozen.rsi
     state: cone
   product: CrateFoodSnowcone
-  cost: 1100
+  cost: 2000
   category: cargoproduct-category-name-food
   group: market
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 54e94c6ca5..02e1e28810 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
@@ -12,20 +12,6 @@
     - id: LidSalami
       prob: 0.01
 
-- type: entity
-  id: CrateFoodPizzaLarge
-  parent: CratePlastic
-  name: disaster pizza delivery
-  description: In the ultimate event that all else has failed, Find comfort in that more pizza solves everything. Includes 16 pizzas.
-  components:
-  - type: StorageFill
-    contents:
-    - id: FoodBoxPizzaFilled
-      amount: 15
-    - id: FoodBoxPizzaCotton
-    - id: LidSalami
-      prob: 0.04
-
 - type: entity
   id: CrateFoodMRE
   parent: CratePlastic
@@ -141,31 +127,6 @@
     - id: DrinkFourteenLokoCan
       amount: 2
 
-- type: entity
-  id: CrateFoodSoftdrinksLarge
-  parent: CratePlastic
-  name: softdrinks bulk crate
-  description: Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 32 sodas.
-  components:
-  - type: EntityStorage
-    capacity: 32 # Slightly over-sized CratePlastic to accomodate over 30 drink cans at once.
-  - type: StorageFill
-    contents:
-      - id: DrinkColaCan
-        amount: 8
-      - id: DrinkGrapeCan
-        amount: 4
-      - id: DrinkRootBeerCan
-        amount: 4
-      - id: DrinkIcedTeaCan
-        amount: 4
-      - id: DrinkLemonLimeCan
-        amount: 4
-      - id: DrinkLemonLimeCranberryCan
-        amount: 4
-      - id: DrinkFourteenLokoCan
-        amount: 4
-
 - type: entity
   id: CrateFoodGetMore
   parent: CratePlastic
diff --git a/Resources/Prototypes/GameRules/cargo_gifts.yml b/Resources/Prototypes/GameRules/cargo_gifts.yml
index 8b687dd88c..be18c7f14b 100644
--- a/Resources/Prototypes/GameRules/cargo_gifts.yml
+++ b/Resources/Prototypes/GameRules/cargo_gifts.yml
@@ -63,9 +63,9 @@
     description: cargo-gift-pizza-large
     dest: cargo-gift-dest-bar
     gifts:
-      FoodPizzaLarge: 1              # 16 pizzas
+      FoodPizza: 4              # 16 pizzas
       FoodBarSupply: 1
-      FoodSoftdrinksLarge: 1
+      FoodSoftdrinks: 2         # 32 sodas
 
 - type: entity
   id: GiftsEngineering
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
index 5f18390857..984ccc26d2 100644
--- a/Resources/Prototypes/Procedural/salvage_rewards.yml
+++ b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -8,7 +8,7 @@
     CrateMaterialSteel: 1.0
     # things the station might want
     CrateEngineeringAMEJar: 0.25
-    CrateFoodPizzaLarge: 0.25
+    CrateFoodPizza: 0.25
     CrateFoodSoftdrinks: 0.25
     CrateFunInstrumentsVariety: 0.25
     CrateSalvageEquipment: 0.25
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 34ede90f45..73f52a3423 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -644,3 +644,7 @@ CapacitorStockPart: MicroManipulatorStockPart
 
 # 2025-05-30
 SpawnHonkBot: SpawnMobHonkBot
+
+# 2025-06-01
+CrateFoodPizzaLarge: CrateFoodPizza
+CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks