Upload files

code/modules/mob/dead/dead.dm

@@ -121,6 +121,9 @@ INITIALIZE_IMMEDIATE(/mob/dead)
 	if (isturf(T))
 		update_z(T.z)
 
+/mob/dead/auto_deadmin_on_login()
+	return
+
 /mob/dead/Logout()
 	update_z(null)
 	return ..()

code/modules/mob/living/silicon/login.dm

@@ -11,3 +11,10 @@
 		if(G)
 			mind.remove_antag_datum(G)
 	..()
+
+/mob/living/silicon/auto_deadmin_on_login()
+	if(!client?.holder)
+		return TRUE
+	if(CONFIG_GET(flag/auto_deadmin_silicons) || (client.prefs?.deadmin & DEADMIN_POSITION_SILICON))
+		return client.holder.auto_deadmin()
+	return ..()

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

@@ -140,6 +140,12 @@
 	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?.deadmin & DEADMIN_POSITION_SILICON))
+		return client.holder.auto_deadmin()
+	return ..()
 
 /mob/living/simple_animal/drone/death(gibbed)
 	..(gibbed)

code/modules/mob/login.dm

@@ -48,6 +48,7 @@
 			for(var/foo in client.player_details.post_login_callbacks)
 				var/datum/callback/CB = foo
 				CB.Invoke()
+			auto_deadmin_on_login()
 
 	mind?.hide_ckey = client?.prefs?.hide_ckey
 
@@ -56,3 +57,13 @@
 
 	if(has_field_of_vision && CONFIG_GET(flag/use_field_of_vision))
 		LoadComponent(/datum/component/field_of_vision, field_of_vision_type)
+
+/mob/proc/auto_deadmin_on_login() //return true if they're not an admin at the end.
+	if(!client?.holder)
+		return TRUE
+	if(CONFIG_GET(flag/auto_deadmin_players) || (client.prefs?.deadmin & DEADMIN_ALWAYS))
+		return client.holder.auto_deadmin()
+	if(mind.has_antag_datum(/datum/antagonist) && (CONFIG_GET(flag/auto_deadmin_antagonists) || client.prefs?.deadmin & DEADMIN_ANTAGONIST))
+		return client.holder.auto_deadmin()
+	if(job)
+		return SSjob.handle_auto_deadmin_roles(client, job)