Deactivates the Hidden Syndicate Teleportation Device

KodeeShoo · Feb 19, 2015 · 0d0ef9e · 0d0ef9e
1 parent 30eb4e3
commit 0d0ef9e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
@@ -82,7 +82,7 @@
 	..()
 
 /obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
-	if (!src.canmove || reappearing) return
+	if (!src.canmove || reappearing || !direction) return
 	var/turf/newLoc = get_step(src,direction)
 	if(!(newLoc.flags & NOJAUNT))
 		loc = newLoc

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
@@ -344,6 +344,8 @@ obj/mecha/proc/can_use(mob/user)
 	return ..()
 
 /obj/mecha/relaymove(mob/user,direction)
+	if(!direction)
+		return
 	if(user != src.occupant) //While not "realistic", this piece is player friendly.
 		user.forceMove(get_turf(src))
 		user << "You climb out from [src]"

diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
@@ -125,7 +125,8 @@
 	master.disrupt()
 
 /obj/effect/dummy/chameleon/relaymove(var/mob/user, direction)
-	if(istype(loc, /turf/space)) return //No magical space movement!
+	if(istype(loc, /turf/space) || !direction)
+		return //No magical space movement!
 
 	if(can_move)
 		can_move = 0

diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
@@ -69,10 +69,10 @@
 
 
 /client/Center()
-	if (isobj(mob.loc))
+	if(isobj(mob.loc))
 		var/obj/O = mob.loc
-		if (mob.canmove)
-			return O.relaymove(mob, 16)
+		if(mob.canmove)
+			return O.relaymove(mob, 0)
 	return