From b2ab4dcd42e30d5d461656de774bf428481fca2c Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Tue, 23 May 2017 01:40:52 -0700 Subject: [PATCH] Change dislodge method to stun instead of harmbaton --- code/modules/surgery/organs/subtypes/skrell.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/surgery/organs/subtypes/skrell.dm b/code/modules/surgery/organs/subtypes/skrell.dm index 4e0994b52da..d5978badaf1 100644 --- a/code/modules/surgery/organs/subtypes/skrell.dm +++ b/code/modules/surgery/organs/subtypes/skrell.dm @@ -1,5 +1,3 @@ -#define HEADPOCKET_DAMAGE_THRESHOLD 8 - /obj/item/organ/internal/liver/skrell alcohol_intensity = 4 species = "Skrell" @@ -15,7 +13,6 @@ species = "Skrell" actions_types = list(/datum/action/item_action/organ_action/toggle) var/obj/item/weapon/storage/internal/pocket - var/head_damage = 0 /obj/item/organ/internal/headpocket/New() ..() @@ -30,11 +27,10 @@ /obj/item/organ/internal/headpocket/on_life() ..() var/obj/item/organ/external/head/head = owner.get_organ("head") - if(pocket.contents.len && (head.brute_dam - head_damage >= HEADPOCKET_DAMAGE_THRESHOLD || !findtextEx(head.h_style, "Tentacles"))) + if(pocket.contents.len && (owner.stunned || !findtextEx(head.h_style, "Tentacles"))) owner.visible_message("Something falls from [owner]'s head!", "Something falls from your head!") pocket.empty_object_contents(0, get_turf(owner)) - head_damage = head.brute_dam /obj/item/organ/internal/headpocket/ui_action_click() if(!loc) @@ -47,5 +43,3 @@ /obj/item/organ/internal/headpocket/remove() pocket.empty_object_contents(0, get_turf(owner)) . = ..() - -#undef HEADPOCKET_DAMAGE_THRESHOLD