Merge pull request #10998 from Zuhayr/antagsystem

Antag system fixes.

code/modules/admin/admin.dm

@@ -1160,30 +1160,27 @@ proc/admin_notice(var/message, var/rights)
 
 	out += "<hr>"
 
-	if(ticker.mode.antag_tag)
-		out += "<b>Core antag id:</b>  <a href='?src=\ref[ticker.mode];debug_antag=[ticker.mode.antag_tag]'>[ticker.mode.antag_tag]</a>.</br>"
+	if(ticker.mode.antag_tags && ticker.mode.antag_tags.len)
+		out += "<b>Core antag templates:</b></br>"
+		for(var/antag_tag in ticker.mode.antag_tags)
+			out += "<a href='?src=\ref[ticker.mode];debug_antag=[antag_tag]'>[antag_tag]</a>.</br>"
 
 	if(ticker.mode.round_autoantag)
-		out += "<b>Autotraitor <a href='?src=\ref[ticker.mode];toggle=autotraitor'>enabled</a></b> ([ticker.mode.get_antag_prob()]% spawn chance)"
-		if(ticker.mode.antag_scaling_coeff)
+		out += "<b>Autotraitor <a href='?src=\ref[ticker.mode];toggle=autotraitor'>enabled</a></b>."
+		if(ticker.mode.antag_scaling_coeff > 0)
 			out += " (scaling with <a href='?src=\ref[ticker.mode];set=antag_scaling'>[ticker.mode.antag_scaling_coeff]</a>)"
+		else
+			out += " (not currently scaling, <a href='?src=\ref[ticker.mode];set=antag_scaling'>set a coefficient</a>)"
 		out += "<br/>"
 	else
 		out += "<b>Autotraitor <a href='?src=\ref[ticker.mode];toggle=autotraitor'>disabled</a></b>.<br/>"
 
 	out += "<b>All antag ids:</b>"
 	if(ticker.mode.antag_templates && ticker.mode.antag_templates.len).
-		var/playercount = ticker.mode.num_players()
 		for(var/datum/antagonist/antag in ticker.mode.antag_templates)
-			var/cur_max_antags
-			if(ticker.mode.antag_tag && antag.id == ticker.mode.antag_tag)
-				cur_max_antags = antag.max_antags_round
-			else
-				cur_max_antags = antag.max_antags
-			if(ticker.mode.antag_scaling_coeff)
-				cur_max_antags = Clamp((playercount/ticker.mode.antag_scaling_coeff), 1, cur_max_antags)
+			antag.update_current_antag_max()
 			out += " <a href='?src=\ref[ticker.mode];debug_antag=[antag.id]'>[antag.id]</a>"
-			out += " ([antag.get_antag_count()]/[cur_max_antags]) "
+			out += " ([antag.get_antag_count()]/[antag.cur_max]) "
 			out += " <a href='?src=\ref[ticker.mode];remove_antag_type=[antag.id]'>\[-\]</a><br/>"
 	else
 		out += " None."
@@ -1365,3 +1362,46 @@ proc/admin_notice(var/message, var/rights)
 	tomob.ckey = frommob.ckey
 	qdel(frommob)
 	return 1
+
+/datum/admins/proc/force_antag_latespawn()
+	set category = "Admin"
+	set name = "Force Template Spawn"
+	set desc = "Force an antagonist template to spawn."
+
+	if (!istype(src,/datum/admins))
+		src = usr.client.holder
+	if (!istype(src,/datum/admins))
+		usr << "Error: you are not an admin!"
+		return
+
+	if(!ticker || !ticker.mode)
+		usr << "Mode has not started."
+		return
+
+	var/antag_type = input("Choose a template.","Force Latespawn") as null|anything in all_antag_types
+	if(!antag_type || !all_antag_types[antag_type])
+		usr << "Aborting."
+		return
+
+	var/datum/antagonist/antag = all_antag_types[antag_type]
+	message_admins("[key_name(usr)] attempting to force latespawn with template [antag.id].")
+	antag.attempt_late_spawn()
+
+/datum/admins/proc/force_mode_latespawn()
+	set category = "Admin"
+	set name = "Force Mode Spawn"
+	set desc = "Force autotraitor to proc."
+
+	if (!istype(src,/datum/admins))
+		src = usr.client.holder
+	if (!istype(src,/datum/admins))
+		usr << "Error: you are not an admin!"
+		return
+
+	if(!ticker || !ticker.mode)
+		usr << "Mode has not started."
+		return
+
+	message_admins("[key_name(usr)] attempting to force mode latespawn.")
+	ticker.mode.next_spawn = 0
+	ticker.mode.try_latespawn()

code/modules/admin/admin_verbs.dm

@@ -16,6 +16,8 @@ var/list/admin_verbs_admin = list(
 	/client/proc/invisimin,				/*allows our mob to go invisible/visible*/
 //	/datum/admins/proc/show_traitor_panel,	/*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage
 	/datum/admins/proc/show_game_mode,  /*Configuration window for the current game mode.*/
+	/datum/admins/proc/force_mode_latespawn, /*Force the mode to try a latespawn proc*/
+	/datum/admins/proc/force_antag_latespawn, /*Force a specific template to try a latespawn proc*/
 	/datum/admins/proc/toggleenter,		/*toggles whether people can join the current game*/
 	/datum/admins/proc/toggleguests,	/*toggles whether guests can join the current game*/
 	/datum/admins/proc/announce,		/*priority announce something to all clients.*/

code/modules/client/preferences.dm

@@ -18,7 +18,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
 	"ninja" = "true",                                    // 10
 	"raider" = IS_MODE_COMPILED("heist"),                // 11
 	"diona" = 1,                                         // 12
-	"mutineer" = IS_MODE_COMPILED("mutiny"),             // 13
+	"loyalist" = IS_MODE_COMPILED("revolution"),         // 13
 	"pAI candidate" = 1, // -- TLE                       // 14
 )
 

code/modules/mob/living/simple_animal/borer/borer.dm

@@ -34,6 +34,11 @@
 /mob/living/simple_animal/borer/roundstart
 	roundstart = 1
 
+/mob/living/simple_animal/borer/Login()
+	..()
+	if(mind)
+		borers.add_antagonist(mind)
+
 /mob/living/simple_animal/borer/New()
 	..()
 
@@ -150,11 +155,7 @@
 	if(!host) return
 
 	if(host.mind)
-		//If they're not a proper traitor, reset their antag status.
-		if(host.mind.special_role == "Borer Thrall")
-			host << "<span class ='danger'>You are no longer an antagonist.</span>"
-			borers.hosts -= host.mind
-			host.mind.special_role = null
+		borers.remove_antagonist(host.mind)
 
 	src.loc = get_turf(host)
 

code/modules/mob/living/simple_animal/borer/borer_powers.dm

@@ -109,15 +109,9 @@
 
 		//Update their traitor status.
 		if(host.mind)
-			if(!host.mind.special_role)
-				borers.hosts |= host.mind
-				host.mind.special_role = "Borer Thrall"
-			host << "<span class='danger'>A creeping lassitude surrounds you. Your mind is being invaded by an alien intelligence and that's just fine.</span>"
-			host << "<span class = 'danger'>You are now a thrall to a cortical borer. Please listen to what they have to say; they're in your head.</span>"
-			show_generic_antag_text(host.mind)
+			borers.add_antagonist_mind(host.mind, 1, borers.faction_role_text, borers.faction_welcome)
 
 		if(istype(M,/mob/living/carbon/human))
-
 			var/mob/living/carbon/human/H = M
 			var/obj/item/organ/I = H.internal_organs_by_name["brain"]
 			if(!I) // No brain organ, so the borer moves in and replaces it permanently.