From ce4b21550a563e3e56fd2d04f2bc65b0570c006f Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Thu, 24 Sep 2015 01:52:17 -0400 Subject: [PATCH] Edits the Z8, L6, and A12 Conflicts: code/modules/projectiles/guns/projectile/automatic.dm --- code/modules/projectiles/guns/projectile/automatic.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index fb9da9c9c5..57a864864c 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -118,7 +118,7 @@ burst_delay = 4 firemodes = list( list(name="semiauto", burst=1, fire_delay=0, move_delay=null, use_launcher=null, burst_accuracy=null, dispersion=null), - list(name="2-round burst", burst=2, fire_delay=null, move_delay=6, use_launcher=null, burst_accuracy=list(0,-1), dispersion=list(0.0, 0.6)), + list(name="2-round bursts", burst=2, fire_delay=null, move_delay=6, use_launcher=null, burst_accuracy=list(0,-1), dispersion=list(0.0, 0.6)), list(name="fire grenades", burst=null, fire_delay=null, move_delay=null, use_launcher=1, burst_accuracy=null, dispersion=null) ) @@ -182,9 +182,9 @@ magazine_type = /obj/item/ammo_magazine/a762 firemodes = list( - list(name="semiauto", burst=1, fire_delay=2), - list(name="short bursts", burst=3, move_delay=6, burst_accuracy = list(0,-1,-1), dispersion = list(0.6, 1.0, 1.0)), - list(name="long bursts", burst=5, move_delay=8, burst_accuracy = list(0,-1,-1,-2,-2), dispersion = list(1.0, 1.0, 1.0, 1.0, 1.2)), + list(name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), + list(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(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)), ) var/cover_open = 0