From 6458d91d831d1a6d1b6286890d6e401a0f554bed Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 12 Apr 2015 14:04:00 +0200 Subject: [PATCH] Fixes AIs inside inteliCards being unable to interact with the world around it. Apparently being inside an object affects view() in unexpected ways. --- code/modules/mob/living/silicon/ai/ai.dm | 6 +++--- code/modules/nano/nanointeraction.dm | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index b0fbcd2473..7edbbac68d 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -703,14 +703,14 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/check_unable(var/flags = 0) if(stat == DEAD) - usr << "\red You are dead!" + src << "You are dead!" return 1 if((flags & AI_CHECK_WIRELESS) && src.control_disabled) - usr << "\red Wireless control is disabled!" + src << "Wireless control is disabled!" return 1 if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi) - src << "\red System Error - Transceiver Disabled!" + src << "System Error - Transceiver Disabled!" return 1 return 0 diff --git a/code/modules/nano/nanointeraction.dm b/code/modules/nano/nanointeraction.dm index 645b5261bf..1e6c304541 100644 --- a/code/modules/nano/nanointeraction.dm +++ b/code/modules/nano/nanointeraction.dm @@ -70,6 +70,8 @@ if(cameranet && !cameranet.checkTurfVis(get_turf(src_object))) return apc_override ? STATUS_INTERACTIVE : STATUS_CLOSE return STATUS_INTERACTIVE + else if(get_dist(src_object, src) <= client.view) // View does not return what one would expect while installed in an inteliCard + return STATUS_INTERACTIVE return STATUS_CLOSE