Add the Zombie, a new cocktail (#32802)

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index c305f521a8bcce17f0c3fc057f557f9f636e0534..2789e59938485987e5bbd5ffaeff8dd3874f14c9 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -263,6 +263,7 @@ flavor-complex-themartinez = like violets and lemon vodka
 flavor-complex-cogchamp = like brass
 flavor-complex-white-gilgamesh = like lightly carbonated cream
 flavor-complex-antifreeze = warm
+flavor-complex-zombiecocktail = like eating brains
 flavor-complex-absinthe = like anise
 flavor-complex-blue-curacao = like orange flowers
 flavor-complex-acidspit = like French battery acid

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 1cac0495b0261ee5dc494a53e87b886c1c56eb73..27e0cb2a812463063c0a09a52f656e3adc99416c 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
@@ -279,3 +279,6 @@ reagent-desc-watermelon-wakeup = If you want to be awake, this will do it... Als
 
 reagent-name-rubberneck = rubberneck
 reagent-desc-rubberneck = A popular drink amongst those adhering to an all synthetic diet.
+
+reagent-name-zombiecocktail = zombie
+reagent-desc-zombiecocktail = It gets in your head. Your he-eyeh-ead.
\ No newline at end of file

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index 2e31b12f2fbcf90e9c32781709b31f2be736681e..b79d6530eced3888e19f21c3347e171d4e61ceab 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -1328,3 +1328,8 @@
   id: compressed-meat
   flavorType: Complex
   description: flavor-complex-compressed-meat
+
+- type: flavor
+  id: zombiecocktail
+  flavorType: Complex
+  description: flavor-complex-zombiecocktail
\ No newline at end of file

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
index 7478161a54fd6f74827d7d7215f011aa9d638db8..e5525b9043b5218f803e0e498b400bb6790baf03 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
@@ -1953,3 +1953,26 @@
           time: 1.0
           type: Remove
   fizziness: 0.25
+
+- type: reagent
+  id: ZombieCocktail
+  name: reagent-name-zombiecocktail
+  parent: BaseAlcohol
+  desc: reagent-desc-zombiecocktail
+  physicalDesc: reagent-physical-desc-strong-smelling
+  flavor: zombiecocktail
+  color: "#d17844"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/zombiecocktail.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+        - !type:SatiateThirst
+          factor: 1
+        - !type:AdjustReagent
+          reagent: Ethanol
+          amount: 0.25
\ No newline at end of file

diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml
index 1c69be50455625b3d7f3dce1ae17791eb642411b..cf6da10b8b6679e2dadd7c548e7da65cb58f2b8e 100644 (file)
--- a/Resources/Prototypes/Recipes/Reactions/drinks.yml
+++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml
@@ -1219,3 +1219,15 @@
       amount: 1
   products:
     Cola: 4
+
+- type: reaction
+  id: ZombieCocktail
+  reactants:
+    Rum:
+      amount: 2
+    Grenadine:
+      amount: 1
+    ZombieBlood:
+      amount: 1
+  products:
+    ZombieCocktail: 4
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-1.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-1.png
new file mode 100644 (file)
index 0000000..f6133a7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-1.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-2.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-2.png
new file mode 100644 (file)
index 0000000..bf9f024
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-2.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-3.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-3.png
new file mode 100644 (file)
index 0000000..4d67d86
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-3.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-4.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-4.png
new file mode 100644 (file)
index 0000000..b52661b
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/fill-4.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon.png
new file mode 100644 (file)
index 0000000..e020b30
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon_empty.png b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon_empty.png
new file mode 100644 (file)
index 0000000..b1e461c
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/icon_empty.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json
new file mode 100644 (file)
index 0000000..b95ee96
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/zombiecocktail.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "size": 
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by dragonryan06 on Github",
+    "states": 
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
\ No newline at end of file