Ports https://github.com/tgstation/tgstation/pull/44655/

code/modules/admin/admin_verbs.dm

@@ -62,7 +62,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
 	/client/proc/cmd_admin_check_player_exp, /* shows players by playtime */
 	/client/proc/toggle_combo_hud, // toggle display of the combination pizza antag and taco sci/med/eng hud
 	/client/proc/toggle_AI_interact, /*toggle admin ability to interact with machines as an AI*/
-	/client/proc/open_shuttle_manipulator, /* Opens shuttle manipulator UI */
+	/datum/admins/proc/open_shuttlepanel, /* Opens shuttle manipulator UI */
 	/client/proc/respawn_character,
 	/client/proc/secrets,
 	/client/proc/toggle_hear_radio,		/*allows admins to hide all radio output*/

code/modules/admin/verbs/randomverbs.dm

@@ -1058,13 +1058,6 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	var/datum/atom_hud/A = GLOB.huds[ANTAG_HUD_TRAITOR]
 	return A.hudusers[mob]
 
-/client/proc/open_shuttle_manipulator()
-	set category = "Admin"
-	set name = "Shuttle Manipulator"
-	set desc = "Opens the shuttle manipulator UI."
-
-	for(var/obj/machinery/shuttle_manipulator/M in GLOB.machines)
-		M.ui_interact(usr)
 
 /client/proc/run_weather()
 	set category = "Fun"

code/modules/admin/verbs/shuttlepanel.dm

@@ -0,0 +1,76 @@
+/datum/admins/proc/open_shuttlepanel()
+	set category = "Admin"
+	set name = "Shuttle Manipulator"
+	set desc = "Opens the shuttle manipulator UI."
+
+	if(!check_rights(R_ADMIN))
+		return
+
+	SSshuttle.ui_interact(usr)
+
+
+/obj/docking_port/mobile/proc/admin_fly_shuttle(mob/user)
+	var/list/options = list()
+
+	for(var/port in SSshuttle.stationary)
+		if (istype(port, /obj/docking_port/stationary/transit))
+			continue  // please don't do this
+		var/obj/docking_port/stationary/S = port
+		if (canDock(S) == SHUTTLE_CAN_DOCK)
+			options[S.name || S.id] = S
+
+	options += "--------"
+	options += "Infinite Transit"
+	options += "Delete Shuttle"
+	options += "Into The Sunset (delete & greentext 'escape')"
+
+	var/selection = input(user, "Select where to fly [name || id]:", "Fly Shuttle") as null|anything in options
+	if(!selection)
+		return
+
+	switch(selection)
+		if("Infinite Transit")
+			destination = null
+			mode = SHUTTLE_IGNITING
+			setTimer(ignitionTime)
+
+		if("Delete Shuttle")
+			if(alert(user, "Really delete [name || id]?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
+				return
+			jumpToNullSpace()
+
+		if("Into The Sunset (delete & greentext 'escape')")
+			if(alert(user, "Really delete [name || id] and greentext escape objectives?", "Delete Shuttle", "Cancel", "Really!") != "Really!")
+				return
+			intoTheSunset()
+
+		else
+			if(options[selection])
+				request(options[selection])
+
+/obj/docking_port/mobile/emergency/admin_fly_shuttle(mob/user)
+	return  // use the existing verbs for this
+
+/obj/docking_port/mobile/arrivals/admin_fly_shuttle(mob/user)
+	switch(alert(user, "Would you like to fly the arrivals shuttle once or change its destination?", "Fly Shuttle", "Fly", "Retarget", "Cancel"))
+		if("Cancel")
+			return
+		if("Fly")
+			return ..()
+
+	var/list/options = list()
+
+	for(var/port in SSshuttle.stationary)
+		if (istype(port, /obj/docking_port/stationary/transit))
+			continue  // please don't do this
+		var/obj/docking_port/stationary/S = port
+		if (canDock(S) == SHUTTLE_CAN_DOCK)
+			options[S.name || S.id] = S
+
+	var/selection = input(user, "Select the new arrivals destination:", "Fly Shuttle") as null|anything in options
+	if(!selection)
+		return
+	target_dock = options[selection]
+	if(!QDELETED(target_dock))
+		destination = target_dock
+

code/modules/shuttle/manipulator.dm

@@ -5,3 +5,8 @@
 		Two roads diverged in a wood, and I,\n\
 		I took the one less traveled by,\n\
 		And that has made all the difference."
+
+	icon = 'icons/obj/machines/shuttle_manipulator.dmi'
+	icon_state = "holograph_on"
+
+	density = TRUE