mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-12 08:27:13 +01:00
Relaymove tweaks (#19489)
Made relaymoves uniform in function header and non sleepable. Improved IPC/borg recharger, made it time constant. Tweaked client/Move() to avoid a range(), moved a relaymove around to fix a bug, some minor tweaks. Fixed IPC/borg recharge station not taking the IPC/Borg in on bump.
This commit is contained in:
@@ -90,7 +90,11 @@
|
||||
return
|
||||
..()
|
||||
|
||||
/obj/vehicle/animal/relaymove(mob/user, direction)
|
||||
/obj/vehicle/animal/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user != load || user.incapacitated())
|
||||
return
|
||||
return Move(get_step(src, direction))
|
||||
|
||||
@@ -189,7 +189,11 @@
|
||||
to_chat(user, SPAN_NOTICE("\The [src] already has a key in it."))
|
||||
..()
|
||||
|
||||
/obj/vehicle/bike/relaymove(mob/user, direction)
|
||||
/obj/vehicle/bike/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user != load || !on || user.incapacitated())
|
||||
return
|
||||
return Move(get_step(src, direction))
|
||||
|
||||
@@ -45,7 +45,11 @@
|
||||
to_chat(user, "You remove [load] from \the [src]")
|
||||
to_chat(load, "You were removed from \the [src] by [user]")
|
||||
|
||||
/obj/vehicle/unicycle/relaymove(mob/user, direction)
|
||||
/obj/vehicle/unicycle/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user != load || !on || user.incapacitated())
|
||||
return
|
||||
return Move(get_step(src, direction))
|
||||
|
||||
Reference in New Issue
Block a user