From d8299bdcfd3bc088ce6a88b944df7a4d56fbe5b7 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 21 May 2017 00:45:55 -0500 Subject: [PATCH] delete .rej --- code/controllers/subsystem/vote.dm.rej | 10 ---------- code/world.dm | 4 ++-- code/world.dm.rej | 12 ------------ 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 code/controllers/subsystem/vote.dm.rej delete mode 100644 code/world.dm.rej diff --git a/code/controllers/subsystem/vote.dm.rej b/code/controllers/subsystem/vote.dm.rej deleted file mode 100644 index a7334b0b4c..0000000000 --- a/code/controllers/subsystem/vote.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm (rejected hunks) -@@ -116,7 +116,7 @@ SUBSYSTEM_DEF(vote) - restart = 1 - if("gamemode") - if(GLOB.master_mode != .) -- world.save_mode(.) -+ SSticker.save_mode(.) - if(SSticker.HasRoundStarted()) - restart = 1 - else diff --git a/code/world.dm b/code/world.dm index 3f274938ec..caf2befe0a 100644 --- a/code/world.dm +++ b/code/world.dm @@ -236,8 +236,8 @@ #define WORLD_REBOOT(X) log_world("World rebooted at [time_stamp()]"); ..(X); return; -/world/Reboot(var/reason, var/feedback_c, var/feedback_r, var/time) - if (reason == 1) //special reboot, do none of the normal stuff +/world/Reboot(reason = 0, fast_track = FALSE) + if (reason || fast_track) //special reboot, do none of the normal stuff if (usr) log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools") message_admins("[key_name_admin(usr)] Has requested an immediate world restart via client side debugging tools") diff --git a/code/world.dm.rej b/code/world.dm.rej deleted file mode 100644 index b192dd6aa4..0000000000 --- a/code/world.dm.rej +++ /dev/null @@ -1,12 +0,0 @@ -diff a/code/world.dm b/code/world.dm (rejected hunks) -@@ -215,8 +215,8 @@ - for(var/client/C in GLOB.clients) - C.AnnouncePR(final_composed) - --/world/Reboot(reason) -- if (reason) //special reboot, do none of the normal stuff -+/world/Reboot(reason = 0, fast_track = FALSE) -+ if (reason || fast_track) //special reboot, do none of the normal stuff - if (usr) - log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools") - message_admins("[key_name_admin(usr)] Has requested an immediate world restart via client side debugging tools")