cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firemode bugfixes

Browse Source
This commit is contained in:
mwerezak
2015-04-26 23:52:10 -04:00
parent 472b284f24
commit 9d9de73f03
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,6 +173,7 @@
next_fire_time = world.time + shoot_time
//actually attempt to shoot
var/turf/targloc = get_turf(target) //cache this in case target gets deleted during shooting, e.g. if it was a securitron that got destroyed.
for(var/i in 1 to _burst)
var/obj/projectile = consume_next_projectile(user)
if(!projectile)
@@ -190,7 +191,12 @@
handle_post_fire(user, target, pointblank, reflex)
update_icon()
sleep(_burst_delay)
if(i < _burst)
sleep(_burst_delay)
if(!target)
target = targloc
pointblank = 0
update_held_icon()
@@ -247,7 +253,7 @@
/obj/item/weapon/gun/proc/process_point_blank(obj/projectile, mob/user, atom/target)
var/obj/item/projectile/P = projectile
if(!istype(projectile))
if(!istype(P))
return //default behaviour only applies to true projectiles
//default point blank multiplier
@@ -268,7 +274,7 @@
/obj/item/weapon/gun/proc/process_accuracy(obj/projectile, mob/user, atom/target, acc_mod, dispersion)
var/obj/item/projectile/P = projectile
if(!istype(projectile))
if(!istype(P))
return //default behaviour only applies to true projectiles
//Accuracy modifiers
@@ -285,7 +291,7 @@
//does the actual launching of the projectile
/obj/item/weapon/gun/proc/process_projectile(obj/projectile, mob/user, atom/target, var/target_zone, var/params=null)
var/obj/item/projectile/P = projectile
if(!istype(projectile))
if(!istype(P))
return 0 //default behaviour only applies to true projectiles
if(params)