Skip to content

Commit

Permalink
Stops xenos from bypassing dead moving via roller beds (#3810)
Browse files Browse the repository at this point in the history
# 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
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl: Morrow
fix: Stops xenos from bypassing dead moving via roller beds
/:cl:
  • Loading branch information
morrowwolf committed Jul 11, 2023
1 parent f83f8b7 commit 259940c
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 259940c

Please sign in to comment.