]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Food/Bev updates and fixes (#21824)
authorVelcroboy <107660393+IamVelcroboy@users.noreply.github.com>
Mon, 27 Nov 2023 22:19:17 +0000 (16:19 -0600)
committerGitHub <noreply@github.com>
Mon, 27 Nov 2023 22:19:17 +0000 (15:19 -0700)
* 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 <velcroboy333@hotmail.com>
33 files changed:
Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_meal.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_produce.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/noodles.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
Resources/Prototypes/Entities/Objects/Consumable/Food/taco.yml
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Recipes/Reactions/drinks.yml

index acb15b217cd285dd4cc4f347a9da14f60546bf2d..2d65fa1f71edc41bd732693eae10f2eb551f2700 100644 (file)
@@ -5,5 +5,6 @@
     DrinkCafeLatte: 5
     DrinkTeacup: 5
     DrinkGreenTea: 5
+    DrinkHotCoco: 5
   emaggedInventory:
     DrinkNothing: 2
index 819320a80fab0401608818f8cd6b7f838e20e9af..8db39e4cc9b00a4b07419b9a33414062f2519b3f 100644 (file)
@@ -31,6 +31,7 @@
       - DrinkWineBottleFull
       - DrinkBeerBottleFull
       - DrinkAleBottleFull
+      - DrinkChampagneBottleFull
     chance: 0.8
     offset: 0.0
     #rare
index 236d36fc88a9ae4532e3927b0f17a6ba192b5100..deaf9cd49db0ca756306bbff81053f097f36b4a2 100644 (file)
@@ -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 (file)
index 0000000..751fc08
--- /dev/null
@@ -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
index 995048c2dd10ae36e74e6a3f93882ab44ad3d943..68d9394ea1610bb796caa63e287367abdc932c3e 100644 (file)
@@ -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
index e95fca1d87578d26417f39160af202518a5f9275..75d4f9308cf93463887956d68e4d3dbb57b573da 100644 (file)
@@ -35,6 +35,9 @@
       - FoodNoodlesChowmein
       - FoodNoodlesSpesslaw
       - FoodNoodlesMeatball
+      - FoodNoodlesBoiled
+      - FoodNoodles
+      - FoodNoodlesButter
       - FoodMealHappyHonkClown
       - FoodSoupPea
       - FoodSaladHerb
@@ -45,6 +48,7 @@
       - FoodSaladCaesar
       - FoodSaladColeslaw
       - FoodSaladKimchi
+      - FoodSaladWatermelonFruitBowl
       - FoodRiceBoiled
       - FoodRiceEgg
       - FoodRicePork
       - 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 (file)
index 0000000..6edf341
--- /dev/null
@@ -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
index 5cbc17665cdc8cc160133111402dc5fcf8e47d10..36386b55a0600949f3dd4f2a61f981444dd74b3b 100644 (file)
       - 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
index d184e8ea0cbda239813ba67e2dd914c41f761f82..9f4b3e59835ca205770cd499c1bc482f72a794da 100644 (file)
   - 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
       - 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
index 4806755a1176e9d85452bc2b993b0f24861a458f..d19164e4fa20288bf089050cf89da6f4f63b8509 100644 (file)
@@ -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 (file)
index 0000000..08ad0ff
--- /dev/null
@@ -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
index 7a1d9ec1605b52f51cb36b861221af6d38edce3d..acea8c72db69b3a69a9d1d86b4e98c89906a51a6 100644 (file)
@@ -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
   - 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
   - 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
           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
index 66c9c404c475a1ec3e6432e76db82c381d72a008..d36d48e316025a41d46f8887a6e3cbecaf524ae8 100644 (file)
@@ -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
   - 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
   - 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
   - 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
index 9fdc594ed00674800eec696e79abbe294c91bfce..fec821419bf6e3a741fc16c7fd777ca634b647a8 100644 (file)
@@ -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
index 828ad3cca69b2e35c5ca6d7bcccc56d4c76517d3..61e77b55bd40391cf3c3ee5cb614e25ae9b24de2 100644 (file)
@@ -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
   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
 
index ec0edc145f6b1d9fb0e946792c6087ad91ff5504..538ef6790a89fafa7c4a0a6e781ba0749e154d56 100644 (file)
@@ -11,7 +11,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 50
+        maxVol: 100
   - type: SolutionTransfer
     canChangeTransferAmount: true
     maxTransferAmount: 5
       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
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/alebottle_empty.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
 
 
 - type: entity
   components:
   - type: Sprite
     sprite: Objects/Consumable/TrashDrinks/beer_empty.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
 
 
 - type: entity
   - 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
index e97985b59948abe26c50c832d29c7f3b7870485d..4ca9ab4a748d757ef85273963dab75e1c18f3212 100644 (file)
@@ -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
index bdf5e65847bbbd65a1e7e3a802508fe6c0ce2706..bc09d958055984f6fde9433ad8e5425204d6aabb 100644 (file)
@@ -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
index 1296bc475295e47bd17df399adde1036e0963b5a..0fbed6815ceb9c546e9dc1061c2a19a39ae9e309 100644 (file)
@@ -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
index 5d2a304f87dd275d706cdb16c4708fd13764dd4b..b03be2fea485012fb4ed12c72ebf44721fffbf2c 100644 (file)
@@ -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
index 01f93cccedfd888309e1686c45c165a298a7b7f0..95bfe6b6b4c86ded49c715f5e0b5d31df639ab82 100644 (file)
@@ -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
index 59cfc0ba16d6bc5bd64ab90419ffedf2f080f405..b7f6f8a9e02c6a84b4b0c6e68a5775c0ad1439e3 100644 (file)
@@ -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
index d48dd88c3934ef444efc3236aec31836961f3fa9..4418eb42c079ff10997016876912a25bb6fd64fd 100644 (file)
@@ -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
index cb79f9b3a385e3777f66f616c302c5eb855e8882..a51bb202ad0b814d9ba62073d5f5cbb957ecc457 100644 (file)
@@ -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.
 
index 2fb16c7846c4cc70c495dd6283ec72efff39d3e2..d8817ab86d7742d7683256bf5e7b7a7c88d438bc 100644 (file)
@@ -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
index 37177164d881bd4a1309a94b031eb43a6beb61c4..de837c4c10721ecb94b8fe4cbe40f3dcb41bffc6 100644 (file)
@@ -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
index 4e9e2a50bff72c44c066f686dc60459a22a25592..1f16cbd66edbc8f1affc445fd6211bd175a36cca 100644 (file)
@@ -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
index 8294f64fe1c222aa0679737af242003f397f3f92..f9cf2231142c43d3b11a826c9d65a44796dc1d86 100644 (file)
@@ -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
index fa87c5a5a02b3a0f7c0412cfbee2a3f0da1af6c0..ccb0923694486ff911ddbd7ec27ed30c550e80aa 100644 (file)
@@ -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
index 385f52b54306cf1c52021690889576d389a35577..1057f5c18a68e6d0b3cead46b15bd5ec254aaa93 100644 (file)
@@ -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
index 94b2496d528ebca417dfc9f4d94b1c8343ce4778..d010588e5f68e9113a755f530c6676eebb9ec7d5 100644 (file)
         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
         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
index 3baa6bbf2dde02e2bb76d482e4023ee3467dbe48..2bd3031825c3ffae272ea0ee7bc702d1cad82b34 100644 (file)
         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
   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
index 1084135bb000e309d82d80c1ffa7f5324e84d0f8..6226fb1816c0c19d17551f1d82dec041411ae113 100644 (file)
   products:
     Hooch: 3
 
+- type: reaction
+  id: HotCocoa
+  minTemp: 350
+  reactants:
+    Water:
+      amount: 1
+    CocoaPowder:
+      amount: 1
+  products:
+    HotCocoa: 2
+
 - type: reaction
   id: IceCream
   reactants: