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

UA Civilian Overhaul #529

Merged
merged 81 commits into from
Dec 2, 2024
Merged

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Oct 29, 2024

About the pull request

Removes PvP survivor presets and a lot of background code they touch, along with a lot of corpses that clog up the presets and are built off of legacy presets. This is done in favour of more generic colonist presets in order to provide an aesthetically coherent roster of props to the setting, largely building off the props I added in the UPP update.

  • Adds shirtless variants of all businesswear
  • Adds khaki and grey businesswear
  • Adds code around assignment name allowing variance for the same prop
  • Drops security belt storage capacity and base spawn items
  • Adds Hybrisa-styled vest
  • Allows ponchos to be utilized with all armor types
  • Fixes minor poncho bug
  • Condenses UPP code
  • Adds M20A rifle and magazines/boxes for UA guard preset
  • Deleted a few outfits unused anywhere in the game in order to save room in uniform files
  • Cleans up corpse presets
  • updated riot helmet
  • updated khaki patrol cap
  • new dark blue patrol cap

Explain why it's good for the game

Aesthetic cohesion, immersive props, more variety, less code.

Testing Photographs and Procedure

N/A

Changelog

🆑 AmoryBlaine, Zenith/Hybrisa PR
add: Adds large quantity of new clothes and loadout presets
del: Removes all old colonist and survivor presets
qol: GMside, easier organization of colonist props by 'civilian'
balance: Balances props around PvE gameplay and probable usage.
fix: Simplifies loadout RNG selection for UPP and UA colonists
code: Aforementioned preset code
refactor: Aforementioned preset code
imagedel: Unused vanilla legacy icons
/:cl:

@github-actions github-actions bot added Sprites Missing Changelog Maintainers always document their changes. labels Oct 29, 2024
@AmoryBlaine AmoryBlaine changed the title UA Civilian Overhaul DRAFT UA Civilian Overhaul Nov 3, 2024
@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.

@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.

@Doubleumc Doubleumc merged commit cdfdf98 into cmss13-devs:master Dec 2, 2024
39 checks passed
cm13-github added a commit that referenced this pull request Dec 2, 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