From ca1f0ef04eb0d1b8c9b84ca43e243781b9531a29 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 13 May 2017 23:59:54 -0500 Subject: [PATCH] commit --- code/world.dm | 2 +- code/world.dm.rej | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 code/world.dm.rej diff --git a/code/world.dm b/code/world.dm index 7d942569da..4489b9a1cb 100644 --- a/code/world.dm +++ b/code/world.dm @@ -42,7 +42,7 @@ else log_world("Your server failed to establish a connection with the database.") if(!GLOB.round_id) - GLOB.log_directory += "[time_stamp()]" + GLOB.log_directory += "[replacetext(time_stamp(), ":", ".")]" GLOB.world_game_log = file("[GLOB.log_directory]/game.log") GLOB.world_attack_log = file("[GLOB.log_directory]/attack.log") GLOB.world_runtime_log = file("[GLOB.log_directory]/runtime.log") diff --git a/code/world.dm.rej b/code/world.dm.rej deleted file mode 100644 index 0ef6272088..0000000000 --- a/code/world.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/world.dm b/code/world.dm (rejected hunks) -@@ -42,7 +42,7 @@ - else - log_world("Your server failed to establish a connection with the database.") - if(!GLOB.round_id) -- GLOB.log_directory += "[time_stamp()]" -+ GLOB.log_directory += "[replacetext(time_stamp(), ":", ".")]" - GLOB.world_game_log = file("[GLOB.log_directory]/game.log") - GLOB.world_attack_log = file("[GLOB.log_directory]/attack.log") - GLOB.world_runtime_log = file("[GLOB.log_directory]/runtime.log")