From e0dd5e1b52641c0380889efb949b827aadaaaea7 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:19:17 -0600 Subject: [PATCH] Food/Bev updates and fixes (#21824) * Food/Bev updates and fixes * Remove some unnessesary * Indentation oops * No forensics on null item * Missing whole ass file :) * Oh, found it * Remove redundant -type: drink * Adds more hot cocoa --------- Co-authored-by: Jeff --- .../VendingMachines/Inventories/coffee.yml | 1 + .../Random/Food_Drinks/drinks_bottles.yml | 1 + .../Random/Food_Drinks/drinks_glass.yml | 2 + .../Random/Food_Drinks/drinks_soda.yml | 47 ++++++ .../Random/Food_Drinks/food_baked_single.yml | 5 + .../Spawners/Random/Food_Drinks/food_meal.yml | 9 ++ .../Random/Food_Drinks/food_produce.yml | 62 ++++++++ .../Random/Food_Drinks/food_single.yml | 9 ++ .../Random/Food_Drinks/food_snacks.yml | 39 +++-- .../Markers/Spawners/Random/trash.yml | 1 + .../Consumable/Drinks/drinks-cartons.yml | 128 +++++++++++++++++ .../Objects/Consumable/Drinks/drinks.yml | 40 +++--- .../Consumable/Drinks/drinks_bottles.yml | 134 +++--------------- .../Objects/Consumable/Drinks/drinks_cans.yml | 1 + .../Objects/Consumable/Drinks/drinks_cups.yml | 7 + .../Consumable/Drinks/trash_drinks.yml | 121 +++++++++++++++- .../Objects/Consumable/Food/Baked/bread.yml | 1 + .../Objects/Consumable/Food/Baked/cake.yml | 1 + .../Objects/Consumable/Food/Baked/misc.yml | 1 + .../Objects/Consumable/Food/Baked/pie.yml | 1 + .../Objects/Consumable/Food/Baked/pizza.yml | 1 + .../Objects/Consumable/Food/burger.yml | 1 + .../Objects/Consumable/Food/frozen.yml | 1 + .../Objects/Consumable/Food/meals.yml | 1 + .../Objects/Consumable/Food/noodles.yml | 1 + .../Objects/Consumable/Food/produce.yml | 1 + .../Objects/Consumable/Food/skewer.yml | 1 + .../Objects/Consumable/Food/snacks.yml | 1 + .../Entities/Objects/Consumable/Food/soup.yml | 2 + .../Entities/Objects/Consumable/Food/taco.yml | 2 + .../Reagents/Consumable/Drink/alcohol.yml | 29 ++++ .../Reagents/Consumable/Drink/drinks.yml | 44 +++--- .../Prototypes/Recipes/Reactions/drinks.yml | 11 ++ 33 files changed, 523 insertions(+), 184 deletions(-) create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml create mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml index acb15b217c..2d65fa1f71 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml @@ -5,5 +5,6 @@ DrinkCafeLatte: 5 DrinkTeacup: 5 DrinkGreenTea: 5 + DrinkHotCoco: 5 emaggedInventory: DrinkNothing: 2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml index 819320a80f..8db39e4cc9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml @@ -31,6 +31,7 @@ - DrinkWineBottleFull - DrinkBeerBottleFull - DrinkAleBottleFull + - DrinkChampagneBottleFull chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml index 236d36fc88..deaf9cd49d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml @@ -91,6 +91,8 @@ - DrinkWineGlass - DrinkShakeBlue - DrinkShakeWhite + - DrinkTheMartinez + - DrinkMoonshineGlass chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml new file mode 100644 index 0000000000..751fc08554 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml @@ -0,0 +1,47 @@ +- type: entity + id: RandomDrinkSoda + name: random soda spawner + parent: MarkerBase + placement: + mode: AlignTileAny + components: + - type: Sprite + layers: + - state: green + - sprite: Objects/Consumable/Drinks/dr_gibb.rsi + state: icon + - type: RandomSpawner + prototypes: + - DrinkColaBottleFull + - DrinkSpaceMountainWindBottleFull + - DrinkSpaceUpBottleFull + - DrinkWaterBottleFull + - DrinkColaCan + - DrinkIcedTeaCan + - DrinkLemonLimeCan + - DrinkGrapeCan + - DrinkRootBeerCan + - DrinkSodaWaterCan + - DrinkSpaceMountainWindCan + - DrinkSpaceUpCan + - DrinkStarkistCan + - DrinkTonicWaterCan + - DrinkFourteenLokoCan + - DrinkChangelingStingCan + - DrinkDrGibbCan + - DrinkEnergyDrinkCan + - DrinkShamblersJuiceCan + - DrinkPwrGameCan + - DrinkHotCoco + - DrinkHotCoffee + - DrinkCafeLatte + - DrinkTeacup + - DrinkGreenTea + - DrinkWaterCup + chance: 0.8 + offset: 0.0 + #rare + rarePrototypes: + - DrinkNukieCan + - DrinkLean + rareChance: 0.01 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index 995048c2dd..68d9394ea1 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -25,6 +25,9 @@ - FoodBreadJellySlice - FoodBreadFrenchToast - FoodBreadTwoSlice + - FoodBreadVolcanicSlice + - FoodBreadTofuSlice + - FoodBreadBaguetteSlice - FoodCakeBlueberrySlice - FoodCakePlainSlice - FoodCakeCarrotSlice @@ -69,6 +72,8 @@ - FoodTartGrape - FoodTartCoco - FoodBakedBrownie + - FoodPieBananaCreamSlice + - FoodTartMimeSlice chance: 0.8 offset: 0.0 #rare diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml index e95fca1d87..75d4f9308c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml @@ -35,6 +35,9 @@ - FoodNoodlesChowmein - FoodNoodlesSpesslaw - FoodNoodlesMeatball + - FoodNoodlesBoiled + - FoodNoodles + - FoodNoodlesButter - FoodMealHappyHonkClown - FoodSoupPea - FoodSaladHerb @@ -45,6 +48,7 @@ - FoodSaladCaesar - FoodSaladColeslaw - FoodSaladKimchi + - FoodSaladWatermelonFruitBowl - FoodRiceBoiled - FoodRiceEgg - FoodRicePork @@ -60,10 +64,14 @@ - FoodSoupMiso - FoodSoupMushroom - FoodSoupBeet + - FoodSoupBeetRed - FoodSoupPotato - FoodSoupOnion - FoodSoupBisque - FoodSoupBungo + - FoodMealSoftTaco + - FoodMealCornInButter + - FoodSoupStew chance: 0.8 offset: 0.0 #rare @@ -86,4 +94,5 @@ - FoodSoupMonkey - FoodSoupEyeball - FoodSoupElectron + - FoodNoodlesCopy rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml new file mode 100644 index 0000000000..6edf341e10 --- /dev/null +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml @@ -0,0 +1,62 @@ +- type: entity + id: RandomProduce + name: random produce spawner + parent: MarkerBase + placement: + mode: AlignTileAny + components: + - type: Sprite + layers: + - state: green + - sprite: Objects/Specific/Hydroponics/onion_red.rsi + state: produce + - type: RandomSpawner + prototypes: + - WheatBushel + - OatBushel + - Sugarcane + - Nettle + - FoodBanana + - FoodCarrot + - FoodCabbage + - FoodGarlic + - FoodLemon + - FoodLime + - FoodOrange + - FoodPineapple + - FoodPotato + - FoodTomato + - FoodEggplant + - FoodApple + - FoodCocoaPod + - FoodCorn + - FoodOnion + - FoodOnionRed + - FoodMushroom + - FoodChili + - FoodChilly + - FoodAloe + - FoodPoppy + - FoodLingzhi + - FoodAmbrosiaVulgaris + - RiceBushel + - FoodSoybeans + - FoodKoibean + - FoodWatermelon + - FoodGrape + - FoodBerries + - FoodBungo + - FoodPeaPod + - FoodPumpkin + - CottonBol + chance: 0.8 + offset: 0.0 + #rare + rarePrototypes: + - FoodBlueTomato + - FoodBloodTomato + - FoodAmbrosiaDeus + - FoodGalaxythistle + - FoodFlyAmanita + - DeathNettle + rareChance: 0.01 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml index 5cbc17665c..36386b55a0 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml @@ -46,6 +46,14 @@ - FoodPizzaSassysageSlice - FoodPizzaPineappleSlice - FoodPizzaMoldySlice + - FoodBakedDumplings + - FoodBakedChevreChaud + - FoodBakedNugget + - FoodTacoBeef + - FoodTacoChicken + - FoodTacoFish + - FoodTacoBeefSupreme + - FoodTacoChickenSupreme chance: 0.8 offset: 0.0 #rare @@ -67,4 +75,5 @@ - FoodMeatRatKebab - FoodMeatRatdoubleKebab - FoodPizzaArnoldSlice + - FoodTacoRat rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml index d184e8ea0c..9f4b3e5983 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml @@ -14,29 +14,6 @@ - type: RandomSpawner #small item prototypes: - - DrinkColaBottleFull - - DrinkSpaceMountainWindBottleFull - - DrinkSpaceUpBottleFull - - DrinkWaterBottleFull - - DrinkColaCan - - DrinkIcedTeaCan - - DrinkLemonLimeCan - - DrinkGrapeCan - - DrinkRootBeerCan - - DrinkSodaWaterCan - - DrinkSpaceMountainWindCan - - DrinkSpaceUpCan - - DrinkStarkistCan - - DrinkTonicWaterCan - - DrinkFourteenLokoCan - - DrinkChangelingStingCan - - DrinkDrGibbCan - - DrinkEnergyDrinkCan - - DrinkHotCoco - - DrinkHotCoffee - - DrinkTeacup - - DrinkLean - - DrinkWaterCup - FoodSnackBoritos - FoodSnackCheesie - FoodSnackChips @@ -52,5 +29,21 @@ - FoodSnackCookieFortune - FoodSnackNutribrick - FoodSnackMREBrownie + - FoodFrozenSandwich + - FoodFrozenSandwichStrawberry + - FoodFrozenFreezy + - FoodFrozenSundae + - FoodFrozenCornuto + - FoodFrozenPopsicleOrange + - FoodFrozenPopsicleBerry + - FoodFrozenPopsicleJumbo + - FoodFrozenSnowcone + - FoodFrozenSnowconeBerry + - FoodFrozenSnowconeFruit + - FoodFrozenSnowconeClown + - FoodFrozenSnowconeMime + - FoodFrozenSnowconeRainbow + - FoodSnackPistachios + - FoodSnackSemki chance: 0.8 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml index 4806755a11..d19164e4fa 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml @@ -32,6 +32,7 @@ - FoodPacketSemkiTrash - FoodPacketSusTrash - FoodPacketSyndiTrash + - BrokenBottle chance: 0.5 offset: 0.2 placement: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml new file mode 100644 index 0000000000..08ad0ffbd0 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -0,0 +1,128 @@ +- type: entity + parent: DrinkBase + id: DrinkCartonBaseFull + abstract: true + components: + - type: Openable + sound: + collection: bottleOpenSounds #Could use a new sound someday ¯\_(ツ)_/¯ + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + - type: Sprite + state: icon + - type: Item + size: Normal + - type: MeleeWeapon + soundNoDamage: + path: "/Audio/Effects/Fluids/splat.ogg" + damage: + types: + Blunt: 0 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:SpillBehavior { } + - !type:DoActsBehavior + acts: [ "Destruction" ] + #In future maybe add generic plastic scrap trash/debris + - type: TrashOnSolutionEmpty + solution: drink + +- type: entity + parent: DrinkCartonBaseFull + id: DrinkJuiceLimeCarton + name: lime juice + description: Sweet-sour goodness. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceLime + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/limejuice.rsi + +- type: entity + parent: DrinkCartonBaseFull + id: DrinkJuiceOrangeCarton + name: orange juice + description: Full of vitamins and deliciousness! + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceOrange + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/orangejuice.rsi + +- type: entity + parent: DrinkCartonBaseFull + id: DrinkJuiceTomatoCarton + name: tomato juice + description: Well, at least it LOOKS like tomato juice. You can't tell with all that redness. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: JuiceTomato + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/tomatojuice.rsi + +- type: entity + parent: DrinkCartonBaseFull + id: DrinkCreamCarton + name: Milk Cream + description: It's cream. Made from milk. What else did you think you'd find in there? + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Cream + Quantity: 50 + - type: Sprite + sprite: Objects/Consumable/Drinks/cream.rsi + +- type: entity + parent: DrinkCartonBaseFull + id: DrinkMilkCarton + name: milk + description: An opaque white liquid produced by the mammary glands of mammals. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: Milk + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/milk.rsi + +- type: entity + parent: DrinkCartonBaseFull + id: DrinkSoyMilkCarton + name: soy milk + description: White and nutritious soy goodness! + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + reagents: + - ReagentId: MilkSoy + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/soymilk.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 7a1d9ec160..acea8c72db 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -1,5 +1,6 @@ # TODO: Find remaining cans and move to drinks_cans # TODO: Find empty containers (e.g. mug, pitcher) and move to their own yml +# When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_glass.yml - type: entity parent: BaseItem id: DrinkBase @@ -507,6 +508,13 @@ - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/chocolateglass.rsi + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: HotCocoa + Quantity: 30 - type: entity parent: DrinkGlassBase @@ -1846,6 +1854,22 @@ - type: Sprite sprite: Objects/Consumable/Drinks/tequillasunriseglass.rsi +- type: entity + parent: DrinkGlassBase + id: DrinkTheMartinez + name: The Martinez glass + description: The edgerunner legend. Remembered by a drink, Forgotten by a drunk. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: TheMartinez + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/the_martinez.rsi + - type: entity parent: DrinkGlassBase id: DrinkThreeMileIslandGlass @@ -2168,19 +2192,3 @@ Quantity: 30 - ReagentId: CapsaicinOil Quantity: 5 - -- type: entity - parent: DrinkGlassBase - id: DrinkTheMartinez - name: The Martinez glass - description: The edgerunner legend. Remembered by a drink, Forgotten by a drunk. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: TheMartinez - Quantity: 30 - - type: Sprite - sprite: Objects/Consumable/Drinks/the_martinez.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 66c9c404c4..d36d48e316 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -1,3 +1,4 @@ +# When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_bottles.yml - type: entity parent: DrinkBase id: DrinkBottleBaseFull @@ -93,6 +94,21 @@ - type: Sprite sprite: Objects/Consumable/Drinks/bottleofnothing.rsi +- type: entity + parent: DrinkBottleBaseFull + id: DrinkChampagneBottleFull + name: champagne bottle + description: Only people devoid of imagination can't find an excuse for champagne. + components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: Champagne + Quantity: 100 + - type: Sprite + sprite: Objects/Consumable/Drinks/champagnebottle.rsi + - type: entity parent: DrinkBottleBaseFull id: DrinkCognacBottleFull @@ -388,21 +404,6 @@ - type: Sprite sprite: Objects/Consumable/Drinks/alebottle.rsi -- type: entity - parent: DrinkBottleBaseFull - id: DrinkChampagneBottleFull - name: champagne bottle - description: Only people devoid of imagination can't find an excuse for champagne. - components: - - type: SolutionContainerManager - solutions: - drink: - reagents: - - ReagentId: Champagne - Quantity: 100 - - type: Sprite - sprite: Objects/Consumable/Drinks/champagnebottle.rsi - - type: entity parent: DrinkBottleBaseFull id: DrinkWaterBottleFull @@ -419,106 +420,3 @@ - type: Drink - type: Sprite sprite: Objects/Consumable/Drinks/waterbottle.rsi - -# Cartons, TODO: this needs to be moved elsewhere eventually, since cartons shouldnt smash into glass shards - -- type: entity - parent: DrinkBottleBaseFull - id: DrinkJuiceLimeCarton - name: lime juice - description: Sweet-sour goodness. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - reagents: - - ReagentId: JuiceLime - Quantity: 50 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/limejuice.rsi - -- type: entity - parent: DrinkBottleBaseFull - id: DrinkJuiceOrangeCarton - name: orange juice - description: Full of vitamins and deliciousness! - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - reagents: - - ReagentId: JuiceOrange - Quantity: 50 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/orangejuice.rsi - -- type: entity - parent: DrinkBottleBaseFull - id: DrinkJuiceTomatoCarton - name: tomato juice - description: Well, at least it LOOKS like tomato juice. You can't tell with all that redness. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - reagents: - - ReagentId: JuiceTomato - Quantity: 50 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/tomatojuice.rsi - -- type: entity - parent: DrinkBottleBaseFull - id: DrinkCreamCarton - name: Milk Cream - description: It's cream. Made from milk. What else did you think you'd find in there? - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 50 - reagents: - - ReagentId: Cream - Quantity: 50 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/cream.rsi - -- type: entity - parent: DrinkBottleBaseFull - id: DrinkMilkCarton - name: milk - description: An opaque white liquid produced by the mammary glands of mammals. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 100 - reagents: - - ReagentId: Milk - Quantity: 100 - - type: Sprite - sprite: Objects/Consumable/Drinks/milk.rsi - -- type: entity - parent: DrinkBottleBaseFull - id: DrinkSoyMilkCarton - name: soy milk - description: White and nutritious soy goodness! - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 100 - reagents: - - ReagentId: MilkSoy - Quantity: 100 - - type: Drink - - type: Sprite - sprite: Objects/Consumable/Drinks/soymilk.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index 9fdc594ed0..fec821419b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -1,3 +1,4 @@ +# When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_soda.yml - type: entity parent: BaseItem id: DrinkCanBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index 828ad3cca6..61e77b55bd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -1,4 +1,5 @@ # Empty drink containers; different from bottles in that these are intended to be spawned empty +# When adding new drinks also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\drinks_soda.yml - type: entity parent: BaseItem id: DrinkBaseCup @@ -178,6 +179,12 @@ name: Hot chocolate description: A heated drink consisting melted chocolate and heated milk. components: + - type: SolutionContainerManager + solutions: + drink: + reagents: + - ReagentId: HotCocoa + Quantity: 20 - type: Sprite sprite: Objects/Consumable/Drinks/hot_coco.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index ec0edc145f..538ef6790a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -11,7 +11,7 @@ - type: SolutionContainerManager solutions: drink: - maxVol: 50 + maxVol: 100 - type: SolutionTransfer canChangeTransferAmount: true maxTransferAmount: 5 @@ -72,6 +72,56 @@ Glass: 100 - type: SpaceGarbage +- type: entity + name: base empty carton + id: DrinkCartonBaseEmpty + parent: BaseItem + abstract: true + description: An empty carton. + components: + - type: Sprite + state: icon + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 + - type: SolutionTransfer + canChangeTransferAmount: true + maxTransferAmount: 5 + - type: Drink + - type: Spillable + solution: drink + - type: FitsInDispenser + solution: drink + - type: DrawableSolution + solution: drink + - type: RefillableSolution + solution: drink + - type: DrainableSolution + solution: drink + - type: UserInterface + interfaces: + - key: enum.TransferAmountUiKey.Key + type: TransferAmountBoundUserInterface + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:SpillBehavior { } + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Trash + - type: PhysicalComposition + materialComposition: + Cardboard: 20 + - type: SpaceGarbage + # Containers - type: entity name: jailbreaker verte bottle @@ -98,6 +148,10 @@ components: - type: Sprite sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 - type: entity @@ -107,6 +161,10 @@ components: - type: Sprite sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi + - type: SolutionContainerManager + solutions: + drink: + maxVol: 50 - type: entity @@ -225,3 +283,64 @@ - type: Sprite sprite: Objects/Consumable/TrashDrinks/winebottle_empty.rsi + +- type: entity + name: lime juice carton + parent: DrinkCartonBaseEmpty + id: DrinkCartonLime + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/limejuice.rsi + + +- type: entity + name: orange juice carton + parent: DrinkCartonBaseEmpty + id: DrinkCartonOrange + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/orangejuice.rsi + + +- type: entity + name: tomato juice carton + parent: DrinkCartonBaseEmpty + id: DrinkCartonTomato + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/tomatojuice.rsi + + +- type: entity + name: Milk Cream carton + parent: DrinkCartonBaseEmpty + id: DrinkCartonCream + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/cream.rsi + + +- type: entity + name: milk carton + parent: DrinkCartonBaseEmpty + id: DrinkCartonMilk + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/milk.rsi + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 + + +- type: entity + name: soy milk carton + parent: DrinkCartonBaseEmpty + id: DrinkCartonSoyMilk + components: + - type: Sprite + sprite: Objects/Consumable/Drinks/soymilk.rsi + - type: SolutionContainerManager + solutions: + drink: + maxVol: 100 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index e97985b599..4ca9ab4a74 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_baked_whole.yml & food_baked_single.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index bdf5e65847..bc09d95805 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_baked_whole.yml & food_baked_single.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 1296bc4752..0fbed6815c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -1,3 +1,4 @@ +# When adding new food also add to the appropriate random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\ # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 5d2a304f87..b03be2fea4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_baked_whole.yml & food_baked_single.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 01f93ccced..95bfe6b6b4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml & food_single.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 59cfc0ba16..b7f6f8a9e0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml # Bun - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml index d48dd88c39..4418eb42c0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_snack.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index cb79f9b3a3..a51bb202ad 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml # A bunch of different meals. This stuff doesn't come off their plates because # it's assembled on them. Or they just don't have plates. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml index 2fb16c7846..d8817ab86d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 37177164d8..de837c4c10 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_produce.yml # For produce that can't be immediately eaten - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 4e9e2a50bf..1f16cbd66e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index 8294f64fe1..f9cf223114 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -1,3 +1,4 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_snack.yml # Base - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index fa87c5a5a0..ccb0923694 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -1,3 +1,5 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_meal.yml + - type: entity parent: FoodBase id: FoodBowlBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml index 385f52b543..1057f5c18a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml @@ -1,3 +1,5 @@ +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_single.yml + - type: entity name: taco shell parent: FoodMealBase diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 94b2496d52..d010588e5f 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1253,6 +1253,18 @@ reagent: Ethanol amount: 0.15 +- type: reagent + id: TheMartinez + name: reagent-name-the-martinez + parent: BaseAlcohol + desc: reagent-desc-the-martinez + physicalDesc: reagent-physical-desc-vibrant + flavor: themartinez + color: "#75b1f0" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/the_martinez.rsi + state: icon + - type: reagent id: ThreeMileIsland name: reagent-name-three-mile-island @@ -1368,6 +1380,23 @@ reagent: Ethanol amount: 0.07 +- type: reagent + id: WhiteGilgamesh + name: reagent-name-white-gilgamesh + parent: BaseDrink + desc: reagent-desc-white-gilgamesh + physicalDesc: reagent-physical-desc-creamy + flavor: white-gilgamesh + color: "#e5d27e" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 1 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + - type: reagent id: WhiteRussian name: reagent-name-white-russian diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 3baa6bbf2d..2bd3031825 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -16,6 +16,24 @@ reagent: Theobromine amount: 0.05 +- type: reagent + id: HotCocoa + name: reagent-name-cocoa + parent: BaseDrink + desc: reagent-desc-cocoa + physicalDesc: reagent-physical-desc-aromatic + flavor: chocolate + color: "#664300" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + - type: reagent id: Cream name: reagent-name-cream @@ -406,29 +424,3 @@ metamorphicSprite: sprite: Objects/Consumable/Drinks/rewriter.rsi state: icon - -- type: reagent - id: TheMartinez - name: reagent-name-the-martinez - parent: BaseDrink - desc: reagent-desc-the-martinez - physicalDesc: reagent-physical-desc-vibrant - flavor: themartinez - color: "#75b1f0" - metamorphicSprite: - sprite: Objects/Consumable/Drinks/the_martinez.rsi - state: icon - -- type: reagent - id: WhiteGilgamesh - name: reagent-name-white-gilgamesh - parent: BaseDrink - desc: reagent-desc-white-gilgamesh - physicalDesc: reagent-physical-desc-creamy - flavor: white-gilgamesh - color: "#e5d27e" - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 1084135bb0..6226fb1816 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -354,6 +354,17 @@ products: Hooch: 3 +- type: reaction + id: HotCocoa + minTemp: 350 + reactants: + Water: + amount: 1 + CocoaPowder: + amount: 1 + products: + HotCocoa: 2 + - type: reaction id: IceCream reactants: -- 2.51.2