From a0609d0ce7c3aa32fea2406c1b5fe176688e7bb9 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Thu, 3 Jul 2014 19:33:46 +0400 Subject: [PATCH] Two fixes Double click made non-snowflake, cancel camera exploit patched --- code/_onclick/ai.dm | 2 -- code/modules/mob/living/silicon/ai/ai.dm | 5 ++++- code/modules/mob/living/silicon/ai/freelook/eye.dm | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index f1e14db0831..29910ceaea9 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -10,8 +10,6 @@ Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner. */ /mob/living/silicon/ai/DblClickOn(var/atom/A, params) - if (istype(A, /obj/screen)) - return if(client.buildmode) // comes after object.Click to allow buildmode gui objects to be clicked build_click(src, client.buildmode, params, A) return diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 46440582ec9..6b0f903c41d 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -302,6 +302,9 @@ var/list/ai_list = list() return +/mob/living/silicon/ai/cancel_camera() + src.view_core() + /mob/living/silicon/ai/verb/toggle_anchor() set category = "AI Commands" set name = "Toggle Floor Bolts" @@ -775,4 +778,4 @@ var/list/ai_list = list() anchored = 1 return else - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index 53da7a3592b..9e19655335d 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -86,7 +86,8 @@ var/mob/living/silicon/ai/AI = usr if(AI.eyeobj && AI.client.eye == AI.eyeobj) AI.cameraFollow = null - AI.eyeobj.setLoc(src) + if (src.loc) + AI.eyeobj.setLoc(src) // This will move the AIEye. It will also cause lights near the eye to light up, if toggled. // This is handled in the proc below this one.