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

Gang Rework - Guns #18180

Merged
merged 14 commits into from Mar 15, 2024
Merged

Gang Rework - Guns #18180

merged 14 commits into from Mar 15, 2024

Conversation

TDHooligan
Copy link
Contributor

@TDHooligan TDHooligan commented Mar 11, 2024

About the PR

The guns for gang rework, and the changes to allow single-shell reloads or energy cell incompatibility.

Included in this PR are the following:
Webley Revolver:
webleysnubwebleysnubfirewebleysnubopen

Sprited by what7431
Uses a new ammunition type, breaks open to reload. 6 shots of .455 Webley.
Gains a short 'fan the hammer' effect when drawn from a pocket with empty hands, deteriorating accuracy but increasing fire rate.

9mm Lo-Point
hipointhipoint-empty
Uses existing Hi-Point sprites, reanimated. Also a pun on 'throwaway guns'
Uses standard 9mm. If thrown while empty, it will explode into pieces on impact with a player, doing bonus damage.

Hafgan Mod. 93R Repeating Laser
lasergatidlelasergatlasergatempty
Modified from an existing sprite in the repository.
A burst-laser weapon that uses single-use magazines. Essentially a laser equivalent to gang's kinetics.

9mm MOR-30
uziuzi-empty
Sprite by Mora.
A high-firerate, no-frills, all-damage 9mm automatic with custom ammunition (to stop it being a 2h KO).

Greafe/Grease/Greece/Grief Gun
grease-emptygreasegungreaseunfoldedgreaseunfolded2
Sprite by Moriarty.
In by cogwerks' request. Similar in purpose to the MOR-30, but is in poor shape and gains improved accuracy, at the cost of an inconsistent firerate, until made better/worse by Chem.

Draco Machine-Pistol
dracodracoempty
Sprite by Shmiggy/Moriarty
A bizarre, incredibly high recoil 7.62 'Pistol'. Currently has no recoil as its' entire schtick was turned into a feature in #18161. Will reimplement if 18161 is merged.

Striker-7
striker12
Sprite by Blackrep
A 7-shot drum fed shotgun, that can only be reloaded 1 shell at a time due to its awkward drum mechanism. Comes loaded with birdshot.

M16
Sprite from the repo.
A 20-round single-shot 5.56 gun, with a 2 shot burst. A rare find from gang crates for gang members, so it's simply straightforward and effective.

American-180
american180american180-empty
Sprite from Cogwerks.
177 rounds of .22, fired at obscene rates with poor accuracy. Balanced by its' rarity and limited single target DPS via a built in miss mechanic.

Why's this needed?

gun's

@TDHooligan TDHooligan requested a review from pali6 as a code owner March 11, 2024 19:05
@boring-cyborg boring-cyborg bot added C-Sound Automatically applied on any .ogg or sound folder change. C-Sprites Automatically applied on any .dmi or icons folder change labels Mar 11, 2024
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Mar 11, 2024
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gun's! I really like these, oozing with flavour and hopefully the right amount of jank to use. Balance may need tweaking but depends a lot on how often each gun shows up.
I got a "sprites look decent" from a spritemin and they generally look good to me (I love the little gas burst from the hafgan laser pistol). Would be nice to have the sprites in the PR body as the icondiffbot previews are kind of small.

code/obj/item/gun/kinetic.dm Outdated Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Outdated Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Outdated Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Outdated Show resolved Hide resolved
TDHooligan and others added 3 commits March 13, 2024 16:44
Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
code/obj/item/gun/kinetic.dm Outdated Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Outdated Show resolved Hide resolved
code/obj/item/gun/kinetic.dm Show resolved Hide resolved
shoot() // fuck up firerate speed
var/datum/component/holdertargeting/fullauto/firemode = GetComponent(/datum/component/holdertargeting/fullauto)
var/delay = firemode.delaystart*10
if (grease > 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to have a message that plays when the gun "runs out" of grease, something like "The Grease Gun sputters and clanks" (I don't know what noise it would make but something)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe. it being a brief speedup makes more sense than it being a distinct state IMO. and less chat clutter.

@444Portal 444Portal added E-Add-To-Wiki A PR that will require changes to the wiki A-Game-Objects The point of this PR is to deal with a specific game object labels Mar 14, 2024
TDHooligan and others added 4 commits March 14, 2024 20:43
Co-authored-by: TobleroneSwordfish <20713227+TobleroneSwordfish@users.noreply.github.com>
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like you can only fan the hammer once now?

@TobleroneSwordfish TobleroneSwordfish merged commit d772ca0 into goonstation:master Mar 15, 2024
22 checks passed
@TDHooligan TDHooligan deleted the gang-guns branch March 23, 2024 17:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object C-Sound Automatically applied on any .ogg or sound folder change. C-Sprites Automatically applied on any .dmi or icons folder change E-Add-To-Wiki A PR that will require changes to the wiki size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants