s

code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm

@@ -1,9 +1,5 @@
-
-
 // organ_internal.dm   --   /obj/item/organ
 
-
-
 // Do I have a stake in my heart?
 /mob/living/AmStaked()
 	var/obj/item/bodypart/BP = get_bodypart("chest")
@@ -13,16 +9,14 @@
 		if (istype(I,/obj/item/stake/))
 			return TRUE
 	return FALSE
+
 /mob/proc/AmStaked()
 	return FALSE
 
-
 /mob/living/proc/StakeCanKillMe()
-	return IsSleeping() || stat >= UNCONSCIOUS || blood_volume <= 0 || HAS_TRAIT(src, TRAIT_DEATHCOMA) // NOTE: You can't go to sleep in a coffin with a stake in you.
+	return _REFACTORING_IsSleeping() || stat >= UNCONSCIOUS || blood_volume <= 0 || HAS_TRAIT(src, TRAIT_DEATHCOMA) // NOTE: You can't go to sleep in a coffin with a stake in you.
 
-
-///obj/item/weapon/melee/stake
-/obj/item/stake/
+/obj/item/stake
 	name = "wooden stake"
 	desc = "A simple wooden stake carved to a sharp point."
 	icon = 'icons/obj/items_and_weapons.dmi'
@@ -113,7 +107,7 @@
 // Can this target be staked? If someone stands up before this is complete, it fails. Best used on someone stationary.
 /mob/living/carbon/proc/can_be_staked()
 	//return resting || IsKnockdown() || IsUnconscious() || (stat && (stat != SOFT_CRIT || pulledby)) || (has_trait(TRAIT_FAKEDEATH)) || resting || IsStun() || IsFrozen() || (pulledby && pulledby.grab_state >= GRAB_NECK)
-	return (src.resting || src.lying)
+	return !CHECK_MOBILITY(src, MOBILITY_STAND)
 	// ABOVE:  Taken from update_mobility() in living.dm
 
 /obj/item/stake/hardened

code/modules/antagonists/bloodsucker/powers/bs_lunge.dm

@@ -61,7 +61,7 @@
 
 	walk_towards(owner, T, 0.1, 10) // NOTE: this runs in the background! to cancel it, you need to use walk(owner.current,0), or give them a new path.
 	addtimer(CALLBACK(owner, .proc/_walk, 0), 2 SECONDS)
-	if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && owner.resting)
+	if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && !CHECK_MOBILITY(owner, MOBILITY_STAND))
 		var/send_dir = get_dir(owner, T)
 		new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
 		owner.spin(10)

code/modules/mob/living/silicon/pai/update_icon.dm

@@ -7,7 +7,7 @@
 		icon = dynamic_chassis_icons[dynamic_chassis]
 		var/list/states = icon_states(icon)
 		icon_state = ""
-		if(resting)		//The next line is some bullshit but I can make it worse if you want and make it a single line instead of four.. :)
+		if(_REFACTORING_resting)		//The next line is some bullshit but I can make it worse if you want and make it a single line instead of four.. :)
 			if(dynamic_chassis_sit && ("sit") in states)
 				icon_state = "sit"
 			else if(dynamic_chassis_bellyup && ("bellyup") in states)