From bedca4cecc9489d2dc93f8c6510a47280f1cdbd1 Mon Sep 17 00:00:00 2001 From: Odairu <39929315+Odairu@users.noreply.github.com> Date: Tue, 27 Aug 2024 07:32:07 -0400 Subject: [PATCH] makes it so hands are completely unusable when in army crawl (#29579) * Update prone_mob.dm * Update prone_mob.dm --- .../code/datums/components/prone_mob.dm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/modular_skyrat/master_files/code/datums/components/prone_mob.dm b/modular_skyrat/master_files/code/datums/components/prone_mob.dm index 739187bdab3..883855ec756 100644 --- a/modular_skyrat/master_files/code/datums/components/prone_mob.dm +++ b/modular_skyrat/master_files/code/datums/components/prone_mob.dm @@ -5,38 +5,25 @@ if(!isliving(parent)) return COMPONENT_INCOMPATIBLE source = parent - parent.add_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING), type) + parent.add_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING, TRAIT_HANDS_BLOCKED), type) parent.add_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING), type) passtable_on(parent, type) source.layer = PROJECTILE_HIT_THRESHHOLD_LAYER /datum/component/prone_mob/RegisterWithParent() RegisterSignals(parent, list(COMSIG_MOVABLE_REMOVE_PRONE_STATE, COMSIG_LIVING_GET_PULLED), PROC_REF(stop_army_crawl)) - RegisterSignals(parent, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK), PROC_REF(check_attack)) - RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, PROC_REF(check_pull)) /datum/component/prone_mob/UnregisterFromParent() UnregisterSignal(parent, list( COMSIG_LIVING_GET_PULLED, - COMSIG_MOB_ATTACK_HAND, - COMSIG_MOB_ITEM_ATTACK, - COMSIG_LIVING_GET_PULLED, - COMSIG_LIVING_TRY_PULL + COMSIG_LIVING_TRY_PULL, )) return ..() -/datum/component/prone_mob/proc/check_attack(mob/living/source) - SIGNAL_HANDLER - return COMPONENT_CANCEL_ATTACK_CHAIN - -/datum/component/prone_mob/proc/check_pull(mob/living/source) - SIGNAL_HANDLER - return COMSIG_LIVING_CANCEL_PULL - /datum/component/prone_mob/proc/stop_army_crawl(mob/living/source) SIGNAL_HANDLER source = parent - parent.remove_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING), type) + parent.remove_traits(list(TRAIT_PRONE, TRAIT_FLOORED, TRAIT_NO_THROWING, TRAIT_HANDS_BLOCKED), type) passtable_off(parent, type) source.layer = MOB_LAYER qdel(src)