From 1ab50b21271bab2416d1a44859a3c8ab884f8b76 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:14:52 +1100
Subject: [PATCH 01/14] haha yeah

---
 .../en-US/deltav/flavors/flavor-profiles.ftl  |  1 +
 .../meta/consumable/drink/alcohol.ftl         |  2 ++
 .../reagents/meta/consumable/drink/drinks.ftl |  3 +++
 .../Prototypes/DeltaV/Flavors/flavors.yml     |  5 ++++
 .../Reagents/Consumable/Drink/alcohol.yml     | 17 ++++++++++++
 .../Reagents/Consumable/Drink/drinks.yml      | 23 ++++++++++++++++
 .../DeltaV/Recipes/Reactions/drinks.yml       | 14 ++++++++++
 .../Drinks/angobitters.rsi/meta.json          | 26 +++++++++++++++++++
 .../Drinks/lemonlimebitters.rsi/meta.json     | 26 +++++++++++++++++++
 9 files changed, 117 insertions(+)
 create mode 100644 Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl
 create mode 100644 Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json

diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
index 6c93c98ed3c..a1cd048c9b1 100644
--- a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
@@ -29,6 +29,7 @@ flavor-complex-blellow = like an impossible color
 flavor-complex-candy-strawberry = like strawberries
 flavor-complex-candy-bubblegum = like bubble gum
 flavor-complex-double-ice-cream = like ice cream, twice
+flavor-complex-lemon-lime-bitters = like an Aussie dessert
 
 candy-flavor-profile = This one is supposed to taste {$flavor}.
 candy-flavor-profile-multiple = This one is supposed to taste {$flavors} and {$lastFlavor}.
diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl
new file mode 100644
index 00000000000..d7b4bebcaa7
--- /dev/null
+++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/alcohol.ftl
@@ -0,0 +1,2 @@
+reagent-name-angobitters = angobitters
+reagent-desc-angobitters = An herbal bitters making use of angostura bark, often used to flavor drinks.
diff --git a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl
index e57a5a1e520..3d6616101ba 100644
--- a/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/deltav/reagents/meta/consumable/drink/drinks.ftl
@@ -24,3 +24,6 @@ reagent-desc-mothamphetamine = A strangely... fuzzy drink. It has a chaotic aura
 
 reagent-name-double-ice-cream = Double Ice Cream
 reagent-desc-double-ice-cream = Ice cream, but now with even more ice cream on top. It doesn't get any sweeter than this!
+
+reagent-name-lemon-lime-bitters = lemon lime bitters
+reagent-desc-lemon-lime-bitters = Western Australians love this shit.
diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml
index 8d0d01efa0b..0ed3f0bd6be 100644
--- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml
+++ b/Resources/Prototypes/DeltaV/Flavors/flavors.yml
@@ -136,3 +136,8 @@
   id: doubleicecream
   flavorType: Complex
   description: flavor-complex-double-ice-cream
+
+- type: flavor
+  id: lemonlimebitters
+  flavorType: Complex
+  description: flavor-complex-lemon-lime-bitters
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml
new file mode 100644
index 00000000000..79871503a09
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/alcohol.yml
@@ -0,0 +1,17 @@
+- type: reagent
+  id: Angobitters
+  name: reagent-name-angobitters
+  parent: BaseAlcohol
+  desc: reagent-desc-angobitters
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: alcohol
+  color: "#611f05"
+  recognizable: true
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 1
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
index d2e297f926a..7ee08c16b02 100644
--- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
@@ -221,3 +221,26 @@
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   fizziness: 0.4
+
+- type: reagent
+  id: LemonLimeBitters
+  name: reagent-name-lemon-lime-bitters
+  parent: BaseDrink
+  desc: reagent-desc-lemon-lime-bitters
+  physicalDesc: reagent-physical-desc-fizzy
+  flavor: lemonlimebitters
+  metamorphicSprite:
+    sprite: DeltaV/Objects/Consumable/Drinks/lemonlimebittersglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  fizziness: 0.2
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:AdjustReagent
+        reagent: Ethanol
+        amount: 0.3
diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml
index 60bb26eaa2f..3216e26b609 100644
--- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml
@@ -100,3 +100,17 @@
       amount: 1
   products:
     DoubleIceCream: 3
+
+- type: reaction
+  id: LemonLimeBitters
+  reactants:
+    Lemonade:
+      amount: 5
+    JuiceLime:
+      amount: 2
+    Sugar:
+      amount: 2
+    Angobitters:
+      amount: 1
+  products:
+    LemonLimeBitters: 10
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
new file mode 100644
index 00000000000..1b5a2396eb8
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by BlitzTheSquishy",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
new file mode 100644
index 00000000000..1b5a2396eb8
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by BlitzTheSquishy",
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        }
+    ]
+}

From 28dc9f7e9ee384ac2cc9baf6bf82cfb237aebc92 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:37:19 +1100
Subject: [PATCH 02/14] merge conflict fix

---
 Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl
index 2a02820a360..814e7b1d4c0 100644
--- a/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/_DV/flavors/flavor-profiles.ftl
@@ -29,6 +29,7 @@ flavor-complex-candy-strawberry = like strawberries
 flavor-complex-candy-bubblegum = like bubble gum
 flavor-complex-double-ice-cream = like ice cream, twice
 flavor-complex-drgibbbloodred = like severe malpractice
+flavor-complex-lemon-lime-bitters = like an Aussie dessert
 
 ## Delta-V additional drink flavors
 flavor-complex-absinthe-deltav = like green death

From 5270226553689cc0e90aae995064bc60885bb9bb Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:49:23 +1100
Subject: [PATCH 03/14] DeltaV namespace is kill

---
 .../Objects/Consumable/Drinks/angobitters.rsi/meta.json           | 0
 .../Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json      | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename Resources/Textures/{DeltaV => _DV}/Objects/Consumable/Drinks/angobitters.rsi/meta.json (100%)
 rename Resources/Textures/{DeltaV => _DV}/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json (100%)

diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
rename to Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
diff --git a/Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
similarity index 100%
rename from Resources/Textures/DeltaV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
rename to Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json

From 5a10d1d69f1fe606b43bcf9192f9349c9b038b74 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:54:41 +1100
Subject: [PATCH 04/14] Flavours reorganized (also shifted blood red dr gibb to
 where it was supposed to be)

---
 Resources/Prototypes/_DV/Flavors/flavors.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/_DV/Flavors/flavors.yml b/Resources/Prototypes/_DV/Flavors/flavors.yml
index d1684fb4504..ae7395b788d 100644
--- a/Resources/Prototypes/_DV/Flavors/flavors.yml
+++ b/Resources/Prototypes/_DV/Flavors/flavors.yml
@@ -116,6 +116,17 @@
   flavorType: Complex
   description: flavor-complex-blellow
 
+- type: flavor
+  id: drgibbbloodred
+  flavorType: Complex
+  description: flavor-complex-drgibbbloodred
+
+- type: flavor
+  id: lemonlimebitters
+  flavorType: Complex
+  description: flavor-complex-lemon-lime-bitters
+
+
 #Delta-V additional drink flavors
 - type: flavor
   id: deadrum
@@ -172,10 +183,6 @@
   flavorType: Complex
   description: flavor-complex-mothamphetamine-deltav
 
-- type: flavor
-  id: drgibbbloodred
-  flavorType: Complex
-  description: flavor-complex-drgibbbloodred
 
 # this is prefixed with "candy" to avoid clashes with potential future strawberries upstream
 - type: flavor
@@ -193,7 +200,3 @@
   flavorType: Complex
   description: flavor-complex-double-ice-cream
 
-- type: flavor
-  id: lemonlimebitters
-  flavorType: Complex
-  description: flavor-complex-lemon-lime-bitters

From 9d30a6bbffc23b00b2c439ff8b314f0cbe732122 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Thu, 13 Feb 2025 12:55:48 +1100
Subject: [PATCH 05/14] forgor this

---
 .../Consumable/Drinks/angobitters.rsi/meta.json      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
index 1b5a2396eb8..b2ef9cf1f3b 100644
--- a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
@@ -9,18 +9,6 @@
     "states": [
         {
             "name": "icon"
-        },
-        {
-            "name": "icon_empty"
-        },
-        {
-            "name": "fill-1"
-        },
-        {
-            "name": "fill-2"
-        },
-        {
-            "name": "fill-3"
         }
     ]
 }

From 2ac63aee0f56c3bf284bfa81fac22ca3105b9055 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Thu, 13 Feb 2025 13:10:12 +1100
Subject: [PATCH 06/14] bottle

---
 .../Objects/Consumable/Drinks/drinks_bottles.yml   | 14 ++++++++++++++
 .../_DV/Reagents/Consumable/Drink/drinks.yml       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
new file mode 100644
index 00000000000..d20ddf69a57
--- /dev/null
+++ b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -0,0 +1,14 @@
+- type: entity
+  parent: DrinkBottleGlassBaseFull
+  id: DrinkAngobittersBottleFull
+  name: angobitters bottle
+  description: It's like sake but if you're trying to get FUCKED. UP.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: Angobitters
+          Quantity: 100
+  - type: Sprite
+    sprite: _DV/Objects/Consumable/Drinks/angobitters.rsi
diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
index 910baa86544..5f6e351a0e4 100644
--- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
@@ -230,7 +230,7 @@
   physicalDesc: reagent-physical-desc-fizzy
   flavor: lemonlimebitters
   metamorphicSprite:
-    sprite: DeltaV/Objects/Consumable/Drinks/lemonlimebittersglass.rsi
+    sprite: _DV/Objects/Consumable/Drinks/lemonlimebitters.rsi
     state: icon_empty
   metamorphicMaxFillLevels: 5
   metamorphicFillBaseName: fill-

From 03a53c41b7807ee384aefa5ea20bcd4f4fcd2da0 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Sat, 15 Feb 2025 22:51:51 +1100
Subject: [PATCH 07/14] drinks.yml

---
 Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
index 5f6e351a0e4..377a9b8478b 100644
--- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
@@ -232,7 +232,7 @@
   metamorphicSprite:
     sprite: _DV/Objects/Consumable/Drinks/lemonlimebitters.rsi
     state: icon_empty
-  metamorphicMaxFillLevels: 5
+  metamorphicMaxFillLevels: 3
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   fizziness: 0.2

From dea42685ef7cb41dcb68fa7925cbba187ac09822 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Mon, 17 Feb 2025 12:49:39 +1100
Subject: [PATCH 08/14] LLB sprites

---
 .../Drinks/lemonlimebitters.rsi/fill-1.png        | Bin 0 -> 434 bytes
 .../Drinks/lemonlimebitters.rsi/fill-2.png        | Bin 0 -> 505 bytes
 .../Drinks/lemonlimebitters.rsi/fill-3.png        | Bin 0 -> 491 bytes
 .../Drinks/lemonlimebitters.rsi/icon.png          | Bin 0 -> 723 bytes
 .../Drinks/lemonlimebitters.rsi/icon_empty.png    | Bin 0 -> 745 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-1.png
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-2.png
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-3.png
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon_empty.png

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-1.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cfa18b61c7ceaf9c415bb9495de7ec45b106871
GIT binary patch
literal 434
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikt0(?ST|Mw^VUtITpN!|a&_5T;w0);Oo2JHn>Y$ZW{!T&*kVe|ea`+*{y
z1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUNp3(0;%-eu!
zwxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLYcMi{#hHL?Lq;YB0U#X(#F_0ZVDT&<
z8w3)77^ELYqgl!T^#25Q1{R<S10!Pt#sv^lK{{9$KunqfWP<<`&>SYP${<S%APcI?
z(7*sB`||2Hi&M99s(?&GPZ!4!3;*N<RR)O*tQQWhVB(MnWngp;U}R=lz@b<iAvsfG
l=1hsm39TMmn7Ac`xEQ#<2%pRry>bF%kf*Dk%Q~loCIEX}Ua0^8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-2.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c77e32746828827a68b6544c02dbf49a28b33fd
GIT binary patch
literal 505
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCikd1AIbU|Mw^VpOo=`a{B*C>HjBZ{9oSue+3XV{ogb1|DO5(FYfw(VfX)w
zyZ>L<1=L|!ak2qO@s|Yo1^-6@3|H>VSO}EjEbxddW?<ku48n}Z^H-z*1tm&cBT9nv
z(@M${i&7Z^5;OBk^!!{y6ioFD^^AV+VcrH*vn@5kGtJXei-7~kVP%kFWMyCkvb=y;
z8p;OwP=k>fEY1XE8!|F62mt9QAkJ)O0gGn=*&vVr#321J8qHD$U>HqcXJ7%UFfcMU
zU|aw(6{Lf80mP&!KsE?40nK3os|>QV0J5OE3=IrGvM;ZGvp97trwYgn@pN$vvG9M}
z@6B~UfrmBO<l3?GfBU0XY}wNh5F<9{>S=@70lypE3^z5O<Fm?Uv|Z5rSIq6<#W~66
z8v}1TJW>o~naX>qviTI-tnRe6E3Vy}^RfE@lhr-5DC2_({UEzMUHx3vIVCg!0C%*P
A-2eap

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-3.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..660461ce09bc1e2aa71ab0702cbe7917a3f34e80
GIT binary patch
literal 491
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCik70(?ST|Mw^VUsCsfasB@#_5XLy`oCk=|D7}c@0k7n?6&`pF8+Uf5vWi<
zwqF-W@stGl1^-6?2BG`s&H=?a3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv=}
z#LT=BJwMkF1yemkJ)_@yn70AdY)g&sO!M^AV&DLBSQ(@kSs56CEH5CIhO$Av(qLo;
zi!%Y)hKx)M0zf(nh%?(+z~WgzHV7mDF-Sj*MzfRw7%mgo8CZZS42+Bo7#BcH1?ga2
z05NF_kPQM%Ky#SDDuXO7fGnskLjwbl?8~d)EKc3ZsRA;CJY5_^Ed1Y2IL&oHfrn-D
zHTUrU|Ldy-5|vw(Dm35DF*`gb=`G{zqi5tx_DS4unEQtJpvIg_iy1lC7o1`@d>RxK
p^0ayL;#2G@*{Y#yZC~|;vxqO#&|;V|ZMO-?CQnyCmvv4FO#o2ni8ufN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bff025b8b80974d90307170339153d0c2fbb094
GIT binary patch
literal 723
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zp3(0;%-eu!wxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;YB0U#X(
z#F_0ZVDT&<8w3)77^ELYqgl$p%)l^#oq+|Y!obMbfN=rDRFDqV1rU>_0NEhG1T=>U
ztTM>b0?2~uGBhv%$-cb$&EnLpoGPGgO`a}}ArbCxr}}#xb`WXbztVH^tYudll=AL!
zC~4R_n#(x}h<|0V?Rc=ydg1j8+$_5%<=HeeDctzA{;Z97XMi)$OpRRz@;s9F&g}Vq
zy1$YqBqZcdd5F~q;S&-+XRLnvM`~-ygWV@24!%G9%ksxx|D;VPLZ=^15P7EdX6M`;
zKR%0^e0%s#<9e&U_$H4o`DKs0zuY<Z;h0@=wrPi}&Afj*7^Y28niQj)q|SAx@y=0`
z=0J^gsj~TIf4}a2`K8XNy4v%-r^LKBrCd+-w!CaUs4?Z;52oFs2J>weq_2Oe%MkNU
zCLqM2Q_o{fxN2Wo!W>r@<*3Eebb^_U4aFKbJX%)Gls|jOrn|vK(DXFhS8=`@r6vpJ
zu$_uz+s(Iaa!*QL!$*A{w}mD7>sS8PJ~Mxr%jQ<Ukb<2XqjxZCJY`U*lYU!urO7md
z{eeD@vlr(A$px|ePuDK^!w|)|CA>b+;jr>5>oYpsg|-<L56m8~SA5DMuzhjH+&-z`
mADeV0eOH+sbD*n>tD#(Ye)dNV-OIZ`G2`j#=d#Wzp$PyE8t_K|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon_empty.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..517a6dcab0b082e883e76457ac927f956466bcf8
GIT binary patch
literal 745
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zp3(0;%-eu!wxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;YB0U#X(
z#F_0ZVDT&<8w3)77^ELYqgl$p%)l^#oq+|Y!obMbfN=rDRFDqV1rU>_0NEhG1T=>U
ztTM>b0?2~uGBhv%$-cb$&EnLpoGPGgGdx`!Ln7SYPTlKw*g)X;|8#4wA1@f3*~8d&
zeZ08c(TV3NXN7=D*^CLl%xZdNXH4u8a1NH5bmRDhu+X);4*7*l`{y=a|NH5=a|Mha
z+bd3I5WMMK@OEwU2JvfW-449wxpFY{_)W%er^^<s*IJ8NIAoZOnVDzVf9dG#m?N9J
zkC{1X%euyI%oldWO^IwOXMYzbcbAi)%5%GxT_xK#zs85GD;}?V%#+Z0V9Sr6hZec&
zzx;N8QMAmvx8XvIXCGr#=v)x~B=H(2!xhHFqia8jc}&@5b0c?a`{R%4QBQ6jYP0;i
zdh$D`O{@F9D~c!xa;|L274O*2u((Q8)8p1gfjz8T$y?HrlU6D@nclam;Fd^RJkwjX
zWmB?Z1-F4Q*V@xAD|d7jKhS6RP#)-`q_`+z)rr2}k5mozM*a1SeBz?AZL!9-?>f7i
zR(}whF)=$fEp_JBM-|K8Ni?yTY?gdlsnxkeg{$gV&x0rHb0+OuzPSIAMDp<(4l#}1
zi;oxmNKE)?{;hw_AMqVK>T8SCzV@BpbIxUg!(^8J1)63|(v9)2<F=o4Q!#i3iZ4%B
KKbLh*2~7Y|ZT@Ef

literal 0
HcmV?d00001


From d25ce0b43e691a48ded9bb3eb87e7e9f3e8fbae5 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:03:51 +1100
Subject: [PATCH 09/14] agnobitters sprite and change of unit count

---
 .../Objects/Consumable/Drinks/drinks_bottles.yml  |   9 ++++++---
 .../Consumable/Drinks/angobitters.rsi/icon.png    | Bin 0 -> 865 bytes
 .../Drinks/angobitters.rsi/icon_open.png          | Bin 0 -> 854 bytes
 .../Consumable/Drinks/angobitters.rsi/meta.json   |   3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index d20ddf69a57..9c791ef6ef3 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -1,14 +1,17 @@
 - type: entity
-  parent: DrinkBottleGlassBaseFull
+  parent: [DrinkBottleVisualsOpenable, DrinkBottleGlassBaseFull]
   id: DrinkAngobittersBottleFull
   name: angobitters bottle
-  description: It's like sake but if you're trying to get FUCKED. UP.
+  description: Commonly used for mixed drinks, not drunk neat.
   components:
   - type: SolutionContainerManager
     solutions:
       drink:
         reagents:
         - ReagentId: Angobitters
-          Quantity: 100
+          Quantity: 50
+  - type: Label
+    currentLabel: reagent-name-angobitters
   - type: Sprite
     sprite: _DV/Objects/Consumable/Drinks/angobitters.rsi
+  - type: Sealable
diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5565040f758908a8f2c175257eaed024d5501d2
GIT binary patch
literal 865
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFqUOHI|q0=J1Ybf<)>xlq%tsQ
zoS!<;(wjL@q;>xh)kjWTqAoga0UHejM2-Y0&2ZD5#F6J~bW+7>TB4d`)7pe&!3_er
zcewsHZfjcGq@dB%F?VmYa^jxzEJ7~a_dh(VoAdqL({qvq=a+o#x%;Bs$1K0Ki7_{^
z(DSp+Wgqk0FP9~+<`$dT$UZ#(wXoa!s`UI<NB@UK+a$hzkR>R0-B(-RM$=~VG;`5>
z&hnQlGh%)?R2-Sa*s4EOZuN)Bk5XFii$qVnAhILWUpMmjMyqSVVQv)>6$+E}UR<rb
zGJT8srq78h_ip;Vfm2YW!L5gB^^%j1C(oLCrtbUC{k6qUjx0WXdr60CpNi(kzK*B~
z>o`}oz2L08Bog}0{_~dJjTgPXe`7GQwL14&p<>&@n4&r7osVnEJ0519lb-!=&J&Z5
zdQ~fz@xEy;XZF+2ippU>XSVS9y`HFx`70f_-8Ojel*LMH;b*C+>DrN@=Pma&pV;+h
zk@k(d&5AqU$Npq`7n;GOa7$|gFd{e$JR*x37`O#Nn6W-3ej-p%qQo_#Bsf2<q&%@G
zl_4N8Gp|I?&oxBBRL@Y)==UDxZ9p|WsS%!Oo}O9^96$~$gA^kx10#^-1;o-&HYmz9
z7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0{W7S3@?}wG@7LhK>ZWg8CZZS4UCKp7#BcH
z{r?}VnStf}lrwfq#C8ICS3O-ELn7SYUOC9yY{0{M;lA7s$Fzi|j^O-`&>4-EGa5r{
z-in-QsBUJq-Rhbrn%L|W`qb0ogy6%|eM~NaBC>B(xU)ZsetvAb`^I<6(@k!#Qe5+c
z8*FDpPk;XN#hk+iJTHFRO?;g_liA?&Yo3&umGWOXIyhWd7(8x&Tf1y2--eQGsmLH>
z_7C^`QzQNE{q|g!xgvf0oV{C~>a00-=Ck_31jT29BCa26wi&QnoVnlY@HXA5!Bu=;
z)_cAc`h6Grb;KwBVpejBy}o!&dF*rshtSX>&90_*M{5?m`pn!H4)U(2tDnm{r-UW|
D$jnZK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..92776e8c77db22318867faf98f62a1d822fa5649
GIT binary patch
literal 854
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFqUOHI|q0=J1Ybf<)>xlq%tsQ
zoS!<;(wjL@q;>xh)kjWTqAoga0UHejM2-Y0&2ZD5#F6J~bW+7>TB4d`)7pe&!3_er
zcewsHZfjcGq@dB%F?VmYa^jxzEJ7~a_dh(VoAdqL({qvq=a+o#x%;Bs$1K0Ki7_{^
z(DSp+Wgqk0FP9~+<`$dT$UZ#(wXoa!s`UI<NB@UK+a$hzkR>R0-B(-RM$=~VG;`5>
z&hnQlGh%)?R2-Sa*s4EOZuN)Bk5XFii$qVnAhILWUpMmjMyqSVVQv)>6$+E}UR<rb
zGJT8srq78h_ip;Vfm2YW!L5gB^^%j1C(oLCrtbUC{k6qUjx0WXdr60CpNi(kzK*B~
z>o`}oz2L08Bog}0{_~dJjTgPXe`7GQwL14&p<>&@n4&r7osVnEJ0519lb-!=&J&Z5
zdQ~fz@xEy;XZF+2ippU>XSVS9y`HFx`70f_-8Ojel*LMH;b*C+>DrN@=Pma&pV;+h
zk@k(d&5AqU$Npq`7n;GOa7$|gFd{e$JR*x37`O#Nn6W-3ej-p%qQo_#Bsf2<q&%@G
zl_4N8Gp|I?&oxBBRL@Y)==UDxZ9p|WsS%!Oo}O9^96$~$gA^kx10#^-1;o-&HYmz9
z7@5K1OhC3FBNKxFkd6Z4%yt&AcovWi0{W7S3@?}wG@7LhK>ZWg8CZZS4UCKp7#BcH
z{r?}VnStf}lrwfq#C8ICr#xL8Ln7SYUc1QIY#_k)V1Mn0wS{dy0x=3ZywVEz(obk@
z_bl_cKa2hMk{j8aaZ|Q!`RTw>?$W<ofMwOHRsZgGvTwT-b^lo@$HK}pdF9U-JGbRl
zdgO#Nx@*We_7u*#?zQsK_YP|Z7X>AT1F16elY$;GU0ZkffOFDOR*B?ETg@bsh0c3+
zq;H>RyZyONj#%=XxRavOf^C}Cy`Gld|A@)%*>g9AZ>F*bR&nQ-marcYcYo)sDn7A-
sS@59c_CGym_I&4M_)>d5ICN?$`_%=rer>-!0TkK{p00i_>zopr03Rtxg#Z8m

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
index b2ef9cf1f3b..2f0fdef2603 100644
--- a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
@@ -9,6 +9,9 @@
     "states": [
         {
             "name": "icon"
+        },
+        {
+            "name": "icon_open"
         }
     ]
 }

From 82a710a8a8fc8fce48e2c4a03e148b82d15e0fe0 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Mon, 17 Feb 2025 14:34:03 +1100
Subject: [PATCH 10/14] fill fix

---
 .../Objects/Consumable/Drinks/drinks.yml        |  16 ++++++++++++++++
 .../_DV/Reagents/Consumable/Drink/alcohol.yml   |   2 +-
 .../_DV/Reagents/Consumable/Drink/drinks.yml    |   3 ++-
 .../Drinks/lemonlimebitters.rsi/fill-4.png      | Bin 0 -> 501 bytes
 .../Drinks/lemonlimebitters.rsi/icon.png        | Bin 723 -> 725 bytes
 .../Drinks/lemonlimebitters.rsi/meta.json       |   3 +++
 6 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-4.png

diff --git a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml
index 37062a5cce0..ad09b82862b 100644
--- a/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -149,3 +149,19 @@
   - type: Icon
     sprite: _DV/Objects/Consumable/Drinks/doubleicecreamglass.rsi
     state: icon
+
+- type: entity
+  parent: DrinkGlass
+  id: LemonLimeBittersGlass
+  suffix: lemon lime bitters
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: LemonLimeBitters
+          Quantity: 30
+  - type: Icon
+    sprite: _DV/Objects/Consumable/Drinks/lemonlimebitters.rsi
+    state: icon
diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml
index 79871503a09..133a560f825 100644
--- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/alcohol.yml
@@ -5,7 +5,7 @@
   desc: reagent-desc-angobitters
   physicalDesc: reagent-physical-desc-strong-smelling
   flavor: alcohol
-  color: "#611f05"
+  color: "#331002"
   recognizable: true
   metabolisms:
     Drink:
diff --git a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
index 377a9b8478b..497394c37a2 100644
--- a/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml
@@ -229,10 +229,11 @@
   desc: reagent-desc-lemon-lime-bitters
   physicalDesc: reagent-physical-desc-fizzy
   flavor: lemonlimebitters
+  color: "#ffa37e"
   metamorphicSprite:
     sprite: _DV/Objects/Consumable/Drinks/lemonlimebitters.rsi
     state: icon_empty
-  metamorphicMaxFillLevels: 3
+  metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: false
   fizziness: 0.2
diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-4.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/fill-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0826fcf7343e284d16d88acf081636f1a06b35c2
GIT binary patch
literal 501
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S_~VrE{6o}X)of~lUN
zp3(0;%-eu!wxvdRrg?g5F>nAmtPE0&tPG4mmKP99L)jqLXfQH^#hHL?Lq;YB0U#X(
z#F_0ZVDT&<8w3)77^ELYqgl$p%)l^#oq+|Y!obMbfN=rDRFDqV1rU>_0NEhG1T=>U
ztTM>b0?2~uGBhv%$-cb$&EnLpoGKu5iKmNWNQC>_D;s$a8Hli4u-0NS-oU`CoWkMd
zrMBQCUx<%`=W!v)#x_=oCmKTBKZGXSS77|EV!nL-<Wx(xGiT2HlTH56SC)NL=TVyd
zj&hM^|Icju3Yf2oNPJ(dmHlakI?ukf-%IXru_!Q!C@{QPwIe5J?#hQwZx{X+eSDoM
zVtvxDpsXDicE0sv_&a$)H1G4$RmP?<FN&&uNfd7LD1D~CaOU4x+OY~!2dB9FnG15e
Mr>mdKI;Vst08nX!YybcN

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/icon.png
index 9bff025b8b80974d90307170339153d0c2fbb094..aa0a0cb90f45d431a6053d6c0c225a53665db127 100644
GIT binary patch
delta 462
zcmV;<0Wtp51=R(RNeaRM01m<d6(~x8kyCaK@^%3L=mP)%@^%3L=mU}0T7Ql^!B^84
zyiNcB0fb3JK~z{r?Ug}F!%z^0zn7+I8k*9kSi!9uK^IC-(2a)>#6>+p4<fklPUto4
z1&UosH(sD12)0yhlW~z0YltB)7F?JQhJ<<V&HVY9N1&jf;J>5diCrL5Wb>|$(t8;3
z#BY%)g4>7o9k~5(Vv<Nzmw&`yGEObnvpZq)<pWgDV0M}6!jB6{M9nYa`E7c3XZTdU
z<*@06B3^HHE`X9!_>yWw=tPDYNL`FGn2g0X&8vf&+ny~J&-2yCTYOK%@cOiqsdlDK
z8wQiHbf@=}>mKX*3&H9=z6F5M@i|!q<hTWq^(x2F1hlJ&1V|8|N`I!Vfr)4fKm^1`
z8Tv<)(61sOzK>y+LH&gTR)qkCsyHay0m}xf5<bgOXrTQGgUMLBvqvnq$$GiKUoFGA
zjNBOQpJcuP<Z=LzT7$rLFq(T%Z$aGyw;6^exdh;P1l1a<)<D%ga9dxYNj?Ep2j8?<
z86~9RKy@oL$tM5+K_?`LC$-5uEZe00l63~Kpr8QY6Gb0u_#S=BLjV8(07*qoM6N<$
Ef;$4#*Z=?k

delta 460
zcmV;-0W<#91=9tPNeaUN01m?e$8V@)kyCaKU;qFB0RR91U;qFB0RWNLT7T))_BhJg
zY<d6y0fI?HK~z{r?UheT!$1^=zo|)+nx@r&B5vIXA}BpUHy%O|7xe@^h~U0Eq1Vt0
z1iO-MJb;2A*!r){JQs;jLkyWHx-cIM8Q#pi_sfrY3{+H9{C8A3@Ds=w`IxKi{2H}%
z;Je5e!SBQRIr#lgVzS6pmw&}z6y_%Ext+N9^A$Aq;qEBcg)bMfNQxh(<BRm%&hW-Q
zV{0{tMLeGVxB!-vB9dGqVkZjRf!xJ3gHb51WgTxe{q?))^nNmXdr9v}7@q8P3gs@e
z>4U*2l<xQfyA?2>JfLT<=`8?U?i^55K#49$tXCzDW?-B}L?c?GmVYc$12ZuefCxy0
zs+k|n!aR$BL=iR12K5&X*mX3ZoCeBS2D=WnlZ<3;fblO3Mxk_Xuc`Yh%%7%2vxQDn
zaJjKtxC1EV03d!F?RwOLHE0LmFAPIU37{FET@U50p!@(@0kl_tQ9#2Zsyoaq3voSY
zc;GhUuOa0G5Vxafoh6PMQ~0thlJ_K=T)>Ko3V?SLpKI|bEz`OH0000<MNUMnLSTYI
CUCvhk

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
index 1b5a2396eb8..15f5b438a40 100644
--- a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
@@ -21,6 +21,9 @@
         },
         {
             "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
         }
     ]
 }

From 98bf6af8e2759993e5c0479804dd5d840d5989a2 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:12:58 +1100
Subject: [PATCH 11/14] added to spawners and vendors

---
 .../Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml | 1 +
 .../Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml       | 1 +
 .../Markers/Spawners/Random/Food_Drinks/drinks_glass.yml         | 1 +
 .../Catalog/VendingMachines/Inventories/unlockedboozeomat.yml    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index f2d592a25da..80a0f568d02 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -47,6 +47,7 @@
     DrinkSakeBottleFull: 3
     DrinkBeerCan: 5
     DrinkWineCan: 5
+    DrinkAngobitterBottleFull: 3 # Delta-V - Angostura Bitters Bottle
   contrabandInventory:
     EthanolChemistryBottle: 3
     DrinkBottleOfNothingFull: 1
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
index ea5d4cdb89d..15e616478ef 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -35,6 +35,7 @@
       - DrinkAleBottleFull
       - DrinkAleBottleFullGrowler
       - DrinkChampagneBottleFull
+      - DrinkAngobittersBottleFull # Delta-V
     chance: 0.8
     offset: 0.0
     #rare
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 5167613cbe7..6ea517ae5a7 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
@@ -107,6 +107,7 @@
       - DrinkShakeWhite
       - DrinkTheMartinez
       - DrinkMoonshineGlass
+      - DrinkLemonLimeBittersGlass # Delta-V
     chance: 0.8
     offset: 0.0
     #rare
diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml
index 0e5017ac871..06fec34db45 100644
--- a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml
+++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml
@@ -34,4 +34,5 @@
     DrinkSpaceUpBottleFull: 3
     DrinkTonicWaterCan: 8
     DrinkVermouthBottleFull: 4
+    DrinkAngobitterBottleFull: 3
   #emaggedInventory:

From 0a35e8c243a8190324b3301eff187886da6246bc Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:27:54 +1100
Subject: [PATCH 12/14] oopsies be fixed!

---
 .../Catalog/VendingMachines/Inventories/boozeomat.yml           | 2 +-
 .../Markers/Spawners/Random/Food_Drinks/drinks_glass.yml        | 2 +-
 .../Catalog/VendingMachines/Inventories/unlockedboozeomat.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index 80a0f568d02..a3fc8fda9ff 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -47,7 +47,7 @@
     DrinkSakeBottleFull: 3
     DrinkBeerCan: 5
     DrinkWineCan: 5
-    DrinkAngobitterBottleFull: 3 # Delta-V - Angostura Bitters Bottle
+    DrinkAngobittersBottleFull: 3 # Delta-V - Angostura Bitters Bottle
   contrabandInventory:
     EthanolChemistryBottle: 3
     DrinkBottleOfNothingFull: 1
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 6ea517ae5a7..e14c279b066 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
@@ -107,7 +107,7 @@
       - DrinkShakeWhite
       - DrinkTheMartinez
       - DrinkMoonshineGlass
-      - DrinkLemonLimeBittersGlass # Delta-V
+      - LemonLimeBittersGlass # Delta-V
     chance: 0.8
     offset: 0.0
     #rare
diff --git a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml
index 06fec34db45..b2393fe9dbe 100644
--- a/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml
+++ b/Resources/Prototypes/_DV/Catalog/VendingMachines/Inventories/unlockedboozeomat.yml
@@ -34,5 +34,5 @@
     DrinkSpaceUpBottleFull: 3
     DrinkTonicWaterCan: 8
     DrinkVermouthBottleFull: 4
-    DrinkAngobitterBottleFull: 3
+    DrinkAngobittersBottleFull: 3
   #emaggedInventory:

From 81ad408a08880e5e770bf748febda75e5530cb9f Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Mon, 17 Feb 2025 15:34:06 +1100
Subject: [PATCH 13/14] thank you orange for making my sprites a bit less shit

---
 .../Consumable/Drinks/angobitters.rsi/icon.png  | Bin 865 -> 903 bytes
 .../Drinks/angobitters.rsi/icon_open.png        | Bin 854 -> 886 bytes
 .../Consumable/Drinks/angobitters.rsi/meta.json |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon.png
index b5565040f758908a8f2c175257eaed024d5501d2..1bbd2559bde20eaac38c14556f45b0b450dbea8b 100644
GIT binary patch
delta 322
zcmV-I0log=28Rc*t^o=V000XR0j(pwb(6ROb_o_40RZR&000(~Hv%<(HR(W2czw?<
z0002{Nkl<ZSV!%YJraU26ogj`x{wQ4m{ZtTpr^3*3ZBCw2&JAvQ`mS4&X7k(gB1|t
z48wc=7Wo=78^|pC7Jx`368SNcP#6o{(6sAxAwOpt3LKOU6+SN+cn9L>j4`#=8qPVC
zWtoKgV-Xu5qP_!ZDn5sQJpyYjthE3DwckH!T-XMDs@*P>*s!BB#?%0yb^i%C=Kw&|
z1-1cy_93ryVKhY4v>Xn{Zarjd2yqAU`~)+fA<s|Y)@ONl0&IK(K2ihh(hyOjlzNDM
zyWOCws_&Jsjo!aX6JYZ<Be<Neowiyp#Uo%pF!ZKhF);KiE{Y-@$+E1!IT9Jc9RsDz
Uw^Xe#TL1t607*qoM6N<$g2s%4q5uE@

delta 283
zcmV+$0p$LN2jK>=t^o=W000XS0e@s)k(0Oqb_p*T0RZR&001wOHv%<(1kaSrKBN}8
z0002hNkl<ZSV!&D!3~2j3<c2N9=JhfV1kHKZ-`ZxfjO9gRebFf%z%4?13k4xZWUpJ
zN>$}aNXQZ4%Z>s>Q4}5QBnxZt74zdgyV&<R%YsJgWJPaNfIXO7m*@HDoWn2-==(mA
z>uZ?<F!SpSWSMy%^$3V|2t)(`NZa<Urlk(BbZZ(}QZone-cMy&PTu=Tu4$-ex17DS
z<t(hm%=0IqU?Jua6h-lTwlD`c%-@Yb?PofGMHjwm?+&Ohj?j-R7m@k{B0^o)qpWvb
hmjFOjRdOkcg6_q9pz8Ajj#mHx002ovPDHLkV1iw1dX4}9

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/icon_open.png
index 92776e8c77db22318867faf98f62a1d822fa5649..befb76c19d98618c0b69793d15491151411749b1 100644
GIT binary patch
delta 305
zcmV-10nYx`2KEN9t^o=V000XR0j(pwb(6ROb_o_40RZR&000(~Hv%<(HR(W2czw?<
z0002$Nkl<ZSV!%YF%p6>5JguDy1)f2%snj7Q&@8a&cP7~rJO=jcn{9NrlY|s7~)JO
z8<26vyoSsVWIlgC07N2@$iK6*1z$MlgI;%Cm&|wl+1mnzEX!<(%pwD85Ih1z9Q8U)
z)8KQ+2}mhHN(le}tg1eLG%92RCaNrLi3~Y9-F~xxecuBFehp*;=Im{jbio@$95r=)
zo7OI4E`mECL<{_Q03lj?>$|L-02$MONvHvGX%KN_jLo7iiYq9kwkx5I-n@n;K;~yg
z@VGxG?R+@}kAVDu>rFQ?;QAFeO_St#{=PX9@!$m$$;QWTAUG)u00000NkvXXu0mjf
D0FQZD

delta 272
zcmV+r0q_3y2G$0!t^o=W000XS0e@s)k(0Oqb_p*T0RZR&001wOHv%<(1kaSrKBN}8
z0002WNkl<ZSV!&F(Fubv5C-7CeekVuhD;D#Ah=3qa1Lk4Dz`~?NZ*<V`=r=w30{=8
zwD~{?cSMi75Cp2Ks{Y-H2e#5$-{y4)p?S=1cjf_!wrzPxY*ztCC>}wKahlgksp9vD
zJ3vGrA^^Z;9G_xR;sVxduEW4XV#Ng*W0JKt8DkR9Nr-2+o;|ncENm8IoL<QlmQy@}
zuIrX(kKzJ8=I2Hr_B9>Asta#*bO*#2NA5!<7m;`a5y3gP{EW=J_YDB_ea}->m30Tz
Wpql!(+mN;Z0000<MNUMnLSTY2&UEGg

diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
index 2f0fdef2603..9b7c2b5f536 100644
--- a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Made by BlitzTheSquishy",
+    "copyright": "Made by BlitzTheSquishy & JustAnOrange",
     "states": [
         {
             "name": "icon"

From b0544b53b34c061d40dcbfd9a39b9e8ebb31e864 Mon Sep 17 00:00:00 2001
From: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com>
Date: Tue, 18 Feb 2025 10:49:00 +1100
Subject: [PATCH 14/14] Deltanedas review fix

---
 .../VendingMachines/Inventories/boozeomat.yml |  2 +-
 .../Random/Food_Drinks/drinks_bottles.yml     |  2 +-
 .../Random/Food_Drinks/drinks_glass.yml       |  2 +-
 Resources/Prototypes/_DV/Flavors/flavors.yml  | 20 +++++++++----------
 .../Drinks/angobitters.rsi/meta.json          |  4 ++--
 .../Drinks/lemonlimebitters.rsi/meta.json     |  4 ++--
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index a3fc8fda9ff..303f23437f4 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -47,7 +47,7 @@
     DrinkSakeBottleFull: 3
     DrinkBeerCan: 5
     DrinkWineCan: 5
-    DrinkAngobittersBottleFull: 3 # Delta-V - Angostura Bitters Bottle
+    DrinkAngobittersBottleFull: 3 # DeltaV - Angostura Bitters Bottle
   contrabandInventory:
     EthanolChemistryBottle: 3
     DrinkBottleOfNothingFull: 1
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
index 15e616478ef..133f16fb5ca 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -35,7 +35,7 @@
       - DrinkAleBottleFull
       - DrinkAleBottleFullGrowler
       - DrinkChampagneBottleFull
-      - DrinkAngobittersBottleFull # Delta-V
+      - DrinkAngobittersBottleFull # DeltaV
     chance: 0.8
     offset: 0.0
     #rare
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 e14c279b066..5bf275bf985 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
@@ -107,7 +107,7 @@
       - DrinkShakeWhite
       - DrinkTheMartinez
       - DrinkMoonshineGlass
-      - LemonLimeBittersGlass # Delta-V
+      - LemonLimeBittersGlass # DeltaV
     chance: 0.8
     offset: 0.0
     #rare
diff --git a/Resources/Prototypes/_DV/Flavors/flavors.yml b/Resources/Prototypes/_DV/Flavors/flavors.yml
index ae7395b788d..b251aefaee4 100644
--- a/Resources/Prototypes/_DV/Flavors/flavors.yml
+++ b/Resources/Prototypes/_DV/Flavors/flavors.yml
@@ -116,17 +116,6 @@
   flavorType: Complex
   description: flavor-complex-blellow
 
-- type: flavor
-  id: drgibbbloodred
-  flavorType: Complex
-  description: flavor-complex-drgibbbloodred
-
-- type: flavor
-  id: lemonlimebitters
-  flavorType: Complex
-  description: flavor-complex-lemon-lime-bitters
-
-
 #Delta-V additional drink flavors
 - type: flavor
   id: deadrum
@@ -183,6 +172,15 @@
   flavorType: Complex
   description: flavor-complex-mothamphetamine-deltav
 
+- type: flavor
+  id: drgibbbloodred
+  flavorType: Complex
+  description: flavor-complex-drgibbbloodred
+
+- type: flavor
+  id: lemonlimebitters
+  flavorType: Complex
+  description: flavor-complex-lemon-lime-bitters
 
 # this is prefixed with "candy" to avoid clashes with potential future strawberries upstream
 - type: flavor
diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
index 9b7c2b5f536..d5d4bd40a8b 100644
--- a/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/angobitters.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by BlitzTheSquishy & JustAnOrange",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by BlitzTheSquishy & JustAnOrange",
     "states": [
         {
             "name": "icon"
diff --git a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
index 15f5b438a40..38f93875710 100644
--- a/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
+++ b/Resources/Textures/_DV/Objects/Consumable/Drinks/lemonlimebitters.rsi/meta.json
@@ -1,11 +1,11 @@
 {
     "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by BlitzTheSquishy",
     "size": {
         "x": 32,
         "y": 32
     },
-    "license": "CC-BY-SA-3.0",
-    "copyright": "Made by BlitzTheSquishy",
     "states": [
         {
             "name": "icon"