Adds Pilot, Crew Chief, and Synth

Also adds a gear and bunk room for the Pilot and Crew Chief, as well as giving the Midway more seats and adding a Dropship Parts Printer.
cmss13-devs · Nov 5, 2023 · 1cac5c8 · 1cac5c8
1 parent 982d120
commit 1cac5c8
Show file tree

Hide file tree

Showing 7 changed files with 275 additions and 111 deletions.
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
@@ -138,7 +138,7 @@ var/global/list/ROLES_FACTION_CLASH = ROLES_USCM + JOB_PREDATOR
 
 
 var/global/list/ROLES_UNASSIGNED = list(JOB_SQUAD_MARINE)
-var/global/list/ROLES_AI = list(JOB_SO, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
+var/global/list/ROLES_AI = list(JOB_SO, JOB_SYNTH, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SQUAD_LEADER, JOB_SQUAD_MEDIC, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MARINE)
 var/global/list/ROLES_WO = list(JOB_WO_CO, JOB_WO_XO, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION, JOB_WO_CMO, JOB_WO_DOCTOR, JOB_WO_RESEARCHER, JOB_WO_SQUAD_MARINE, JOB_WO_SQUAD_MEDIC, JOB_WO_SQUAD_ENGINEER, JOB_WO_SQUAD_SMARTGUNNER, JOB_WO_SQUAD_SPECIALIST, JOB_WO_SQUAD_LEADER)
 //Role lists used for switch() checks in show_blurb_uscm(). Cosmetic, determines ex. "Engineering, USS Almayer", "2nd Bat. 'Falling Falcons'" etc.
 #define BLURB_USCM_COMBAT JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_SEA,\

diff --git a/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm b/code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
@@ -17,6 +17,9 @@
 
 	role_mappings = list(
 		/datum/job/command/bridge/ai = JOB_SO,
+		/datum/job/civilians/support/synthetic/ai = JOB_SYNTH,
+		/datum/job/command/auxiliary/pilot/ai = JOB_PILOT,
+		/datum/job/command/auxiliary/crew_chief/ai = JOB_DROPSHIP_CREW_CHIEF,
 		/datum/job/marine/leader/ai = JOB_SQUAD_LEADER,
 		/datum/job/marine/medic/ai = JOB_SQUAD_MEDIC,
 		/datum/job/marine/tl/ai = JOB_SQUAD_TEAM_LEADER,

diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm
@@ -50,3 +50,7 @@
 	name = JOB_SYNTH
 	icon_state = "syn_spawn"
 	job = /datum/job/civilian/synthetic
+
+/datum/job/civilians/support/synthetic/ai
+	total_positions = 1
+	spawn_positions = 1
diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm
@@ -3,7 +3,7 @@
 	total_positions = 2
 	spawn_positions = 2
 	allow_additional = TRUE
-	scaled = TRUE
+	scaled = FALSE
 	supervisors = "the pilot officers"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/dcc
@@ -17,3 +17,7 @@ AddTimelock(/datum/job/command/crew_chief, list(
 	name = JOB_DROPSHIP_CREW_CHIEF
 	icon_state = "dcc_spawn"
 	job = /datum/job/command/crew_chief
+
+/datum/job/command/auxiliary/crew_chief/ai
+	total_positions = 1
+	spawn_positions = 1
diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm
@@ -3,7 +3,7 @@
 	total_positions = 2
 	spawn_positions = 2
 	allow_additional = TRUE
-	scaled = TRUE
+	scaled = FALSE
 	supervisors = "the auxiliary support officer"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/po
@@ -18,3 +18,7 @@ AddTimelock(/datum/job/command/pilot, list(
 	name = JOB_PILOT
 	icon_state = "po_spawn"
 	job = /datum/job/command/pilot
+
+/datum/job/command/auxiliary/pilot/ai
+	total_positions = 1
+	spawn_positions = 1