Merge pull request #31713 from vuonojenmustaturska/initializefixesoct

Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
This commit is contained in:
Jordan Brown
2017-10-15 12:30:52 -04:00
committed by CitadelStationBot
parent be2dc49384
commit 4e4f2fa19d
5 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -86,7 +86,7 @@
var/chnotify = 0
/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
..()
. = ..()
if(!target_ai) //If there is no player/brain inside.
new/obj/structure/AIcore/deactivated(loc) //New empty terminal.
qdel(src)//Delete AI.
@@ -988,6 +988,6 @@
return
/mob/living/silicon/ai/spawned/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
. = ..()
if(!target_ai)
target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct
..()