diff --git a/_maps/cit_map_files/BoxStation/BoxStation.dmm b/_maps/cit_map_files/BoxStation/BoxStation.dmm index 779d4e4a90..bf29f04364 100644 --- a/_maps/cit_map_files/BoxStation/BoxStation.dmm +++ b/_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{ diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index b7b57b669b..c7df44dfec 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/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 diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 4894edb6dd..99b5f0dde6 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -201,7 +201,7 @@ SUBSYSTEM_DEF(ticker) check_queue() check_maprotate() scripture_states = scripture_unlock_alert(scripture_states) - SSshuttle.autoEnd() + //SSshuttle.autoEnd() if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending) current_state = GAME_STATE_FINISHED