From 6d44eea0783859a3307ccbcd6a971506ca7f3773 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Thu, 19 Jun 2014 18:11:39 -0400
Subject: [PATCH] Updates l_move_time to use world.time

---
 code/game/atoms_movable.dm                    | 4 ++--
 code/modules/mob/living/carbon/human/human.dm | 2 +-
 code/modules/organs/organ.dm                  | 2 +-
 code/modules/vehicles/vehicle.dm              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 3ccb3547a86..63ccc18fcc6 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -15,8 +15,8 @@
 /atom/movable/Move()
 	var/atom/A = src.loc
 	. = ..()
-	src.move_speed = world.timeofday - src.l_move_time
-	src.l_move_time = world.timeofday
+	src.move_speed = world.time - src.l_move_time
+	src.l_move_time = world.time
 	src.m_flag = 1
 	if ((A != src.loc && A && A.z == src.z))
 		src.last_move = get_dir(A, src.loc)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3cacd168704..23b37ebf1a3 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1371,7 +1371,7 @@
 		return
 
 	usr << "Don't move until counting is finished."
-	var/time = world.timeofday
+	var/time = world.time
 	sleep(60)
 	if(usr.l_move_time >= time)	//checks if our mob has moved during the sleep()
 		usr << "You moved while counting. Try again."
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index a51d99b8cb8..9f74d34ba84 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -74,7 +74,7 @@
 
 			//Moving around with fractured ribs won't do you any good
 			if (broken && E.internal_organs && prob(15))
-				if (!lying && world.timeofday - l_move_time < 15)
+				if (!lying && world.time - l_move_time < 15)
 					var/datum/organ/internal/I = pick(E.internal_organs)
 					custom_pain("You feel broken bones moving in your [E.display_name]!", 1)
 					I.take_damage(rand(3,5))
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 814c54383a6..ea977845559 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -37,7 +37,7 @@
 	//spawn the cell you want in each vehicle
 
 /obj/vehicle/Move()
-	if(world.timeofday > l_move_time + move_delay)
+	if(world.time > l_move_time + move_delay)
 		if(on && powered && cell.charge < power_use)
 			turn_off()