diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 2c0021dfa4..54ddd8894b 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -247,6 +247,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
//send this msg to all admins
for(var/client/X in GLOB.admins)
+ if(!check_rights(R_ADMIN, 0, X))
+ continue
if(X.is_preference_enabled(/datum/client_preference/holder/play_adminhelp_ping))
X << 'sound/effects/adminhelp.ogg'
window_flash(X)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 592b20b358..4dbc2a2307 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -5,7 +5,7 @@
/client/proc/cmd_admin_pm_context(mob/M in mob_list)
set category = null
set name = "Admin PM Mob"
- if(!holder)
+ if(!check_rights(R_ADMIN))
to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.")
return
if( !ismob(M) || !M.client )
@@ -17,7 +17,7 @@
/client/proc/cmd_admin_pm_panel()
set category = "Admin"
set name = "Admin PM"
- if(!holder)
+ if(!check_rights(R_ADMIN))
to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.")
return
var/list/client/targets[0]
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 308cc34d5a..4fa7f2862c 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -12,7 +12,7 @@
log_adminsay(msg,src)
for(var/client/C in GLOB.admins)
- if(check_rights(R_ADMIN))
+ if(check_rights(R_ADMIN, 0, C))
to_chat(C, "" + create_text_tag("admin", "ADMIN:", C) + " [key_name(usr, 1)]([admin_jump_link(mob, src)]): [msg]")
feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm
index 8892eba4cc..c3e386cb4c 100644
--- a/code/modules/client/preference_setup/vore/02_size.dm
+++ b/code/modules/client/preference_setup/vore/02_size.dm
@@ -206,7 +206,7 @@
return TOPIC_REFRESH
else if(href_list["voice_test"])
- var/sound/S = pick(pref.voice_sound)
+ var/sound/S
switch(pref.voice_sound)
if("beep-boop")
S = sound(pick(talk_sound))
@@ -236,8 +236,9 @@
S = sound(pick(goon_speak_roach_sound))
if("goon speak skelly")
S = sound(pick(goon_speak_skelly_sound))
- S.frequency = pick(pref.voice_freq)
- S.volume = 50
- SEND_SOUND(user, S)
+ if(S)
+ S.frequency = pick(pref.voice_freq)
+ S.volume = 50
+ SEND_SOUND(user, S)
return ..();