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

Pistol changes #370

Merged
merged 24 commits into from
Aug 28, 2024
Merged

Pistol changes #370

merged 24 commits into from
Aug 28, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Aug 11, 2024

  • Marine vendors loses pistol ammo
  • Marine vendors loses non-standard pistols
  • Marine service pistol magazines added to gear lockup
  • VP78 removed until redesigned/rebalance
  • Various desc changes
  • Various pistol audio changes
  • Marine vendor no longer carries ammo
  • Marine prep zone has service pistol magazines
  • MK-45 Highpower Automag is now called the HG-45 Super and is added to loadout
  • HG-45 Super and 1911 now share same ammo, dealing 45 damage (4 rounds to crit a drone)
  • 1911 now has a silver HG-45 magazine instead of legacy
  • HG-45 black now looks like a USCM pistol sharing palette with the M41A
  • Pistols do not trigger beeping when auto ejecting magazines
  • Black Spearhead added to the loadout

- Marine vendors loses pistol ammo
- Marine vendors loses non-standard pistols
- Marine service pistol magazines added to gear lockup
- VP78 removed until redesigned/rebalance
- Various desc changes
- Various pistol audio changes
- Marine vendor no longer carries ammo
- Marine prep zone has service pistol magazines
- HG-45 Super is added to loadout
AmoryBlaine and others added 9 commits August 11, 2024 00:38
- Removes all visible mentions of 88 Mod in favour of VP70
- Removes VP70/normalpoint and makes the base VP70 ammo FMJ
- Adds VP70/ap
- HG-45 Super and 1911 now share same ammo, dealing 45 damage (4 rounds to crit a drone)
- 1911 now has a silver HG-45 magazine instead of legacy
- HG-45 black now looks like a USCM pistol sharing palette with the M41A
- Pistols do not trigger beeping when auto ejecting magazines
- Reorganizes pistol code
- Reverts M44 changes
- Creates non-tactical variant of .44 automag so you can hear the badass sound fx
- Spearhead no longer specified as a CMB/OCM weapon
- renamed Spearhead pathways from CMB to spearhead
- added black Spearhead for loadout
- Updates Spearhead onmobs
- D18 Hummingbird is just the Hummingbird now
- Hummingbird is now chambered in .50 AE to justify its loud fire sfx and make it a bit more unique
- Hummingbird magazines only fit 3 .50 AE rounds
- Hummingbird damage multiplier maxed out
- Hummingbird has high recoil even when wielded
- Spearhead Armory revolver, instead of Spearhead Armoury autorevolver
-Loadout gear boxes condensed in code
@Doubleumc Doubleumc added the needs tested testmerge this to see what breaks label Aug 17, 2024
@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.

Doubleumc
Doubleumc previously approved these changes Aug 27, 2024
@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.

@Doubleumc Doubleumc merged commit d8e545a into cmss13-devs:master Aug 28, 2024
35 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do not merge Mapping needs tested testmerge this to see what breaks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants