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 21:35:56 -07: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/game/gamemodes/clock_cult/clock_mobs/anima_fragment.dm
+1 -1
View File
@@ -49,7 +49,7 @@
/mob/living/simple_animal/hostile/clockwork/fragment/Process_Spacemove(movement_dir = 0)
return 1
/mob/living/simple_animal/hostile/clockwork/fragment/Bump(atom/movable/AM)
/mob/living/simple_animal/hostile/clockwork/fragment/Collide(atom/movable/AM)
. = ..()
if(movement_delay_time <= world.time && next_move <= world.time && isliving(AM) && !is_servant_of_ratvar(AM))
var/mob/living/L = AM