From f463852b23af40742171a0316a1730b3f612e29c Mon Sep 17 00:00:00 2001 From: Theos Date: Tue, 4 Jun 2024 18:16:04 -0400 Subject: [PATCH] Broken bones now hurt less on rollerbeds (#3024) ## About The Pull Request fixes #2968 splints would work for some stuff but they are both uncommon (only spawn in like brute kits/need to be crafted) and don't work on the head or chest. Also gives rollerbeds a niche ## Why It's Good For The Game Life or random damage ticks for broken cat it's a bit unintuitive that putting someone on a rollerbed won't make them resistant/immune to bone jostling ## Changelog :cl: balance: Rollerbeds stop broken bone damage ticks from occurring while buckled /:cl: --------- Signed-off-by: Theos --- code/modules/surgery/bodyparts/bodyparts.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 366fb41790ab..7cf31dc83ca6 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -745,8 +745,8 @@ bone_status = BONE_FLAG_NORMAL /obj/item/bodypart/proc/on_mob_move() - // Dont trigger if it isn't broken or if it has no owner - if(bone_status != BONE_FLAG_BROKEN || !owner) + // Dont trigger if it isn't broken or if it has no owner or is buckled to a rollerbed + if(bone_status != BONE_FLAG_BROKEN || !owner || istype(owner?.buckled, /obj/structure/bed/roller)) return if(prob(5))