shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Rename Bump to Collide (#2002)

Browse Source 
* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
This commit is contained in:
CitadelStationBot
2017-07-14 23:35:56 -05:00
committed by kevinz000
parent 80d06fe843
commit 2d3905457e
37 changed files with 78 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/tesla/energy_ball.dm
+1 -1
View File
@@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
/obj/singularity/energy_ball/Bump(atom/A)
/obj/singularity/energy_ball/Collide(atom/A)
dust_mobs(A)
/obj/singularity/energy_ball/Bumped(atom/A)