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

Adds more harsher time locks and restrictions for multiple marine and shipside roles. #5760

Closed
wants to merge 31 commits into from
Closed

Adds more harsher time locks and restrictions for multiple marine and shipside roles. #5760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9bddf21
sg hours to 10
HumiliatedGoblin Feb 19, 2024
90838d1
spec hours 10
HumiliatedGoblin Feb 19, 2024
8c7f3b7
comtech 3 hours
HumiliatedGoblin Feb 19, 2024
43f845f
medic 3 squad 2 medic
HumiliatedGoblin Feb 19, 2024
8c993bb
tl 10 hours
HumiliatedGoblin Feb 19, 2024
8cc3380
adds leaders define
HumiliatedGoblin Feb 19, 2024
e0993c4
Update leader.dm
HumiliatedGoblin Feb 19, 2024
7ac35ee
Update leader.dm
HumiliatedGoblin Feb 19, 2024
452872d
oops mistype
HumiliatedGoblin Feb 19, 2024
b81fd6d
intel 10 hrs
HumiliatedGoblin Feb 19, 2024
d705b5b
yarr! adds 2 squad leaders
HumiliatedGoblin Feb 19, 2024
bd96daa
oop
HumiliatedGoblin Feb 19, 2024
e566246
yarr!
HumiliatedGoblin Feb 19, 2024
27af289
another typo!! D:
HumiliatedGoblin Feb 19, 2024
a6e1ad4
xo needs 10 command hour now :D
HumiliatedGoblin Feb 19, 2024
faca7fc
make so have more SL hours
HumiliatedGoblin Feb 19, 2024
b468502
make so more sl hours
HumiliatedGoblin Feb 19, 2024
4d16567
make so better true!
HumiliatedGoblin Feb 19, 2024
cb3b574
yippe1
HumiliatedGoblin Feb 19, 2024
6d55607
squad leader!
HumiliatedGoblin Feb 19, 2024
0002b78
dpctpr!
HumiliatedGoblin Feb 19, 2024
8dc0752
adds 2 mp hours to xo
HumiliatedGoblin Feb 19, 2024
8bfa661
forgot a comma
HumiliatedGoblin Feb 19, 2024
0ea8493
update engineer to have engineer hour
HumiliatedGoblin Feb 19, 2024
cff8047
lowers from 3 to 2 marine hourse
HumiliatedGoblin Feb 19, 2024
b00a295
makesmartgunner marine
HumiliatedGoblin Feb 20, 2024
1a54ea7
spec gets marine treatment too
HumiliatedGoblin Feb 20, 2024
e6e2535
Merge branch 'master' into master
HumiliatedGoblin Feb 20, 2024
3fce5f5
OOPS MISTYPE fixed
HumiliatedGoblin Feb 20, 2024
2e28775
updates marine thingy
HumiliatedGoblin Feb 20, 2024
30a8b1c
engineer!
HumiliatedGoblin Feb 20, 2024
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 @@ -21,6 +21,8 @@
#define JOB_SQUAD_SPECIALIST "Weapons Specialist"
#define JOB_SQUAD_TEAM_LEADER "Fireteam Leader"
#define JOB_SQUAD_SMARTGUN "Smartgunner"
#define JOB_SQUAD_LEADERS /datum/timelock/leaders
#define JOB_SQUAD_LEADERS_LIST list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER)
#define JOB_SQUAD_ROLES /datum/timelock/squad
#define JOB_SQUAD_ROLES_LIST list(JOB_SQUAD_MARINE, JOB_SQUAD_LEADER, JOB_SQUAD_ENGI, JOB_SQUAD_MEDIC, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_TEAM_LEADER)

Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/civilians/support/doctor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
return positions

AddTimelock(/datum/job/civilian/doctor, list(
JOB_MEDIC_ROLES = 1 HOURS
JOB_MEDIC_ROLES = 2 HOURS
))

/obj/effect/landmark/start/doctor
Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/command/auxiliary/crew_chief.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to assist</a> the pilot officer maintain the ship's dropship. You have authority only on the dropship, but you are expected to maintain order, as not to disrupt the pilot."

AddTimelock(/datum/job/command/crew_chief, list(
JOB_SQUAD_ROLES = 5 HOURS
JOB_SQUAD_ROLES = 5 HOURS,
JOB_MEDIC_ROLES = 2 HOURS
Comment on lines -13 to +14
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only change that I see necessary. Revert all other changes.

))

/obj/effect/landmark/start/crew_chief
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/command/auxiliary/intel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
return positions

AddTimelock(/datum/job/command/intel, list(
JOB_SQUAD_ROLES = 5 HOURS
JOB_SQUAD_ROLES = 10 HOURS
))

/obj/effect/landmark/start/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 @@ -11,7 +11,8 @@

// Dropship Roles is both PO and DCC combined to not force people to backtrack
AddTimelock(/datum/job/command/pilot, list(
JOB_DROPSHIP_ROLES = 2 HOURS
JOB_DROPSHIP_ROLES = 3 HOURS,
JOB_SQUAD_LEADERS = 2 HOURS
))

/obj/effect/landmark/start/pilot
Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/command/cic/executive.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
GLOB.marine_leaders -= JOB_XO

AddTimelock(/datum/job/command/executive, list(
JOB_COMMAND_ROLES = 5 HOURS,
JOB_COMMAND_ROLES = 10 HOURS,
JOB_POLICE_ROLES = 2 HOURS
))

/obj/effect/landmark/start/executive
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/command/cic/staffofficer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

AddTimelock(/datum/job/command/bridge, list(
JOB_SQUAD_LEADER = 1 HOURS,
JOB_HUMAN_ROLES = 15 HOURS
JOB_HUMAN_ROLES = 20 HOURS
))

/obj/effect/landmark/start/bridge
Expand Down
7 changes: 7 additions & 0 deletions code/game/jobs/job/marine/marine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,10 @@
/datum/timelock/squad/New(name, time_required, list/roles)
. = ..()
src.roles = JOB_SQUAD_ROLES_LIST

/datum/timelock/leaders
name = "Leaders"

/datum/timelock/leaders/New(name, time_required, list/roles)
. = ..()
src.roles = JOB_SQUAD_LEADERS_LIST
3 changes: 2 additions & 1 deletion code/game/jobs/job/marine/squad/engineer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
gear_preset = /datum/equipment_preset/wo/marine/engineer

AddTimelock(/datum/job/marine/engineer, list(
JOB_SQUAD_ROLES = 1 HOURS
JOB_SQUAD_ROLES = 2 HOURS,
JOB_ENGINEER_ROLES = 1 HOURS
))

/obj/effect/landmark/start/marine/engineer
Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/marine/squad/leader.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
gear_preset = /datum/equipment_preset/wo/marine/sl

AddTimelock(/datum/job/marine/leader, list(
JOB_SQUAD_ROLES = 10 HOURS
JOB_SQUAD_LEADERS = 3 HOURS,
JOB_SQUAD_ENGIE = 2 HOURS
))

/obj/effect/landmark/start/marine/leader
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/marine/squad/medic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
gear_preset = /datum/equipment_preset/wo/marine/medic

AddTimelock(/datum/job/marine/medic, list(
JOB_MEDIC_ROLES = 1 HOURS,
JOB_SQUAD_ROLES = 1 HOURS
JOB_MEDIC_ROLES = 2 HOURS,
JOB_SQUAD_ROLES = 2 HOURS
))

/obj/effect/landmark/start/marine/medic
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/marine/squad/smartgunner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
gear_preset = /datum/equipment_preset/wo/marine/sg

AddTimelock(/datum/job/marine/smartgunner, list(
JOB_SQUAD_ROLES = 5 HOURS
JOB_SQUAD_MARINE = 10 HOURS
))

/obj/effect/landmark/start/marine/smartgunner
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/marine/squad/specialist.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
gear_preset = /datum/equipment_preset/wo/marine/spec

AddTimelock(/datum/job/marine/specialist, list(
JOB_SQUAD_ROLES = 5 HOURS
JOB_SQUAD_MARINE = 10 HOURS
))

/obj/effect/landmark/start/marine/spec
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/marine/squad/tl.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
spawning_human.important_radio_channels += JTAC_FREQ

AddTimelock(/datum/job/marine/tl, list(
JOB_SQUAD_ROLES = 8 HOURS
JOB_SQUAD_ROLES = 10 HOURS
))

/obj/effect/landmark/start/marine/tl
Expand Down
Loading