manual merge

2017-04-29 07:57:16 -05:00
parent bcab389ca2
commit 0cf401934b
4 changed files with 7 additions and 16 deletions
@@ -31,8 +31,8 @@
 	. = ..()
 	deltimer(timerid)

-/obj/effect/overlay/temp/New()
-	..()
+/obj/effect/overlay/temp/Initialize()
+	. = ..()
 	if(randomdir)
 		setDir(pick(GLOB.cardinal))