mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Merge pull request #9224 from rboys2/clara-dev-more-drinks
Drink addons and sprites
This commit is contained in:
committed by
Chompstation Bot
parent
a3f9f88bea
commit
d8ddcb3026
@@ -123,6 +123,31 @@
|
|||||||
glass_center_of_mass = list("x"=16, "y"=9)
|
glass_center_of_mass = list("x"=16, "y"=9)
|
||||||
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/originalsin
|
||||||
|
glass_icon_state = "originalsinglass"
|
||||||
|
glass_center_of_mass = list("x"=16, "y"=9)
|
||||||
|
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/whiskeysour
|
||||||
|
glass_icon_state = "whiskeysourglass"
|
||||||
|
glass_center_of_mass = list("x"=16, "y"=9)
|
||||||
|
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/newyorksour
|
||||||
|
glass_icon_state = "newyorksourglass"
|
||||||
|
glass_center_of_mass = list("x"=16, "y"=9)
|
||||||
|
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/mudslide
|
||||||
|
glass_icon_state = "mudslideglass"
|
||||||
|
glass_center_of_mass = list("x"=16, "y"=9)
|
||||||
|
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/windgarita
|
||||||
|
glass_icon_state = "windgaritaglass"
|
||||||
|
glass_center_of_mass = list("x"=16, "y"=9)
|
||||||
|
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
||||||
|
|
||||||
/datum/reagent/drink/soda/kiraspecial
|
/datum/reagent/drink/soda/kiraspecial
|
||||||
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
glass_icon_file = 'icons/obj/drinks_vr.dmi'
|
||||||
|
|
||||||
|
|||||||
@@ -78,6 +78,50 @@
|
|||||||
glass_name = "Pink Moo"
|
glass_name = "Pink Moo"
|
||||||
glass_desc = "A very familiar looking drink. ...moo?"
|
glass_desc = "A very familiar looking drink. ...moo?"
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/originalsin
|
||||||
|
name = "Original Sin"
|
||||||
|
id = "originalsin"
|
||||||
|
description = "Angel Ichor, entirely transformed by one drop of apple juice"
|
||||||
|
taste_description = "the apple Eve gave to Adam"
|
||||||
|
color = "#99CC35"
|
||||||
|
strength = 17
|
||||||
|
|
||||||
|
glass_name = "Original Sin"
|
||||||
|
glass_desc = "A drink so fine, you may just risk eternal damnation!"
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/newyorksour
|
||||||
|
name = "New York Sour"
|
||||||
|
id = "newyorksour"
|
||||||
|
description = "Whiskey sour, with a layer of wine and egg white."
|
||||||
|
taste_description = "refreshing lemoned whiskey, smoothed with wine"
|
||||||
|
color = "#FFBF3C"
|
||||||
|
strength = 17
|
||||||
|
|
||||||
|
glass_name = "New York Sour"
|
||||||
|
glass_desc = "A carefully poured three layered drink"
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/windgarita
|
||||||
|
name = "WND-Garita"
|
||||||
|
id = "windgarita"
|
||||||
|
description = "A highly questionable combination of margarita and Space Mountain Wind"
|
||||||
|
taste_description = "like sin, and some tequilia"
|
||||||
|
color = "#90D93D"
|
||||||
|
strength = 15
|
||||||
|
|
||||||
|
glass_name = "WND-Garita"
|
||||||
|
glass_desc = "Who the hell comes up with these drinks?!"
|
||||||
|
|
||||||
|
/datum/reagent/ethanol/mudslide
|
||||||
|
name = "Mudslide"
|
||||||
|
id = "mudslide"
|
||||||
|
description = "Vodka, Kahlua and Irish Cream together at last."
|
||||||
|
taste_description = "a mocha milkshake, with a splash of vodka."
|
||||||
|
color = "#8B6338"
|
||||||
|
strength = 13
|
||||||
|
|
||||||
|
glass_name = "Mudslide"
|
||||||
|
glass_desc = "A richly coloured drink, comes with a chocolate garnish!"
|
||||||
|
|
||||||
/datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
/datum/reagent/ethanol/monstertamer/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
|
|
||||||
/datum/chemical_reaction/foam/softdrink
|
/datum/chemical_reaction/foam/softdrink
|
||||||
required_reagents = list("cola" = 1, "mint" = 1)
|
required_reagents = list("cola" = 1, "mint" = 1)
|
||||||
|
|
||||||
/datum/chemical_reaction/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them
|
/datum/chemical_reaction/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them
|
||||||
name = "Firefighting Foam"
|
name = "Firefighting Foam"
|
||||||
id = "firefighting foam"
|
id = "firefighting foam"
|
||||||
@@ -290,6 +290,35 @@
|
|||||||
required_reagents = list("blackrussian" = 2, "berryshake" = 1)
|
required_reagents = list("blackrussian" = 2, "berryshake" = 1)
|
||||||
result_amount = 3
|
result_amount = 3
|
||||||
|
|
||||||
|
/datum/chemical_reaction/drinks/originalsin
|
||||||
|
name = "Original Sin"
|
||||||
|
id = "originalsin"
|
||||||
|
result = "originalsin"
|
||||||
|
required_reagents = list("holywine" = 1)
|
||||||
|
catalysts = list("applejuice" = 1)
|
||||||
|
result_amount = 1
|
||||||
|
|
||||||
|
/datum/chemical_reaction/drinks/windgarita
|
||||||
|
name = "WND-Garita"
|
||||||
|
id = "windgarita"
|
||||||
|
result = "windgarita"
|
||||||
|
required_reagents = list("margarita" = 3, "spacemountainwind" = 2, "melonliquor" = 1)
|
||||||
|
result_amount = 6
|
||||||
|
|
||||||
|
/datum/chemical_reaction/drinks/newyorksour
|
||||||
|
name = "New York Sour"
|
||||||
|
id = "newyorksour"
|
||||||
|
result = "newyorksour"
|
||||||
|
required_reagents = list("whiskeysour" = 3, "wine" = 2, "egg" = 1)
|
||||||
|
result_amount = 6
|
||||||
|
|
||||||
|
/datum/chemical_reaction/drinks/mudslide
|
||||||
|
name = "Mudslide"
|
||||||
|
id = "mudslide"
|
||||||
|
result = "mudslide"
|
||||||
|
required_reagents = list("blackrussian" = 1, "irishcream" = 1)
|
||||||
|
result_amount = 2
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
/// Reagent colonies.
|
/// Reagent colonies.
|
||||||
/datum/chemical_reaction/meatcolony
|
/datum/chemical_reaction/meatcolony
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 35 KiB |
Reference in New Issue
Block a user