From 14336e79853efaa1f286ffa0ff16c2782ac786b0 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Wed, 21 Feb 2018 18:57:51 -0600 Subject: [PATCH] Corrects an oversight with surgery and defibs --- code/modules/organs/organ.dm | 2 ++ code/modules/organs/subtypes/standard.dm | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 29b98d2663..f9a8c576ff 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -89,6 +89,7 @@ var/list/organ_cache = list() processing_objects -= src if(owner && vital) owner.death() + owner.can_defib = 0 /obj/item/organ/proc/adjust_germ_level(var/amount) // Unless you're setting germ level directly to 0, use this proc instead germ_level = Clamp(germ_level + amount, 0, INFECTION_LEVEL_MAX) @@ -329,6 +330,7 @@ var/list/organ_cache = list() owner.attack_log += "\[[time_stamp()]\] had a vital organ ([src]) removed by [user.name] ([user.ckey]) (INTENT: [uppertext(user.a_intent)])" msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (JMP)") owner.death() + owner.can_defib = 0 owner = null diff --git a/code/modules/organs/subtypes/standard.dm b/code/modules/organs/subtypes/standard.dm index 10123c9ea4..8f04a2d0a9 100644 --- a/code/modules/organs/subtypes/standard.dm +++ b/code/modules/organs/subtypes/standard.dm @@ -281,8 +281,6 @@ spawn(1) owner.update_hair() get_icon() - if(vital) //This is just in case we ever add something that both a) Doesn't need a head to live, and b) Can be defibbed - owner.can_defib = 0 ..() /obj/item/organ/external/head/take_damage(brute, burn, sharp, edge, used_weapon = null, list/forbidden_limbs = list())