Bartender "Essentials" (#25367)

* drinks round 1 saving my progress before my hard drive explodes * test 2 please work * name fixes whoops * Update drinks.yml * various fixes am dumb * add sol dry to vends more fixes and changes, yippee! * more fixes & ingame testing shrimple tests * last fixes :trollface: should be ready for pr now * Update soda.yml sate thirst
2024-04-01 02:41:14 -04:00
parent 5613c3d3dd
commit ea3e98e120
50 changed files with 820 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
@@ -19,6 +19,7 @@
      - DrinkAloe
      - DrinkAndalusia
      - DrinkAntifreeze
+      - DrinkArnoldPalmer
      - DrinkB52Glass
      - DrinkBahamaMama
      - DrinkBananaHonkGlass
@@ -27,12 +28,15 @@
      - DrinkBerryJuice
      - DrinkBlackRussianGlass
      - DrinkBlueCuracaoGlass
+      - DrinkBlueHawaiianGlass
      - DrinkBloodyMaryGlass
      - DrinkBooger
      - DrinkBraveBullGlass
      - DrinkCarrotJuice
+      - DrinkCoconutRum
      - DrinkChocolateGlass
      - DrinkCognacGlass
+      - DrinkCosmopolitan
      - DrinkCubaLibreGlass
      - DrinkDeadRumGlass
      - DrinkDevilsKiss
@@ -66,15 +70,19 @@
      - DrinkMilkshake
      - DrinkMojito
      - DrinkNTCahors
+      - DrinkPainkillerGlass
      - DrinkPatronGlass
+      - DrinkPinaColadaGlass
      - DrinkPoscaGlass
      - DrinkRedMeadGlass
      - DrinkRewriter
+      - DrinkRoyRogersGlass
      - DrinkRootBeerFloatGlass
      - DrinkRumGlass
      - DrinkSakeGlass
      - DrinkSbitenGlass
      - DrinkScrewdriverCocktailGlass
+      - DrinkShirleyTempleGlass
      - DrinkSuiDreamGlass
      - DrinkSingulo
      - DrinkSoyLatte
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_soda.yml
@@ -31,6 +31,7 @@
      - DrinkDrGibbCan
      - DrinkEnergyDrinkCan
      - DrinkShamblersJuiceCan
+      - DrinkSolDryCan
      - DrinkPwrGameCan
      - DrinkHotCoco
      - DrinkHotCoffee
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
@@ -112,6 +112,24 @@
  - type: Sprite
    sprite: Objects/Consumable/Drinks/tomatojuice.rsi

+- type: entity
+  parent: [DrinkBottleVisualsOpenable, DrinkBottlePlasticBaseFull]
+  id: DrinkCoconutWaterCarton
+  name: coconut water
+  description: It's the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 50
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/coconutwater.rsi
+
 - type: entity
  parent: [DrinkCartonVisualsOpenable, DrinkCartonBaseFull]
  id: DrinkCreamCarton
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -258,6 +258,22 @@
        - ReagentId: Antifreeze
          Quantity: 30

+- type: entity
+  parent: DrinkGlass
+  id: DrinkArnoldPalmer
+  suffix: arnold palmer
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ArnoldPalmer
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/arnoldpalmer.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkAtomicBombGlass
@@ -437,6 +453,22 @@
    sprite: Objects/Consumable/Drinks/bloodymaryglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkBlueHawaiianGlass
+  suffix: blue hawaiian
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BlueHawaiian
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/bluehawaiian.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkBooger
@@ -501,6 +533,35 @@
    sprite: Objects/Consumable/Drinks/chocolateglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutRum
+  suffix: coconut rum
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutRum
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/coconutrum.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: DrinkCoconutWaterGlass
+  suffix: coconut water
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 30
+
 - type: entity
  parent: DrinkGlass
  id: DrinkCoffee
@@ -533,6 +594,22 @@
    sprite: Objects/Consumable/Drinks/cognacglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkCosmopolitan
+  suffix: cosmopolitan
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Cosmopolitan
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/cosmopolitan.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkCream
@@ -1340,6 +1417,22 @@
    sprite: Objects/Consumable/Drinks/orangejuice.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkPainkillerGlass
+  suffix: painkiller
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Painkiller
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/painkiller.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkPatronGlass
@@ -1356,6 +1449,22 @@
    sprite: Objects/Consumable/Drinks/patronglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkPinaColadaGlass
+  suffix: piña colada
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: PinaColada
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/pinacolada.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkPoisonBerryJuice
@@ -1484,6 +1593,22 @@
    sprite: Objects/Consumable/Drinks/rumglass.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkRoyRogersGlass
+  suffix: roy rogers
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: RoyRogers
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/royrogers.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkSakeGlass
@@ -1609,6 +1734,22 @@
    sprite: Objects/Consumable/Drinks/glass_white.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkShirleyTempleGlass
+  suffix: shirley temple
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: ShirleyTemple
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/shirleytemple.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkSilencerGlass
@@ -1641,6 +1782,22 @@
    sprite: Objects/Consumable/Drinks/singulo.rsi
    state: icon

+- type: entity
+  parent: DrinkGlass
+  id: DrinkSolDryGlass
+  suffix: sol dry
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/sol_dry_glass.rsi
+    state: icon
+
 - type: entity
  parent: DrinkGlass
  id: DrinkSnowWhite
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -789,6 +789,23 @@
  - type: Label
    currentLabel: ice

+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkCoconutWaterJug
+  name: coconut water jug
+  description: It's on the inside of the coconut that counts.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 300
+        reagents:
+        - ReagentId: CoconutWater
+          Quantity: 300
+  - type: Drink
+  - type: Label
+    currentLabel: coconut water
+
 - type: entity
  parent: DrinkBottlePlasticBaseFull
  id: DrinkCoffeeJug
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -239,6 +239,24 @@
  - type: Item
    sprite: Objects/Consumable/Drinks/space-up.rsi

+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkSolDryCan
+  name: sol dry
+  description: Sweet ginger soda from outer space!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: SolDry
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/sol_dry.rsi
+
 - type: entity
  parent: DrinkCanBaseFull
  id: DrinkStarkistCan