Merge branch 'master' into TG-sync-testing

_maps/cit_map_files/BoxStation/BoxStation.dmm

@@ -25476,8 +25476,8 @@
 /area/quartermaster/sorting)
 "bml" = (
 /obj/machinery/mineral/ore_redemption{
-	input_dir = 4;
-	output_dir = 8
+	input_dir = 8;
+	output_dir = 4
 	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/eastleft{

code/_onclick/hud/screen_objects.dm

@@ -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