From cfe11fbd1c295c9e8a2e255bc58f5e44699fa172 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 24 May 2021 10:25:23 -0600
Subject: [PATCH] finishes renaming return to menu back to respawn, adds return
 to menu as an alias to respawn (#3122)

* Update admin.dm

* Update mob.dm
---
 code/modules/admin/admin.dm |  2 +-
 code/modules/mob/mob.dm     | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index c371274d031..b78555dad9d 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -891,7 +891,7 @@ var/datum/announcement/minor/admin_min_announcer = new
 /datum/admins/proc/toggleaban()
 	set category = "Server"
 	set desc = "Respawn basically"
-	set name = "Toggle Return to Menu"
+	set name = "Toggle Respawn"
 	config_legacy.abandon_allowed = !(config_legacy.abandon_allowed)
 	if(config_legacy.abandon_allowed)
 		to_chat(world, "<B>Returning to menu as a ghost is now allowed.</B>")
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 9dcf4847a22..9250ea117e1 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -398,11 +398,19 @@
 	else
 		return 	// Don't set it, no need
 
-/mob/verb/abandon_mob()
-	set name = "Respawn (Return to Menu)"
+/// Alias for respawn
+/mob/verb/return_to_menu()
+	set name = "Return to Menu"
 	set category = "OOC"
+	set desc = "Return to the lobby."
+	return abandon_mob()
 
-	if(stat != DEAD || !SSticker)
+/mob/verb/abandon_mob()
+	set name = "Respawn"
+	set category = "OOC"
+	set desc = "Return to the lobby."
+
+	if(stat != DEAD)
 		to_chat(usr, "<span class='notice'><B>You must be dead to use this!</B></span>")
 		return