cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates frag grenades to use bresenham, tweaks

Browse Source
This commit is contained in:
mwerezak
2015-08-14 03:44:22 -04:00
parent da58494275
commit 4092b40ae5
3 changed files with 64 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/projectiles/projectile/bullets.dm
View File

@@ -77,7 +77,7 @@
. = ..()
bumped = 0 //can hit all mobs in a tile. pellets is decremented inside attack_mob so this should be fine.
/obj/item/projectile/bullet/pellet/attack_mob(var/mob/living/target_mob, var/distance, var/prone = 0)
/obj/item/projectile/bullet/pellet/attack_mob(var/mob/living/target_mob, var/distance, var/miss_modifier)
if (pellets < 0) return 1
var/pellet_loss = round((distance - 1)/range_step) //pellets lost due to distance
@@ -89,8 +89,6 @@
if(!base_spread)
prone_chance = max(spread_step*(distance - 2), 0)
world << "[src]: attacking [target_mob] > target_mob.lying = [target_mob.lying], original = [original], prone_chance = [prone_chance]"
var/hits = 0
for (var/i in 1 to total_pellets)
if(target_mob.lying && target_mob != original && prob(prone_chance))
@@ -114,8 +112,9 @@
//If this is a shrapnel explosion, allow mobs that are prone to get hit, too
if(. && !base_spread && isturf(loc))
for(var/mob/living/M in loc)
if(M.lying && Bump(M)) //Bump will make sure we don't hit a mob multiple times
return
if(M.lying || !M.CanPass(src, loc)) //Bump if lying or if we would normally Bump.
if(Bump(M)) //Bump will make sure we don't hit a mob multiple times
return
/* short-casing projectiles, like the kind used in pistols or SMGs */