From 17ebf2a3ce6a64febf1380e78945ed321c11711c Mon Sep 17 00:00:00 2001 From: EnDecc <33369477+Endecc@users.noreply.github.com> Date: Mon, 21 Aug 2023 14:16:20 -0400 Subject: [PATCH] Cargo crate fixes (#19401) * locale additions, icon tweaks * soda count for consistency --- .../prototypes/catalog/cargo/cargo-food.ftl | 9 +++ .../catalog/fills/crates/food-crates.ftl | 11 ++- .../Prototypes/Catalog/Cargo/cargo_food.yml | 6 +- .../Prototypes/Catalog/Fills/Crates/food.yml | 72 +++++++++---------- 4 files changed, 58 insertions(+), 40 deletions(-) diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl index 78f3c279ae..74405b719f 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl @@ -1,6 +1,9 @@ ent-FoodPizza = { ent-CrateFoodPizza } .desc = { ent-CrateFoodPizza.desc } +ent-FoodPizzaLarge = { ent-CrateFoodPizzaLarge } + .desc = { ent-CrateFoodPizzaLarge.desc } + ent-FoodMRE = { ent-CrateFoodMRE } .desc = { ent-CrateFoodMRE.desc } @@ -12,3 +15,9 @@ ent-FoodDinnerware = { ent-CrateFoodDinnerware } ent-FoodBarSupply = { ent-CrateFoodBarSupply } .desc = { ent-CrateFoodBarSupply.desc } + +ent-FoodSoftdrinks = { ent-CrateFoodSoftdrinks } + .desc = { ent-CrateFoodSoftdrinks.desc } + +ent-FoodSoftdrinksLarge = { ent-CrateFoodSoftdrinksLarge } + .desc = { ent-CrateFoodSoftdrinksLarge.desc } diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl index de1accdeae..b9f67862f2 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/food-crates.ftl @@ -1,5 +1,8 @@ ent-CrateFoodPizza = Emergency pizza delivery - .desc = Help do your part to end station hunger by distributing pizza to underfunded departments! + .desc = Help do your part to end station hunger by distributing pizza to underfunded departments! Includes 4 pizzas. + +ent-CrateFoodPizzaLarge = Disaster pizza delivery + .desc = In the ultimate event that all else has failed, Find comfort in that more pizza solves everything. Includes 16 pizzas. ent-CrateFoodMRE = MRE crate .desc = A military style meal fit to feed a whole department. @@ -12,3 +15,9 @@ ent-CrateFoodDinnerware = Kitchen dinnerware crate ent-CrateFoodBarSupply = Bartending supplies crate .desc = Extra Bar supplies, in case the clown was allowed in the bar unsupervised. + +ent-CrateFoodSoftdrinks = Softdrinks crate + .desc = A variety of sodas to complement a small party, without having to empty the soda machines. Includes 14 sodas. + +ent-CrateFoodSoftdrinksLarge = Softdrinks bulk crate + .desc = Lots of sodas taken straight out of Centcomm's own vending machines, because you just can't leave your department. Includes 28 sodas. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index c38535bb56..e506995929 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -2,7 +2,7 @@ id: FoodPizza icon: sprite: Objects/Consumable/Food/Baked/pizza.rsi - state: margherita + state: margherita-slice product: CrateFoodPizza cost: 450 category: Food @@ -61,7 +61,7 @@ - type: cargoProduct id: FoodSoftdrinks icon: - sprite: Objects/Consumable/Drinks/beerglass.rsi + sprite: Objects/Consumable/Drinks/cola.rsi state: icon product: CrateFoodSoftdrinks cost: 1200 @@ -71,7 +71,7 @@ - type: cargoProduct id: FoodSoftdrinksLarge icon: - sprite: Objects/Consumable/Drinks/beerglass.rsi + sprite: Objects/Consumable/Drinks/colabottle.rsi state: icon product: CrateFoodSoftdrinksLarge cost: 2400 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 5813521424..215ce59856 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -14,14 +14,14 @@ id: CrateFoodPizzaLarge parent: CratePlastic components: - - type: StorageFill - contents: - - id: FoodBoxPizzaFilled - amount: 16 - - id: KnifePlastic - amount: 4 - - id: LidSalami - prob: 0.04 + - type: StorageFill + contents: + - id: FoodBoxPizzaFilled + amount: 16 + - id: KnifePlastic + amount: 4 + - id: LidSalami + prob: 0.04 - type: entity id: CrateFoodMRE @@ -109,37 +109,37 @@ id: CrateFoodSoftdrinks parent: CratePlastic components: - - type: StorageFill - contents: - - id: DrinkColaCan - amount: 4 - - id: DrinkGrapeCan - amount: 2 - - id: DrinkRootBeerCan - amount: 2 - - id: DrinkIcedTeaCan - amount: 2 - - id: DrinkLemonLimeCan - amount: 2 - - id: DrinkFourteenLokoCan - amount: 2 + - type: StorageFill + contents: + - id: DrinkColaCan + amount: 4 + - id: DrinkGrapeCan + amount: 2 + - id: DrinkRootBeerCan + amount: 2 + - id: DrinkIcedTeaCan + amount: 2 + - id: DrinkLemonLimeCan + amount: 2 + - id: DrinkFourteenLokoCan + amount: 2 - type: entity id: CrateFoodSoftdrinksLarge parent: CratePlastic components: - - type: StorageFill - contents: - - id: DrinkColaCan - amount: 8 - - id: DrinkGrapeCan - amount: 4 - - id: DrinkRootBeerCan - amount: 4 - - id: DrinkIcedTeaCan - amount: 4 - - id: DrinkLemonLimeCan - amount: 4 - - id: DrinkFourteenLokoCan - amount: 4 + - type: StorageFill + contents: + - id: DrinkColaCan + amount: 8 + - id: DrinkGrapeCan + amount: 4 + - id: DrinkRootBeerCan + amount: 4 + - id: DrinkIcedTeaCan + amount: 4 + - id: DrinkLemonLimeCan + amount: 4 + - id: DrinkFourteenLokoCan + amount: 4