Merge pull request #31713 from vuonojenmustaturska/initializefixesoct
Fixes a bunch of runtimes involving supermatter suicides, also some initialize fixes
This commit is contained in:
committed by
CitadelStationBot
parent
be2dc49384
commit
4e4f2fa19d
@@ -34,7 +34,7 @@
|
||||
|
||||
dust_animation()
|
||||
spawn_dust(just_ash)
|
||||
qdel(src)
|
||||
QDEL_IN(src,5) // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. Looks much nicer and doesn't cause multiple runtimes.
|
||||
|
||||
/mob/living/proc/dust_animation()
|
||||
return
|
||||
|
||||
@@ -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
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user