From ef0fe20beb3d8fa1b5de251eab15bec46b3beca4 Mon Sep 17 00:00:00 2001 From: Chap Date: Sat, 25 Jan 2025 00:58:45 +0100 Subject: [PATCH] Kills changeling autoparry (#27868) Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Adrer Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --- .../antagonists/changeling/powers/mutations.dm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index b485eca0da4..912db673271 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -418,8 +418,6 @@ flags = NODROP | DROPDEL icon_state = "ling_shield" - var/remaining_uses = 6 - /obj/item/shield/changeling/Initialize(mapload) . = ..() AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = ALL_ATTACK_TYPES) @@ -427,22 +425,6 @@ loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") playsound(loc, 'sound/effects/bone_break_1.ogg', 100, TRUE) -/obj/item/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - SEND_SIGNAL(owner, COMSIG_HUMAN_PARRY) - . = ..() - if(!.) - return - if(remaining_uses < 1) - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - H.visible_message("With a sickening crunch, [H] reforms [H.p_their()] shield into an arm!", "We assimilate our shield into our body", "You hear organic matter ripping and tearing!") - playsound(loc, 'sound/effects/bone_break_2.ogg', 100, TRUE) - H.unequip(src, force = TRUE) - qdel(src) - return FALSE - else - remaining_uses-- - /***************************************\ |*********SPACE SUIT + HELMET***********| \***************************************/