diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm index 3bb8a9bda9e..74a36cfee11 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm @@ -114,7 +114,7 @@ A.fired() */ proc/Emit() - var/obj/item/projectile/beam/emitter/A = getFromPool(/obj/item/projectile/beam/emitter, loc) + var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter(src.loc) A.frequency = frequency A.damage = mega_energy * 500 playsound(get_turf(src), 'sound/weapons/emitter.ogg', 25, 1) diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm index ee2b787f7fb..7039b393cfe 100644 --- a/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm +++ b/code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm @@ -92,7 +92,7 @@ src.fire_delay = rand(20,100) src.shot_number = 0 use_power(1000) - var/obj/item/projectile/beam/emitter/A = getFromPool(/obj/item/projectile/beam/emitter, loc) + var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter(src.loc) playsound(get_turf(src), 'sound/weapons/emitter.ogg', 25, 1) if(prob(35)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index caa4d1c62f4..715b8eda90e 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -270,7 +270,7 @@ var/turf/T = get_turf(src) var/turf/U = get_turf(A) - var/obj/item/projectile/beam/LE = getFromPool(/obj/item/projectile/beam, loc) + var/obj/item/projectile/beam/LE = new /obj/item/projectile/beam(loc) LE.icon = 'icons/effects/genetics.dmi' LE.icon_state = "eyelasers" playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1) @@ -311,7 +311,7 @@ "You hear the loud crackle of electricity!") var/datum/powernet/PN = cable.get_powernet() var/available = 0 - var/obj/item/projectile/beam/lightning/L = getFromPool(/obj/item/projectile/beam/lightning, loc) + var/obj/item/projectile/beam/lightning/L = new /obj/item/projectile/beam/lightning/(get_turf(src)) if(PN) available = PN.avail L.damage = PN.get_electrocute_damage() @@ -337,8 +337,7 @@ s.set_up(5, 1, src) s.start() if(L.damage <= 0) - //del(L) - returnToPool(L) + del(L) if(L) playsound(get_turf(src), 'sound/effects/eleczap.ogg', 75, 1) L.tang = L.adjustAngle(get_angle(U,T)) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1eb52770f20..1a852f8da12 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -168,7 +168,7 @@ its easier to just keep the beam vertical. //Maxdistance is the longest range the beam will persist before it gives up. var/EndTime=world.time+time var/broken = 0 - var/obj/item/projectile/beam/lightning/light = getFromPool(/obj/item/projectile/beam/lightning) + var/obj/item/projectile/beam/lightning/light = new while(BeamTarget&&world.time