diff --git a/code/_helpers/datum_pool.dm b/code/_helpers/datum_pool.dm deleted file mode 100644 index b5bcea123f..0000000000 --- a/code/_helpers/datum_pool.dm +++ /dev/null @@ -1,110 +0,0 @@ - -/* -/tg/station13 /atom/movable Pool: ---------------------------------- -By RemieRichards - -Creation/Deletion is laggy, so let's reduce reuse and recycle! - -*/ -#define ATOM_POOL_COUNT 100 -// "define DEBUG_ATOM_POOL 1 -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 new location, if the type is /atom/movable -//Or a list of arguments -//Either way it gets passed to new - -/proc/PoolOrNew(var/get_type,var/second_arg) - var/datum/D - D = GetFromPool(get_type,second_arg) - - if(!D) - // So the GC knows we're pooling this type. - if(!GlobalPool[get_type]) - GlobalPool[get_type] = list() - if(islist(second_arg)) - return new get_type (arglist(second_arg)) - else - return new get_type (second_arg) - return D - -/proc/GetFromPool(var/get_type,var/second_arg) - if(isnull(GlobalPool[get_type])) - return 0 - - if(length(GlobalPool[get_type]) == 0) - return 0 - - var/datum/D = pick_n_take(GlobalPool[get_type]) - if(D) - D.ResetVars() - D.Prepare(second_arg) - return D - return 0 - -/proc/PlaceInPool(var/datum/D) - if(!istype(D)) - return - - if(length(GlobalPool[D.type]) > ATOM_POOL_COUNT) - #ifdef DEBUG_ATOM_POOL - world << text("DEBUG_DATUM_POOL: PlaceInPool([]) exceeds []. Discarding.", D.type, ATOM_POOL_COUNT) - #endif - if(garbage_collector) - garbage_collector.AddTrash(D) - else - del(D) - return - - if(D in GlobalPool[D.type]) - return - - if(!GlobalPool[D.type]) - GlobalPool[D.type] = list() - - GlobalPool[D.type] += D - - D.Destroy() - D.ResetVars() - -/proc/IsPooled(var/datum/D) - if(isnull(GlobalPool[D.type])) - return 0 - return 1 - -/datum/proc/Prepare(args) - if(islist(args)) - New(arglist(args)) - else - New(args) - -/atom/movable/Prepare(args) - var/list/args_list = args - if(istype(args_list) && args_list.len) - loc = args[1] - else - loc = args - ..() - -/datum/proc/ResetVars(var/list/exlude = list()) - var/list/excluded = list("animate_movement", "loc", "locs", "parent_type", "vars", "verbs", "type") + exlude - - for(var/V in vars) - if(V in excluded) - continue - - vars[V] = initial(vars[V]) - -/atom/movable/ResetVars() - ..() - vars["loc"] = null - -#undef ATOM_POOL_COUNT diff --git a/code/_onclick/hud/ability_screen_objects.dm b/code/_onclick/hud/ability_screen_objects.dm index 1e6844b6ad..2081e011b3 100644 --- a/code/_onclick/hud/ability_screen_objects.dm +++ b/code/_onclick/hud/ability_screen_objects.dm @@ -32,11 +32,6 @@ my_mob.client.screen -= src my_mob = null -/obj/screen/movable/ability_master/ResetVars() - ..("ability_objects", args) - remove_all_abilities() -// ability_objects = list() - /obj/screen/movable/ability_master/MouseDrop() if(showing) return diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index fd226eb70c..a00fa6e10d 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -20,7 +20,7 @@ return null if(!screen) - screen = PoolOrNew(type) + screen = new type() screen.icon_state = "[initial(screen.icon_state)][severity]" screen.severity = severity diff --git a/code/_onclick/hud/spell_screen_objects.dm b/code/_onclick/hud/spell_screen_objects.dm index 262ece09e4..a599381730 100644 --- a/code/_onclick/hud/spell_screen_objects.dm +++ b/code/_onclick/hud/spell_screen_objects.dm @@ -23,10 +23,6 @@ spell_holder.client.screen -= src spell_holder = null -/obj/screen/movable/spell_master/ResetVars() - ..("spell_objects", args) - spell_objects = list() - /obj/screen/movable/spell_master/MouseDrop() if(showing) return @@ -93,7 +89,7 @@ if(spell.spell_flags & NO_BUTTON) //no button to add if we don't get one return - var/obj/screen/spell/newscreen = PoolOrNew(/obj/screen/spell) + var/obj/screen/spell/newscreen = new /obj/screen/spell() newscreen.spellmaster = src newscreen.spell = spell diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 4c976f4458..f08727abf3 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -149,7 +149,7 @@ var/const/tk_maxrange = 15 /obj/item/tk_grab/proc/apply_focus_overlay() if(!focus) return - var/obj/effect/overlay/O = PoolOrNew(/obj/effect/overlay, locate(focus.x,focus.y,focus.z)) + var/obj/effect/overlay/O = new /obj/effect/overlay(locate(focus.x,focus.y,focus.z)) O.name = "sparkles" O.anchored = 1 O.density = 0 diff --git a/code/controllers/Processes/garbage.dm b/code/controllers/Processes/garbage.dm index 2d56dde1a2..02f0411332 100644 --- a/code/controllers/Processes/garbage.dm +++ b/code/controllers/Processes/garbage.dm @@ -152,19 +152,13 @@ world/loop_checks = 0 A.finalize_qdel() /datum/proc/finalize_qdel() - if(IsPooled(src)) - PlaceInPool(src) - else - del(src) + del(src) /atom/finalize_qdel() - if(IsPooled(src)) - PlaceInPool(src) + if(garbage_collector) + garbage_collector.AddTrash(src) else - if(garbage_collector) - garbage_collector.AddTrash(src) - else - delayed_garbage |= src + delayed_garbage |= src /icon/finalize_qdel() del(src) @@ -180,7 +174,7 @@ world/loop_checks = 0 // Default implementation of clean-up code. // This should be overridden to remove all references pointing to the object being destroyed. -// Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.) +// Return true if the the GC controller should allow the object to continue existing. /datum/proc/Destroy() nanomanager.close_uis(src) tag = null diff --git a/code/game/gamemodes/technomancer/assistance/assistance.dm b/code/game/gamemodes/technomancer/assistance/assistance.dm index 3cdf7014ad..d5d28bc118 100644 --- a/code/game/gamemodes/technomancer/assistance/assistance.dm +++ b/code/game/gamemodes/technomancer/assistance/assistance.dm @@ -30,7 +30,7 @@ /obj/item/weapon/antag_spawner/technomancer_apprentice/New() ..() - sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) + sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(5, 0, src) sparks.attach(loc) diff --git a/code/game/gamemodes/technomancer/devices/shield_armor.dm b/code/game/gamemodes/technomancer/devices/shield_armor.dm index bacb2c60ed..0bbb6ef085 100644 --- a/code/game/gamemodes/technomancer/devices/shield_armor.dm +++ b/code/game/gamemodes/technomancer/devices/shield_armor.dm @@ -26,7 +26,7 @@ /obj/item/clothing/suit/armor/shield/New() ..() - spark_system = PoolOrNew(/datum/effect/effect/system/spark_spread) + spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) /obj/item/clothing/suit/armor/shield/Destroy() diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm index 453469619c..be35adec6e 100644 --- a/code/game/gamemodes/technomancer/instability.dm +++ b/code/game/gamemodes/technomancer/instability.dm @@ -102,7 +102,7 @@ rng = rand(0,1) switch(rng) if(0) - var/datum/effect/effect/system/spark_spread/sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(5, 0, src) sparks.attach(loc) sparks.start() @@ -167,10 +167,10 @@ rng = rand(0,1) switch(rng) if(0) - var/datum/effect/effect/system/spark_spread/sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(5, 0, src) sparks.attach(loc) -// var/datum/effect/effect/system/spark_spread/spark_system = PoolOrNew(/datum/effect/effect/system/spark_spread) +// var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() // spark_system.set_up(5, 0, get_turf(src)) // spark_system.attach(src) sparks.start() diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index fb22001d30..faaf3ee75a 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -247,7 +247,7 @@ if(!path || !ispath(path)) return 0 - //var/obj/item/weapon/spell/S = PoolOrNew(path, src) + //var/obj/item/weapon/spell/S = new path(src) var/obj/item/weapon/spell/S = new path(src) //No hands needed for innate casts. diff --git a/code/game/gamemodes/technomancer/spells/condensation.dm b/code/game/gamemodes/technomancer/spells/condensation.dm index c02e1c1ac5..c303c2a5fb 100644 --- a/code/game/gamemodes/technomancer/spells/condensation.dm +++ b/code/game/gamemodes/technomancer/spells/condensation.dm @@ -24,7 +24,7 @@ spawn(1) var/turf/desired_turf = get_step(T,direction) if(desired_turf) // This shouldn't fail but... - var/obj/effect/effect/water/W = PoolOrNew(/obj/effect/effect/water, get_turf(T)) + var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(T)) W.create_reagents(60) W.reagents.add_reagent(id = "water", amount = 60, data = null, safety = 0) W.set_color() diff --git a/code/game/gamemodes/technomancer/spells/passwall.dm b/code/game/gamemodes/technomancer/spells/passwall.dm index aa16a8a4fc..e786134b4c 100644 --- a/code/game/gamemodes/technomancer/spells/passwall.dm +++ b/code/game/gamemodes/technomancer/spells/passwall.dm @@ -39,7 +39,7 @@ visible_message("[user] rests a hand on \the [hit_atom].") busy = 1 - var/datum/effect/effect/system/spark_spread/spark_system = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, our_turf) while(i) diff --git a/code/game/gamemodes/technomancer/spells/reflect.dm b/code/game/gamemodes/technomancer/spells/reflect.dm index d841db2acc..60abcee63f 100644 --- a/code/game/gamemodes/technomancer/spells/reflect.dm +++ b/code/game/gamemodes/technomancer/spells/reflect.dm @@ -19,7 +19,7 @@ /obj/item/weapon/spell/reflect/New() ..() set_light(3, 2, l_color = "#006AFF") - spark_system = PoolOrNew(/datum/effect/effect/system/spark_spread) + spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) owner << "Your shield will expire in 3 seconds!" spawn(5 SECONDS) diff --git a/code/game/gamemodes/technomancer/spells/shield.dm b/code/game/gamemodes/technomancer/spells/shield.dm index a9514aaa29..291c74f7fa 100644 --- a/code/game/gamemodes/technomancer/spells/shield.dm +++ b/code/game/gamemodes/technomancer/spells/shield.dm @@ -21,7 +21,7 @@ /obj/item/weapon/spell/shield/New() ..() set_light(3, 2, l_color = "#006AFF") - spark_system = PoolOrNew(/datum/effect/effect/system/spark_spread) + spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src) /obj/item/weapon/spell/shield/Destroy() diff --git a/code/game/gamemodes/technomancer/spells/warp_strike.dm b/code/game/gamemodes/technomancer/spells/warp_strike.dm index 94074ffcf0..3f8939e0ba 100644 --- a/code/game/gamemodes/technomancer/spells/warp_strike.dm +++ b/code/game/gamemodes/technomancer/spells/warp_strike.dm @@ -16,7 +16,7 @@ /obj/item/weapon/spell/warp_strike/New() ..() - sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) + sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(5, 0, src) sparks.attach(loc) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index fa4b601e91..76eb2da2d5 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -61,7 +61,7 @@ for reference: var/health = 100 var/maxhealth = 100 var/material/material - + /obj/structure/barricade/New(var/newloc, var/material_name) ..(newloc) if(!material_name) @@ -74,7 +74,7 @@ for reference: desc = "This space is blocked off by a barricade made of [material.display_name]." color = material.icon_colour maxhealth = material.integrity - health = maxhealth + health = maxhealth /obj/structure/barricade/get_material() return material @@ -237,7 +237,7 @@ for reference: var/turf/Tsec = get_turf(src) /* var/obj/item/stack/rods/ =*/ - PoolOrNew(/obj/item/stack/rods, Tsec) + new /obj/item/stack/rods(Tsec) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index cd38f9f1ce..7a1d6abd02 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -164,7 +164,7 @@ switch (Proj.damage_type) if(BRUTE) new /obj/item/stack/material/steel(src.loc, 2) - PoolOrNew(/obj/item/stack/rods, list(src.loc, 3)) + new /obj/item/stack/rods(src.loc, 3) if(BURN) new /obj/effect/decal/cleanable/ash(src.loc) // Turn it to ashes! qdel(src) diff --git a/code/game/machinery/kitchen/cooking_machines/_cooker.dm b/code/game/machinery/kitchen/cooking_machines/_cooker.dm index a6af0f13f2..552e05d95a 100644 --- a/code/game/machinery/kitchen/cooking_machines/_cooker.dm +++ b/code/game/machinery/kitchen/cooking_machines/_cooker.dm @@ -170,7 +170,7 @@ cooking_obj = new /obj/item/weapon/reagent_containers/food/snacks/badrecipe(src) // Produce nasty smoke. visible_message("\The [src] vomits a gout of rancid smoke!") - var/datum/effect/effect/system/smoke_spread/bad/smoke = PoolOrNew(/datum/effect/effect/system/smoke_spread/bad) + var/datum/effect/effect/system/smoke_spread/bad/smoke = new /datum/effect/effect/system/smoke_spread/bad() smoke.attach(src) smoke.set_up(10, 0, usr.loc) smoke.start() diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index b0946bf347..6e9f31889d 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -155,7 +155,7 @@ Class Procs: if(use_power && stat == 0) use_power(7500/severity) - var/obj/effect/overlay/pulse2 = PoolOrNew(/obj/effect/overlay, src.loc) + var/obj/effect/overlay/pulse2 = new /obj/effect/overlay(src.loc) pulse2.icon = 'icons/effects/effects.dmi' pulse2.icon_state = "empdisable" pulse2.name = "emp sparks" diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 595712afd3..6d7a6f82a7 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -567,7 +567,7 @@ var/list/turret_icons set_raised_raising(raised, 1) update_icon() - var/atom/flick_holder = PoolOrNew(/atom/movable/porta_turret_cover, loc) + var/atom/flick_holder = new /atom/movable/porta_turret_cover(loc) flick_holder.layer = layer + 0.1 flick("popup", flick_holder) sleep(10) @@ -588,7 +588,7 @@ var/list/turret_icons set_raised_raising(raised, 1) update_icon() - var/atom/flick_holder = PoolOrNew(/atom/movable/porta_turret_cover, loc) + var/atom/flick_holder = new /atom/movable/porta_turret_cover(loc) flick_holder.layer = layer + 0.1 flick("popdown", flick_holder) sleep(10) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 41f1ba44ef..9b2e0aa26d 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -208,7 +208,7 @@ for(var/a = 1 to 5) spawn(0) - var/obj/effect/effect/water/W = PoolOrNew(/obj/effect/effect/water, get_turf(chassis)) + var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(chassis)) var/turf/my_target if(a == 1) my_target = T diff --git a/code/game/objects/effects/chem/chemsmoke.dm b/code/game/objects/effects/chem/chemsmoke.dm index 3f077116e9..45cfcc8348 100644 --- a/code/game/objects/effects/chem/chemsmoke.dm +++ b/code/game/objects/effects/chem/chemsmoke.dm @@ -152,7 +152,7 @@ if(passed_smoke) smoke = passed_smoke else - smoke = PoolOrNew(/obj/effect/effect/smoke/chem, location) + smoke = new /obj/effect/effect/smoke/chem(location) if(chemholder.reagents.reagent_list.len) chemholder.reagents.trans_to_obj(smoke, chemholder.reagents.total_volume / dist, copy = 1) //copy reagents to the smoke so mob/breathe() can handle inhaling the reagents @@ -169,7 +169,7 @@ qdel(src) /datum/effect/effect/system/smoke_spread/chem/spores/spawnSmoke(var/turf/T, var/icon/I, var/dist = 1) - var/obj/effect/effect/smoke/chem/spores = PoolOrNew(/obj/effect/effect/smoke/chem, location) + var/obj/effect/effect/smoke/chem/spores = new /obj/effect/effect/smoke/chem(location) spores.name = "cloud of [seed.seed_name] [seed.seed_noun]" ..(T, I, dist, spores) diff --git a/code/game/objects/effects/chem/foam.dm b/code/game/objects/effects/chem/foam.dm index b29b2440e6..5f29bd6448 100644 --- a/code/game/objects/effects/chem/foam.dm +++ b/code/game/objects/effects/chem/foam.dm @@ -108,7 +108,7 @@ F.amount += amount return - F = PoolOrNew(/obj/effect/effect/foam, list(location, metal)) + F = new /obj/effect/effect/foam(location, metal) F.amount = amount if(!metal) // don't carry other chemicals if a metal foam diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index fc764efd02..3cdca23fde 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -222,7 +222,7 @@ var/global/list/image/splatter_cache=list() for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++) sleep(3) if (i > 0) - var/obj/effect/decal/cleanable/blood/b = PoolOrNew(/obj/effect/decal/cleanable/blood/splatter, src.loc) + var/obj/effect/decal/cleanable/blood/b = new /obj/effect/decal/cleanable/blood/splatter(src.loc) b.basecolor = src.basecolor b.update_icon() diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 485ea6987b..2343871b95 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -75,7 +75,7 @@ steam.start() -- spawns the effect spawn(0) if(holder) src.location = get_turf(holder) - var/obj/effect/effect/steam/steam = PoolOrNew(/obj/effect/effect/steam, src.location) + var/obj/effect/effect/steam/steam = new /obj/effect/effect/steam(src.location) var/direction if(src.cardinals) direction = pick(cardinal) @@ -146,7 +146,7 @@ steam.start() -- spawns the effect spawn(0) if(holder) src.location = get_turf(holder) - var/obj/effect/effect/sparks/sparks = PoolOrNew(/obj/effect/effect/sparks, src.location) + var/obj/effect/effect/sparks/sparks = new /obj/effect/effect/sparks(src.location) src.total_sparks++ var/direction if(src.cardinals) @@ -283,7 +283,7 @@ steam.start() -- spawns the effect spawn(0) if(holder) src.location = get_turf(holder) - var/obj/effect/effect/smoke/smoke = PoolOrNew(smoke_type, src.location) + var/obj/effect/effect/smoke/smoke = new smoke_type(src.location) src.total_smoke++ smoke.color = I var/direction = src.direction @@ -334,7 +334,7 @@ steam.start() -- spawns the effect var/turf/T = get_turf(src.holder) if(T != src.oldposition) if(isturf(T)) - var/obj/effect/effect/ion_trails/I = PoolOrNew(/obj/effect/effect/ion_trails, src.oldposition) + var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition) src.oldposition = T I.set_dir(src.holder.dir) flick("ion_fade", I) @@ -380,7 +380,7 @@ steam.start() -- spawns the effect src.processing = 0 spawn(0) if(src.number < 3) - var/obj/effect/effect/steam/I = PoolOrNew(/obj/effect/effect/steam, src.oldposition) + var/obj/effect/effect/steam/I = new /obj/effect/effect/steam(src.oldposition) src.number++ src.oldposition = get_turf(holder) I.set_dir(src.holder.dir) @@ -420,7 +420,7 @@ steam.start() -- spawns the effect start() if (amount <= 2) - var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(2, 1, location) s.start() diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index 9d630113bb..16db09edb6 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -24,7 +24,7 @@ var/obj/effect/decal/cleanable/blood/gibs/gib = null if(sparks) - var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(2, 1, get_turf(location)) // Not sure if it's safe to pass an arbitrary object to set_up, todo s.start() diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 27e6d7c74a..52f920775e 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -26,7 +26,7 @@ call(src,triggerproc)(M) /obj/effect/mine/proc/triggerrad(obj) - var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(3, 1, src) s.start() obj:radiation += 50 @@ -39,7 +39,7 @@ if(ismob(obj)) var/mob/M = obj M.Stun(30) - var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(3, 1, src) s.start() spawn(0) @@ -67,7 +67,7 @@ qdel(src) /obj/effect/mine/proc/triggerkick(obj) - var/datum/effect/effect/system/spark_spread/s = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread() s.set_up(3, 1, src) s.start() qdel(obj:client) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 1077d757ae..4396465bc9 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -105,7 +105,7 @@ O = loc for(var/i=0, i[src] dies!") - PoolOrNew(/obj/effect/decal/cleanable/spiderling_remains, src.loc) + new /obj/effect/decal/cleanable/spiderling_remains(src.loc) qdel(src) /obj/effect/spider/spiderling/healthcheck() diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 3b1a3b54f5..3d97946bd4 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -15,7 +15,7 @@ proc/empulse(turf/epicenter, first_range, second_range, third_range, fourth_rang log_game("EMP with size ([first_range], [second_range], [third_range], [fourth_range]) in area [epicenter.loc.name] ") if(first_range > 1) - var/obj/effect/overlay/pulse = PoolOrNew(/obj/effect/overlay, epicenter) + var/obj/effect/overlay/pulse = new /obj/effect/overlay(epicenter) pulse.icon = 'icons/effects/effects.dmi' pulse.icon_state = "emppulse" pulse.name = "emp pulse" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 4b870481fa..9775d64042 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -47,7 +47,7 @@ qdel(active_dummy) active_dummy = null usr << "You deactivate the [src]." - var/obj/effect/overlay/T = PoolOrNew(/obj/effect/overlay, get_turf(src)) + var/obj/effect/overlay/T = new /obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) spawn(8) qdel(T) @@ -55,7 +55,7 @@ playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) var/obj/O = new saved_item(src) if(!O) return - var/obj/effect/dummy/chameleon/C = PoolOrNew(/obj/effect/dummy/chameleon, usr.loc) + var/obj/effect/dummy/chameleon/C = new /obj/effect/dummy/chameleon(usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src) qdel(O) usr << "You activate the [src]." diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index 3bcb68bcee..eba48464f0 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -107,7 +107,7 @@ spawn(0) if(!src || !reagents.total_volume) return - var/obj/effect/effect/water/W = PoolOrNew(/obj/effect/effect/water, get_turf(src)) + var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(src)) var/turf/my_target if(a <= the_targets.len) my_target = the_targets[a] diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index c3f93a016f..84bee72558 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -86,7 +86,7 @@ if(ptank) ptank.loc = T ptank = null - PoolOrNew(/obj/item/stack/rods, T) + new /obj/item/stack/rods(T) qdel(src) return diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index d64627fcf3..2c89be0ac7 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -12,7 +12,7 @@ /obj/item/weapon/grenade/smokebomb/New() ..() - src.smoke = PoolOrNew(/datum/effect/effect/system/smoke_spread/bad) + src.smoke = new /datum/effect/effect/system/smoke_spread/bad() src.smoke.attach(src) /obj/item/weapon/grenade/smokebomb/Destroy() diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 2c47c8ab9d..5e3c96c8a0 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -130,7 +130,7 @@ . = ..() if(.) - var/datum/effect/effect/system/spark_spread/spark_system = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, user.loc) spark_system.start() playsound(user.loc, 'sound/weapons/blade1.ogg', 50, 1) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 0691d3d68e..720d8a92d3 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -97,7 +97,7 @@ if(iswirecutter(W)) if(!shock(user, 100)) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) - PoolOrNew(/obj/item/stack/rods, list(get_turf(src), destroyed ? 1 : 2)) + new /obj/item/stack/rods(get_turf(src), destroyed ? 1 : 2) qdel(src) else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored)) if(!shock(user, 90)) @@ -152,7 +152,7 @@ else if(!(W.flags & CONDUCT) || !shock(user, 70)) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - user.do_attack_animation(src) + user.do_attack_animation(src) playsound(loc, 'sound/effects/grillehit.ogg', 80, 1) switch(W.damtype) if("fire") @@ -170,11 +170,11 @@ density = 0 destroyed = 1 update_icon() - PoolOrNew(/obj/item/stack/rods, get_turf(src)) + new /obj/item/stack/rods(get_turf(src)) else if(health <= -6) - PoolOrNew(/obj/item/stack/rods, get_turf(src)) + new /obj/item/stack/rods(get_turf(src)) qdel(src) return return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 0eb48e94e0..96291ecd27 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -65,7 +65,7 @@ if(WT.welding == 1) if(WT.remove_fuel(0, user)) user << "Slicing lattice joints ..." - PoolOrNew(/obj/item/stack/rods, src.loc) + new /obj/item/stack/rods(src.loc) qdel(src) return diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index a382858c54..94aa30c24d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -182,13 +182,13 @@ spawn(50) if(src && on) ismist = 1 - mymist = PoolOrNew(/obj/effect/mist,loc) + mymist = new /obj/effect/mist(loc) else ismist = 1 - mymist = PoolOrNew(/obj/effect/mist,loc) + mymist = new /obj/effect/mist(loc) else if(ismist) ismist = 1 - mymist = PoolOrNew(/obj/effect/mist,loc) + mymist = new /obj/effect/mist(loc) spawn(250) if(src && !on) qdel(mymist) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 15d6e32213..809dd008a4 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -92,11 +92,11 @@ index = 0 while(index < 2) new shardtype(loc) //todo pooling? - if(reinf) PoolOrNew(/obj/item/stack/rods, loc) + if(reinf) new /obj/item/stack/rods(loc) index++ else new shardtype(loc) //todo pooling? - if(reinf) PoolOrNew(/obj/item/stack/rods, loc) + if(reinf) new /obj/item/stack/rods(loc) qdel(src) return diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index 7cdf301f6c..d0db6e7f08 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -35,7 +35,7 @@ /obj/effect/wingrille_spawn/proc/activate() if(activated) return if (!locate(/obj/structure/grille) in get_turf(src)) - var/obj/structure/grille/G = PoolOrNew(/obj/structure/grille, src.loc) + var/obj/structure/grille/G = new /obj/structure/grille(src.loc) handle_grille_spawn(G) var/list/neighbours = list() for (var/dir in cardinal) @@ -49,7 +49,7 @@ found_connection = 1 qdel(W) if(!found_connection) - var/obj/structure/window/new_win = PoolOrNew(win_path, src.loc) + var/obj/structure/window/new_win = new win_path(src.loc) new_win.set_dir(dir) handle_window_spawn(new_win) else diff --git a/code/game/turfs/initialization/maintenance.dm b/code/game/turfs/initialization/maintenance.dm index 16b1d03d21..558f638588 100644 --- a/code/game/turfs/initialization/maintenance.dm +++ b/code/game/turfs/initialization/maintenance.dm @@ -15,9 +15,10 @@ T.update_dirt() if(prob(2)) - PoolOrNew(junk(), T) + var/type = junk() + new type(T) if(prob(2)) - PoolOrNew(/obj/effect/decal/cleanable/blood/oil, T) + new /obj/effect/decal/cleanable/blood/oil(T) if(prob(25)) // Keep in mind that only "corners" get any sort of web attempt_web(T, cardinal_turfs) @@ -54,7 +55,7 @@ var/global/list/random_junk var/turf/neighbour = get_step(T, dir) if(neighbour && neighbour.density) if(dir == WEST) - PoolOrNew(/obj/effect/decal/cleanable/cobweb, T) + new /obj/effect/decal/cleanable/cobweb(T) if(dir == EAST) - PoolOrNew(/obj/effect/decal/cleanable/cobweb2, T) + new /obj/effect/decal/cleanable/cobweb2(T) return diff --git a/code/game/turfs/turf_flick_animations.dm b/code/game/turfs/turf_flick_animations.dm index 94f5fec4c5..81b248ec0d 100644 --- a/code/game/turfs/turf_flick_animations.dm +++ b/code/game/turfs/turf_flick_animations.dm @@ -5,7 +5,7 @@ location = get_turf(target) if(location && !target) target = location - var/atom/movable/overlay/animation = PoolOrNew(/atom/movable/overlay, location) + var/atom/movable/overlay/animation = new /atom/movable/overlay(location) if(direction) animation.set_dir(direction) animation.icon = a_icon diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index da4e8c9da5..075411cd29 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -183,7 +183,7 @@ /obj/item/rig_module/self_destruct/New() ..() - src.smoke = PoolOrNew(/datum/effect/effect/system/smoke_spread/bad) + src.smoke = new /datum/effect/effect/system/smoke_spread/bad() src.smoke.attach(src) /obj/item/rig_module/self_destruct/Destroy() diff --git a/code/modules/mob/freelook/ai/eye.dm b/code/modules/mob/freelook/ai/eye.dm index 7b0cbde24e..62f0d93152 100644 --- a/code/modules/mob/freelook/ai/eye.dm +++ b/code/modules/mob/freelook/ai/eye.dm @@ -43,7 +43,7 @@ /mob/living/silicon/ai/proc/create_eyeobj(var/newloc) if(eyeobj) destroy_eyeobj() if(!newloc) newloc = src.loc - eyeobj = PoolOrNew(/mob/observer/eye/aiEye, newloc) + eyeobj = new /mob/observer/eye/aiEye(newloc) eyeobj.owner = src eyeobj.name = "[src.name] (AI Eye)" // Give it a name if(client) client.eye = eyeobj diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm index 323d2909fb..a843206e5e 100644 --- a/code/modules/mob/living/bot/floorbot.dm +++ b/code/modules/mob/living/bot/floorbot.dm @@ -221,7 +221,7 @@ if(building == 1) I = new /obj/item/stack/tile/floor(src) else - I = PoolOrNew(/obj/item/stack/rods, src) + I = new /obj/item/stack/rods(src) A.attackby(I, src) target = null busy = 0 diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm index 2079f77a35..ead145e388 100644 --- a/code/modules/mob/living/bot/mulebot.dm +++ b/code/modules/mob/living/bot/mulebot.dm @@ -268,8 +268,8 @@ var/turf/Tsec = get_turf(src) new /obj/item/device/assembly/prox_sensor(Tsec) - PoolOrNew(/obj/item/stack/rods, Tsec) - PoolOrNew(/obj/item/stack/rods, Tsec) + new /obj/item/stack/rods(Tsec) + new /obj/item/stack/rods(Tsec) new /obj/item/stack/cable_coil/cut(Tsec) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 26e1b264fd..9a5bd4e574 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -80,7 +80,7 @@ time_last_drone = world.time if(player.mob && player.mob.mind) player.mob.mind.reset() - var/mob/living/silicon/robot/drone/new_drone = PoolOrNew(drone_type, get_turf(src)) + var/mob/living/silicon/robot/drone/new_drone = new drone_type(get_turf(src)) new_drone.transfer_personality(player) new_drone.master_fabricator = src diff --git a/code/modules/mob/living/simple_animal/aliens/drone.dm b/code/modules/mob/living/simple_animal/aliens/drone.dm index 06de6b4d14..186afd6ed3 100644 --- a/code/modules/mob/living/simple_animal/aliens/drone.dm +++ b/code/modules/mob/living/simple_animal/aliens/drone.dm @@ -176,16 +176,16 @@ step_to(O, get_turf(pick(view(7, src)))) //rods - O = PoolOrNew(/obj/item/stack/rods, src.loc) + O = new /obj/item/stack/rods(src.loc) step_to(O, get_turf(pick(view(7, src)))) if(prob(75)) - O = PoolOrNew(/obj/item/stack/rods, src.loc) + O = new /obj/item/stack/rods(src.loc) step_to(O, get_turf(pick(view(7, src)))) if(prob(50)) - O = PoolOrNew(/obj/item/stack/rods, src.loc) + O = new /obj/item/stack/rods(src.loc) step_to(O, get_turf(pick(view(7, src)))) if(prob(25)) - O = PoolOrNew(/obj/item/stack/rods, src.loc) + O = new /obj/item/stack/rods(src.loc) step_to(O, get_turf(pick(view(7, src)))) //plasteel diff --git a/code/modules/mob/living/simple_animal/animals/giant_spider.dm b/code/modules/mob/living/simple_animal/animals/giant_spider.dm index acb1d7a1b7..e2c833000e 100644 --- a/code/modules/mob/living/simple_animal/animals/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/animals/giant_spider.dm @@ -103,7 +103,7 @@ if(istype(I, /obj/effect/spider/eggcluster)) eggcount ++ if(!eggcount) - var/eggs = PoolOrNew(/obj/effect/spider/eggcluster/small, list(O, src)) + var/eggs = new /obj/effect/spider/eggcluster/small(O, src) O.implants += eggs H << "The [src] injects something into your [O.name]!" @@ -172,7 +172,7 @@ if(busy == LAYING_EGGS) E = locate() in get_turf(src) if(!E) - PoolOrNew(/obj/effect/spider/eggcluster, list(loc, src)) + new /obj/effect/spider/eggcluster(loc, src) fed-- busy = 0 stop_automated_movement = 0 diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm index 3283e67f7d..41f0619187 100644 --- a/code/modules/paperwork/papershredder.dm +++ b/code/modules/paperwork/papershredder.dm @@ -123,7 +123,7 @@ if(!paperamount) return paperamount-- - return PoolOrNew(/obj/item/weapon/shreddedp, get_turf(src)) + return new /obj/item/weapon/shreddedp(get_turf(src)) /obj/machinery/papershredder/power_change() ..() @@ -185,5 +185,5 @@ var/mob/living/M = loc if(istype(M)) M.drop_from_inventory(src) - PoolOrNew(/obj/effect/decal/cleanable/ash,get_turf(src)) + new /obj/effect/decal/cleanable/ash(get_turf(src)) qdel(src) diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 033b406510..ebb786c60e 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -38,7 +38,7 @@ playsound(src, 'sound/effects/snap.ogg', 50, 1) src.visible_message("\The [src] explodes in a bright flash!") - var/datum/effect/effect/system/spark_spread/sparks = PoolOrNew(/datum/effect/effect/system/spark_spread) + var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread() sparks.set_up(2, 1, T) sparks.start() diff --git a/code/modules/random_map/automata/diona.dm b/code/modules/random_map/automata/diona.dm index 523f688038..e9e58a03a4 100644 --- a/code/modules/random_map/automata/diona.dm +++ b/code/modules/random_map/automata/diona.dm @@ -38,7 +38,7 @@ if(1) new_growth = 2 var/obj/structure/diona/vines/existing = locate() in T - if(!istype(existing)) existing = PoolOrNew(/obj/structure/diona/vines, T) + if(!istype(existing)) existing = new /obj/structure/diona/vines(T) if(existing.growth < new_growth) existing.growth = new_growth existing.update_icon() @@ -161,11 +161,11 @@ switch(value) if(ARTIFACT_CHAR) - PoolOrNew(/obj/structure/diona/bulb,T) + new /obj/structure/diona/bulb(T) if(MONSTER_CHAR) spawn_diona_nymph(T) if(DOOR_CHAR) - var/obj/structure/diona/vines/V = PoolOrNew(/obj/structure/diona/vines,T) + var/obj/structure/diona/vines/V = new /obj/structure/diona/vines(T) V.growth = 3 V.update_icon() spawn(1) diff --git a/code/modules/spells/spell_projectile.dm b/code/modules/spells/spell_projectile.dm index c94131b252..07adda0081 100644 --- a/code/modules/spells/spell_projectile.dm +++ b/code/modules/spells/spell_projectile.dm @@ -26,7 +26,7 @@ /obj/item/projectile/spell_projectile/before_move() if(proj_trail && src && src.loc) //pretty trails - var/obj/effect/overlay/trail = PoolOrNew(/obj/effect/overlay, src.loc) + var/obj/effect/overlay/trail = new /obj/effect/overlay(src.loc) trails += trail trail.icon = proj_trail_icon trail.icon_state = proj_trail_icon_state diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 80eb2f1a44..4da307cb91 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -139,7 +139,7 @@ /obj/vehicle/emp_act(severity) var/was_on = on stat |= EMPED - var/obj/effect/overlay/pulse2 = PoolOrNew(/obj/effect/overlay, src.loc) + var/obj/effect/overlay/pulse2 = new /obj/effect/overlay(src.loc) pulse2.icon = 'icons/effects/effects.dmi' pulse2.icon_state = "empdisable" pulse2.name = "emp sparks" @@ -192,8 +192,8 @@ src.visible_message("\red [src] blows apart!", 1) var/turf/Tsec = get_turf(src) - PoolOrNew(/obj/item/stack/rods, Tsec) - PoolOrNew(/obj/item/stack/rods, Tsec) + new /obj/item/stack/rods(Tsec) + new /obj/item/stack/rods(Tsec) new /obj/item/stack/cable_coil/cut(Tsec) if(cell) diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 3be0dfbca2..f6a4200654 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -244,7 +244,7 @@ apply_material_decorations = 0 if(23) apply_prefix = 0 - new_item = PoolOrNew(/obj/item/stack/rods, src.loc) + new_item = new /obj/item/stack/rods(src.loc) apply_image_decorations = 0 apply_material_decorations = 0 if(24) diff --git a/polaris.dme b/polaris.dme index 23fc2fc0c4..15a221dade 100644 --- a/polaris.dme +++ b/polaris.dme @@ -47,7 +47,6 @@ #include "code\_compatibility\509\type2type.dm" #include "code\_helpers\_global_objects.dm" #include "code\_helpers\atmospherics.dm" -#include "code\_helpers\datum_pool.dm" #include "code\_helpers\files.dm" #include "code\_helpers\game.dm" #include "code\_helpers\global_lists.dm"