Merge pull request #4821 from phil235/FlashbangFix

Fix for #3773
This commit is contained in:
Cheridan
2014-09-15 21:27:15 -05:00
@@ -8,11 +8,11 @@
/obj/item/weapon/grenade/flashbang/prime()
update_mob()
var/flashbang_turf = get_turf(src)
for(var/obj/structure/closet/L in view(7, flashbang_turf))
for(var/obj/structure/closet/L in get_hear(7, flashbang_turf))
for(var/mob/living/M in L)
bang(get_turf(M), M)
for(var/mob/living/M in view(7, flashbang_turf))
for(var/mob/living/M in hearers(7, flashbang_turf))
bang(get_turf(M), M)
for(var/obj/effect/blob/B in view(8,flashbang_turf)) //Blob damage here
@@ -22,7 +22,7 @@
qdel(src)
/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M)
M << "<span class='warning'>BANG</span>"
M.show_message("<span class='warning'>BANG</span>", 2)
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
//Checking for protections
@@ -141,4 +141,4 @@
walk_away(src,temploc,stepdist)
var/dettime = rand(15,60)
spawn(dettime)
prime()
prime()