Added New Cocktails and new fill level sprites to existing drinks. (#33570)

* Added New Cocktails and new fill level sprites to existing drinks * Updated copyright info and fixed recipies for Caipirinha/Mojito. --------- Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-03-10 16:08:23 -07:00
parent ca60f22c4d
commit 80e674a9ae
225 changed files with 1678 additions and 87 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1675,6 +1675,9 @@
        reagents:
        - ReagentId: Sake
          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/sakeglass.rsi
+    state: icon

 - type: entity
  parent: DrinkGlass
@@ -2280,6 +2283,182 @@
    sprite: Objects/Consumable/Drinks/xenobasher.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkCaipirinha
+  suffix: caipirinha
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Caipirinha
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/caipirinha.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkDaiquiri
+  suffix: daiquiri
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Daiquiri 
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkDeathInTheAfternoon
+  suffix: death in the afternoon
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: DeathInTheAfternoon
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/deathintheafternoon.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkEmpress75
+  suffix: empress 75
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Empress75
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/empress75.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkEspressoMartini
+  suffix: espresso martini
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: EspressoMartini
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/espressomartini.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMayojito
+  suffix: mayojito
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mayojito
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mayojito.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMimeosa
+  suffix: mimeosa
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mimeosa
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mimeosa.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMimosa
+  suffix: mimosa
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Mimosa
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mimosa.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkMoscowMule
+  suffix: moscow mule
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: MoscowMule
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/moscowmule.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkTheSunAlsoRises
+  suffix: the sun also rises
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: TheSunAlsoRises
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/thesunalsorises.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkWhiskeySour
+  suffix: whiskey sour
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: WhiskeySour
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/whiskeysour.rsi
+    state: icon
+
 # TODO: MOVE

 - type: entity
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1339,6 +1339,61 @@
  flavorType: Complex
  description: flavor-complex-compressed-meat

+- type: flavor
+  id: caipirinha
+  flavorType: Complex
+  description: flavor-complex-caipirinha
+
+- type: flavor
+  id: daiquiri
+  flavorType: Complex
+  description: flavor-complex-daiquiri
+
+- type: flavor
+  id: deathintheafternoon
+  flavorType: Complex
+  description: flavor-complex-deathintheafternoon
+
+- type: flavor
+  id: empress75
+  flavorType: Complex
+  description: flavor-complex-empress75
+
+- type: flavor
+  id: espressomartini
+  flavorType: Complex
+  description: flavor-complex-espressomartini
+
+- type: flavor
+  id: mayojito
+  flavorType: Complex
+  description: flavor-complex-mayojito
+
+- type: flavor
+  id: mimeosa
+  flavorType: Complex
+  description: flavor-complex-mimeosa
+
+- type: flavor
+  id: mimosa
+  flavorType: Complex
+  description: flavor-complex-mimosa
+
+- type: flavor
+  id: moscowmule
+  flavorType: Complex
+  description: flavor-complex-moscowmule
+
+- type: flavor
+  id: thesunalsorises
+  flavorType: Complex
+  description: flavor-complex-thesunalsorises
+
+- type: flavor
+  id: whiskeysour
+  flavorType: Complex
+  description: flavor-complex-whiskeysour
+
 - type: flavor
  id: zombiecocktail
  flavorType: Complex
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -67,9 +67,9 @@
  flavor: bluecuracao
  color: "#0099FF"
  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/thin_glass.rsi
+    sprite: Objects/Consumable/Drinks/curacaoglass.rsi
    state: icon_empty
-  metamorphicMaxFillLevels: 5
+  metamorphicMaxFillLevels: 4
  metamorphicFillBaseName: fill-
  metamorphicChangeColor: true
  metabolisms:
@@ -81,26 +81,6 @@
        reagent: Ethanol
        amount: 0.1

- type: reagent
-  id: BlueHawaiian
-  name: reagent-name-blue-hawaiian
-  parent: BaseAlcohol
-  desc: reagent-desc-blue-hawaiian
-  physicalDesc: reagent-physical-desc-tropical
-  flavor: bluehawaiian
-  color: "#47687b"
-  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
-    state: icon
-  metabolisms:
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 2
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.2
-
 - type: reagent
  id: Cognac
  name: reagent-name-cognac
@@ -252,9 +232,9 @@
  flavor: watermelon
  color: "#00FF33"
  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/thin_glass.rsi
+    sprite: Objects/Consumable/Drinks/emeraldglass.rsi
    state: icon_empty
-  metamorphicMaxFillLevels: 5
+  metamorphicMaxFillLevels: 4
  metamorphicFillBaseName: fill-
  metamorphicChangeColor: true

@@ -334,6 +314,20 @@
  physicalDesc: reagent-physical-desc-strong-smelling
  flavor: sake
  color: "#DDDDDD"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/sakeglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2

 - type: reagent
  id: Tequila
@@ -766,7 +760,10 @@
  color: "#cccbc8"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/coconutrum.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
  metabolisms:
    Drink:
      effects:
@@ -786,7 +783,10 @@
  color: "#f73030"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
  metabolisms:
    Drink:
      effects:
@@ -1341,7 +1341,10 @@
  color: "#e6cb47"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/painkiller.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
  metabolisms:
    Drink:
      effects:
@@ -1383,12 +1386,19 @@
  flavor: redmead
  color: "#bc5550"
  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    sprite: Objects/Consumable/Drinks/red_meadglass.rsi
    state: icon_empty
  metamorphicMaxFillLevels: 5
  metamorphicFillBaseName: fill-
-  metamorphicChangeColor: true
-  fizziness: 0.4
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2 

 - type: reagent
  id: PinaColada
@@ -1400,7 +1410,18 @@
  color: "#e8dba4"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/pinacolada.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2  

 - type: reagent
  id: Sbiten
@@ -1664,9 +1685,9 @@
  flavor: vodkatonic
  color: "#0064C8"
  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/gintonicglass.rsi # they look the same
+    sprite: Objects/Consumable/Drinks/vodkatonicglass.rsi
    state: icon_empty
-  metamorphicMaxFillLevels: 6
+  metamorphicMaxFillLevels: 5
  metamorphicFillBaseName: fill-
  metamorphicChangeColor: false
  metabolisms:
@@ -1953,6 +1974,297 @@
          time: 1.0
          type: Remove
  fizziness: 0.25
+  
+- type: reagent
+  id: BlueHawaiian
+  name: reagent-name-blue-hawaiian
+  parent: BaseAlcohol
+  desc: reagent-desc-blue-hawaiian
+  physicalDesc: reagent-physical-desc-tropical
+  flavor: bluehawaiian
+  color: "#47687b"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+
+- type: reagent
+  id: Caipirinha
+  name: reagent-name-caipirinha
+  parent: BaseAlcohol
+  desc: reagent-desc-caipirinha
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: caipirinha
+  color: "#E6EE9C"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/caipirinha.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.1
+
+- type: reagent
+  id: MoscowMule
+  name: reagent-name-moscow-mule
+  parent: BaseAlcohol
+  desc: reagent-desc-moscow-mule
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: moscowmule
+  color: "#CECBAD"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/moscowmule.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+      - !type:AdjustReagent
+        reagent: Copper
+        amount: 0.05        
+        
+- type: reagent
+  id: Mimeosa
+  name: reagent-name-mimeosa
+  parent: BaseAlcohol
+  desc: reagent-desc-mimeosa
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: mimeosa
+  color: "#939393"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/mimeosa.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:GenericStatusEffect
+        key: Muted
+        component: Muted
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.07
+
+- type: reagent
+  id: Mimosa
+  name: reagent-name-mimosa
+  parent: BaseAlcohol
+  desc: reagent-desc-mimosa
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: mimosa
+  color: "#FFCA48"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/mimosa.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.07
+        
+- type: reagent
+  id: Mayojito
+  name: reagent-name-mayojito
+  parent: BaseAlcohol
+  desc: reagent-desc-mayojito
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: mayojito
+  color: "#6FBE44"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/mayojito.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:ChemVomit
+        conditions:
+        - !type:ReagentThreshold
+          min: 5
+        probability: 0.5
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: .5
+      - !type:SatiateThirst
+        factor: 1
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.15
+
+- type: reagent
+  id: DeathInTheAfternoon
+  name: reagent-name-death-in-the-afternoon
+  parent: BaseAlcohol
+  desc: reagent-desc-death-in-the-afternoon
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: deathintheafternoon
+  color: "#57A87D"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/deathintheafternoon.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
+
+- type: reagent
+  id: Empress75
+  name: reagent-name-empress-75
+  parent: BaseAlcohol
+  desc: reagent-desc-empress-75
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: empress75
+  color: "#900296"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/empress75.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
+
+- type: reagent
+  id: EspressoMartini
+  name: reagent-name-espresso-martini
+  parent: BaseAlcohol
+  desc: reagent-desc-espresso-martini
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: espressomartini
+  color: "#170a0c"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/espressomartini.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2
+        
+- type: reagent
+  id: Daiquiri
+  name: reagent-name-daiquiri
+  parent: BaseAlcohol
+  desc: reagent-desc-daiquiri
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: daiquiri
+  color: "#DAC865"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.1
+        
+- type: reagent
+  id: TheSunAlsoRises
+  name: reagent-name-the-sun-also-rises
+  parent: BaseAlcohol
+  desc: reagent-desc-the-sun-also-rises
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: thesunalsorises
+  color: "#DCE2DE"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/thesunalsorises.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
+
+- type: reagent
+  id: WhiskeySour
+  name: reagent-name-whiskey-sour
+  parent: BaseAlcohol
+  desc: reagent-desc-whiskey-sour
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: whiskeysour
+  color: "#8B7941"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/whiskeysour.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.2

 - type: reagent
  id: ZombieCocktail
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -506,7 +506,10 @@
  color: "#d8cc5d"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
  metabolisms:
    Drink:
      effects:
@@ -565,7 +568,7 @@
  flavor: sweet
  color: "#485000"
  metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/beerstein.rsi
+    sprite: Objects/Consumable/Drinks/rewriter.rsi
    state: icon_empty
  metamorphicMaxFillLevels: 5
  metamorphicFillBaseName: fill-
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -33,7 +33,10 @@
  color: "#262019"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/royrogers.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
  metabolisms:
    Drink:
      effects:
@@ -181,7 +184,10 @@
  color: "#ccb87e"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false

 - type: reagent
  id: ShirleyTemple
@@ -193,7 +199,10 @@
  color: "#af2221"
  metamorphicSprite:
    sprite: Objects/Consumable/Drinks/shirleytemple.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
  metabolisms:
    Drink:
      effects:
@@ -247,6 +256,12 @@
  physicalDesc: reagent-physical-desc-fizzy
  flavor: fourteenlokosoda
  color: "#deb928"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/fourteen_loko_glass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false  
  metabolisms:
    Drink:
      effects:
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -1219,6 +1219,144 @@
      amount: 1
  products:
    Cola: 4
+    
+- type: reaction
+  id: Caipirinha
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Rum:
+      amount: 1
+    JuiceLime:
+      amount: 1
+    Sugar:
+      amount: 1
+    Ice:
+      amount: 1
+  products:
+    Caipirinha: 4
+
+- type: reaction
+  id: Daiquiri
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Rum:
+      amount: 4
+    Sugar:
+      amount: 1
+    JuiceLime:
+      amount: 1
+  products:
+    Daiquiri: 6
+
+- type: reaction
+  id: DeathInTheAfternoon
+  reactants:
+    Absinthe:
+      amount: 2
+    Champagne:
+      amount: 1
+  products:
+    DeathInTheAfternoon: 3
+
+- type: reaction
+  id: Empress75
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Champagne:
+      amount: 2
+    Gin:
+      amount: 2
+    JuiceLime:
+      amount: 1
+    Grenadine:
+      amount: 1
+  products:
+    Empress75: 6
+
+- type: reaction
+  id: EspressoMartini
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    BlackRussian:
+      amount: 1
+    Coffee:
+      amount: 1
+  products:
+    EspressoMartini: 2
+
+- type: reaction
+  id: Mayojito
+  reactants:
+    Mojito:
+      amount: 1
+    Mayo:
+      amount: 1
+  products:
+    Mayojito: 2
+
+- type: reaction
+  id: Mimeosa
+  reactants:
+    Mimosa:
+      amount: 2
+    Nothing:
+      amount: 1
+  products:
+    Mimeosa: 3
+
+- type: reaction
+  id: Mimosa
+  reactants:
+    JuiceOrange:
+      amount: 2
+    Champagne:
+      amount: 1
+  products:
+    Mimosa: 3
+
+- type: reaction
+  id: MoscowMule
+  requiredMixerCategories:
+  - Stir
+  reactants:
+    Vodka:
+      amount: 4
+    JuiceLime:
+      amount: 1
+    SolDry:
+      amount: 1
+  products:
+    MoscowMule: 6
+
+- type: reaction
+  id: TheSunAlsoRises
+  reactants:
+    Absinthe:
+      amount: 1
+    Daiquiri:
+      amount: 5
+  products:
+    TheSunAlsoRises: 6
+
+- type: reaction
+  id: WhiskeySour
+  requiredMixerCategories:
+  - Shake
+  reactants:
+    Whiskey:
+      amount: 2
+    Sugar:
+      amount: 1
+    JuiceLemon:
+      amount: 2
+    Egg:
+      amount: 1
+  products:
+    WhiskeySour: 6

 - type: reaction
  id: ZombieCocktail