Merge pull request #11119 from phil235/VaporizeMethodReaction

reagents reaction() now has more application method
This commit is contained in:
Jordie
2015-08-19 19:23:17 +10:00
20 changed files with 312 additions and 310 deletions
@@ -58,14 +58,14 @@
for(var/obj/O in range(0,src))
if(O.type == src.type)
continue
reagents.reaction(O, TOUCH, fraction)
reagents.reaction(O, VAPOR, fraction)
var/hit = 0
for(var/mob/living/L in range(0,src))
hit += foam_mob(L)
if(hit)
lifetime++ //this is so the decrease from mobs hit and the natural decrease don't cumulate.
var/T = get_turf(src)
reagents.reaction(T, TOUCH, fraction)
reagents.reaction(T, VAPOR, fraction)
if(--amount < 0)
return
@@ -77,7 +77,7 @@
if(!istype(L))
return 0
var/fraction = 1/initial(lifetime)
reagents.reaction(L, TOUCH, fraction)
reagents.reaction(L, VAPOR, fraction)
lifetime--
return 1
@@ -156,10 +156,10 @@
for(var/obj/O in range(1,src))
if(O.type == src.type)
continue
reagents.reaction(O, TOUCH, fraction)
reagents.reaction(O, VAPOR, fraction)
for(var/turf/T in range(1,src))
reagents.reaction(T, TOUCH, fraction)
reagents.reaction(T, VAPOR, fraction)
var/hit = 0
for(var/mob/living/L in range(1,src))
@@ -173,7 +173,7 @@
if(!istype(M))
return 0
var/fraction = 1/initial(lifetime)
reagents.reaction(M, TOUCH, fraction)
reagents.reaction(M, VAPOR, fraction)
lifetime--
return 1
-1
View File
@@ -450,7 +450,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
var/melting_threshold = 100
if(meltingpwr <= melting_threshold) // so a single unit can't melt items. You need 5.1+ unit for fluoro and 10.1+ for sulphuric
return
for(var/V in armor)
if(armor[V] > 0)
.-- //it survives the acid...