cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/defines/obj/hydro.dm
	code/game/mecha/mecha.dm
	code/game/objects/devices/PDA/PDA.dm
	code/game/objects/devices/flashlight.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/radio/radio.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/mob.dm
This commit is contained in:
Erthilo
2012-08-23 13:56:12 +01:00
parent 66ef336259 7508c64fbf
commit 3510a8adf0
7 changed files with 76 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/ZAS/Fire.dm
View File

@@ -126,10 +126,16 @@ obj
//Change icon depending on the fuel, and thus temperature.
if(firelevel > 6)
icon_state = "3"
if(ul_Red != 11)
ul_SetLuminosity(11,9,0)
else if(firelevel > 2.5)
icon_state = "2"
if(ul_Red != 8)
ul_SetLuminosity(8,7,0)
else
icon_state = "1"
if(ul_Red != 5)
ul_SetLuminosity(5,4,0)
//Ensure flow temperature is higher than minimum fire temperatures.
flow.temperature = max(PLASMA_MINIMUM_BURN_TEMPERATURE+0.1,flow.temperature)