From f21e9815e5b7e7f321beeba4da040e617e59e832 Mon Sep 17 00:00:00 2001 From: tacoguy7765093 Date: Mon, 8 Apr 2024 08:57:13 -0500 Subject: [PATCH] Allows item use when in weakened state (#8154) --- code/_onclick/click.dm | 2 +- code/modules/mob/living/living.dm | 2 +- code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index a29a786b57..93e06ddf2d 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -68,7 +68,7 @@ CtrlClickOn(A) return 1 - if(stat || paralysis || stunned || weakened) + if(stat || paralysis || stunned) //CHOMPedit, removed weakened to allow item use while crawling return face_atom(A) // change direction to face what you clicked on diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 78078457c5..e959243b1b 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -972,7 +972,7 @@ if(incapacitated(INCAPACITATION_KNOCKOUT) || incapacitated(INCAPACITATION_STUNNED)) // CHOMPAdd - Making sure we're in good condition to crawl canmove = 0 - drop_both_hands() + //drop_both_hands() CHOMPremove, purple stuns dont drop items, this makes space EVA less frustrating and slips/shoves are already coded to drop your stuff. else canmove = 1 diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm index 8618822c44..79057e889c 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm @@ -541,6 +541,7 @@ var/mob/living/carbon/human/H = T if(H.species.lightweight == 1) H.Stun(3) // CHOMPEdit - Crawling made this useless. Changing to stun instead. + H.drop_both_hands() //Stuns no longer drop items, so were forcing it >:3 return var/armor_block = run_armor_check(T, "melee") var/armor_soak = get_armor_soak(T, "melee")