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/datums/forced_movement.dm
+1 -1
View File
@@ -82,7 +82,7 @@
. = . && (vic.loc != tar.loc)
/mob/Bump(atom/A)
/mob/Collide(atom/A)
. = ..()
if(force_moving && force_moving.allow_climbing && istype(A,/obj/structure))
var/obj/structure/S = A