From 9ca8def744de8507cb945114cba1665bc89835ca Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sun, 5 Apr 2015 21:56:59 -0400 Subject: [PATCH] [Goonchem] Fixups --- code/game/objects/items/devices/scanners.dm | 2 ++ code/modules/mob/living/carbon/human/life.dm | 3 ++ code/modules/reagents/Chemistry-Holder.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 27 ++++++++++++------ code/modules/reagents/Chemistry-Recipes.dm | 13 +++++---- .../food/drinks/drinkingglass.dm | 10 +++++-- icons/obj/drinks.dmi | Bin 60811 -> 60958 bytes 7 files changed, 38 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 836fb13b4e2..de473470896 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -244,6 +244,8 @@ REAGENT SCANNER user.show_message("\red Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl") else user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl") + if(H.heart_attack) + user.show_message("Subject suffering from heart attack: Apply defibrillator immediately.") user.show_message("\blue Subject's pulse: [H.get_pulse(GETPULSE_TOOL)] bpm.") src.add_fingerprint(user) return diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 6fd9d7684cd..885733f0a71 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -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 diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index b5a8ca98460..2bdb8f24c46 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -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 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 834313a8fce..9a62abf43c9 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -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" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 85905a0f24a..f692cb8c893 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -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" diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm index 1b912dba4fc..3005e332548 100644 --- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm +++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm @@ -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" diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index d2e691b633a54ec3293671eca590937d3039a0c2..925db02fe58bb2e5d6a0dd3a7cab71c129b30e8b 100644 GIT binary patch delta 4549 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 aM7dv;z~&Od_I4Z~KgI^P^s988pZ*Wiv+s%k delta 4393 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