New Drinks (#36287)

Co-authored-by: RedBookcase <crazykid1590@gmail.com> Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
2025-04-19 01:12:10 -04:00
parent be8fa724a7
commit 9599f582f3
98 changed files with 1042 additions and 3 deletions
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_glass.yml
@@ -16,6 +16,7 @@
    prototypes:
      - DrinkAbsintheGlass
      - DrinkAleGlass
+      - DrinkAlienBrainHemorrhage
      - DrinkAloe
      - DrinkAndalusia
      - DrinkAntifreeze
@@ -32,17 +33,21 @@
      - DrinkBloodyMaryGlass
      - DrinkBooger
      - DrinkBraveBullGlass
+      - DrinkBronxGlass
      - BudgetInsulsDrinkGlass
      - DrinkCarrotJuice
      - DrinkCoconutRum
      - DrinkChocolateGlass
      - DrinkCognacGlass
      - DrinkCosmopolitan
+      - DrinkCrushDepthGlass
      - DrinkCubaLibreGlass
+      - DrinkDarkandStormyGlass
      - DrinkDeadRumGlass
      - DrinkDevilsKiss
      - DrinkDriestMartiniGlass
      - DrinkDrGibbGlass
+      - DrinkElectricSharkGlass
      - DrinkErikaSurprise
      - DrinkFourteenLokoGlass
      - DrinkGargleBlasterGlass
@@ -62,6 +67,9 @@
      - DrinkIrishSlammer
      - DrinkIrishCoffeeGlass
      - DrinkLemonadeGlass
+      - DrinkJackRoseGlass
+      - DrinkJungleBirdGlass
+      - DrinkKalimotxoGlass
      - DrinkKiraSpecial
      - DrinkLongIslandIcedTeaGlass
      - DrinkManhattanGlass
@@ -71,11 +79,13 @@
      - DrinkMeadGlass
      - DrinkMilkshake
      - DrinkMojito
+      - DrinkMonkeyBusinessGlass
      - DrinkNTCahors
      - DrinkPainkillerGlass
      - DrinkPatronGlass
      - DrinkPinaColadaGlass
      - DrinkPoscaGlass
+      - DrinkRadlerGlass
      - DrinkRedMeadGlass
      - DrinkRewriter
      - DrinkRoyRogersGlass
@@ -92,7 +102,9 @@
      - DrinkSyndicatebomb
      - DrinkTequilaSunriseGlass
      - DrinkThreeMileIslandGlass
+      - DrinkTortugaGlass
      - DrinkToxinsSpecialGlass
+      - DrinkVampiroGlass
      - DrinkVodkaMartiniGlass
      - DrinkVodkaRedBool
      - DrinkVodkaTonicGlass
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -187,6 +187,22 @@
    sprite: Objects/Consumable/Drinks/aleglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkAlienBrainHemorrhage
+  suffix: alien brain hemorrhage
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: AlienBrainHemorrhage
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/alienbrainhemorrhage.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkAlliesCocktail
@@ -507,6 +523,22 @@
    sprite: Objects/Consumable/Drinks/bravebullglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkBronxGlass
+  suffix: bronx
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Bronx
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/bronx.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: BudgetInsulsDrinkGlass
@@ -661,6 +693,22 @@
        - ReagentId: Cream
          Quantity: 30

+- type: entity
+  parent: DrinkGlass
+  id: DrinkCrushDepthGlass
+  suffix: crush depth
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CrushDepth
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/crushdepth.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkCubaLibreGlass
@@ -677,6 +725,22 @@
    sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkDarkandStormyGlass
+  suffix: dark and stormy
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: DarkandStormy
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/dark&stormy.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkDeadRumGlass
@@ -773,6 +837,22 @@
    sprite: Objects/Consumable/Drinks/dr_gibb_glass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkElectricSharkGlass
+  suffix: electric shark
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ElectricShark
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/electricshark.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkErikaSurprise
@@ -1177,6 +1257,54 @@
    sprite: Objects/Consumable/Drinks/coffeeliqueurglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkJackRoseGlass
+  suffix: jack rose
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: JackRose
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/jackrose.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkJungleBirdGlass
+  suffix: jungle bird
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: JungleBird
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/junglebird.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkKalimotxoGlass
+  suffix: kalimotxo
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Kalimotxo
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/kalimotxo.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkKiraSpecial
@@ -1193,6 +1321,7 @@
    sprite: Objects/Consumable/Drinks/kiraspecial.rsi
    state: icon

+
 - type: entity
  parent: DrinkGlass
  id: DrinkLemonadeGlass
@@ -1391,6 +1520,22 @@
    sprite: Objects/Consumable/Drinks/mojito.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkMonkeyBusinessGlass
+  suffix: monkey business
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: MonkeyBusiness
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/monkeybusiness.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkNeurotoxinGlass
@@ -1567,6 +1712,22 @@
    sprite: Objects/Consumable/Drinks/glass_light_yellow.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkRadlerGlass
+  suffix: radler
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Radler
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/radler.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkRedMeadGlass
@@ -2045,6 +2206,22 @@
        - ReagentId: JuiceTomato
          Quantity: 30

+- type: entity
+  parent: DrinkGlass
+  id: DrinkTortugaGlass
+  suffix: tortuga
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Tortuga
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/tortuga.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkToxinsSpecialGlass
@@ -2061,6 +2238,22 @@
    sprite: Objects/Consumable/Drinks/toxinsspecialglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkVampiroGlass
+  suffix: vampiro
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Vampiro
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/vampiro.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkVermouthGlass
@@ -2309,7 +2502,7 @@
      drink:
        maxVol: 30
        reagents:
-        - ReagentId: Daiquiri 
+        - ReagentId: Daiquiri
          Quantity: 30
  - type: Icon
    sprite: Objects/Consumable/Drinks/daiquiri.rsi