Fixed relaymove blocking you in place (#19595)

Fixed relaymove blocking you in place

Should fix #19569 and #19507
This commit is contained in:
Fluffy
2024-07-09 15:41:23 +00:00
committed by GitHub
parent 681b5a8f04
commit e6917d84e5
35 changed files with 61 additions and 69 deletions
@@ -532,8 +532,6 @@
/obj/structure/closet/relaymove(mob/living/user, direction)
. = ..()
if(!.)
return
if(user.stat || !isturf(loc))
return
@@ -154,8 +154,6 @@
/obj/structure/closet/statue/relaymove(mob/living/user, direction)
. = ..()
if(!.)
return
return
-2
View File
@@ -360,8 +360,6 @@
//Shamelessly copied from wheelchair code
/obj/structure/janitorialcart/relaymove(mob/living/user, direction)
. = ..()
if(!.)
return
if(user.stat || user.stunned || user.weakened || user.paralysis || user.lying || user.restrained())
if(user==pulling)
-2
View File
@@ -108,8 +108,6 @@
/obj/structure/morgue/relaymove(mob/living/user, direction)
. = ..()
if(!.)
return
if(user.stat || locked)
return
@@ -22,8 +22,6 @@
/obj/structure/bed/stool/chair/office/wheelchair/relaymove(mob/living/user, direction)
. = ..()
if(!.)
return
// Redundant check?
if(user.stat || user.stunned || user.weakened || user.paralysis || user.lying || user.restrained())
@@ -43,8 +43,6 @@
/obj/structure/trash_pile/relaymove(mob/living/user, direction)
. = ..()
if(!.)
return
if(user.stat || user.resting) // don't care too much about use_check here, checking these will suffice
return