Fixes to Rnd MkII (#653)

Fixes #648
This commit is contained in:
LordFowl
2016-07-31 01:07:58 +03:00
committed by skull132
parent 9cf53dfa45
commit 8254478a3f
7 changed files with 58 additions and 17 deletions
@@ -114,13 +114,15 @@
weaken = 5
stun = 5
/obj/item/projectile/energy/sonic/on_hit(var/atom/target, var/blocked = 0)
var/mob/M = target
if(isturf(target))
/obj/item/projectile/energy/sonic/on_impact(var/atom/A)
if(isturf(A))
target.ex_act(0)
if(ismob(target))
if(ismob(A))
var/mob/M = A
explosion(target, -1, 0, 2)
M.gib()
if(!(isturf(A)) & !(ismob(A)))
explosion(A, -1, 0, 2)
..()
/obj/item/projectile/energy/blaster
@@ -20,9 +20,9 @@
sharp = 1
edge = 1
on_hit(var/atom/target, var/blocked = 0)
explosion(target, -1, 0, 2)
return 1
on_impact(var/atom/A)
explosion(A, -1, 0, 2)
..()
/obj/item/projectile/bullet/gyro/law
name ="high-ex round"
@@ -159,6 +159,6 @@
sharp = 1
edge = 1
on_hit(var/atom/target, var/blocked = 0)
explosion(target, 0, 0, 4)
return 1
on_impact(var/atom/A)
explosion(A, 0, 0, 4)
..()