From 846013fb1e3111eeaf635a6356ea9ba5b543e614 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Sun, 24 Sep 2023 19:50:34 +1300 Subject: [PATCH 1/5] makes pilot 5 dcc hours instead of squad hours https://media.discordapp.net/attachments/604397850675380234/1155395437256249354/image_4.png I'm tired of new pilots who don't even read the guide only do direct firing without a laser detector, wipe the front with six minis, and don't even apologize afterwards. this ends now. --- code/game/jobs/job/command/auxiliary/pilot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index 57495fe8be28..946e7bd6f691 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -10,7 +10,7 @@ entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. 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." AddTimelock(/datum/job/command/pilot, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_DROPSHIP_CREW_CHIEF = 5 HOURS )) /obj/effect/landmark/start/pilot From 3c8fad583ed244f4105b8b895cc63653208ef633 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Sun, 24 Sep 2023 20:21:08 +1300 Subject: [PATCH 2/5] as per biolocks request changes from 5 - 2. anything for morrow. --- code/game/jobs/job/command/auxiliary/pilot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index 946e7bd6f691..d692f46bff9a 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -10,7 +10,7 @@ entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. 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." AddTimelock(/datum/job/command/pilot, list( - JOB_DROPSHIP_CREW_CHIEF = 5 HOURS + JOB_DROPSHIP_CREW_CHIEF = 2 HOURS )) /obj/effect/landmark/start/pilot From 318a86fd33b9d0c08feb709549f895b331566ae2 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 25 Sep 2023 01:55:12 +1300 Subject: [PATCH 3/5] Creates Job_Dropship_Roles --- code/__DEFINES/job.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index d80c3b5bb23b..9600adcd96da 100644 --- a/code/__DEFINES/job.dm +++ b/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) From 0068ab0742366a75b240cd6fdb803cd16d71d40f Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 25 Sep 2023 01:56:04 +1300 Subject: [PATCH 4/5] Combines DCC and PO hours --- code/game/jobs/job/command/auxiliary/pilot.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index d692f46bff9a..2f34937d0a2e 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -9,8 +9,9 @@ gear_preset = /datum/equipment_preset/uscm_ship/po entry_message_body = "Your job is to fly, protect, and maintain the ship's dropship. 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_DROPSHIP_CREW_CHIEF = 2 HOURS + JOB_DROPSHIP_ROLES = 2 HOURS )) /obj/effect/landmark/start/pilot From 23cfc007b85c7f44869efe3fa1ee682a01e7f17e Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 25 Sep 2023 01:56:55 +1300 Subject: [PATCH 5/5] Creates Job_Dropship_Roles --- code/game/jobs/job/command/command.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/jobs/job/command/command.dm b/code/game/jobs/job/command/command.dm index b95ddfe9d33c..d430352d6e83 100644 --- a/code/game/jobs/job/command/command.dm +++ b/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