diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm
index 8358df737e0..4bbe2e486a1 100644
--- a/code/__DEFINES/qdel.dm
+++ b/code/__DEFINES/qdel.dm
@@ -6,8 +6,7 @@
#define QDEL_HINT_IWILLGC 2 //functionally the same as the above. qdel should assume the object will gc on its own, and not check it.
#define QDEL_HINT_HARDDEL 3 //qdel should assume this object won't gc, and queue a hard delete using a hard reference.
#define QDEL_HINT_HARDDEL_NOW 4 //qdel should assume this object won't gc, and hard del it post haste.
-#define QDEL_HINT_PUTINPOOL 5 //qdel will put this object in the atom pool.
-#define QDEL_HINT_FINDREFERENCE 6 //functionally identical to QDEL_HINT_QUEUE if TESTING is not enabled in _compiler_options.dm.
+#define QDEL_HINT_FINDREFERENCE 5 //functionally identical to QDEL_HINT_QUEUE if TESTING is not enabled in _compiler_options.dm.
//if TESTING is enabled, qdel will call this object's find_references() verb.
//defines for the gc_destroyed var
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 4d8a0a46e0a..0fea126a80a 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -33,7 +33,7 @@
else //no need to update
return 0
else
- alert = PoolOrNew(type)
+ alert = new type()
if(new_master)
var/old_layer = new_master.layer
@@ -586,8 +586,8 @@ so as to remain in compliance with the most up-to-date laws."
return usr.client.Click(master, location, control, params)
/obj/screen/alert/Destroy()
- ..()
+ . = ..()
severity = 0
master = null
screen_loc = ""
- return QDEL_HINT_PUTINPOOL //Don't destroy me, I have a family!
+
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index a1078b7aeb1..ba8ff0e72cc 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -12,7 +12,7 @@
else if(!severity || severity == screen.severity)
return null
else
- screen = PoolOrNew(type)
+ screen = new type()
screen.icon_state = "[initial(screen.icon_state)][severity]"
screen.severity = severity
@@ -65,9 +65,8 @@
var/severity = 0
/obj/screen/fullscreen/Destroy()
- ..()
severity = 0
- return QDEL_HINT_PUTINPOOL
+ . = ..()
/obj/screen/fullscreen/brute
icon_state = "brutedamageoverlay"
diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm
index 66e4a5d0448..4a141df0c51 100644
--- a/code/_onclick/telekinesis.dm
+++ b/code/_onclick/telekinesis.dm
@@ -175,7 +175,7 @@ var/const/tk_maxrange = 15
/obj/item/tk_grab/proc/apply_focus_overlay()
if(!focus)
return
- PoolOrNew(/obj/effect/overlay/temp/telekinesis, get_turf(focus))
+ new /obj/effect/overlay/temp/telekinesis(get_turf(focus))
/obj/item/tk_grab/update_icon()
diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm
index ece8d7c5678..05807f12955 100644
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -190,8 +190,6 @@ var/datum/subsystem/garbage_collector/SSgarbage
SSgarbage.HardQueue(D)
if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste.
del(D)
- if (QDEL_HINT_PUTINPOOL) //qdel will put this object in the pool.
- PlaceInPool(D, 0)
if (QDEL_HINT_FINDREFERENCE)//qdel will, if TESTING is enabled, display all references to this object, then queue the object for deletion.
SSgarbage.QueueForQueuing(D)
#ifdef TESTING
diff --git a/code/controllers/subsystem/pool.dm b/code/controllers/subsystem/pool.dm
deleted file mode 100644
index 245e733e984..00000000000
--- a/code/controllers/subsystem/pool.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-var/datum/subsystem/pool/SSpool
-
-/datum/subsystem/pool
- name = "Pool"
- init_order = 20
- flags = SS_BACKGROUND | SS_FIRE_IN_LOBBY
- var/list/global_pool
- var/list/pool_levels = list()
- var/sum = 0
-
- var/list/maintained_types = list(
- /obj/item/stack/tile/plasteel = 100
- )
-
- var/list/stats_placed_in_pool = list()
- var/list/stats_pooled_or_newed = list()
- var/list/stats_reused = list()
- var/list/stats_created_new = list()
-
-/datum/subsystem/pool/New()
- NEW_SS_GLOBAL(SSpool)
-
-/datum/subsystem/pool/Initialize(timeofday)
- global_pool = GlobalPool
-
-/datum/subsystem/pool/stat_entry(msg)
- if(global_pool)
- msg += "Types: [global_pool.len]|Total Pooled Objects: [sum]"
- else
- msg += "NULL POOL"
- ..(msg)
-
-/datum/subsystem/pool/fire()
- sum = 0
- for(var/type in global_pool + maintained_types)
- var/list/L = global_pool[type]
- var/required_number = maintained_types[type] || 0
-
- // Update pool levels and tracker
- var/amount = 0
- if(L)
- amount = L.len
- sum += amount
-
- // why yes, just inflate the pool at one item per tick
- if(amount < required_number)
- var/diver = new type
- qdel(diver)
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index b6170c688d9..0b1cc6d6e7d 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -36,7 +36,7 @@ Bonus
/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A)
var/heal_amt = 0.5
if(M.toxloss > 0 && prob(20))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#66FF99"))
+ new /obj/effect/overlay/temp/heal(get_turf(M), "#66FF99")
M.adjustToxLoss(-heal_amt)
return 1
@@ -67,7 +67,7 @@ Bonus
/datum/symptom/heal/plus/Heal(mob/living/M, datum/disease/advance/A)
var/heal_amt = 1
if(M.toxloss > 0 && prob(20))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#00FF00"))
+ new /obj/effect/overlay/temp/heal(get_turf(M), "#00FF00")
M.adjustToxLoss(-heal_amt)
return 1
@@ -110,7 +110,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#FF3333"))
+ new /obj/effect/overlay/temp/heal(get_turf(M), "#FF3333")
return 1
@@ -148,7 +148,7 @@ Bonus
if(M.getCloneLoss() > 0)
M.adjustCloneLoss(-1)
M.take_bodypart_damage(0, 1) //Deals BURN damage, which is not cured by this symptom
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#33FFCC"))
+ new /obj/effect/overlay/temp/heal(get_turf(M), "#33FFCC")
if(!parts.len)
return
@@ -158,7 +158,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#CC1100"))
+ new /obj/effect/overlay/temp/heal(get_turf(M), "#CC1100")
return 1
@@ -201,7 +201,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#FF9933"))
+ new /obj/effect/overlay/temp/heal(get_turf(M), "#FF9933")
return 1
@@ -248,7 +248,7 @@ Bonus
M.update_damage_overlays()
if(prob(20))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(M), "#CC6600"))
+ new /obj/effect/overlay/temp/heal(get_turf(M), "#CC6600")
return 1
diff --git a/code/datums/weather/weather_types.dm b/code/datums/weather/weather_types.dm
index 541bef2e59e..0232d4c8ad5 100644
--- a/code/datums/weather/weather_types.dm
+++ b/code/datums/weather/weather_types.dm
@@ -174,7 +174,7 @@
return
var/datum/signal/status_signal = new
- var/atom/movable/virtualspeaker/virt = PoolOrNew(/atom/movable/virtualspeaker,null)
+ var/atom/movable/virtualspeaker/virt = new /atom/movable/virtualspeaker(null)
status_signal.source = virt
status_signal.transmission_method = 1
status_signal.data["command"] = "shuttle"
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 5f6f0ee55ff..f2cd8a257b9 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -445,7 +445,7 @@ var/list/blood_splatter_icons = list()
/atom/proc/add_vomit_floor(mob/living/carbon/M, toxvomit = 0)
if(isturf(src))
- var/obj/effect/decal/cleanable/vomit/V = PoolOrNew(/obj/effect/decal/cleanable/vomit, src)
+ var/obj/effect/decal/cleanable/vomit/V = new /obj/effect/decal/cleanable/vomit(src)
// Make toxins vomit look different
if(toxvomit)
V.icon_state = "vomittox_[pick(1,4)]"
diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm
index d634f10ebb3..6342011050d 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/game/gamemodes/antag_spawner.dm
@@ -70,7 +70,7 @@
H << "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later."
/obj/item/weapon/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "")
- PoolOrNew(/obj/effect/particle_effect/smoke, T)
+ new /obj/effect/particle_effect/smoke(T)
var/mob/living/carbon/human/M = new/mob/living/carbon/human(T)
C.prefs.copy_to(M)
M.key = C.key
@@ -257,7 +257,7 @@
/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "")
- var /obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,T)
+ var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T)
var/mob/living/simple_animal/slaughter/S = new demon_type(holder)
S.holder = holder
S.key = C.key
diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm
index d7403319957..570a0df62e3 100644
--- a/code/game/gamemodes/blob/blobs/blob_mobs.dm
+++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm
@@ -32,7 +32,7 @@
/mob/living/simple_animal/hostile/blob/blob_act(obj/structure/blob/B)
if(stat != DEAD && health < maxHealth)
for(var/i in 1 to 2)
- var/obj/effect/overlay/temp/heal/H = PoolOrNew(/obj/effect/overlay/temp/heal, get_turf(src)) //hello yes you are being healed
+ var/obj/effect/overlay/temp/heal/H = new /obj/effect/overlay/temp/heal(get_turf(src)) //hello yes you are being healed
if(overmind)
H.color = overmind.blob_reagent_datum.complementary_color
else
diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm
index 6825d2cd6cb..209d8ca130e 100644
--- a/code/game/gamemodes/blob/theblob.dm
+++ b/code/game/gamemodes/blob/theblob.dm
@@ -140,7 +140,7 @@
loc.blob_act(src) //don't ask how a wall got on top of the core, just eat it
/obj/structure/blob/proc/blob_attack_animation(atom/A = null, controller) //visually attacks an atom
- var/obj/effect/overlay/temp/blob/O = PoolOrNew(/obj/effect/overlay/temp/blob, src.loc)
+ var/obj/effect/overlay/temp/blob/O = new /obj/effect/overlay/temp/blob(src.loc)
O.setDir(dir)
if(controller)
var/mob/camera/blob/BO = controller
@@ -208,7 +208,7 @@
if(overmind)
overmind.blob_reagent_datum.emp_reaction(src, severity)
if(prob(100 - severity * 30))
- PoolOrNew(/obj/effect/overlay/temp/emp, get_turf(src))
+ new /obj/effect/overlay/temp/emp(get_turf(src))
/obj/structure/blob/tesla_act(power)
..()
diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm
index 2e42a1ee4c9..8284bf351c4 100644
--- a/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm
+++ b/code/game/gamemodes/clock_cult/clock_effects/clock_overlay.dm
@@ -16,8 +16,7 @@
/obj/effect/clockwork/overlay/Destroy()
if(linked)
linked = null
- ..()
- return QDEL_HINT_PUTINPOOL
+ . = ..()
/obj/effect/clockwork/overlay/wall
name = "clockwork wall"
diff --git a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
index d33943cfe89..eb9909c429e 100644
--- a/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
+++ b/code/game/gamemodes/clock_cult/clock_effects/clock_sigils.dm
@@ -68,7 +68,7 @@
L.visible_message("[src] appears around [L] in a burst of light!", \
"[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!")
L.Stun(5)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/sigil/transgression, get_turf(src))
+ new /obj/effect/overlay/temp/ratvar/sigil/transgression(get_turf(src))
qdel(src)
@@ -101,7 +101,7 @@
animate(src, color = "#AF0AAF", time = convert_time)
var/obj/effect/overlay/temp/ratvar/sigil/glow
if(glow_type)
- glow = PoolOrNew(glow_type, get_turf(src))
+ glow = new glow_type(get_turf(src))
animate(glow, alpha = 255, time = convert_time)
var/I = 0
while(I < convert_time && get_turf(L) == get_turf(src))
@@ -294,14 +294,14 @@
while(L && (!is_servant_of_ratvar(L) || (is_servant_of_ratvar(L) && vitality)) && get_turf(L) == get_turf(src))
sigil_active = TRUE
if(animation_number >= 4)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/sigil/vitality, get_turf(src))
+ new /obj/effect/overlay/temp/ratvar/sigil/vitality(get_turf(src))
animation_number = 0
animation_number++
if(!is_servant_of_ratvar(L))
var/vitality_drained = 0
if(L.stat == DEAD)
vitality_drained = L.maxHealth
- var/obj/effect/overlay/temp/ratvar/sigil/vitality/V = PoolOrNew(/obj/effect/overlay/temp/ratvar/sigil/vitality, get_turf(src))
+ var/obj/effect/overlay/temp/ratvar/sigil/vitality/V = new /obj/effect/overlay/temp/ratvar/sigil/vitality(get_turf(src))
animate(V, alpha = 0, transform = matrix()*2, time = 8)
playsound(L, 'sound/magic/WandODeath.ogg', 50, 1)
L.visible_message("[L] collapses in on [L.p_them()]self as [src] flares bright blue!")
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm
index 5a9a486efea..e04edc42c3e 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/component_helpers.dm
@@ -4,7 +4,8 @@
specific_component_id = get_weighted_component_id()
clockwork_component_cache[specific_component_id]++
if(A)
- PoolOrNew(get_component_animation_type(specific_component_id), get_turf(A))
+ var/component_animation_type = get_component_animation_type(specific_component_id)
+ new component_animation_type(get_turf(A))
update_slab_info()
return specific_component_id
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm
index 885ca815c0d..04d739c8ff8 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/proselytizer_helpers.dm
@@ -32,7 +32,7 @@
/turf/open/floor/proselytize_vals(mob/living/user, obj/item/clockwork/clockwork_proselytizer/proselytizer)
if(floor_tile == /obj/item/stack/tile/plasteel)
- PoolOrNew(floor_tile, src)
+ new floor_tile(src)
make_plating()
playsound(src, 'sound/items/Crowbar.ogg', 10, 1) //clink
return list("operation_time" = 30, "new_obj_type" = /turf/open/floor/clockwork, "power_cost" = POWER_FLOOR, "spawn_dir" = SOUTH)
diff --git a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm
index d36dcd3d8fe..397dd55203b 100644
--- a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm
+++ b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm
@@ -120,7 +120,7 @@
L.adjustToxLoss(totaldamage * 0.5, TRUE, TRUE)
var/healseverity = max(round(totaldamage*0.05, 1), 1) //shows the general severity of the damage you just healed, 1 glow per 20
for(var/i in 1 to healseverity)
- PoolOrNew(/obj/effect/overlay/temp/heal, list(targetturf, "#1E8CE1"))
+ new /obj/effect/overlay/temp/heal(targetturf, "#1E8CE1")
clockwork_say(ranged_ability_user, text2ratvar("Mend wounded flesh!"))
add_logs(ranged_ability_user, L, "healed with Sentinel's Compromise")
else
diff --git a/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm b/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm
index d63b36aea95..8e92246ed17 100644
--- a/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm
+++ b/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm
@@ -99,13 +99,13 @@
impale_cooldown = world.time + initial(impale_cooldown)
attack_cooldown = world.time + initial(attack_cooldown)
if(target)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/bloodsplatter, list(get_turf(target), get_dir(user, target)))
+ new /obj/effect/overlay/temp/dir_setting/bloodsplatter(get_turf(target), get_dir(user, target))
target.Stun(2)
user << "You prepare to remove your ratvarian spear from [target]..."
var/remove_verb = pick("pull", "yank", "drag")
if(do_after(user, 10, 1, target))
var/turf/T = get_turf(target)
- var/obj/effect/overlay/temp/dir_setting/bloodsplatter/B = PoolOrNew(/obj/effect/overlay/temp/dir_setting/bloodsplatter, list(T, get_dir(target, user)))
+ var/obj/effect/overlay/temp/dir_setting/bloodsplatter/B = new /obj/effect/overlay/temp/dir_setting/bloodsplatter(T, get_dir(target, user))
playsound(T, 'sound/misc/splort.ogg', 200, 1)
playsound(T, 'sound/weapons/pierce.ogg', 200, 1)
if(target.stat != CONSCIOUS)
@@ -154,5 +154,5 @@
T = get_turf(src)
if(T) //make sure we're not in null or something
T.visible_message("[src] [pick("cracks in two and fades away", "snaps in two and dematerializes")]!")
- PoolOrNew(/obj/effect/overlay/temp/ratvar/spearbreak, T)
+ new /obj/effect/overlay/temp/ratvar/spearbreak(T)
qdel(src)
diff --git a/code/game/gamemodes/clock_cult/clock_mobs.dm b/code/game/gamemodes/clock_cult/clock_mobs.dm
index 792e4e16844..8fd91b5519d 100644
--- a/code/game/gamemodes/clock_cult/clock_mobs.dm
+++ b/code/game/gamemodes/clock_cult/clock_mobs.dm
@@ -225,7 +225,7 @@
if(iscarbon(host))
resulthealth = round((abs(HEALTH_THRESHOLD_DEAD - host.health) / abs(HEALTH_THRESHOLD_DEAD - host.maxHealth)) * 100)
if(ratvar_awakens || resulthealth <= MARAUDER_EMERGE_THRESHOLD)
- PoolOrNew(/obj/effect/overlay/temp/heal, list(host.loc, "#AF0AAF"))
+ new /obj/effect/overlay/temp/heal(host.loc, "#AF0AAF")
host.adjustBruteLoss(-1)
host.adjustFireLoss(-1)
host.adjustToxLoss(-1)
diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
index 8faba217d19..3dab30acce9 100644
--- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
+++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm
@@ -290,7 +290,7 @@
/datum/clockwork_scripture/channeled/volt_void/chant_effects(chant_number)
playsound(invoker, 'sound/effects/EMPulse.ogg', 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/sigil/voltvoid, get_turf(invoker))
+ new /obj/effect/overlay/temp/ratvar/sigil/voltvoid(get_turf(invoker))
var/power_drained = 0
for(var/atom/movable/A in view(7, get_turf(invoker)))
power_drained += A.power_drain(TRUE)
diff --git a/code/game/gamemodes/clock_cult/clock_structure.dm b/code/game/gamemodes/clock_cult/clock_structure.dm
index 92e36d8a6d6..0050ab9e146 100644
--- a/code/game/gamemodes/clock_cult/clock_structure.dm
+++ b/code/game/gamemodes/clock_cult/clock_structure.dm
@@ -104,7 +104,7 @@
if(anchored && unanchored_icon)
anchored = FALSE
update_anchored(null, obj_integrity > max_integrity * 0.25)
- PoolOrNew(/obj/effect/overlay/temp/emp, loc)
+ new /obj/effect/overlay/temp/emp(loc)
//for the ark and Ratvar
@@ -191,7 +191,7 @@
/obj/structure/destructible/clockwork/powered/emp_act(severity)
if(forced_disable(TRUE))
- PoolOrNew(/obj/effect/overlay/temp/emp, loc)
+ new /obj/effect/overlay/temp/emp(loc)
/obj/structure/destructible/clockwork/powered/proc/total_accessable_power() //how much power we have and can use
if(!needs_power || ratvar_awakens)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
index d8ec850a701..3d53803a62f 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -113,7 +113,7 @@
/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/make_glow()
if(!glow)
- glow = PoolOrNew(/obj/effect/clockwork/overlay/gateway_glow, get_turf(src))
+ glow = new /obj/effect/clockwork/overlay/gateway_glow(get_turf(src))
glow.linked = src
/obj/structure/destructible/clockwork/massive/celestial_gateway/ex_act(severity)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm
index d7054fddc71..94d8c135126 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/geis_binding.dm
@@ -26,7 +26,7 @@
return
/obj/structure/destructible/clockwork/geis_binding/emp_act(severity)
- PoolOrNew(/obj/effect/overlay/temp/emp, loc)
+ new /obj/effect/overlay/temp/emp(loc)
qdel(src)
/obj/structure/destructible/clockwork/geis_binding/post_buckle_mob(mob/living/M)
@@ -47,8 +47,8 @@
M.visible_message("A [name] appears around [M]!", \
"A [name] appears around you!\nResist!")
else
- var/obj/effect/overlay/temp/ratvar/geis_binding/G = PoolOrNew(/obj/effect/overlay/temp/ratvar/geis_binding, M.loc)
- var/obj/effect/overlay/temp/ratvar/geis_binding/T = PoolOrNew(/obj/effect/overlay/temp/ratvar/geis_binding/top, M.loc)
+ var/obj/effect/overlay/temp/ratvar/geis_binding/G = new /obj/effect/overlay/temp/ratvar/geis_binding(M.loc)
+ var/obj/effect/overlay/temp/ratvar/geis_binding/T = new /obj/effect/overlay/temp/ratvar/geis_binding/top(M.loc)
G.layer = mob_layer - 0.01
T.layer = mob_layer + 0.01
G.alpha = alpha
@@ -83,10 +83,10 @@
if(L)
L.Stun(1, 1, 1)
visible_message("[src] flares brightly!")
- var/obj/effect/overlay/temp/ratvar/geis_binding/G1 = PoolOrNew(/obj/effect/overlay/temp/ratvar/geis_binding, loc)
- var/obj/effect/overlay/temp/ratvar/geis_binding/G2 = PoolOrNew(/obj/effect/overlay/temp/ratvar/geis_binding, loc)
- var/obj/effect/overlay/temp/ratvar/geis_binding/T1 = PoolOrNew(/obj/effect/overlay/temp/ratvar/geis_binding/top, loc)
- var/obj/effect/overlay/temp/ratvar/geis_binding/T2 = PoolOrNew(/obj/effect/overlay/temp/ratvar/geis_binding/top, loc)
+ var/obj/effect/overlay/temp/ratvar/geis_binding/G1 = new /obj/effect/overlay/temp/ratvar/geis_binding(loc)
+ var/obj/effect/overlay/temp/ratvar/geis_binding/G2 = new /obj/effect/overlay/temp/ratvar/geis_binding(loc)
+ var/obj/effect/overlay/temp/ratvar/geis_binding/T1 = new /obj/effect/overlay/temp/ratvar/geis_binding/top(loc)
+ var/obj/effect/overlay/temp/ratvar/geis_binding/T2 = new /obj/effect/overlay/temp/ratvar/geis_binding/top(loc)
G1.layer = mob_layer - 0.01
G2.layer = mob_layer - 0.01
T1.layer = mob_layer + 0.01
diff --git a/code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm b/code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm
index fb3d60888e8..11c12d4db69 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/mending_motor.dm
@@ -61,7 +61,7 @@
if(S.health < S.maxHealth)
if(try_use_power(heal_cost))
S.adjustHealth(-(8 * efficiency))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(T, "#1E8CE1"))
+ new /obj/effect/overlay/temp/heal(T, "#1E8CE1")
else
S << "\"[text2ratvar(pick(heal_failure_messages))]\""
break
@@ -80,7 +80,7 @@
if(C == src)
efficiency = get_efficiency_mod()
C.update_icon()
- PoolOrNew(/obj/effect/overlay/temp/heal, list(T, "#1E8CE1"))
+ new /obj/effect/overlay/temp/heal(T, "#1E8CE1")
else
break
else
@@ -95,7 +95,7 @@
if(try_use_power(heal_cost))
S.adjustBruteLoss(-(5 * efficiency))
S.adjustFireLoss(-(3 * efficiency))
- PoolOrNew(/obj/effect/overlay/temp/heal, list(T, "#1E8CE1"))
+ new /obj/effect/overlay/temp/heal(T, "#1E8CE1")
else
S << "\"[text2ratvar(pick(heal_failure_messages))]\""
break
diff --git a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm
index c938966062c..c28d7ae3efe 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm
@@ -78,7 +78,7 @@
var/obj/mecha/M = target
M.take_damage(damage_per_tick * get_efficiency_mod(), BURN, "melee", 1, get_dir(src, M))
- PoolOrNew(/obj/effect/overlay/temp/ratvar/ocular_warden, get_turf(target))
+ new /obj/effect/overlay/temp/ratvar/ocular_warden(get_turf(target))
setDir(get_dir(get_turf(src), get_turf(target)))
if(!target)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm b/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm
index 87ae60dc6d4..6b6f3ff9dc0 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm
@@ -19,7 +19,7 @@
/obj/structure/destructible/clockwork/wall_gear/New()
..()
- PoolOrNew(/obj/effect/overlay/temp/ratvar/gear, get_turf(src))
+ new /obj/effect/overlay/temp/ratvar/gear(get_turf(src))
/obj/structure/destructible/clockwork/wall_gear/emp_act(severity)
return
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index b2c3d2520f3..6490636a9ab 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -193,7 +193,7 @@
if(current_charges)
owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!")
current_charges--
- PoolOrNew(/obj/effect/overlay/temp/cult/sparks, get_turf(owner))
+ new /obj/effect/overlay/temp/cult/sparks(get_turf(owner))
if(!current_charges)
owner.visible_message("The runed shield around [owner] suddenly disappears!")
owner.update_inv_wear_suit()
@@ -341,14 +341,14 @@
if(uses <= 0)
icon_state ="shifter_drained"
playsound(mobloc, "sparks", 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/cult/phase/out, list(mobloc, C.dir))
+ new /obj/effect/overlay/temp/dir_setting/cult/phase/out(mobloc, C.dir)
var/atom/movable/pulled = handle_teleport_grab(destination, C)
C.forceMove(destination)
if(pulled)
C.start_pulling(pulled) //forcemove resets pulls, so we need to re-pull
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/cult/phase, list(destination, C.dir))
+ new /obj/effect/overlay/temp/dir_setting/cult/phase(destination, C.dir)
playsound(destination, 'sound/effects/phasein.ogg', 25, 1)
playsound(destination, "sparks", 50, 1)
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index fc49899a9c3..752e311533f 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -154,7 +154,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list(
for(var/mob/living/L in range(5, src))
if(iscultist(L) || isshade(L) || isconstruct(L))
if(L.health != L.maxHealth)
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(src), "#960000"))
+ new /obj/effect/overlay/temp/heal(get_turf(src), "#960000")
if(ishuman(L))
L.adjustBruteLoss(-1, 0)
L.adjustFireLoss(-1, 0)
@@ -184,7 +184,7 @@ var/list/blacklisted_pylon_turfs = typecacheof(list(
else
var/turf/open/floor/engine/cult/F = safepick(cultturfs)
if(F)
- PoolOrNew(/obj/effect/overlay/temp/cult/turf/floor, F)
+ new /obj/effect/overlay/temp/cult/turf/floor(F)
else
// Are we in space or something? No cult turfs or
// convertable turfs?
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 359154a044e..db9f4a91a17 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -415,7 +415,7 @@ var/list/teleport_runes = list()
else
sacrificed += sacrificial
- PoolOrNew(/obj/effect/overlay/temp/cult/sac, get_turf(src))
+ new /obj/effect/overlay/temp/cult/sac(get_turf(src))
for(var/M in invokers)
if(sacrifice_fulfilled)
M << "\"Yes! This is the one I desire! You have done well.\""
@@ -891,7 +891,7 @@ var/list/wall_runes = list()
if(!src)
return
do_area_burn(T, 1.5)
- PoolOrNew(/obj/effect/hotspot, T)
+ new /obj/effect/hotspot(T)
qdel(src)
/obj/effect/rune/blood_boil/proc/do_area_burn(turf/T, multiplier)
diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index 681ce9c9033..3f3f0e57ccc 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -328,7 +328,7 @@
/obj/effect/meteor/tunguska/Move()
. = ..()
if(.)
- PoolOrNew(/obj/effect/overlay/temp/revenant, get_turf(src))
+ new /obj/effect/overlay/temp/revenant(get_turf(src))
/obj/effect/meteor/tunguska/meteor_effect()
..()
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 7cdd3ac1f0c..b7b05526a13 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -52,8 +52,7 @@
stealth_active = 1
if(ishuman(loc))
var/mob/living/carbon/human/M = loc
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/cloak,
- list(get_turf(M), M.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/cloak(get_turf(M), M.dir)
M.name_override = disguise.name
M.icon = disguise.icon
M.icon_state = disguise.icon_state
@@ -66,8 +65,7 @@
stealth_active = 0
if(ishuman(loc))
var/mob/living/carbon/human/M = loc
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja,
- list(get_turf(M), M.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(M), M.dir)
M.name_override = null
M.cut_overlays()
M.regenerate_icons()
diff --git a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm
index 21c627d266f..10d22d43c1e 100644
--- a/code/game/gamemodes/miniantags/abduction/machinery/pad.dm
+++ b/code/game/gamemodes/miniantags/abduction/machinery/pad.dm
@@ -16,27 +16,27 @@
flick("alien-pad", src)
for(var/mob/living/target in loc)
target.forceMove(teleport_target)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja, list(get_turf(target), target.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir)
/obj/machinery/abductor/pad/proc/Retrieve(mob/living/target)
flick("alien-pad", src)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja, list(get_turf(target), target.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir)
Warp(target)
/obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target)
- PoolOrNew(/obj/effect/overlay/temp/teleport_abductor, place)
+ new /obj/effect/overlay/temp/teleport_abductor(place)
sleep(80)
flick("alien-pad", src)
target.forceMove(place)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja, list(get_turf(target), target.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir)
/obj/machinery/abductor/pad/proc/PadToLoc(place)
- PoolOrNew(/obj/effect/overlay/temp/teleport_abductor, place)
+ new /obj/effect/overlay/temp/teleport_abductor(place)
sleep(80)
flick("alien-pad", src)
for(var/mob/living/target in get_turf(src))
target.forceMove(place)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja, list(get_turf(target), target.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja(get_turf(target), target.dir)
/obj/effect/overlay/temp/teleport_abductor
diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
index 823106453bd..dd2f9af17e1 100644
--- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
+++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm
@@ -409,7 +409,7 @@
resources++
do_attack_animation(target)
changeNext_move(CLICK_CD_MELEE)
- var/obj/effect/overlay/temp/swarmer/integrate/I = PoolOrNew(/obj/effect/overlay/temp/swarmer/integrate, get_turf(target))
+ var/obj/effect/overlay/temp/swarmer/integrate/I = new /obj/effect/overlay/temp/swarmer/integrate(get_turf(target))
I.pixel_x = target.pixel_x
I.pixel_y = target.pixel_y
I.pixel_z = target.pixel_z
@@ -426,7 +426,7 @@
/mob/living/simple_animal/hostile/swarmer/proc/DisIntegrate(atom/movable/target)
- PoolOrNew(/obj/effect/overlay/temp/swarmer/disintegration, get_turf(target))
+ new /obj/effect/overlay/temp/swarmer/disintegration(get_turf(target))
do_attack_animation(target)
changeNext_move(CLICK_CD_MELEE)
target.ex_act(3)
@@ -474,7 +474,7 @@
/mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(obj/machinery/target)
do_attack_animation(target)
src << "We begin to dismantle this machine. We will need to be uninterrupted."
- var/obj/effect/overlay/temp/swarmer/dismantle/D = PoolOrNew(/obj/effect/overlay/temp/swarmer/dismantle, get_turf(target))
+ var/obj/effect/overlay/temp/swarmer/dismantle/D = new /obj/effect/overlay/temp/swarmer/dismantle(get_turf(target))
D.pixel_x = target.pixel_x
D.pixel_y = target.pixel_y
D.pixel_z = target.pixel_z
@@ -484,7 +484,7 @@
M.amount = 5
for(var/obj/item/I in target.component_parts)
I.loc = M.loc
- var/obj/effect/overlay/temp/swarmer/disintegration/N = PoolOrNew(/obj/effect/overlay/temp/swarmer/disintegration, get_turf(target))
+ var/obj/effect/overlay/temp/swarmer/disintegration/N = new /obj/effect/overlay/temp/swarmer/disintegration(get_turf(target))
N.pixel_x = target.pixel_x
N.pixel_y = target.pixel_y
N.pixel_z = target.pixel_z
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 91c47fad8e4..d096c397402 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -205,7 +205,7 @@
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(4, 0, L)
s.start()
- PoolOrNew(/obj/effect/overlay/temp/revenant, L.loc)
+ new /obj/effect/overlay/temp/revenant(L.loc)
sleep(20)
if(!L.on) //wait, wait, don't shock me
return
@@ -240,19 +240,19 @@
/obj/effect/proc_holder/spell/aoe_turf/revenant/defile/proc/defile(turf/T)
if(T.flags & NOJAUNT)
T.flags -= NOJAUNT
- PoolOrNew(/obj/effect/overlay/temp/revenant, T)
+ new /obj/effect/overlay/temp/revenant(T)
if(!istype(T, /turf/open/floor/plating) && !istype(T, /turf/open/floor/engine/cult) && isfloorturf(T) && prob(15))
var/turf/open/floor/floor = T
if(floor.intact && floor.floor_tile)
- PoolOrNew(floor.floor_tile, floor)
+ new floor.floor_tile(floor)
floor.broken = 0
floor.burnt = 0
floor.make_plating(1)
if(T.type == /turf/closed/wall && prob(15))
- PoolOrNew(/obj/effect/overlay/temp/revenant, T)
+ new /obj/effect/overlay/temp/revenant(T)
T.ChangeTurf(/turf/closed/wall/rust)
if(T.type == /turf/closed/wall/r_wall && prob(10))
- PoolOrNew(/obj/effect/overlay/temp/revenant, T)
+ new /obj/effect/overlay/temp/revenant(T)
T.ChangeTurf(/turf/closed/wall/r_wall/rust)
for(var/obj/structure/closet/closet in T.contents)
closet.open()
@@ -264,7 +264,7 @@
for(var/obj/structure/window/window in T)
window.take_damage(rand(30,80))
if(window && window.fulltile)
- PoolOrNew(/obj/effect/overlay/temp/revenant/cracks, window.loc)
+ new /obj/effect/overlay/temp/revenant/cracks(window.loc)
for(var/obj/machinery/light/light in T)
light.flicker(20) //spooky
@@ -287,7 +287,7 @@
/obj/effect/proc_holder/spell/aoe_turf/revenant/malfunction/proc/malfunction(turf/T, mob/user)
for(var/mob/living/simple_animal/bot/bot in T)
if(!bot.emagged)
- PoolOrNew(/obj/effect/overlay/temp/revenant, bot.loc)
+ new /obj/effect/overlay/temp/revenant(bot.loc)
bot.locked = 0
bot.open = 1
bot.emag_act()
@@ -295,21 +295,21 @@
if(human == user)
continue
human << "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")]."
- PoolOrNew(/obj/effect/overlay/temp/revenant, human.loc)
+ new /obj/effect/overlay/temp/revenant(human.loc)
human.emp_act(1)
for(var/obj/thing in T)
if(istype(thing, /obj/machinery/dominator) || istype(thing, /obj/machinery/power/apc) || istype(thing, /obj/machinery/power/smes)) //Doesn't work on dominators, SMES and APCs, to prevent kekkery
continue
if(prob(20))
if(prob(50))
- PoolOrNew(/obj/effect/overlay/temp/revenant, thing.loc)
+ new /obj/effect/overlay/temp/revenant(thing.loc)
thing.emag_act(null)
else
if(!istype(thing, /obj/machinery/clonepod)) //I hate everything but mostly the fact there's no better way to do this without just not affecting it at all
thing.emp_act(1)
for(var/mob/living/silicon/robot/S in T) //Only works on cyborgs, not AI
playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/revenant, S.loc)
+ new /obj/effect/overlay/temp/revenant(S.loc)
S.spark_system.start()
S.emp_act(1)
@@ -332,7 +332,7 @@
for(var/mob/living/mob in T)
if(mob == user)
continue
- PoolOrNew(/obj/effect/overlay/temp/revenant, mob.loc)
+ new /obj/effect/overlay/temp/revenant(mob.loc)
if(iscarbon(mob))
if(ishuman(mob))
var/mob/living/carbon/human/H = mob
@@ -353,14 +353,14 @@
mob.adjustToxLoss(5)
for(var/obj/structure/spacevine/vine in T) //Fucking with botanists, the ability.
vine.add_atom_colour("#823abb", TEMPORARY_COLOUR_PRIORITY)
- PoolOrNew(/obj/effect/overlay/temp/revenant, vine.loc)
+ new /obj/effect/overlay/temp/revenant(vine.loc)
QDEL_IN(vine, 10)
for(var/obj/structure/glowshroom/shroom in T)
shroom.add_atom_colour("#823abb", TEMPORARY_COLOUR_PRIORITY)
- PoolOrNew(/obj/effect/overlay/temp/revenant, shroom.loc)
+ new /obj/effect/overlay/temp/revenant(shroom.loc)
QDEL_IN(shroom, 10)
for(var/obj/machinery/hydroponics/tray in T)
- PoolOrNew(/obj/effect/overlay/temp/revenant, tray.loc)
+ new /obj/effect/overlay/temp/revenant(tray.loc)
tray.pestlevel = rand(8, 10)
tray.weedlevel = rand(8, 10)
tray.toxic = rand(45, 55)
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_blight.dm b/code/game/gamemodes/miniantags/revenant/revenant_blight.dm
index 41815b1ca45..7122451c653 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_blight.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_blight.dm
@@ -33,11 +33,11 @@
affected_mob << "You suddenly feel [pick("sick and tired", "disoriented", "tired and confused", "nauseated", "faint", "dizzy")]..."
affected_mob.confused += 8
affected_mob.adjustStaminaLoss(8)
- PoolOrNew(/obj/effect/overlay/temp/revenant, affected_mob.loc)
+ new /obj/effect/overlay/temp/revenant(affected_mob.loc)
if(stagedamage < stage)
stagedamage++
affected_mob.adjustToxLoss(stage*2) //should, normally, do about 30 toxin damage.
- PoolOrNew(/obj/effect/overlay/temp/revenant, affected_mob.loc)
+ new /obj/effect/overlay/temp/revenant(affected_mob.loc)
if(prob(45))
affected_mob.adjustStaminaLoss(stage)
..() //So we don't increase a stage before applying the stage damage.
@@ -56,7 +56,7 @@
finalstage = 1
affected_mob << "You feel like [pick("nothing's worth it anymore", "nobody ever needed your help", "nothing you did mattered", "everything you tried to do was worthless")]."
affected_mob.adjustStaminaLoss(45)
- PoolOrNew(/obj/effect/overlay/temp/revenant, affected_mob.loc)
+ new /obj/effect/overlay/temp/revenant(affected_mob.loc)
if(affected_mob.dna && affected_mob.dna.species)
affected_mob.dna.species.handle_mutant_bodyparts(affected_mob,"#1d2953")
affected_mob.dna.species.handle_hair(affected_mob,"#1d2953")
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm
index 908bdae128d..d41b9edab16 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm
@@ -33,7 +33,7 @@
message_admins("No valid spawn locations found, aborting...")
return MAP_ERROR
- var /obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,(pick(spawn_locs)))
+ var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs)))
var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
S.holder = holder
player_mind.transfer_to(S)
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 71de06ffcdf..5c40f147b31 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -592,7 +592,7 @@ var/global/list/multiverse = list()
var/turf/T = get_turf(user)
playsound(T,'sound/magic/WarpWhistle.ogg', 200, 1)
user.canmove = 0
- PoolOrNew(/obj/effect/overlay/temp/tornado,T)
+ new /obj/effect/overlay/temp/tornado(T)
sleep(20)
if(interrupted(user))
return
@@ -610,7 +610,7 @@ var/global/list/multiverse = list()
T = potential_T
break
breakout += 1
- PoolOrNew(/obj/effect/overlay/temp/tornado,T)
+ new /obj/effect/overlay/temp/tornado(T)
sleep(20)
if(interrupted(user))
return
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index 16bc9f135e4..1b5e8ff1066 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -91,7 +91,7 @@
if(cooldown_on || disabled)
return
else
- PoolOrNew(/obj/effect/particle_effect/foam, loc)
+ new /obj/effect/particle_effect/foam(loc)
src.uses--
cooldown_on = 1
cooldown_time = world.timeofday + 100
diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm
index becb3aae116..59a445c8cb4 100644
--- a/code/game/machinery/computer/gulag_teleporter.dm
+++ b/code/game/machinery/computer/gulag_teleporter.dm
@@ -148,7 +148,7 @@
prisoner.forceMove(get_turf(beacon))
prisoner.Weaken(2) // small travel dizziness
prisoner << "The teleportation makes you a little dizzy."
- PoolOrNew(/obj/effect/particle_effect/sparks, prisoner.loc)
+ new /obj/effect/particle_effect/sparks(prisoner.loc)
playsound(src.loc, "sparks", 50, 1)
if(teleporter.locked)
teleporter.locked = FALSE
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 3f3fa5dd9f7..15de9be8e4f 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -362,7 +362,7 @@
/obj/machinery/door/airlock/cult/New()
..()
- PoolOrNew(openingoverlaytype, src.loc)
+ new openingoverlaytype(src.loc)
/obj/machinery/door/airlock/cult/canAIControl(mob/user)
return (iscultist(user) && !isAllPowerCut())
@@ -371,10 +371,10 @@
if(!density)
return 1
if(friendly || iscultist(M) || istype(M, /mob/living/simple_animal/shade) || isconstruct(M))
- PoolOrNew(openingoverlaytype, loc)
+ new openingoverlaytype(loc)
return 1
else
- PoolOrNew(/obj/effect/overlay/temp/cult/sac, loc)
+ new /obj/effect/overlay/temp/cult/sac(loc)
var/atom/throwtarget
throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(M, src)))
M << pick(sound('sound/hallucinations/turn_around1.ogg',0,1,50), sound('sound/hallucinations/turn_around2.ogg',0,1,50))
@@ -432,8 +432,8 @@
/obj/machinery/door/airlock/clockwork/New()
..()
var/turf/T = get_turf(src)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/door, T)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/beam/door, T)
+ new /obj/effect/overlay/temp/ratvar/door(T)
+ new /obj/effect/overlay/temp/ratvar/beam/door(T)
change_construction_value(5)
/obj/machinery/door/airlock/clockwork/Destroy()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index bbc8aeff386..5d219ca853b 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -318,7 +318,7 @@
/obj/machinery/door/window/clockwork/setDir(direct)
if(!made_glow)
- var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/door/window, get_turf(src))
+ var/obj/effect/E = new /obj/effect/overlay/temp/ratvar/door/window(get_turf(src))
E.setDir(direct)
made_glow = TRUE
..()
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index e59263ddf2a..bd68496bb92 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -156,7 +156,7 @@ Class Procs:
/obj/machinery/emp_act(severity)
if(use_power && !stat)
use_power(7500/severity)
- PoolOrNew(/obj/effect/overlay/temp/emp, loc)
+ new /obj/effect/overlay/temp/emp(loc)
..()
/obj/machinery/proc/open_machine(drop = 1)
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 66c70792338..7227a393dfc 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -67,7 +67,7 @@
var/list/radios = list()
- var/atom/movable/virtualspeaker/virt = PoolOrNew(/atom/movable/virtualspeaker,null)
+ var/atom/movable/virtualspeaker/virt = new /atom/movable/virtualspeaker(null)
virt.name = name
virt.job = job
virt.languages_spoken = AM.languages_spoken
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 9b193245c04..b871bd7c7a7 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -151,7 +151,7 @@
var/list/the_targets = list(T,T1,T2)
spawn(0)
for(var/a=0, a<5, a++)
- var/obj/effect/particle_effect/water/W = PoolOrNew(/obj/effect/particle_effect/water, get_turf(chassis))
+ var/obj/effect/particle_effect/water/W = new /obj/effect/particle_effect/water(get_turf(chassis))
if(!W)
return
var/turf/my_target = pick(the_targets)
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index b16103e6a03..c0c4b62d063 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -37,7 +37,7 @@
A.original = target
A.current = curloc
if(!A.suppressed && firing_effect_type)
- PoolOrNew(firing_effect_type, list(get_turf(src), chassis.dir))
+ new firing_effect_type(get_turf(src), chassis.dir)
var/spread = 0
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index c50d3cf0103..58a5edce57d 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -63,7 +63,7 @@
qdel(src)
/obj/effect/anomaly/proc/anomalyNeutralize()
- PoolOrNew(/obj/effect/particle_effect/smoke/bad, loc)
+ new /obj/effect/particle_effect/smoke/bad(loc)
for(var/atom/movable/O in src)
O.loc = src.loc
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index ec9f73d71b2..eb8f575efb8 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -19,8 +19,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
/obj/effect/particle_effect/Destroy()
if(ticker)
cameranet.updateVisibility(src)
- ..()
- return QDEL_HINT_PUTINPOOL
+ . = ..()
/datum/effect_system
var/number = 3
@@ -57,7 +56,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
/datum/effect_system/proc/generate_effect()
if(holder)
location = get_turf(holder)
- var/obj/effect/E = PoolOrNew(effect_type, location)
+ var/obj/effect/E = new effect_type(location)
total_effects++
var/direction
if(cardinals)
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index e7db9acffeb..f2a3d61d190 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -113,7 +113,7 @@
for(var/mob/living/L in T)
foam_mob(L)
- var/obj/effect/particle_effect/foam/F = PoolOrNew(src.type, T)
+ var/obj/effect/particle_effect/foam/F = new src.type(T)
F.amount = amount
reagents.copy_to(F, (reagents.total_volume))
F.add_atom_colour(color, FIXED_COLOUR_PRIORITY)
@@ -144,7 +144,7 @@
/datum/effect_system/foam_spread/New()
..()
- chemholder = PoolOrNew(/obj)
+ chemholder = new /obj()
var/datum/reagents/R = new/datum/reagents(1000)
chemholder.reagents = R
R.my_atom = chemholder
@@ -172,7 +172,7 @@
if(foundfoam)//If there was already foam where we start, we add our foaminess to it.
foundfoam.amount += amount
else
- var/obj/effect/particle_effect/foam/F = PoolOrNew(effect_type, location)
+ var/obj/effect/particle_effect/foam/F = new effect_type(location)
var/foamcolor = mix_color_from_reagents(chemholder.reagents.reagent_list)
chemholder.reagents.copy_to(F, chemholder.reagents.total_volume/amount)
F.add_atom_colour(foamcolor, FIXED_COLOUR_PRIORITY)
diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm
index 60fd3c63edc..503f120dd49 100644
--- a/code/game/objects/effects/effect_system/effects_other.dm
+++ b/code/game/objects/effects/effect_system/effects_other.dm
@@ -36,7 +36,7 @@
if(processing)
processing = 0
if(number < 3)
- var/obj/effect/particle_effect/steam/I = PoolOrNew(/obj/effect/particle_effect/steam, oldposition)
+ var/obj/effect/particle_effect/steam/I = new /obj/effect/particle_effect/steam(oldposition)
number++
I.setDir(holder.dir)
oldposition = get_turf(holder)
@@ -73,7 +73,7 @@
var/turf/T = get_turf(holder)
if(T != oldposition)
if(!T.has_gravity() || !nograv_required)
- var/obj/effect/particle_effect/ion_trails/I = PoolOrNew(effect_type, oldposition)
+ var/obj/effect/particle_effect/ion_trails/I = new effect_type(oldposition)
set_dir(I)
if(fade)
flick(fadetype, I)
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 17c19b0a204..351ac8122c8 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -255,7 +255,7 @@
/datum/effect_system/smoke_spread/chem/New()
..()
- chemholder = PoolOrNew(/obj)
+ chemholder = new /obj()
var/datum/reagents/R = new/datum/reagents(500)
chemholder.reagents = R
R.my_atom = chemholder
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 3648adac7c8..f118900e966 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -28,9 +28,8 @@
var/timerid
/obj/effect/overlay/temp/Destroy()
- ..()
+ . = ..()
deltimer(timerid)
- return QDEL_HINT_PUTINPOOL
/obj/effect/overlay/temp/New()
..()
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index 510c5183af7..0a87fc55dba 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -9,7 +9,7 @@
log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
if(heavy_range > 1)
- PoolOrNew(/obj/effect/overlay/temp/emp/pulse, epicenter)
+ new /obj/effect/overlay/temp/emp/pulse(epicenter)
if(heavy_range > light_range)
light_range = heavy_range
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 9e663c385e9..17e638e8bdf 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -145,7 +145,7 @@ var/explosionid = 1
if(T)
if(flame_dist && prob(40) && !isspaceturf(T) && !T.density)
- PoolOrNew(/obj/effect/hotspot, T) //Mostly for ambience!
+ new /obj/effect/hotspot(T) //Mostly for ambience!
if(dist > 0)
T.explosion_level = max(T.explosion_level, dist) //let the bigger one have it
T.explosion_id = id
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 5cefee833ee..66acb1e6c58 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -49,13 +49,13 @@
qdel(active_dummy)
active_dummy = null
usr << "You deactivate \the [src]."
- PoolOrNew(/obj/effect/overlay/temp/emp/pulse, get_turf(src))
+ new /obj/effect/overlay/temp/emp/pulse(get_turf(src))
else
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc)
C.activate(usr, saved_appearance, src)
usr << "You activate \the [src]."
- PoolOrNew(/obj/effect/overlay/temp/emp/pulse, get_turf(src))
+ new /obj/effect/overlay/temp/emp/pulse(get_turf(src))
/obj/item/device/chameleon/proc/disrupt(delete_dummy = 1)
if(active_dummy)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 56ec099fbdf..65de6658ac0 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -111,7 +111,7 @@
return
var/T = get_turf(target)
if(locate(/mob/living) in T)
- PoolOrNew(/obj/effect/overlay/temp/medical_holosign, list(T,user)) //produce a holographic glow
+ new /obj/effect/overlay/temp/medical_holosign(T,user) //produce a holographic glow
holo_cooldown = world.time + 100
return
..()
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index 49fba49dc1b..10132b4d423 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -29,7 +29,7 @@
var/obj/item/stack/sheet/metal/M = O
if (M.use(1))
use(1)
- var/obj/item/L = PoolOrNew(/obj/item/stack/tile/light, user.loc)
+ var/obj/item/L = new /obj/item/stack/tile/light(user.loc)
user << "You make a light tile."
L.add_fingerprint(user)
else
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index e206d9ac087..97490e9fc35 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -18,10 +18,6 @@
pixel_x = rand(-3, 3)
pixel_y = rand(-3, 3) //randomize a little
-/obj/item/stack/tile/Destroy()
- ..()
- return QDEL_HINT_PUTINPOOL
-
/obj/item/stack/tile/attackby(obj/item/W, mob/user, params)
if (istype(W, /obj/item/weapon/weldingtool))
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index a7eba9a3164..3c2e3df48be 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -44,7 +44,7 @@
/obj/item/weapon/soap/suicide_act(mob/user)
user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!")
user.visible_message("[user] lifts [src] to their mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!")
- PoolOrNew(/obj/effect/particle_effect/foam, loc)
+ new /obj/effect/particle_effect/foam(loc)
return (TOXLOSS)
/obj/item/weapon/soap/Crossed(AM as mob|obj)
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 8f95ca04c16..aafc8a1b007 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -147,7 +147,7 @@
for(var/a=0, a<5, a++)
spawn(0)
- var/obj/effect/particle_effect/water/W = PoolOrNew( /obj/effect/particle_effect/water, get_turf(src) )
+ var/obj/effect/particle_effect/water/W = new /obj/effect/particle_effect/water(get_turf(src))
var/turf/my_target = pick(the_targets)
if(precision)
the_targets -= my_target
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index 7f78ac53275..3c6b809ec7b 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -81,7 +81,7 @@
target.apply_damage(force * fisto_setting, BRUTE)
target.visible_message("[user]'s powerfist lets out a loud hiss as they punch [target.name]!", \
"You cry out in pain as [user]'s punch flings you backwards!")
- PoolOrNew(/obj/effect/overlay/temp/kinetic_blast, target.loc)
+ new /obj/effect/overlay/temp/kinetic_blast(target.loc)
playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 0cca77c19c9..4c1c005464b 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -285,7 +285,7 @@
/obj/item/weapon/storage/backpack/satchel/flat/New()
..()
- PoolOrNew(/obj/item/stack/tile/plasteel, src)
+ new /obj/item/stack/tile/plasteel(src)
new /obj/item/weapon/crowbar(src)
SSpersistence.new_secret_satchels += src
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 9229058882a..d944ab6f5c0 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -300,7 +300,7 @@
if(!Adj|| !isturf(target))
return
if(metal_synthesis_cooldown < 5)
- var/obj/effect/particle_effect/foam/metal/F = PoolOrNew(/obj/effect/particle_effect/foam/metal, get_turf(target))
+ var/obj/effect/particle_effect/foam/metal/F = new /obj/effect/particle_effect/foam/metal(get_turf(target))
F.amount = 0
metal_synthesis_cooldown++
spawn(100)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 00a8aee7063..93b4893d4b8 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -330,8 +330,8 @@
/obj/structure/falsewall/brass/New(loc)
..()
var/turf/T = get_turf(src)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/wall/false, T)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/beam/falsewall, T)
+ new /obj/effect/overlay/temp/ratvar/wall/false(T)
+ new /obj/effect/overlay/temp/ratvar/beam/falsewall(T)
change_construction_value(4)
/obj/structure/falsewall/brass/Destroy()
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 6796be48652..a0f8dd9e882 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -224,10 +224,10 @@
..()
change_construction_value(1)
if(broken)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/grille/broken, get_turf(src))
+ new /obj/effect/overlay/temp/ratvar/grille/broken(get_turf(src))
else
- PoolOrNew(/obj/effect/overlay/temp/ratvar/grille, get_turf(src))
- PoolOrNew(/obj/effect/overlay/temp/ratvar/beam/grille, get_turf(src))
+ new /obj/effect/overlay/temp/ratvar/grille(get_turf(src))
+ new /obj/effect/overlay/temp/ratvar/beam/grille(get_turf(src))
/obj/structure/grille/ratvar/Destroy()
change_construction_value(-1)
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index b37d37bebde..bb715800a5e 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -115,8 +115,8 @@
/obj/structure/lattice/catwalk/clockwork/New()
..()
- PoolOrNew(/obj/effect/overlay/temp/ratvar/floor/catwalk, loc)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/beam/catwalk, loc)
+ new /obj/effect/overlay/temp/ratvar/floor/catwalk(loc)
+ new /obj/effect/overlay/temp/ratvar/beam/catwalk(loc)
/obj/structure/lattice/catwalk/clockwork/ratvar_act()
return
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 298547d658e..0dbfc2ca4da 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -453,12 +453,12 @@
var/amount_of_gears = 2
if(!fulltile)
if(direct)
- var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/window/single, get_turf(src))
+ var/obj/effect/E = new /obj/effect/overlay/temp/ratvar/window/single(get_turf(src))
setDir(direct)
E.setDir(direct)
made_glow = TRUE
else
- PoolOrNew(/obj/effect/overlay/temp/ratvar/window, get_turf(src))
+ new /obj/effect/overlay/temp/ratvar/window(get_turf(src))
made_glow = TRUE
amount_of_gears = 4
for(var/i in 1 to amount_of_gears)
@@ -467,7 +467,7 @@
/obj/structure/window/reinforced/clockwork/setDir(direct)
if(!made_glow)
- var/obj/effect/E = PoolOrNew(/obj/effect/overlay/temp/ratvar/window/single, get_turf(src))
+ var/obj/effect/E = new /obj/effect/overlay/temp/ratvar/window/single(get_turf(src))
E.setDir(direct)
made_glow = TRUE
..()
diff --git a/code/game/pooling/pool.dm b/code/game/pooling/pool.dm
deleted file mode 100644
index e99df9c5b0b..00000000000
--- a/code/game/pooling/pool.dm
+++ /dev/null
@@ -1,146 +0,0 @@
-
-/*
-/tg/station13 /datum Pool:
----------------------------------
-By RemieRichards
-
-Creation/Deletion is laggy, so let's reduce reuse and recycle!
-
-Usage:
-
-To get a object, just call
- - PoolOrNew(type, arg) if you only want to pass one argument to New(), usually loc
- - PoolOrNew(type, list) if you want to pass multiple arguments to New()
-
-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_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)
-
-For almost all pooling purposes, it is better to use the QDEL hint than to pool it directly with PlaceInPool
-
-*/
-
-var/global/list/GlobalPool = list()
-
-//You'll be using this proc 90% of the time.
-//It grabs a type from the pool if it can
-//And if it can't, it creates one
-//The pool is flexible and will expand to fit
-//The new created atom when it eventually
-//Goes into the pool
-
-//Second argument can be a single arg
-//Or a list of arguments
-//Either way it gets passed to new
-
-/proc/PoolOrNew(get_type,second_arg)
- if(!get_type)
- return
-
- if(SSpool)
- INCREMENT_TALLY(SSpool.stats_pooled_or_newed, get_type)
-
- . = GetFromPool(get_type,second_arg)
-
- if(!.)
- if(SSpool)
- INCREMENT_TALLY(SSpool.stats_created_new, get_type)
- if(ispath(get_type))
- if(islist(second_arg))
- . = new get_type (arglist(second_arg))
- else
- . = new get_type (second_arg)
- else
- if(SSpool)
- INCREMENT_TALLY(SSpool.stats_reused, get_type)
-
-
-/proc/GetFromPool(get_type,second_arg)
- if(!get_type)
- return
-
- if(isnull(GlobalPool[get_type]))
- return
-
- if(length(GlobalPool[get_type]) == 0)
- return
-
- var/datum/pooled = pop(GlobalPool[get_type])
- if(pooled)
- pooled.gc_destroyed = null
-
- var/atom/movable/AM
- if(istype(pooled, /atom/movable))
- AM = pooled
-
- if(islist(second_arg))
- if(AM)
- AM.loc = second_arg[1] //we need to do loc setting explicetly before even calling New() to replicate new()'s behavior
- pooled.New(arglist(second_arg))
-
- else
- if(AM)
- AM.loc = second_arg
- pooled.New(second_arg)
-
- return pooled
-
-
-/proc/PlaceInPool(datum/diver, destroy = 1)
- if(!istype(diver))
- return
-
- if(diver in GlobalPool[diver.type])
- return
-
- if(SSpool)
- INCREMENT_TALLY(SSpool.stats_placed_in_pool, diver.type)
-
- if(!GlobalPool[diver.type])
- GlobalPool[diver.type] = list()
-
- GlobalPool[diver.type] |= diver
-
- if(destroy)
- diver.Destroy()
-
- diver.gc_destroyed = 1
-
- diver.ResetVars()
-
-var/list/exclude = list("animate_movement", "contents", "loc", "locs", "parent_type", "vars", "verbs", "type", "gc_destroyed")
-var/list/pooledvariables = list()
-//thanks to clusterfack @ /vg/station for these two procs
-/datum/proc/createVariables()
- pooledvariables[type] = new/list()
- var/list/exclude = global.exclude + args
-
- for(var/key in vars)
- if(key in exclude)
- continue
- if(islist(vars[key]))
- pooledvariables[type][key] = list()
- else
- pooledvariables[type][key] = initial(vars[key])
-
-/datum/proc/ResetVars()
- if(!pooledvariables[type])
- createVariables(args)
-
- for(var/key in pooledvariables[type])
- if (islist(pooledvariables[type][key]))
- vars[key] = list()
- else
- vars[key] = pooledvariables[type][key]
-
-/atom/movable/ResetVars()
- ..()
- loc = null
- contents = initial(contents) //something is really wrong if this object still has stuff in it by this point
-
-/image/ResetVars()
- ..()
- loc = null
diff --git a/code/game/say.dm b/code/game/say.dm
index 5ac65c4b80e..172bfc0fd3c 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -170,7 +170,3 @@ var/list/freqtospan = list(
/atom/movable/virtualspeaker/GetRadio()
return radio
-
-/atom/movable/virtualspeaker/Destroy()
- ..()
- return QDEL_HINT_PUTINPOOL
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index ea0431e0ed9..11ec431d618 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -145,7 +145,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
else
user << "You remove the floor tile."
if(floor_tile)
- PoolOrNew(floor_tile, src)
+ new floor_tile(src)
make_plating()
playsound(src, C.usesound, 80, 1)
return 1
@@ -155,17 +155,17 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
if(current_size == STAGE_THREE)
if(prob(30))
if(floor_tile)
- PoolOrNew(floor_tile, src)
+ new floor_tile(src)
make_plating()
else if(current_size == STAGE_FOUR)
if(prob(50))
if(floor_tile)
- PoolOrNew(floor_tile, src)
+ new floor_tile(src)
make_plating()
else if(current_size >= STAGE_FIVE)
if(floor_tile)
if(prob(70))
- PoolOrNew(floor_tile, src)
+ new floor_tile(src)
make_plating()
else if(prob(50))
ReplaceWithLattice()
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index e0bf32470fd..f20b98bae32 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -69,9 +69,9 @@
/turf/open/floor/clockwork/New()
..()
- PoolOrNew(/obj/effect/overlay/temp/ratvar/floor, src)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/beam, src)
- realappearence = PoolOrNew(/obj/effect/clockwork/overlay/floor, src)
+ new /obj/effect/overlay/temp/ratvar/floor(src)
+ new /obj/effect/overlay/temp/ratvar/beam(src)
+ realappearence = new /obj/effect/clockwork/overlay/floor(src)
realappearence.linked = src
change_construction_value(1)
@@ -129,7 +129,7 @@
return ..()
/turf/open/floor/clockwork/make_plating()
- PoolOrNew(/obj/item/stack/tile/brass, src)
+ new /obj/item/stack/tile/brass(src)
return ..()
/turf/open/floor/clockwork/narsie_act()
diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm
index 02bded48527..8ee346905d5 100644
--- a/code/game/turfs/simulated/floor/reinf_floor.dm
+++ b/code/game/turfs/simulated/floor/reinf_floor.dm
@@ -61,7 +61,7 @@
if(current_size >= STAGE_FIVE)
if(floor_tile)
if(prob(30))
- PoolOrNew(floor_tile, src)
+ new floor_tile(src)
make_plating()
else if(prob(30))
ReplaceWithLattice()
@@ -108,8 +108,8 @@
/turf/open/floor/engine/cult/New()
..()
- PoolOrNew(/obj/effect/overlay/temp/cult/turf/floor, src)
- realappearence = PoolOrNew(/obj/effect/clockwork/overlay/floor/bloodcult, src)
+ new /obj/effect/overlay/temp/cult/turf/floor(src)
+ realappearence = new /obj/effect/clockwork/overlay/floor/bloodcult(src)
realappearence.linked = src
/turf/open/floor/engine/cult/Destroy()
diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm
index 211ef629627..ce0b8a61074 100644
--- a/code/game/turfs/simulated/wall/misc_walls.dm
+++ b/code/game/turfs/simulated/wall/misc_walls.dm
@@ -9,7 +9,7 @@
girder_type = /obj/structure/girder/cult
/turf/closed/wall/mineral/cult/New()
- PoolOrNew(/obj/effect/overlay/temp/cult/turf, src)
+ new /obj/effect/overlay/temp/cult/turf(src)
..()
/turf/closed/wall/mineral/cult/devastate_wall()
@@ -31,11 +31,11 @@
desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound."
/turf/closed/wall/mineral/cult/artificer/break_wall()
- PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src))
+ new /obj/effect/overlay/temp/cult/turf(get_turf(src))
return null //excuse me we want no runed metal here
/turf/closed/wall/mineral/cult/artificer/devastate_wall()
- PoolOrNew(/obj/effect/overlay/temp/cult/turf, get_turf(src))
+ new /obj/effect/overlay/temp/cult/turf(get_turf(src))
//Clockwork wall: Causes nearby tinkerer's caches to generate components.
/turf/closed/wall/clockwork
@@ -52,9 +52,9 @@
/turf/closed/wall/clockwork/New()
..()
- PoolOrNew(/obj/effect/overlay/temp/ratvar/wall, src)
- PoolOrNew(/obj/effect/overlay/temp/ratvar/beam, src)
- realappearence = PoolOrNew(/obj/effect/clockwork/overlay/wall, src)
+ new /obj/effect/overlay/temp/ratvar/wall(src)
+ new /obj/effect/overlay/temp/ratvar/beam(src)
+ realappearence = new /obj/effect/clockwork/overlay/wall(src)
realappearence.linked = src
change_construction_value(5)
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index c0632662c8d..9493b756be6 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -60,7 +60,7 @@
message_admins("[key_name_admin(ghost)] has taken control of ([key_name_admin(body)])")
body.ghostize(0)
body.key = ghost.key
- PoolOrNew(/obj/effect/overlay/temp/gravpush, get_turf(body))
+ new /obj/effect/overlay/temp/gravpush(get_turf(body))
/obj/effect/fun_balloon/sentience/emergency_shuttle
name = "shuttle sentience fun balloon"
@@ -79,7 +79,7 @@
/obj/effect/fun_balloon/scatter/effect()
for(var/mob/living/M in range(effect_range, get_turf(src)))
var/turf/T = find_safe_turf()
- PoolOrNew(/obj/effect/overlay/temp/gravpush, get_turf(M))
+ new /obj/effect/overlay/temp/gravpush(get_turf(M))
M.forceMove(T)
M << "Pop!"
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index dba6f2dbb2e..9ddfe2380e6 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -177,11 +177,11 @@
/obj/item/device/assembly/flash/cyborg/attack(mob/living/M, mob/user)
..()
- PoolOrNew(/obj/effect/overlay/temp/borgflash, get_turf(src))
+ new /obj/effect/overlay/temp/borgflash(get_turf(src))
/obj/item/device/assembly/flash/cyborg/attack_self(mob/user)
..()
- PoolOrNew(/obj/effect/overlay/temp/borgflash, get_turf(src))
+ new /obj/effect/overlay/temp/borgflash(get_turf(src))
/obj/item/device/assembly/flash/cyborg/attackby(obj/item/weapon/W, mob/user, params)
return
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index aeca666fde9..e796d3cf64a 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -33,7 +33,7 @@
if(oxy < 0.5 || tox < 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
@@ -155,8 +155,8 @@
T.active_hotspot = null
DestroyTurf()
loc = null
- ..()
- return QDEL_HINT_PUTINPOOL
+ . = ..()
+
/obj/effect/hotspot/proc/DestroyTurf()
if(isturf(loc))
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index fc09409ff9e..a2abd6d2ace 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -31,7 +31,7 @@
extinguishes_left--
H.visible_message("[H]'s suit automatically extinguishes them!","Your suit automatically extinguishes you.")
H.ExtinguishMob()
- PoolOrNew(/obj/effect/particle_effect/water, get_turf(H))
+ new /obj/effect/particle_effect/water(get_turf(H))
//I just want the light feature of the hardsuit helmet
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index ec6b580ef53..11b4c83f114 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -618,7 +618,7 @@
extinguishes_left--
H.visible_message("[H]'s suit automatically extinguishes them!","Your suit automatically extinguishes you.")
H.ExtinguishMob()
- PoolOrNew(/obj/effect/particle_effect/water, get_turf(H))
+ new /obj/effect/particle_effect/water(get_turf(H))
return 0
/obj/item/clothing/under/plasmaman/attackby(obj/item/E, mob/user, params)
diff --git a/code/modules/events/wizard/imposter.dm b/code/modules/events/wizard/imposter.dm
index b579ee834fb..fcb1100f1c7 100644
--- a/code/modules/events/wizard/imposter.dm
+++ b/code/modules/events/wizard/imposter.dm
@@ -16,7 +16,7 @@
return //Sad Trombone
var/client/C = pick(candidates)
- PoolOrNew(/obj/effect/particle_effect/smoke, W.loc)
+ new /obj/effect/particle_effect/smoke(W.loc)
var/mob/living/carbon/human/I = new /mob/living/carbon/human(W.loc)
W.dna.transfer_identity(I, transfer_SE=1)
diff --git a/code/modules/mining/equipment.dm b/code/modules/mining/equipment.dm
index d1ebf0d5509..dcfff7d841f 100644
--- a/code/modules/mining/equipment.dm
+++ b/code/modules/mining/equipment.dm
@@ -447,7 +447,7 @@
minerals += M
if(minerals.len)
for(var/turf/closed/mineral/M in minerals)
- var/obj/effect/overlay/temp/mining_overlay/C = PoolOrNew(/obj/effect/overlay/temp/mining_overlay, M)
+ var/obj/effect/overlay/temp/mining_overlay/C = new /obj/effect/overlay/temp/mining_overlay(M)
C.icon_state = M.scan_state
/obj/effect/overlay/temp/mining_overlay
@@ -542,7 +542,7 @@
var/target_turf = get_turf(target)
if(ismineralturf(target_turf))
var/turf/closed/mineral/M = target_turf
- PoolOrNew(/obj/effect/overlay/temp/kinetic_blast, M)
+ new /obj/effect/overlay/temp/kinetic_blast(M)
M.gets_drilled(firer)
..()
@@ -567,7 +567,7 @@
return
if(proximity_flag && target == mark && isliving(target))
var/mob/living/L = target
- PoolOrNew(/obj/effect/overlay/temp/kinetic_blast, get_turf(L))
+ new /obj/effect/overlay/temp/kinetic_blast(get_turf(L))
mark = 0
if(L.mob_size >= MOB_SIZE_LARGE)
L.underlays -= marked_image
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 0b0b257a1b3..4941ce6b0eb 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -141,10 +141,10 @@
if(linked.z == CENTCOMM)
user << "[linked] is somewhere you can't go."
- PoolOrNew(/obj/effect/particle_effect/smoke, user.loc)
+ new /obj/effect/particle_effect/smoke(user.loc)
user.forceMove(get_turf(linked))
feedback_add_details("warp_cube","[src.type]")
- PoolOrNew(/obj/effect/particle_effect/smoke, user.loc)
+ new /obj/effect/particle_effect/smoke(user.loc)
/obj/item/device/warp_cube/red
name = "red cube"
@@ -656,7 +656,7 @@
if(!istype(T))
return
if(!istype(T, turf_type))
- var/obj/effect/overlay/temp/lavastaff/L = PoolOrNew(/obj/effect/overlay/temp/lavastaff, T)
+ var/obj/effect/overlay/temp/lavastaff/L = new /obj/effect/overlay/temp/lavastaff(T)
L.alpha = 0
animate(L, alpha = 255, time = create_delay)
user.visible_message("[user] points [src] at [T]!")
@@ -803,7 +803,7 @@
timer = world.time + cooldown_time
if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one!
chaser_timer = world.time + chaser_cooldown
- PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(get_turf(user), user, target, chaser_speed, friendly_fire_check))
+ new /obj/effect/overlay/temp/hierophant/chaser(get_turf(user), user, target, chaser_speed, friendly_fire_check)
add_logs(user, target, "fired a chaser at", src)
else
addtimer(CALLBACK(src, .proc/cardinal_blasts, T, user), 0) //otherwise, just do cardinal blast
@@ -858,7 +858,7 @@
if(do_after(user, 50, target = user) && !beacon)
var/turf/T = get_turf(user)
playsound(T,'sound/magic/Blind.ogg', 200, 1, -4)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, user))
+ new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user)
beacon = new/obj/effect/hierophant(T)
user.update_action_buttons_icon()
user.visible_message("[user] places a strange machine beneath [user.p_their()] feet!", \
@@ -885,8 +885,8 @@
timer = world.time + 50
addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
beacon.icon_state = "hierophant_tele_on"
- var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE1 = PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/edge, user.loc)
- var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE2 = PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/edge, beacon.loc)
+ var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE1 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(user.loc)
+ var/obj/effect/overlay/temp/hierophant/telegraph/edge/TE2 = new /obj/effect/overlay/temp/hierophant/telegraph/edge(beacon.loc)
if(do_after(user, 40, target = user) && user && beacon)
var/turf/T = get_turf(beacon)
var/turf/source = get_turf(user)
@@ -898,8 +898,8 @@
addtimer(CALLBACK(src, .proc/prepare_icon_update), 0)
beacon.icon_state = "hierophant_tele_off"
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, user))
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(source, user))
+ new /obj/effect/overlay/temp/hierophant/telegraph(T, user)
+ new /obj/effect/overlay/temp/hierophant/telegraph(source, user)
playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
if(!do_after(user, 3, target = user) || !user || !beacon) //no walking away shitlord
@@ -920,13 +920,13 @@
beacon.icon_state = "hierophant_tele_off"
return
add_logs(user, beacon, "teleported self from ([source.x],[source.y],[source.z]) to")
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, user))
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(source, user))
+ new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user)
+ new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, user)
for(var/t in RANGE_TURFS(1, T))
- var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, TRUE)) //blasts produced will not hurt allies
+ var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies
B.damage = 30
for(var/t in RANGE_TURFS(1, source))
- var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, TRUE)) //but absolutely will hurt enemies
+ var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
B.damage = 30
for(var/mob/living/L in range(1, source))
addtimer(CALLBACK(src, .proc/teleport_mob, source, L, T, user), 0) //regardless, take all mobs near us along
@@ -971,10 +971,10 @@
/obj/item/weapon/hierophant_club/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
if(!T)
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/cardinal, list(T, user))
+ new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, user)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, user, friendly_fire_check))
+ new /obj/effect/overlay/temp/hierophant/blast(T, user, friendly_fire_check)
for(var/d in cardinal)
addtimer(CALLBACK(src, .proc/blast_wall, T, d, user), 0)
@@ -987,15 +987,15 @@
for(var/i in 1 to range)
if(!J)
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(J, user, friendly_fire_check))
+ new /obj/effect/overlay/temp/hierophant/blast(J, user, friendly_fire_check)
previousturf = J
J = get_step(previousturf, dir)
/obj/item/weapon/hierophant_club/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
if(!T)
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, user))
+ new /obj/effect/overlay/temp/hierophant/telegraph(T, user)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
for(var/t in RANGE_TURFS(1, T))
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, user, friendly_fire_check))
+ new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index d4c584964ec..1aa26092f02 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -285,7 +285,7 @@
message_admins("[key_name_admin(usr)] (?) (FLW) activated a bluespace capsule away from the mining level! (JMP)")
log_admin("[key_name(usr)] activated a bluespace capsule away from the mining level at [T.x], [T.y], [T.z]")
template.load(deploy_location, centered = TRUE)
- PoolOrNew(/obj/effect/particle_effect/smoke, get_turf(src))
+ new /obj/effect/particle_effect/smoke(get_turf(src))
qdel(src)
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index b8553642f12..e6d569c7f9c 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -19,9 +19,6 @@
/obj/effect/dummy/slaughter/singularity_act()
return
-/obj/effect/dummy/slaughter/Destroy()
- ..()
- return QDEL_HINT_PUTINPOOL
/mob/living/proc/phaseout(obj/effect/decal/cleanable/B)
@@ -53,7 +50,7 @@
playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
// Extinguish, unbuckle, stop being pulled, set our location into the
// dummy object
- var/obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,mobloc)
+ var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(mobloc)
src.ExtinguishMob()
// Keep a reference to whatever we're pulling, because forceMove()
diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm
index 6211dc83493..9382dc392db 100644
--- a/code/modules/mob/living/carbon/alien/death.dm
+++ b/code/modules/mob/living/carbon/alien/death.dm
@@ -5,10 +5,10 @@
new /obj/effect/gibspawner/xenobodypartless(loc,viruses)
/mob/living/carbon/alien/gib_animation()
- PoolOrNew(/obj/effect/overlay/temp/gib_animation, list(loc, "gibbed-a"))
+ new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-a")
/mob/living/carbon/alien/spawn_dust()
new /obj/effect/decal/remains/xeno(loc)
/mob/living/carbon/alien/dust_animation()
- PoolOrNew(/obj/effect/overlay/temp/dust_animation, list(loc, "dust-a"))
+ new /obj/effect/overlay/temp/dust_animation(loc, "dust-a")
diff --git a/code/modules/mob/living/carbon/alien/larva/death.dm b/code/modules/mob/living/carbon/alien/larva/death.dm
index 3ebd1c0141b..16d2f534e08 100644
--- a/code/modules/mob/living/carbon/alien/larva/death.dm
+++ b/code/modules/mob/living/carbon/alien/larva/death.dm
@@ -13,10 +13,10 @@
new /obj/effect/gibspawner/larvabodypartless(loc,viruses)
/mob/living/carbon/alien/larva/gib_animation()
- PoolOrNew(/obj/effect/overlay/temp/gib_animation, list(loc, "gibbed-l"))
+ new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-l")
/mob/living/carbon/alien/larva/spawn_dust()
new /obj/effect/decal/remains/xeno(loc)
/mob/living/carbon/alien/larva/dust_animation()
- PoolOrNew(/obj/effect/overlay/temp/dust_animation, list(loc, "dust-l"))
+ new /obj/effect/overlay/temp/dust_animation(loc, "dust-l")
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index d12da18b721..1e50d17e408 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -1,8 +1,8 @@
/mob/living/carbon/human/gib_animation()
- PoolOrNew(/obj/effect/overlay/temp/gib_animation, list(loc, "gibbed-h"))
+ new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-h")
/mob/living/carbon/human/dust_animation()
- PoolOrNew(/obj/effect/overlay/temp/dust_animation, list(loc, "dust-h"))
+ new /obj/effect/overlay/temp/dust_animation(loc, "dust-h")
/mob/living/carbon/human/spawn_gibs(with_bodyparts)
if(with_bodyparts)
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 5083098c045..7b133bda11c 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -308,7 +308,7 @@
/datum/species/golem/bluespace/proc/reactive_teleport(mob/living/carbon/human/H)
H.visible_message("[H] teleports!", "You destabilize and teleport!")
- PoolOrNew(/obj/effect/particle_effect/sparks, get_turf(H))
+ new /obj/effect/particle_effect/sparks(get_turf(H))
playsound(get_turf(H), "sparks", 50, 1)
do_teleport(H, get_turf(H), 6, asoundin = 'sound/weapons/emitter2.ogg')
last_teleport = world.time
diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm
index 25e7face89d..a45209c5c21 100644
--- a/code/modules/mob/living/carbon/monkey/death.dm
+++ b/code/modules/mob/living/carbon/monkey/death.dm
@@ -1,5 +1,5 @@
/mob/living/carbon/monkey/gib_animation()
- PoolOrNew(/obj/effect/overlay/temp/gib_animation, list(loc, "gibbed-m"))
+ new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-m")
/mob/living/carbon/monkey/dust_animation()
- PoolOrNew(/obj/effect/overlay/temp/dust_animation, list(loc, "dust-m"))
+ new /obj/effect/overlay/temp/dust_animation(loc, "dust-m")
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index 06369f02cbf..36e6a7f05a0 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/code/modules/mob/living/silicon/robot/death.dm
@@ -1,6 +1,6 @@
/mob/living/silicon/robot/gib_animation()
- PoolOrNew(/obj/effect/overlay/temp/gib_animation, list(loc, "gibbed-r"))
+ new /obj/effect/overlay/temp/gib_animation(loc, "gibbed-r")
/mob/living/silicon/robot/dust()
if(mmi)
@@ -11,7 +11,7 @@
new /obj/effect/decal/remains/robot(loc)
/mob/living/silicon/robot/dust_animation()
- PoolOrNew(/obj/effect/overlay/temp/dust_animation, list(loc, "dust-r"))
+ new /obj/effect/overlay/temp/dust_animation(loc, "dust-r")
/mob/living/silicon/robot/death(gibbed)
if(stat == DEAD)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 35fb6540517..20fce3d5dd4 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -191,9 +191,9 @@
/obj/item/weapon/robot_module/proc/do_transform_animation()
var/mob/living/silicon/robot/R = loc
- var/obj/effect/overlay/temp/decoy/fading/fivesecond/ANM = PoolOrNew(/obj/effect/overlay/temp/decoy/fading/fivesecond, list(R.loc, R))
+ var/obj/effect/overlay/temp/decoy/fading/fivesecond/ANM = new /obj/effect/overlay/temp/decoy/fading/fivesecond(R.loc, R)
ANM.layer = R.layer - 0.01
- PoolOrNew(/obj/effect/overlay/temp/small_smoke, R.loc)
+ new /obj/effect/overlay/temp/small_smoke(R.loc)
if(R.hat)
R.hat.forceMove(get_turf(R))
R.hat = null
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 27858feaf3c..7bffdf2ba78 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -302,7 +302,7 @@
/mob/living/simple_animal/bot/emp_act(severity)
var/was_on = on
stat |= EMPED
- PoolOrNew(/obj/effect/overlay/temp/emp, loc)
+ new /obj/effect/overlay/temp/emp(loc)
if(paicard)
paicard.emp_act(severity)
src.visible_message("[paicard] is flies out of [bot_name]!","You are forcefully ejected from [bot_name]!")
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index dbec44582ab..da33418b6f2 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -242,7 +242,7 @@
T.MakeSlippery(min_wet_time = 20, wet_time_to_add = 15)
else
visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
- PoolOrNew(/obj/effect/particle_effect/foam, loc)
+ new /obj/effect/particle_effect/foam(loc)
else
..()
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 26d48b5c033..eac1dcd042a 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -446,7 +446,7 @@ Auto Patrol[]"},
if(severity==2 && prob(70))
..(severity-1)
else
- PoolOrNew(/obj/effect/overlay/temp/emp, loc)
+ new /obj/effect/overlay/temp/emp(loc)
var/list/mob/living/carbon/targets = new
for(var/mob/living/carbon/C in view(12,src))
if(C.stat==2)
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index a277de98424..7b49e29ad1c 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -175,9 +175,9 @@ var/global/list/parasites = list() //all currently existing/living guardians
if(istype(summoner.loc, /obj/effect))
Recall(TRUE)
else
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, loc)
+ new /obj/effect/overlay/temp/guardian/phase/out(loc)
forceMove(summoner.loc)
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase, loc)
+ new /obj/effect/overlay/temp/guardian/phase(loc)
/mob/living/simple_animal/hostile/guardian/canSuicide()
return 0
@@ -320,7 +320,7 @@ var/global/list/parasites = list() //all currently existing/living guardians
return FALSE
if(loc == summoner)
forceMove(summoner.loc)
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase, loc)
+ new /obj/effect/overlay/temp/guardian/phase(loc)
cooldown = world.time + 10
return TRUE
return FALSE
@@ -328,7 +328,7 @@ var/global/list/parasites = list() //all currently existing/living guardians
/mob/living/simple_animal/hostile/guardian/proc/Recall(forced)
if(!summoner || loc == summoner || (cooldown > world.time && !forced))
return FALSE
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, loc)
+ new /obj/effect/overlay/temp/guardian/phase/out(loc)
forceMove(summoner)
cooldown = world.time + 10
diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
index 73e48a73c1b..b14609413eb 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm
@@ -71,7 +71,7 @@
armour_penetration = 100
obj_damage = 0
environment_smash = 0
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, get_turf(src))
+ new /obj/effect/overlay/temp/guardian/phase/out(get_turf(src))
alpha = 15
if(!forced)
src << "You enter stealth, empowering your next attack."
diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
index 31636ed3c80..708a1e2ce6b 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm
@@ -40,7 +40,7 @@
/mob/living/simple_animal/hostile/guardian/charger/Move()
if(charging)
- PoolOrNew(/obj/effect/overlay/temp/decoy/fading, list(loc,src))
+ new /obj/effect/overlay/temp/decoy/fading(loc,src)
. = ..()
/mob/living/simple_animal/hostile/guardian/charger/snapback()
diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
index a8fd15e8531..acad094cc24 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
@@ -22,14 +22,14 @@
if(isliving(target))
var/mob/living/M = target
if(!M.anchored && M != summoner && !hasmatchingsummoner(M))
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, get_turf(M))
+ new /obj/effect/overlay/temp/guardian/phase/out(get_turf(M))
do_teleport(M, M, 10)
for(var/mob/living/L in range(1, M))
if(hasmatchingsummoner(L)) //if the summoner matches don't hurt them
continue
if(L != src && L != summoner)
L.apply_damage(15, BRUTE)
- PoolOrNew(/obj/effect/overlay/temp/explosion, get_turf(M))
+ new /obj/effect/overlay/temp/explosion(get_turf(M))
/mob/living/simple_animal/hostile/guardian/bomb/AltClickOn(atom/movable/A)
if(!istype(A))
@@ -76,7 +76,7 @@
var/turf/T = get_turf(src)
stored_obj.forceMove(T)
playsound(T,'sound/effects/Explosion2.ogg', 200, 1)
- PoolOrNew(/obj/effect/overlay/temp/explosion, T)
+ new /obj/effect/overlay/temp/explosion(T)
user.ex_act(2)
qdel(src)
else
diff --git a/code/modules/mob/living/simple_animal/guardian/types/protector.dm b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
index 3613d0bdd74..5defc82199e 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/protector.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/protector.dm
@@ -63,6 +63,6 @@
else
summoner << "You moved out of range, and were pulled back! You can only move [range] meters from [real_name]!"
summoner.visible_message("\The [summoner] jumps back to [summoner.p_their()] protector.")
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, get_turf(summoner))
+ new /obj/effect/overlay/temp/guardian/phase/out(get_turf(summoner))
summoner.forceMove(get_turf(src))
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase, get_turf(summoner))
+ new /obj/effect/overlay/temp/guardian/phase(get_turf(summoner))
diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm
index e59076cced3..a10680e73eb 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/support.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm
@@ -35,7 +35,7 @@
C.adjustFireLoss(-5)
C.adjustOxyLoss(-5)
C.adjustToxLoss(-5)
- var/obj/effect/overlay/temp/heal/H = PoolOrNew(/obj/effect/overlay/temp/heal, get_turf(C))
+ var/obj/effect/overlay/temp/heal/H = new /obj/effect/overlay/temp/heal(get_turf(C))
if(namedatum)
H.color = namedatum.colour
if(C == summoner)
@@ -137,11 +137,11 @@
src << "You need to hold still!"
return
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase/out, T)
+ new /obj/effect/overlay/temp/guardian/phase/out(T)
if(isliving(A))
var/mob/living/L = A
L.flash_act()
A.visible_message("[A] disappears in a flash of light!", \
"Your vision is obscured by a flash of light!")
do_teleport(A, beacon, 0)
- PoolOrNew(/obj/effect/overlay/temp/guardian/phase, get_turf(A))
+ new /obj/effect/overlay/temp/guardian/phase(get_turf(A))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 36aba02fdc1..7244788cd5e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -129,7 +129,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/Move()
if(charging)
- PoolOrNew(/obj/effect/overlay/temp/decoy/fading, list(loc,src))
+ new /obj/effect/overlay/temp/decoy/fading(loc,src)
DestroySurroundings()
. = ..()
if(!stat && .)
@@ -150,12 +150,12 @@ Difficulty: Hard
var/turf/T = get_turf(target)
if(!T || T == loc)
return
- PoolOrNew(/obj/effect/overlay/temp/dragon_swoop, T)
+ new /obj/effect/overlay/temp/dragon_swoop(T)
charging = 1
DestroySurroundings()
walk(src, 0)
setDir(get_dir(src, T))
- var/obj/effect/overlay/temp/decoy/D = PoolOrNew(/obj/effect/overlay/temp/decoy, list(loc,src))
+ var/obj/effect/overlay/temp/decoy/D = new /obj/effect/overlay/temp/decoy(loc,src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 5)
sleep(5)
throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .charge_end))
@@ -240,9 +240,9 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness)
if(handedness)
- PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightsmack, T)
+ new /obj/effect/overlay/temp/bubblegum_hands/rightsmack(T)
else
- PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftsmack, T)
+ new /obj/effect/overlay/temp/bubblegum_hands/leftsmack(T)
sleep(2.5)
for(var/mob/living/L in T)
if(!faction_check(L))
@@ -254,11 +254,11 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T, handedness)
if(handedness)
- PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightpaw, T)
- PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/rightthumb, T)
+ new /obj/effect/overlay/temp/bubblegum_hands/rightpaw(T)
+ new /obj/effect/overlay/temp/bubblegum_hands/rightthumb(T)
else
- PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftpaw, T)
- PoolOrNew(/obj/effect/overlay/temp/bubblegum_hands/leftthumb, T)
+ new /obj/effect/overlay/temp/bubblegum_hands/leftpaw(T)
+ new /obj/effect/overlay/temp/bubblegum_hands/leftthumb(T)
sleep(6)
for(var/mob/living/L in T)
if(!faction_check(L))
@@ -308,7 +308,7 @@ Difficulty: Hard
if(!pools.len)
return FALSE
- var/obj/effect/overlay/temp/decoy/DA = PoolOrNew(/obj/effect/overlay/temp/decoy, list(loc,src))
+ var/obj/effect/overlay/temp/decoy/DA = new /obj/effect/overlay/temp/decoy(loc,src)
DA.color = "#FF0000"
var/oldtransform = DA.transform
DA.transform = matrix()*2
@@ -350,7 +350,7 @@ Difficulty: Hard
new /obj/effect/decal/cleanable/blood/bubblegum(J)
for(var/i in 1 to range)
J = get_step(previousturf, targetdir)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/bloodsplatter, list(previousturf, get_dir(previousturf, J)))
+ new /obj/effect/overlay/temp/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J))
playsound(previousturf,'sound/effects/splat.ogg', 100, 1, -1)
if(!J || !previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])
break
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 97fd658ce29..b0d7639d224 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -112,7 +112,7 @@ Difficulty: Very Hard
/mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P)
if(!stat)
- var/obj/effect/overlay/temp/at_shield/AT = PoolOrNew(/obj/effect/overlay/temp/at_shield, src.loc, src)
+ var/obj/effect/overlay/temp/at_shield/AT = new /obj/effect/overlay/temp/at_shield(src.loc, src)
var/random_x = rand(-32, 32)
AT.pixel_x += random_x
@@ -556,7 +556,7 @@ Difficulty: Very Hard
if(..())
for(var/i in range(1, src))
if(isturf(i))
- PoolOrNew(/obj/effect/overlay/temp/cult/sparks, i)
+ new /obj/effect/overlay/temp/cult/sparks(i)
continue
if(ishuman(i))
var/mob/living/carbon/human/H = i
@@ -644,7 +644,7 @@ Difficulty: Very Hard
var/mob/living/L = target
if(L.stat < DEAD)
L.heal_overall_damage(heal_power, heal_power)
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(target), "#80F5FF"))
+ new /obj/effect/overlay/temp/heal(get_turf(target), "#80F5FF")
/mob/living/simple_animal/hostile/lightgeist/ghostize()
. = ..()
@@ -667,7 +667,7 @@ Difficulty: Very Hard
if(..())
var/list/L = list()
var/turf/T = get_step(src, dir)
- PoolOrNew(/obj/effect/overlay/temp/emp/pulse,T)
+ new /obj/effect/overlay/temp/emp/pulse(T)
for(var/i in T)
if(istype(i, /obj/item) && !is_type_in_typecache(i, banned_items_typecache))
var/obj/item/W = i
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index f882f2143a6..7cf9de1a960 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -128,7 +128,7 @@ Difficulty: Medium
/obj/effect/overlay/temp/target/proc/fall()
var/turf/T = get_turf(src)
playsound(T,'sound/magic/Fireball.ogg', 200, 1)
- PoolOrNew(/obj/effect/overlay/temp/fireball,T)
+ new /obj/effect/overlay/temp/fireball(T)
sleep(12)
explosion(T, 0, 0, 1, 0, 0, 0, 1)
@@ -157,7 +157,7 @@ Difficulty: Medium
visible_message("Fire rains from the sky!")
for(var/turf/turf in range(12,get_turf(src)))
if(prob(10))
- PoolOrNew(/obj/effect/overlay/temp/target, turf)
+ new /obj/effect/overlay/temp/target(turf)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls()
playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1)
@@ -174,7 +174,7 @@ Difficulty: Medium
if(!range || (J != previousturf && (!previousturf.atmos_adjacent_turfs || !previousturf.atmos_adjacent_turfs[J])))
break
range--
- PoolOrNew(/obj/effect/hotspot,J)
+ new /obj/effect/hotspot(J)
J.hotspot_expose(700,50,1)
for(var/mob/living/L in J.contents - hit_things)
L.adjustFireLoss(20)
@@ -218,7 +218,7 @@ Difficulty: Medium
else
tturf = get_turf(src)
forceMove(tturf)
- PoolOrNew(/obj/effect/overlay/temp/dragon_swoop, tturf)
+ new /obj/effect/overlay/temp/dragon_swoop(tturf)
animate(src, pixel_x = initial(pixel_x), pixel_z = 0, time = 10)
sleep(10)
playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 037400778c4..4c537c32fb3 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -151,7 +151,7 @@ Difficulty: Hard
var/prevloc = loc
. = ..()
if(!stat && .)
- var/obj/effect/overlay/temp/hierophant/squares/HS = PoolOrNew(/obj/effect/overlay/temp/hierophant/squares, prevloc)
+ var/obj/effect/overlay/temp/hierophant/squares/HS = new /obj/effect/overlay/temp/hierophant/squares(prevloc)
HS.dir = dir
playsound(loc, 'sound/mecha/mechmove04.ogg', 150, 1, -4)
if(target)
@@ -251,7 +251,7 @@ Difficulty: Hard
pickedtarget = pick_n_take(targets)
if(!istype(pickedtarget) || pickedtarget.stat == DEAD)
pickedtarget = target
- var/obj/effect/overlay/temp/hierophant/chaser/C = PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(loc, src, pickedtarget, chaser_speed, FALSE))
+ var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE)
C.moving = 3
C.moving_dir = pick_n_take(cardinal_copy)
sleep(10)
@@ -281,10 +281,10 @@ Difficulty: Hard
else
addtimer(CALLBACK(src, .proc/diagonal_blasts, target), 0)
else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some!
- var/obj/effect/overlay/temp/hierophant/chaser/C = PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(loc, src, target, chaser_speed, FALSE))
+ var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, chaser_speed, FALSE)
chaser_cooldown = world.time + initial(chaser_cooldown)
if((prob(anger_modifier) || target.Adjacent(src)) && target != src)
- var/obj/effect/overlay/temp/hierophant/chaser/OC = PoolOrNew(/obj/effect/overlay/temp/hierophant/chaser, list(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE))
+ var/obj/effect/overlay/temp/hierophant/chaser/OC = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE)
OC.moving = 4
OC.moving_dir = pick(cardinal - C.moving_dir)
else //just release a burst of power
@@ -294,10 +294,10 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/diagonal, list(T, src))
+ new /obj/effect/overlay/temp/hierophant/telegraph/diagonal(T, src)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE))
+ new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
for(var/d in diagonals)
addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0)
@@ -305,10 +305,10 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/cardinal, list(T, src))
+ new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, src)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE))
+ new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
for(var/d in cardinal)
addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0)
@@ -316,10 +316,10 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, src))
+ new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE))
+ new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
for(var/d in alldirs)
addtimer(CALLBACK(src, .proc/blast_wall, T, d), 0)
@@ -328,7 +328,7 @@ Difficulty: Hard
var/turf/previousturf = T
var/turf/J = get_step(previousturf, set_dir)
for(var/i in 1 to range)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(J, src, FALSE))
+ new /obj/effect/overlay/temp/hierophant/blast(J, src, FALSE)
previousturf = J
J = get_step(previousturf, set_dir)
@@ -344,7 +344,7 @@ Difficulty: Hard
for(var/t in RANGE_TURFS(11, T))
if(t && get_dist(t, T) == 11)
new /obj/effect/overlay/temp/hierophant/wall(t)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, src, FALSE))
+ new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
if(get_dist(src, T) >= 11) //hey you're out of range I need to get closer to you!
addtimer(CALLBACK(src, .proc/blink, T), 0)
@@ -352,7 +352,7 @@ Difficulty: Hard
var/turf/previousturf = T
var/turf/J = get_step(previousturf, set_dir)
for(var/i in 1 to 10)
- var/obj/effect/overlay/temp/hierophant/squares/HS = PoolOrNew(/obj/effect/overlay/temp/hierophant/squares, J)
+ var/obj/effect/overlay/temp/hierophant/squares/HS = new /obj/effect/overlay/temp/hierophant/squares(J)
HS.dir = set_dir
previousturf = J
J = get_step(previousturf, set_dir)
@@ -363,19 +363,19 @@ Difficulty: Hard
return
var/turf/T = get_turf(victim)
var/turf/source = get_turf(src)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, src))
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(source, src))
+ new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
+ new /obj/effect/overlay/temp/hierophant/telegraph(source, src)
playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
blinking = TRUE
sleep(2) //short delay before we start...
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(T, src))
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(source, src))
+ new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, src)
+ new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, src)
for(var/t in RANGE_TURFS(1, T))
- var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, src, FALSE))
+ var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
B.damage = 30
for(var/t in RANGE_TURFS(1, source))
- var/obj/effect/overlay/temp/hierophant/blast/B = PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, src, FALSE))
+ var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
B.damage = 30
animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
sleep(1)
@@ -397,11 +397,11 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph, list(T, src))
+ new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
for(var/t in RANGE_TURFS(1, T))
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(t, src, FALSE))
+ new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
/mob/living/simple_animal/hostile/megafauna/hierophant/proc/burst(turf/original) //release a wave of blasts
playsound(original,'sound/machines/AirlockOpen.ogg', 200, 1)
@@ -414,7 +414,7 @@ Difficulty: Hard
if(dist > last_dist)
last_dist = dist
sleep(1 + min(burst_range - last_dist, 12) * 0.5) //gets faster as it gets further out
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(T, src, FALSE))
+ new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
/mob/living/simple_animal/hostile/megafauna/hierophant/AltClickOn(atom/A) //player control handler(don't give this to a player holy fuck)
if(!istype(A) || get_dist(A, src) <= 2)
@@ -525,7 +525,7 @@ Difficulty: Hard
targetturf = get_turf(target)
/obj/effect/overlay/temp/hierophant/chaser/proc/make_blast()
- PoolOrNew(/obj/effect/overlay/temp/hierophant/blast, list(loc, caster, friendly_fire_check))
+ new /obj/effect/overlay/temp/hierophant/blast(loc, caster, friendly_fire_check)
/obj/effect/overlay/temp/hierophant/telegraph
icon = 'icons/effects/96x96.dmi'
@@ -632,7 +632,7 @@ Difficulty: Hard
addtimer(CALLBACK(H, /obj/item/weapon/hierophant_club.proc/prepare_icon_update), 0)
if(do_after(user, 50, target = src))
playsound(src,'sound/magic/Blind.ogg', 200, 1, -4)
- PoolOrNew(/obj/effect/overlay/temp/hierophant/telegraph/teleport, list(get_turf(src), user))
+ new /obj/effect/overlay/temp/hierophant/telegraph/teleport(get_turf(src), user)
user << "You collect [src], reattaching it to the club!"
H.beacon = null
user.update_action_buttons_icon()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 8b2a29de530..6be8cd5723d 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -290,7 +290,7 @@ var/next_mob_id = 0
if (!tile)
return 0
- PoolOrNew(/obj/effect/overlay/temp/point, list(A,invisibility))
+ new /obj/effect/overlay/temp/point(A,invisibility)
return 1
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index d029187d6bd..a3f12c4d174 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -241,12 +241,12 @@
L.loc = locate(locx,locy,mobloc.z)
var/limit = 2//For only two trailing shadows.
for(var/turf/T in getline(mobloc, L.loc))
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/shadow, list(T, L.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/shadow(T, L.dir)
limit--
if(limit<=0)
break
else
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/shadow, list(mobloc, L.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/shadow(mobloc, L.dir)
L.loc = get_step(L, direct)
L.setDir(direct)
if(3) //Incorporeal move, but blocked by holy-watered tiles and salt piles.
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index a66b1d653c8..5fe7e06b5ca 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -42,7 +42,7 @@
cut_overlays()
invisibility = INVISIBILITY_MAXIMUM
- PoolOrNew(/obj/effect/overlay/temp/monkeyify, get_turf(src))
+ new /obj/effect/overlay/temp/monkeyify(get_turf(src))
sleep(22)
var/mob/living/carbon/monkey/O = new /mob/living/carbon/monkey( loc )
@@ -192,7 +192,7 @@
icon = null
cut_overlays()
invisibility = INVISIBILITY_MAXIMUM
- PoolOrNew(/obj/effect/overlay/temp/monkeyify/humanify, get_turf(src))
+ new /obj/effect/overlay/temp/monkeyify/humanify(get_turf(src))
sleep(22)
var/mob/living/carbon/human/O = new( loc )
for(var/obj/item/C in O.loc)
diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
index a29a42f89a7..1ef1d02a533 100644
--- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
@@ -72,7 +72,7 @@ It is possible to destroy the net by the occupant or someone else.
M.unEquip(W)
playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/phase/out, list(get_turf(M), M.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(M), M.dir)
visible_message("[M] suddenly vanishes!")
M.forceMove(pick(holdingfacility)) //Throw mob in to the holding facility.
@@ -86,7 +86,7 @@ It is possible to destroy the net by the occupant or someone else.
spark_system.start()
playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1)
playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/phase, list(get_turf(M), M.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/phase(get_turf(M), M.dir)
qdel(src)
else//And they are free.
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm
index f60151d4794..de88dc03f6a 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_teleporting.dm
@@ -33,7 +33,7 @@ Contents:
if(destination && isturf(mobloc))//So we don't teleport out of containers
playsound(H.loc, "sparks", 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/phase/out, list(get_turf(H), H.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(H), H.dir)
handle_teleport_grab(destination, H)
H.loc = destination
@@ -41,7 +41,7 @@ Contents:
spark_system.start()
playsound(H.loc, 'sound/effects/phasein.ogg', 25, 1)
playsound(H.loc, "sparks", 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/phase, list(get_turf(H), H.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/phase(get_turf(H), H.dir)
destination.phase_damage_creatures(20,H)//Paralyse and damage mobs and mechas on the turf
s_coold = 1
@@ -62,7 +62,7 @@ Contents:
var/turf/mobloc = get_turf(H.loc)//To make sure that certain things work properly below.
if(!T.density && isturf(mobloc))
playsound(H.loc, "sparks", 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/phase/out, list(get_turf(H), H.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/phase/out(get_turf(H), H.dir)
handle_teleport_grab(T, H)
H.forceMove(T)
@@ -70,7 +70,7 @@ Contents:
spark_system.start()
playsound(H.loc, 'sound/effects/phasein.ogg', 25, 1)
playsound(H.loc, "sparks", 50, 1)
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/ninja/phase, list(get_turf(H), H.dir))
+ new /obj/effect/overlay/temp/dir_setting/ninja/phase(get_turf(H), H.dir)
T.phase_damage_creatures(20,H)//Paralyse and damage mobs and mechas on the turf
s_coold = 1
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 63aac680697..10d617e4670 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -177,7 +177,7 @@
src.fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
src.shot_number = 0
- var/obj/item/projectile/A = PoolOrNew(projectile_type,src.loc)
+ var/obj/item/projectile/A = new projectile_type(src.loc)
A.setDir(src.dir)
playsound(src.loc, projectile_sound, 25, 1)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 3a19ec72b10..9c11a4289b9 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -41,7 +41,7 @@
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, user, null, 0, loc_override = src.loc)
- PoolOrNew(/obj/effect/particle_effect/smoke/sleeping, src.loc)
+ new /obj/effect/particle_effect/smoke/sleeping(src.loc)
/obj/singularity/narsie/process()
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index 4c44b27bb62..68c08054553 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -44,7 +44,7 @@
if(BB.firer)
firing_dir = BB.firer.dir
if(!BB.suppressed && firing_effect_type)
- PoolOrNew(firing_effect_type, list(get_turf(src), firing_dir))
+ new firing_effect_type(get_turf(src), firing_dir)
var/direct_target
if(targloc == curloc)
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index e4654ea5a8d..1d0dc72e1f6 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -193,10 +193,10 @@
if(ismineralturf(target_turf))
var/turf/closed/mineral/M = target_turf
M.gets_drilled(firer)
- var/obj/effect/overlay/temp/kinetic_blast/K = PoolOrNew(/obj/effect/overlay/temp/kinetic_blast, target_turf)
+ var/obj/effect/overlay/temp/kinetic_blast/K = new /obj/effect/overlay/temp/kinetic_blast(target_turf)
K.color = color
for(var/type in hit_overlays)
- PoolOrNew(type, target_turf)
+ new type(target_turf)
if(turf_aoe)
for(var/T in RANGE_TURFS(1, target_turf) - target_turf)
if(ismineralturf(T))
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index fae78a8fa31..bcc9e3bd8a5 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -107,7 +107,7 @@
/obj/item/weapon/gun/medbeam/proc/on_beam_tick(var/mob/living/target)
if(target.health != target.maxHealth)
- PoolOrNew(/obj/effect/overlay/temp/heal, list(get_turf(target), "#80F5FF"))
+ new /obj/effect/overlay/temp/heal(get_turf(target), "#80F5FF")
target.adjustBruteLoss(-4)
target.adjustFireLoss(-4)
return
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 51799b0d8d5..d3c220ac0cc 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -81,7 +81,7 @@
var/turf/target_loca = get_turf(target)
if(!isliving(target))
if(impact_effect_type)
- PoolOrNew(impact_effect_type, list(target_loca, target, src))
+ new impact_effect_type(target_loca, target, src)
return 0
var/mob/living/L = target
if(blocked != 100) // not completely blocked
@@ -90,13 +90,13 @@
if(starting)
splatter_dir = get_dir(starting, target_loca)
if(isalien(L))
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter, list(target_loca, splatter_dir))
+ new /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir)
else
- PoolOrNew(/obj/effect/overlay/temp/dir_setting/bloodsplatter, list(target_loca, splatter_dir))
+ new /obj/effect/overlay/temp/dir_setting/bloodsplatter(target_loca, splatter_dir)
if(prob(33))
L.add_splatter_floor(target_loca)
else if(impact_effect_type)
- PoolOrNew(impact_effect_type, list(target_loca, target, src))
+ new impact_effect_type(target_loca, target, src)
var/organ_hit_text = ""
var/limb_hit = L.check_limb_hit(def_zone)//to get the correct message info.
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 81c5bb9ddc1..b12784b4307 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -95,10 +95,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/beam/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 d08b80cb164..76725fd2169 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -119,7 +119,7 @@
..()
var/turf/location = get_turf(src)
if(location)
- PoolOrNew(/obj/effect/hotspot, location)
+ new /obj/effect/hotspot(location)
location.hotspot_expose(700, 50, 1)
/obj/item/projectile/bullet/incendiary/shell/dragonsbreath
@@ -326,7 +326,7 @@
..()
var/turf/location = get_turf(src)
if(location)
- PoolOrNew(/obj/effect/hotspot, location)
+ new /obj/effect/hotspot(location)
location.hotspot_expose(700, 50, 1)
/obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = 0)
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index e8830ec1a8f..7a68d887067 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -247,7 +247,7 @@
var/throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(A, src)))
A.throw_at(throwtarget,power+1,1)
for(var/turf/F in range(T,power))
- PoolOrNew(/obj/effect/overlay/temp/gravpush, F)
+ new /obj/effect/overlay/temp/gravpush(F)
/obj/item/projectile/gravityattract
name = "attraction bolt"
@@ -274,7 +274,7 @@
continue
A.throw_at(T, power+1, 1)
for(var/turf/F in range(T,power))
- PoolOrNew(/obj/effect/overlay/temp/gravpush, F)
+ new /obj/effect/overlay/temp/gravpush(F)
/obj/item/projectile/gravitychaos
name = "gravitational blast"
@@ -301,5 +301,5 @@
continue
A.throw_at(get_edge_target_turf(A, pick(cardinal)), power+1, 1)
for(var/turf/Z in range(T,power))
- PoolOrNew(/obj/effect/overlay/temp/gravpush, Z)
+ new /obj/effect/overlay/temp/gravpush(Z)
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 1ce7341a3fd..f60c7f38a60 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -170,7 +170,7 @@
for(var/turf/open/T in range(1, B))
var/obj/structure/blob/C = locate() in T
if(!(C && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) && prob(80))
- PoolOrNew(/obj/effect/hotspot, T)
+ new /obj/effect/hotspot(T)
if(damage_flag == "fire")
return 0
return ..()
@@ -299,7 +299,7 @@
var/initial_volume = reac_volume
reac_volume = ..()
if(reac_volume >= 10) //if it's not a spore cloud, bad time incoming
- var/obj/effect/overlay/temp/explosion/fast/E = PoolOrNew(/obj/effect/overlay/temp/explosion/fast, get_turf(M))
+ var/obj/effect/overlay/temp/explosion/fast/E = new /obj/effect/overlay/temp/explosion/fast(get_turf(M))
E.alpha = 150
for(var/mob/living/L in orange(get_turf(M), 1))
if("blob" in L.faction) //no friendly fire
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 249825cde20..85f553fcc28 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -63,7 +63,7 @@
if(isfloorturf(F))
for(var/turf/turf in range(1,F))
if(!locate(/obj/effect/hotspot) in turf)
- PoolOrNew(/obj/effect/hotspot, F)
+ new /obj/effect/hotspot(F)
if(iswallturf(T))
var/turf/closed/wall/W = T
if(prob(reac_volume))
@@ -75,7 +75,7 @@
M.adjust_fire_stacks(min(reac_volume/5, 10))
M.IgniteMob()
if(!locate(/obj/effect/hotspot) in M.loc)
- PoolOrNew(/obj/effect/hotspot, M.loc)
+ new /obj/effect/hotspot(M.loc)
/datum/reagent/sorium
name = "Sorium"
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index b75908a6f23..4f76d34b2a8 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -132,7 +132,7 @@
/datum/chemical_reaction/clf3/on_reaction(datum/reagents/holder, 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)
holder.chem_temp = 1000 // hot as shit
/datum/chemical_reaction/reagent_explosion/methsplosion
@@ -147,7 +147,7 @@
/datum/chemical_reaction/reagent_explosion/methsplosion/on_reaction(datum/reagents/holder, 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)
holder.chem_temp = 1000 // hot as shit
..()
diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm
index 681b9b58610..f244a4d748c 100644
--- a/code/modules/recycling/disposal-structures.dm
+++ b/code/modules/recycling/disposal-structures.dm
@@ -254,7 +254,7 @@
if(isfloorturf(T)) //intact floor, pop the tile
floorturf = T
if(floorturf.floor_tile)
- PoolOrNew(floorturf.floor_tile, T)
+ new floorturf.floor_tile(T)
floorturf.make_plating()
if(direction) // direction is specified
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index ed185319fbf..7c21400b645 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -391,7 +391,7 @@
/obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1)
var/list/turfs = ripple_area(S1)
for(var/t in turfs)
- ripples += PoolOrNew(/obj/effect/overlay/temp/ripple, t)
+ ripples += new /obj/effect/overlay/temp/ripple(t)
/obj/docking_port/mobile/proc/remove_ripples()
for(var/R in ripples)
diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm
index 42502536550..b235184ddd8 100644
--- a/code/modules/spells/spell_types/devil.dm
+++ b/code/modules/spells/spell_types/devil.dm
@@ -136,7 +136,7 @@
spawn_dust()
src.visible_message("[src] disappears in a flashfire!")
playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
- var/obj/effect/dummy/slaughter/holder = PoolOrNew(/obj/effect/dummy/slaughter,loc)
+ var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(loc)
src.ExtinguishMob()
if(buckled)
buckled.unbuckle_mob(src,force=1)
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index 52669807277..cbc87cd40ff 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -26,7 +26,7 @@
target.notransform = 1
var/turf/mobloc = get_turf(target)
var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt(mobloc)
- PoolOrNew(jaunt_out_type, list(mobloc, holder.dir))
+ new jaunt_out_type(mobloc, holder.dir)
target.ExtinguishMob()
if(target.buckled)
target.buckled.unbuckle_mob(target,force=1)
@@ -51,7 +51,7 @@
holder.reappearing = 1
playsound(get_turf(target), 'sound/magic/Ethereal_Exit.ogg', 50, 1, -1)
sleep(25 - jaunt_in_time)
- PoolOrNew(jaunt_in_type, list(mobloc, holder.dir))
+ new jaunt_in_type(mobloc, holder.dir)
sleep(jaunt_in_time)
qdel(holder)
if(!qdeleted(target))
diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm
index b5ca5146578..72eab294e43 100644
--- a/code/modules/spells/spell_types/wizard.dm
+++ b/code/modules/spells/spell_types/wizard.dm
@@ -338,7 +338,7 @@
M.adjustBruteLoss(5)
M << "You're slammed into the floor by [user]!"
else
- PoolOrNew(sparkle_path, list(get_turf(AM), get_dir(user, AM))) //created sparkles will disappear on their own
+ new sparkle_path(get_turf(AM), get_dir(user, AM)) //created sparkles will disappear on their own
if(isliving(AM))
var/mob/living/M = AM
M.Weaken(stun_amt)
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 937906101c9..2bd0ee63d95 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -23,7 +23,7 @@
/obj/item/weapon/ore/bluespace_crystal/attack_self(mob/user)
user.visible_message("[user] crushes [src]!", "You crush [src]!")
- PoolOrNew(/obj/effect/particle_effect/sparks, loc)
+ new /obj/effect/particle_effect/sparks(loc)
playsound(src.loc, "sparks", 50, 1)
blink_mob(user)
user.unEquip(src)
@@ -36,7 +36,7 @@
if(!..()) // not caught in mid-air
visible_message("[src] fizzles and disappears upon impact!")
var/turf/T = get_turf(hit_atom)
- PoolOrNew(/obj/effect/particle_effect/sparks, T)
+ new /obj/effect/particle_effect/sparks(T)
playsound(src.loc, "sparks", 50, 1)
if(isliving(hit_atom))
blink_mob(hit_atom)
diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm
index 4240d93e8c1..ecfcecbc2ed 100644
--- a/code/modules/vehicles/speedbike.dm
+++ b/code/modules/vehicles/speedbike.dm
@@ -29,7 +29,7 @@
/obj/vehicle/space/speedbike/Move(newloc,move_dir)
if(has_buckled_mobs())
- PoolOrNew(/obj/effect/overlay/temp/speedbike_trail,list(loc,move_dir))
+ new /obj/effect/overlay/temp/speedbike_trail(loc,move_dir)
. = ..()
/obj/vehicle/space/speedbike/red
diff --git a/tgstation.dme b/tgstation.dme
index c00cc47ce66..5167f6b9a4c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -167,7 +167,6 @@
#include "code\controllers\subsystem\parallax.dm"
#include "code\controllers\subsystem\persistence.dm"
#include "code\controllers\subsystem\ping.dm"
-#include "code\controllers\subsystem\pool.dm"
#include "code\controllers\subsystem\radio.dm"
#include "code\controllers\subsystem\religion.dm"
#include "code\controllers\subsystem\server_maintenance.dm"
@@ -899,7 +898,6 @@
#include "code\game\objects\structures\transit_tubes\transit_tube.dm"
#include "code\game\objects\structures\transit_tubes\transit_tube_construction.dm"
#include "code\game\objects\structures\transit_tubes\transit_tube_pod.dm"
-#include "code\game\pooling\pool.dm"
#include "code\game\turfs\closed.dm"
#include "code\game\turfs\open.dm"
#include "code\game\turfs\turf.dm"