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 d2e691b633a..925db02fe58 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ