cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7720 from Iamgoofball/patch-32

Browse Source 
fixes #7719
This commit is contained in:
Swag McYolosteinen
2015-02-14 12:14:17 +01:00
parent b2d6ce5481 a51ffe8cd4
commit 1aa7f423e9
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/projectiles/projectile/special.dm
View File

@@ -122,11 +122,9 @@ obj/item/projectile/kinetic/New()
if(range <= 0)
new /obj/item/effect/kinetic_blast(src.loc)
for(var/turf/T in range(1, src.loc))
if(!istype(T, /turf/simulated/wall))
T.ex_act(3)
for(var/obj/structure/S in range(1, src.loc))
S.ex_act(3)
if(istype(T, /turf/simulated/mineral))
var/turf/simulated/mineral/M = T
M.gets_drilled(firer)
qdel(src)
/obj/item/projectile/kinetic/on_hit(atom/target)
@@ -135,13 +133,11 @@ obj/item/projectile/kinetic/New()
var/turf/simulated/mineral/M = target_turf
M.gets_drilled(firer)
new /obj/item/effect/kinetic_blast(target_turf)
if(isturf(target) || istype(target, /obj/structure))
if(isturf(target))
for(var/turf/T in range(1, target_turf))
if(!istype(T, /turf/simulated/wall))
T.ex_act(3)
for(var/obj/structure/S in range(1, target_turf))
S.ex_act(3)
if(istype(T, /turf/simulated/mineral))
var/turf/simulated/mineral/M = T
M.gets_drilled(firer)
..()
/obj/item/effect/kinetic_blast
@@ -207,4 +203,4 @@ obj/item/projectile/kinetic/New()
/obj/item/projectile/bullet/magspear/on_range()
if(!proj_hit)
new /obj/item/ammo_casing/caseless/magspear(src.loc)
..()
..()