From 552278631886f4c2dfb4a3d338e79a3954e8995d Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 18 Feb 2016 00:18:28 -0500 Subject: [PATCH 1/3] Makes Fires Much Cheaper --- code/LINDA/LINDA_fire.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm index f82cd83d3a6..9b72817fb27 100644 --- a/code/LINDA/LINDA_fire.dm +++ b/code/LINDA/LINDA_fire.dm @@ -49,6 +49,7 @@ layer = TURF_LAYER blend_mode = BLEND_ADD + light_range = 3 var/volume = 125 var/temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST @@ -58,7 +59,7 @@ /obj/effect/hotspot/New() ..() color = heat2color(temperature) - set_light(3, 1, color) + set_light(l_color = color) air_master.hotspots += src perform_exposure() dir = pick(cardinal) @@ -88,10 +89,8 @@ if(item && item != src) // It's possible that the item is deleted in temperature_expose item.fire_act(null, temperature, volume) -// animate(src, color = heat2color(temperature), 5) color = heat2color(temperature) set_light(l_color = color) - return 0 @@ -122,7 +121,6 @@ if(bypassing) icon_state = "3" - set_light(7,3) location.burn_tile() //Possible spread due to radiated heat @@ -138,10 +136,8 @@ else if(volume > CELL_VOLUME*0.4) icon_state = "2" - set_light(5, 2) else icon_state = "1" - set_light(3, 1) if(temperature > location.max_fire_temperature_sustained) location.max_fire_temperature_sustained = temperature @@ -156,9 +152,9 @@ // Garbage collect itself by nulling reference to it /obj/effect/hotspot/Destroy() + set_light(0) air_master.hotspots -= src DestroyTurf() - set_light(0) if(istype(loc, /turf/simulated)) var/turf/simulated/T = loc if(T.active_hotspot == src) From 49cd05ff3c88b4cc281a49a12870080de3e8c60a Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Thu, 18 Feb 2016 01:37:52 -0500 Subject: [PATCH 2/3] colored light removal --- code/LINDA/LINDA_fire.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm index 9b72817fb27..2995435d101 100644 --- a/code/LINDA/LINDA_fire.dm +++ b/code/LINDA/LINDA_fire.dm @@ -59,7 +59,6 @@ /obj/effect/hotspot/New() ..() color = heat2color(temperature) - set_light(l_color = color) air_master.hotspots += src perform_exposure() dir = pick(cardinal) @@ -90,7 +89,6 @@ item.fire_act(null, temperature, volume) color = heat2color(temperature) - set_light(l_color = color) return 0 From 20107e11476a2fb4987c2db41b4dbfa184ec4c44 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 22 Feb 2016 22:20:27 -0500 Subject: [PATCH 3/3] tweak --- code/LINDA/LINDA_fire.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm index 2995435d101..afbeb0a0e45 100644 --- a/code/LINDA/LINDA_fire.dm +++ b/code/LINDA/LINDA_fire.dm @@ -58,7 +58,6 @@ /obj/effect/hotspot/New() ..() - color = heat2color(temperature) air_master.hotspots += src perform_exposure() dir = pick(cardinal) @@ -89,6 +88,7 @@ item.fire_act(null, temperature, volume) color = heat2color(temperature) + set_light(l_color = color) return 0