cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #724 from CHOMPStationBot/upstream-merge-9221

Browse Source 
[MIRROR] [MIRROR] Make the tesla ball eventually run out of energy
This commit is contained in:
Nadyr
2020-10-22 10:03:06 -04:00
committed by GitHub
parent 6f4897702e 640a68a71b
commit 9205e50340
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/energy_ball.dm
+3 -3
View File
@@ -112,7 +112,7 @@
var/Orchiectomy_target = pick(orbiting_balls)
qdel(Orchiectomy_target)
else if(orbiting_balls.len)
else
dissipate() //sing code has a much better system.
/obj/singularity/energy_ball/proc/new_mini_ball()
@@ -140,14 +140,14 @@
if (istype(target))
target.orbiting_balls += src
//TODO-LESH-DEL global.poi_list -= src
target.dissipate_strength = target.orbiting_balls.len
target.dissipate_strength = target.orbiting_balls.len + 1
. = ..()
/obj/singularity/energy_ball/stop_orbit()
if (orbiting && istype(orbiting.orbiting, /obj/singularity/energy_ball))
var/obj/singularity/energy_ball/orbitingball = orbiting.orbiting
orbitingball.orbiting_balls -= src
orbitingball.dissipate_strength = orbitingball.orbiting_balls.len
orbitingball.dissipate_strength = orbitingball.orbiting_balls.len + 1
..()
if (!loc && !QDELETED(src))
qdel(src)