Merge pull request #8664 from rboys2/clara-dev-pink-moo-drink

Pink Moo Drink
This commit is contained in:
Novacat
2020-08-13 15:02:11 -04:00
committed by GitHub
5 changed files with 24 additions and 1 deletions

View File

@@ -670,4 +670,4 @@ Drinks Data
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/ethanol/mojito
glass_icon_state = "mojito"
glass_icon_state = "mojito"

View File

@@ -118,6 +118,11 @@
glass_center_of_mass = list("x"=16, "y"=8)
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/ethanol/pink_moo
glass_icon_state = "pinkmooglass"
glass_center_of_mass = list("x"=16, "y"=9)
glass_icon_file = 'icons/obj/drinks_vr.dmi'
/datum/reagent/drink/soda/kiraspecial
glass_icon_file = 'icons/obj/drinks_vr.dmi'

View File

@@ -67,6 +67,17 @@
glass_name = "Monster Tamer"
glass_desc = "This looks like a vaguely-alcoholic slurry of meat. Gross."
/datum/reagent/ethanol/pink_moo
name = "Pink Moo"
id = "pinkmoo"
description = "Like a White Russian but with 100% more pink!"
taste_description = "strawberry icecream, with a coffee kick"
color = "#d789bd"
strength = 15
glass_name = "Pink Moo"
glass_desc = "A very familiar looking drink. ...moo?"
/datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()

View File

@@ -275,6 +275,13 @@
required_reagents = list("monstertamer" = 2, "nutriment" = 1)
result_amount = 3
/datum/chemical_reaction/drinks/pink_moo
name = "Pink Moo"
id = "pinkmoo"
result = "pinkmoo"
required_reagents = list("blackrussian" = 2, "berryshake" = 1)
result_amount = 3
///////////////////////////////////////////////////////////////////////////////////
/// Reagent colonies.
/datum/chemical_reaction/meatcolony

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 31 KiB