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

New UPP guns #3865

Merged
merged 39 commits into from
Aug 25, 2023
Merged

New UPP guns #3865

merged 39 commits into from
Aug 25, 2023

Conversation

CapCamIII
Copy link
Contributor

@CapCamIII CapCamIII commented Jul 11, 2023

About the pull request

Adds a bunch of new UPP guns to replace ill-fitting ones, respites others, removes others, also does some balance changes that I feel would be good for the game, nothing too outrageous I believe.

All sprites by wei/esselnek

lore and stuff

Look at changelog and code for specific changes unless i get asked by a dev to list them here

Explain why it's good for the game

New UPP guns to replace old things that don't make sense, better sprites, IMO needed balance changes.

Testing Photographs and Procedure

image
Slightly outdated and I forgot Type 23, but mostly correct. Look at imagediff for type 23 sprite

Changelog

I might have forgotten a thing or two since I've been working on this on and off since April, but from what I can tell mostly there

🆑
add: Adds 6(8 if you're pedantic) new guns for the UPP, details for each in following lines.
add: Type 19, Replacement for PPsh on colonies and black market.
add: Type 64, replacement for scorpion, full sized SMG, 2 versions, 1 for upp, 1 for not upp
add: HJRA-12, RPG for UPP.
add: Type 73, pistol for higher ranked UPP troops, UPP COs get a Type 74 which has high-impact rounds, replaces PK9 in non-UPP use.
add: NP92, pistol, replaces PK9 in UPP use(mostly), integrally suppressed version called NPZ92 for UPP Commandos.
add: QYJ-72, UPP GPMG, replaces minigun with UPP Minigunners
add: Technically resprites but due to changes closer to replaces N-Y revolver with ZHNK-72
add: Adds a character custom loadout Type 73, 2 mags spare.
add: UPP helmets now work as ear protection, intended use with HJRA-12 RPG
add: UPP officers now have regular UM4 helmets instead of UH7 helmets in their vendors as UH7 looked ugly with their combat gear
del: Removes the PK9 entirely
del: Removes tranqs from UPP Commando loadout
del: Removes HEAP ammo from UPP officers and commandos, replaced with normal and AP mags when applicable
balance: UPP jackets no longer have massive armor, in exchange they no longer slow and in clothing vendors a light version of UPP armor is vendable
balance: UPP MPs are now armed with a ZHNK-72 belt on their jacket, with an additional shrapnelshot loader in their belt.
balance: Rebalances Type 71 damage/firerate/AP to be a sidegrade of M41A, about equal DPS, higher damage per shot and AP, lower fire rate, carbine is round-about the exact same as M41A however.
balance: Fixes UPP support armor, given to medics on their person and officers in their vendor, lighter version of UPP armor, exchanges protection for speed.
balance: Seperates SVD bullet damage from crude rifle bullet and buffs it as a hard-hitting AP bullet.
balance: Rebalances UPP revolver(now ZHNK-72), much harder hitting and has higher AP, but rarer, shrapnelshot extremely rare and good.
balance: Due to ammo changes, SVD no longer has burst.
balance: Removes ceramic plates from UPP loadouts
fix: UPP Major now has the correct UPP Commander skillset
fix: UPP Commander skillset can BE
fix: Fixes typepath for UPP support/light armor, actually works now.
spellcheck: Renames SVD to Type 88
spellcheck: Renames UPP Minigunner to UPP Machinegunner
spellcheck: Renames UPP jackets to UL4 all around
soundadd: Adds firing sounds for Type 73 and SVD/UPP MG
imageadd: Resprites the SVD, Type 71, and Type 23, all sprites by wei/esselnek
imageadd: Adds sprites for all above guns, all sprites by wei/esselnek
maptweak: Changes instances of skorpion to non-upp type 64, also changes instances of ppsh to type 19
/:cl:

@github-actions
Copy link
Contributor

You currently have a negative Fix/Feature pull request delta of -9. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge Removal snap Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Fix Fix one bug, make ten more Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors labels Jul 11, 2023
@BeagleGaming1
Copy link
Contributor

Could you elaborate on what this was?

qol: made something easier to use

@CapCamIII
Copy link
Contributor Author

Could you elaborate on what this was?

qol: made something easier to use

I forgot to remove the default CL for QOL

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 16, 2023
@Zonespace27 Zonespace27 added this pull request to the merge queue Aug 25, 2023
Merged via the queue into cmss13-devs:master with commit 3163b00 Aug 25, 2023
25 checks passed
cm13-github added a commit that referenced this pull request Aug 25, 2023
@CapCamIII CapCamIII deleted the upp-guns branch August 25, 2023 04:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Fix Fix one bug, make ten more Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Removal snap Sound Blast 5 minutes of bass boosted music to our players Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants