[admin] Revamp auto deadmin

code/__DEFINES/preferences.dm

@@ -22,6 +22,7 @@
 #define DEADMIN_POSITION_HEAD	(1<<18)
 #define DEADMIN_POSITION_SECURITY	(1<<19)
 #define DEADMIN_POSITION_SILICON	(1<<20)
+#define DEADMIN_POSITION_CRITICAL	(1<<21)
 
 #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS|SOUND_JUKEBOX)
 

code/controllers/configuration/entries/general.dm

@@ -20,6 +20,11 @@
 /datum/config_entry/flag/auto_deadmin_security
 	protection = CONFIG_ENTRY_LOCKED
 
+/datum/config_entry/flag/auto_deadmin_critical
+	protection = CONFIG_ENTRY_LOCKED
+
+/datum/config_entry/number/auto_deadmin_threshold
+	protection = CONFIG_ENTRY_LOCKED
 
 /datum/config_entry/string/servername	// server name (the name of the game window)
 

code/controllers/subsystem/job.dm

@@ -562,6 +562,8 @@ SUBSYSTEM_DEF(job)
 	var/datum/job/job = GetJob(rank)
 	if(!job)
 		return
+	if((job.auto_deadmin_role_flags & DEADMIN_POSITION_CRITICAL) && (CONFIG_GET(flag/auto_deadmin_critical) || (C.prefs?.toggles & DEADMIN_POSITION_CRITICAL)))
+		return C.holder.auto_deadmin()
 	if((job.auto_deadmin_role_flags & DEADMIN_POSITION_HEAD) && (CONFIG_GET(flag/auto_deadmin_heads) || (C.prefs?.toggles & DEADMIN_POSITION_HEAD)))
 		return C.holder.auto_deadmin()
 	else if((job.auto_deadmin_role_flags & DEADMIN_POSITION_SECURITY) && (CONFIG_GET(flag/auto_deadmin_security) || (C.prefs?.toggles & DEADMIN_POSITION_SECURITY)))

code/modules/admin/permissionedit.dm

@@ -291,6 +291,10 @@
 	D.deactivate() //after logs so the deadmined admin can see the message.
 
 /datum/admins/proc/auto_deadmin()
+	if(GLOB.admins.len < CONFIG_GET(number/auto_deadmin_threshold))
+		log_admin("[owner] auto-deadmin failed due to low admin count.")
+		to_chat(owner, span_userdanger("You have not be auto-deadminned due to lack of admins on the server, you can still deadmin manually."))
+		return FALSE
 	to_chat(owner, span_interface("You are now a normal player."))
 	var/old_owner = owner
 	deactivate()

code/modules/client/preferences.dm

@@ -801,6 +801,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						else
 							dat += "<b>As Silicon:</b> FORCED<br>"
 
+						if(!CONFIG_GET(flag/auto_deadmin_critical))
+							dat += "<b>As Critical Roles:</b> <a href = '?_src_=prefs;preference=toggle_deadmin_critical'>[(toggles & DEADMIN_POSITION_CRITICAL)?"Deadmin":"Keep Admin"]</a><br>"
+						else
+							dat += "<b>As Critical Roles:</b> FORCED<br>"
+
 				dat += "</td>"
 			dat += "</tr></table>"
 		// yogs start - Donor features
@@ -1828,6 +1833,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					toggles ^= DEADMIN_POSITION_SECURITY
 				if("toggle_deadmin_silicon")
 					toggles ^= DEADMIN_POSITION_SILICON
+				if("toggle_deadmin_critical")
+					toggles ^= DEADMIN_POSITION_CRITICAL
 
 
 				if("be_special")

code/modules/jobs/job_types/ai.dm

@@ -1,7 +1,7 @@
 /datum/job/ai
 	title = "AI"
 	flag = AI_JF
-	auto_deadmin_role_flags = DEADMIN_POSITION_SILICON
+	auto_deadmin_role_flags = DEADMIN_POSITION_SILICON|DEADMIN_POSITION_CRITICAL
 	department_flag = ENGSEC
 	faction = "Station"
 	total_positions = 1

code/modules/jobs/job_types/captain.dm

@@ -1,7 +1,7 @@
 /datum/job/captain
 	title = "Captain"
 	flag = CAPTAIN
-	auto_deadmin_role_flags = DEADMIN_POSITION_HEAD|DEADMIN_POSITION_SECURITY
+	auto_deadmin_role_flags = DEADMIN_POSITION_HEAD|DEADMIN_POSITION_SECURITY|DEADMIN_POSITION_CRITICAL
 	department_head = list("CentCom")
 	department_flag = ENGSEC
 	faction = "Station"

code/modules/jobs/job_types/head_of_security.dm

@@ -1,7 +1,7 @@
 /datum/job/hos
 	title = "Head of Security"
 	flag = HOS
-	auto_deadmin_role_flags = DEADMIN_POSITION_HEAD|DEADMIN_POSITION_SECURITY
+	auto_deadmin_role_flags = DEADMIN_POSITION_HEAD|DEADMIN_POSITION_SECURITY|DEADMIN_POSITION_CRITICAL
 	department_head = list("Captain")
 	department_flag = ENGSEC
 	head_announce = list(RADIO_CHANNEL_SECURITY)

code/modules/mob/living/simple_animal/friendly/drone/_drone.dm

@@ -142,13 +142,6 @@
 	if(!picked)
 		pickVisualAppearence()
 
-/mob/living/simple_animal/drone/auto_deadmin_on_login()
-	if(!client?.holder)
-		return TRUE
-	if(CONFIG_GET(flag/auto_deadmin_silicons) || (client.prefs?.toggles & DEADMIN_POSITION_SILICON))
-		return client.holder.auto_deadmin()
-	return ..()
-
 /mob/living/simple_animal/drone/death(gibbed)
 	..(gibbed)
 	if(internal_storage)

config/config.txt

@@ -322,7 +322,10 @@ MAPROTATIONCHANCEDELTA 1
 #AUTO_DEADMIN_HEADS
 #AUTO_DEADMIN_SECURITY
 #AUTO_DEADMIN_SILICONS
+#AUTO_DEADMIN_CRITICAL
 
+## The minimum nubmer of admins to allow for auto deadminning, includes the deadminning admin
+AUTO_DEADMIN_THRESHOLD 4
 
 ## CLIENT VERSION CONTROL
 ## This allows you to configure the minimum required client version, as well as a warning version, and message for both.