love to work with merge conflicts

This commit is contained in:
Linzolle
2019-08-24 20:27:47 -05:00
parent 5e94a5db80
commit 9651ae45b1
@@ -1,4 +1,3 @@
<<<<<<< HEAD
/mob/living/Moved()
. = ..()
update_turf_movespeed(loc)