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

Firearm Condition and Jamming #4322

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3403ebc
Guns can jam now. That was easy enough, time for the hard part.
SomeguyManperson Feb 5, 2025
ba94020
Initial design for jamming, guns now jam. sometimes.
SomeguyManperson Feb 9, 2025
cb0dfcc
desc work and better numbers
SomeguyManperson Feb 9, 2025
f0dbf71
initial generic values & repair kit framework
SomeguyManperson Feb 15, 2025
01ab5d0
Repair kit work. it works now. probably. no sprite, though.
SomeguyManperson Feb 19, 2025
985c2b7
forgor
SomeguyManperson Feb 19, 2025
c489c79
whoops
SomeguyManperson Feb 21, 2025
7c2d51b
Merge remote-tracking branch 'origin/master' into aspacerisawake
SomeguyManperson Mar 5, 2025
668866d
waugh
SomeguyManperson Mar 5, 2025
836c484
Numbers! They're probably fine. Mostly. Aiming for about 3-5 magazine…
SomeguyManperson Mar 6, 2025
5bba509
Player-accessible repair kits, accidents now occur from the gun inste…
SomeguyManperson Mar 6, 2025
ee40d7a
Flavortext runover, indev cleaning and a slight price reduction. We'l…
SomeguyManperson Mar 6, 2025
1e0b737
Testing fixes, probably feature complete enough
SomeguyManperson Mar 6, 2025
40f0a94
Underbarrels can't jam, otherwise something really emberassing could …
SomeguyManperson Mar 6, 2025
290273c
Surplus bullets lose their damage reduction in exchange for the doubl…
SomeguyManperson Mar 6, 2025
fd5d871
Switches shotgun wear to automatic shotguns only. Pump action shotgun…
SomeguyManperson Mar 6, 2025
3a55a8d
better sprite. Not like this one is being used right now.
SomeguyManperson Mar 6, 2025
a7fda0f
wear rate on marksman rifles for readability
SomeguyManperson Mar 6, 2025
1156cfa
pistol readability, also obliterates duplicate candor/penix definitions
SomeguyManperson Mar 6, 2025
b77ac7d
rattlesnake statted as an SMG
SomeguyManperson Mar 6, 2025
db02f6f
Name switch for readability repair kit > maint kit in code
SomeguyManperson Mar 6, 2025
e519b38
Maintenance ND now checks if there is a chambered round OR a magazine…
SomeguyManperson Mar 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pistol readability, also obliterates duplicate candor/penix definitions
  • Loading branch information
SomeguyManperson committed Mar 6, 2025
commit 1156cfa8a7630b65c40a7232b915fea537115549
45 changes: 1 addition & 44 deletions code/modules/projectiles/guns/ballistic/pistol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,56 +24,13 @@

muzzleflash_iconstate = "muzzle_flash_light"
light_range = 1
wear_rate = 1

refused_attachments = list(
/obj/item/attachment/gun,
/obj/item/attachment/sling
)


/obj/item/gun/ballistic/automatic/pistol/candor
name = "\improper Candor"
desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45."
icon_state = "candor"
item_state = "hp_generic"
icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi'

default_ammo_type = /obj/item/ammo_box/magazine/m45
allowed_ammo_types = list(
/obj/item/ammo_box/magazine/m45,
)
fire_sound = 'sound/weapons/gun/pistol/candor.ogg'
rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg'
bolt_drop_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg'
manufacturer = MANUFACTURER_HUNTERSPRIDE
load_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg'
eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg'
show_magazine_on_sprite = TRUE

NO_MAG_GUN_HELPER(automatic/pistol/candor)

/obj/item/gun/ballistic/automatic/pistol/candor/factory //also give this to the srm, their candors should probably look factory fresh from how well taken care of they are
desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of 'Hunter's Pride Arms and Ammunition'. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45."
item_state = "hp_generic_fresh"

NO_MAG_GUN_HELPER(automatic/pistol/candor/factory)

/obj/item/gun/ballistic/automatic/pistol/candor/factory/update_overlays()
. = ..()
. += "[initial(icon_state)]_factory"

/obj/item/gun/ballistic/automatic/pistol/candor/phenex
name = "\improper HP Phenex"
desc = "A uniquely modified version of the Candor, famously created by Hunter's Pride. Named after the daemonic Phoenix of legend that the Ashen Huntsman had once slain, this hell-kissed weapon is more visually intimidating than its original counterpart, but mechanically acts the same. Chambered in .45."
icon_state = "phenex"
item_state = "hp_phenex"

/obj/item/gun/ballistic/automatic/pistol/commissar
name = "\improper Commissar"
desc = "A Nanotrasen-issue handgun, modified with a voice box to further enhance its effectiveness in troop discipline."
Expand Down