From 4d427bf7128017dcb6173a23e6f60a610b6cd4c8 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 14 Sep 2014 14:19:25 +0200 Subject: [PATCH 1/2] Partial fix for the immunity to flashbangs in the dark ( now only immune if in the dark AND inside a locker). Deaf people no longer see the "BANG" message of flashbangs. --- code/game/objects/items/weapons/grenades/flashbang.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index ff92bf3ab64..fb35e70ea11 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -12,7 +12,7 @@ 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 << "BANG" + M.show_message("BANG", 2) playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) //Checking for protections From e639737605dffb3ce74bfc74e2c4861a00e1f551 Mon Sep 17 00:00:00 2001 From: phil235 Date: Sun, 14 Sep 2014 15:35:23 +0200 Subject: [PATCH 2/2] hearers() -> get_hear() Fixing the issue. --- code/game/objects/items/weapons/grenades/flashbang.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index fb35e70ea11..c566f3b347b 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -8,7 +8,7 @@ /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) @@ -141,4 +141,4 @@ walk_away(src,temploc,stepdist) var/dettime = rand(15,60) spawn(dettime) - prime() \ No newline at end of file + prime()