From 7b3ab5fefaa8aaa627b3621e4348bc456dc08b8c Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 24 Aug 2024 19:41:23 +0100 Subject: [PATCH 1/2] defaults --- code/modules/admin/admin_verbs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index aa87f157173c..fd700fc0e605 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -73,11 +73,12 @@ GLOBAL_LIST_INIT(admin_verbs_default, list( /client/proc/cmd_mod_say, /* alternate way of typing asay, no different than cmd_admin_say */ /client/proc/cmd_admin_tacmaps_panel, /client/proc/other_records, + /datum/admins/proc/announce, /*priority announce something to all clients.*/ + /client/proc/toogle_door_control, )) GLOBAL_LIST_INIT(admin_verbs_admin, list( /datum/admins/proc/togglejoin, /*toggles whether people can join the current game*/ - /datum/admins/proc/announce, /*priority announce something to all clients.*/ /datum/admins/proc/view_game_log, /*shows the server game log (diary) for this round*/ /datum/admins/proc/view_attack_log, /*shows the server attack log for this round*/ /client/proc/giveruntimelog, /*allows us to give access to all runtime logs to somebody*/ @@ -154,7 +155,6 @@ GLOBAL_LIST_INIT(admin_verbs_major_event, list( /client/proc/set_autoreplacer, /client/proc/deactivate_autoreplacer, /client/proc/rerun_decorators, - /client/proc/toogle_door_control, /client/proc/map_template_load, /client/proc/load_event_level, /client/proc/cmd_fun_fire_ob, From 1de00106bf9d2299c09e931008a2102bb2c30e9d Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 25 Aug 2024 16:18:59 +0100 Subject: [PATCH 2/2] shuttle manipulator --- code/modules/admin/admin_verbs.dm | 9 +++++---- code/modules/admin/tabs/event_tab.dm | 2 +- code/modules/admin/verbs/shuttlepanel.dm | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index fd700fc0e605..2270685c0cf6 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -73,12 +73,11 @@ GLOBAL_LIST_INIT(admin_verbs_default, list( /client/proc/cmd_mod_say, /* alternate way of typing asay, no different than cmd_admin_say */ /client/proc/cmd_admin_tacmaps_panel, /client/proc/other_records, - /datum/admins/proc/announce, /*priority announce something to all clients.*/ - /client/proc/toogle_door_control, )) GLOBAL_LIST_INIT(admin_verbs_admin, list( /datum/admins/proc/togglejoin, /*toggles whether people can join the current game*/ + /datum/admins/proc/announce, /*priority announce something to all clients.*/ /datum/admins/proc/view_game_log, /*shows the server game log (diary) for this round*/ /datum/admins/proc/view_attack_log, /*shows the server attack log for this round*/ /client/proc/giveruntimelog, /*allows us to give access to all runtime logs to somebody*/ @@ -94,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( @@ -144,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( @@ -155,6 +154,7 @@ GLOBAL_LIST_INIT(admin_verbs_major_event, list( /client/proc/set_autoreplacer, /client/proc/deactivate_autoreplacer, /client/proc/rerun_decorators, + /client/proc/toogle_door_control, /client/proc/map_template_load, /client/proc/load_event_level, /client/proc/cmd_fun_fire_ob, @@ -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)