cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31713 from vuonojenmustaturska/initializefixesoct

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/effects/landmarks.dm
View File

@@ -310,7 +310,7 @@
/obj/effect/landmark/servant_of_ratvar/Initialize(mapload) /obj/effect/landmark/servant_of_ratvar/Initialize(mapload)
..() ..()
GLOB.servant_spawns += loc GLOB.servant_spawns += loc
qdel(src) return INITIALIZE_HINT_QDEL
//City of Cogs entrances //City of Cogs entrances
/obj/effect/landmark/city_of_cogs /obj/effect/landmark/city_of_cogs
@@ -320,7 +320,7 @@
/obj/effect/landmark/city_of_cogs/Initialize(mapload) /obj/effect/landmark/city_of_cogs/Initialize(mapload)
..() ..()
GLOB.city_of_cogs_spawns += loc GLOB.city_of_cogs_spawns += loc
qdel(src) return INITIALIZE_HINT_QDEL
//generic event spawns //generic event spawns
/obj/effect/landmark/event_spawn /obj/effect/landmark/event_spawn

2
code/game/objects/structures/window.dm
View File

@@ -650,7 +650,7 @@
/obj/structure/window/reinforced/clockwork/Initialize(mapload, direct) /obj/structure/window/reinforced/clockwork/Initialize(mapload, direct)
if(fulltile) if(fulltile)
made_glow = TRUE made_glow = TRUE
..() . = ..()
QDEL_LIST(debris) QDEL_LIST(debris)
var/amount_of_gears = 2 var/amount_of_gears = 2
if(fulltile) if(fulltile)

2
code/game/turfs/simulated/wall/misc_walls.dm
View File

@@ -59,7 +59,7 @@
var/obj/effect/clockwork/overlay/wall/realappearence var/obj/effect/clockwork/overlay/wall/realappearence
/turf/closed/wall/clockwork/Initialize() /turf/closed/wall/clockwork/Initialize()
..() . = ..()
new /obj/effect/temp_visual/ratvar/wall(src) new /obj/effect/temp_visual/ratvar/wall(src)
new /obj/effect/temp_visual/ratvar/beam(src) new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/wall(src) realappearence = new /obj/effect/clockwork/overlay/wall(src)

2
code/modules/mob/living/death.dm
View File

@@ -34,7 +34,7 @@
dust_animation() dust_animation()
spawn_dust(just_ash) 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() /mob/living/proc/dust_animation()
return return

4
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -86,7 +86,7 @@
var/chnotify = 0 var/chnotify = 0
/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai) /mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
..() . = ..()
if(!target_ai) //If there is no player/brain inside. if(!target_ai) //If there is no player/brain inside.
new/obj/structure/AIcore/deactivated(loc) //New empty terminal. new/obj/structure/AIcore/deactivated(loc) //New empty terminal.
qdel(src)//Delete AI. qdel(src)//Delete AI.
@@ -988,6 +988,6 @@
return return
/mob/living/silicon/ai/spawned/Initialize(mapload, datum/ai_laws/L, mob/target_ai) /mob/living/silicon/ai/spawned/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
. = ..()
if(!target_ai) if(!target_ai)
target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct
..()