Merge pull request #445 from KingMudkipIII/master

New drinks!! again!!

.gitignore

@@ -306,3 +306,4 @@ Resources/MapImages
 
 # Direnv stuff
 .direnv/
+

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -271,6 +271,7 @@ flavor-complex-antifreeze = warm
 flavor-complex-cottonbool = like an angry cloud
 flavor-complex-genderfluid = transitional
 flavor-complex-thavenbad = like you need to pretend you like it
+flavor-complex-zombieslushie = like frostbitten meat
 
 ### This is exactly what pilk tastes like. I'm not even joking. I might've been a little drunk though
 flavor-complex-pilk = like sweet milk

Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl

@@ -326,4 +326,7 @@ reagent-name-cottonbool = cotton bool
 reagent-desc-cottonbool = A modern take on a Mothrine classic that's sure to cause a buzzz.
 
 reagent-name-thavenbad = bad
-reagent-desc-thavenbad = A traditional Thaven delicacy. It's considered a great honour to share one with a new friend.
+reagent-desc-thavenbad = A traditional Thaven delicacy. It's considered a great honour to share one with a new friend.
+
+reagent-name-starrynight = Starry Night
+reagent-desc-starrynight = A beautiful drink fashioned in memoriam of a great terran artist, proof that your works will be loved in ways you cannot imagine.

Resources/Locale/en-US/reagents/meta/consumable/drink/soda.ftl

@@ -52,11 +52,14 @@ reagent-desc-fourteen-loko = A highly processed liquid substance barely-passing
 reagent-name-shamblers-juice = Shambler's Juice
 reagent-desc-shamblers-juice = ~Shake me up some of that Shambler's Juice!~
 
-reagent-name-kingsoda = King Soda
+reagent-name-kingsoda = king Soda
 reagent-desc-kingsoda = A drink fit for a king. Or a seven year old.
 
-reagent-name-hummingbird = Hummingbird's Delight
+reagent-name-hummingbird = hummingbird's delight
 reagent-desc-hummingbird = A favourite of adolescent Vox just about everywhere.
 
-reagent-name-genderfluid = Genderfluid
+reagent-name-genderfluid = genderfluid
 reagent-desc-genderfluid = Looking at this drink makes you feel... ahem. Well.
+
+reagent-name-zombieslushie = zombie slushie
+reagent-desc-zombieslushie = Ice, Cream, and Raw Meat come together to create... this?

Resources/Prototypes/Flavors/flavors.yml

@@ -1218,4 +1218,9 @@
 - type: flavor
   id: thavenbad
   flavorType: Complex
-  description: flavor-complex-thavenbad
+  description: flavor-complex-thavenbad
+
+- type: flavor
+  id: zombieslushie
+  flavorType: Complex
+  description: flavor-complex-zombieslushie

Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml

@@ -2429,7 +2429,34 @@
       effects:
       - !type:SatiateThirst
         factor: 2
-      - !type:SatiateHunger
-        conditions: 
-        factor: 2
-  fizziness: .1
+  fizziness: .1
+
+- type: reagent
+  id: StarryNight
+  name: reagent-name-starrynight
+  parent: BaseAlcohol
+  desc: reagent-desc-starrynight
+  physicalDesc: reagent-physical-desc-inky
+  flavor: paintthinner
+  color: "#080e17"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/starrynight.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 5
+      - !type:Emote
+        conditions:
+        - !type:ReagentThreshold
+          reagent: StarryNight
+          min: 27          # this should proc only once after drinking 30u in one go
+          max: 27
+        emote: Yawn
+        showInChat: true
+  fizziness: 0.5
+

Resources/Prototypes/Reagents/Consumable/Drink/soda.yml

@@ -309,3 +309,30 @@
   metamorphicMaxFillLevels: 4
   metamorphicFillBaseName: fill-
   metamorphicChangeColor: true
+
+- type: reagent
+  id: ZombieSlushie
+  name: reagent-name-zombieslushie
+  parent: BaseSoda
+  desc: reagent-desc-zombieslushie
+  physicalDesc: reagent-physical-desc-clumpy
+  flavor: zombieslushie
+  color: "#ff6fa8"
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/zombieslushie.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+      - !type:SatiateHunger
+        factor: 4
+        conditions:
+        - !type:OrganType
+          type: Moth
+          shouldHave: false   
+  fizziness: 0.2

Resources/Prototypes/Recipes/Reactions/drinks.yml

@@ -1499,3 +1499,32 @@
       amount: 1
   products:
     ThavenBad: 2
+
+- type: reaction
+  id: StarryNight
+  requiredMixerCategories:
+    - Stir
+  reactants:
+    BlueCuracao:
+      amount: 1
+    Vodka:
+      amount: 1
+    Plasma:
+      amount: 1
+  products:
+    StarryNight: 3
+
+
+- type: reaction
+  id: ZombieSlushie
+  requiredMixerCategories:
+    - Shake
+  reactants:
+    Protein:
+      amount: 1
+    Cream:
+      amount: 1
+    Ice:
+      amount: 1
+  products:
+    ZombieSlushie: 3

Resources/Textures/Objects/Consumable/Drinks/starrynight.rsi/meta.json

@@ -0,0 +1,67 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "ghostphasemoon",
+    "states":
+    [
+        {
+            "name": "icon",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-2",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-3",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        },
+        {
+            "name": "fill-4",
+            "delays":
+            [
+                [
+                    0.5,
+                    0.5
+                ]
+            ]
+        }
+    ]
+}
+

Resources/Textures/Objects/Consumable/Drinks/zombieslushie.rsi/meta.json

@@ -0,0 +1,32 @@
+{
+    "version": 1,
+    "size":
+    {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "ghostphasemoon",
+    "states":
+    [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon_empty"
+        },
+        {
+            "name": "fill-1"
+        },
+        {
+            "name": "fill-2"
+        },
+        {
+            "name": "fill-3"
+        },
+        {
+            "name": "fill-4"
+        }
+    ]
+}
+