cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[READY] The not so great but pretty alright ammo simplifcation (#9831)

Browse Source
This commit is contained in:
tacoguy7765093
2025-01-15 07:28:18 -06:00
committed by GitHub
parent a6da9bf9bf
commit d0ebe164ac
24 changed files with 2712 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/ammunition/magazines.dm
View File

@@ -427,8 +427,6 @@
ammo_type = /obj/item/ammo_casing/a9mm/ap
matter = list(MAT_STEEL = 1000, MAT_PLASTEEL = 2000)
// P90
/* CHOMPEDIT Commented out, moved to zz_magazines_ch.dm *
/obj/item/ammo_magazine/m9mmp90
name = "large capacity top mounted magazine (9mm armor-piercing)"
icon_state = "p90"
@@ -441,7 +439,13 @@
/obj/item/ammo_magazine/m9mmp90/empty
initial_ammo = 0
* CHOMPEDIT Commented out, moved to zz_magazines_ch.dm */
//CHOMPadd begin
/obj/item/ammo_magazine/m9mmp90/rubber
name = "large capacity top mounted magazine (9mm rubber)"
ammo_type = /obj/item/ammo_casing/a9mm/rubber
matter = list(MAT_STEEL = 2000, MAT_PLASTIC = 1000)
//CHOMPadd end
// Stripper Clip
/obj/item/ammo_magazine/clip/c9mm

4
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -306,8 +306,8 @@
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
list(mode_name="3-round bursts", burst=3,burst_delay=1 ,fire_delay=null, move_delay=4, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), //CHOMPedit, firerate buff
list(mode_name="short bursts", burst=5,burst_delay=1 ,move_delay=3, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)) //CHOMPedit, firerate buff
)
/obj/item/gun/projectile/automatic/l6_saw/special_check(mob/user)

10
code/modules/projectiles/guns/projectile/automatic_ch.dm
View File

@@ -13,7 +13,7 @@
/obj/item/gun/projectile/automatic/p90
name = "\improper P90K PDW"
desc = "The P90K Personal Defense Weapon is a MarsTech-assembled modernized variation of the ancient FN P90, a compact, high-capacity submachine gun of human origin. Its fierce reputation owes to its minimal recoil and ergonomic design. Chambered in 5.7x28mm caseless rounds."
desc = "The P90K Personal Defense Weapon is a MarsTech-assembled modernized variation of the ancient FN P90, a compact, high-capacity submachine gun of human origin. Its fierce reputation owes to its minimal recoil and ergonomic design. Chambered in 9mm rounds."
description_fluff = "The leading civilian-sector high-quality small arms subsidiary of Hephaestus Industries, MarsTech has been the provider of choice for law enforcement and security forces for over 300 years."
icon = 'icons/obj/gun_ch.dmi'
@@ -34,11 +34,11 @@
auto_eject = 1 // Auto-ejects magazine when it's empty.
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
caliber = "5.7x28mm" // The type of caliber the gun accepts. Will not accept magazines loaded with the wrong caliber, even if they're listed in allowed_magazines.
ammo_type = /obj/item/ammo_casing/a57 // Should always be an ammo casing that uses the same caliber as the gun's listed for.
caliber = "9mm" // The type of caliber the gun accepts. Will not accept magazines loaded with the wrong caliber, even if they're listed in allowed_magazines.
ammo_type = /obj/item/ammo_casing/a9mm // Should always be an ammo casing that uses the same caliber as the gun's listed for.
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/a57p90 // The magazine type it spawns with.
allowed_magazines = list(/obj/item/ammo_magazine/a57p90) // What kind of magazine(s) it can load.
magazine_type = /obj/item/ammo_magazine/m9mmp90 // The magazine type it spawns with.
allowed_magazines = list(/obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmt) // What kind of magazine(s) it can load.
fire_sound = "sound/weapons/Gunshot1.ogg"
firemodes = list(