-
Notifications
You must be signed in to change notification settings - Fork 87
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
Open
AmoryBlaine
wants to merge
116
commits into
cmss13-devs:master
Choose a base branch
from
AmoryBlaine:conscripts-gone
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
UPP Overhaul #385
+141,206
−143,709
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
AmoryBlaine
commented
Aug 17, 2024
•
edited
Loading
edited
- Replaces UPP "Conscript" with UPP Territorial Guardsmen; essentially planetary defense force soldiers who may be the first to respond to a situation on their respective planet or provide recon assistance to the Naval Infantry. They are not poorly armed, poorly trained fodder. No one in the UPP Armed Collective is.
- Equipped versions of all UPP Platoon roles
- Removes excess Commando variants. We don't deploy or use them like a functional PvP squad so why have DS variants and medics among them, it's just more stuff we need to scroll through to find the things we actually use.
- Lowest rank in the UPP is now "Ryadovoy".
- Naval Infantry all spawn with the unique Naval Infantry beret
- Armor designs updated and stats changes
- UPP Dropship minor updates
- UPP prep map update
- UPP colonists - civilians, police and researchers
- All loadout guns available to UPP
- Type 50 entrenching tool
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.
…o conscripts-gone
Conflicts have been resolved. A maintainer will review the pull request shortly. |
- 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
…o conscripts-gone
- 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
Irritated and annoyed. - Deletes useless ERT Devils, UPP and UPP Commandos
- Adds the full PaP uniform
- UPP Combat Synth name fixed - Soro fixed - KS-29 is pump desc - NP92 ammo box
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.