From 76bf07db7d83368d920dcd6c7b44dba9256fd53c Mon Sep 17 00:00:00 2001 From: Crimsonerva <61176328+Crimsonerva@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:45:00 -0500 Subject: [PATCH] re-adjusts timelocks for all roles increases timelocks and reworks entry text --- code/__DEFINES/job.dm | 7 ++++++- code/game/jobs/job/antag/xeno/queen.dm | 12 ++++++------ code/game/jobs/job/civilians/civilian.dm | 14 ++++++++++++++ code/game/jobs/job/civilians/other/liaison.dm | 4 ++-- .../game/jobs/job/civilians/other/mess_seargent.dm | 6 +++++- code/game/jobs/job/civilians/other/reporter.dm | 4 ++-- code/game/jobs/job/civilians/other/survivors.dm | 6 +++--- code/game/jobs/job/civilians/support/cmo.dm | 8 +++++--- code/game/jobs/job/civilians/support/doctor.dm | 2 +- code/game/jobs/job/civilians/support/nurse.dm | 4 ++-- code/game/jobs/job/civilians/support/researcher.dm | 4 ++-- code/game/jobs/job/civilians/support/synthetic.dm | 4 ++-- .../command/auxiliary/auxiliary_support_officer.dm | 12 +++++++----- code/game/jobs/job/command/auxiliary/crew_chief.dm | 6 +++--- code/game/jobs/job/command/auxiliary/intel.dm | 4 ++-- code/game/jobs/job/command/auxiliary/pilot.dm | 4 ++-- code/game/jobs/job/command/auxiliary/senior.dm | 3 ++- code/game/jobs/job/command/cic/executive.dm | 6 ++++-- code/game/jobs/job/command/cic/staffofficer.dm | 8 +++++--- code/game/jobs/job/command/command.dm | 12 +++++++++--- code/game/jobs/job/command/police/chief_police.dm | 8 +++++--- code/game/jobs/job/command/police/police.dm | 5 +++-- code/game/jobs/job/command/police/warden.dm | 4 ++-- code/game/jobs/job/logistics/cargo/cargo_tech.dm | 2 +- code/game/jobs/job/logistics/cargo/chief_req.dm | 5 +++-- .../game/jobs/job/logistics/engi/chief_engineer.dm | 7 +++++-- code/game/jobs/job/logistics/engi/ordnance_tech.dm | 2 +- code/game/jobs/job/logistics/logistics.dm | 14 ++++++++++++++ code/game/jobs/job/marine/marine.dm | 7 +++++++ code/game/jobs/job/marine/squad/engineer.dm | 3 ++- code/game/jobs/job/marine/squad/leader.dm | 4 ++-- code/game/jobs/job/marine/squad/medic.dm | 5 +++-- code/game/jobs/job/marine/squad/smartgunner.dm | 3 ++- code/game/jobs/job/marine/squad/specialist.dm | 3 ++- code/game/jobs/job/marine/squad/standard.dm | 1 + code/game/jobs/job/marine/squad/tl.dm | 3 ++- code/game/objects/structures/signs.dm | 2 +- 37 files changed, 140 insertions(+), 68 deletions(-) diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index ad3b9fe3af32..8d8789dc953c 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -55,11 +55,12 @@ 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_CORPORATE_LIAISON "Corporate Liaison" #define JOB_COMBAT_REPORTER "Combat Correspondent" @@ -72,6 +73,10 @@ GLOBAL_LIST_INIT(job_squad_roles, JOB_SQUAD_ROLES_LIST) #define JOB_SO "Staff Officer" #define JOB_COMMAND_ROLES /datum/timelock/command #define JOB_COMMAND_ROLES_LIST list(JOB_CO, JOB_XO, JOB_SO) +#define JOB_DEPARTMENTHEADS_ROLES /datum/timelock/departmentheads +#define JOB_DEPARTMENTHEADS_ROLES_LIST list(JOB_CO, JOB_XO, JOB_AUXILIARY_OFFICER, JOB_CHIEF_ENGINEER, JOB_CHIEF_POLICE, JOB_CHIEF_REQUISITION, JOB_CMO) +#define JOB_SQUADLEADERSHIP_ROLES /datum/timelock/squadleadership +#define JOB_SQUADLEADERSHIP_ROLES_LIST list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER) GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST) #define JOB_AUXILIARY_OFFICER "Auxiliary Support Officer" diff --git a/code/game/jobs/job/antag/xeno/queen.dm b/code/game/jobs/job/antag/xeno/queen.dm index 5702f9b1a671..33aac0df0b7f 100644 --- a/code/game/jobs/job/antag/xeno/queen.dm +++ b/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, "You are now the alien queen!") - 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, "You are now a xenomorph queen!") + to_chat(new_queen, "Your job is to spread and command YOUR hive.") + to_chat(new_queen, "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.") 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, + JOB_XENO_ROLES = 21 HOURS, + JOB_DRONE_ROLES = 9 HOURS, + JOB_T3_ROLES = 6 HOURS, )) diff --git a/code/game/jobs/job/civilians/civilian.dm b/code/game/jobs/job/civilians/civilian.dm index a9631f2ed9c1..95f0be039f9a 100644 --- a/code/game/jobs/job/civilians/civilian.dm +++ b/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 diff --git a/code/game/jobs/job/civilians/other/liaison.dm b/code/game/jobs/job/civilians/other/liaison.dm index cbbb87124957..241944da4d96 100644 --- a/code/game/jobs/job/civilians/other/liaison.dm +++ b/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 representative of Weyland-Yutani Corporation, 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 representative of Weyland-Yutani Corporation, 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) @@ -24,5 +24,5 @@ job = /datum/job/civilian/liaison AddTimelock(/datum/job/civilian/liaison, list( - JOB_HUMAN_ROLES = 10 HOURS, + JOB_HUMAN_ROLES = 21 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/mess_seargent.dm b/code/game/jobs/job/civilians/other/mess_seargent.dm index fb4f5ee14d7c..e98f8ac36d94 100644 --- a/code/game/jobs/job/civilians/other/mess_seargent.dm +++ b/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 = "Your job is to service the marines with excellent food, 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 = "Your job is to service the marines with excellent food 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) @@ -30,3 +30,7 @@ name = JOB_MESS_SERGEANT icon_state = "chef_spawn" job = /datum/job/civilian/chef + +AddTimelock(/datum/job/civilian/chef, list( + JOB_HUMAN_ROLES = 6 HOURS, +)) diff --git a/code/game/jobs/job/civilians/other/reporter.dm b/code/game/jobs/job/civilians/other/reporter.dm index c681768f93bc..811bea3c850e 100644 --- a/code/game/jobs/job/civilians/other/reporter.dm +++ b/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" @@ -35,5 +35,5 @@ This could be the story of the sector! 'Brave Marines responding to dangerous di job = /datum/job/civilian/reporter AddTimelock(/datum/job/civilian/reporter, list( - JOB_HUMAN_ROLES = 10 HOURS, + JOB_HUMAN_ROLES = 21 HOURS, )) diff --git a/code/game/jobs/job/civilians/other/survivors.dm b/code/game/jobs/job/civilians/other/survivors.dm index a85731aa781a..79c0fadc2b2e 100644 --- a/code/game/jobs/job/civilians/other/survivors.dm +++ b/code/game/jobs/job/civilians/other/survivors.dm @@ -142,9 +142,9 @@ 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 + JOB_SQUAD_ROLES = 6 HOURS, + JOB_ENGINEER_ROLES = 6 HOURS, + JOB_MEDIC_ROLES = 6 HOURS )) /datum/job/civilian/survivor/synth diff --git a/code/game/jobs/job/civilians/support/cmo.dm b/code/game/jobs/job/civilians/support/cmo.dm index b75f840ac895..db5fdd90fc45 100644 --- a/code/game/jobs/job/civilians/support/cmo.dm +++ b/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. You have authority over everything related to Medbay and Research, 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. You have authority over everything related to Medbay and Research, 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 = 21 HOURS, + JOB_DOCTOR = 9 HOURS, + JOB_RESEARCHER = 6 HOURS )) /obj/effect/landmark/start/professor diff --git a/code/game/jobs/job/civilians/support/doctor.dm b/code/game/jobs/job/civilians/support/doctor.dm index 9e0853d96e33..b6425687e6e6 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_NURSE = 3 HOURS )) /obj/effect/landmark/start/doctor diff --git a/code/game/jobs/job/civilians/support/nurse.dm b/code/game/jobs/job/civilians/support/nurse.dm index 8912011298dc..2511b7cae27d 100644 --- a/code/game/jobs/job/civilians/support/nurse.dm +++ b/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 = "You are tasked with keeping the Marines healthy and strong. 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 = "You are tasked with keeping the Marines healthy and strong. 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 @@ -14,5 +14,5 @@ job = /datum/job/civilian/nurse AddTimelock(/datum/job/civilian/nurse, list( - JOB_HUMAN_ROLES = 1 HOURS + JOB_HUMAN_ROLES = 6 HOURS )) diff --git a/code/game/jobs/job/civilians/support/researcher.dm b/code/game/jobs/job/civilians/support/researcher.dm index 21163f27959d..78a02053da14 100644 --- a/code/game/jobs/job/civilians/support/researcher.dm +++ b/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 researching 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 researching 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, and you may be expected to act as one during hardened times. 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) @@ -28,7 +28,7 @@ return positions AddTimelock(/datum/job/civilian/researcher, list( - JOB_MEDIC_ROLES = 5 HOURS + JOB_DOCTOR = 3 HOURS )) /obj/effect/landmark/start/researcher diff --git a/code/game/jobs/job/civilians/support/synthetic.dm b/code/game/jobs/job/civilians/support/synthetic.dm index 12e50ef6c809..3549fe1d819c 100644 --- a/code/game/jobs/job/civilians/support/synthetic.dm +++ b/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 Synthetic! 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 Synthetic! 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() . = ..() 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 5f6293000365..44aefabb475a 100644 --- a/code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm +++ b/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 = "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." + entry_message_body = "Your job is to oversee 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_REQUISITION_ROLES = 6 HOURS, + JOB_ENGINEER_ROLES = 12 HOURS, + JOB_JOB_MAINT_TECH = 3 HOURS, + JOB_ORDNANCE_TECH = 6 HOURS + JOB_AUXILIARY_ROLES = 9 HOURS, )) /obj/effect/landmark/start/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 0770bcd60ffa..c6bdc1dea489 100644 --- a/code/game/jobs/job/command/auxiliary/crew_chief.dm +++ b/code/game/jobs/job/command/auxiliary/crew_chief.dm @@ -4,13 +4,13 @@ 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 = "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." + entry_message_body = "Your job is to assist 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 + JOB_SQUAD_ROLES = 9 HOURS )) /obj/effect/landmark/start/crew_chief diff --git a/code/game/jobs/job/command/auxiliary/intel.dm b/code/game/jobs/job/command/auxiliary/intel.dm index 9905bc9d3747..1c5f69ee0dcc 100644 --- a/code/game/jobs/job/command/auxiliary/intel.dm +++ b/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 = "Your job is to assist the marines in collecting intelligence related 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 = "Your job is to assist the marines in collecting intelligence related 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) @@ -24,7 +24,7 @@ return positions AddTimelock(/datum/job/command/intel, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 12 HOURS )) /obj/effect/landmark/start/intel diff --git a/code/game/jobs/job/command/auxiliary/pilot.dm b/code/game/jobs/job/command/auxiliary/pilot.dm index 1a7a7c21d5a0..ad6d90847d98 100644 --- a/code/game/jobs/job/command/auxiliary/pilot.dm +++ b/code/game/jobs/job/command/auxiliary/pilot.dm @@ -7,11 +7,11 @@ supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT 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." + entry_message_body = "Your job is to fly, protect, and 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. 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( - JOB_DROPSHIP_ROLES = 2 HOURS + JOB_DROPSHIP_ROLES = 3 HOURS )) /obj/effect/landmark/start/pilot diff --git a/code/game/jobs/job/command/auxiliary/senior.dm b/code/game/jobs/job/command/auxiliary/senior.dm index 014db9569b2a..905ac6451c18 100644 --- a/code/game/jobs/job/command/auxiliary/senior.dm +++ b/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 = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. 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 = "You are held to a higher standard and are required to obey not only the Server Rules but Marine Law and Standard Operating Procedure. 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) diff --git a/code/game/jobs/job/command/cic/executive.dm b/code/game/jobs/job/command/cic/executive.dm index f717a03e1229..0d0e8ef4fd3c 100644 --- a/code/game/jobs/job/command/cic/executive.dm +++ b/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 = "You are second in command aboard the [MAIN_SHIP_NAME], and are in next in the chain of command after the Commanding Officer. Where applicable, you must abide by the Commanding Officer Code of Conduct. 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 = "You are second in command aboard the [MAIN_SHIP_NAME], and behind the Commanding Officer in the chain of command. Where applicable, you must abide by the Commanding Officer Code of Conduct. 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 = 12 HOURS, + JOB_DEPARTMENTHEADS_ROLES = 6 HOURS )) /obj/effect/landmark/start/executive diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm index 94769de2158f..9a4a8f5beadb 100644 --- a/code/game/jobs/job/command/cic/staffofficer.dm +++ b/code/game/jobs/job/command/cic/staffofficer.dm @@ -4,9 +4,10 @@ spawn_positions = 4 allow_additional = 1 scaled = FALSE + supervisors = "the acting commander" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/so - entry_message_body = "Your job is to monitor the Marines, man the CIC, and listen to your superior officers. You are in charge of logistics and the overwatch system. You are also in line to take command after other eligible superior commissioned officers." + entry_message_body = "Your job is to monitor the Marines via overwatch, man the CIC, and listen to your Acting Commander. You are in charge of managing one or many squads, or delegated duties handed out by the Acting Commander. You are 6th in line for Acting Commander, behind the Chief Medical Officer." /datum/job/command/bridge/set_spawn_positions(count) spawn_positions = so_slot_formula(count) @@ -27,8 +28,9 @@ return ..() AddTimelock(/datum/job/command/bridge, list( - JOB_SQUAD_LEADER = 1 HOURS, - JOB_HUMAN_ROLES = 15 HOURS + JOB_SQUAD_LEADER = 9 HOURS, + JOB_SQUAD_LEADERSHIP_ROLES = 12 HOURS, + JOB_HUMAN_ROLES = 24 HOURS )) /obj/effect/landmark/start/bridge diff --git a/code/game/jobs/job/command/command.dm b/code/game/jobs/job/command/command.dm index d430352d6e83..5a49fb99bdbe 100644 --- a/code/game/jobs/job/command/command.dm +++ b/code/game/jobs/job/command/command.dm @@ -1,6 +1,6 @@ /datum/job/command selection_class = "job_command" - supervisors = "the acting commanding officer" + supervisors = "the acting commander" total_positions = 1 spawn_positions = 1 @@ -23,7 +23,7 @@ /datum/timelock/human/can_play(client/C) return C.get_total_human_playtime() >= time_required - + /datum/timelock/human/get_role_requirement(client/C) return time_required - C.get_total_human_playtime() @@ -33,4 +33,10 @@ /datum/timelock/dropship/New(name, time_required, list/roles) . = ..() src.roles = JOB_DROPSHIP_ROLES_LIST - + +/datum/timelock/departmentheads + name = "Department Head" + +/datum/timelock/departmentheads/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_DEPARTMENTHEADS_ROLES_LIST diff --git a/code/game/jobs/job/command/police/chief_police.dm b/code/game/jobs/job/command/police/chief_police.dm index 63e6d8023f17..f390dd485511 100644 --- a/code/game/jobs/job/command/police/chief_police.dm +++ b/code/game/jobs/job/command/police/chief_police.dm @@ -2,13 +2,15 @@ /datum/job/command/warrant title = JOB_CHIEF_POLICE selection_class = "job_cmp" + supervisors = "the acting commander" flags_startup_parameters = ROLE_ADD_TO_DEFAULT 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!" + 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. Your primary duties will be managing and dispatching subordinate MPs to handle the law. You are the highest authority on Marine Law aboard the ship, only being overruled by a Commanding Officer, or Provost Personnel. You are 4th in line for Acting Commander, behind the Auxiliary Support Officer." AddTimelock(/datum/job/command/warrant, list( - JOB_POLICE_ROLES = 15 HOURS, - JOB_COMMAND_ROLES = 5 HOURS + JOB_POLICE_ROLES = 25 HOURS, + JOB_COMMAND_ROLES = 9 HOURS, + JOB_WARDEN = 3 HOURS )) /obj/effect/landmark/start/warrant diff --git a/code/game/jobs/job/command/police/police.dm b/code/game/jobs/job/command/police/police.dm index e05bc2e96256..54d0a3e6976d 100644 --- a/code/game/jobs/job/command/police/police.dm +++ b/code/game/jobs/job/command/police/police.dm @@ -6,9 +6,10 @@ allow_additional = 1 scaled = 1 selection_class = "job_mp" + supervisors = "the Chief MP" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/mp - 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 security of high-ranking personnel, including the command staff. Keep them safe!" + 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 security of high-ranking personnel, including the command staff. Keep them safe! You are 13th in line for Acting Commander, behind the MP Warden." /datum/job/command/police/set_spawn_positions(count) spawn_positions = mp_slot_formula(count) @@ -26,7 +27,7 @@ return positions AddTimelock(/datum/job/command/police, list( - JOB_SQUAD_ROLES = 10 HOURS + JOB_SQUAD_ROLES = 12 HOURS )) /obj/effect/landmark/start/police diff --git a/code/game/jobs/job/command/police/warden.dm b/code/game/jobs/job/command/police/warden.dm index d2775e197537..e5704a999cd9 100644 --- a/code/game/jobs/job/command/police/warden.dm +++ b/code/game/jobs/job/command/police/warden.dm @@ -5,10 +5,10 @@ flags_startup_parameters = ROLE_ADD_TO_DEFAULT supervisors = "the Chief MP" 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." + 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. You are 12th in line for Acting Commander, behind the Senior Enlisted Advisor." AddTimelock(/datum/job/command/warden, list( - JOB_POLICE_ROLES = 10 HOURS + JOB_POLICE_ROLES = 15 HOURS )) /obj/effect/landmark/start/warden diff --git a/code/game/jobs/job/logistics/cargo/cargo_tech.dm b/code/game/jobs/job/logistics/cargo/cargo_tech.dm index c4725289c3ff..3b3c0f13cb47 100644 --- a/code/game/jobs/job/logistics/cargo/cargo_tech.dm +++ b/code/game/jobs/job/logistics/cargo/cargo_tech.dm @@ -4,7 +4,7 @@ spawn_positions = 2 allow_additional = 1 scaled = 1 - supervisors = "the requisitions officer" + supervisors = "the quartermaster" selection_class = "job_ct" flags_startup_parameters = ROLE_ADD_TO_DEFAULT gear_preset = /datum/equipment_preset/uscm_ship/cargo diff --git a/code/game/jobs/job/logistics/cargo/chief_req.dm b/code/game/jobs/job/logistics/cargo/chief_req.dm index 5d5123e687ed..489fcd37015f 100644 --- a/code/game/jobs/job/logistics/cargo/chief_req.dm +++ b/code/game/jobs/job/logistics/cargo/chief_req.dm @@ -1,12 +1,13 @@ /datum/job/logistics/requisition title = JOB_CHIEF_REQUISITION selection_class = "job_qm" + supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT 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." + entry_message_body = "Your job is to dispense supplies to the marines, organize your cargo technicians, and supply the marine's operations. You may do this through vending supplies, or using your five crate launch pads. 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. You are 10th in line for Acting Commander, behind any intelligence officers." AddTimelock(/datum/job/logistics/requisition, list( - JOB_REQUISITION_ROLES = 10 HOURS, + JOB_REQUISITION_ROLES = 6 HOURS, )) /obj/effect/landmark/start/requisition diff --git a/code/game/jobs/job/logistics/engi/chief_engineer.dm b/code/game/jobs/job/logistics/engi/chief_engineer.dm index b6aa23f9c4a6..1f301f83ad27 100644 --- a/code/game/jobs/job/logistics/engi/chief_engineer.dm +++ b/code/game/jobs/job/logistics/engi/chief_engineer.dm @@ -1,12 +1,15 @@ /datum/job/logistics/engineering title = JOB_CHIEF_ENGINEER selection_class = "job_ce" + supervisors = "the auxiliary support officer" flags_startup_parameters = ROLE_ADD_TO_DEFAULT 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." + 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. You are seventh in line for Acting Commander, behind any staff officers." AddTimelock(/datum/job/logistics/engineering, list( - JOB_ENGINEER_ROLES = 10 HOURS, + JOB_ENGINEER_ROLES = 12 HOURS, + JOB_JOB_MAINT_TECH = 3 HOURS, + JOB_ORDNANCE_TECH = 6 HOURS )) /obj/effect/landmark/start/engineering diff --git a/code/game/jobs/job/logistics/engi/ordnance_tech.dm b/code/game/jobs/job/logistics/engi/ordnance_tech.dm index 43a8a7122a8f..55f152b6630a 100644 --- a/code/game/jobs/job/logistics/engi/ordnance_tech.dm +++ b/code/game/jobs/job/logistics/engi/ordnance_tech.dm @@ -27,7 +27,7 @@ return positions AddTimelock(/datum/job/logistics/otech, list( - JOB_ENGINEER_ROLES = 1 HOURS + JOB_ENGINEER_ROLES = 3 HOURS )) /obj/effect/landmark/start/otech diff --git a/code/game/jobs/job/logistics/logistics.dm b/code/game/jobs/job/logistics/logistics.dm index ef4364354067..eb0e9bb5d464 100644 --- a/code/game/jobs/job/logistics/logistics.dm +++ b/code/game/jobs/job/logistics/logistics.dm @@ -10,6 +10,20 @@ . = ..() src.roles = JOB_ENGINEER_ROLES_LIST +/datum/timelock/shipsideengineer + name = "Ship-side Engineering Roles" + +/datum/timelock/shipsideengineer/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_SHIPSIDEENGINEER_ROLES_LIST + +/datum/timelock/ordnancetechnician + name = "Ordnance Technician" + +/datum/timelock/ordnancetechnician/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_ORDNANCETECHNICIAN_ROLES_LIST + /datum/timelock/requisition name = "Requisition Roles" diff --git a/code/game/jobs/job/marine/marine.dm b/code/game/jobs/job/marine/marine.dm index e07c1edd3138..9b33cc837d6e 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/squadleadership + name = "Squad Leadership" + +/datum/timelock/squadleadership/New(name, time_required, list/roles) + . = ..() + src.roles = JOB_SQUADLEADERSHIP_ROLES_LIST diff --git a/code/game/jobs/job/marine/squad/engineer.dm b/code/game/jobs/job/marine/squad/engineer.dm index a4422572f218..2f9399237049 100644 --- a/code/game/jobs/job/marine/squad/engineer.dm +++ b/code/game/jobs/job/marine/squad/engineer.dm @@ -3,6 +3,7 @@ total_positions = 12 spawn_positions = 12 allow_additional = 1 + supervisors = "your squad leader, and assigned CIC personnel" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/engineer entry_message_body = "You have the equipment and skill to build fortifications, reroute power lines, and bunker down. Your squaddies will look to you when it comes to construction in the field of battle." @@ -33,7 +34,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 diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm index be78438db3d6..d4c0fce8f7ba 100644 --- a/code/game/jobs/job/marine/squad/leader.dm +++ b/code/game/jobs/job/marine/squad/leader.dm @@ -2,7 +2,7 @@ title = JOB_SQUAD_LEADER total_positions = 4 spawn_positions = 4 - supervisors = "the acting commanding officer" + supervisors = "the acting commander" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/leader entry_message_body = "You are responsible for the men and women of your squad. Make sure they are on task, working together, and communicating. You are also in charge of communicating with command and letting them know about the situation first hand. Keep out of harm's way." @@ -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_ROLES = 12 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 450d1176658f..44f8a890d26e 100644 --- a/code/game/jobs/job/marine/squad/medic.dm +++ b/code/game/jobs/job/marine/squad/medic.dm @@ -3,6 +3,7 @@ total_positions = 16 spawn_positions = 16 allow_additional = 1 + supervisors = "your squad leader, and assigned CIC personnel" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/medic entry_message_body = "You tend the wounds of your squad mates and make sure they are healthy and active. You may not be a fully-fledged doctor, but you stand between life and death when it matters." @@ -33,8 +34,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 = 3 HOURS, + JOB_SQUAD_ROLES = 3 HOURS )) /obj/effect/landmark/start/marine/medic diff --git a/code/game/jobs/job/marine/squad/smartgunner.dm b/code/game/jobs/job/marine/squad/smartgunner.dm index 1a89abf5d3be..1490c54f9a19 100644 --- a/code/game/jobs/job/marine/squad/smartgunner.dm +++ b/code/game/jobs/job/marine/squad/smartgunner.dm @@ -4,6 +4,7 @@ spawn_positions = 4 allow_additional = 1 scaled = 1 + supervisors = "your squad leader, and assigned CIC personnel" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/sg entry_message_body = "You are the smartgunner. Your task is to provide heavy weapons support." @@ -29,7 +30,7 @@ gear_preset = /datum/equipment_preset/wo/marine/sg AddTimelock(/datum/job/marine/smartgunner, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 6 HOURS )) /obj/effect/landmark/start/marine/smartgunner diff --git a/code/game/jobs/job/marine/squad/specialist.dm b/code/game/jobs/job/marine/squad/specialist.dm index e69241cdc70b..fbc16b909559 100644 --- a/code/game/jobs/job/marine/squad/specialist.dm +++ b/code/game/jobs/job/marine/squad/specialist.dm @@ -4,6 +4,7 @@ spawn_positions = 4 allow_additional = 1 scaled = 1 + supervisors = "your squad leader, and assigned CIC personnel" flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/spec entry_message_body = "You are the very rare and valuable weapon expert, trained to use special equipment. You can serve a variety of roles, so choose carefully." @@ -30,7 +31,7 @@ gear_preset = /datum/equipment_preset/wo/marine/spec AddTimelock(/datum/job/marine/specialist, list( - JOB_SQUAD_ROLES = 5 HOURS + JOB_SQUAD_ROLES = 9 HOURS )) /obj/effect/landmark/start/marine/spec diff --git a/code/game/jobs/job/marine/squad/standard.dm b/code/game/jobs/job/marine/squad/standard.dm index 2fcd8a3cdd28..cf96fec920e9 100644 --- a/code/game/jobs/job/marine/squad/standard.dm +++ b/code/game/jobs/job/marine/squad/standard.dm @@ -6,6 +6,7 @@ spawn_positions = -1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/pfc + supervisors = "your squad leader, and assigned CIC personnel" /datum/job/marine/standard/on_config_load() entry_message_body = "You are a rank-and-file Marine of the USCM, and that is your strength. What you lack alone, you gain standing shoulder to shoulder with the men and women of the corps. Ooh-rah!" diff --git a/code/game/jobs/job/marine/squad/tl.dm b/code/game/jobs/job/marine/squad/tl.dm index 2b0cff3ea3ed..51e53a8ccc71 100644 --- a/code/game/jobs/job/marine/squad/tl.dm +++ b/code/game/jobs/job/marine/squad/tl.dm @@ -5,6 +5,7 @@ allow_additional = 1 flags_startup_parameters = ROLE_ADD_TO_DEFAULT|ROLE_ADD_TO_SQUAD gear_preset = /datum/equipment_preset/uscm/tl + supervisors = "your squad leader, and assigned CIC personnel" entry_message_body = "You are the Team Leader.Your task is to assist the squad leader in leading the squad as well as utilize ordnance such as orbital bombardments, CAS, and mortar as well as coordinating resupply with Requisitions and CIC. If the squad leader dies, you are expected to lead in their place." /datum/job/marine/tl/generate_entry_conditions(mob/living/carbon/human/spawning_human) @@ -12,7 +13,7 @@ spawning_human.important_radio_channels += JTAC_FREQ AddTimelock(/datum/job/marine/tl, list( - JOB_SQUAD_ROLES = 8 HOURS + JOB_SQUAD_ROLES = 9 HOURS )) /obj/effect/landmark/start/marine/tl diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index e19d190c7442..318bc5c3f71f 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -570,7 +570,7 @@ /obj/structure/sign/ROsign name = "\improper USCM Requisitions Office Guidelines" - desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Quartermaster has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard." + desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Quartermaster has the final say and the right to decline service. Only the Acting Commander may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard." icon_state = "roplaque" /obj/structure/sign/prop1