Merge pull request #15343 from SandPoot/deadmin-prefs

Ports Automatic Deadminning from TG
2022-04-15 17:44:55 -07:00
parent 9b5c7ae313 e9637bb688
commit 73d39db3c1
24 changed files with 132 additions and 23 deletions
@@ -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 ..()
@@ -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)