Merge branch 'master' into sensormap

code/__DEFINES/job.dm

@@ -78,6 +78,8 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
 #define JOB_DROPSHIP_CREW_CHIEF "Dropship Crew Chief"
 #define JOB_CREWMAN "Vehicle Crewman"
 #define JOB_INTEL "Intelligence Officer"
+#define JOB_DROPSHIP_ROLES   /datum/timelock/dropship
+#define JOB_DROPSHIP_ROLES_LIST   list(JOB_DROPSHIP_CREW_CHIEF, JOB_PILOT)
 #define JOB_AUXILIARY_ROLES    /datum/timelock/auxiliary
 #define JOB_AUXILIARY_ROLES_LIST   list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL)
 

code/game/jobs/job/command/auxiliary/pilot.dm

@@ -9,8 +9,9 @@
 	gear_preset = /datum/equipment_preset/uscm_ship/po
 	entry_message_body = "<a href='%WIKIPAGE%'>Your job is to fly, protect, and maintain the ship's dropship.</a> While you are an officer, your authority is limited to the dropship, where you have authority over the enlisted personnel. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason."
 
+// Dropship Roles is both PO and DCC combined to not force people to backtrack
 AddTimelock(/datum/job/command/pilot, list(
-	JOB_SQUAD_ROLES = 5 HOURS
+	JOB_DROPSHIP_ROLES = 2 HOURS
 ))
 
 /obj/effect/landmark/start/pilot

code/game/jobs/job/command/command.dm

@@ -26,4 +26,11 @@
 
 /datum/timelock/human/get_role_requirement(client/C)
 	return time_required - C.get_total_human_playtime()
+
+/datum/timelock/dropship
+	name = "Dropship Roles"
+
+/datum/timelock/dropship/New(name, time_required, list/roles)
+	. = ..()
+	src.roles = JOB_DROPSHIP_ROLES_LIST
 

html/changelogs/AutoChangeLog-pr-4488.yml

@@ -0,0 +1,4 @@
+author: "bostonthebear"
+delete-after: True
+changes:
+  - rscadd: "Changes pilot officer timelock from 5 hours as squad marine to 2 hours as DCC"