From 4215819c9a73116ca773706607182db0f57aa355 Mon Sep 17 00:00:00 2001
From: uporotiy <uporotiy@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 27 Dec 2010 23:03:52 +0000
Subject: [PATCH] Various hologram changes, namely ability to walk through
 windows and such, ability to hear humans (I hope, can't test that) and
 inheritance of parent AI name. Also disappears when knocked unconscious (will
 fix it getting attacked later).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@716 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/mob/living/silicon/hologram.dm              | 1 +
 code/game/machinery/hologram.dm                          | 2 ++
 code/modules/mob/living/carbon/human/say.dm              | 2 ++
 code/modules/mob/living/silicon/aihologram/aihologram.dm | 5 +++++
 4 files changed, 10 insertions(+)

diff --git a/code/defines/mob/living/silicon/hologram.dm b/code/defines/mob/living/silicon/hologram.dm
index f555c6887bf..52621a3e4c8 100644
--- a/code/defines/mob/living/silicon/hologram.dm
+++ b/code/defines/mob/living/silicon/hologram.dm
@@ -4,5 +4,6 @@
 	icon = 'mob.dmi'//
 	icon_state = "ai-holo"
 	density = 0
+	incorporeal_move = 1
 	var/mob/living/silicon/ai/parent_ai = null
 	var/datum/ai_laws/ailaws = null
\ No newline at end of file
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index e833ae55f03..6fe4ee9e218 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -8,6 +8,8 @@
 				holo.parent_ai = user
 				holo.ailaws = holo.parent_ai.laws_object
 				holo.client = usr.client //should move the client there
+				holo.name = holo.parent_ai.name
+				holo.real_name = holo.parent_ai.real_name
 				src.state = "on"
 				src.icon_state = "holopad1"
 				src.slave_holo = holo
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 886e93d1eb0..d681b6045db 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -7,6 +7,8 @@
 /mob/living/carbon/human/say_understands(var/other)
 	if (istype(other, /mob/living/silicon/ai))
 		return 1
+	if (istype(other, /mob/living/silicon/aihologram))
+		return 1
 	if (istype(other, /mob/living/silicon/robot))
 		return 1
 	return ..()
diff --git a/code/modules/mob/living/silicon/aihologram/aihologram.dm b/code/modules/mob/living/silicon/aihologram/aihologram.dm
index 92e932a833f..22956521176 100644
--- a/code/modules/mob/living/silicon/aihologram/aihologram.dm
+++ b/code/modules/mob/living/silicon/aihologram/aihologram.dm
@@ -36,6 +36,11 @@
 /mob/living/silicon/aihologram/bullet_act(flag)
 	return
 
+/mob/living/silicon/aihologram/Life()
+	if(src.stat)
+		del(src)
+	..()
+
 /mob/living/silicon/aihologram/proc/back_to_ai()
 	set category = "AI Commands"
 	set name = "Return To AI"