Merge pull request #6585 from Citadel-Station-13/upstream-merge-37544

[MIRROR] Adds a 2.5 second fire delay to beam rifles
2018-04-30 10:21:06 -05:00
parent 794d078dff 51c102ddd8
commit 6885655022
1 changed files with 2 additions and 1 deletions
@@ -58,7 +58,7 @@
 	var/projectile_damage = 30
 	var/projectile_stun = 0
 	var/projectile_setting_pierce = TRUE
-	var/delay = 65
+	var/delay = 25
 	var/lastfire = 0

 	//ZOOMING
@@ -182,6 +182,7 @@

 /obj/item/gun/energy/beam_rifle/Initialize()
 	. = ..()
+	fire_delay = delay
 	current_tracers = list()
 	START_PROCESSING(SSprojectiles, src)
 	zoom_lock_action = new(src)