[Goonchem] Fixups

This commit is contained in:
Fox-McCloud
2015-04-05 21:56:59 -04:00
parent 7c739e4745
commit 9ca8def744
7 changed files with 38 additions and 19 deletions
@@ -1569,6 +1569,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
if(stat == DEAD)
return PULSE_NONE //that's it, you're dead, nothing can influence your pulse
if(heart_attack)
return PULSE_NONE
var/temp = PULSE_NORM
if(round(vessel.get_reagent_amount("blood")) <= BLOOD_VOLUME_BAD) //how much blood do we have
+1 -1
View File
@@ -334,7 +334,7 @@ datum
var/list/seen = viewers(4, get_turf(my_atom))
for(var/mob/M in seen)
M << "\blue \icon[my_atom] [C.mix_message]."
M << "\blue \icon[my_atom] [C.mix_message]"
/* if(istype(my_atom, /obj/item/slime_core))
var/obj/item/slime_core/ME = my_atom
+18 -9
View File
@@ -2479,6 +2479,12 @@ datum
M:jitteriness = max(M:jitteriness-3,0)
return
cider
name = "Cider"
id = "cider"
description = "An alcoholic beverage derived from apples."
color = "#174116"
whiskey
name = "Whiskey"
id = "whiskey"
@@ -2576,15 +2582,18 @@ datum
dizzy_adj = 4
confused_start = 115 //amount absorbed after which mob starts confusing directions
hooch
name = "Hooch"
id = "hooch"
description = "Either someone's failure at cocktail making or attempt in alchohol production. In any case, do you really want to drink that?"
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 6
slurr_adj = 5
slur_start = 35 //amount absorbed after which mob starts slurring
confused_start = 90 //amount absorbed after which mob starts confusing directions
suicider //otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning".
name = "Suicider"
id = "suicider"
description = "An unbelievably strong and potent variety of Cider."
color = "#CF3811"
dizzy_adj = 20
slurr_adj = 20
confused_adj = 3
slur_start = 15
confused_start = 40
blur_start = 60
pass_out = 80
ale
name = "Ale"
+7 -6
View File
@@ -1249,12 +1249,13 @@ datum
required_reagents = list ("beer" = 1, "ale" = 2)
result_amount = 3
hooch
name = "Hooch"
id = "hooch"
result = "hooch"
required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
result_amount = 3
suicider
name = "Suicider"
id = "suicider"
result = "suicider"
required_reagents = list ("vodka" = 1, "cider" = 1, "fuel" = 1, "epinephrine" = 1)
result_amount = 4
mix_message = "The drinks and chemicals mix together, emitting a potent smell."
irish_coffee
name = "Irish Coffee"
@@ -96,6 +96,10 @@
icon_state = "beerglass"
name = "Beer glass"
desc = "A freezing pint of beer"
if("cider")
icon_state = "rewriter"
name = "Cider"
desc = "a refreshing glass of traditional cider"
if("beer2")
icon_state = "beerglass"
name = "Beer glass"
@@ -308,9 +312,9 @@
icon_state = "irishcoffeeglass"
name = "Irish Coffee"
desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
if("hooch")
icon_state = "glass_brown2"
name = "Hooch"
if("suicider")
icon_state = "suicider"
name = "Suicider"
desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
if("whiskeysoda")
icon_state = "whiskeysodaglass2"