Merge pull request #7233 from Citadel-Station-13/upstream-merge-38653

[MIRROR] Ports more things to Initialize
2018-06-24 18:12:40 -05:00
parent f44cd3f917 e0dc509f5d
commit 72bc5121bd
15 changed files with 35 additions and 34 deletions
@@ -15,8 +15,8 @@

 	var/obj/item/toner/ink = null

-/obj/item/airlock_painter/New()
-	..()
+/obj/item/airlock_painter/Initialize()
+	. = ..()
 	ink = new /obj/item/toner(src)

 //This proc doesn't just check if the painter can be used, but also uses it.
@@ -14,8 +14,8 @@
 	var/start_lit = FALSE
 	heat = 1000

-/obj/item/candle/New()
-	..()
+/obj/item/candle/Initialize()
+	. = ..()
 	if(start_lit)
 		// No visible message
 		light(show_message = FALSE)