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.

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

Increases XO Police skill by 1 #6781

Merged
merged 1 commit into from
Jul 29, 2024

Conversation

TheManWithNoHands
Copy link
Contributor

@TheManWithNoHands TheManWithNoHands commented Jul 23, 2024

About the pull request

  • Increases the police skill of the XO to SKILL_POLICE_SKILLED from SKILL_POLICE_FLASH

Explain why it's good for the game

The XO can choose a MP belt from their own vendor, but cant use most of the items in it.
Either XO is able to use the MP belt from their own vendor, or the MP belt gets removed.
But one of those things needs to change, having a noob trap in the XO role aint cool.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑TheManWithNoHands
balance: increases XO police skill by 1

/:cl:

@github-actions github-actions bot added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Jul 23, 2024
@Drulikar
Copy link
Contributor

Duplicate change to #6301 but can leave this up until if/when that closes/merges

@Drulikar Drulikar added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Jul 29, 2024
@Drulikar Drulikar added this pull request to the merge queue Jul 29, 2024
Merged via the queue into cmss13-devs:master with commit 6247394 Jul 29, 2024
28 checks passed
cm13-github added a commit that referenced this pull request Jul 29, 2024
github-merge-queue bot pushed a commit that referenced this pull request Aug 3, 2024
# About The Pull Request
Follow up PR to
[#4707](#4707). Aims to expand
XO vendors to bring them up to date with modern combat meta, as well as
clean up my SO vendor update in the process.
- Added gear specializations to the XO weapons vendor, offering the
essentials set of either a Medic or Engineer
- Adds a Magharn to rail attachments section in the XO weapons vendor
- Expanded belt/pouch options in the XO weapons vendor
- Added the 'other gear' section in the XO vendor, with various combat
supplies

Misc.
- Fixed XO/SO vendor code so that selecting the autoinjector pouch gives
you a full one, rather than empty
- ~~Increased XO policing skillset from 1, to 2, so they can actually
use the MP belt they are offered~~ (Already done in #6781 )
- Unified the SO armory vendor code into the regular SO vendor file,
rather than having two seperate

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game

The XO gear vendors have sat untouched in the code for quite some time,
and have been left to fall behind the quickly changing meta of CM. With
a more updated selection of modern gear, XOs will no longer be
significantly out-geared by their Staff Officers when it comes to
organizing their combat kits, especially during hijack.

XOs will be brought up to par with the gear diversity that SOs have
enjoyed for some months now.

# Testing Photographs and Procedure

Select photos of the updated XO vendor menus, where changes have been
made

<details>

![Screenshot 2024-05-17
160207](https://github.com/cmss13-devs/cmss13/assets/31124786/bc48f7e7-a6d4-44a6-91c8-7e9090ab83a8)

![Screenshot 2024-05-17
160216](https://github.com/cmss13-devs/cmss13/assets/31124786/b48ebdd3-7f3a-42cb-9411-ae5385c9273d)

![Screenshot 2024-05-17
160228](https://github.com/cmss13-devs/cmss13/assets/31124786/f2b14ecb-ff72-4437-ad24-3692e0447d13)

![Screenshot 2024-05-17
160236](https://github.com/cmss13-devs/cmss13/assets/31124786/f07ff972-ed74-478e-9eec-e2080c128f60)

</details>


# Changelog
:cl:
refactor: SO armory vendor code refactored into the main SO gear vendor
code
balance: XO weapon and clothing vendors fitted with a more modernized
equipment set
balance: XO weapon vendor now offers Medic or Engineer essentials sets
fix: Vending an autoinjector pouch as SO or XO now produces a full
pouch, rather than empty
balance: SO's mod88 removed from cryo spawn and moved to their vendor
instead
/:cl:

---------

Co-authored-by: Drathek <[email protected]>
@TheManWithNoHands TheManWithNoHands deleted the XO-skill branch August 24, 2024 15:17
@TheManWithNoHands TheManWithNoHands mentioned this pull request Aug 27, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants