From fad7c01c5d74b3040ec89e34221092ff3417e180 Mon Sep 17 00:00:00 2001
From: forest2001 <41653574+realforest2001@users.noreply.github.com>
Date: Sun, 25 Aug 2024 16:47:20 +0100
Subject: [PATCH] Changes default verbs for staff (#7027)

# About the pull request

Gives all staff announcement and remote control verbs.

# Changelog
:cl:
admin: All staff now have Admin Announcement and Toggle Remote Control
verbs.
admin: Moved shuttle manipulator to minor event perms rather than admin.
code: Changed rights check on Toggle Remote Control and Shuttle
Manipulator to check for mod/minor event perms respectively, or debug.
/:cl:
---
 code/modules/admin/admin_verbs.dm        | 5 +++--
 code/modules/admin/tabs/event_tab.dm     | 2 +-
 code/modules/admin/verbs/shuttlepanel.dm | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index aa87f157173c..2270685c0cf6 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -93,8 +93,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, list(
 	/datum/admins/proc/admin_force_selfdestruct,
 	/client/proc/check_round_statistics,
 	/client/proc/force_teleporter,
-	/client/proc/matrix_editor,
-	/datum/admins/proc/open_shuttlepanel
+	/client/proc/matrix_editor
 ))
 
 GLOBAL_LIST_INIT(admin_verbs_ban, list(
@@ -143,6 +142,7 @@ GLOBAL_LIST_INIT(admin_verbs_minor_event, list(
 	/client/proc/toggle_hardcore_perma,
 	/client/proc/toggle_bypass_joe_restriction,
 	/client/proc/toggle_joe_respawns,
+	/datum/admins/proc/open_shuttlepanel
 ))
 
 GLOBAL_LIST_INIT(admin_verbs_major_event, list(
@@ -220,6 +220,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug, list(
 	/datum/admins/proc/view_href_log, /*shows the server HREF log for this round*/
 	/datum/admins/proc/view_tgui_log, /*shows the server TGUI log for this round*/
 	/client/proc/admin_blurb,
+	/datum/admins/proc/open_shuttlepanel,
 ))
 
 GLOBAL_LIST_INIT(admin_verbs_debug_advanced, list(
diff --git a/code/modules/admin/tabs/event_tab.dm b/code/modules/admin/tabs/event_tab.dm
index a155f2a37614..fa0f43780031 100644
--- a/code/modules/admin/tabs/event_tab.dm
+++ b/code/modules/admin/tabs/event_tab.dm
@@ -718,7 +718,7 @@
 	set name = "Toggle Remote Control"
 	set category = "Admin.Events"
 
-	if(!check_rights(R_SPAWN))
+	if(!check_rights(R_MOD|R_DEBUG))
 		return
 
 	remote_control = !remote_control
diff --git a/code/modules/admin/verbs/shuttlepanel.dm b/code/modules/admin/verbs/shuttlepanel.dm
index 9ae9cedd7992..72d69511aff6 100644
--- a/code/modules/admin/verbs/shuttlepanel.dm
+++ b/code/modules/admin/verbs/shuttlepanel.dm
@@ -3,7 +3,7 @@
 	set name = "Shuttle Manipulator"
 	set desc = "Opens the shuttle manipulator UI."
 
-	if(!check_rights(R_ADMIN|R_DEBUG|R_HOST))
+	if(!check_rights(R_EVENT|R_DEBUG|R_HOST))
 		return
 
 	SSshuttle.tgui_interact(usr)