mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +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:
@@ -69,8 +69,6 @@
|
||||
|
||||
/obj/machinery/gibber/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
go_out()
|
||||
return
|
||||
|
||||
@@ -266,8 +266,6 @@
|
||||
|
||||
/mob/living/heavy_vehicle/relaymove(mob/living/user, direction, var/turn_only = FALSE)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(!can_move(user))
|
||||
return
|
||||
|
||||
@@ -78,8 +78,6 @@
|
||||
|
||||
/obj/effect/spresent/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if (user.stat)
|
||||
return
|
||||
|
||||
@@ -203,8 +203,6 @@
|
||||
|
||||
/obj/item/device/mmi/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user.stat || user.stunned)
|
||||
return
|
||||
|
||||
@@ -78,8 +78,6 @@
|
||||
|
||||
/mob/living/carbon/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if((user in contents) && istype(user))
|
||||
if(user.last_special <= world.time)
|
||||
|
||||
@@ -111,8 +111,6 @@
|
||||
|
||||
/obj/machinery/computer/ship/helm/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(viewing_overmap(user) && connected)
|
||||
connected.relaymove(user, direction, accellimit)
|
||||
|
||||
@@ -81,8 +81,6 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
|
||||
|
||||
/obj/effect/overmap/visitable/ship/relaymove(mob/living/user, direction, accel_limit)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
INVOKE_ASYNC(src, PROC_REF(accelerate), direction, accel_limit)
|
||||
|
||||
|
||||
@@ -312,8 +312,6 @@
|
||||
// attempt to move while inside
|
||||
/obj/machinery/disposal/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user.stat || src.flushing)
|
||||
return
|
||||
@@ -752,8 +750,6 @@
|
||||
// called when player tries to move while in a pipe
|
||||
/obj/disposalholder/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(!istype(user,/mob/living))
|
||||
return
|
||||
|
||||
@@ -98,8 +98,6 @@
|
||||
|
||||
/obj/effect/dummy/spell_jaunt/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if (!src.canmove || reappearing) return
|
||||
var/turf/newLoc = get_step(src,direction)
|
||||
|
||||
@@ -92,8 +92,6 @@
|
||||
|
||||
/obj/vehicle/animal/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user != load || user.incapacitated())
|
||||
return
|
||||
|
||||
@@ -191,8 +191,6 @@
|
||||
|
||||
/obj/vehicle/bike/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user != load || !on || user.incapacitated())
|
||||
return
|
||||
|
||||
@@ -47,8 +47,6 @@
|
||||
|
||||
/obj/vehicle/unicycle/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user != load || !on || user.incapacitated())
|
||||
return
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
|
||||
/obj/machinery/atmospherics/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user.loc != src || !(direction & initialize_directions)) //can't go in a way we aren't connecting to
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user