From: Hanz <41141796+Hanzdegloker@users.noreply.github.com>
Date: Fri, 3 May 2024 06:57:37 +0000 (-0400)
Subject: Red bool update (#27597)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=a8bf2689a4696e841ce607c7061ac73faceeeefb;p=space-station-14.git

Red bool update (#27597)

* the meat and potatoes

yuh yuh yuh

* what the hell is a copyright?

am I right?
---

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index f861624fb6..39b185bd02 100644
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -243,6 +243,12 @@ flavor-complex-atomic-cola = like hoarding bottle caps
 flavor-complex-cuba-libre = like spiked cola
 flavor-complex-gin-tonic = like spiked lemon-lime soda
 flavor-complex-screwdriver = like spiked orange juice
+flavor-complex-vodka-red-bool = like a heart attack
+flavor-complex-irish-bool = caffine and Ireland
+flavor-complex-xeno-basher = like killing bugs
+flavor-complex-budget-insuls-drink = like door hacking
+flavor-complex-watermelon-wakeup = like a sweet wakeup call
+flavor-complex-rubberneck = like synthetics
 flavor-complex-irish-car-bomb = like a spiked cola float
 flavor-complex-themartinez = like violets and lemon vodka
 flavor-complex-cogchamp = like brass
diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
index 4c38e92558..1cac0495b0 100644
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -261,3 +261,21 @@ reagent-desc-whiskey-soda = For the more refined griffon.
 
 reagent-name-white-russian = white russian
 reagent-desc-white-russian = That's just, like, your opinion, man...
+
+reagent-name-vodka-red-bool = vodka red bool
+reagent-desc-vodka-red-bool = Because heart failure and liver failure go hand in hand.
+
+reagent-name-xeno-basher = xeno basher
+reagent-desc-xeno-basher = The perfect drink before an expedition.
+
+reagent-name-irish-bool = irish bool
+reagent-desc-irish-bool = Like a bool in a Ireland shop.
+
+reagent-name-budget-insuls = budget insuls
+reagent-desc-budget-insuls = A tider's preferred drink.
+
+reagent-name-watermelon-wakeup = watermelon wakeup
+reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Also sweet.
+
+reagent-name-rubberneck = rubberneck
+reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet.
diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
index 975541a502..4689e26f8e 100644
--- a/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
+++ b/Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
@@ -6,6 +6,7 @@
   - DrinkColaBottleFull
   - DrinkCreamCartonXL
   - DrinkDrGibbJug
+  - DrinkEnergyDrinkJug
   - DrinkGreenTeaJug
   - DrinkIceJug
   - DrinkJuiceLimeCartonXL
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index a309b1d61d..e4f4440bd3 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -18,6 +18,7 @@
     DrinkCognacBottleFull: 4
     DrinkCoconutWaterCarton: 3
     DrinkColaBottleFull: 4
+    DrinkEnergyDrinkCan: 8
     DrinkMilkCarton: 2
     DrinkCreamCarton: 5
     DrinkGinBottleFull: 3
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
index ddf7943217..fc8492dcf1 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
@@ -4,6 +4,7 @@
     FoodSnackCheesie: 3
     FoodSnackChips: 3
     FoodSnackBoritos: 3
+    DrinkEnergyDrinkCan: 4
     FoodSnackPopcorn: 3
     FoodSnackEnergy: 3
     CigPackMixed: 2
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 ff9e512432..f8fc2998d7 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
@@ -32,6 +32,7 @@
       - DrinkBloodyMaryGlass
       - DrinkBooger
       - DrinkBraveBullGlass
+      - BudgetInsulsDrinkGlass
       - DrinkCarrotJuice
       - DrinkCoconutRum
       - DrinkChocolateGlass
@@ -57,6 +58,7 @@
       - DrinkIcedGreenTeaGlass
       - DrinkIcedBeerGlass
       - DrinkIceCreamGlass
+      - IrishBoolGlass
       - DrinkIrishCarBomb
       - DrinkIrishCoffeeGlass
       - DrinkLemonadeGlass
@@ -78,6 +80,7 @@
       - DrinkRewriter
       - DrinkRoyRogersGlass
       - DrinkRootBeerFloatGlass
+      - RubberneckGlass
       - DrinkRumGlass
       - DrinkSakeGlass
       - DrinkSbitenGlass
@@ -91,12 +94,15 @@
       - DrinkThreeMileIslandGlass
       - DrinkToxinsSpecialGlass
       - DrinkVodkaMartiniGlass
+      - DrinkVodkaRedBool
       - DrinkVodkaTonicGlass
       - DrinkWatermelonJuice
+      - DrinkWatermelonWakeup
       - DrinkWhiskeyColaGlass
       - DrinkWhiskeySodaGlass
       - DrinkWhiteRussianGlass
       - DrinkWineGlass
+      - XenoBasherGlass
       - DrinkShakeBlue
       - DrinkShakeWhite
       - DrinkTheMartinez
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index a729eed9c8..42814f7fd8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -503,6 +503,22 @@
     sprite: Objects/Consumable/Drinks/bravebullglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: BudgetInsulsDrinkGlass
+  suffix: budget insuls
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: BudgetInsulsDrink
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/budgetinsulsdrink.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCarrotJuice
@@ -535,6 +551,22 @@
     sprite: Objects/Consumable/Drinks/chocolateglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: RubberneckGlass
+  suffix: rubberneck
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Rubberneck
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/rubberneck.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkCoconutRum
@@ -1061,6 +1093,22 @@
     sprite: Objects/Consumable/Drinks/icecreamglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: IrishBoolGlass
+  suffix: irish bool
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: IrishBool
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkIrishCarBomb
@@ -2054,6 +2102,22 @@
     sprite: Objects/Consumable/Drinks/martiniglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkVodkaRedBool
+  suffix: vodka red bool
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: VodkaRedBool
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkVodkaTonicGlass
@@ -2100,6 +2164,22 @@
         - ReagentId: JuiceWatermelon
           Quantity: 30
 
+- type: entity
+  parent: DrinkGlass
+  id: DrinkWatermelonWakeup
+  suffix: watermelon wakeup
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: WatermelonWakeup
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/champagneglass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlass
   id: DrinkWhiskeyColaGlass
@@ -2180,6 +2260,22 @@
     sprite: Objects/Consumable/Drinks/wineglass.rsi
     state: icon
 
+- type: entity
+  parent: DrinkGlass
+  id: XenoBasherGlass
+  suffix: xeno basher
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: XenoBasher
+          Quantity: 30
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/xenobasher.rsi
+    state: icon
+
 # TODO: MOVE
 
 - type: entity
diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 47a1bc71aa..73ded93e0f 100644
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -589,6 +589,36 @@
   flavorType: Complex
   description: flavor-complex-irish-car-bomb
 
+- type: flavor
+  id: vodkaredbool
+  flavorType: Complex
+  description: flavor-complex-vodka-red-bool
+
+- type: flavor
+  id: xenobasher
+  flavorType: Complex
+  description: flavor-complex-xeno-basher
+
+- type: flavor
+  id: irishbool
+  flavorType: Complex
+  description: flavor-complex-irish-bool
+
+- type: flavor
+  id: budgetinsulsdrink
+  flavorType: Complex
+  description: flavor-complex-budget-insuls-drink
+
+- type: flavor
+  id: watermelonwakeup
+  flavorType: Complex
+  description: flavor-complex-watermelon-wakeup
+
+- type: flavor
+  id: rubberneck
+  flavorType: Complex
+  description: flavor-complex-rubberneck
+
 - type: flavor
   id: blackrussian
   flavorType: Complex
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 963e5fcf45..8028b6376c 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -1769,3 +1769,165 @@
       - !type:AdjustReagent
         reagent: Ethanol
         amount: 0.15
+
+- type: reagent
+  id: VodkaRedBool
+  name: reagent-name-vodka-red-bool
+  parent: BaseAlcohol
+  desc: reagent-desc-vodka-red-bool
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: vodkaredbool
+  color: "#c4c27655"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.10
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.25
+
+- type: reagent
+  id: XenoBasher
+  name: reagent-name-xeno-basher
+  parent: BaseAlcohol
+  desc: reagent-desc-xeno-basher
+  physicalDesc: reagent-physical-desc-fizzy-and-creamy
+  flavor: xenobasher
+  color: "#4d6600"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/xenobasher.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 2
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.15
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.15
+
+- type: reagent
+  id: IrishBool
+  name: reagent-name-irish-bool
+  parent: BaseAlcohol
+  desc: reagent-desc-irish-bool
+  physicalDesc: reagent-physical-desc-bubbly
+  flavor: irishbool
+  color: "#71672e99"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/beerglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 6
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.10
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.15
+
+- type: reagent
+  id: BudgetInsulsDrink
+  name: reagent-name-budget-insuls
+  parent: BaseAlcohol
+  desc: reagent-desc-budget-insuls
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: budgetinsulsdrink
+  color: "#dede73"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/budgetinsulsdrink.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.15
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.25
+
+- type: reagent
+  id: WatermelonWakeup
+  name: reagent-name-watermelon-wakeup
+  parent: BaseAlcohol
+  desc: reagent-desc-watermelon-wakeup
+  physicalDesc: reagent-physical-desc-sweet
+  flavor: watermelonwakeup
+  color: "#d49dca"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/champagneglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: true
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.07
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.15
+
+- type: reagent
+  id: Rubberneck
+  name: reagent-name-rubberneck
+  parent: BaseAlcohol
+  desc: reagent-desc-rubberneck
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: rubberneck
+  color: "#f0d74a"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/rubberneck.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.15
+        - !type:AdjustReagent
+          reagent: Theobromine
+          amount: 0.05
+  fizziness: 0.25
diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
index f8d3f41af9..d78b0351ce 100644
--- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml
@@ -70,7 +70,7 @@
         factor: 2
       - !type:AdjustReagent
         reagent: Theobromine
-        amount: 0.05
+        amount: 0.1
   fizziness: 0.4
 
 - type: reagent
diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index c810ebb0ce..2a14c0ecd2 100644
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -86,6 +86,16 @@
   products:
     B52: 3
 
+- type: reaction
+  id: BudgetInsulsDrink
+  reactants:
+    Tequila:
+      amount: 1
+    VodkaRedBool:
+      amount: 2
+  products:
+    BudgetInsulsDrink: 3
+
 - type: reaction
   id: BlueHawaiian
   reactants:
@@ -516,6 +526,16 @@
   products:
     IcedTea: 3
 
+- type: reaction
+  id: IrishBool
+  reactants:
+    EnergyDrink:
+      amount: 1
+    IrishCarBomb:
+      amount: 1
+  products:
+    IrishBool: 2
+
 - type: reaction
   id: IrishCarBomb
   reactants:
@@ -794,6 +814,18 @@
   products:
     RoyRogers: 3
 
+- type: reaction
+  id: Rubberneck
+  reactants:
+    EnergyDrink:
+      amount: 2
+    Moonshine:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    Rubberneck: 4
+
 - type: reaction
   id: Sbiten
   reactants:
@@ -943,6 +975,16 @@
   products:
     VodkaMartini: 3
 
+- type: reaction
+  id: VodkaRedBool
+  reactants:
+    Vodka:
+      amount: 1
+    EnergyDrink:
+      amount: 2
+  products:
+    VodkaRedBool: 3
+
 - type: reaction
   id: VodkaTonic
   reactants:
@@ -963,6 +1005,18 @@
   products:
     WhiskeyCola: 3
 
+- type: reaction
+  id: WatermelonWakeup
+  reactants:
+    JuiceWatermelon:
+      amount: 1
+    Whiskey:
+      amount: 1
+    EnergyDrink:
+      amount: 1
+  products:
+    WatermelonWakeup: 3
+
 - type: reaction
   id: WhiteRussian
   reactants:
@@ -983,6 +1037,16 @@
   products:
     WhiskeySoda: 3
 
+- type: reaction
+  id: XenoBasher
+  reactants:
+    ManlyDorf:
+      amount: 2
+    EnergyDrink:
+      amount: 1
+  products:
+    XenoBasher: 3
+
 - type: reaction
   id: HotRamen
   minTemp: 323.15
diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-1.png
new file mode 100644
index 0000000000..aca8f4931d
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-2.png
new file mode 100644
index 0000000000..4715162ebe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-3.png
new file mode 100644
index 0000000000..04bfd58d03
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon.png
new file mode 100644
index 0000000000..04bfd58d03
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon_empty.png
new file mode 100644
index 0000000000..4d446abc54
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/meta.json
new file mode 100644
index 0000000000..14c43f186f
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/budgetinsulsdrink.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Glass and fillstates by Hanzdegloker on Github.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png
index 7a577d477c..e9e2aea716 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png and b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png
index b26d37e377..44688ef3e9 100644
Binary files a/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png and b/Resources/Textures/Objects/Consumable/Drinks/energy_drink.rsi/icon_open.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-1.png
new file mode 100644
index 0000000000..f5afa0bed8
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-2.png
new file mode 100644
index 0000000000..79bcdcfb8c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-3.png
new file mode 100644
index 0000000000..772aa80d6a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/fill-3.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon.png
new file mode 100644
index 0000000000..772aa80d6a
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon_empty.png
new file mode 100644
index 0000000000..416d1f7717
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/meta.json
new file mode 100644
index 0000000000..a26c7355ae
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/rubberneck.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://tgstation13.org/wiki/images/archive/4/4e/20220514022531%21Rubberneck.png. Fill levels by Hanzdegloker on GitHub.",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-1.png
new file mode 100644
index 0000000000..3aef3bd8ab
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-1.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-2.png
new file mode 100644
index 0000000000..ce4411ee1e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/fill-2.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon.png
new file mode 100644
index 0000000000..ce4411ee1e
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon_empty.png
new file mode 100644
index 0000000000..85097b80cc
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/icon_empty.png differ
diff --git a/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/meta.json
new file mode 100644
index 0000000000..9743bd909e
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/xenobasher.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by Hanzdegloker on github",
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon_empty"
+    },
+    {
+      "name": "fill-1"
+    },
+    {
+      "name": "fill-2"
+    }
+  ]
+}