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 f9a3794e8c..ec9c36bb52 100644 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargo-food.ftl @@ -7,5 +7,11 @@ ent-FoodMRE = { ent-CrateFoodMRE } ent-FoodCook = { ent-CrateFoodCooking } .desc = { ent-CrateFoodCooking.desc } +ent-FoodDinnerware = { ent-CrateFoodDinnerware } + .desc = { ent-CrateFoodDinnerware.desc } + +ent-FoodBarSupply = { ent-CrateFoodBarSupply } + .desc = { ent-CrateFoodBarSupply.desc } + ent-FoodCrateKvassTank = { ent-CrateFoodKvassTank } .desc = { ent-CrateFoodKvassTank.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 6ed6db25b5..78ad45da92 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 @@ -7,5 +7,11 @@ ent-CrateFoodMRE = MRE crate ent-CrateFoodCooking = Kitchen supplies crate .desc = Extra kitchen supplies, in case the botanists are absent. +ent-CrateFoodDinnerware = Kitchen dinnerware crate + .desc = Extra kitchen supplies, in case the clown was allowed in the cafeteria unsupervised. + +ent-CrateFoodBarSupply = Bartending supplies crate + .desc = Extra Bar supplies, in case the clown was allowed in the bar unsupervised. + ent-CrateFoodKvassTank = Kvass tank crate - .desc = A tank with refreshing kvass, which helps so much in the heat. + .desc = A tank with refreshing kvass, which helps so much in the heat. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 313b37f90c..3af8cecc3a 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -24,10 +24,30 @@ sprite: Objects/Consumable/Food/ingredients.rsi state: flour-big product: CrateFoodCooking - cost: 1500 + cost: 750 category: Food group: market +- type: cargoProduct + id: FoodDinnerware + icon: + sprite: Objects/Consumable/Food/plates.rsi + state: tin + product: CrateFoodDinnerware + cost: 750 + category: Food + group: market + +- type: cargoProduct + id: FoodBarSupply + icon: + sprite: Objects/Consumable/Drinks/beerglass.rsi + state: icon + product: CrateFoodBarSupply + cost: 750 + category: Food + group: market + - type: cargoProduct id: FoodCrateKvassTank icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 245879d649..e81c8dec93 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -28,25 +28,66 @@ - id: ReagentContainerFlour amount: 3 - id: ReagentContainerRice - amount: 1 + amount: 3 - id: ReagentContainerMilk amount: 4 - id: ReagentContainerMilkSoy - amount: 1 + amount: 2 - id: ReagentContainerSugar - amount: 1 + amount: 2 - id: FoodCondimentPacketSalt amount: 3 - id: FoodCondimentBottleEnzyme - amount: 1 - - id: FoodBowlBig - amount: 3 - - id: FoodPlate - amount: 3 - - id: FoodPlateSmall - amount: 3 + amount: 2 - id: FoodContainerEgg + amount: 2 + +- type: entity + id: CrateFoodDinnerware + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: FoodBowlBig + amount: 4 + - id: FoodPlate + amount: 4 + - id: FoodPlateSmall + amount: 4 - id: FoodKebabSkewer - amount: 3 + amount: 4 - id: KitchenKnife amount: 1 + - id: DrinkGlass + amount: 4 + - id: FoodPlateTin + amount: 4 + - id: Fork + amount: 2 + - id: Spoon + amount: 2 + +- type: entity + id: CrateFoodBarSupply + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: DrinkGlass + amount: 5 + - id: DrinkShotGlass + amount: 5 + - id: DrinkShaker + amount: 2 + - id: DrinkOrangeJuice + amount: 2 + - id: DrinkLimeJuice + amount: 2 + - id: DrinkTomatoJuice + amount: 2 + - id: DrinkWaterBottleFull + amount: 2 + - id: DrinkSodaWaterCan + amount: 2 + - id: DrinkCreamCarton + amount: 2 \ No newline at end of file