cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dev merge.

Browse Source
This commit is contained in:
Zuhayr
2015-05-11 18:35:02 +09:30
parent bc50ba5166 dcdc0a4862
commit e28acd5045
182 changed files with 2647 additions and 2741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/power/singularity/act.dm
View File

@@ -38,17 +38,19 @@
..()
/obj/singularity_act()
ex_act(1)
if(src)
qdel(src)
return 2
if(simulated)
ex_act(1)
if(src)
qdel(src)
return 2
/obj/singularity_pull(S, current_size)
if(anchored)
if(current_size >= STAGE_FIVE)
if(simulated)
if(anchored)
if(current_size >= STAGE_FIVE)
step_towards(src, S)
else
step_towards(src, S)
else
step_towards(src, S)
/obj/effect/beam/singularity_pull()
return