cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix promie shock mechanic & enables additional footsteps (#12802)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-06-04 09:11:57 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent a620b171cc
commit e7e7d5342b
45 changed files with 299 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+1 -11
View File
@@ -55,7 +55,6 @@
var/burst = 1
var/fire_delay = 6 //delay after shooting before the gun can be used again
var/burst_delay = 2 //delay between shots, if firing in bursts
var/move_delay = 1
var/fire_sound = null // This is handled by projectile.dm's fire_sound var now, but you can override the projectile's fire_sound with this one if you want to.
var/fire_sound_text = "gunshot"
var/fire_anim = null
@@ -72,7 +71,6 @@
var/wielded_item_state
var/one_handed_penalty = 0 // Penalty applied if someone fires a two-handed gun with one hand.
var/atom/movable/screen/auto_target/auto_target
var/shooting = 0
var/next_fire_time = 0
var/sel_mode = 1 //index of the currently selected mode
@@ -275,7 +273,7 @@
*/
/obj/item/gun/attack(mob/living/A, mob/living/user, target_zone, attack_modifier)
if (A == user && user.zone_sel.selecting == O_MOUTH && !mouthshoot)
if (A == user && user.zone_sel.selecting == O_MOUTH)
handle_suicide(user)
return ITEM_INTERACT_SUCCESS
else if(user.a_intent == I_HURT) //point blank shooting
@@ -712,19 +710,14 @@
else
playsound(src, shot_sound, 50, 1)
//Suicide handling.
/obj/item/gun/var/mouthshoot = 0 //To stop people from suiciding twice... >.>
/obj/item/gun/proc/handle_suicide(mob/living/user)
if(!ishuman(user))
return
var/mob/living/carbon/human/M = user
mouthshoot = 1
M.visible_message(span_red("[user] sticks their gun in their mouth, ready to pull the trigger..."))
if(!do_after(user, 4 SECONDS, target = src))
M.visible_message(span_blue("[user] decided life was worth living"))
mouthshoot = 0
return
var/obj/item/projectile/in_chamber = consume_next_projectile()
if (istype(in_chamber))
@@ -732,7 +725,6 @@
play_fire_sound(M, in_chamber)
if(istype(in_chamber, /obj/item/projectile/beam/lasertag))
user.show_message(span_warning("You feel rather silly, trying to commit suicide with a toy."))
mouthshoot = 0
return
in_chamber.on_hit(M)
@@ -744,11 +736,9 @@
to_chat(user, span_notice("Ow..."))
user.apply_effect(110,AGONY,0)
qdel(in_chamber)
mouthshoot = 0
return
else
handle_click_empty(user)
mouthshoot = 0
return
/obj/item/gun/proc/toggle_scope(zoom_amount=2.0)
code/modules/projectiles/guns/energy/laser.dm
-1
View File
@@ -106,7 +106,6 @@
cell_type = /obj/item/cell/device/weapon/recharge/alien // Self charges.
modifystate = "alienpistol"
battery_lock = 1 //CHOMPedit adds battery lock.
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/datum/category_item/catalogue/anomalous/precursor_a/alien_pistol
name = "Precursor Alpha Weapon - Appendageheld Laser"
code/modules/projectiles/guns/energy/laser_ch.dm
+7 -7
View File
@@ -60,7 +60,7 @@
firemodes = list(
list(mode_name="normal", fire_delay=8, projectile_type=/obj/item/projectile/beam/midlaser, charge_cost = 240),
list(mode_name="suppressive", fire_delay=5, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60),
list(mode_name="burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, charge_cost = 200),
list(mode_name="burst", burst=3, fire_delay=null, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, charge_cost = 200),
)
force = 8
w_class = ITEMSIZE_HUGE //Probably gonna make it a rifle sooner or later //CHOMP Edit, and so I did.
@@ -93,9 +93,9 @@
cell_type = /obj/item/cell/device/weapon
firemodes = list(
list(mode_name="single shot", burst = 1, fire_delay=4, move_delay=null, burst_accuracy = null, dispersion = null),
list(mode_name="three shot bursts", burst=3, fire_delay=10 , move_delay=4, burst_accuracy=list(65,65,65), dispersion=list(1,1,1)),
list(mode_name="short bursts", burst=5, fire_delay=10 ,move_delay=6, burst_accuracy = list(65,65,65,65,65), dispersion = list(4,4,4,4,4)),
list(mode_name="single shot", burst = 1, fire_delay=4, burst_accuracy = null, dispersion = null),
list(mode_name="three shot bursts", burst=3, fire_delay=10, burst_accuracy=list(65,65,65), dispersion=list(1,1,1)),
list(mode_name="short bursts", burst=5, fire_delay=10, burst_accuracy = list(65,65,65,65,65), dispersion = list(4,4,4,4,4)),
)
/obj/item/gun/energy/vepr/plasma
@@ -130,9 +130,9 @@
item_state = "x16b"
wielded_item_state = "x16b_w"
firemodes = list(
list(mode_name="single shot", burst = 1, fire_delay=1, move_delay=null, burst_accuracy = null, dispersion = null),
list(mode_name="three shot bursts", burst=3, fire_delay=5 , move_delay=1, burst_accuracy=list(65,65,65), dispersion=list(1,1,1)),
list(mode_name="short bursts", burst=5, fire_delay=5 ,move_delay=4, burst_accuracy = list(65,65,65,65,65), dispersion = list(4,4,4,4,4)),
list(mode_name="single shot", burst = 1, fire_delay=1, burst_accuracy = null, dispersion = null),
list(mode_name="three shot bursts", burst=3, fire_delay=5, burst_accuracy=list(65,65,65), dispersion=list(1,1,1)),
list(mode_name="short bursts", burst=5, fire_delay=5, burst_accuracy = list(65,65,65,65,65), dispersion = list(4,4,4,4,4)),
)
w_class = ITEMSIZE_NORMAL
code/modules/projectiles/guns/energy/laser_yw.dm
-1
View File
@@ -32,5 +32,4 @@
charge_meter = 1
recoil = 1
fire_delay = 27 //old technology
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
///END OF GAUSS WEAPONRY///
code/modules/projectiles/guns/energy/nuclear.dm
+3 -3
View File
@@ -62,9 +62,9 @@
firemodes = list(
list(mode_name="stun", burst=1, projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="energystun", charge_cost = 100),
list(mode_name="stun burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="energystun"),
list(mode_name="stun burst", burst=3, fire_delay=null, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="energystun"),
list(mode_name="lethal", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="energykill", charge_cost = 200),
list(mode_name="lethal burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="energykill"),
list(mode_name="lethal burst", burst=3, fire_delay=null, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="energykill"),
)
/*
@@ -89,7 +89,7 @@
firemodes = list(
list(mode_name="lethal", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, charge_cost = 200),
list(mode_name="lethal burst", burst=4, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser),
list(mode_name="lethal burst", burst=4, fire_delay=null, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser),
)
/*
code/modules/projectiles/guns/energy/nuclear_yw.dm
+3 -3
View File
@@ -37,9 +37,9 @@
firemodes = list(
list(mode_name="single fire", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg', charge_cost = 100),
list(mode_name="burst fire", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="5 laser burst", burst=5, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0,0,0), dispersion=list(0.0, 0.2, 0.5, 0.5, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="15 laser burst, ye boi.", burst=15, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), dispersion=list(0.0, 0.2, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="burst fire", burst=3, fire_delay=null, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="5 laser burst", burst=5, fire_delay=null, burst_accuracy=list(0,0,0,0,0), dispersion=list(0.0, 0.2, 0.5, 0.5, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="15 laser burst, ye boi.", burst=15, fire_delay=null, burst_accuracy=list(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), dispersion=list(0.0, 0.2, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="mg42-e", fire_sound='sound/weapons/Laser.ogg'),
)
/obj/item/gun/energy/x01
code/modules/projectiles/guns/energy/phase.dm
-1
View File
@@ -40,7 +40,6 @@
charge_cost = 160 //Chompedit Bringing charge cost down for all phase weapons. 15 shots on normal cell
projectile_type = /obj/item/projectile/energy/phase/light
one_handed_penalty = 0
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/energy/locked/phasegun/pistol/unlocked
desc = "The RayZar EW15 Apollo, also known as the 'phase pistol', is an energy-based handgun specifically designed for self-defense against aggressive wildlife." //ChompEDIT
code/modules/projectiles/guns/energy/pump_ch.dm
+4 -4
View File
@@ -34,9 +34,9 @@
firemodes = list(
list(mode_name="stun", burst=1, projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg', charge_cost = 100),
list(mode_name="stun burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="stun burst", burst=3, fire_delay=null, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/stun/weak, modifystate="g44estun", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="lethal", burst=1, projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg', charge_cost = 200),
list(mode_name="lethal burst", burst=3, fire_delay=null, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg'),
list(mode_name="lethal burst", burst=3, fire_delay=null, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/burstlaser, modifystate="g44ekill", fire_sound='sound/weapons/Laser.ogg'),
)
*/
@@ -188,7 +188,7 @@
firemodes = list(
list(mode_name="lethal", fire_delay=10, projectile_type=/obj/item/projectile/beam/phaser, modifystate="carbinekill", charge_cost = 60), //Chompedit Reduced cost
list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 30), //Chompedit Reduced cost
list(mode_name="burst", burst=3, fire_delay=10, move_delay=4, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/phaser/light, charge_cost = 90), //Chompedit Added this
list(mode_name="burst", burst=3, fire_delay=10, burst_accuracy=list(0,0,0), dispersion=list(0.0, 0.2, 0.5), projectile_type=/obj/item/projectile/beam/phaser/light, charge_cost = 90), //Chompedit Added this
)
/obj/item/gun/energy/locked/frontier/carbine/update_icon()
@@ -250,7 +250,7 @@
//CHOMP Edit: Changed beam type to new phaser beam type.
firemodes = list(
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="riflestun", charge_cost = 60), //Chompedit Reduced cost
list(mode_name="sniper", fire_delay=35, move_delay=4, projectile_type=/obj/item/projectile/beam/phaser/heavy, modifystate="riflekill", charge_cost = 100), //Chompedit Reduced cost
list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/phaser/heavy, modifystate="riflekill", charge_cost = 100), //Chompedit Reduced cost
)
/obj/item/gun/energy/locked/frontier/rifle/ui_action_click()
code/modules/projectiles/guns/energy/special.dm
-1
View File
@@ -26,7 +26,6 @@
slot_flags = SLOT_BELT|SLOT_HOLSTER
charge_cost = 480
projectile_type = /obj/item/projectile/ion/pistol
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/energy/decloner
name = "biological demolecularisor"
code/modules/projectiles/guns/energy/special_vr.dm
-1
View File
@@ -1,7 +1,6 @@
/obj/item/gun/energy/ionrifle/pistol
projectile_type = /obj/item/projectile/ion/pistol // still packs a punch but no AoE
w_class = ITEMSIZE_NORMAL //CHOMP Edit.
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/energy/ionrifle/weak
projectile_type = /obj/item/projectile/ion/small
code/modules/projectiles/guns/magnetic/magnetic_railgun.dm
+15 -17
View File
@@ -66,9 +66,9 @@
w_class = ITEMSIZE_NO_CONTAINER
firemodes = list(
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="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="semiauto", burst=1, fire_delay=0.1, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, 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, one_handed_penalty=30, burst_accuracy=list(0,-15,-15,-15,-30), dispersion=list(0.6, 0.6, 1.0, 1.0, 1.2)),
)
/obj/item/gun/magnetic/railgun/automatic/examine(mob/user)
@@ -103,8 +103,8 @@
empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
)
/obj/item/gun/magnetic/railgun/flechette/pistol
@@ -121,7 +121,6 @@
removable_components = TRUE //CHOMPstation Edit
fire_delay = 0.1
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
slot_flags = SLOT_BELT
@@ -136,8 +135,8 @@
empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
)
/obj/item/gun/magnetic/railgun/heater
@@ -167,8 +166,8 @@
empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
firemodes = list(
list(mode_name="high power", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=15),
list(mode_name="low power", power_cost = 150, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=15),
list(mode_name="high power", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, one_handed_penalty=15),
list(mode_name="low power", power_cost = 150, projectile_type = /obj/item/projectile/bullet/magnetic/heated/weak, burst=1, fire_delay=5, one_handed_penalty=15),
)
/obj/item/gun/magnetic/railgun/heater/pistol
@@ -180,7 +179,6 @@
item_state = "revolver"
w_class = ITEMSIZE_NORMAL
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
slowdown_held = 0.1
@@ -191,8 +189,8 @@
slot_flags = SLOT_BELT|SLOT_HOLSTER
firemodes = list(
list(mode_name="lethal", power_cost = 500, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=10, move_delay=null, one_handed_penalty=0),
list(mode_name="stun", power_cost = 350, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=7, move_delay=null, one_handed_penalty=0),
list(mode_name="lethal", power_cost = 500, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=10, one_handed_penalty=0),
list(mode_name="stun", power_cost = 350, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=7, one_handed_penalty=0),
)
/obj/item/gun/magnetic/railgun/heater/pistol/hos
@@ -203,8 +201,8 @@
description_antag = "This weapon starts with a DNA locking chip attached. Using an EMAG on the weapon will disarm it, and allow you to use the chip as your own."
firemodes = list(
list(mode_name="lethal", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, move_delay=null, one_handed_penalty=0),
list(mode_name="stun", power_cost = 300, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=5, move_delay=null, one_handed_penalty=0),
list(mode_name="lethal", power_cost = 400, projectile_type = /obj/item/projectile/bullet/magnetic/heated, burst=1, fire_delay=8, one_handed_penalty=0),
list(mode_name="stun", power_cost = 300, projectile_type = /obj/item/projectile/energy/electrode/strong, burst=1, fire_delay=5, one_handed_penalty=0),
)
/obj/item/gun/magnetic/railgun/flechette/sif
@@ -227,6 +225,6 @@
empty_sound = 'sound/weapons/smg_empty_alarm.ogg'
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, one_handed_penalty=15, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=3, fire_delay=null, one_handed_penalty=30, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
)
code/modules/projectiles/guns/modular_guns.dm
-1
View File
@@ -154,7 +154,6 @@
max_components = 6
desc = "A bulky modular pistol frame. This only only accepts six parts."
burst_delay = 2
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/energy/modular/carbine
name = "modular carbine"
code/modules/projectiles/guns/projectile/automatic.dm
+21 -23
View File
@@ -13,8 +13,8 @@
//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(
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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)))
/*
* Advanced SMG
@@ -34,8 +34,8 @@
fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
/obj/item/gun/projectile/automatic/advanced_smg/update_icon()
@@ -116,8 +116,8 @@
one_handed_penalty = 30
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
)
/obj/item/gun/projectile/automatic/sts35/update_icon(ignore_inhands)
@@ -146,8 +146,8 @@
fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
)
/obj/item/gun/projectile/automatic/pdw/update_icon(ignore_inhands)
@@ -176,7 +176,6 @@
magazine_type = /obj/item/ammo_magazine/m9mmt/rubber
allowed_magazines = list(/obj/item/ammo_magazine/m9mmt)
projectile_type = /obj/item/projectile/bullet/pistol/medium
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit
/obj/item/gun/projectile/automatic/wt550/update_icon()
@@ -218,9 +217,9 @@
burst_delay = 4
firemodes = list(
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="fire grenades", burst=null, fire_delay=null, move_delay=null, use_launcher=1, burst_accuracy=null, dispersion=null)
list(mode_name="semiauto", burst=1, fire_delay=0.1, use_launcher=null, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=null, use_launcher=null, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6)),
list(mode_name="fire grenades", burst=null, fire_delay=null, use_launcher=1, burst_accuracy=null, dispersion=null)
)
var/use_launcher = 0
@@ -298,9 +297,9 @@
var/cover_open = 0
firemodes = list(
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="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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
special_weapon_handling = TRUE
@@ -378,7 +377,7 @@
firemodes = list(
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, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.0, 0.6, 0.6))
)
/obj/item/gun/projectile/automatic/as24/update_icon()
@@ -406,14 +405,13 @@
caliber = ".45"
magazine_type = /obj/item/ammo_magazine/m45uzi
allowed_magazines = list(/obj/item/ammo_magazine/m45uzi)
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
var/is64x32 = TRUE
var/is_picked_up = FALSE
fire_sound = "sound/weapons/gunshot_pathetic.ogg" //CHOMPedit
firemodes = list(
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, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0))
)
/obj/item/gun/projectile/automatic/mini_uzi/update_icon()
@@ -468,7 +466,7 @@
firemodes = list(
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, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0))
)
/obj/item/gun/projectile/automatic/p90/update_icon()
@@ -494,7 +492,7 @@
firemodes = list(
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, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0))
)
/obj/item/gun/projectile/automatic/tommygun/update_icon()
@@ -528,8 +526,8 @@
one_handed_penalty = 45
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=null, burst_accuracy=list(0,-15), dispersion=list(0.0, 0.6))
)
/obj/item/gun/projectile/automatic/bullpup/update_icon(ignore_inhands)
@@ -562,7 +560,7 @@
firemodes = list(
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, burst_accuracy=list(0,-15,-30), dispersion=list(0.0, 0.6, 0.6))
)
/obj/item/gun/projectile/automatic/combatsmg/update_icon()
code/modules/projectiles/guns/projectile/automatic_ch.dm
+6 -6
View File
@@ -40,8 +40,8 @@
fire_sound = "sound/weapons/Gunshot1.ogg"
firemodes = list(
list(mode_name="semi-automatic", burst=1, fire_delay=0, move_delay=0),
list(mode_name="three-round burst", burst=3, fire_delay=null, burst_delay=1, move_delay=0, burst_accuracy=list(0,-15,-20), dispersion=list(0.0, 1.0, 1.5))
list(mode_name="semi-automatic", burst=1, fire_delay=0),
list(mode_name="three-round burst", burst=3, fire_delay=null, burst_delay=1, burst_accuracy=list(0,-15,-20), dispersion=list(0.0, 1.0, 1.5))
)
/obj/item/gun/projectile/automatic/p90/update_icon() // Code for visually updating the item depending on current magazine capacity.
@@ -80,8 +80,8 @@
fire_sound = "sound/weapons/Gunshot1.ogg"
firemodes = list(
list(mode_name="semi-automatic", burst=1, fire_delay=0, move_delay=0),
list(mode_name="two-shot rapidfire", burst=2, fire_delay=null, burst_delay=1, move_delay=0, burst_accuracy=list(-5,-10), dispersion=list(0.5, 1.0)),
list(mode_name="semi-automatic", burst=1, fire_delay=0),
list(mode_name="two-shot rapidfire", burst=2, fire_delay=null, burst_delay=1, burst_accuracy=list(-5,-10), dispersion=list(0.5, 1.0)),
)
/obj/item/gun/projectile/automatic/c20r/update_icon()
@@ -113,8 +113,8 @@
fire_sound = "sound/weapons/ballistics/a762.ogg"
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, 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(60,35), dispersion=list(0.0, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=null, burst_accuracy=list(60,35), dispersion=list(0.0, 0.6))
)
/obj/item/gun/projectile/automatic/fal/update_icon(ignore_inhands)
code/modules/projectiles/guns/projectile/automatic_vr.dm
+2 -2
View File
@@ -58,8 +58,8 @@
multi_aim = 1
burst_delay = 2
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
)
/obj/item/gun/projectile/automatic/sol/proc/update_charge()
code/modules/projectiles/guns/projectile/automatic_yw.dm
+4 -4
View File
@@ -23,10 +23,10 @@
one_handed_penalty = 6
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,-1,-1), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="15-round bursts.. unleash hell", burst=15, move_delay=6, burst_accuracy = list(0,-1,-1,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-1,-1), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="15-round bursts.. unleash hell", burst=15, burst_accuracy = list(0,-1,-1,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2))
)
var/cover_open = 0
code/modules/projectiles/guns/projectile/pistol.dm
+2 -10
View File
@@ -11,7 +11,6 @@
icon_state = "colt"
caliber = ".45"
load_method = MAGAZINE
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/colt/update_icon()
if(ammo_magazine)
@@ -86,7 +85,6 @@
projectile_type = /obj/item/projectile/bullet/pistol/medium
caliber = ".45"
load_method = MAGAZINE
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/sec/update_icon()
..()
@@ -97,7 +95,6 @@
/obj/item/gun/projectile/sec/flash
magazine_type = /obj/item/ammo_magazine/m45/flash
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/sec/wood
name = "custom .45 pistol"
@@ -122,7 +119,6 @@
caliber = ".45"
silenced = 1
fire_delay = 1
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
recoil = 0
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/m45
@@ -190,7 +186,6 @@
allowed_magazines = list(/obj/item/ammo_magazine/m75)
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/gyropistol/update_icon()
..()
@@ -224,7 +219,6 @@
magazine_type = /obj/item/ammo_magazine/m9mm/compact
allowed_magazines = list(/obj/item/ammo_magazine/m9mm/compact)
projectile_type = /obj/item/projectile/bullet/pistol
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/pistol/flash
magazine_type = /obj/item/ammo_magazine/m9mm/compact/flash
@@ -401,7 +395,6 @@
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/m9mm
allowed_magazines = list(/obj/item/ammo_magazine/m9mm) // Can accept illegal large capacity magazines, or compact magazines.
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/p92x/update_icon()
..()
@@ -454,8 +447,8 @@
icon_state = "olivawcivil"
item_state = "giskardcivil"
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=1.2, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=0.2, move_delay=4, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)),
list(mode_name="semiauto", burst=1, fire_delay=1.2, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=0.2, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)),
)
/obj/item/gun/projectile/giskard/olivaw/update_icon()
@@ -574,7 +567,6 @@
load_method = MAGAZINE
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/lamia/update_icon()
cut_overlays()
code/modules/projectiles/guns/projectile/pistol_vr.dm
+2 -2
View File
@@ -62,8 +62,8 @@
icon_state = "olivawcivil"
item_state = "olivawcivil"
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=1.2, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=0.2, move_delay=4, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)),
list(mode_name="semiauto", burst=1, fire_delay=1.2, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=0.2, burst_accuracy=list(0,-15), dispersion=list(1.2, 1.8)),
)
/obj/item/gun/projectile/giskard/olivaw/update_icon()
code/modules/projectiles/guns/projectile/pistol_yw.dm
+2 -2
View File
@@ -12,8 +12,8 @@
allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=5, move_delay=6, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
/obj/item/gun/projectile/automatic/glock/update_icon()
code/modules/projectiles/guns/projectile/revolver.dm
-1
View File
@@ -170,7 +170,6 @@
icon_state = "deckard-empty"
caliber = ".38"
ammo_type = /obj/item/ammo_casing/a38
move_delay = 0 // CHOMPEdit: Pistols have move_delay of 0
/obj/item/gun/projectile/revolver/deckard/emp
ammo_type = /obj/item/ammo_casing/a38/emp
code/modules/projectiles/guns/projectile/zz_ballistics_ch.dm
+69 -69
View File
@@ -52,8 +52,8 @@
icon_state = "mp5a5"
projectile_type = /obj/item/projectile/bullet/pistol
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 400
@@ -115,8 +115,8 @@
icon_state = "asval"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT
@@ -140,8 +140,8 @@
icon_state = "krinkov"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT
@@ -164,8 +164,8 @@
icon_state = "akm"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT
@@ -189,8 +189,8 @@
icon_state = "scrapak"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT
@@ -214,8 +214,8 @@
icon_state = "ak74"
projectile_type = /obj/item/projectile/bullet/rifle/a545
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT
@@ -304,8 +304,8 @@
icon_state="m16"
projectile_type = /obj/item/projectile/bullet/rifle/a556
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
@@ -327,8 +327,8 @@
icon_state="m4"
projectile_type = /obj/item/projectile/bullet/rifle/a556
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
load_method = MAGAZINE
@@ -353,8 +353,8 @@
icon_state="patriot"
projectile_type = /obj/item/projectile/bullet/rifle/a556
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
load_method = MAGAZINE
@@ -394,8 +394,8 @@
icon_state="m41b"
projectile_type = /obj/item/projectile/bullet/rifle/a10x24
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 840
@@ -418,8 +418,8 @@
icon_state="m41a"
projectile_type = /obj/item/projectile/bullet/rifle/a10x24
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 840
@@ -436,8 +436,8 @@
icon_state="t12"
projectile_type = /obj/item/projectile/bullet/rifle/a10x24
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 840
@@ -560,8 +560,8 @@
icon_state = "type901"
projectile_type = /obj/item/projectile/bullet/rifle/a762
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 910
@@ -667,8 +667,8 @@
icon_state = "memegun"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_MANUAL_LOCK
@@ -686,8 +686,8 @@
icon_state = "tkb"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_MANUAL_LOCK
@@ -705,8 +705,8 @@
icon_state = "groza"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_MANUAL_LOCK
@@ -723,8 +723,8 @@
icon_state = "plamyab"
projectile_type = /obj/item/projectile/bullet/rifle/a9x39
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="5-round bursts", burst=5, fire_delay=0.5, move_delay=3.5, burst_accuracy=list(0,-10,-15,-20,-25), dispersion=list(0.0, 0.3, 0.6, 0.9, 1.1))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="5-round bursts", burst=5, fire_delay=0.5, burst_accuracy=list(0,-10,-15,-20,-25), dispersion=list(0.0, 0.3, 0.6, 0.9, 1.1))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
@@ -738,8 +738,8 @@
icon_state = "plamya"
desc = "An old school assault rifle. A favorite on the rimworld for it's blisteringly high rate of fire. One of the best selling products of W-K Heavy Manufacturing. Virtually impossible to break. The gold standard, with a rosewood thumbhole stock, a full length barrel, and an improved heatshield. The most mass produced firearm in WKHM's lineup. This one bears the 'WKHM Adamant' arkship's production stamp. Chambered in 9x39mm."
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="5-round bursts", burst=5, fire_delay=0.5, move_delay=3.5, burst_accuracy=list(0,-5,-10,-10,-15), dispersion=list(0.0, 0.2, 0.35, 0.5, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="5-round bursts", burst=5, fire_delay=0.5, burst_accuracy=list(0,-5,-10,-10,-15), dispersion=list(0.0, 0.2, 0.35, 0.5, 0.6))
)
muzzle_velocity = 305
@@ -748,8 +748,8 @@
icon_state = "plamyac"
desc = "An old school assault rifle with a modern twist. A favorite on the rimworld for it's blisteringly high rate of fire. One of the best selling products of W-K Heavy Manufacturing. Virtually impossible to break. This is a newer variant, with a fully synthetic stock, and a shorter barrel. The serial number and production stamp has been sanded off. Chambered in 9x39mm."
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="5-round bursts", burst=5, fire_delay=0.5, move_delay=3.5, burst_accuracy=list(0,-7.5,-10,-15,-20), dispersion=list(0.0, 0.2, 0.4, 0.6, 0.7))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="5-round bursts", burst=5, fire_delay=0.5, burst_accuracy=list(0,-7.5,-10,-15,-20), dispersion=list(0.0, 0.2, 0.4, 0.6, 0.7))
)
muzzle_velocity = 290
@@ -765,9 +765,9 @@
icon_state = "strela"
projectile_type = /obj/item/projectile/bullet/shotgun
firemodes = list(
list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=3, burst_accuracy=list(0,-5), dispersion=list(0.0, 0.2)),
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="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="2-round bursts", burst=2, fire_delay=null, burst_accuracy=list(0,-5), dispersion=list(0.0, 0.2)),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
@@ -817,8 +817,8 @@
icon_state="ppsh"
projectile_type = /obj/item/projectile/bullet/a762x25
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
auto_loading_type = OPEN_BOLT
load_method = MAGAZINE
@@ -840,8 +840,8 @@
icon_state="mp5"
projectile_type = /obj/item/projectile/bullet/pistol
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 400
@@ -857,8 +857,8 @@
icon_state="pitchgun"
projectile_type = /obj/item/projectile/bullet/pistol/strong
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
muzzle_velocity = 400
@@ -874,8 +874,8 @@
icon_state = "vityaz"
projectile_type = /obj/item/projectile/bullet/a10mm
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
@@ -895,8 +895,8 @@
burst_delay = 1
projectile_type = /obj/item/projectile/bullet/a10mm
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,-10,-10), dispersion=list(0.0, 0.3, 0.6))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-10,-10), dispersion=list(0.0, 0.3, 0.6))
)
load_method = MAGAZINE
auto_loading_type = CLOSED_BOLT | LOCK_OPEN_EMPTY | LOCK_SLAPPABLE
@@ -919,10 +919,10 @@
icon_state = "molniya"
projectile_type = /obj/item/projectile/bullet/rifle/a762
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="long bursts", burst=15, move_delay=8, burst_accuracy = list(0,-15,-15,-30,-30,0,-15,-15,-30,-30,0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2,0.6, 1.0, 1.0, 1.0, 1.2,0.6, 1.0, 1.0, 1.0, 1.2))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2)),
list(mode_name="long bursts", burst=15, burst_accuracy = list(0,-15,-15,-30,-30,0,-15,-15,-30,-30,0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2,0.6, 1.0, 1.0, 1.0, 1.2,0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
@@ -940,9 +940,9 @@
icon_state = "pkm"
projectile_type = /obj/item/projectile/bullet/rifle/a762
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="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
@@ -960,9 +960,9 @@
icon_state = "rpd"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
@@ -980,9 +980,9 @@
icon_state = "rpk47"
projectile_type = /obj/item/projectile/bullet/rifle/a762x39
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="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
@@ -1005,9 +1005,9 @@
icon_state = "kord"
projectile_type = /obj/item/projectile/bullet/rifle/a127x108
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="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-15,-15), dispersion=list(0.0, 0.6, 1.0)),
list(mode_name="short bursts", burst=5, burst_accuracy = list(0,-15,-15,-30,-30), dispersion = list(0.6, 1.0, 1.0, 1.0, 1.2))
)
w_class = ITEMSIZE_HUGE
load_method = MAGAZINE
@@ -1140,8 +1140,8 @@
magazine_type = /obj/item/ammo_magazine/m9mm/vp70
allowed_magazines = list(/obj/item/ammo_magazine/m9mm)
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,-20,-40), dispersion=list(0.0, 0.9, 1.8))
list(mode_name="semiauto", burst=1, fire_delay=0, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-20,-40), dispersion=list(0.0, 0.9, 1.8))
)
projectile_type = /obj/item/projectile/bullet/pistol
muzzle_velocity = 365
code/modules/projectiles/guns/toy.dm
+2 -2
View File
@@ -201,8 +201,8 @@
fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit
firemodes = list(
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="semiauto", burst=1, fire_delay=0.1, burst_accuracy=null, dispersion=null),
list(mode_name="3-round bursts", burst=3, fire_delay=null, burst_accuracy=list(0,-2,-2), dispersion=null)
)
/obj/item/gun/projectile/automatic/toy/riot
code/modules/projectiles/guns/vox.dm
+3 -3
View File
@@ -65,9 +65,9 @@
accuracy = 30
firemodes = list(
list(mode_name="stunning", burst=1, fire_delay=null, move_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/stun/darkmatter, charge_cost = 300),
list(mode_name="focused", burst=1, fire_delay=null, move_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/darkmatter, charge_cost = 400),
list(mode_name="scatter burst", burst=8, fire_delay=null, move_delay=4, burst_accuracy=list(0, 0, 0, 0, 0, 0, 0, 0), dispersion=list(3, 3, 3, 3, 3, 3, 3, 3, 3), projectile_type=/obj/item/projectile/energy/darkmatter, charge_cost = 300),
list(mode_name="stunning", burst=1, fire_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/stun/darkmatter, charge_cost = 300),
list(mode_name="focused", burst=1, fire_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/darkmatter, charge_cost = 400),
list(mode_name="scatter burst", burst=8, fire_delay=null, burst_accuracy=list(0, 0, 0, 0, 0, 0, 0, 0), dispersion=list(3, 3, 3, 3, 3, 3, 3, 3, 3), projectile_type=/obj/item/projectile/energy/darkmatter, charge_cost = 300),
)
/obj/item/projectile/beam/stun/darkmatter
code/modules/projectiles/projectile/energy.dm
+2 -14
View File
@@ -21,7 +21,7 @@
hitsound_wall = null
damage = 5
range = 15 //if the shell hasn't hit anything after travelling this far it just explodes.
var/flash_range = 0
var/flash_range = 1
var/brightness = 7
var/light_colour = "#ffffff"
hud_state = "grenade_dummy"
@@ -59,7 +59,7 @@
/obj/item/projectile/energy/flash/flare
fire_sound = 'sound/weapons/grenade_launcher.ogg'
damage = 10
flash_range = 1
flash_range = 2
brightness = 15
flash_strength = 20
hud_state = "grenade_dummy"
@@ -84,10 +84,6 @@
hud_state = "taser"
//Damage will be handled on the MOB side, to prevent window shattering.
/obj/item/projectile/energy/electrode/strong
agony = 55
hud_state = "taser"
/obj/item/projectile/energy/electrode/stunshot
name = "stunshot"
damage = 5
@@ -319,10 +315,6 @@
flash_strength = 10
hud_state = "taser"
/obj/item/projectile/energy/flash
flash_range = 1
hud_state = "grenade_dummy"
/obj/item/projectile/energy/flash/strong
name = "chemical shell"
icon_state = "bullet"
@@ -332,10 +324,6 @@
brightness = 15
hud_state = "grenade_dummy"
/obj/item/projectile/energy/flash/flare
flash_range = 2
hud_state = "grenade_dummy"
/obj/item/projectile/energy/anomaly
name = "anomaly emitter projectile"
light_color = "#be008f"