Merge branch 'master' into TG-sync-testing

2018-02-03 01:52:44 +00:00
parent 9b976b1c04 f02529555c
commit 09436512b4
2 changed files with 3 additions and 5 deletions
@@ -546,9 +546,7 @@
 	plane = SPLASHSCREEN_PLANE
 	var/client/holder

-INITIALIZE_IMMEDIATE(/obj/screen/splash)
-
-/obj/screen/splash/Initialize(client/C, visible, use_previous_title)
+/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE, except its not easy
 	. = ..()

 	holder = C