compile

code/__HELPERS/time.dm

@@ -81,3 +81,6 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
 	if(!wtime)
 		wtime = world.time
 	return time2text(wtime - GLOB.timezoneOffset, format)
+
+/proc/station_time_timestamp(format = "hh:mm:ss", wtime)
+	return time2text(station_time(TRUE, wtime), format)

code/datums/brain_damage/severe.dm

@@ -132,7 +132,7 @@
 
 /datum/brain_trauma/severe/narcolepsy/on_life()
 	..()
-	if(owner.IsSleeping())
+	if(owner._REFACTORING_IsSleeping())
 		return
 	var/sleep_chance = 1
 	if(owner.m_intent == MOVE_INTENT_RUN)

code/game/machinery/pipe/pipe_dispenser.dm

@@ -34,7 +34,8 @@
 /obj/machinery/pipedispenser/Topic(href, href_list)
 	if(..())
 		return 1
-	if(!anchored|| !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
+	var/mob/living/L = usr
+	if(!anchored || !istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
 		usr << browse(null, "window=pipedispenser")
 		return 1
 	usr.set_machine(src)

code/game/mecha/mecha.dm

@@ -750,7 +750,7 @@
 	AI.cancel_camera()
 	AI.controlled_mech = src
 	AI.remote_control = src
-	AI.mobility_flags = MOBILITY_FLAG_DEFAULT //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow.
+	AI.mobility_flags = MOBILITY_FLAGS_DEFAULT //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow.
 	AI.can_shunt = 0 //ONE AI ENTERS. NO AI LEAVES.
 	to_chat(AI, AI.can_dominate_mechs ? "<span class='announce'>Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!</span>" :\
 		"<span class='notice'>You have been uploaded to a mech's onboard computer.</span>")

code/game/objects/items/robot/robot_parts.dm

@@ -356,8 +356,7 @@
 			forceMove(O)
 			O.robot_suit = src
 			if(!locomotion)
-				O.locked_down = TRUE
-				O.update_canmove()
+				O.SetLockdown(TRUE)
 
 	else if(istype(W, /obj/item/pen))
 		to_chat(user, "<span class='warning'>You need to use a multitool to name [src]!</span>")

code/modules/mob/dead/observer/observer.dm

@@ -11,7 +11,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	layer = GHOST_LAYER
 	stat = DEAD
 	density = FALSE
-	canmove = 0
+	mobility_flags = NONE
 	anchored = TRUE	//  don't get pushed around
 	see_invisible = SEE_INVISIBLE_OBSERVER
 	see_in_dark = 100

code/modules/mob/living/carbon/alien/alien_defense.dm

@@ -26,7 +26,7 @@ In all, this is a lot like the monkey code. /N
 			AdjustAllImmobility(-60, FALSE)
 			AdjustUnconscious(-60, FALSE)
 			AdjustSleeping(-100, FALSE)
-			update_mobililty()
+			update_mobility()
 			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake [p_them()] up!</span>")
 		if(INTENT_DISARM, INTENT_HARM)
 			if(health > 0)

code/modules/mob/living/silicon/robot/robot_defense.dm

@@ -136,7 +136,7 @@
 
 /mob/living/silicon/robot/proc/beep_boop_rogue_bot(mob/user)
 	SetEmagged(1)
-	SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
+	_REFACTORING_SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
 	lawupdate = 0
 	connected_ai = null
 	message_admins("[ADMIN_LOOKUPFLW(user)] emagged cyborg [ADMIN_LOOKUPFLW(src)].  Laws overridden.")

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -38,8 +38,8 @@
 	. = ..()
 	verbs += /mob/living/proc/lay_down
 
-/mob/living/simple_animal/pet/cat/update_canmove()
-	..()
+/mob/living/simple_animal/pet/cat/update_mobility()
+	. = ..()
 	if(client && stat != DEAD)
 		if(!CHECK_BITFIELD(mobility_flags, MOBILITY_STAND))
 			icon_state = "[icon_living]_rest"

code/modules/mob/living/status_procs.dm

@@ -545,7 +545,7 @@
 		emote("deathgasp")
 	ADD_TRAIT(src, TRAIT_FAKEDEATH, source)
 	ADD_TRAIT(src, TRAIT_DEATHCOMA, source)
-	tod = station_time_timestamp()
+	tod = gameTimestamp()
 	update_stat()
 
 /mob/living/proc/unignore_slowdown(source)

code/modules/vehicles/cars/car.dm

@@ -29,8 +29,8 @@
 	last_enginesound_time = world.time
 	playsound(src, engine_sound, 100, TRUE)
 
-/obj/vehicle/sealed/car/MouseDrop_T(atom/dropping, mob/M)
-	if(!M.canmove || M.stat || M.restrained())
+/obj/vehicle/sealed/car/MouseDrop_T(atom/dropping, mob/living/M)
+	if(!istype(M) || !CHECK_MOBILITY(M, MOBILITY_USE))
 		return FALSE
 	if(isliving(dropping) && M != dropping)
 		var/mob/living/L = dropping