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() 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 .