Adds generic impact noises to all projectiles

Overrides the generic sounds with specific ones for electrodes and
lasers.

Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/energy.dm
This commit is contained in:
Tenebrosity
2014-01-22 10:20:16 -05:00
committed by ZomgPonies
parent 95f7280781
commit 67c88c42e7
5 changed files with 6 additions and 3 deletions
+2 -1
View File
@@ -174,6 +174,7 @@ var/list/beam_master = list()
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 40
damage_type = BURN
hitsound = 'sound/weapons/sear.ogg'
flag = "laser"
eyeblur = 4
var/frequency = 1
@@ -273,4 +274,4 @@ var/list/beam_master = list()
damage = 60
stun = 5
weaken = 5
stutter = 5
stutter = 5
@@ -17,10 +17,9 @@
*/
agony = 40
damage_type = HALLOSS
hitsound = 'sound/weapons/tase.ogg'
//Damage will be handled on the MOB side, to prevent window shattering.
/obj/item/projectile/energy/declone
name = "declone"
icon_state = "declone"