From 619f295b11fc6d213556051546f022f0acfa5da2 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Mon, 22 Jan 2018 23:41:16 -0600 Subject: [PATCH 1/3] Add light to lasers --- code/modules/projectiles/projectile/beams.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 48fe1f74564..4ea2cf848c8 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -9,6 +9,8 @@ flag = "laser" eyeblur = 2 is_reflectable = TRUE + light_range = 2 + light_color = LIGHT_COLOR_RED /obj/item/projectile/beam/laser @@ -35,6 +37,7 @@ irradiate = 30 forcedodge = 1 range = 15 + light_color = LIGHT_COLOR_GREEN /obj/item/projectile/beam/disabler name = "disabler beam" @@ -44,11 +47,13 @@ flag = "energy" hitsound = 'sound/weapons/tap.ogg' eyeblur = 0 + light_color = LIGHT_COLOR_CYAN /obj/item/projectile/beam/pulse name = "pulse" icon_state = "u_laser" damage = 50 + light_color = LIGHT_COLOR_DARKBLUE /obj/item/projectile/beam/pulse/on_hit(var/atom/target, var/blocked = 0) if(istype(target,/turf/)||istype(target,/obj/structure/)) @@ -77,6 +82,7 @@ flag = "laser" var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag) log_override = TRUE + light_color = LIGHT_COLOR_DARKBLUE /obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0) . = ..() @@ -94,6 +100,7 @@ /obj/item/projectile/beam/lasertag/redtag icon_state = "laser" suit_types = list(/obj/item/clothing/suit/bluetag) + light_color = LIGHT_COLOR_RED /obj/item/projectile/beam/lasertag/bluetag icon_state = "bluelaser" @@ -106,6 +113,7 @@ stun = 5 weaken = 5 stutter = 5 + light_color = LIGHT_COLOR_PINK /obj/item/projectile/beam/immolator name = "immolation beam" @@ -122,12 +130,15 @@ icon_state = "purple_laser" damage = 200 damage_type = BURN + light_color = LIGHT_COLOR_PURPLE /obj/item/projectile/beam/instakill/blue icon_state = "blue_laser" + light_color = LIGHT_COLOR_DARKBLUE /obj/item/projectile/beam/instakill/red icon_state = "red_laser" + light_color = LIGHT_COLOR_RED /obj/item/projectile/beam/instakill/on_hit(atom/target) . = ..() From 460cada461f464e040178b908430a4a2b6b80268 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Tue, 23 Jan 2018 15:07:40 -0600 Subject: [PATCH 2/3] 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() From 5e1a2358e8ebdba1f8125e189ca9228d39d9b8b4 Mon Sep 17 00:00:00 2001 From: Tayyyyyyy Date: Wed, 24 Jan 2018 00:53:12 -0600 Subject: [PATCH 3/3] Remove unneeded proc --- code/modules/lighting/lighting_atom.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm index 6229fa5b044..679f6fb86ef 100644 --- a/code/modules/lighting/lighting_atom.dm +++ b/code/modules/lighting/lighting_atom.dm @@ -20,11 +20,6 @@ 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()