mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-18 11:30:35 +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:
@@ -310,7 +310,11 @@
|
||||
return 1
|
||||
|
||||
// attempt to move while inside
|
||||
/obj/machinery/disposal/relaymove(mob/user as mob)
|
||||
/obj/machinery/disposal/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(user.stat || src.flushing)
|
||||
return
|
||||
if(user.loc == src)
|
||||
@@ -746,7 +750,11 @@
|
||||
|
||||
|
||||
// called when player tries to move while in a pipe
|
||||
/obj/disposalholder/relaymove(mob/user as mob)
|
||||
/obj/disposalholder/relaymove(mob/living/user, direction)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
|
||||
if(!istype(user,/mob/living))
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user