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

[MIRROR] Fixes a lot of guns with 0 fire delay (#10047)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-02-01 17:47:19 -07:00
committed by GitHub
parent e89ae275cf
commit ba86c06dc9
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/projectiles/guns/magnetic/magnetic_railgun.dm
View File

@@ -57,7 +57,7 @@
cell = /obj/item/cell/infinite cell = /obj/item/cell/infinite
capacitor = /obj/item/stock_parts/capacitor/super capacitor = /obj/item/stock_parts/capacitor/super
fire_delay = 0 fire_delay = 0.1
slowdown = 2 slowdown = 2
slowdown_held = 3 slowdown_held = 3
@@ -67,7 +67,7 @@
w_class = ITEMSIZE_NO_CONTAINER w_class = ITEMSIZE_NO_CONTAINER
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="long bursts", burst=6, fire_delay=null, move_delay=10, one_handed_penalty=30, burst_accuracy=list(0,-15,-15,-15,-30), dispersion=list(0.6, 0.6, 1.0, 1.0, 1.2)), list(mode_name="long bursts", burst=6, fire_delay=null, move_delay=10, one_handed_penalty=30, burst_accuracy=list(0,-15,-15,-15,-30), dispersion=list(0.6, 0.6, 1.0, 1.0, 1.2)),
) )
@@ -87,7 +87,7 @@
capacitor = /obj/item/stock_parts/capacitor/adv capacitor = /obj/item/stock_parts/capacitor/adv
removable_components = TRUE //CHOMP Edit. removable_components = TRUE //CHOMP Edit.
fire_delay = 0 fire_delay = 0.1
w_class = ITEMSIZE_HUGE //CHOMP Edit. w_class = ITEMSIZE_HUGE //CHOMP Edit.
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
@@ -104,7 +104,7 @@
empty_sound = 'sound/weapons/smg_empty_alarm.ogg' empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
) )
@@ -121,7 +121,7 @@
capacitor = /obj/item/stock_parts/capacitor capacitor = /obj/item/stock_parts/capacitor
removable_components = TRUE //CHOMPstation Edit removable_components = TRUE //CHOMPstation Edit
fire_delay = 0 fire_delay = 0.1
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0 move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
@@ -137,7 +137,7 @@
empty_sound = 'sound/weapons/smg_empty_alarm.ogg' empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
) )
@@ -228,6 +228,6 @@
empty_sound = 'sound/weapons/smg_empty_alarm.ogg' empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)), list(mode_name="short bursts", burst=3, fire_delay=null, move_delay=5, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
) )

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

@@ -13,7 +13,7 @@
//Burst accuracy is the accuracy of each bullet fired in the burst. Dispersion is how much the bullets will 'spread' away from where you aimed. //Burst accuracy is the accuracy of each bullet fired in the burst. Dispersion is how much the bullets will 'spread' away from where you aimed.
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, 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="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)))
/* /*
@@ -35,7 +35,7 @@
fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, 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,-10,-10), dispersion=list(0.0, 0.3, 0.6)) list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
) )
@@ -119,7 +119,7 @@
one_handed_penalty = 30 one_handed_penalty = 30
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6)) list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
) )
@@ -150,7 +150,7 @@
fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6)) list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
) )
@@ -224,7 +224,7 @@
burst_delay = 4 burst_delay = 4
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, use_launcher=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, use_launcher=null, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, use_launcher=null, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6)), list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, use_launcher=null, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6)),
list(mode_name="fire grenades", burst=null, fire_delay=null, move_delay=null, use_launcher=1, burst_accuracy=null, dispersion=null) list(mode_name="fire grenades", burst=null, fire_delay=null, move_delay=null, use_launcher=1, burst_accuracy=null, dispersion=null)
) )
@@ -305,7 +305,7 @@
var/cover_open = 0 var/cover_open = 0
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, burst_accuracy=null, dispersion=null),
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="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 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
) )
@@ -380,7 +380,7 @@
one_handed_penalty = 60 one_handed_penalty = 60
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0), list(mode_name="semiauto", burst=1, fire_delay=0.1),
list(mode_name="3-round bursts", burst=3, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.0, 0.6, 0.6)) list(mode_name="3-round bursts", burst=3, move_delay=6, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.0, 0.6, 0.6))
) )
@@ -416,7 +416,7 @@
fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0), list(mode_name="semiauto", burst=1, fire_delay=0.1),
list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0)) list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0))
) )
@@ -472,7 +472,7 @@
allowed_magazines = list(/obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmt) // ToDo: New sprite for the different mag. allowed_magazines = list(/obj/item/ammo_magazine/m9mmp90, /obj/item/ammo_magazine/m9mmt) // ToDo: New sprite for the different mag.
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0), list(mode_name="semiauto", burst=1, fire_delay=0.1),
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="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))
) )
@@ -499,7 +499,7 @@
fire_sound = "sound/weapons/Gunshot1.ogg" //CHOMPedit fire_sound = "sound/weapons/Gunshot1.ogg" //CHOMPedit
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0), list(mode_name="semiauto", burst=1, fire_delay=0.1),
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="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))
) )
@@ -535,7 +535,7 @@
one_handed_penalty = 45 one_handed_penalty = 45
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6)) list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=6, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6))
) )
@@ -569,7 +569,7 @@
fire_sound = "sound/weapons/Gunshot1.ogg" //CHOMPedit fire_sound = "sound/weapons/Gunshot1.ogg" //CHOMPedit
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0), list(mode_name="semiauto", burst=1, fire_delay=0.1),
list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6)) list(mode_name="3-round bursts", burst=3, burst_delay=1, fire_delay=4, move_delay=4, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
) )

2
code/modules/projectiles/guns/projectile/automatic_vr.dm
View File

@@ -67,7 +67,7 @@
burst_delay = 2 burst_delay = 2
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2) origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, 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="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)),
) )

2
code/modules/projectiles/guns/toy.dm
View File

@@ -206,7 +206,7 @@
fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit
firemodes = list( firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), list(mode_name="semiauto", burst=1, fire_delay=0.1, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=2, burst_accuracy=list(0,-2,-2), dispersion=null) list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=2, burst_accuracy=list(0,-2,-2), dispersion=null)
) )