From 14e3b9a7c2c6c3b239a9a7a513e8a445cd43aed1 Mon Sep 17 00:00:00 2001 From: GunHog Date: Mon, 26 Jun 2017 09:37:25 -0500 Subject: [PATCH] Fixes AI <-> Shell mind transfer issues - Fixed Traitor/Malf AIs resetting their antagonist status and points upon transfering to a shell and back. - Fixes connected borgs being shown their laws when the AI returns to its shell. --- code/datums/antagonists/datum_traitor.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm index ee6baa2c709..4aad416c622 100644 --- a/code/datums/antagonists/datum_traitor.dm +++ b/code/datums/antagonists/datum_traitor.dm @@ -38,7 +38,7 @@ /datum/antagonist/traitor/on_body_transfer(mob/living/old_body, mob/living/new_body) - if(isAI(new_body)==isAI(old_body)) + if(issilicon(new_body) && issilicon(old_body)) ..() else silent = TRUE diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b50a8daff21..7f19f862ff2 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1085,7 +1085,8 @@ camera.c_tag = real_name //update the camera name too diag_hud_set_aishell() mainframe.diag_hud_set_deployed() - mainframe.show_laws() //Always remind the AI when switching + if(mainframe.laws) + mainframe.laws.show_laws(mainframe) //Always remind the AI when switching mainframe = null /mob/living/silicon/robot/attack_ai(mob/user)