Skip to content

Commit

Permalink
Merge pull request #12811 from Cuboos/A_Whole_new_bang
Browse files Browse the repository at this point in the history
New Flash bang sounds (OW FUCK MY EARS edition)
  • Loading branch information
Razharas committed Nov 5, 2015
2 parents 10dbabe + f136955 commit 037b646
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/game/objects/items/weapons/grenades/flashbang.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

/obj/item/weapon/grenade/flashbang/proc/bang(turf/T , mob/living/M)
M.show_message("<span class='warning'>BANG</span>", 2)
playsound(loc, 'sound/effects/bang.ogg', 25, 1)
playsound(loc, 'sound/weapons/flashbang.ogg', 100, 1)

//Checking for protection
var/ear_safety = M.check_ear_prot()
Expand All @@ -43,6 +43,7 @@
M.Stun(10)
M.Weaken(10)
if(!ear_safety)
M << sound('sound/weapons/flash_ring.ogg',0,1,0,100)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
M.setEarDamage(M.ear_damage + rand(0, 5), max(M.ear_deaf,15))
Expand Down
37 changes: 37 additions & 0 deletions html/changelogs/Cuboos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# spellcheck (typo fixes)
# experiment
# tgs (TG-ported fixes?)
#################################

# Your name.
author: Cuboos

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- soundadd: "Added a new and better sounding flashbag sound and a ringing sound for flashbake deaf effect"

Binary file added sound/weapons/flash_ring.ogg
Binary file not shown.
Binary file added sound/weapons/flashbang.ogg
Binary file not shown.

0 comments on commit 037b646

Please sign in to comment.