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

Sorokyne Strata Patch #410

Merged
merged 30 commits into from
Sep 4, 2024
Merged

Sorokyne Strata Patch #410

merged 30 commits into from
Sep 4, 2024

Conversation

Max-023
Copy link
Contributor

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

About the pull request

Removes all USCM vendors and replaces them with UPP counterparts, as well as USCM gear. CMB equipment is also replaced with UPP equipment to make Sorokyne Strata more adequately feel like a UPP colony. Removes some PVP oriented stuff as well.

Explain why it's good for the game

Sorokyne is a good map held back by inconsistencies regarding the items there. There is a plentiful amount of USCM and CMB equipment and vendors that do not make sense to be on a UPP colony, especially where there are UPP counterparts that exist in code.

Testing Photographs and Procedure

N/A

Changelog

🆑
add: on Sorokyne, UPP 'Territorial Guard' vendor to replace USCM MP Vendors
del: on Sorokyne, removed USCM Galley Vendors
fix: on Sorokyne, Replaces USCM/CMB guns, ammunition, and belts with UPP counterparts
/:cl:

@AmoryBlaine
Copy link
Contributor

Territorial Guard are military units, the sec vendors should make reference to the People's Police instead

@Max-023
Copy link
Contributor Author

Max-023 commented Aug 25, 2024

Territorial Guard are military units, the sec vendors should make reference to the People's Police instead

Fixed.

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

Copy link
Contributor

@Doubleumc Doubleumc left a comment

Choose a reason for hiding this comment

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

Code good, but make each changelog line specify that it is changing just Sorokyne. In the changelog people will only see a contextless line like Replaces USCM/CMB guns, ammunition, and belts with UPP counterparts and get the entirely wrong idea.

@Doubleumc Doubleumc merged commit e7171e5 into cmss13-devs:master Sep 4, 2024
35 checks passed
cm13-github added a commit that referenced this pull request Sep 4, 2024
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.

4 participants