Kill is Kill

This commit is contained in:
Fox-McCloud
2015-07-04 19:27:43 -04:00
parent a878ccee30
commit ab28186d13
5 changed files with 15 additions and 18 deletions
+3 -6
View File
@@ -98,18 +98,18 @@
var/turf/simulated/location = loc
if(!istype(location))
Kill()
qdel(src)
return
if(location.excited_group)
location.excited_group.reset_cooldowns()
if((temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) || (volume <= 1))
Kill()
qdel(src)
return
if(!(location.air) || location.air.toxins < 0.5 || location.air.oxygen < 0.5)
Kill()
qdel(src)
return
perform_exposure()
@@ -151,9 +151,6 @@
// Garbage collect itself by nulling reference to it
/obj/effect/hotspot/proc/Kill()
PlaceInPool(src)
/obj/effect/hotspot/Destroy()
air_master.hotspots -= src
DestroyTurf()
+1 -1
View File
@@ -66,7 +66,7 @@ turf/simulated/New()
turf/simulated/Del()
if(active_hotspot)
active_hotspot.Kill()
qdel(active_hotspot)
..()
turf/simulated/assume_air(datum/gas_mixture/giver)
@@ -357,7 +357,7 @@
G.temperature = 2
T.air_update_turf()
for(var/obj/effect/hotspot/H in T)
H.Kill()
qdel(H)
if(G.toxins)
G.nitrogen += (G.toxins)
G.toxins = 0
+6 -6
View File
@@ -270,25 +270,25 @@ datum
for(var/mob/living/carbon/slime/M in T)
M.apply_water()
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
var/hotspot = (locate(/obj/effect/hotspot) 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)
lowertemp.react()
T.assume_air(lowertemp)
hotspot.Kill()
qdel(hotspot)
return
reaction_obj(var/obj/O, var/volume)
src = null
var/turf/T = get_turf(O)
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
var/hotspot = (locate(/obj/effect/hotspot) 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)
lowertemp.react()
T.assume_air(lowertemp)
hotspot.Kill()
qdel(hotspot)
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
if(!cube.wrapped)
@@ -1860,13 +1860,13 @@ datum
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
var/hotspot = (locate(/obj/effect/hotspot) in T)
if(hotspot)
var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )
lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
lowertemp.react()
T.assume_air(lowertemp)
hotspot.Kill()
qdel(hotspot)
enzyme
name = "Denatured Enzyme"
+4 -4
View File
@@ -574,25 +574,25 @@ datum/reagent/firefighting_foam/reaction_turf(var/turf/simulated/T, var/volume)
src = null
if(!istype(T, /turf/space))
new /obj/effect/decal/cleanable/flour/foam(T) //foam mess; clears up quickly.
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
var/hotspot = (locate(/obj/effect/hotspot) 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-(CT*1000),lowertemp.temperature / CT) ,0)
lowertemp.react()
T.assume_air(lowertemp)
hotspot.Kill()
qdel(hotspot)
return
datum/reagent/firefighting_foam/reaction_obj(var/obj/O, var/volume)
src = null
var/turf/T = get_turf(O)
var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
var/hotspot = (locate(/obj/effect/hotspot) 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)
lowertemp.react()
T.assume_air(lowertemp)
hotspot.Kill()
qdel(hotspot)
return
/datum/chemical_reaction/clf3_firefighting