Added Crew Transfer Shuttle to the restart vote.

code/datums/vote.dm

@@ -8,4 +8,6 @@
 
 	var/customname
 	var/choices = list()
-	var/enteringchoices = 0
+	var/enteringchoices = 0
+
+	var/instant_restart = 0

code/game/vote.dm

@@ -106,16 +106,20 @@
 
 		world << "Result is \red Restart round."
 
-		world <<"\red <B>World will reboot in 5 seconds</B>"
+		if(vote.instant_restart)
+			world <<"\red <B>World will reboot in 5 seconds</B>"
 
-		//feedback_set_details("end_error","restart vote")
+			//feedback_set_details("end_error","restart vote")
 
-		if(blackbox)
-			blackbox.save_all_data_to_sql()
+			if(blackbox)
+				blackbox.save_all_data_to_sql()
 
-		sleep(50)
-		log_game("Rebooting due to restart vote")
-		world.Reboot()
+			sleep(50)
+			log_game("Rebooting due to restart vote")
+			world.Reboot()
+		else
+			// Call the shift change shuttle instead
+			init_shift_change()
 	return
 
 
@@ -256,10 +260,13 @@
 			usr << browse(text, "window=vote")
 
 		else	// voting to restart
-			text += "Vote to restart round in progress.<BR>"
+			text += "Vote to call crew transfer shuttle round in progress.<BR>"
 			text += "[vote.endwait()] until voting is closed.<BR>"
 
-			text += "Restart the world?<BR><UL>"
+			if(vote.instant_restart)
+				text += "Restart the world? <B><font color='red'>ONLY PRESS THIS IF THERE'S A ROUND-BREAKING GLITCH.</font></B><BR><UL>"
+			else
+				text += "Call the Crew Transfer Shuttle?<BR><UL>"
 
 			var/list/VL = list("default","restart")
 
@@ -391,6 +398,16 @@
 			if(M) M.vote()
 			return
 
+		if(vote.mode == 0)
+			var/answer = alert(M,"Do you want to force an immediate restart? Only do this when there are round-breaking glitches, or risk being banned.","Immediate Reboot?","Yes","No")
+
+			if(answer == "Yes")
+				vote.instant_restart = 1
+				log_admin("[M.key] has initiated an instant reboot vote! This may be banworthy!")
+				message_admins("[M.key] has initiated an instant reboot vote! This may be banworthy!")
+			else
+				vote.instant_restart = 0
+
 		if(!ticker && vote.mode == 1)
 			if(going)
 				world << "<B>The game start has been delayed.</B>"
@@ -398,6 +415,7 @@
 		vote.voting = 1						// now voting
 		vote.votetime = world.timeofday + config.vote_period*10	// when the vote will end
 
+
 		spawn(config.vote_period*10)
 			vote.endvote()
 

html/changelog.html

@@ -63,6 +63,7 @@ should be listed in the changelog upon commit though. Thanks. -->
 		<li class="tweak">Your nutrition now decreases at the same rate as before it was nerfed.</li>
 		<li class="tweak">Low nutrition will now have a much smaller effect on your speed.</li>
 		<li class="tweak">The hunger messages will start displaying a bit earlier.</li>
+		<li class="rscadd">A restart vote now calls the Crew Transfer Shuttle by default. A regular restart is still possible for the purpose of rebooting a glitched server.</li>
 	</ul>
 </div>