cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

BRAINLETMOMENT

Browse Source
This commit is contained in:
kevinz000
2020-01-27 22:44:51 -07:00
parent 3ce1fe2585
commit d89b8d95cf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/gun.dm
View File

@@ -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()

2
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -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)