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.

Sign up for GitHub

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

Jump to bottom

Shotgun Overhaul #304

Merged
merged 56 commits into from
Aug 28, 2024
Merged

Shotgun Overhaul #304

merged 56 commits into from
Aug 28, 2024

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Jun 22, 2024 •
edited
Loading

The intent of this PR is to repurpose the various shotguns into a role of their own as primarily functioning to focus knockback and stun damage to xenomorphs, rather than function as outright killers. The intended goal of this is to fit shotguns better into the gameplay of PvE. Where hordes can easily overwhelm you even with heavy firepower, the shotgun will be able to buy you a moment of relief by knocking back advancing xenomorphs allowing your teammates to sustain accurate fire and maintain your position.

  • Super Buck is moved to GM-spawn only, with standard buck and slugs taking its place.
  • Buckshot has been made accurate at a distance and provides spread of knockback pellets that will apply their effect within a range of 4 tiles while doing less damage than previously. They provide no armor penetration.
  • Slugs are made accurate to 8 tiles and do a high degree of damage, and can stun individual xenomorphs for a longer period of time than buckshot to balance with its lack of spread. It has high armor penetration.
  • The Mk221 is given an increased fire rate, removing it's intense delay between shots. The internal magazine has been dropped to 6 in the tube, one in the chamber.
  • The M37 has been given a buff to firing, with there no longer being a delay after pumping. The internal magazine has dropped to four shells in the tube, and one chambered. Also it's now known as the Ithaca 37, customized.
  • Undecided for incendiary and flechette ammo changes
  • UPP Type 23 has had its fire delay lowered and 8 gauge is now Super Buck-lite. Handle with caution or you will instantly fuck your friends out of most of their health.
  • XM38 is has an increased shell count to 7 in the tube, one in the chamber and loses buffs. It's essentially a full auto ithaca.
  • HG is left the way it is. It's an Ithaca but with two seperate tubes of 4 shells each.
  • Shotguns spawn unloaded, as does the M79 cause I thought why not.
  • Shotguns and M79 get repalettes for on-mobs

@AmoryBlaine AmoryBlaine changed the title Shotgun Overhaul WIP - Shotgun Overhaul Jun 22, 2024
AmoryBlaine and others added 8 commits June 22, 2024 22:00
@AmoryBlaine
Update colonialmarines.dme
72b9b5f
@AmoryBlaine
Update shotgun.dm
01f2f1d
@AndroBetel
Merge branch 'master' into shotgun-changes
7ad2da9
@AmoryBlaine
Update
fe32afc 
- M37 internal magazine dropped to 4 and 1 loaded
- Mk221 internal magazine dropped to 7 and 1 loaded
- Various damage, accuracy changes and effects to slug and buck
@AmoryBlaine
Update shotgun.dm
f48212e
@AmoryBlaine
repalette stock
b795a46
@AmoryBlaine
pump edit
1020dd7 
Faster pumping and faster firing for the m37. Pretend you're slam firing 5 12 gauge rounds. More an emergency option than an actual good use of ammo.
@AmoryBlaine
backup uscm generic shotgun sprite update
1dba042
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@AmoryBlaine
Revert "pump edit"
f6c2903 
This reverts commit 1020dd7.
@github-actions GitHub Actions
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@bearrrrrrrr
Copy link
Contributor

bearrrrrrrr commented Jun 29, 2024 •
edited
Loading

uhhh this kinda directly conflicts w/ the use case of the M4RA. not a huge fan :T

@AmoryBlaine
Update shotgun.dm
d023db4 
- Lowers slug accuracy by 1
- Increases weakened effect timers for slug, buckshot and spread
- increases number of spread projectiles
@AmoryBlaine
Update shotguns.dm
a222663
@AmoryBlaine
Type 23 updates
2208aee 
- 8ga Slugs do an absurd 120 damage and high armor pen leaving your target immobile for 6 seconds or whatever that metric is
@AmoryBlaine
Update items_righthand_1.dmi
8c5c212
@AmoryBlaine
some description changes and updated XM38 sprites so its less samey
23b9c78
@AmoryBlaine
Update shotguns.dm
7bf7f96
@AmoryBlaine
Mk221 changes, a vendor change, ithaca's in wood
682b6db 
- Updates Mk221 onmob
- Unloads shotguns by default
- Ithaca's are put in wooden crates instead of sleek black ones
- Chief Engineer vendors can now vend combat shotguns cause there was a conflict and who cares
@AmoryBlaine
I broke it, and then I fixed it
9f98564
@AmoryBlaine
grammar changes to guncases cause my brain didn't like the way it was
f953cfb
@AmoryBlaine
map updates, random m79 wood resprite
c05d2fc 
- map updates
- M79 resprited and had its preload removed
@AmoryBlaine
fug
a10ec94 
- fixed sprite
- actually unloaded the m79
@AmoryBlaine
Disables Point Blank Firing in order to circumvent direction bug
77c3f43 
Decided to disable point blank to cease the 6 tile jump East, until we fix it
@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.

@AmoryBlaine
Fixes Belt and Back onmob merge errors
f3de174
@AmoryBlaine
HG-37 changes
a20b8aa 
- HG-37 has same pump speed as the shotgun, fire delay dropped.
- Military variant of the HG-37 loses its magic damage multiplier, retains higher shell cap.
Doubleumc
Doubleumc requested changes Aug 17, 2024
View reviewed changes
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.

Change instances of apply_effect(x, WEAKEN) to KnockDown(x) and Stun(x). For example:

target.apply_effect(3.5, WEAKEN)

becomes

target.KnockDown(3.5)
target.Stun(3.5)

This is to keep parity with how existing knockdown effect were changed in the Status Effect update.

Additionally, instances where WEAKEN (now KnockDown/Stun) lasts longer than SLOW/SUPERSLOW makes the SLOW/SUPERSLOW pointless, since they'll expire before the target can move at all. Suggest reducing the WEAKEN duration as appropriate.

@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.

@AmoryBlaine
Icon update
af795be
@AmoryBlaine
Dragonsbreath is based
36fcf1c 
8 gauge dragonsbreath is buck but with incen, it's fun
@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.

AmoryBlaine and others added 7 commits August 27, 2024 14:55
@AmoryBlaine
KS-29, M120
f36ffda 
- MK221 is now the M120
- M120 UGL now uses functional sprites
- Type-23 becomes KS-29/4 and KS-29; riot and tactical variants available
- Removed Type23/riot_control in favour of Type23/riot
- Removed excess Type23 variants
@AmoryBlaine
Type 29
f334fa8 
- 8ga Dragsonsbreath useless test code removed
- KS-29 back and suit slot sprites
@AmoryBlaine
Beanbag issue
34fb2da
@AmoryBlaine
Shotguns are unloaded
868c5db
@AmoryBlaine
Max ammo issue
a2373ee
@AmoryBlaine
Merge branch 'master' into shotgun-changes
4534eea
@AmoryBlaine
M120 grenade launcher
339b3ef 
- Grenade launchers fire faster like da movie
Doubleumc
Doubleumc requested changes Aug 27, 2024
View reviewed changes
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.

Either make the indicated slowdowns long enough to matter or remove them. Otherwise looks good.

code/datums/ammo/bullet/shotgun.dm Outdated Show resolved Hide resolved
code/datums/ammo/bullet/shotgun.dm Outdated Show resolved Hide resolved
@AmoryBlaine
fixes
24b7acc 
- Shotgun ammo slow fixes
@Doubleumc Doubleumc merged commit f384b96 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
Reviewers

@Doubleumc Doubleumc Doubleumc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@AmoryBlaine @bearrrrrrrr @cm13-github @Doubleumc @AndroBetel