diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b147fc2cee..d9a22674ae 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -692,12 +692,11 @@
 		log_combat(src, old_pulled, "[success? "successfully broke free of" : "failed to resist"] a grab of strength [old_gs][moving_resist? " (moving)":""][forced? " (forced)":""]")
 	return success
 
-	/*!
-	 * Proc that actually does the grab resisting. Return TRUE if successful. Does not check that a grab exists! Use attempt_resist_grab() instead of this in general!
-	 * Forced is if something other than the user mashing movement keys/pressing resist button did it, silent is if it makes messages (like "attempted to resist" and "broken free").
-	 * Forced does NOT force success!
-	 */
-
+/*!
+ * Proc that actually does the grab resisting. Return TRUE if successful. Does not check that a grab exists! Use attempt_resist_grab() instead of this in general!
+ * Forced is if something other than the user mashing movement keys/pressing resist button did it, silent is if it makes messages (like "attempted to resist" and "broken free").
+ * Forced does NOT force success!
+ */
 /mob/proc/do_resist_grab(moving_resist, forced, silent = FALSE)
 	return FALSE
 
diff --git a/code/modules/mob/living/living_mobility.dm b/code/modules/mob/living/living_mobility.dm
index 9a350a0871..4b2afd0448 100644
--- a/code/modules/mob/living/living_mobility.dm
+++ b/code/modules/mob/living/living_mobility.dm
@@ -124,12 +124,12 @@
 		DISABLE_BITFIELD(mobility_flags, MOBILITY_USE)
 
 	//Handle update-effects.
-	if(!(mobility_flags & MOBILITY_HOLD))
+	if(!CHECK_MOBILITY(src, MOBILITY_HOLD))
 		drop_all_held_items()
-	if(!(mobility_flags & MOBILITY_PULL))
+	if(!CHECK_MOBILITY(src, MOBILITY_PULL))
 		if(pulling)
 			stop_pulling()
-	if(!(mobility_flags & MOBILITY_UI))
+	if(!CHECK_MOBILITY(src, MOBILITY_UI))
 		unset_machine()
 
 	if(isliving(pulledby))
@@ -149,7 +149,7 @@
 	lying_prev = lying
 
 	//Handle citadel autoresist
-	if((mobility_flags & MOBILITY_MOVE) && !intentionalresting && canstand_involuntary && iscarbon(src) && client?.prefs?.autostand)//CIT CHANGE - adds autostanding as a preference
+	if(CHECK_MOBILITY(src, MOBILITY_MOVE) && !intentionalresting && canstand_involuntary && iscarbon(src) && client?.prefs?.autostand)//CIT CHANGE - adds autostanding as a preference
 		addtimer(CALLBACK(src, .proc/resist_a_rest, TRUE), 0) //CIT CHANGE - ditto
 
 	return mobility_flags