From 5e06583dad9d30e7fce19323f24cc24b0d4f2646 Mon Sep 17 00:00:00 2001 From: Zna12 Date: Thu, 1 Feb 2018 08:20:43 -0600 Subject: [PATCH 1/3] What a mess. (#5238) This should fix the issue of having the minerals and output coming out of the wrong sides of the ORM. --- _maps/cit_map_files/BoxStation/BoxStation.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/cit_map_files/BoxStation/BoxStation.dmm b/_maps/cit_map_files/BoxStation/BoxStation.dmm index 339ac253b2..2c9b220daf 100644 --- a/_maps/cit_map_files/BoxStation/BoxStation.dmm +++ b/_maps/cit_map_files/BoxStation/BoxStation.dmm @@ -25477,8 +25477,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{ From f02529555cd1126ac5909d9c5ce47d482837d615 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 2 Feb 2018 01:22:56 -0600 Subject: [PATCH 2/3] [MIRROR] Fix roundend splash screens (#5242) * Fix roundend splash screens * Update screen_objects.dm --- code/_onclick/hud/screen_objects.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 1bfb801730..10744f401d 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -546,7 +546,9 @@ plane = SPLASHSCREEN_PLANE var/client/holder -/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE +/obj/screen/splash/New(client/C, visible, use_previous_title) //TODO: Make this use INITIALIZE_IMMEDIATE, except its not easy + . = ..() + holder = C if(!visible) From ab1c75edbba258046e0a779bae4031659e86f3f1 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Fri, 2 Feb 2018 23:17:31 -0500 Subject: [PATCH 3/3] Temporarily disables autocall --- code/controllers/subsystem/ticker.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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