diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 7543c68f155..49d1e53ac05 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -19,6 +19,7 @@ flags = FPRINT | TABLEPASS pass_flags = PASSTABLE mouse_opacity = 0 + hitsound = 'sound/weapons/pierce.ogg' var/bumped = 0 //Prevents it from hitting more than one guy at once var/def_zone = "" //Aiming at var/mob/firer = null//Who shot it @@ -113,8 +114,10 @@ forcedodge = -1 else if(silenced) + playsound(loc, hitsound, 5, 1, -1) M << "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!" else + playsound(loc, hitsound, 20, 1, -1) visible_message("\red [A.name] is hit by the [src.name] in the [parse_zone(def_zone)]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter if(istype(firer, /mob)) M.attack_log += "\[[time_stamp()]\] [firer]/[firer.ckey] shot [M]/[M.ckey] with a [src.type]" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index e20c54598b0..9f080758c7e 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -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 \ No newline at end of file + stutter = 5 diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 1a452463482..50e9a1d97d6 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -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" diff --git a/sound/weapons/sear.ogg b/sound/weapons/sear.ogg new file mode 100644 index 00000000000..6a3b361f5d3 Binary files /dev/null and b/sound/weapons/sear.ogg differ diff --git a/sound/weapons/tase.ogg b/sound/weapons/tase.ogg new file mode 100644 index 00000000000..75149620f04 Binary files /dev/null and b/sound/weapons/tase.ogg differ