diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 5fb9d9447bb..28587a77e6a 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -17,7 +17,8 @@ #define ADMIN_IGNORE_CULT_GHOST (1<<21) #define SPLIT_ADMIN_TABS (1<<23) -#define TOGGLES_DEFAULT (SOUND_ADMINHELP|MEMBER_PUBLIC|SOUND_PRAYERS) +#define TOGGLES_DEADMIN_DEFAULT (DEADMIN_ANTAGONIST|DEADMIN_POSITION_HEAD|DEADMIN_POSITION_SECURITY|DEADMIN_POSITION_SILICON) +#define TOGGLES_DEFAULT (SOUND_ADMINHELP|MEMBER_PUBLIC|SOUND_PRAYERS|TOGGLES_DEADMIN_DEFAULT) // Legacy chat toggles. // !!! DO NOT ADD ANY NEW ONES HERE !!! diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm index 296b6fd2dd8..73987622202 100644 --- a/code/modules/admin/permissionedit.dm +++ b/code/modules/admin/permissionedit.dm @@ -300,7 +300,9 @@ ADMIN_VERB(edit_admin_permissions, R_PERMISSIONS, "Permissions Panel", "Edit adm D.deactivate() //after logs so the deadmined admin can see the message. /datum/admins/proc/auto_deadmin() - if (owner.prefs.read_preference(/datum/preference/toggle/bypass_deadmin_in_centcom) && is_centcom_level(owner.mob.z)) + if(owner.is_localhost()) + return FALSE + if(owner.prefs.read_preference(/datum/preference/toggle/bypass_deadmin_in_centcom) && is_centcom_level(owner.mob.z)) return FALSE to_chat(owner, span_interface("You are now a normal player."), confidential = TRUE)