Merge pull request #2029 from Citadel-Station-13/upstream-merge-29267

[MIRROR] Makes round end delay message optional
2017-07-15 23:19:08 -05:00
parent e6fbba5404 2cbfec38a2
commit 44473643bb
1 changed files with 3 additions and 2 deletions
@@ -348,11 +348,12 @@
 	else if(href_list["delay_round_end"])
 		if(!check_rights(R_SERVER))
 			return
-
 		if(!SSticker.delay_end)
 			SSticker.admin_delay_notice = input(usr, "Enter a reason for delaying the round end", "Round Delay Reason") as null|text
-			if(!SSticker.admin_delay_notice)
+			if(isnull(SSticker.admin_delay_notice))
 				return
+		else
+			SSticker.admin_delay_notice = null
 		SSticker.delay_end = !SSticker.delay_end
 		var/reason = SSticker.delay_end ? "for reason: [SSticker.admin_delay_notice]" : "."//laziness
 		var/msg = "[SSticker.delay_end ? "delayed" : "undelayed"] the round end [reason]"