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"