From 21fa63b53303503dc65755cf7ecad5b6cd494671 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 31 Dec 2022 14:18:17 +1000 Subject: [PATCH] Fixes two admin bugs --- code/game/objects/items.dm | 2 +- code/modules/admin/admin.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d4df7c13a11..47d3843b7c9 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -417,7 +417,7 @@ var/list/global/slot_flags_enumeration = list( //Next check if the slot is accessible. var/mob/_user = disable_warning? null : H - if(!H.slot_is_accessible(slot, src, _user) && !ignore_obstruction) + if(!ignore_obstruction && !H.slot_is_accessible(slot, src, _user)) return 0 //Lastly, check special rules for the desired slot. diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 3d6297bd636..4d7f3491f26 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -741,7 +741,7 @@ var/datum/announcement/minor/admin_min_announcer = new /datum/admins/proc/toggleooc() set category = "Server" set desc="Globally Toggles OOC" - set name="Toggle OOC" + set name="Toggle Player OOC" if(!check_rights(R_ADMIN)) return @@ -757,7 +757,7 @@ var/datum/announcement/minor/admin_min_announcer = new /datum/admins/proc/togglelooc() set category = "Server" set desc="Globally Toggles LOOC" - set name="Toggle LOOC" + set name="Toggle Player LOOC" if(!check_rights(R_ADMIN)) return