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 Armed Forces update 6 #646

Open
wants to merge 30 commits into
base: master
Choose a base branch
from

Conversation

BonniePandora
Copy link
Contributor

@BonniePandora BonniePandora commented Jan 4, 2025

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 icons

image

USASF 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

image

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:

Tidying up .DMI files, changing ComTech preset to combat engineer, flight crew tidy up
Doubleumc
Doubleumc previously approved these changes Jan 16, 2025
Copy link
Contributor

@Doubleumc Doubleumc left a 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.

@Doubleumc Doubleumc added the needs tested testmerge this to see what breaks label Jan 16, 2025
Feature creep can't hurt you (it can)
Adjustments to USCM loader & scout-sniper stuff
@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.

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.

3 participants