diff --git a/code/game/jobs/job/antag/xeno/queen.dm b/code/game/jobs/job/antag/xeno/queen.dm
index 5702f9b1a6..62425e38b8 100644
--- a/code/game/jobs/job/antag/xeno/queen.dm
+++ b/code/game/jobs/job/antag/xeno/queen.dm
@@ -17,9 +17,3 @@
to_chat(new_queen, "Your job is to spread the hive.")
to_chat(new_queen, "You should start by building a hive core.")
to_chat(new_queen, "Talk in Hivemind using ; (e.g. ';Hello my children!')")
-
-AddTimelock(/datum/job/antag/xenos/queen, list(
- JOB_XENO_ROLES = 10 HOURS,
- JOB_DRONE_ROLES = 5 HOURS,
- JOB_T3_ROLES = 3 HOURS,
-))
diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm
index cbbb871249..d34c5fd6bc 100644
--- a/code/game/jobs/job/civilians/other/liaison.dm
+++ b/code/game/jobs/job/civilians/other/liaison.dm
@@ -22,7 +22,3 @@
name = JOB_CORPORATE_LIAISON
icon_state = "cl_spawn"
job = /datum/job/civilian/liaison
-
-AddTimelock(/datum/job/civilian/liaison, list(
- JOB_HUMAN_ROLES = 10 HOURS,
-))
diff --git a/code/game/jobs/job/civilians/other/reporter.dm b/code/game/jobs/job/civilians/other/reporter.dm
index c681768f93..d3883f4742 100644
--- a/code/game/jobs/job/civilians/other/reporter.dm
+++ b/code/game/jobs/job/civilians/other/reporter.dm
@@ -33,7 +33,3 @@ This could be the story of the sector! 'Brave Marines responding to dangerous di
/obj/effect/landmark/start/reporter
name = JOB_COMBAT_REPORTER
job = /datum/job/civilian/reporter
-
-AddTimelock(/datum/job/civilian/reporter, list(
- JOB_HUMAN_ROLES = 10 HOURS,
-))
diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm
index 07598483b8..685ca3d968 100644
--- a/code/game/jobs/job/civilians/other/survivors.dm
+++ b/code/game/jobs/job/civilians/other/survivors.dm
@@ -139,12 +139,6 @@
SSticker.mode.survivors_by_type_amounts[preferred_variant] += 1
-AddTimelock(/datum/job/civilian/survivor, list(
- JOB_SQUAD_ROLES = 5 HOURS,
- JOB_ENGINEER_ROLES = 5 HOURS,
- JOB_MEDIC_ROLES = 5 HOURS
-))
-
/datum/job/civilian/survivor/synth
title = JOB_SYNTH_SURVIVOR
selection_class = "job_synth"
diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm
index 835f16f7d8..930c1eb492 100644
--- a/code/game/jobs/job/civilians/support/cmo.dm
+++ b/code/game/jobs/job/civilians/support/cmo.dm
@@ -8,10 +8,6 @@
gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo
entry_message_body = "You're a commissioned officer of the USCM. You have authority over everything related to Medbay and Research, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall."
-AddTimelock(/datum/job/civilian/professor, list(
- JOB_MEDIC_ROLES = 10 HOURS
-))
-
/obj/effect/landmark/start/professor
name = JOB_CMO
icon_state = "cmo_spawn"
diff --git a/code/game/jobs/job/civilians/support/doctor.dm b/code/game/jobs/job/civilians/support/doctor.dm
index ff1b2146be..7c05985b23 100644
--- a/code/game/jobs/job/civilians/support/doctor.dm
+++ b/code/game/jobs/job/civilians/support/doctor.dm
@@ -51,10 +51,6 @@
total_positions_so_far = positions
return positions
-AddTimelock(/datum/job/civilian/doctor, list(
- JOB_MEDIC_ROLES = 1 HOURS
-))
-
/obj/effect/landmark/start/doctor
name = JOB_DOCTOR
icon_state = "doc_spawn"
diff --git a/code/game/jobs/job/civilians/support/nurse.dm b/code/game/jobs/job/civilians/support/nurse.dm
index 8912011298..1848dd9d93 100644
--- a/code/game/jobs/job/civilians/support/nurse.dm
+++ b/code/game/jobs/job/civilians/support/nurse.dm
@@ -12,7 +12,3 @@
name = JOB_NURSE
icon_state = "nur_spawn"
job = /datum/job/civilian/nurse
-
-AddTimelock(/datum/job/civilian/nurse, list(
- JOB_HUMAN_ROLES = 1 HOURS
-))
diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm
index 21163f2795..cd875cf550 100644
--- a/code/game/jobs/job/civilians/support/researcher.dm
+++ b/code/game/jobs/job/civilians/support/researcher.dm
@@ -27,10 +27,6 @@
total_positions_so_far = positions
return positions
-AddTimelock(/datum/job/civilian/researcher, list(
- JOB_MEDIC_ROLES = 5 HOURS
-))
-
/obj/effect/landmark/start/researcher
name = JOB_RESEARCHER
icon_state = "res_spawn"
diff --git a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
index 5f62930003..8adc20786a 100644
--- a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
+++ b/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
@@ -7,13 +7,6 @@
gear_preset = /datum/equipment_preset/uscm_ship/auxiliary_officer
entry_message_body = "Your job is to oversee the hangar crew, the intel officers, the engineering department, and requisition department. You have many responsibilities and a few plates to keep spinning but your subordinates are mostly self-reliant. Assist where you can and make sure command personnel are confident the auxiliary departments are operating at peak efficiency."
-AddTimelock(/datum/job/command/auxiliary_officer, list(
- JOB_SQUAD_ROLES = 5 HOURS,
- JOB_REQUISITION_ROLES = 5 HOURS,
- JOB_ENGINEER_ROLES = 5 HOURS,
- JOB_AUXILIARY_ROLES = 5 HOURS,
-))
-
/obj/effect/landmark/start/auxiliary_officer
name = JOB_AUXILIARY_OFFICER
job = /datum/job/command/auxiliary_officer
diff --git a/code/game/jobs/job/command/auxiliary/crew_chief.dm b/code/game/jobs/job/command/auxiliary/crew_chief.dm
index 0770bcd60f..9c2f7522b8 100644
--- a/code/game/jobs/job/command/auxiliary/crew_chief.dm
+++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm
@@ -9,10 +9,6 @@
gear_preset = /datum/equipment_preset/uscm_ship/dcc
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
-))
-
/obj/effect/landmark/start/crew_chief
name = JOB_DROPSHIP_CREW_CHIEF
icon_state = "dcc_spawn"
diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm
index 9905bc9d37..b216d40dff 100644
--- a/code/game/jobs/job/command/auxiliary/intel.dm
+++ b/code/game/jobs/job/command/auxiliary/intel.dm
@@ -23,10 +23,6 @@
total_positions_so_far = positions
return positions
-AddTimelock(/datum/job/command/intel, list(
- JOB_SQUAD_ROLES = 5 HOURS
-))
-
/obj/effect/landmark/start/intel
name = JOB_INTEL
icon_state = "io_spawn"
diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm
index 1a7a7c21d5..f03ef877d9 100644
--- a/code/game/jobs/job/command/auxiliary/pilot.dm
+++ b/code/game/jobs/job/command/auxiliary/pilot.dm
@@ -9,11 +9,6 @@
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_ROLES = 2 HOURS
-))
-
/obj/effect/landmark/start/pilot
name = JOB_PILOT
icon_state = "po_spawn"
diff --git a/code/game/jobs/job/command/auxiliary/senior.dm b/code/game/jobs/job/command/auxiliary/senior.dm
index 014db9569b..308279199e 100644
--- a/code/game/jobs/job/command/auxiliary/senior.dm
+++ b/code/game/jobs/job/command/auxiliary/senior.dm
@@ -27,16 +27,6 @@
return filtered_job_options
-AddTimelock(/datum/job/command/senior, list(
- JOB_SQUAD_ROLES = 15 HOURS,
-
- JOB_ENGINEER_ROLES = 10 HOURS,
- JOB_POLICE_ROLES = 10 HOURS,
- JOB_MEDIC_ROLES = 10 HOURS,
-
- JOB_COMMAND_ROLES = 5 HOURS,
-))
-
/obj/effect/landmark/start/senior
name = JOB_SEA
icon_state = "sea_spawn"
diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm
index f717a03e12..0407215829 100644
--- a/code/game/jobs/job/command/cic/executive.dm
+++ b/code/game/jobs/job/command/cic/executive.dm
@@ -17,10 +17,6 @@
SIGNAL_HANDLER
GLOB.marine_leaders -= JOB_XO
-AddTimelock(/datum/job/command/executive, list(
- JOB_COMMAND_ROLES = 5 HOURS,
-))
-
/obj/effect/landmark/start/executive
name = JOB_XO
icon_state = "xo_spawn"
diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
index 8e4e7c0cfa..c9c1cf7d8a 100644
--- a/code/game/jobs/job/command/cic/staffofficer.dm
+++ b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -39,9 +39,8 @@
else
gear_preset = initial(gear_preset)
-AddTimelock(/datum/job/command/bridge, list(
- JOB_SQUAD_LEADER = 1 HOURS,
- JOB_HUMAN_ROLES = 15 HOURS
+OverrideTimelock(/datum/job/command/bridge, list(
+ JOB_SQUAD_ROLES = 1 HOURS
))
/obj/effect/landmark/start/bridge
diff --git a/code/game/jobs/job/command/police/chief_police.dm b/code/game/jobs/job/command/police/chief_police.dm
index 63e6d8023f..3cec89ee64 100644
--- a/code/game/jobs/job/command/police/chief_police.dm
+++ b/code/game/jobs/job/command/police/chief_police.dm
@@ -6,11 +6,6 @@
gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/cmp
entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. You lead the Military Police, ensure your officers maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the security of high-ranking personnel, including the command staff. Keep them safe!"
-AddTimelock(/datum/job/command/warrant, list(
- JOB_POLICE_ROLES = 15 HOURS,
- JOB_COMMAND_ROLES = 5 HOURS
-))
-
/obj/effect/landmark/start/warrant
name = JOB_CHIEF_POLICE
icon_state = "cmp_spawn"
diff --git a/code/game/jobs/job/command/police/police.dm b/code/game/jobs/job/command/police/police.dm
index e05bc2e962..95eaf7c1b9 100644
--- a/code/game/jobs/job/command/police/police.dm
+++ b/code/game/jobs/job/command/police/police.dm
@@ -25,10 +25,6 @@
total_positions_so_far = positions
return positions
-AddTimelock(/datum/job/command/police, list(
- JOB_SQUAD_ROLES = 10 HOURS
-))
-
/obj/effect/landmark/start/police
name = JOB_POLICE
icon_state = "mp_spawn"
diff --git a/code/game/jobs/job/command/police/warden.dm b/code/game/jobs/job/command/police/warden.dm
index d2775e1975..50e1a36ce8 100644
--- a/code/game/jobs/job/command/police/warden.dm
+++ b/code/game/jobs/job/command/police/warden.dm
@@ -7,10 +7,6 @@
gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/warden
entry_message_body = "You are held by a higher standard and are required to obey not only the server rules but the Marine Law. Failure to do so may result in a job ban or server ban. Your primary job is to maintain peace and stability aboard the ship. Marines can get rowdy after a few weeks of cryosleep! In addition, you are tasked with the mainting security records and overwatching any prisoners in Brig."
-AddTimelock(/datum/job/command/warden, list(
- JOB_POLICE_ROLES = 10 HOURS
-))
-
/obj/effect/landmark/start/warden
name = JOB_WARDEN
icon_state = "wmp_spawn"
diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm
index 5d5123e687..6fbf6b8864 100644
--- a/code/game/jobs/job/logistics/cargo/chief_req.dm
+++ b/code/game/jobs/job/logistics/cargo/chief_req.dm
@@ -5,10 +5,6 @@
gear_preset = /datum/equipment_preset/uscm_ship/qm
entry_message_body = "Your job is to dispense supplies to the marines, including weapon attachments. Your cargo techs can help you out, but you have final say in your department. Make sure they're not goofing off. While you may request paperwork for supplies, do not go out of your way to screw with marines, unless you want to get deposed. A happy ship is a well-functioning ship."
-AddTimelock(/datum/job/logistics/requisition, list(
- JOB_REQUISITION_ROLES = 10 HOURS,
-))
-
/obj/effect/landmark/start/requisition
name = JOB_CHIEF_REQUISITION
icon_state = "ro_spawn"
diff --git a/code/game/jobs/job/logistics/engi/chief_engineer.dm b/code/game/jobs/job/logistics/engi/chief_engineer.dm
index b6aa23f9c4..a9a18165d9 100644
--- a/code/game/jobs/job/logistics/engi/chief_engineer.dm
+++ b/code/game/jobs/job/logistics/engi/chief_engineer.dm
@@ -5,10 +5,6 @@
gear_preset = /datum/equipment_preset/uscm_ship/chief_engineer
entry_message_body = "Your job is to maintain your department and keep your technicians in check. You are responsible for engineering, power, ordnance, and the orbital cannon. Should the commanding and executive officer be unavailable, you are next in the chain of command."
-AddTimelock(/datum/job/logistics/engineering, list(
- JOB_ENGINEER_ROLES = 10 HOURS,
-))
-
/obj/effect/landmark/start/engineering
name = JOB_CHIEF_ENGINEER
icon_state = "ce_spawn"
diff --git a/code/game/jobs/job/logistics/engi/ordnance_tech.dm b/code/game/jobs/job/logistics/engi/ordnance_tech.dm
index 43a8a7122a..df55013cda 100644
--- a/code/game/jobs/job/logistics/engi/ordnance_tech.dm
+++ b/code/game/jobs/job/logistics/engi/ordnance_tech.dm
@@ -26,10 +26,6 @@
total_positions_so_far = positions
return positions
-AddTimelock(/datum/job/logistics/otech, list(
- JOB_ENGINEER_ROLES = 1 HOURS
-))
-
/obj/effect/landmark/start/otech
name = JOB_ORDNANCE_TECH
icon_state = "ot_spawn"
diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm
index 1910248a61..5b93e5f6cf 100644
--- a/code/game/jobs/job/marine/squad/engineer.dm
+++ b/code/game/jobs/job/marine/squad/engineer.dm
@@ -32,10 +32,6 @@
flags_startup_parameters = ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/wo/marine/engineer
-AddTimelock(/datum/job/marine/engineer, list(
- JOB_SQUAD_ROLES = 1 HOURS
-))
-
/obj/effect/landmark/start/marine/engineer
name = JOB_SQUAD_ENGI
icon_state = "engi_spawn"
diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm
index ebb0cd25a9..e856164f87 100644
--- a/code/game/jobs/job/marine/squad/leader.dm
+++ b/code/game/jobs/job/marine/squad/leader.dm
@@ -25,8 +25,8 @@
flags_startup_parameters = ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/wo/marine/sl
-AddTimelock(/datum/job/marine/leader, list(
- JOB_SQUAD_ROLES = 10 HOURS
+OverrideTimelock(/datum/job/marine/leader, list(
+ JOB_SQUAD_ROLES = 1 HOURS
))
/obj/effect/landmark/start/marine/leader
diff --git a/code/game/jobs/job/marine/squad/medic.dm b/code/game/jobs/job/marine/squad/medic.dm
index 02b438c048..5c379c1121 100644
--- a/code/game/jobs/job/marine/squad/medic.dm
+++ b/code/game/jobs/job/marine/squad/medic.dm
@@ -45,11 +45,6 @@
flags_startup_parameters = ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/wo/marine/medic
-AddTimelock(/datum/job/marine/medic, list(
- JOB_MEDIC_ROLES = 1 HOURS,
- JOB_SQUAD_ROLES = 1 HOURS
-))
-
/obj/effect/landmark/start/marine/medic
name = JOB_SQUAD_MEDIC
icon_state = "medic_spawn"
diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm
index 6c27f5ec27..861d5fd905 100644
--- a/code/game/jobs/job/marine/squad/smartgunner.dm
+++ b/code/game/jobs/job/marine/squad/smartgunner.dm
@@ -41,10 +41,6 @@
flags_startup_parameters = ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/wo/marine/sg
-AddTimelock(/datum/job/marine/smartgunner, list(
- JOB_SQUAD_ROLES = 5 HOURS
-))
-
/obj/effect/landmark/start/marine/smartgunner
name = JOB_SQUAD_SMARTGUN
icon_state = "smartgunner_spawn"
diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm
index e69241cdc7..3e4d0600c2 100644
--- a/code/game/jobs/job/marine/squad/specialist.dm
+++ b/code/game/jobs/job/marine/squad/specialist.dm
@@ -29,10 +29,6 @@
flags_startup_parameters = ROLE_ADD_TO_SQUAD
gear_preset = /datum/equipment_preset/wo/marine/spec
-AddTimelock(/datum/job/marine/specialist, list(
- JOB_SQUAD_ROLES = 5 HOURS
-))
-
/obj/effect/landmark/start/marine/spec
name = JOB_SQUAD_SPECIALIST
icon_state = "spec_spawn"
diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm
index be876dc0b3..d074dfd182 100644
--- a/code/game/jobs/job/marine/squad/tl.dm
+++ b/code/game/jobs/job/marine/squad/tl.dm
@@ -16,10 +16,6 @@
. = ..()
spawning_human.important_radio_channels += JTAC_FREQ
-AddTimelock(/datum/job/marine/tl, list(
- JOB_SQUAD_ROLES = 8 HOURS
-))
-
/obj/effect/landmark/start/marine/tl
name = JOB_SQUAD_TEAM_LEADER
icon_state = "tl_spawn"
diff --git a/code/game/world.dm b/code/game/world.dm
index c23cce5abb..f47840b52c 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -74,7 +74,10 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
initiate_minimap_icons()
change_tick_lag(CONFIG_GET(number/ticklag))
- GLOB.timezoneOffset = text2num(time2text(0,"hh")) * 36000
+
+ // As of byond 515.1637 time2text now treats 0 like it does negative numbers so the hour is wrong
+ // We could instead use world.timezone but IMO better to not assume lummox will keep time2text in parity with it
+ GLOB.timezoneOffset = text2num(time2text(10,"hh")) * 36000
Master.Initialize(10, FALSE, TRUE)