delete .rej

code/controllers/subsystem/vote.dm.rej

@@ -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

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")

code/world.dm.rej

@@ -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")