diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 6beef525638..bd3f19ecf74 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -49,7 +49,7 @@ var/list/forum_groupids_to_ranks = list() if ("r_cciaa") . |= R_CCIAA if ("r_everything","r_host","r_all") - . |= (R_BUILDMODE | R_ADMIN | R_BAN | R_FUN | R_SERVER | R_DEBUG | R_PERMISSIONS | R_POSSESS | R_STEALTH | R_REJUVINATE | R_VAREDIT | R_SPAWN | R_MOD | R_CCIAA | R_DEV) + . |= (R_BUILDMODE | R_ADMIN | R_BAN | R_FUN | R_SERVER | R_DEBUG | R_PERMISSIONS | R_POSSESS | R_STEALTH | R_REJUVINATE | R_VAREDIT | R_SOUNDS | R_SPAWN | R_MOD | R_CCIAA | R_DEV) else crash_with("Unknown rank in file: [auth]") diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 659def78f66..be280f7ae66 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -3,7 +3,7 @@ var/list/sounds_cache = list() /client/proc/play_sound(S as sound) set category = "Fun" set name = "Play Global Sound" - if(!check_rights(R_FUN)) return + if(!check_rights(R_SOUNDS)) return var/sound/uploaded_sound = sound(S, repeat = 0, wait = 1, channel = 777) uploaded_sound.priority = 250 @@ -24,7 +24,7 @@ var/list/sounds_cache = list() /client/proc/play_local_sound(S as sound) set category = "Fun" set name = "Play Local Sound" - if(!check_rights(R_FUN)) return + if(!check_rights(R_SOUNDS)) return log_admin("[key_name(src)] played a local sound [S]") message_admins("[key_name_admin(src)] played a local sound [S]", 1) @@ -35,7 +35,7 @@ var/list/sounds_cache = list() /client/proc/play_server_sound() set category = "Fun" set name = "Play Server Sound" - if(!check_rights(R_FUN)) return + if(!check_rights(R_SOUNDS)) return var/list/sounds = file2list('sound/serversound_list.txt'); sounds += "--CANCEL--" diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index f9da0851755..6c9a310d5c6 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -923,13 +923,12 @@ ABSTRACT_TYPE(/obj/machinery/power/apc) if(!operable()) return FALSE var/use_flags = issilicon(user) && USE_ALLOW_NON_ADJACENT // AIs and borgs can use it at range - use_flags |= (check_rights(R_ADMIN, FALSE, user) && USE_ALLOW_NONLIVING) // admins can use the UI when ghosting - if(use_check(user, use_flags, show_messages = TRUE)) - return FALSE if(isstoryteller(user)) return TRUE if(isobserver(user)) return check_rights(R_ADMIN, FALSE, user) + if(use_check(user, use_flags, show_messages = TRUE)) + return FALSE if(!user.client) return FALSE if(user.restrained())