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
+3 -3
View File
@@ -254,7 +254,7 @@
..()
GLOB.prisonwarp += loc
return INITIALIZE_HINT_QDEL
/obj/effect/landmark/ert_spawn
name = "Emergencyresponseteam"
@@ -310,7 +310,7 @@
/obj/effect/landmark/servant_of_ratvar/Initialize(mapload)
..()
GLOB.servant_spawns += loc
qdel(src)
return INITIALIZE_HINT_QDEL
//City of Cogs entrances
/obj/effect/landmark/city_of_cogs
@@ -320,7 +320,7 @@
/obj/effect/landmark/city_of_cogs/Initialize(mapload)
..()
GLOB.city_of_cogs_spawns += loc
qdel(src)
return INITIALIZE_HINT_QDEL
//generic event spawns
/obj/effect/landmark/event_spawn
+1 -1
View File
@@ -650,7 +650,7 @@
/obj/structure/window/reinforced/clockwork/Initialize(mapload, direct)
if(fulltile)
made_glow = TRUE
..()
. = ..()
QDEL_LIST(debris)
var/amount_of_gears = 2
if(fulltile)