From eaef948ec30cee9aa2ca0f7e5196ce4a67e1e124 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Sun, 3 Sep 2023 01:22:42 -0400 Subject: [PATCH] Brain damage tweaks (#4316) # About the pull request This PR: Makes peri work for brain damage Stops you from moving while buckled or not conscious # Explain why it's good for the game No more unconscious people crawling away from medics # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow fix: Peri now works for brain damage fix: Brain damage movement will no longer occur while buckled and unconscious /:cl: --- code/modules/organs/organ_internal.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index 2178e2d53f5c..dd37ac5a8af1 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -250,10 +250,14 @@ /datum/internal_organ/brain/process(delta_time) ..() + if(owner.chem_effect_flags & CHEM_EFFECT_ORGAN_STASIS) + return + if(organ_status >= ORGAN_BRUISED && prob(5 * delta_time)) var/dir_choice = pick(list(NORTH, SOUTH, EAST, WEST)) owner.drop_held_items() - owner.Move(get_step(get_turf(owner), dir_choice)) + if(!owner.buckled && owner.stat == CONSCIOUS) + owner.Move(get_step(get_turf(owner), dir_choice)) to_chat(owner, SPAN_DANGER("Your mind wanders and goes blank for a moment...")) if(organ_status >= ORGAN_BROKEN && prob(5 * delta_time))