diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm index 43ef1e80054..e8b368d64fc 100644 --- a/code/LINDA/LINDA_fire.dm +++ b/code/LINDA/LINDA_fire.dm @@ -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() diff --git a/code/LINDA/LINDA_turf_tile.dm b/code/LINDA/LINDA_turf_tile.dm index ef834dbb1b2..eb43d2d5bca 100644 --- a/code/LINDA/LINDA_turf_tile.dm +++ b/code/LINDA/LINDA_turf_tile.dm @@ -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) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index ff76e6259d3..7dd5365e20a 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -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 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 2a530bab243..ef6d0f4437e 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -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" diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index 2296a7b17ad..c1a9b11e8f6 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -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