From 259940ccc5778cbcefe7c5c346296461645f865c Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Tue, 11 Jul 2023 02:37:47 -0400 Subject: [PATCH] Stops xenos from bypassing dead moving via roller beds (#3810) # About the pull request This PR makes it so a roller bed with a dead person on it now is unmovable. Can still be moved if unconscious or alive so as to mimic current restrictions. # Explain why it's good for the game This has been a longstanding ruling issue that we can now just let be mechanically prevented. Less rule bloat good. # 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: Stops xenos from bypassing dead moving via roller beds /:cl: --- .../objects/structures/stool_bed_chair_nest/bed.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index bda4b60ca21e..7979994915f4 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -208,6 +208,20 @@ return ..() +/obj/structure/bed/roller/Collided(atom/movable/moving_atom) + if(!isxeno(moving_atom)) + return ..() + + if(buckled_mob && buckled_mob.stat != DEAD) + return ..() + + if(buckled_bodybag) + var/mob/mob_in_bodybag = locate(/mob) in buckled_bodybag + if(mob_in_bodybag && mob_in_bodybag.stat != DEAD) + return ..() + + return + /obj/item/roller name = "roller bed" desc = "A collapsed roller bed that can be carried around."