From 1a24a794d450fbf83763e80ed61d04fb39e9d442 Mon Sep 17 00:00:00 2001 From: craftxbox Date: Tue, 8 Oct 2019 22:58:37 -0230 Subject: [PATCH] Fixes teleport runes teleporting AI eye (#12510) --- code/game/gamemodes/cult/runes.dm | 2 ++ code/modules/mob/camera/camera.dm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 50351991a66..2f2f0cae02e 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -315,6 +315,8 @@ var/list/teleport_runes = list() var/movedsomething = 0 var/moveuserlater = 0 for(var/atom/movable/A in T) + if(A.move_resist == INFINITY) + continue //object cant move, shouldnt teleport if(A == user) moveuserlater = 1 movedsomething = 1 diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm index df6fd57423d..39931a60fb2 100644 --- a/code/modules/mob/camera/camera.dm +++ b/code/modules/mob/camera/camera.dm @@ -8,7 +8,7 @@ status_flags = GODMODE // You can't damage it. mouse_opacity = MOUSE_OPACITY_TRANSPARENT see_in_dark = 8 - invisibility = 101 // No one can see us + invisibility = 101 // No one can see us sight = SEE_SELF move_on_shuttle = 0