diff --git a/code/LINDA/LINDA_fire.dm b/code/LINDA/LINDA_fire.dm index e6858f04d18..c4b5e645e4a 100644 --- a/code/LINDA/LINDA_fire.dm +++ b/code/LINDA/LINDA_fire.dm @@ -30,7 +30,7 @@ if(air_contents.oxygen < 0.5 || air_contents.toxins < 0.5) return 0 - active_hotspot = PoolOrNew(/obj/effect/hotspot, src) + active_hotspot = new /obj/effect/hotspot(src) active_hotspot.temperature = exposed_temperature active_hotspot.volume = exposed_volume @@ -160,8 +160,7 @@ var/turf/simulated/T = loc if(T.active_hotspot == src) T.active_hotspot = null - ..() - return QDEL_HINT_PUTINPOOL + return ..() /obj/effect/hotspot/proc/DestroyTurf() diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 74919873a29..a8ce807be8a 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -121,7 +121,7 @@ if(T) if(flame_dist && prob(40) && !istype(T, /turf/space) && !T.density) - PoolOrNew(/obj/effect/hotspot, T) //Mostly for ambience! + new /obj/effect/hotspot(T) //Mostly for ambience! if(dist > 0) for(var/atom_movable in T.contents) //bypass type checking since only atom/movable can be contained by turfs anyway var/atom/movable/AM = atom_movable diff --git a/code/modules/pooling/pool.dm b/code/modules/pooling/pool.dm index 048940cfb51..25ff8e3e603 100644 --- a/code/modules/pooling/pool.dm +++ b/code/modules/pooling/pool.dm @@ -16,7 +16,7 @@ To put a object back in the pool, call PlaceInPool(object) This will call destroy on the object, set its loc to null, and reset all of its vars to their default -You can override your object's destroy to return QDEL_HINT_PLACEINPOOL +You can override your object's destroy to return QDEL_HINT_PUTINPOOL to ensure its always placed in this pool (this will only be acted on if qdel calls destroy, and destroy will not get called twice) */ diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 93936f3b06f..d7b8d2bcdd1 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -191,7 +191,7 @@ src.fire_delay = rand(minimum_fire_delay,maximum_fire_delay) src.shot_number = 0 - var/obj/item/projectile/beam/emitter/A = PoolOrNew(/obj/item/projectile/beam/emitter,src.loc) + var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter(src.loc) A.dir = src.dir playsound(get_turf(src), 'sound/weapons/emitter.ogg', 25, 1) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b4462517019..dbc001bb548 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -75,10 +75,6 @@ /obj/item/projectile/beam/emitter/singularity_pull() return //don't want the emitters to miss -/obj/item/projectile/beam/emitter/Destroy() - ..() - return QDEL_HINT_PUTINPOOL - /obj/item/projectile/lasertag name = "laser tag beam" icon_state = "omnilaser" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 5eeff0dac3e..2859edc6a3c 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -119,7 +119,7 @@ /obj/item/projectile/bullet/incendiary/shell/Move() ..() var/turf/location = get_turf(src) - PoolOrNew(/obj/effect/hotspot, location) + new /obj/effect/hotspot(location) location.hotspot_expose(700, 50, 1) /obj/item/projectile/bullet/incendiary/shell/dragonsbreath diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm index f858cc41797..f700ec2aa16 100644 --- a/code/modules/reagents/newchem/drugs.dm +++ b/code/modules/reagents/newchem/drugs.dm @@ -95,7 +95,7 @@ /datum/chemical_reaction/crank/on_reaction(var/datum/reagents/holder, var/created_volume) var/turf/T = get_turf(holder.my_atom) for(var/turf/turf in range(1,T)) - PoolOrNew(/obj/effect/hotspot, turf) + new /obj/effect/hotspot(turf) explosion(T,0,0,2) return diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index 9a978acc26f..a85060132ae 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -46,7 +46,7 @@ /datum/chemical_reaction/clf3/on_reaction(var/datum/reagents/holder, var/created_volume) var/turf/T = get_turf(holder.my_atom) for(var/turf/turf in range(1,T)) - PoolOrNew(/obj/effect/hotspot, turf) + new /obj/effect/hotspot(turf) return /datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume) @@ -59,13 +59,13 @@ if(prob(volume/10)) F.make_plating() if(istype(F, /turf/simulated/floor/)) - PoolOrNew(/obj/effect/hotspot, F) + new /obj/effect/hotspot(F) if(istype(T, /turf/simulated/wall/)) var/turf/simulated/wall/W = T if(prob(volume/10)) W.ChangeTurf(/turf/simulated/floor) if(istype(T, /turf/simulated/shuttle/)) - PoolOrNew(/obj/effect/hotspot, T) + new /obj/effect/hotspot(T) return /datum/reagent/clf3/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) @@ -429,7 +429,7 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit return var/turf/simulated/T = get_turf(holder.my_atom) for(var/turf/simulated/turf in range(created_volume/10,T)) - PoolOrNew(/obj/effect/hotspot, turf) + new /obj/effect/hotspot(turf) return /datum/reagent/phlogiston/on_mob_life(var/mob/living/M as mob)