question order consistency

cmss13-devs · Feb 5, 2024 · f00d0f5 · f00d0f5
1 parent adbae76
commit f00d0f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
@@ -286,16 +286,16 @@ GLOBAL_DATUM(Banlist, /savefile)
 	if(!identifier)
 		return
 
-	if(!reason)
-		reason = tgui_input_text(src, "What's the reason for the ban? This is shown internally, and not displayed in public notes and ban messages. Include as much detail as necessary.", "BuildABan", multiline = TRUE, encode = FALSE)
-	if(!reason)
-		return
-
 	if(!message)
 		message = tgui_input_text(src, "What message should be given to the impacted users?", "BuildABan", encode = FALSE)
 	if(!message)
 		return
 
+	if(!reason)
+		reason = tgui_input_text(src, "What's the reason for the ban? This is shown internally, and not displayed in public notes and ban messages. Include as much detail as necessary.", "BuildABan", multiline = TRUE, encode = FALSE)
+	if(!reason)
+		return
+
 	if(!length(impacted_ckeys))
 		impacted_ckeys = splittext(tgui_input_text(src, "Which CKEYs should be impacted by this ban? Include the primary ckey, separated by semicolons.", "BuildABan", "player1;player2;player3"), ";")
 

diff --git a/code/modules/admin/player_panel/actions/punish.dm b/code/modules/admin/player_panel/actions/punish.dm
@@ -80,14 +80,14 @@
 	var/persistent_ip = target.client?.address || player.last_known_ip
 	var/persistent_cid = target.client?.computer_id || player.last_known_cid
 
-	var/reason = tgui_input_text(user, "What's the reason for the ban? This is shown internally, and not displayed in public notes and ban messages. Include as much detail as necessary.", "BuildABan", multiline = TRUE, encode = FALSE)
-	if(!reason)
-		return
-
 	var/message = tgui_input_text(user, "What message should be given to the impacted users?", "BuildABan", encode = FALSE)
 	if(!message)
 		return
 
+	var/reason = tgui_input_text(user, "What's the reason for the ban? This is shown internally, and not displayed in public notes and ban messages. Include as much detail as necessary.", "BuildABan", multiline = TRUE, encode = FALSE)
+	if(!reason)
+		return
+
 	user.cmd_admin_do_stickyban(target.ckey, reason, message, impacted_ckeys = list(target.ckey), impacted_cids = list(persistent_cid), impacted_ips = list(persistent_ip))
 	player.add_note("Stickybanned | [message]", FALSE, NOTE_ADMIN, TRUE)
 	player.add_note("Internal reason: [reason]", TRUE, NOTE_ADMIN)