From 208f5d3e2c77ac568e4dd68f7256bfaaf7b143ad Mon Sep 17 00:00:00 2001
From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Date: Tue, 17 Oct 2023 22:58:12 +0200
Subject: [PATCH] 1 (#17568)

Co-authored-by: DreamySkrell <>
---
 code/modules/admin/admin_verbs.dm             |  16 +++
 code/modules/admin/verbs/adminjump.dm         | 101 ++++++++++++++++++
 .../changelogs/DreamySkrell-jump-to-verbs.yml |  44 ++++++++
 3 files changed, 161 insertions(+)
 create mode 100644 html/changelogs/DreamySkrell-jump-to-verbs.yml

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 8ae24ca8945..7617b368c39 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -32,6 +32,10 @@ var/list/admin_verbs_admin = list(
 	/client/proc/getserverlog,			/*allows us to fetch server logs (diary) for other days*/
 	/client/proc/view_signal_log,		/*allows admins to check the log of signaler uses*/
 	/client/proc/jumptocoord,			/*we ghost and jump to a coordinate*/
+	/client/proc/jumptozlevel,
+	/client/proc/jumptoshuttle,
+	/client/proc/jumptoship,
+	/client/proc/jumptosector,
 	/client/proc/Getmob,				/*teleports a mob to our location*/
 	/client/proc/Getkey,				/*teleports a mob with a certain ckey to our location*/
 //	/client/proc/sendmob,				/*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage */
@@ -207,6 +211,10 @@ var/list/admin_verbs_debug = list(
 	/client/proc/Jump,
 	/client/proc/jumptomob,
 	/client/proc/jumptocoord,
+	/client/proc/jumptozlevel,
+	/client/proc/jumptoshuttle,
+	/client/proc/jumptoship,
+	/client/proc/jumptosector,
 	/client/proc/dsay,
 	/client/proc/toggle_recursive_explosions,
 	/client/proc/restart_sql,
@@ -297,6 +305,10 @@ var/list/admin_verbs_hideable = list(
 	/client/proc/cmd_cciaa_say,
 	/datum/admins/proc/access_news_network,
 	/client/proc/jumptocoord,
+	/client/proc/jumptozlevel,
+	/client/proc/jumptoshuttle,
+	/client/proc/jumptoship,
+	/client/proc/jumptosector,
 	/client/proc/colorooc,
 	/client/proc/add_client_color,
 	/datum/admins/proc/force_mode_latespawn,
@@ -440,6 +452,10 @@ var/list/admin_verbs_dev = list( //will need to be altered - Ryan784
 	/client/proc/cmd_admin_pm_context,
 	/client/proc/cmd_admin_pm_panel,	//admin-pm list
 	/client/proc/jumptocoord,			/*we ghost and jump to a coordinate*/
+	/client/proc/jumptozlevel,
+	/client/proc/jumptoshuttle,
+	/client/proc/jumptoship,
+	/client/proc/jumptosector,
 	/client/proc/cmd_dev_say,
 	/client/proc/nanomapgen_DumpImage,
 	/client/proc/admin_ghost,
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 707338efd71..b90e399fbf8 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -90,6 +90,107 @@
 	else
 		alert("Admin jumping disabled")
 
+/client/proc/jumptozlevel()
+	set category = "Admin"
+	set name = "Jump to Z-Level"
+
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
+		return
+
+	if(config.allow_admin_jump)
+		var/list/zlevels = list()
+		for(var/z=0, z<world.maxz, z++)
+			zlevels += z
+		var/selection = input("Select z-level to jump to.", "Admin Jumping", null, null) as null|anything in zlevels
+		if(!selection)
+			to_chat(src, "No z-level selected.")
+			return
+		if(src && src.mob)
+			var/mob/A = src.mob
+			A.on_mob_jump()
+			A.x = world.maxx/2
+			A.y = world.maxy/2
+			A.z = selection
+			message_admins("[key_name_admin(usr)] jumped to z-level [selection]", 1)
+			feedback_add_details("admin_verb","JZ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	else
+		alert("Admin jumping disabled")
+
+/client/proc/jumptoshuttle()
+	set category = "Admin"
+	set name = "Jump to Shuttle"
+
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
+		return
+
+	if(config.allow_admin_jump)
+		var/list/shuttles = list()
+		for(var/shuttle_tag in SSshuttle.shuttles)
+			shuttles += shuttle_tag
+		var/selection = input("Select shuttle to jump to.", "Admin Jumping", null, null) as null|anything in shuttles
+		if(!selection)
+			to_chat(src, "No shuttle selected.")
+			return
+		var/datum/shuttle/shuttle = SSshuttle.shuttles[selection]
+		if(src && src.mob && shuttle && shuttle.current_location && shuttle.current_location.loc)
+			usr.on_mob_jump()
+			usr.forceMove(shuttle.current_location.loc)
+			message_admins("[key_name_admin(usr)] jumped to shuttle [selection]", 1)
+			feedback_add_details("admin_verb","JSHU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	else
+		alert("Admin jumping disabled")
+
+/client/proc/jumptoship()
+	set category = "Admin"
+	set name = "Jump to Ship"
+
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
+		return
+
+	if(config.allow_admin_jump)
+		var/list/ships = list()
+		for(var/ship in SSshuttle.ships)
+			ships += ship
+		var/selection = input("Select ship to jump to.", "Admin Jumping", null, null) as null|anything in ships
+		if(!selection)
+			to_chat(src, "No ship selected.")
+			return
+		var/obj/effect/overmap/visitable/ship/ship = selection
+		if(src && src.mob && ship && ship.entry_points && ship.entry_points[1])
+			usr.on_mob_jump()
+			usr.forceMove(ship.entry_points[1].loc)
+			message_admins("[key_name_admin(usr)] jumped to ship [selection]", 1)
+			feedback_add_details("admin_verb","JSHI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	else
+		alert("Admin jumping disabled")
+
+/client/proc/jumptosector()
+	set category = "Admin"
+	set name = "Jump to Sector"
+
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_DEV))
+		return
+
+	if(config.allow_admin_jump)
+		var/list/sectors = list()
+		for(var/sector in SSshuttle.initialized_sectors)
+			sectors += sector
+		var/selection = input("Select sector to jump to.", "Admin Jumping", null, null) as null|anything in sectors
+		if(!selection)
+			to_chat(src, "No sector selected.")
+			return
+		var/obj/effect/overmap/visitable/sector/sector = selection
+		if(src && src.mob && sector && sector.map_z && sector.map_z[1])
+			var/mob/A = src.mob
+			A.on_mob_jump()
+			A.x = world.maxx/2
+			A.y = world.maxy/2
+			A.z = sector.map_z[1]
+			message_admins("[key_name_admin(usr)] jumped to sector [selection]", 1)
+			feedback_add_details("admin_verb","JSEC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	else
+		alert("Admin jumping disabled")
+
 /client/proc/jumptokey()
 	set category = "Admin"
 	set name = "Jump to Key"
diff --git a/html/changelogs/DreamySkrell-jump-to-verbs.yml b/html/changelogs/DreamySkrell-jump-to-verbs.yml
new file mode 100644
index 00000000000..ee4b662ba8b
--- /dev/null
+++ b/html/changelogs/DreamySkrell-jump-to-verbs.yml
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: DreamySkrell
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds verb: Jump To Z-Level."
+  - rscadd: "Adds verb: Jump To Ship."
+  - rscadd: "Adds verb: Jump To Shuttle."
+  - rscadd: "Adds verb: Jump To Sector."