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

SO CIC vendor quality of life tweaks #4707

Merged
merged 5 commits into from
Oct 22, 2023
Merged

SO CIC vendor quality of life tweaks #4707

merged 5 commits into from
Oct 22, 2023

Conversation

SpypigDev
Copy link
Contributor

@SpypigDev SpypigDev commented Oct 17, 2023 •
edited
Loading

About the pull request

Brings more cohesion to the SO vendor system, as well as CIC Armory. Reworking the gear/prep aspect of SOs to better reflect what gear would be reasonable for them to have IC (no machetes right out of cryo for example).

  • SO spawn vendors majorly cut back, with webbing, combat helmet, machete, all belts, and RTO pack removed, moving each to the SO Armory Vendor. The SO spawn vendor should provide purely for SO activity within CIC, and I feel this is more appropriate
  • Added a new vendor in CIC's Armory called the 'SO Armory Vendor' to serve as a new location for the deployment gear set required by SOs.
  • On top of already already-mentioned moved gear, the Armory vendor adds combat gear, aviator shades (because of course), an option to specialize as either an Engineer or a Medic with their essential kit, an engineer belt! (as well as all the other belts removed from the SO spawn room)
  • Adds some extra items to the Armory vendor point-buy section to finally give SOs a reason to chew up their 45 points, notably including the RTO pack

Explain why it's good for the game

I've always found it really unusual how SO spawn vendors are a bit all over the place in terms of supplied gear. With this PR, SO gear has been split into two distinct vendors, with one being firmly behind the Armory shutters to ensure that SOs aren't allowed to continually roll around the Almayer with a full combat set minus the chest piece and rifle. This way, SOs can still get basic gear needed for CIC operation from their regular vendor, but can also access a full combat set and more once the Armory shutters go up, whether it's from XO deployment or code red.

Testing Photographs and Procedure

Screenshots & Videos

New SO spawn vend: https://cdn.discordapp.com/attachments/1100833406314618880/1163812305352528015/image.png?ex=6540efac&is=652e7aac&hm=5a4db3d47b2a0f6416e7b0181ad135913203512f7fb7b5c5600394d75e9856aa&

Armory Vendor, the typo has since been repaired (1/2): https://cdn.discordapp.com/attachments/1100833406314618880/1163812464232775690/image.png?ex=6540efd2&is=652e7ad2&hm=b6040e631260ef77f502903b1cf65a59d18f7b2a896d45d0d0e9ce0493e2887e&

Armory Vendor (2/2): https://cdn.discordapp.com/attachments/1100833406314618880/1163812566569582632/image.png?ex=6540efea&is=652e7aea&hm=186a90a37c2b6b8821de93ae476aa02733db22a9360e050900beb81d4b412a7a&

New CIC Armory setup: https://cdn.discordapp.com/attachments/1100833406314618880/1163812692696498226/image.png?ex=6540f008&is=652e7b08&hm=7434e1a665e87af3683be853a388c97039f3c790ba1c17e9482347c532fca2e9&

Changelog

🆑
add: CIC Armory SO vendor
balance: Moved most combat-themed gear from SO spawn vendors, to CIC Armory vendor
balance: Made RTO pack a point-buy item in CIC Armory vendor for SOs
/:cl:

@SpypigDev
SO vend rework
f78963f 
- Adds SO Armory vendor with more combat focused gear in CIC Armory
- Majorly cuts back SO spawn vendor gear, moving most of it to CIC Armory
@SpypigDev
Updated vend name (oops!)
fe57578
@github-actions github-actions bot added Mapping did you remember to save in tgm format? Feature Feature coder badge Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Oct 17, 2023
@BeagleGaming1
Copy link
Contributor

You left a lot of commented out code

@SpypigDev
Copy link
Contributor Author

Yeah I'm aware, just so we can keep track of the old SO gear setup in case we wanted to restore it in the future

@harryob
Copy link
Member

harryob commented Oct 17, 2023

Yeah I'm aware, just so we can keep track of the old SO gear setup in case we wanted to restore it in the future

that's what git is for, not code comments. if we did that for the past 8 years comments would be 90% of the code

@SpypigDev
Copy link
Contributor Author

Yeah I'm aware, just so we can keep track of the old SO gear setup in case we wanted to restore it in the future

that's what git is for, not code comments. if we did that for the past 8 years comments would be 90% of the code

Fair enough I suppose, comments cleaned

@Zonespace27 Zonespace27 added the Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. label Oct 22, 2023
@Zonespace27 Zonespace27 added this pull request to the merge queue Oct 22, 2023
Merged via the queue into cmss13-devs:master with commit 34878a1 Oct 22, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Oct 22, 2023
@cm13-github
Automatic changelog for PR #4707 [ci skip]
b511436
@SpypigDev
Copy link
Contributor Author

Until next time!

@SpypigDev SpypigDev mentioned this pull request May 17, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Aug 3, 2024
@SpypigDev @Drulikar
CIC Vendor Expansion (Part 2) (#6301)
3ffcf5e 
# 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harryob harryob harryob approved these changes

@Zonespace27 Zonespace27 Zonespace27 approved these changes

Assignees
No one assigned
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. Feature Feature coder badge Mapping did you remember to save in tgm format?
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SpypigDev @BeagleGaming1 @harryob @Zonespace27