From eee52655efc06529418ea4940f940cad8119041c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 19 Dec 2019 01:57:28 -0700 Subject: [PATCH 1/3] Update flashbang.dm --- code/game/objects/items/grenades/flashbang.dm | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 48ecf8273a..50d1d94d05 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -14,23 +14,34 @@ do_sparks(rand(5, 9), FALSE, src) playsound(flashbang_turf, 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) new /obj/effect/dummy/lighting_obj (flashbang_turf, LIGHT_COLOR_WHITE, (flashbang_range + 2), 4, 2) + flashbang_mobs(flashbang_turf, flashbang_range) for(var/mob/living/M in get_hearers_in_view(flashbang_range, flashbang_turf)) bang(get_turf(M), M) qdel(src) -/obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M) +/obj/item/grenade/flashbang/proc/flashbang_mobs(turf/source, range) + var/list/banged = get_hearers_in_view(range, source) + var/list/flashed = viewers(range, source) + for(var/i in banged) + bang(i, source) + for(var/i in flashed) + flash(i, source) + +/obj/item/grenade/flashbang/proc/bang(mob/living/M, turf/source) if(M.stat == DEAD) //They're dead! return M.show_message("BANG", MSG_AUDIBLE) - var/distance = max(0,get_dist(get_turf(src),T)) - -//Flash - if(M.flash_act(affect_silicon = 1)) - M.Knockdown(max(200/max(1,distance), 60)) -//Bang + var/distance = get_dist(get_turf(M), source) if(!distance || loc == M || loc == M.loc) //Stop allahu akbarring rooms with this. M.Knockdown(200) M.soundbang_act(1, 200, 10, 15) - else M.soundbang_act(1, max(200/max(1,distance), 60), rand(0, 5)) + +/obj/item/grenade/flashbang/proc/flash(mob/living/M, turf/source) + if(M.stat == DEAD) //They're dead! + return + var/distance = get_dist(get_turf(M, source)) + if(M.flash_act(affect_silicon = 1)) + M.Knockdown(max(200/max(1,distance), 60)) + From 9436d218b42670dacd3a29b044888d4e8618853a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 19 Dec 2019 03:59:57 -0700 Subject: [PATCH 2/3] thank you based ghomtainer (when) Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/game/objects/items/grenades/flashbang.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 50d1d94d05..9b46c87554 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -41,7 +41,6 @@ /obj/item/grenade/flashbang/proc/flash(mob/living/M, turf/source) if(M.stat == DEAD) //They're dead! return - var/distance = get_dist(get_turf(M, source)) + var/distance = get_dist(get_turf(M), source) if(M.flash_act(affect_silicon = 1)) M.Knockdown(max(200/max(1,distance), 60)) - From 8aca8b8f256afa9db953306f224ab968a4a63759 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Thu, 19 Dec 2019 04:00:37 -0700 Subject: [PATCH 3/3] thank you based ghomtainer (when) 2x how did i not notice this --- code/game/objects/items/grenades/flashbang.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 9b46c87554..66897fa722 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -15,8 +15,6 @@ playsound(flashbang_turf, 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) new /obj/effect/dummy/lighting_obj (flashbang_turf, LIGHT_COLOR_WHITE, (flashbang_range + 2), 4, 2) flashbang_mobs(flashbang_turf, flashbang_range) - for(var/mob/living/M in get_hearers_in_view(flashbang_range, flashbang_turf)) - bang(get_turf(M), M) qdel(src) /obj/item/grenade/flashbang/proc/flashbang_mobs(turf/source, range)