Merge pull request #33652 from MoreRobustThanYou/teemwork

Renames /datum/objective_team to /datum/team

code/modules/admin/player_panel.dm

@@ -524,7 +524,7 @@
 
 		if(SSticker.mode.brother_teams.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Brothers</B></td><td></td><td></td></tr>"
-			for(var/datum/objective_team/brother_team/team in SSticker.mode.brother_teams)
+			for(var/datum/team/brother_team/team in SSticker.mode.brother_teams)
 				for(var/datum/mind/brother in team.members)
 					var/mob/M = brother.current
 					if(M)
@@ -611,7 +611,7 @@
 					dat += "<td><A href='?priv_msg=[blob.key]'>PM</A></td></tr>"
 			dat += "</table>"
 
-		
+
 		var/list/pirates = get_antagonists(/datum/antagonist/pirate)
 		if(pirates.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Pirates</B></td><td></td></tr>"

code/modules/admin/verbs/one_click_antag.dm

@@ -240,7 +240,7 @@
 
 		//Let's find the spawn locations
 		var/leader_chosen = FALSE
-		var/datum/objective_team/nuclear/nuke_team
+		var/datum/team/nuclear/nuke_team
 		for(var/mob/c in chosen)
 			var/mob/living/carbon/human/new_character=makeBody(c)
 			if(!leader_chosen)
@@ -308,13 +308,13 @@
 			//Assign antag status and the mission
 			SSticker.mode.traitors += Commando.mind
 			Commando.mind.special_role = "deathsquad"
-			
+
 			var/datum/objective/missionobj = new
 			missionobj.owner = Commando.mind
 			missionobj.explanation_text = mission
 			missionobj.completed = 1
 			Commando.mind.objectives += missionobj
-			
+
 			Commando.mind.add_antag_datum(/datum/antagonist/auto_custom)
 
 			//Greet the commando
@@ -363,13 +363,13 @@
 		//Assign antag status and the mission
 		SSticker.mode.traitors += newmob.mind
 		newmob.mind.special_role = "official"
-		
+
 		var/datum/objective/missionobj = new
 		missionobj.owner = newmob.mind
 		missionobj.explanation_text = mission
 		missionobj.completed = 1
 		newmob.mind.objectives += missionobj
-		
+
 		newmob.mind.add_antag_datum(/datum/antagonist/auto_custom)
 
 		if(CONFIG_GET(flag/enforce_human_authority))
@@ -471,7 +471,7 @@
 			//Assign antag status and the mission
 			SSticker.mode.traitors += ERTOperative.mind
 			ERTOperative.mind.special_role = "ERT"
-			
+
 			var/datum/objective/missionobj = new
 			missionobj.owner = ERTOperative.mind
 			missionobj.explanation_text = mission

code/modules/power/singularity/narsie.dm

@@ -50,7 +50,7 @@
 	var/list/all_cults = list()
 	for(var/datum/antagonist/cult/C in GLOB.antagonists)
 		all_cults |= C.cult_team
-	for(var/datum/objective_team/cult/T in all_cults)
+	for(var/datum/team/cult/T in all_cults)
 		deltimer(T.blood_target_reset_timer)
 		T.blood_target = src
 		var/datum/objective/eldergod/summon_objective = locate() in T.objectives