Skip to content

Commit

Permalink
Replaces the default gunshot sound effect with four higher quality on…
Browse files Browse the repository at this point in the history
…es. Replaces the laser sound effect with an arguably better one.
  • Loading branch information
Tenebrosity committed Aug 19, 2013
1 parent 9913df5 commit 9109ef6
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
if ("swing_hit") soundin = pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
if ("hiss") soundin = pick('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
if ("pageturn") soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
if ("gunshot") soundin = pick('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')

var/sound/S = sound(soundin)
S.wait = 0 //No queue
Expand Down
7 changes: 3 additions & 4 deletions code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
origin_tech = "combat=1"
attack_verb = list("struck", "hit", "bashed")

var/fire_sound = 'sound/weapons/Gunshot.ogg'
var/fire_sound = "gunshot"
var/obj/item/projectile/in_chamber = null
var/caliber = ""
var/silenced = 0
var/recoil = 0
var/ejectshell = 1
var/clumsy_check = 1


proc/load_into_chamber()
return 0

Expand Down Expand Up @@ -100,15 +99,15 @@
user.visible_message("<span class='danger'>[user] fires [src]!</span>", "<span class='danger'>You fire [src]!</span>", "You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!")

prepare_shot(in_chamber) //Set the projectile's properties



if(targloc == curloc) //Fire the projectile
user.bullet_act(in_chamber)
del(in_chamber)
update_icon()
return
in_chamber.original = target
in_chamber.original = target
in_chamber.loc = get_turf(user)
in_chamber.starting = get_turf(user)
in_chamber.current = curloc
Expand Down
Binary file modified sound/weapons/Gunshot.ogg
Binary file not shown.
Binary file added sound/weapons/Gunshot2.ogg
Binary file not shown.
Binary file added sound/weapons/Gunshot3.ogg
Binary file not shown.
Binary file added sound/weapons/Gunshot4.ogg
Binary file not shown.
Binary file modified sound/weapons/Laser.ogg
Binary file not shown.

0 comments on commit 9109ef6

Please sign in to comment.