Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates Outdated Entry Text, Requires CMO to play researcher #5742

Closed
wants to merge 4 commits into from
Closed

Updates Outdated Entry Text, Requires CMO to play researcher #5742

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f9c873
re-adjusts timelocks for all roles
Crimsonerva Feb 16, 2024
f19f77d
reverts timelocks (CMO aside), keeps entry text
Crimsonerva Feb 21, 2024
ad9e595
Merge branch 'master' into timelocks
Crimsonerva Feb 22, 2024
5f1171f
Update code/game/jobs/job/civilians/support/researcher.dm
Crimsonerva Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions code/game/jobs/job/antag/xeno/queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/job/antag/xenos/queen
title = JOB_XENOMORPH_QUEEN
role_ban_alternative = "Queen"
supervisors = "Queen Mother"
supervisors = "Your Queen Mother"
selection_class = "job_xeno_queen"
total_positions = 1
spawn_positions = 1
Expand All @@ -13,9 +13,10 @@
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.</B>")
to_chat(new_queen, "<B>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(
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/civilians/other/liaison.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
title = JOB_CORPORATE_LIAISON
total_positions = 1
spawn_positions = 1
supervisors = "the Wey-Yu corporate office"
supervisors = "the Weyland-Yutani public relations office"
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 obey military orders, and you are unable to give them. Although you are not expected to follow orders, you are still within the reach of SOP and Marine Law. Your primary goal is to observe, record, and interact with marines on behalf of the company. You may report back to the company with a fax machine in your office to receive directives, or inform the company. Although you may fax them, you may not receive anything back, which is normal. You are free to make up your own directives which support the company or ulterior motive, though they must remain within the rules."
var/mob/living/carbon/human/active_liaison

/datum/job/civilian/liaison/generate_entry_conditions(mob/living/liaison, whitelist_status)
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/civilians/other/mess_seargent.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/civilians/other/reporter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
total_positions = 1
spawn_positions = 1
selection_class = "job_cl"
supervisors = "the acting commanding officer"
supervisors = "the acting commander, and various public press organizations"
gear_preset = /datum/equipment_preset/uscm_ship/reporter
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
selection_class = "job_cl"
Expand Down
6 changes: 4 additions & 2 deletions code/game/jobs/job/civilians/support/cmo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."

AddTimelock(/datum/job/civilian/professor, list(
JOB_MEDIC_ROLES = 10 HOURS
JOB_MEDIC_ROLES = 10 HOURS,
JOB_DOCTOR = 3 HOURS,
JOB_RESEARCHER = 3 HOURS,
))

/obj/effect/landmark/start/professor
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/civilians/support/nurse.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
title = JOB_NURSE
total_positions = 3
spawn_positions = 3
supervisors = "the chief medical officer"
supervisors = "the chief medical officer, and doctors you work under"
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 also an expert when it comes to 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
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/civilians/support/researcher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, 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."
Crimsonerva marked this conversation as resolved.
Show resolved Hide resolved

/datum/job/civilian/researcher/set_spawn_positions(count)
spawn_positions = rsc_slot_formula(count)
Expand All @@ -28,7 +28,7 @@
return positions

AddTimelock(/datum/job/civilian/researcher, list(
JOB_MEDIC_ROLES = 5 HOURS
JOB_MEDIC_ROLES = 5 HOURS,
))

/obj/effect/landmark/start/researcher
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/civilians/support/synthetic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
spawn_positions = 1
allow_additional = 1
scaled = 1
supervisors = "the acting commanding officer"
supervisors = "the acting commander, command staff"
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 and command staff. Special circumstances may change this!"
Comment on lines -7 to +12
Copy link
Contributor

@Drulikar Drulikar Feb 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I'm not sure this is exactly correct or it seems awkward this way. I'd just leave it as the acting commander since that's going to be the value for most roles anyways. If you're firm on this though, then its probably fine.

Copy link
Author

Choose a reason for hiding this comment

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

Synth guidelines require players to follow command staff's orders.
"Do not disobey valid orders from Command personnel. An unlawful order is not valid, thus can be ignored."

I'll leave the final call up to you, I only had it this way because that specifically requires synthetics to follow it. I thought it would be a good reminder for newer synthetics.

Copy link
Contributor

@Drulikar Drulikar Mar 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

When I asked the council they said it was that you need to listen to 2nd Lt and above not that you answer to them directly. There were also concerns that people could abuse this wording. So no I still think it should be how it was. Or worded differently.


/datum/job/civilian/synthetic/New()
. = ..()
Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/command/auxiliary/auxiliary_support_officer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
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."
supervisors = "the acting commander"
entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to oversee</a> the hangar crew, the intel officers 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."
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of duplicating the intel officers did you mean the engineering department?

Copy link
Author

Choose a reason for hiding this comment

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

I did. Some things got jumbled up it seems when I was reverting the other stuff. Fixed! 😄

Copy link
Contributor

Choose a reason for hiding this comment

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

This is still unresolved.


AddTimelock(/datum/job/command/auxiliary_officer, list(
JOB_SQUAD_ROLES = 5 HOURS,
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job/command/auxiliary/crew_chief.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
spawn_positions = 2
allow_additional = TRUE
scaled = TRUE
supervisors = "the pilot officers"
supervisors = "your assigned dropship pilot"
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
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/command/auxiliary/intel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/command/auxiliary/pilot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/command/auxiliary/senior.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/command/cic/executive.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, 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)
Expand Down
3 changes: 2 additions & 1 deletion code/game/jobs/job/command/cic/staffofficer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
scaled = FALSE
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/so
entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to monitor the Marines, man the CIC, and listen to your superior officers.</a> You are in charge of logistics and the overwatch system. You are also in line to take command after other eligible superior commissioned officers."
supervisors = "the acting commander"
entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>Your job is to monitor the Marines, man the CIC via overwatch, man the CIC, and listen to your Acting Commander.</a> 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"
Copy link
Contributor

Choose a reason for hiding this comment

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

Redundant to say man the CIC twice.

Copy link
Author

Choose a reason for hiding this comment

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

More reversion mistakes. Fixed!

Copy link
Contributor

Choose a reason for hiding this comment

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

This is still unresolved.


/datum/job/command/bridge/set_spawn_positions(count)
spawn_positions = so_slot_formula(count)
Expand Down
6 changes: 3 additions & 3 deletions code/game/jobs/job/command/command.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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()

Expand All @@ -33,4 +33,4 @@
/datum/timelock/dropship/New(name, time_required, list/roles)
. = ..()
src.roles = JOB_DROPSHIP_ROLES_LIST

2 changes: 1 addition & 1 deletion code/game/jobs/job/command/police/chief_police.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
selection_class = "job_cmp"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/uscm_police/cmp
entry_message_body = "<a href='"+WIKI_PLACEHOLDER+"'>You</a> are held by a higher standard and are required to obey not only the server rules but the <a href='"+LAW_PLACEHOLDER+"'>Marine Law</a>. 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 = "<a href='"+WIKI_PLACEHOLDER+"'>You</a> are held by a higher standard and are required to obey not only the server rules but the <a href='"+LAW_PLACEHOLDER+"'>Marine Law</a>. 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,
Expand Down
Loading
Loading