diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index 0435c8ff693..daaee3f31a3 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -26,10 +26,6 @@ movement_range = 15 energy = 15 -/obj/effect/accelerated_particle/powerful - movement_range = 20 - energy = 50 - /obj/effect/accelerated_particle/New(loc, dir = 2) src.loc = loc @@ -105,7 +101,7 @@ src.loc = get_step(src,dir) movement_range-- if(movement_range <= 0) - qdel(src) + del(src) else sleep(lag) move(lag) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 833b878bda3..ed441450ca8 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -71,12 +71,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin var/strength = null var/desc_holder = null -/obj/structure/particle_accelerator/Destroy() - construction_state = 0 - if(master) - master.part_scan() - ..() - /obj/structure/particle_accelerator/end_cap name = "Alpha Particle Generation Array" desc_holder = "This is where Alpha particles are generated from \[REDACTED\]" diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 20c276d98be..a7aeffe9508 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -26,10 +26,6 @@ connected_parts = list() ..() -/obj/machinery/particle_accelerator/control_box/Destroy() - if(active) - toggle_power() - ..() /obj/machinery/particle_accelerator/control_box/attack_hand(mob/user as mob) if(construction_state >= 3) @@ -236,7 +232,7 @@ var/dat = "" dat += "Particle Accelerator Control Panel
" dat += "Close

" - dat += "

Status

" + dat += "Status:
" if(!assembled) dat += "Unable to detect all parts!
" dat += "Run Scan

" @@ -251,10 +247,6 @@ dat += "Particle Strength: [src.strength] " dat += "--|++

" - //user << browse(dat, "window=pacontrol;size=420x500") - //onclose(user, "pacontrol") - var/datum/browser/popup = new(user, "pacontrol", name, 420, 500) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() + user << browse(dat, "window=pacontrol;size=420x500") + onclose(user, "pacontrol") return \ No newline at end of file diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index 8e260a1115d..f91b92a55e9 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -43,8 +43,6 @@ A = new/obj/effect/accelerated_particle(T, dir) if(2) A = new/obj/effect/accelerated_particle/strong(T, dir) - if(3) - A = new/obj/effect/accelerated_particle/powerful(T, dir) if(A) A.dir = src.dir return 1