From 9bddf21bbc0bd8ee69c009d76e90ca0f404d914d Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:12:31 +1300 Subject: [PATCH 01/30] sg hours to 10 --- code/game/jobs/job/marine/squad/smartgunner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index 1a89abf5d3be..70beb5dad283 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -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_ROLES = 10 HOURS )) /obj/effect/landmark/start/marine/smartgunner From 90838d1d52b808aab2dd40f0b3cb1364e562fb58 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:12:55 +1300 Subject: [PATCH 02/30] spec hours 10 --- code/game/jobs/job/marine/squad/specialist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index e69241cdc70b..38e6581ee71a 100644 --- a/code/game/jobs/job/marine/squad/specialist.dm +++ b/code/game/jobs/job/marine/squad/specialist.dm @@ -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_ROLES = 10 HOURS )) /obj/effect/landmark/start/marine/spec From 8c7f3b76b18104fd057ae108df9b492754624282 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:15:03 +1300 Subject: [PATCH 03/30] comtech 3 hours --- code/game/jobs/job/marine/squad/engineer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm index a4422572f218..a7b8ff8d8a8b 100644 --- a/code/game/jobs/job/marine/squad/engineer.dm +++ b/code/game/jobs/job/marine/squad/engineer.dm @@ -33,7 +33,7 @@ gear_preset = /datum/equipment_preset/wo/marine/engineer AddTimelock(/datum/job/marine/engineer, list( - JOB_SQUAD_ROLES = 1 HOURS + JOB_SQUAD_ROLES = 3 HOURS )) /obj/effect/landmark/start/marine/engineer From 43f845fecee41c999792a9aeaee0ad46b40a3ac3 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:16:06 +1300 Subject: [PATCH 04/30] medic 3 squad 2 medic --- code/game/jobs/job/marine/squad/medic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index 450d1176658f..499eb945bb45 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -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 = 3 HOURS )) /obj/effect/landmark/start/marine/medic From 8c993bb25e69f2061ca49608fecb4720252611b4 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:16:30 +1300 Subject: [PATCH 05/30] tl 10 hours --- code/game/jobs/job/marine/squad/tl.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index 2b0cff3ea3ed..1fd14585b1d0 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.dm @@ -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 From 8cc3380175f12bd811fcc1b3cd61f18cfd9cf789 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:25:22 +1300 Subject: [PATCH 06/30] adds leaders define --- code/__DEFINES/job.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index ad3b9fe3af32..1119dafdb917 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -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(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) From e0993c4814cfee95d97e178ad2e2c10e463a3f89 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:26:30 +1300 Subject: [PATCH 07/30] Update leader.dm --- code/game/jobs/job/marine/squad/leader.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index be78438db3d6..e14fc9da46d3 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -13,7 +13,7 @@ gear_preset = /datum/equipment_preset/wo/marine/sl AddTimelock(/datum/job/marine/leader, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_LEADERS = 5 HOURS )) /obj/effect/landmark/start/marine/leader From 7ac35eef7e8203090640e711285c4e7ecac446e2 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:27:27 +1300 Subject: [PATCH 08/30] Update leader.dm --- code/game/jobs/job/marine/squad/leader.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index e14fc9da46d3..da56b3dbb167 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -13,7 +13,8 @@ gear_preset = /datum/equipment_preset/wo/marine/sl AddTimelock(/datum/job/marine/leader, list( - JOB_SQUAD_LEADERS = 5 HOURS + JOB_SQUAD_LEADERS = 5 HOURS, + JOB_SQUAD_ENGINEER = 3 HOURS )) /obj/effect/landmark/start/marine/leader From 452872daf9abbeb26b6667a9d4e0963a9f81a4d2 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:28:11 +1300 Subject: [PATCH 09/30] oops mistype --- code/game/jobs/job/marine/squad/leader.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index da56b3dbb167..6494d72418ee 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -14,7 +14,7 @@ AddTimelock(/datum/job/marine/leader, list( JOB_SQUAD_LEADERS = 5 HOURS, - JOB_SQUAD_ENGINEER = 3 HOURS + JOB_SQUAD_ENGIE = 2 HOURS )) /obj/effect/landmark/start/marine/leader From b81fd6d4f529323e6b2e792d51cc3dff3ccf55d6 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:34:49 +1300 Subject: [PATCH 10/30] intel 10 hrs --- code/game/jobs/job/command/auxiliary/intel.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 9905bc9d3747..c1e3e173f563 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/code/game/jobs/job/command/auxiliary/intel.dm @@ -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 From d705b5b93aa1842743ddf3384825e0cdacdccb5b Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:44:20 +1300 Subject: [PATCH 11/30] yarr! adds 2 squad leaders --- 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 1a7a7c21d5a0..50e62c5818dd 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -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 )) /obj/effect/landmark/start/pilot From bd96daac2ad56d0eb1bf39ab3eff858c0538550c Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:44:33 +1300 Subject: [PATCH 12/30] oop --- 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 50e62c5818dd..1c15d3a34b0b 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -12,7 +12,7 @@ // Dropship Roles is both PO and DCC combined to not force people to backtrack AddTimelock(/datum/job/command/pilot, list( JOB_DROPSHIP_ROLES = 3 HOURS, - JOB_SQUAD_LEADERS = 2 + JOB_SQUAD_LEADERS = 2 HOURS )) /obj/effect/landmark/start/pilot From e5662460a100cd040efa73167c2bc667e8b9a0e3 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:45:51 +1300 Subject: [PATCH 13/30] yarr! --- code/game/jobs/job/command/auxiliary/crew_chief.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index 0770bcd60ffa..a878d5255c82 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -10,7 +10,8 @@ entry_message_body = "Your job is to assist 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_SQUAD_MEDIC = 2 HOURS )) /obj/effect/landmark/start/crew_chief From 27af289d27708852c56991581d645a5ec8699606 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:49:21 +1300 Subject: [PATCH 14/30] another typo!! D: --- code/game/jobs/job/command/auxiliary/crew_chief.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm index a878d5255c82..a43c3ce8fdc6 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -11,7 +11,7 @@ AddTimelock(/datum/job/command/crew_chief, list( JOB_SQUAD_ROLES = 5 HOURS, - JOB_SQUAD_MEDIC = 2 HOURS + JOB_MEDIC_ROLES = 2 HOURS )) /obj/effect/landmark/start/crew_chief From a6e1ad403280b11eb2d1c47095826e5dc7d8549a Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:54:30 +1300 Subject: [PATCH 15/30] xo needs 10 command hour now :D --- code/game/jobs/job/command/cic/executive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index f717a03e1229..33e9708a9e39 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -18,7 +18,7 @@ GLOB.marine_leaders -= JOB_XO AddTimelock(/datum/job/command/executive, list( - JOB_COMMAND_ROLES = 5 HOURS, + JOB_COMMAND_ROLES = 10 HOURS )) /obj/effect/landmark/start/executive From faca7fc8f0dd183759b7e416d5ebaa39e1b2db54 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:02:48 +1300 Subject: [PATCH 16/30] make so have more SL hours --- code/game/jobs/job/command/cic/staffofficer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 94769de2158f..9a04e124922f 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -27,8 +27,8 @@ return ..() AddTimelock(/datum/job/command/bridge, list( - JOB_SQUAD_LEADER = 1 HOURS, - JOB_HUMAN_ROLES = 15 HOURS + JOB_SQUAD_LEADER = 5 HOURS, + JOB_HUMAN_ROLES = 10 HOURS )) /obj/effect/landmark/start/bridge From b468502feddd15ef49b6bbd0a07981310afa026d Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:03:51 +1300 Subject: [PATCH 17/30] make so more sl hours --- code/game/jobs/job/command/cic/staffofficer.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 9a04e124922f..7f6772f5bc93 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -27,8 +27,7 @@ return ..() AddTimelock(/datum/job/command/bridge, list( - JOB_SQUAD_LEADER = 5 HOURS, - JOB_HUMAN_ROLES = 10 HOURS + JOB_SQUAD_LEADER = 5 HOURS )) /obj/effect/landmark/start/bridge From 4d16567fa5a8f042d2207a861ded00a03fbbd03f Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:04:48 +1300 Subject: [PATCH 18/30] make so better true! --- code/game/jobs/job/command/cic/staffofficer.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 7f6772f5bc93..94769de2158f 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -27,7 +27,8 @@ return ..() AddTimelock(/datum/job/command/bridge, list( - JOB_SQUAD_LEADER = 5 HOURS + JOB_SQUAD_LEADER = 1 HOURS, + JOB_HUMAN_ROLES = 15 HOURS )) /obj/effect/landmark/start/bridge From cb3b574b72400d19224137ad061740f3659bf614 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:05:05 +1300 Subject: [PATCH 19/30] yippe1 --- code/game/jobs/job/command/cic/staffofficer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 94769de2158f..84f0337bd5d8 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -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 From 6d55607ab62bf8ffa189e8965a7b917d134890b8 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:05:56 +1300 Subject: [PATCH 20/30] squad leader! --- code/game/jobs/job/marine/squad/leader.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index 6494d72418ee..3feaf9b43da2 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -13,7 +13,7 @@ gear_preset = /datum/equipment_preset/wo/marine/sl AddTimelock(/datum/job/marine/leader, list( - JOB_SQUAD_LEADERS = 5 HOURS, + JOB_SQUAD_LEADERS = 3 HOURS, JOB_SQUAD_ENGIE = 2 HOURS )) From 0002b784bab1e1f6b24563c2fa46212b71acf04f Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:10:17 +1300 Subject: [PATCH 21/30] dpctpr! --- code/game/jobs/job/civilians/support/doctor.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/civilians/support/doctor.dm b/code/game/jobs/job/civilians/support/doctor.dm index 9e0853d96e33..73f1cb82fa23 100644 --- a/code/game/jobs/job/civilians/support/doctor.dm +++ b/code/game/jobs/job/civilians/support/doctor.dm @@ -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 From 8dc0752233ae959e6bc44dd41af1f871529f0868 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:18:02 +1300 Subject: [PATCH 22/30] adds 2 mp hours to xo --- code/game/jobs/job/command/cic/executive.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index 33e9708a9e39..75d5aca69c81 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -19,6 +19,7 @@ AddTimelock(/datum/job/command/executive, list( JOB_COMMAND_ROLES = 10 HOURS + JOB_POLICE_ROLES = 2 HOURS )) /obj/effect/landmark/start/executive From 8bfa661dc1e26015a3a00480696945f8e5278d1c Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:18:14 +1300 Subject: [PATCH 23/30] forgot a comma --- code/game/jobs/job/command/cic/executive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index 75d5aca69c81..2630313c6b49 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/code/game/jobs/job/command/cic/executive.dm @@ -18,7 +18,7 @@ GLOB.marine_leaders -= JOB_XO AddTimelock(/datum/job/command/executive, list( - JOB_COMMAND_ROLES = 10 HOURS + JOB_COMMAND_ROLES = 10 HOURS, JOB_POLICE_ROLES = 2 HOURS )) From 0ea849326afe951f4128dafd5c93a05c9cb2cba4 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:40:21 +1300 Subject: [PATCH 24/30] update engineer to have engineer hour --- code/game/jobs/job/marine/squad/engineer.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm index a7b8ff8d8a8b..ae4666e2c378 100644 --- a/code/game/jobs/job/marine/squad/engineer.dm +++ b/code/game/jobs/job/marine/squad/engineer.dm @@ -33,7 +33,8 @@ gear_preset = /datum/equipment_preset/wo/marine/engineer AddTimelock(/datum/job/marine/engineer, list( - JOB_SQUAD_ROLES = 3 HOURS + JOB_SQUAD_ROLES = 2 HOURS, + JOB_ENGINEER_ROLES = 1 HOUR )) /obj/effect/landmark/start/marine/engineer From cff8047235904de84a2dfd50a4d231a7f54accc5 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:45:06 +1300 Subject: [PATCH 25/30] lowers from 3 to 2 marine hourse --- code/game/jobs/job/marine/squad/medic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm index 499eb945bb45..131eeceb01cd 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -34,7 +34,7 @@ AddTimelock(/datum/job/marine/medic, list( JOB_MEDIC_ROLES = 2 HOURS, - JOB_SQUAD_ROLES = 3 HOURS + JOB_SQUAD_ROLES = 2 HOURS )) /obj/effect/landmark/start/marine/medic From b00a2953f9e24ce2aa9ab6bdd3fb0edb5777cf9a Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:52:38 +1300 Subject: [PATCH 26/30] makesmartgunner marine --- code/game/jobs/job/marine/squad/smartgunner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index 70beb5dad283..23f19f8a87b2 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -29,7 +29,7 @@ gear_preset = /datum/equipment_preset/wo/marine/sg AddTimelock(/datum/job/marine/smartgunner, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_MARINE = 10 HOURS )) /obj/effect/landmark/start/marine/smartgunner From 1a54ea7d161550305d50553e1cfc1f6b04663773 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 14:53:00 +1300 Subject: [PATCH 27/30] spec gets marine treatment too --- code/game/jobs/job/marine/squad/specialist.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index 38e6581ee71a..5a73933e4134 100644 --- a/code/game/jobs/job/marine/squad/specialist.dm +++ b/code/game/jobs/job/marine/squad/specialist.dm @@ -30,7 +30,7 @@ gear_preset = /datum/equipment_preset/wo/marine/spec AddTimelock(/datum/job/marine/specialist, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_MARINE = 10 HOURS )) /obj/effect/landmark/start/marine/spec From 3fce5f5d1697b3070c323141822dccaa498f1372 Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 20:14:24 +1300 Subject: [PATCH 28/30] OOPS MISTYPE fixed --- code/__DEFINES/job.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 1119dafdb917..0a790e8547c2 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -22,7 +22,7 @@ #define JOB_SQUAD_TEAM_LEADER "Fireteam Leader" #define JOB_SQUAD_SMARTGUN "Smartgunner" #define JOB_SQUAD_LEADERS /datum/timelock/leaders -#define JOB_SQUAD_LEADERS list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER) +#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) From 2e28775c76d92c0bb718b33a91641155808a63ed Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 20:28:57 +1300 Subject: [PATCH 29/30] updates marine thingy --- code/game/jobs/job/marine/marine.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/game/jobs/job/marine/marine.dm b/code/game/jobs/job/marine/marine.dm index e07c1edd3138..0e12421be813 100644 --- a/code/game/jobs/job/marine/marine.dm +++ b/code/game/jobs/job/marine/marine.dm @@ -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 From 30a8b1c161439de55212922806d3ccfd6900e69b Mon Sep 17 00:00:00 2001 From: HumiliatedGoblin <87675952+HumiliatedGoblin@users.noreply.github.com> Date: Tue, 20 Feb 2024 20:33:06 +1300 Subject: [PATCH 30/30] engineer! --- code/game/jobs/job/marine/squad/engineer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm index ae4666e2c378..7bc38b9502b7 100644 --- a/code/game/jobs/job/marine/squad/engineer.dm +++ b/code/game/jobs/job/marine/squad/engineer.dm @@ -34,7 +34,7 @@ AddTimelock(/datum/job/marine/engineer, list( JOB_SQUAD_ROLES = 2 HOURS, - JOB_ENGINEER_ROLES = 1 HOUR + JOB_ENGINEER_ROLES = 1 HOURS )) /obj/effect/landmark/start/marine/engineer