cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-13 08:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Aurorastation/development' into Map-Development

Browse Source
This commit is contained in:
LordFowl
2017-01-29 15:38:37 -05:00
parent 426317e156 5a355914fc
commit 865ae1ebd9
218 changed files with 5025 additions and 5528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ZAS/Fire.dm
+4 -4
View File
@@ -137,13 +137,13 @@ turf/proc/hotspot_expose(exposed_temperature, exposed_volume, soh = 0)
if(firelevel > 6)
icon_state = "3"
set_light(7, FIRE_LIGHT_3)
set_light(7, FIRE_LIGHT_3, update_type = UPDATE_NONE) // We set color later in the proc, that should trigger an update.
else if(firelevel > 2.5)
icon_state = "2"
set_light(5, FIRE_LIGHT_2)
set_light(5, FIRE_LIGHT_2, update_type = UPDATE_NONE)
else
icon_state = "1"
set_light(3, FIRE_LIGHT_1)
set_light(3, FIRE_LIGHT_1, update_type = UPDATE_NONE)
for(var/mob/living/L in loc)
L.FireBurn(firelevel, air_contents.temperature, air_contents.return_pressure()) //Burn the mobs!
@@ -439,4 +439,4 @@ datum/gas_mixture/proc/check_recombustability(list/fuel_objs)
#undef FIRE_LIGHT_1
#undef FIRE_LIGHT_2
#undef FIRE_LIGHT_3
#undef FIRE_LIGHT_3