[MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)

* More Initialize() fixes, requires someone to test with DB * fucking mirror failure
2017-09-22 23:35:22 -05:00
parent 6717720356
commit 2a860d1954
45 changed files with 161 additions and 160 deletions
@@ -88,7 +88,7 @@
 	..()
 	if(FESTIVE_SEASON in SSevents.holidays)
 		new tree(get_turf(src))
-	qdel(src)
+	return INITIALIZE_HINT_QDEL

 /obj/effect/landmark/xmastree/rdrod
 	name = "festivus pole spawner"
@@ -43,7 +43,7 @@
 	
 /mob/living/simple_animal/hostile/carp/ranged/Initialize()
 	projectiletype = pick(allowed_projectile_types)
-	..()
+	. = ..()

 /mob/living/simple_animal/hostile/carp/ranged/chaos
 	name = "chaos magicarp"