cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Chinsky
2012-10-29 04:28:32 +04:00
parent 27eaaa01d1 299c8d6433
commit 5281cbf2e2
67 changed files with 9509 additions and 9995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents.dm
+17 -5
View File
@@ -246,7 +246,18 @@ datum
var/hotspot = (locate(/obj/fire) in T)
if(hotspot && !istype(T, /turf/space))
var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )
lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
var/excess_temp = lowertemp.temperature - WATER_BOIL_TEMP
if(excess_temp > 0)
while(T.wet > 0)
T.wet -= 0
excess_temp /= 2
if(T.wet_overlay)
if(prob(10))
T.visible_message("\icon[T.wet_overlay] You hear something [pick("hissing","sizzling")]!", "", "\icon[T.wet_overlay] You hear something [pick("hissing","sizzling")]!")
T.overlays -= T.wet_overlay
T.wet_overlay = null
lowertemp.temperature = WATER_BOIL_TEMP + excess_temp
//lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
lowertemp.react()
T.assume_air(lowertemp)
del(hotspot)
@@ -1509,8 +1520,9 @@ datum
if(M.bodytemperature < 170)
M.adjustCloneLoss(-1)
M.adjustOxyLoss(-3)
M.heal_organ_damage(3,3)
M.adjustToxLoss(-3)
if(prob(50))
M.heal_organ_damage(1,1)
M.adjustToxLoss(-1)
..()
return
@@ -1526,8 +1538,8 @@ datum
if(M.bodytemperature < 170)
M.adjustCloneLoss(-3)
M.adjustOxyLoss(-3)
M.heal_organ_damage(3,3)
M.adjustToxLoss(-3)
M.heal_organ_damage(1,1)
M.adjustToxLoss(-1)
..()
return