mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 08:01:06 +00:00
a86398d0d2
This PR rips out the old Bump() and Bumped() procs and replaces them with Collide() and CollidedWith() respectively. Behavior should be the same, but Bump() should no longer be double-called, and no longer relies on spawns. Other changes: LAssailant is now a weakref. Some direct loc setting are now forceMove().
88 lines
2.0 KiB
Plaintext
88 lines
2.0 KiB
Plaintext
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
|
|
|
|
/obj/effect/accelerated_particle
|
|
name = "Accelerated Particles"
|
|
desc = "Small things moving very fast."
|
|
icon = 'icons/obj/machines/particle_accelerator.dmi'
|
|
icon_state = "particle"//Need a new icon for this
|
|
anchored = 1
|
|
density = 1
|
|
var/movement_range = 10
|
|
var/energy = 10 //energy in eV
|
|
var/mega_energy = 0 //energy in MeV
|
|
var/frequency = 1
|
|
var/ionizing = 0
|
|
var/particle_type
|
|
var/additional_particles = 0
|
|
var/turf/target
|
|
var/turf/source
|
|
var/movetotarget = 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/New(loc, dir = 2)
|
|
src.loc = loc
|
|
src.set_dir(dir)
|
|
if(movement_range > 20)
|
|
movement_range = 20
|
|
spawn(0)
|
|
move(1)
|
|
return
|
|
|
|
|
|
/obj/effect/accelerated_particle/Collide(atom/A)
|
|
. = ..()
|
|
if (A)
|
|
if(ismob(A))
|
|
toxmob(A)
|
|
if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/singularity/)))
|
|
A:energy += energy
|
|
return
|
|
|
|
/obj/effect/accelerated_particle/CollidedWith(atom/A)
|
|
. = ..()
|
|
if(ismob(A))
|
|
toxmob(A)
|
|
|
|
|
|
/obj/effect/accelerated_particle/ex_act(severity)
|
|
qdel(src)
|
|
return
|
|
|
|
|
|
|
|
/obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M)
|
|
var/radiation = (energy*2)
|
|
M.apply_effect((radiation*3),IRRADIATE,blocked = M.getarmor(null, "rad"))
|
|
M.updatehealth()
|
|
//M << "\red You feel odd."
|
|
return
|
|
|
|
|
|
/obj/effect/accelerated_particle/proc/move(var/lag)
|
|
if(target)
|
|
if(movetotarget)
|
|
if(!step_towards(src,target))
|
|
src.loc = get_step(src, get_dir(src,target))
|
|
if(get_dist(src,target) < 1)
|
|
movetotarget = 0
|
|
else
|
|
if(!step(src, get_step_away(src,source)))
|
|
src.loc = get_step(src, get_step_away(src,source))
|
|
else
|
|
if(!step(src,dir))
|
|
src.loc = get_step(src,dir)
|
|
movement_range--
|
|
if(movement_range <= 0)
|
|
qdel(src)
|
|
else
|
|
sleep(lag)
|
|
move(lag)
|