diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 668cb83683a..59fab2b21b5 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -611,23 +611,24 @@ GLOBAL_VAR_INIT(nologevent, 0)
feedback_add_details("admin_verb","R") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
world.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", delay)
-/datum/admins/proc/smoothend()
+/datum/admins/proc/end_round()
set category = "Server"
- set name = "Annouce game over"
- set desc = "Instantly ends round and brings up objectives like shadowlings or wizards dying."
-
+ set name = "End Round"
+ set desc = "Instantly ends the round and brings up the scoreboard, like shadowlings or wizards dying."
if(!check_rights(R_SERVER))
return
+ var/input = sanitize(copytext(input(usr, "What text should players see announcing the round end? Input nothing to cancel.", "Specify Announcement Text", "Shift Has Ended!"), 1, MAX_MESSAGE_LEN))
- if(alert(usr, "Are you sure you want to admin end the round and bring up objectives?", "End the game", "Yes", "No") != "Yes")
+ if(!input)
return
-
- message_admins("[key_name_admin(usr)] has admin ended the round.")
- log_admin("[key_name(usr)] has admin ended the round")
- SSticker.force_ending = 1
- to_chat(world, "The administrators have declared the round over and have ended the round!")
- feedback_add_details("admin_verb","S") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- feedback_set_details("round_end_result","Admin ended")
+ if(SSticker.force_ending)
+ return
+ message_admins("[key_name_admin(usr)] has admin ended the round with message: '[input]'")
+ log_admin("[key_name(usr)] has admin ended the round with message: '[input]'")
+ SSticker.force_ending = TRUE
+ to_chat(world, "[input]")
+ feedback_add_details("admin_verb", "END") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ feedback_set_details("round_end_result", "Admin ended")
/datum/admins/proc/announce()
set category = "Admin"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 9b6e828ad2a..af7735e0d86 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(admin_verbs_server, list(
/client/proc/Set_Holiday,
/datum/admins/proc/startnow,
/datum/admins/proc/restart,
- /datum/admins/proc/smoothend,
+ /datum/admins/proc/end_round,
/datum/admins/proc/delay,
/datum/admins/proc/toggleaban,
/datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/