mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-24 08:02:57 +00:00
5494f5328a
This reduces confusion arising from the fact byond already has a built in byond proc also named Bump. We used an argument called yes to distinguish our Bump from byond's builtin bump, but then we failed to make sure everyone of our bumps properly override it, so a bunch of things have been double bumping This resolves that issue permanently I've also removed the second argument as it no longer has a purpose I also cleaned up the recycler bump as it didn't do anything the parent procs didn't already do
63 lines
1.3 KiB
Plaintext
63 lines
1.3 KiB
Plaintext
/obj/effect/accelerated_particle
|
|
name = "Accelerated Particles"
|
|
desc = "Small things moving very fast."
|
|
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
|
icon_state = "particle"
|
|
anchored = TRUE
|
|
density = FALSE
|
|
var/movement_range = 10
|
|
var/energy = 10
|
|
var/speed = 1
|
|
|
|
/obj/effect/accelerated_particle/weak
|
|
movement_range = 8
|
|
energy = 5
|
|
|
|
/obj/effect/accelerated_particle/strong
|
|
movement_range = 15
|
|
energy = 15
|
|
|
|
/obj/effect/accelerated_particle/powerful
|
|
movement_range = 20
|
|
energy = 50
|
|
|
|
|
|
/obj/effect/accelerated_particle/New(loc)
|
|
..()
|
|
|
|
addtimer(CALLBACK(src, .proc/move), 1)
|
|
|
|
|
|
/obj/effect/accelerated_particle/Collide(atom/A)
|
|
if(A)
|
|
if(isliving(A))
|
|
toxmob(A)
|
|
else if(istype(A, /obj/machinery/the_singularitygen))
|
|
var/obj/machinery/the_singularitygen/S = A
|
|
S.energy += energy
|
|
else if(istype(A, /obj/singularity))
|
|
var/obj/singularity/S = A
|
|
S.energy += energy
|
|
|
|
|
|
/obj/effect/accelerated_particle/Crossed(atom/A)
|
|
if(isliving(A))
|
|
toxmob(A)
|
|
|
|
|
|
/obj/effect/accelerated_particle/ex_act(severity, target)
|
|
qdel(src)
|
|
|
|
/obj/effect/accelerated_particle/proc/toxmob(mob/living/M)
|
|
M.rad_act(energy*6)
|
|
|
|
/obj/effect/accelerated_particle/proc/move()
|
|
if(!step(src,dir))
|
|
forceMove(get_step(src,dir))
|
|
movement_range--
|
|
if(movement_range == 0)
|
|
qdel(src)
|
|
else
|
|
sleep(speed)
|
|
move()
|