From c1ba51f32800c064c2eaff85f5f4b3e73315377d Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 10 Feb 2020 23:31:41 +0100 Subject: [PATCH] Makes AI able to click on turfs --- code/_onclick/ai.dm | 4 ++-- code/modules/mob/living/silicon/ai/ai.dm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 8d58245eda5..7c2214e2287 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -42,8 +42,8 @@ if(control_disabled || stat) return - - var/turf/pixel_turf = get_turf_pixel(A) + + var/turf/pixel_turf = isturf(A) ? A : get_turf_pixel(A) if(isnull(pixel_turf)) return if(!can_see(A)) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 7822584ab98..adc1ace2fa8 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1200,7 +1200,8 @@ var/list/ai_verbs_default = list( if(isturf(loc)) //AI in core, check if on cameras //get_turf_pixel() is because APCs in maint aren't actually in view of the inner camera //apc_override is needed here because AIs use their own APC when depowered - return (cameranet && cameranet.checkTurfVis(get_turf_pixel(A))) || apc_override + var/turf/T = isturf(A) ? A : get_turf_pixel(A) + return (cameranet && cameranet.checkTurfVis(T)) || apc_override //AI is carded/shunted //view(src) returns nothing for carded/shunted AIs and they have x-ray vision so just use get_dist var/list/viewscale = getviewsize(client.view)