increases timelocks and reworks entry text

code/__DEFINES/job.dm

@@ -55,11 +55,14 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST)
 #define JOB_CMO "Chief Medical Officer"
 #define JOB_DOCTOR "Doctor"
 #define JOB_SURGEON "Surgeon"
-
 #define JOB_NURSE "Nurse"
 #define JOB_RESEARCHER "Researcher"
 #define JOB_MEDIC_ROLES  /datum/timelock/medic
 #define JOB_MEDIC_ROLES_LIST list(JOB_SQUAD_MEDIC, JOB_CMO, JOB_DOCTOR, JOB_NURSE, JOB_RESEARCHER, JOB_SURGEON)
+#define JOB_MEDBAY_ROLES  /datum/timelock/medbay
+#define JOB_MEDBAY_ROLES_LIST list(JOB_CMO, JOB_DOCTOR, JOB_NURSE, JOB_SURGEON)
+#define JOB_RESEARCH_ROLES  /datum/timelock/research
+#define JOB_RESEARCH_ROLES_LIST list(JOB_CMO, JOB_RESEARCHER)
 
 #define JOB_CORPORATE_LIAISON "Corporate Liaison"
 #define JOB_COMBAT_REPORTER "Combat Correspondent"
@@ -81,6 +84,8 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #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_SUPPORTOFFICER_ROLES   /datum/timelock/supportofficer
+#define JOB_SUPPORTOFFICER_ROLES_LIST   list(JOB_AUXILIARY_OFFICER)
 #define JOB_AUXILIARY_ROLES    /datum/timelock/auxiliary
 #define JOB_AUXILIARY_ROLES_LIST   list(JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_CREWMAN, JOB_INTEL)
 
@@ -97,6 +102,10 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_ORDNANCE_TECH "Ordnance Technician"
 #define JOB_ENGINEER_ROLES   /datum/timelock/engineer
 #define JOB_ENGINEER_ROLES_LIST  list(JOB_SQUAD_ENGI, JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER)
+#define JOB_SHIPSIDEENGINEER_ROLES   /datum/timelock/shipsideengineer
+#define JOB_SHIPSIDEENGINEER_ROLES_LIST  list(JOB_MAINT_TECH, JOB_ORDNANCE_TECH, JOB_CHIEF_ENGINEER)
+#define JOB_ORDNANCETECHNICIAN_ROLES   /datum/timelock/ordnancetechnician
+#define JOB_ORDNANCETECHNICIAN_ROLES_LIST  list(JOB_ORDNANCE_TECH)
 
 #define JOB_CHIEF_REQUISITION "Quartermaster"
 #define JOB_CARGO_TECH "Cargo Technician"

code/game/jobs/job/antag/xeno/queen.dm

@@ -13,13 +13,13 @@
 	SSticker.mode.pick_queen_spawn(NP.mind, hive_index)
 
 /datum/job/antag/xenos/queen/announce_entry_message(mob/new_queen, account, whitelist_status)
-	to_chat(new_queen, "<B>You are now the alien queen!</B>")
-	to_chat(new_queen, "<B>Your job is to spread the hive.</B>")
-	to_chat(new_queen, "<B>You should start by building a hive core.</B>")
+	to_chat(new_queen, "<B>You are now a xenomorph queen!</B>")
+	to_chat(new_queen, "<B>Your job is to spread and command YOUR hive.</B>")
+	to_chat(new_queen, "<B>You should start by building a hive core, and growing your ovipositor in a safe location. If you have no children, you may want to seek viable hosts to infect prior to growing your ovipositor.</B>")
 	to_chat(new_queen, "Talk in Hivemind using <strong>;</strong> (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,
+	JOB_XENO_ROLES = 20 HOURS,
+	JOB_DRONE_ROLES = 10 HOURS,
+	JOB_T3_ROLES = 7 HOURS,
 ))

code/game/jobs/job/civilians/civilian.dm

@@ -7,3 +7,17 @@
 /datum/timelock/medic/New(name, time_required, list/roles)
 	. = ..()
 	src.roles = JOB_MEDIC_ROLES_LIST
+
+/datum/timelock/medbay
+	name = "Medbay Roles"
+
+/datum/timelock/medbay/New(name, time_required, list/roles)
+	. = ..()
+	src.roles = JOB_MEDBAY_ROLES_LIST
+
+/datum/timelock/research
+	name = "Research Roles"
+
+/datum/timelock/research/New(name, time_required, list/roles)
+	. = ..()
+	src.roles = JOB_RESEARCH_ROLES_LIST

code/game/jobs/job/civilians/other/liaison.dm

@@ -6,7 +6,7 @@
 	selection_class = "job_cl"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/liaison
-	entry_message_body = "As a <a href='"+WIKI_PLACEHOLDER+"'>representative of Weyland-Yutani Corporation</a>, your job requires you to stay in character at all times. You are not required to follow military orders; however, you cannot give military orders. Your primary job is to observe and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors. Use your office fax machine to communicate with corporate headquarters or to acquire new directives. You may not receive anything back, and this is normal."
+	entry_message_body = "As a <a href='"+WIKI_PLACEHOLDER+"'>representative of Weyland-Yutani Corporation</a>, your job requires you to stay in character at all times and is a roleplay-centric role. As a civilian, you are not expected to follow military orders. However, you may still be arrested for failing to abide by Standard Operating Procedure, or Marine Law. Your primary job is to observe, interact, and report back your findings to Weyland-Yutani. Follow regular game rules unless told otherwise by your superiors or administrative staff. Use your office fax machine to communicate with corporate headquarters, or to acquire new directives. You may not receive anything back, and this is normal. You are free to make up your own directives, as long as they are within the bounds of the rules."
 	var/mob/living/carbon/human/active_liaison
 
 /datum/job/civilian/liaison/generate_entry_conditions(mob/living/liaison, whitelist_status)

code/game/jobs/job/civilians/other/mess_seargent.dm

@@ -8,7 +8,7 @@
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	supervisors = "the auxiliary support officer"
 	gear_preset = /datum/equipment_preset/uscm_ship/chef
-	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to service the marines with excellent food</a>, drinks and entertaining the shipside crew when needed. You have a lot of freedom and it is up to you, to decide what to do with it. Good luck!"
+	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to service the marines with excellent food</a> and drinks. You may entertain the shipside crew as needed. You have a lot of freedom and it is up to you, to decide what to do with it. If you choose to deploy to an operations area, you must remain in a safe area. Good luck!"
 
 /datum/job/civilian/chef/set_spawn_positions(count)
 	spawn_positions = mess_sergeant_slot_formula(count)

code/game/jobs/job/civilians/other/reporter.dm

@@ -6,7 +6,7 @@
 	total_positions = 1
 	spawn_positions = 1
 	selection_class = "job_cl"
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	gear_preset = /datum/equipment_preset/uscm_ship/reporter
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	selection_class = "job_cl"

code/game/jobs/job/civilians/support/cmo.dm

@@ -2,14 +2,16 @@
 	title = JOB_CMO
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	selection_class = "job_cmo"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo
-	entry_message_body = "You're a commissioned officer of the USCM. <a href='"+WIKI_PLACEHOLDER+"'>You have authority over everything related to Medbay and Research</a>, only able to be overridden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall."
+	entry_message_body = "You're a commissioned officer of the USCM. <a href='"+WIKI_PLACEHOLDER+"'>You have authority over everything related to Medbay and Research</a>, only able to be overridden by the Acting Commander, or Commanding Officer. You are in charge of medical staff, surgery, chemistry, chemical synthesis, biological testing, mental diagnosis, and keeping the marines healthy overall.  You are 5th in line for Acting Commander, behind the Chief MP."
 
 AddTimelock(/datum/job/civilian/professor, list(
-	JOB_MEDIC_ROLES = 10 HOURS
+	JOB_MEDIC_ROLES = 20 HOURS,
+	JOB_MEDBAY_ROLES = 10 HOURS,
+	JOB_RESEARCH_ROLES = 6 HOURS
 ))
 
 /obj/effect/landmark/start/professor

code/game/jobs/job/civilians/support/nurse.dm

@@ -6,7 +6,7 @@
 	selection_class = "job_doctor"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/nurse
-	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>You are tasked with keeping the Marines healthy and strong.</a> You are also an expert when it comes to medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines."
+	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>You are tasked with keeping the Marines healthy and strong.</a> You are here to provide medication and treatment, and can do minor surgical procedures. Focus on assisting doctors and triaging wounded marines. You are not expected to be sufficient in medical knowledge gameplay yet, as this is a learning role. Your superiors can help you if you are lost, or if you do not know what you are doing, you can mentorhelp so a mentor can assist you."
 
 /obj/effect/landmark/start/nurse
 	name = JOB_NURSE

code/game/jobs/job/civilians/support/researcher.dm

@@ -10,7 +10,7 @@
 	selection_class = "job_researcher"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/researcher
-	entry_message_body = "You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are tasked with <a href='"+WIKI_PLACEHOLDER+"'>researching</a> and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor."
+	entry_message_body = "You're a commissioned officer of the USCM, though you are not in the ship's chain of command. You are tasked with <a href='"+WIKI_PLACEHOLDER+"'>researching</a> and developing new medical treatments, helping your fellow doctors, and generally learning new things. Your role involves a lot of roleplaying, but you can perform the function of a regular doctor. Do not hand out things to Marines without getting permission from your supervisor, or you may find yourself on the wrong side of the law."
 
 /datum/job/civilian/researcher/set_spawn_positions(count)
 	spawn_positions = rsc_slot_formula(count)

code/game/jobs/job/civilians/support/synthetic.dm

@@ -4,12 +4,12 @@
 	spawn_positions = 1
 	allow_additional = 1
 	scaled = 1
-	supervisors = "the acting commanding officer"
+	supervisors = "the acting commander"
 	selection_class = "job_synth"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED|ROLE_CUSTOM_SPAWN
 	flags_whitelist = WHITELIST_SYNTHETIC
 	gear_preset = /datum/equipment_preset/synth/uscm
-	entry_message_body = "You are a <a href='"+WIKI_PLACEHOLDER+"'>Synthetic!</a> You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commanding officer. Special circumstances may change this!"
+	entry_message_body = "You are a <a href='"+WIKI_PLACEHOLDER+"'>Synthetic!</a> You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Synthetic Rules. Failure to do so may result in your White-list Removal. Your primary job is to support and assist all USCM Departments and Personnel on-board. In addition, being a Synthetic gives you knowledge in every field and specialization possible on-board the ship. As a Synthetic you answer to the acting commander. Special circumstances may change this!"
 
 /datum/job/civilian/synthetic/New()
 	. = ..()

code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm

@@ -2,16 +2,18 @@
 	title = JOB_AUXILIARY_OFFICER
 	total_positions = 1
 	spawn_positions = 1
+	supervisors = "the acting commander"
 	allow_additional = TRUE
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/auxiliary_officer
-	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to oversee</a> 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."
+	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to oversee</a> the hangar crew, the intel officers, the engineering department, and requisitions bay. You have many responsibilities to oversee, but ensure you are delegating to your subordinates. You will find great relief in coordinating with the department heads under you, rather than their subordinates. You are 3rd in line for Acting Commander, behind the Executive Officer."
 
 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,
+	JOB_SQUAD_ROLES = 15 HOURS,
+	JOB_REQUISITION_ROLES = 15 HOURS,
+	JOB_SHIPSIDEENGINEER_ROLES = 10 HOURS,
+	JOB_ORDNANCETECHNICIAN_ROLES = 5 HOURS,
+	JOB_AUXILIARY_ROLES = 15 HOURS,
 ))
 
 /obj/effect/landmark/start/auxiliary_officer

code/game/jobs/job/command/auxiliary/crew_chief.dm

@@ -4,10 +4,10 @@
 	spawn_positions = 2
 	allow_additional = TRUE
 	scaled = TRUE
-	supervisors = "the pilot officers"
+	supervisors = "the pilot officers and auxiliary support officer"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/dcc
-	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."
+	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to assist</a> your pilot officer maintain the ship's dropship. You have authority over your assigned dropship and personnel within its walls, as long as it does not conflict with Standard Operating Procedure, or Marine Law. You are expected to maintain order and assist with maintaining the dropship, as not to disrupt the pilot and increase efficiency."
 
 AddTimelock(/datum/job/command/crew_chief, list(
 	JOB_SQUAD_ROLES = 5 HOURS

code/game/jobs/job/command/auxiliary/intel.dm

@@ -8,7 +8,7 @@
 	supervisors = "the auxiliary support officer"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD
 	gear_preset = "USCM Intelligence Officer (IO) (Cryo)"
-	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to assist the marines in collecting intelligence related</a> to the current operation to better inform command of their opposition. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to grant the USCM additional resources."
+	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to assist the marines in collecting intelligence related</a> to the current operation to better inform command of their opposition and the events that unfolded at the operation site. You are in charge of gathering any data disks, folders, and notes you may find on the operational grounds and decrypt them to authorize additional asset usage from the station you reside. You are 9th in line for Acting Commander, behind any Pilot Officers."
 
 /datum/job/command/intel/set_spawn_positions(count)
 	spawn_positions = int_slot_formula(count)

code/game/jobs/job/command/auxiliary/pilot.dm

@@ -7,7 +7,7 @@
 	supervisors = "the auxiliary support officer"
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT
 	gear_preset = /datum/equipment_preset/uscm_ship/po
-	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>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."
+	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to fly, protect, and maintain the ship's dropship.</a> You have authority over your assigned dropship and personnel within its walls, as long as it does not conflict with Standard Operating Procedure, or Marine Law. If you are not piloting, there is an autopilot fallback for command, but don't leave the dropship without reason. You should notify the Acting Commander if you are incapacitated or cannot continue your duties. You are 8th in line for Acting Commander, behind the Chief Engineer."
 
 // Dropship Roles is both PO and DCC combined to not force people to backtrack
 AddTimelock(/datum/job/command/pilot, list(

code/game/jobs/job/command/auxiliary/senior.dm

@@ -3,11 +3,12 @@
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY|ROLE_WHITELISTED
 	flags_whitelist = WHITELIST_MENTOR
 	gear_preset = /datum/equipment_preset/uscm_ship/sea
+	supervisors = "the acting commander"
 
 	job_options = list("Gunnery Sergeant" = "GySGT", "Master Sergeant" = "MSgt", "First Sergeant" = "1Sgt", "Master Gunnery Sergeant" = "MGySgt", "Sergeant Major" = "SgtMaj")
 
 /datum/job/command/senior/on_config_load()
-	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>You are</a> held to a higher standard and are required to obey not only the Server Rules but <a href='"+LAW_PLACEHOLDER+"'>Marine Law</a> and <a href='[CONFIG_GET(string/wikiarticleurl)]/[URL_WIKI_SOP]'>Standard Operating Procedure</a>. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all USCM Departments and Personnel on-board."
+	entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>You are</a> held to a higher standard and are required to obey not only the Server Rules but <a href='"+LAW_PLACEHOLDER+"'>Marine Law</a> and <a href='[CONFIG_GET(string/wikiarticleurl)]/[URL_WIKI_SOP]'>Standard Operating Procedure</a>. Failure to do so may result in your Mentorship Removal. Your primary job is to teach others the game and its mechanics, and offer advice to all USCM Departments and Personnel on-board. You are 11th in line for Acting Commander, behind the Quartermaster."
 	return ..()
 
 /datum/job/command/senior/announce_entry_message(mob/living/carbon/human/H)

code/game/jobs/job/command/cic/executive.dm

@@ -3,9 +3,10 @@
 	title = JOB_XO
 	flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADMIN_NOTIFY
 	gear_preset = /datum/equipment_preset/uscm_ship/xo
+	supervisors = "the commanding officer and USCM High Command"
 
 /datum/job/command/executive/generate_entry_message(mob/living/carbon/human/H)
-	entry_message_body = "<a href='[generate_wiki_link()]'>You are second in command aboard the [MAIN_SHIP_NAME],</a> and are in next in the chain of command after the Commanding Officer. Where applicable, you must abide by the <a href='[CONFIG_GET(string/wikiarticleurl)][URL_WIKI_CO_RULES]'>Commanding Officer Code of Conduct</a>. You may need to fill in for other duties if areas are understaffed, and you are given access to do so. Make the USCM proud!"
+	entry_message_body = "<a href='[generate_wiki_link()]'>You are second in command aboard the [MAIN_SHIP_NAME],</a> and behind the Commanding Officer in the chain of command. Where applicable, you must abide by the <a href='[CONFIG_GET(string/wikiarticleurl)][URL_WIKI_CO_RULES]'>Commanding Officer Code of Conduct</a>. You may need to fill in for other duties if areas are understaffed, and you are given access to do so. If there is no Commanding Officer, you are in charge of overseeing department heads among the [MAIN_SHIP_NAME], and overseeing the operation. Delegation will be your best friend. Make the USCM proud!"
 	return ..()
 
 /datum/job/command/executive/generate_entry_conditions(mob/living/M, whitelist_status)
@@ -18,7 +19,8 @@
 	GLOB.marine_leaders -= JOB_XO
 
 AddTimelock(/datum/job/command/executive, list(
-	JOB_COMMAND_ROLES = 5 HOURS,
+	JOB_COMMAND_ROLES = 15 HOURS,
+	JOB_AUXILIARY_OFFICER = 10 HOURS
 ))
 
 /obj/effect/landmark/start/executive