This squad code is literal ass

cmss13-devs · Oct 12, 2023 · 748c3eb · 748c3eb
1 parent 08dcd79
commit 748c3eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
@@ -16,7 +16,7 @@
 #define JOB_SQUAD_MARINE "Rifleman"
 #define JOB_SQUAD_LEADER "Platoon Sergeant"
 #define JOB_SQUAD_ENGI "Combat Technician"
-#define JOB_SQUAD_MEDIC "Hospital Corpsman"
+#define JOB_SQUAD_MEDIC "Platoon Corpsman"
 #define JOB_SQUAD_SPECIALIST "Weapons Specialist"
 #define JOB_SQUAD_TEAM_LEADER "Squad Sergeant"
 #define JOB_SQUAD_SMARTGUN "Smartgunner"

diff --git a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
@@ -6,7 +6,7 @@
 	flags_round_type = MODE_INFESTATION|MODE_NEW_SPAWN
 
 	var/list/squad_limit = list(
-		SQUAD_MARINE_1
+		/datum/squad/marine/alpha
 	)
 
 	var/list/objectives = list()
@@ -27,16 +27,22 @@
 	return ..()
 
 /datum/game_mode/colonialmarines/ai/pre_setup()
+
+	//Hacky pre-setup shit since RoleAuthority sucks
+	RoleAuthority.squads = list()
+	RoleAuthority.squads_by_type = list()
+	for(var/cycled_squad_type in squad_limit)
+		var/datum/squad/cycled_squad = new cycled_squad_type()
+		RoleAuthority.squads += cycled_squad
+		RoleAuthority.squads_by_type[cycled_squad.type] = cycled_squad
+
 	RegisterSignal(SSdcs, COMSIG_GLOB_XENO_SPAWN, PROC_REF(handle_xeno_spawn))
 
 	. = ..()
 
 /datum/game_mode/colonialmarines/ai/announce_bioscans()
 	return
 
-/datum/game_mode/colonialmarines/ai/declare_completion()
-	. = ..()
-
 /datum/game_mode/colonialmarines/ai/end_round_message()
 	return ..()
 

diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm
@@ -11,11 +11,11 @@
 	var/sub_leader
 
 /datum/squad_type/marine_squad
-	name = "Squad"
-	lead_name = "Squad Leader"
+	name = "Platoon"
+	lead_name = "Platoon Sergeant"
 	lead_icon = "leader"
-	sub_squad = "Fireteam"
-	sub_leader = "Fireteam Leader"
+	sub_squad = "Squad"
+	sub_leader = "Squad Sergeant"
 
 /datum/squad_type/marsoc_team
 	name = "Team"
@@ -70,7 +70,7 @@
 	var/faction = FACTION_MARINE
 
 	/// What will the assistant squad leader be called
-	var/squad_type = "Squad" //Referenced for aSL details. Squad/Team/Cell etc.
+	var/squad_type = "Platoon" //Referenced for aSL details. Squad/Team/Cell etc.
 	/// Squad leaders icon
 	var/lead_icon //Referenced for SL's 'L' icon. If nulled, won't override icon for aSLs.
 
@@ -476,7 +476,7 @@
 				var/old_lead = squad_leader
 				demote_squad_leader() //replaced by the real one
 				SStracking.start_tracking(tracking_id, old_lead)
-			assignment = squad_type + " Leader"
+			assignment = squad_type + " Sergeant"
 			squad_leader = M
 			SStracking.set_leader(tracking_id, M)
 			SStracking.start_tracking("marine_sl", M)