compile

code/game/objects/buckling.dm

@@ -66,7 +66,7 @@
 	M.buckled = src
 	M.setDir(dir)
 	buckled_mobs |= M
-	M.update_canmove()
+	M.update_mobility()
 	M.throw_alert("buckled", /obj/screen/alert/restrained/buckled)
 	post_buckle_mob(M)
 

code/game/objects/items.dm

@@ -177,14 +177,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	set category = "Object"
 	set src in oview(1)
 
-	if(!isturf(loc) || usr.stat || usr.restrained() || !usr.canmove)
+	var/mob/living/L = usr
+	if(!istype(L) || !isturf(loc) || !CHECK_MOBILITY(L, MOBILITY_USE))
 		return
 
-	var/turf/T = src.loc
-
-	src.loc = null
-
-	src.loc = T
+	var/turf/T = loc
+	loc = null
+	loc = T
 
 /obj/item/examine(mob/user) //This might be spammy. Remove?
 	. = ..()

code/game/objects/items/religion.dm

@@ -64,8 +64,7 @@
 /obj/item/banner/proc/inspiration(mob/living/carbon/human/H)
 	H.adjustBruteLoss(-15)
 	H.adjustFireLoss(-15)
-	H.AdjustStun(-40)
-	H.AdjustKnockdown(-40)
+	H.AdjustAllImmobility(-40)
 	H.AdjustUnconscious(-40)
 	playsound(H, 'sound/magic/staff_healing.ogg', 25, FALSE)
 

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

@@ -99,7 +99,7 @@
 					else
 						user.visible_message("<span class='warning'>[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...</span>", \
 								"<span class='warning'>You hug [M] firmly to make [M.p_them()] feel better! [M] looks uncomfortable...</span>")
-					if(M.resting && !M.recoveringstam)
+					if(!CHECK_MOBILITY(M, MOBILITY_STAND) && !M.recoveringstam)
 						M.set_resting(FALSE, TRUE)
 				else
 					user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \

code/game/objects/structures.dm

@@ -45,7 +45,8 @@
 	if(!climbable)
 		return
 	if(user == O && iscarbon(O))
-		if(user.canmove)
+		var/mob/living/L = O
+		if(CHECK_MOBILITY(O, MOBILITY_MOVE))
 			climb_structure(user)
 			return
 	if(!istype(O, /obj/item) || user.get_active_held_item() != O)

code/game/objects/structures/transit_tubes/station.dm

@@ -44,7 +44,7 @@
 
 //pod insertion
 /obj/structure/transit_tube/station/MouseDrop_T(obj/structure/c_transit_tube_pod/R, mob/living/user)
-	if(!istype(user) || !CHECK_MOBILLITY(user, MOBILITY_USE))
+	if(!istype(user) || !CHECK_MOBILITY(user, MOBILITY_USE))
 		return
 	if(!istype(R) || get_dist(user, src) > 1 || get_dist(src,R) > 1)
 		return