Updates Outdated Entry Text, Requires CMO to play researcher #5742
Conversation
github-actions
bot
added
Balance
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
Crimsonerva
force-pushed
the
timelocks
branch
from
417c3e5
to
76bf07d
Compare
|
Unlocked by request from the PR author, behave in comment section or risk git sanctions |
increases timelocks and reworks entry text (also patches some things i accidentally left in from prior force push)
Crimsonerva
force-pushed
the
timelocks
branch
from
76bf07d
to
7f9c873
Compare
At time of writing, #5685 is still awaiting approval or denial from staff. Should that PR be merged, the requirement for CMO to have played researcher may already be somewhat obsolete from an in character perspective. As CMO, you should no doubt have a grasp on what a research chem is capable of but that can be learned by playing medic or doctor for a couple rounds anyways. This does bring up the question of if CMO should still be in charge of publishing research chems but that is a topic for that particular PR. Regardless, changes to CMO should be held back until that PR has been decided upon. |
This reverts commit 7f9c873.
Crimsonerva
changed the title
|
Timelocks were reverted, aside from the CMO one I cleared with you in Discord. |
| @@ -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." | |||
There was a problem hiding this comment.
Instead of duplicating the intel officers did you mean the engineering department?
There was a problem hiding this comment.
I did. Some things got jumbled up it seems when I was reverting the other stuff. Fixed! 😄
| @@ -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" | |||
There was a problem hiding this comment.
Redundant to say man the CIC twice.
There was a problem hiding this comment.
More reversion mistakes. Fixed!
Drulikar
added
the
Balance Approved
| 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!" |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
Co-authored-by: Drathek <[email protected]>
|
All outstanding grammatical issues were revised and fixed. Let me know if there's anything else! |
| @@ -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" | |||
| @@ -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." | |||
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
About the pull request
Updates entry text for all roles to be more accurate with modern standards.
Requires CMO to play 3 hours of doctor and 3 of researcher, and 1 additional medical role elsewhere.
Explain why it's good for the game
A lot of the entry text has some outdated information, and this modernizes it to be in accordance with SOP/ML now, along with the rules. People are also told what place they are in for the chain of command, if they are set to take acting commander, outside of squad roles.
Changelog
🆑 Ahana
balance: requires CMO to play researcher and doctor for 3 hours each now
balance: changes entry text in most roles to reflect more modern standards and duties
fix: fixed wrongly listed supervisors for certain marine roles
spellcheck: fixed sign referencing the requisitions officer in the requisitions line to now refer to the quartermaster
spellcheck: marine roles now refer to the leader of the operation as simplified 'commander' as said in marine law, rather than commanding officer to enhance clarity.
/:cl: