From 460cada461f464e040178b908430a4a2b6b80268 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Tue, 23 Jan 2018 15:07:40 -0600 Subject: [PATCH] Add light to flashbangs --- code/game/objects/items/weapons/grenades/flashbang.dm | 10 +++++++++- code/modules/lighting/lighting_atom.dm | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index 650173d29eb..dbc0423da37 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -3,12 +3,18 @@ icon_state = "flashbang" item_state = "flashbang" origin_tech = "materials=2;combat=3" + light_power = 10 + light_color = LIGHT_COLOR_WHITE + var/light_time = 2 /obj/item/weapon/grenade/flashbang/prime() update_mob() var/flashbang_turf = get_turf(src) if(!flashbang_turf) return + + set_light(7) + for(var/mob/living/M in hearers(7, flashbang_turf)) bang(get_turf(M), M) @@ -16,7 +22,9 @@ var/damage = round(30/(get_dist(B,get_turf(src))+1)) B.health -= damage B.update_icon() - qdel(src) + + spawn(light_time) + qdel(src) /obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M) M.show_message("BANG", 2) diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm index 679f6fb86ef..6229fa5b044 100644 --- a/code/modules/lighting/lighting_atom.dm +++ b/code/modules/lighting/lighting_atom.dm @@ -20,6 +20,11 @@ update_light() +/atom/proc/flash_light(l_range, l_power, l_color = NONSENSICAL_VALUE, time = 2) + set_light(l_range, l_power, l_color) + spawn(time) + set_light(0) + #undef NONSENSICAL_VALUE /atom/proc/update_light()