Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makes Dropship Pilot Two Dropship Crew Chief hours, instead of Five Marine squad hours. #4488

Merged
merged 6 commits into from
Sep 26, 2023
Merged

Makes Dropship Pilot Two Dropship Crew Chief hours, instead of Five Marine squad hours. #4488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
846013f
makes pilot 5 dcc hours instead of squad hours
HumiliatedGoblin Sep 24, 2023
3c8fad5
as per biolocks request
HumiliatedGoblin Sep 24, 2023
318a86f
Creates Job_Dropship_Roles
HumiliatedGoblin Sep 24, 2023
0068ab0
Combines DCC and PO hours
HumiliatedGoblin Sep 24, 2023
23cfc00
Creates Job_Dropship_Roles
HumiliatedGoblin Sep 24, 2023
a5b86a6
Merge branch 'master' into patch-1
HumiliatedGoblin Sep 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/command/auxiliary/pilot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
gear_preset = /datum/equipment_preset/uscm_ship/po
entry_message_body = "<a href='"+URL_WIKI_PO_GUIDE+"'>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
Expand Down
7 changes: 7 additions & 0 deletions code/game/jobs/job/command/command.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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