-
Notifications
You must be signed in to change notification settings - Fork 116
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 Armed Forces update 6 #646
Open
BonniePandora
wants to merge
30
commits into
cmss13-devs:master
Choose a base branch
from
BonniePandora:UA-armed-forces-update-6
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
UA Armed Forces update 6 #646
BonniePandora
wants to merge
30
commits into
cmss13-devs:master
from
BonniePandora:UA-armed-forces-update-6
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
Tidying up .DMI files, changing ComTech preset to combat engineer, flight crew tidy up
Doubleumc
previously approved these changes
Jan 16, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code looks good. Should definitely get some testing in.
Feature creep can't hurt you (it can) Adjustments to USCM loader & scout-sniper stuff
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
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.
About the pull request
Adds a new collection of presets for USCM, USASF & Army, condenses some of the USASF ones, tidies up some of the .DMI files for accessories (god, kill me they were such a mess), swaps out some naval references in the USASF jobs to space-esque equivelants (seaman becoming voidsman, for example)
USCM M5 loader stuff is credited to the authors of these PRs over on PVP; #7887, #7957 and #7970
Explain why it's good for the game
More adjusted roles for GM's to spawn props from as needed
General tidying up of the .DMI files is never a bad thing
New sprites for logistics uniforms & a new patch for combat engineers.
Testing Photographs and Procedure
Compiles fine, works as intended on local
Screenshots & Videos
Army HUD iconsUSASF HUD icons (synthetic one is broken, unsure what the issue is but I doubt they'll be spawned all that often)
Some icons could do with a touch up but for an initial commit they'll suffice
Changelog
🆑
add: Logistics presets for Army & Marines, pilot presets for USASF
add: Custom-armor compliant versions of the army & usasf M4 armour
del: Lot of unused equipment presets have been axed. Examples include; Provost personnel, WY Directors and elite mercenaries
qol: ComTech is now a Combat Engineer, to seperate them as a specialist attached to the section
fix: Warrant Officer rank-boards now use the right sprite for non-marine ones
imageadd: Sprites for logistics guys on the HUD, along with a new patch for the engineers
imageadd: Army & USASF HUD icons, displaying correctly in-game
maptweak: Removed the now non-existant spawners from maps they were present on
/:cl: