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

Limited Service/Out of Service Equipment Adjustments #408

Merged
merged 21 commits into from
Aug 24, 2024

Conversation

Max-023
Copy link
Contributor

@Max-023 Max-023 commented Aug 22, 2024

About the pull request

This pull request removes the shotgun scabbard and pouch from the vendors of the USCM and instead places them in the M37 boxes to keep consistent with the limited service nature the M37 has. Generic gas masks have also been removed from all prep vendors and replaced with service models, the generics now being considered 'civilian grade'. Civilian gas masks can still be selected from the preferences menu, however.

The new masks to replace are the M5 Standalone Gasmask and the PMK-63 Gasmask. The M5 Standalone is an alternative variant to the M5 Integrated for use with individuals who are not wearing or do not have access to the M10 Pattern helmet. The PMK-63 as well as its front line variant, the PMK-63N, are gas masks designed for UPP troops and act as the counterpart to the M5. The 63N more specifically is designed to attach to in-service helmets within the UPP Armed Forces.

Explain why it's good for the game

The shotgun stuff is more of a minor thing that is just inconsistent with the M37s. The Marines don't need that many shotgun shell pouches when they usually only get enough shells to fill two and they don't need fifteen shotgun scabbards when they only get two shotguns.

The gas masks are good because the generic one tonally doesn't make sense to be both used by colonists as well as military personnel, especially personnel of both sides. The M5 Standalone is necessary to keep Marines aesthetically consistent and both PMKs are necessary to further separate the UPP into being its own faction rather than continue to exist using USCM gear to fill the gaps it has.

Testing Photographs and Procedure

N/A

Changelog

🆑
add: Added PMK-63 and PMK-63N to UPP vendors
add: M5 Standalone to USCM regular and FORECON vendors
add: A shotgun scabbard and shotgun shell pouch to M37 box kits
del: Removed generic gas masks from squad prep vendors
del: Shotgun scabbards and shotgun shell pouches from USCM regular and FORECON vendors
tweak: Generic gas masks now cost only 1 point for those that still want to use them
tweak: Generic gas masks now are referred to as 'civilian grade' to denote their status as a civilian model
tweak: Altered the description of the M5 Integrated Gasmask to not be the haha funny jarhead PVP lore
/:cl:

@Max-023 Max-023 changed the title Limited Service/Out of Service Adjustments Limited Service/Out of Service Equipment Adjustments Aug 22, 2024
code/modules/clothing/masks/gasmask.dm Outdated Show resolved Hide resolved
@@ -117,7 +116,6 @@
list("First-Aid Pouch (Injectors)", round(scale * 15), /obj/item/storage/pouch/firstaid/full, VENDOR_ITEM_REGULAR),
list("Flare Pouch (Full)", round(scale * 15), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR),
list("Magazine Pouch", round(scale * 15), /obj/item/storage/pouch/magazine, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Pouch", round(scale * 15), /obj/item/storage/pouch/shotgun, VENDOR_ITEM_REGULAR),
Copy link
Contributor

Choose a reason for hiding this comment

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

with amory's PR we're getting multiple shell boxes, what if i want to put them all in my pockets? i see no reason for removing this pouch from the vendors

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Given that this is a PR for the current state of the game, not for Amory's PR, I am willing to modify it to account for Amory's changes if they are fully merged and add a second pouch. The point of removing them from the vendors is because they are not standard service, so they should be lumped into the case with the weapon as well to fully reflect its use within the USCM.

@AndroBetel AndroBetel merged commit 05dd6bf into cmss13-devs:master Aug 24, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants