UA Armed Forces update 6 #646
Open
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
Feature creep can't hurt you (it can) Adjustments to USCM loader & scout-sniper stuff
|
also atomization no need to have all removal stuff in the same pr with content updates |
That should be most, if not all, of the mass-removal stuff reverted now. I'll go through it again once the checks are finished |
3a81090: maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm Automatically commited by: tools\mapmerge2\fixup.py
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
1 similar comment
|
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. |
|
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. |
Mostly hAI related, some kit adjustments too
USCM prop presets get two UGL rounds as standard
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
add: US Army & USASF hAI faction datums, so they shouldn't spawn immediately hostile to USCM forces
add: Voicelines for the above factions when spawned as hAI
qol: ComTech is now a Combat Engineer, to seperate them as a specialist attached to the section
qol: SEA has been rebranded into a Drill Instructor
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: