shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#6038)

Browse Source 
* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A (#36549)

* Add Fringe Weaver, Sugar Rush, Crevice Spike from Va-11 Hall-A

* Rebalance crevice spike damage

* Crevice Spike cleanup and sugar-y Sugar Rush

* Add Fringe Weaver, Sugar Rush, Crevice Spike drinks from Va-11 Hall-A
This commit is contained in:
CitadelStationBot
2018-03-21 14:00:54 -05:00
committed by Poojawa
parent 2fbdfd1856
commit 4403ccf908
3 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+21
View File
@@ -603,3 +603,24 @@
results = list("squirt_cider" = 1)
required_reagents = list("water" = 1, "tomatojuice" = 1, "nutriment" = 1)
mix_message = "The mix swirls and turns a bright red that reminds you of an apple's skin."
/datum/chemical_reaction/fringe_weaver
name = "Fringe Weaver"
id = "fringe_weaver"
results = list("fringe_weaver" = 10)
required_reagents = list("ethanol" = 9, "sugar" = 1) //9 karmotrine, 1 adelhyde
mix_message = "The mix turns a pleasant cream color and foams up."
/datum/chemical_reaction/sugar_rush
name = "Sugar Rush"
id = "sugar_rush"
results = list("sugar_rush" = 4)
required_reagents = list("sugar" = 2, "lemonjuice" = 1, "wine" = 1) //2 adelhyde (sweet), 1 powdered delta (sour), 1 karmotrine (alcohol)
mix_message = "The mixture bubbles and brightens into a girly pink."
/datum/chemical_reaction/crevice_spike
name = "Crevice Spike"
id = "crevice_spike"
results = list("crevice_spike" = 6)
required_reagents = list("limejuice" = 2, "capsaicin" = 4) //2 powdered delta (sour), 4 flanergide (spicy)
mix_message = "The mixture stings your eyes as it settles."
code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+42
View File
@@ -1505,3 +1505,45 @@ All effects don't start immediately, but rather get worse over time; the rate is
M.satiety += 5 //for context, vitamins give 30 satiety per tick
..()
. = TRUE
/datum/reagent/consumable/ethanol/fringe_weaver
name = "Fringe Weaver"
id = "fringe_weaver"
description = "Bubbly, classy, and undoubtedly strong - a Glitch City classic."
color = "#FFEAC4"
boozepwr = 90 //classy hooch, essentially, but lower pwr to make up for slightly easier access
taste_description = "ethylic alcohol with a hint of sugar"
glass_icon_state = "fringe_weaver"
glass_name = "Fringe Weaver"
glass_desc = "It's a wonder it doesn't spill out of the glass."
/datum/reagent/consumable/ethanol/sugar_rush
name = "Sugar Rush"
id = "sugar_rush"
description = "Sweet, light, and fruity - as girly as it gets."
color = "#FF226C"
boozepwr = 10
taste_description = "your arteries clogging with sugar"
nutriment_factor = 2 * REAGENTS_METABOLISM
glass_icon_state = "sugar_rush"
glass_name = "Sugar Rush"
glass_desc = "If you can't mix a Sugar Rush, you can't tend bar."
/datum/reagent/consumable/ethanol/sugar_rush/on_mob_life(mob/living/M)
M.satiety -= 10 //junky as hell! a whole glass will keep you from being able to eat junk food
..()
. = TRUE
/datum/reagent/consumable/ethanol/crevice_spike
name = "Crevice Spike"
id = "crevice_spike"
description = "Sour, bitter, and smashingly sobering."
color = "#5BD231"
boozepwr = -10 //sobers you up - ideally, one would drink to get hit with brute damage now to avoid alcohol problems later
taste_description = "a bitter SPIKE with a sour aftertaste"
glass_icon_state = "crevice_spike"
glass_name = "Crevice Spike"
glass_desc = "It'll either knock the drunkenness out of you or knock you out cold. Both, probably."
/datum/reagent/consumable/ethanol/crevice_spike/on_mob_add(mob/living/L) //damage only applies when drink first enters system and won't again until drink metabolizes out
L.adjustBruteLoss(3 * min(5,volume)) //minimum 3 brute damage on ingestion to limit non-drink means of injury - a full 5 unit gulp of the drink trucks you for the full 15