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

UPP Overhaul #385

Merged
merged 192 commits into from
Oct 28, 2024
Merged

UPP Overhaul #385

merged 192 commits into from
Oct 28, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Aug 17, 2024

  • Aesthetic overhaul of the SSV Chapaev.
  • New USCM and UPP cargo containers for map design.
  • New E-tool for UPP forces.
  • New UPP uniform
  • New UPP helmet and armors
  • KS-29 riot shotgun is now pump action.
  • New Territorial Guard prop roles: UPP Armed Collective military units stationed in the frontier and on border worlds. Very good at land nav, lightly armored, usually the first responders to emergencies on their respective planets.
  • New UPP generic civilians, Ministry of Education researchers, medical doctors, cargo techs, administrators, maintenance techs, operations technicians and People's Armed Police prop roles.
  • Equipped variants of all platoon roles.
  • Armor stats redesigned to fit PvE combat
  • New book sprites
  • Overhauled UPP access

@cm13-github
Copy link
Contributor

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

- UPP Loadouts updated
- USCM and CMB loadouts no longer look stupid.
@cm13-github
Copy link
Contributor

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

AmoryBlaine and others added 23 commits August 18, 2024 00:53
- UPP Survivors are deleted
- Comm titles standardized as all caps
- Type 71 suit storage onmob
- Mild UPP armor improvements
- Updated UPP uniform
- Boots overhaul
- New UPP boonie
- UPP Naval Infantry Platoon now spawn with Naval Infantry berets.
- UPP Naval Infantry Platoon wear black gloves and boots
- UPP Heavy and Support armor overhaul
- Combat Gloves overhauled, excess killed
- Combat Boots overhauled, excess killed
- New Onmob IDs
- Removed excess customization from UPP squad prep vendor- added two types of balaclava and tactical scarf. you're Naval Infantry, not yokels in civilian ushankas
- No magic sterile gloves. Choose; combat gloves or sterile gloves
- New armor & helmet lore
- UPP helmet now has HUD optics
- UPP armor no longer as slow
- Presets brought into cohesion
@cm13-github
Copy link
Contributor

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

Doubleumc
Doubleumc previously approved these changes Oct 23, 2024
AndroBetel
AndroBetel previously approved these changes Oct 23, 2024
@cm13-github
Copy link
Contributor

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

@AmoryBlaine AmoryBlaine dismissed stale reviews from AndroBetel and Doubleumc via c1c4dfe October 23, 2024 21:28
@cm13-github
Copy link
Contributor

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

Doubleumc
Doubleumc previously approved these changes Oct 24, 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.

@Doubleumc Doubleumc merged commit 167ac89 into cmss13-devs:master Oct 28, 2024
37 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Github Mapping Missing Changelog Maintainers always document their changes. needs tested testmerge this to see what breaks Sound Sprites UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants