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.
This commit is contained in:
GunHog
2017-06-26 09:37:25 -05:00
parent e9a66eb6ec
commit 14e3b9a7c2
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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
@@ -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)