diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 8b28262dfe..7e125e9614 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -229,7 +229,7 @@
 	return
 
 /obj/item/gun/proc/on_cooldown()
-	return busy_action || firing || (last_fire > world.time + fire_delay)
+	return busy_action || firing || (last_fire + fire_delay > world.time)
 
 /obj/item/gun/proc/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
 	add_fingerprint(user)
@@ -246,7 +246,6 @@
 		SEND_SIGNAL(user, COMSIG_LIVING_GUN_PROCESS_FIRE, target, params, zone_override)
 
 /obj/item/gun/proc/do_fire(atom/target, mob/living/user, message = TRUE, params, zone_override = "", bonus_spread = 0)
-	set waitfor = FALSE
 	var/sprd = 0
 	var/randomized_gun_spread = 0
 	var/rand_spr = rand()
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 28b099e548..9b749bbead 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -28,7 +28,7 @@
 
 /obj/item/gun/energy/e_gun/advtaser/altafterattack(atom/target, mob/user, proximity_flag, params)
 	. = TRUE
-	if(last_altfire > world.time + altfire_delay)
+	if(last_altfire + altfire_delay > world.time)
 		return
 	var/current_index = current_firemode_index
 	set_firemode_to_type(/obj/item/ammo_casing/energy/electrode)