From da14500268017fc7c6020452eb8daf7ad045cc1c Mon Sep 17 00:00:00 2001 From: Igor Golubkov Date: Mon, 22 Jul 2013 09:19:19 +0400 Subject: [PATCH 1/2] Add error reporting on failed DB connection. --- code/world.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/world.dm b/code/world.dm index d72ec0c02a8..502d25d1905 100644 --- a/code/world.dm +++ b/code/world.dm @@ -308,6 +308,7 @@ proc/setup_database_connection() failed_db_connections = 0 //If this connection succeeded, reset the failed connections counter. else failed_db_connections++ //If it failed, increase the failed connections counter. + world.log << dbcon.ErrorMsg() return . @@ -345,6 +346,7 @@ proc/setup_old_database_connection() failed_old_db_connections = 0 //If this connection succeeded, reset the failed connections counter. else failed_old_db_connections++ //If it failed, increase the failed connections counter. + world.log << dbcon.ErrorMsg() return . From 3889716dd6dfb7f497c95fe33d3bfdf80eacad1f Mon Sep 17 00:00:00 2001 From: Igor Golubkov Date: Mon, 22 Jul 2013 10:26:48 +0400 Subject: [PATCH 2/2] Fix Issue #3327 --- code/game/machinery/alarm.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 71906ffb3b6..ec48cf76cc4 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -125,6 +125,8 @@ pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24) pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0 update_icon() + if(ticker && ticker.current_state == 3)//if the game is running + src.initialize() return first_run()