cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 22:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2016-08-03 14:45:28 -04:00
parent d6803a26e3 7bf44f8498
commit db200cf633
26 changed files with 225 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/projectiles/projectile/energy.dm
View File

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

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

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