From cec16d75595cf4904d744dc396186863515d077b Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Thu, 7 May 2015 14:48:18 +0100 Subject: [PATCH] Fixes cyborgs showing up as AIs in radio output for AIs. Also fixes pAIs and non-carbon non-robot non-AI non-pAI mobs doing the same. --- code/game/machinery/alarm.dm | 2 +- code/game/machinery/computer/atmos_control.dm | 2 +- code/modules/mob/mob_helpers.dm | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 32847060d22..7d9b6055856 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -617,7 +617,7 @@ if(buildstage != 2) return STATUS_CLOSE - if(aidisabled && user.isAI()) + if(aidisabled && user.isMobAI()) user << "AI control for \the [src] interface has been disabled." return STATUS_CLOSE diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index d63259bc4c5..069ec5e2161 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -93,6 +93,6 @@ /datum/topic_state/air_alarm/href_list(var/mob/user) var/list/extra_href = list() extra_href["remote_connection"] = 1 - extra_href["remote_access"] = user && (user.isAI() || atmos_control.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO)) + extra_href["remote_access"] = user && (user.isMobAI() || atmos_control.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO)) return extra_href diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 7c220076bb5..01d3da92fbe 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -86,10 +86,10 @@ /mob/living/silicon/isSilicon() return 1 -/mob/proc/isAI() +/mob/proc/isMobAI() return 0 -/mob/living/silicon/ai/isAI() +/mob/living/silicon/ai/isMobAI() return 1 /mob/proc/isSynthetic()