mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Fixed relaymove blocking you in place (#19595)
Fixed relaymove blocking you in place Should fix #19569 and #19507
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user