refactor tags

code/_onclick/cyborg.dm

@@ -14,7 +14,7 @@
 	if(check_click_intercept(params,A))
 		return
 
-	if(stat || locked_down || IsParalyzed() || _REFACTORING_IsStun() || _REFACTORING_IsUnconscious())
+	if(stat || locked_down || IsParalyzed() || IsStun() || IsUnconscious())
 		return
 
 	var/list/modifiers = params2list(params)

code/_onclick/hud/screen_objects.dm

@@ -406,7 +406,7 @@
 	var/mob/living/user = hud?.mymob
 	if(!istype(user))
 		return
-	if(!user._REFACTORING_resting)
+	if(!user.resting)
 		icon_state = "act_rest"
 	else
 		icon_state = "act_rest0"

code/datums/brain_damage/severe.dm

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

code/datums/components/butchering.dm

@@ -32,7 +32,7 @@
 
 	if(ishuman(M) && source.force && source.get_sharpness())
 		var/mob/living/carbon/human/H = M
-		if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H._REFACTORING_IsSleeping()) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Only sleeping, neck grabbed, or crit, can be sliced.
+		if((H.health <= H.crit_threshold || (user.pulling == H && user.grab_state >= GRAB_NECK) || H.IsSleeping()) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Only sleeping, neck grabbed, or crit, can be sliced.
 			if(H.has_status_effect(/datum/status_effect/neck_slice))
 				user.show_message("<span class='warning'>[H]'s neck has already been already cut, you can't make the bleeding any worse!</span>", 1, \
 								"<span class='warning'>Their neck has already been already cut, you can't make the bleeding any worse!</span>")

code/datums/diseases/advance/symptoms/heal.dm

@@ -253,11 +253,11 @@
 	var/mob/living/M = A.affected_mob
 	if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
 		return power
-	else if(M._REFACTORING_IsUnconscious() || M.stat == UNCONSCIOUS)
+	else if(M.IsUnconscious() || M.stat == UNCONSCIOUS)
 		return power * 0.9
 	else if(M.stat == SOFT_CRIT)
 		return power * 0.5
-	else if(M._REFACTORING_IsSleeping())
+	else if(M.IsSleeping())
 		return power * 0.25
 	else if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
 		to_chat(M, "<span class='warning'>You feel yourself slip into a regenerative coma...</span>")

code/datums/martial/sleeping_carp.dm

@@ -227,7 +227,7 @@
 			H.visible_message("<span class='warning'>[H] collapses!</span>", \
 								   "<span class='userdanger'>Your legs give out!</span>")
 			H.DefaultCombatKnockdown(80)
-		if(H.staminaloss && !H._REFACTORING_IsSleeping())
+		if(H.staminaloss && !H.IsSleeping())
 			var/total_health = (H.health - H.staminaloss)
 			if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
 				H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!</span>", \

code/datums/mutations/body.dm

@@ -99,7 +99,7 @@
 	text_gain_indication = "<span class='danger'>You twitch.</span>"
 
 /datum/mutation/human/tourettes/on_life(mob/living/carbon/human/owner)
-	if(prob(10) && owner.stat == CONSCIOUS && !owner._REFACTORING_IsStun())
+	if(prob(10) && owner.stat == CONSCIOUS && !owner.IsStun())
 		owner.Stun(200)
 		switch(rand(1, 3))
 			if(1)

code/game/machinery/porta_turret/portable_turret.dm

@@ -545,7 +545,7 @@
 	var/obj/item/projectile/A
 	//any emagged turrets drains 2x power and uses a different projectile?
 	if(mode == TURRET_STUN)
-		if(nonlethal_projectile && C && C._REFACTORING_resting)
+		if(nonlethal_projectile && C && C.resting)
 			use_power(reqpower*0.5)
 			A = new nonlethal_projectile(T)
 			playsound(loc, nonlethal_projectile_sound, 75, 1)

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

@@ -80,7 +80,7 @@
 					else
 						user.visible_message("<span class='notice'>[user] hugs [M] to make [M.p_them()] feel better!</span>", \
 								"<span class='notice'>You hug [M] to make [M.p_them()] feel better!</span>")
-					if(M._REFACTORING_resting && !M.recoveringstam)
+					if(M.resting && !M.recoveringstam)
 						M.set_resting(FALSE, TRUE)
 				else
 					user.visible_message("<span class='notice'>[user] pets [M]!</span>", \

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

@@ -14,7 +14,7 @@
 	return FALSE
 
 /mob/living/proc/StakeCanKillMe()
-	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.
+	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.
 
 /obj/item/stake
 	name = "wooden stake"

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

@@ -71,7 +71,7 @@
 				if (rand(0, 5) < level_current)
 					playsound(get_turf(newtarget), "sound/weapons/punch[rand(1,4)].ogg", 15, 1, -1)
 					newtarget.DefaultCombatKnockdown(10 + level_current * 5)
-				if(newtarget._REFACTORING_IsStun())
+				if(newtarget.IsStun())
 					newtarget.spin(10,1)
 					if (rand(0,4))
 						newtarget.drop_all_held_items()

code/modules/clothing/head/misc_special.dm

@@ -282,7 +282,7 @@
 	if(target.get_item_by_slot(SLOT_HEAD) != src)
 		return
 	QDEL_NULL(paranoia)
-	if(!target._REFACTORING_IsUnconscious())
+	if(!target.IsUnconscious())
 		to_chat(target, "<span class='warning'>Your zealous conspirationism rapidly dissipates as the donned hat warps up into a ruined mess. All those theories starting to sound like nothing but a ridicolous fanfare.</span>")
 
 /obj/item/clothing/head/foilhat/attack_hand(mob/user)

code/modules/clothing/spacesuits/chronosuit.dm

@@ -87,7 +87,7 @@
 	if(istype(user))
 		if(to_turf)
 			user.forceMove(to_turf)
-		user._REFACTORING_SetStun(0)
+		user.SetStun(0)
 		user.next_move = 1
 		user.alpha = 255
 		user.update_atom_colour()

code/modules/fields/timestop.dm

@@ -146,7 +146,7 @@
 
 /datum/proximity_monitor/advanced/timestop/proc/unfreeze_mob(mob/living/L)
 	escape_the_negative_zone(L)
-	L._REFACTORING_AdjustStun(-20, TRUE, TRUE)
+	L.AdjustStun(-20, TRUE, TRUE)
 	L.anchored = frozen_mobs[L]
 	frozen_mobs -= L
 	global_frozen_atoms -= L

code/modules/flufftext/Hallucination.dm

@@ -1136,7 +1136,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
 	set waitfor = FALSE
 	..()
 	target.set_screwyhud(SCREWYHUD_DEAD)
-	target._REFACTORING_Knockdown(300)
+	target.Knockdown(300)
 	target.silent += 10
 	to_chat(target, "<span class='deadsay'><b>[target.real_name]</b> has died at <b>[get_area_name(target)]</b>.</span>")
 	if(prob(50))
@@ -1154,7 +1154,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
 			 "i[prob(50)?" fucking":""] hate [pick("blood cult", "clock cult", "revenants", "this round","this","myself","admins","you")]")]\"</span>")
 	sleep(rand(70,90))
 	target.set_screwyhud(SCREWYHUD_NONE)
-	target._REFACTORING_SetKnockdown(0)
+	target.SetKnockdown(0)
 	target.silent = FALSE
 	qdel(src)
 

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -4,7 +4,7 @@
 	for(var/I in overlays_standing)
 		add_overlay(I)
 
-	var/asleep = _REFACTORING_IsSleeping()
+	var/asleep = IsSleeping()
 	if(stat == DEAD)
 		//If we mostly took damage from fire
 		if(fireloss > 125)

code/modules/mob/living/carbon/alien/larva/life.dm

@@ -18,7 +18,7 @@
 		if(health<= -maxHealth || !getorgan(/obj/item/organ/brain))
 			death()
 			return
-		if(_REFACTORING_IsUnconscious() || _REFACTORING_IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || health <= crit_threshold)
+		if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || health <= crit_threshold)
 			if(stat == CONSCIOUS)
 				stat = UNCONSCIOUS
 				blind_eyes(1)

code/modules/mob/living/carbon/alien/larva/update_icons.dm

@@ -14,9 +14,9 @@
 		icon_state = "larva[state]_dead"
 	else if(handcuffed || legcuffed) //This should be an overlay. Who made this an icon_state?
 		icon_state = "larva[state]_cuff"
-	else if(stat == UNCONSCIOUS || lying || _REFACTORING_resting)
+	else if(stat == UNCONSCIOUS || lying || resting)
 		icon_state = "larva[state]_sleep"
-	else if(_REFACTORING_IsStun() || IsParalyzed())
+	else if(IsStun() || IsParalyzed())
 		icon_state = "larva[state]_stun"
 	else
 		icon_state = "larva[state]"

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

@@ -803,7 +803,7 @@
 		if(health <= HEALTH_THRESHOLD_DEAD && !HAS_TRAIT(src, TRAIT_NODEATH))
 			death()
 			return
-		if(_REFACTORING_IsUnconscious() || _REFACTORING_IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT)))
+		if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT)))
 			stat = UNCONSCIOUS
 			blind_eyes(1)
 			if(combatmode)
@@ -965,7 +965,7 @@
 		return FALSE
 	if(hallucinating())
 		return TRUE
-	if(_REFACTORING_IsSleeping())
+	if(IsSleeping())
 		return TRUE
 	if(HAS_TRAIT(src, TRAIT_DUMB))
 		return TRUE

code/modules/mob/living/carbon/monkey/monkey_defense.dm

@@ -79,7 +79,7 @@
 				visible_message("<span class='danger'>[M] has attempted to punch [name]!</span>", \
 					"<span class='userdanger'>[M] has attempted to punch [name]!</span>", null, COMBAT_MESSAGE_RANGE)
 		if(INTENT_DISARM)
-			if(!_REFACTORING_IsUnconscious())
+			if(!IsUnconscious())
 				M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
 				if (prob(25))
 					DefaultCombatKnockdown(40)

code/modules/mob/living/living.dm

@@ -416,7 +416,7 @@
 	set name = "Sleep"
 	set category = "IC"
 
-	if(_REFACTORING_IsSleeping())
+	if(IsSleeping())
 		to_chat(src, "<span class='notice'>You are already sleeping.</span>")
 		return
 	else
@@ -674,7 +674,7 @@
 		if(on_fire)
 			resist_fire() //stop, drop, and roll
 			return
-		if(_REFACTORING_resting) //cit change - allows resisting out of resting
+		if(resting) //cit change - allows resisting out of resting
 			resist_a_rest() // ditto
 			return
 		if(resist_embedded()) //Citadel Change for embedded removal memes

code/modules/mob/living/living_mobility.dm

@@ -2,9 +2,9 @@
 
 //Force-set resting variable, without needing to resist/etc.
 /mob/living/proc/set_resting(new_resting, silent = FALSE, updating = TRUE)
-	_REFACTORING_resting = new_resting
+	resting = new_resting
 	if(!silent)
-		to_chat(src, "<span class='notice'>You are now [_REFACTORING_resting? "resting" : "getting up"].</span>")
+		to_chat(src, "<span class='notice'>You are now [resting? "resting" : "getting up"].</span>")
 	update_resting(updating)
 
 /mob/living/proc/update_resting(update_mobility = TRUE)
@@ -25,20 +25,20 @@
 	set category = "IC"
 	if(client?.prefs?.autostand)
 		intentionalresting = !intentionalresting
-		to_chat(src, "<span class='notice'>You are now attempting to [intentionalresting ? "[!_REFACTORING_resting ? "lay down and ": ""]stay down" : "[_REFACTORING_resting ? "get up and ": ""]stay up"].</span>")
+		to_chat(src, "<span class='notice'>You are now attempting to [intentionalresting ? "[!resting ? "lay down and ": ""]stay down" : "[resting ? "get up and ": ""]stay up"].</span>")
-		if(intentionalresting && !_REFACTORING_resting)
+		if(intentionalresting && !resting)
 			set_resting(TRUE, FALSE)
 		else
 			resist_a_rest()
 	else
-		if(!_REFACTORING_resting)
+		if(!resting)
 			set_resting(TRUE, FALSE)
 			to_chat(src, "<span class='notice'>You are now laying down.</span>")
 		else
 			resist_a_rest()
 
 /mob/living/proc/resist_a_rest(automatic = FALSE, ignoretimer = FALSE) //Lets mobs resist out of resting. Major QOL change with combat reworks.
-	if(!_REFACTORING_resting || stat || attemptingstandup)
+	if(!resting || stat || attemptingstandup)
 		return FALSE
 	if(ignoretimer)
 		set_resting(FALSE, FALSE)
@@ -84,20 +84,20 @@
 	var/stat_softcrit = stat == SOFT_CRIT
 	var/stat_conscious = (stat == CONSCIOUS) || stat_softcrit
 
-	var/conscious = !_REFACTORING_IsUnconscious() && stat_conscious && !HAS_TRAIT(src, TRAIT_DEATHCOMA)
+	var/conscious = !IsUnconscious() && stat_conscious && !HAS_TRAIT(src, TRAIT_DEATHCOMA)
 
 	var/has_arms = get_num_arms()
 	var/has_legs = get_num_legs()
 	var/ignore_legs = get_leg_ignore()
-	var/stun = _REFACTORING_IsStun()
+	var/stun = IsStun()
 	var/paralyze = IsParalyzed()
-	var/knockdown = _REFACTORING_IsKnockdown()
+	var/knockdown = IsKnockdown()
 	var/daze = IsDazed()
 	var/immobilize = IsImmobilized()
 
 	var/chokehold = pulledby && pulledby.grab_state >= GRAB_NECK
 	var/restrained = restrained()
-	var/pinned = _REFACTORING_resting && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE // Cit change - adds pinning for aggressive-grabbing people on the ground
+	var/pinned = resting && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE // Cit change - adds pinning for aggressive-grabbing people on the ground
 	var/canmove = !immobilize && !stun && conscious && !paralyze && !buckled && (!stat_softcrit || !pulledby) && !chokehold && !IsFrozen() && (has_arms || ignore_legs || has_legs) && !pinned && !recoveringstam
 
 	if(canmove)
@@ -105,7 +105,7 @@
 	else
 		mobility_flags &= ~MOBILITY_MOVE
 	var/canstand_involuntary = conscious && !stat_softcrit && !knockdown && !chokehold && !paralyze && (ignore_legs || has_legs) && !(buckled && buckled.buckle_lying) || !recoveringstam
-	var/canstand = canstand_involuntary && !_REFACTORING_resting
+	var/canstand = canstand_involuntary && !resting
 
 	var/should_be_lying = !canstand
 	if(buckled)

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

@@ -100,7 +100,7 @@
 /mob/living/silicon/pai/lay_down()
 	. = ..()
 	if(loc != card)
-		visible_message("<span class='notice'>[src] [_REFACTORING_resting? "lays down for a moment..." : "perks up from the ground"]</span>")
+		visible_message("<span class='notice'>[src] [resting? "lays down for a moment..." : "perks up from the ground"]</span>")
 	update_icon()
 
 /mob/living/silicon/pai/start_pulling(atom/movable/AM, gs)

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(_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(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)
@@ -21,7 +21,7 @@
 		rotate_on_lying = TRUE
 	else
 		icon = initial(icon)
-		icon_state = "[chassis][_REFACTORING_resting? "_rest" : (stat == DEAD? "_dead" : "")]"
+		icon_state = "[chassis][resting? "_rest" : (stat == DEAD? "_dead" : "")]"
 		rotate_on_lying = FALSE
 	pixel_x = ((chassis == "dynamic") && chassis_pixel_offsets_x[dynamic_chassis]) || 0
 	update_transform()

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

@@ -675,7 +675,7 @@
 	if(module.cyborg_base_icon == "robot")
 		icon = 'icons/mob/robots.dmi'
 		pixel_x = initial(pixel_x)
-	if(stat != DEAD && !(_REFACTORING_IsUnconscious() ||_REFACTORING_IsStun() || _REFACTORING_IsKnockdown() || IsParalyzed() || low_power_mode)) //Not dead, not stunned.
+	if(stat != DEAD && !(IsUnconscious() ||IsStun() || IsKnockdown() || IsParalyzed() || low_power_mode)) //Not dead, not stunned.
 		if(!eye_lights)
 			eye_lights = new()
 		if(lamp_intensity > 2)
@@ -699,7 +699,7 @@
 	update_fire()
 
 	if(client && stat != DEAD && module.dogborg == TRUE)
-		if(_REFACTORING_resting)
+		if(resting)
 			if(sitting)
 				icon_state = "[module.cyborg_base_icon]-sit"
 			if(bellyup)
@@ -1020,7 +1020,7 @@
 		if(health <= -maxHealth) //die only once
 			death()
 			return
-		if(_REFACTORING_IsUnconscious() || _REFACTORING_IsStun() || IsParalyzed() || getOxyLoss() > maxHealth*0.5)
+		if(IsUnconscious() || IsStun() || IsParalyzed() || getOxyLoss() > maxHealth*0.5)
 			if(stat == CONSCIOUS)
 				stat = UNCONSCIOUS
 				blind_eyes(1)
@@ -1271,7 +1271,7 @@
 /mob/living/silicon/robot/update_mobility()
 	. = ..()
 	if(client && stat != DEAD && dogborg == FALSE)
-		if(_REFACTORING_resting)
+		if(resting)
 			cut_overlays()
 			icon_state = "[module.cyborg_base_icon]-rest"
 		else

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)
-	_REFACTORING_SetStun(60) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
+	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/silicon/robot/robot_mobility.dm

@@ -1,7 +1,7 @@
 /mob/living/silicon/robot/update_mobility()
 	var/newflags = NONE
 	if(!stat)
-		if(!_REFACTORING_resting)
+		if(!resting)
 			newflags |= MOBILITY_STAND
 			if(!locked_down)
 				newflags |= MOBILITY_MOVE

code/modules/mob/living/simple_animal/bot/firebot.dm

@@ -170,7 +170,7 @@
 	if(!..())
 		return
 
-	if(_REFACTORING_IsStun() || IsParalyzed())
+	if(IsStun() || IsParalyzed())
 		old_target_fire = target_fire
 		target_fire = null
 		mode = BOT_IDLE
@@ -287,7 +287,7 @@
 	if(!on)
 		icon_state = "firebot0"
 		return
-	if(_REFACTORING_IsStun() || IsParalyzed())
+	if(IsStun() || IsParalyzed())
 		icon_state = "firebots1"
 	else if(stationary_mode) //Bot has yellow light to indicate stationary mode.
 		icon_state = "firebots1"

code/modules/mob/living/simple_animal/bot/honkbot.dm

@@ -149,7 +149,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"},
 		if (emagged <= 1)
 			honk_attack(A)
 		else
-			if(!C._REFACTORING_IsStun() || arrest_type)
+			if(!C.IsStun() || arrest_type)
 				stun_attack(A)
 		..()
 	else if (!spam_flag) //honking at the ground

code/modules/mob/living/simple_animal/bot/medbot.dm

@@ -86,7 +86,7 @@
 	if(!on)
 		icon_state = "medibot0"
 		return
-	if(_REFACTORING_IsStun())
+	if(IsStun())
 		icon_state = "medibota"
 		return
 	if(mode == BOT_HEALING)
@@ -278,7 +278,7 @@
 	if(mode == BOT_HEALING)
 		return
 
-	if(_REFACTORING_IsStun())
+	if(IsStun())
 		oldpatient = patient
 		patient = null
 		mode = BOT_IDLE

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

@@ -180,7 +180,7 @@
 			collar_type = "[initial(collar_type)]_sit"
 			set_resting(TRUE)
 		else if (prob(1))
-			if (_REFACTORING_resting)
+			if (resting)
 				emote("me", EMOTE_VISIBLE, pick("gets up and meows.", "walks around.", "stops resting."))
 				icon_state = "[icon_living]"
 				collar_type = "[initial(collar_type)]"

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

@@ -26,7 +26,7 @@
 	..()
 	//CRAB movement
 	if(!ckey && !stat)
-		if(isturf(loc) && !_REFACTORING_resting && !buckled)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
+		if(isturf(loc) && !resting && !buckled)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
 			turns_since_move++
 			if(turns_since_move >= turns_per_move)
 				var/east_vs_west = pick(4,8)

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

@@ -418,7 +418,7 @@
 		..()
 
 /mob/living/simple_animal/update_mobility(value_otherwise = MOBILITY_FLAGS_DEFAULT)
-	if(_REFACTORING_IsUnconscious() || _REFACTORING_IsStun() || IsParalyzed() || stat || _REFACTORING_resting)
+	if(IsUnconscious() || IsStun() || IsParalyzed() || stat || resting)
 		drop_all_held_items()
 		mobility_flags = NONE
 	else if(buckled)

code/modules/mob/living/status_procs.dm

@@ -22,11 +22,11 @@
 
 ////////////////////////////// STUN ////////////////////////////////////
 
-/mob/living/proc/_REFACTORING_IsStun() //If we're stunned
+/mob/living/proc/IsStun() //If we're stunned
 	return has_status_effect(STATUS_EFFECT_STUN)
 
-/mob/living/proc/_REFACTORING_AmountStun() //How many deciseconds remain in our stun
+/mob/living/proc/AmountStun() //How many deciseconds remain in our stun
-	var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun()
+	var/datum/status_effect/incapacitating/stun/S = IsStun()
 	if(S)
 		return S.duration - world.time
 	return 0
@@ -37,18 +37,18 @@
 	if(((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
 		if(absorb_stun(amount, ignore_canstun))
 			return
-		var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun()
+		var/datum/status_effect/incapacitating/stun/S = IsStun()
 		if(S)
 			S.duration = max(world.time + amount, S.duration)
 		else if(amount > 0)
 			S = apply_status_effect(STATUS_EFFECT_STUN, amount, updating)
 		return S
 
-/mob/living/proc/_REFACTORING_SetStun(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration
+/mob/living/proc/SetStun(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_STUN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
-		var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun()
+		var/datum/status_effect/incapacitating/stun/S = IsStun()
 		if(amount <= 0)
 			if(S)
 				qdel(S)
@@ -61,13 +61,13 @@
 				S = apply_status_effect(STATUS_EFFECT_STUN, amount, updating)
 		return S
 
-/mob/living/proc/_REFACTORING_AdjustStun(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration
+/mob/living/proc/AdjustStun(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_STUN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANSTUN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
 		if(absorb_stun(amount, ignore_canstun))
 			return
-		var/datum/status_effect/incapacitating/stun/S = _REFACTORING_IsStun()
+		var/datum/status_effect/incapacitating/stun/S = IsStun()
 		if(S)
 			S.duration += amount
 		else if(amount > 0)
@@ -76,33 +76,33 @@
 
 ///////////////////////////////// KNOCKDOWN /////////////////////////////////////
 
-/mob/living/proc/_REFACTORING_IsKnockdown() //If we're knocked down
+/mob/living/proc/IsKnockdown() //If we're knocked down
 	return has_status_effect(STATUS_EFFECT_KNOCKDOWN)
 
-/mob/living/proc/_REFACTORING_AmountKnockdown() //How many deciseconds remain in our knockdown
+/mob/living/proc/AmountKnockdown() //How many deciseconds remain in our knockdown
-	var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown()
+	var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown()
 	if(K)
 		return K.duration - world.time
 	return 0
 
-/mob/living/proc/_REFACTORING_Knockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Can't go below remaining duration
+/mob/living/proc/Knockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Can't go below remaining duration
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_KNOCKDOWN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANKNOCKDOWN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
 		if(absorb_stun(amount, ignore_canstun))
 			return
-		var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown()
+		var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown()
 		if(K)
 			K.duration = max(world.time + amount, K.duration)
 		else if(amount > 0)
 			K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount, updating)
 		return K
 
-/mob/living/proc/_REFACTORING_SetKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration
+/mob/living/proc/SetKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Sets remaining duration
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_KNOCKDOWN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANKNOCKDOWN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
-		var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown()
+		var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown()
 		if(amount <= 0)
 			if(K)
 				qdel(K)
@@ -115,13 +115,13 @@
 				K = apply_status_effect(STATUS_EFFECT_KNOCKDOWN, amount, updating)
 		return K
 
-/mob/living/proc/_REFACTORING_AdjustKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration
+/mob/living/proc/AdjustKnockdown(amount, updating = TRUE, ignore_canstun = FALSE) //Adds to remaining duration
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_KNOCKDOWN, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANKNOCKDOWN) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
 		if(absorb_stun(amount, ignore_canstun))
 			return
-		var/datum/status_effect/incapacitating/knockdown/K = _REFACTORING_IsKnockdown()
+		var/datum/status_effect/incapacitating/knockdown/K = IsKnockdown()
 		if(K)
 			K.duration += amount
 		else if(amount > 0)
@@ -290,7 +290,7 @@
 //Blanket
 /mob/living/proc/AllImmobility(amount, updating, ignore_canstun = FALSE)
 	Paralyze(amount, FALSE, ignore_canstun)
-	_REFACTORING_Knockdown(amount, FALSE, ignore_canstun)
+	Knockdown(amount, FALSE, ignore_canstun)
 	Stun(amount, FALSE, ignore_canstun)
 	Immobilize(amount, FALSE, ignore_canstun)
 	Daze(amount, FALSE, ignore_canstun)
@@ -299,8 +299,8 @@
 
 /mob/living/proc/SetAllImmobility(amount, updating, ignore_canstun = FALSE)
 	SetParalyzed(amount, FALSE, ignore_canstun)
-	_REFACTORING_SetKnockdown(amount, FALSE, ignore_canstun)
+	SetKnockdown(amount, FALSE, ignore_canstun)
-	_REFACTORING_SetStun(amount, FALSE, ignore_canstun)
+	SetStun(amount, FALSE, ignore_canstun)
 	SetImmobilized(amount, FALSE, ignore_canstun)
 	SetDazed(amount, FALSE, ignore_canstun)
 	if(updating)
@@ -308,8 +308,8 @@
 
 /mob/living/proc/AdjustAllImmobility(amount, updating, ignore_canstun = FALSE)
 	AdjustParalyzed(amount, FALSE, ignore_canstun)
-	_REFACTORING_AdjustKnockdown(amount, FALSE, ignore_canstun)
+	AdjustKnockdown(amount, FALSE, ignore_canstun)
-	_REFACTORING_AdjustStun(amount, FALSE, ignore_canstun)
+	AdjustStun(amount, FALSE, ignore_canstun)
 	AdjustImmobilized(amount, FALSE, ignore_canstun)
 	AdjustDazed(amount, FALSE, ignore_canstun)
 	if(updating)
@@ -317,10 +317,10 @@
 
 /// Makes sure all 5 of the non-knockout immobilizing status effects are lower or equal to amount.
 /mob/living/proc/HealAllImmobilityUpTo(amount, updating, ignore_canstun = FALSE)
-	if(_REFACTORING_AmountStun() > amount)
+	if(AmountStun() > amount)
-		_REFACTORING_SetStun(amount, FALSE, ignore_canstun)
+		SetStun(amount, FALSE, ignore_canstun)
-	if(_REFACTORING_AmountKnockdown() > amount)
+	if(AmountKnockdown() > amount)
-		_REFACTORING_SetKnockdown(amount, FALSE, ignore_canstun)
+		SetKnockdown(amount, FALSE, ignore_canstun)
 	if(AmountParalyzed() > amount)
 		SetParalyzed(amount, FALSE, ignore_canstun)
 	if(AmountImmobilized() > amount)
@@ -331,14 +331,14 @@
 		update_mobility()
 
 /mob/living/proc/HighestImmobilityAmount()
-	return max(max(max(max(_REFACTORING_AmountStun(), _REFACTORING_AmountKnockdown()), AmountParalyzed()), AmountImmobilized()), AmountDazed())
+	return max(max(max(max(AmountStun(), AmountKnockdown()), AmountParalyzed()), AmountImmobilized()), AmountDazed())
 
 //////////////////UNCONSCIOUS
-/mob/living/proc/_REFACTORING_IsUnconscious() //If we're unconscious
+/mob/living/proc/IsUnconscious() //If we're unconscious
 	return has_status_effect(STATUS_EFFECT_UNCONSCIOUS)
 
 /mob/living/proc/AmountUnconscious() //How many deciseconds remain in our unconsciousness
-	var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious()
+	var/datum/status_effect/incapacitating/unconscious/U = IsUnconscious()
 	if(U)
 		return U.duration - world.time
 	return 0
@@ -347,7 +347,7 @@
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANUNCONSCIOUS) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE))  || ignore_canstun)
-		var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious()
+		var/datum/status_effect/incapacitating/unconscious/U = IsUnconscious()
 		if(U)
 			U.duration = max(world.time + amount, U.duration)
 		else if(amount > 0)
@@ -358,7 +358,7 @@
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANUNCONSCIOUS) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
-		var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious()
+		var/datum/status_effect/incapacitating/unconscious/U = IsUnconscious()
 		if(amount <= 0)
 			if(U)
 				qdel(U)
@@ -372,7 +372,7 @@
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if(((status_flags & CANUNCONSCIOUS) && !HAS_TRAIT(src, TRAIT_STUNIMMUNE)) || ignore_canstun)
-		var/datum/status_effect/incapacitating/unconscious/U = _REFACTORING_IsUnconscious()
+		var/datum/status_effect/incapacitating/unconscious/U = IsUnconscious()
 		if(U)
 			U.duration += amount
 		else if(amount > 0)
@@ -381,11 +381,11 @@
 
 /////////////////////////////////// SLEEPING ////////////////////////////////////
 
-/mob/living/proc/_REFACTORING_IsSleeping() //If we're asleep
+/mob/living/proc/IsSleeping() //If we're asleep
 	return has_status_effect(STATUS_EFFECT_SLEEPING)
 
 /mob/living/proc/AmountSleeping() //How many deciseconds remain in our sleep
-	var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping()
+	var/datum/status_effect/incapacitating/sleeping/S = IsSleeping()
 	if(S)
 		return S.duration - world.time
 	return 0
@@ -394,7 +394,7 @@
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_SLEEP, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if((!HAS_TRAIT(src, TRAIT_SLEEPIMMUNE)) || ignore_canstun)
-		var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping()
+		var/datum/status_effect/incapacitating/sleeping/S = IsSleeping()
 		if(S)
 			S.duration = max(world.time + amount, S.duration)
 		else if(amount > 0)
@@ -405,7 +405,7 @@
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_SLEEP, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if((!HAS_TRAIT(src, TRAIT_SLEEPIMMUNE)) || ignore_canstun)
-		var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping()
+		var/datum/status_effect/incapacitating/sleeping/S = IsSleeping()
 		if(amount <= 0)
 			if(S)
 				qdel(S)
@@ -419,7 +419,7 @@
 	if(SEND_SIGNAL(src, COMSIG_LIVING_STATUS_SLEEP, amount, updating, ignore_canstun) & COMPONENT_NO_STUN)
 		return
 	if((!HAS_TRAIT(src, TRAIT_SLEEPIMMUNE)) || ignore_canstun)
-		var/datum/status_effect/incapacitating/sleeping/S = _REFACTORING_IsSleeping()
+		var/datum/status_effect/incapacitating/sleeping/S = IsSleeping()
 		if(S)
 			S.duration += amount
 		else if(amount > 0)

code/modules/mob/mob_defines.dm

@@ -34,7 +34,7 @@
 	var/eye_blurry = 0		//Carbon
 	var/real_name = null
 	var/spacewalk = FALSE
-	var/_REFACTORING_resting = 0			//Carbon
+	var/resting = 0			//Carbon
 	var/lying = 0
 	var/lying_prev = 0
 

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -1898,7 +1898,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 
 /datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L)
 	..()
-	if(L._REFACTORING_IsSleeping())
+	if(L.IsSleeping())
 		if(L.bruteloss && L.fireloss) //If you are damaged by both types, slightly increased healing but it only heals one. The more the merrier wink wink.
 			if(prob(50))
 				L.adjustBruteLoss(-0.25)

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -465,7 +465,7 @@
 		M.drowsyness = max(M.drowsyness-5, 0)
 		M.AdjustUnconscious(-60, FALSE)
 		M.AdjustAllImmobility(-30, FALSE)
-		M._REFACTORING_AdjustKnockdown(-40, FALSE)
+		M.AdjustKnockdown(-40, FALSE)
 		M.adjustStaminaLoss(-15, FALSE)
 		M.adjustToxLoss(-5, FALSE, TRUE)
 		M.adjustOxyLoss(-3, FALSE)
@@ -474,7 +474,7 @@
 	if(iscultist(M))
 		M.AdjustUnconscious(1, FALSE)
 		M.AdjustAllImmobility(10, FALSE)
-		M._REFACTORING_AdjustKnockdown(10, FALSE)
+		M.AdjustKnockdown(10, FALSE)
 		M.adjustStaminaLoss(15, FALSE)
 	else
 		M.adjustToxLoss(3, FALSE)

code/modules/spells/spell.dm

@@ -377,9 +377,9 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 		if("oxyloss")
 			target.adjustOxyLoss(amount)
 		if("stun")
-			target._REFACTORING_AdjustStun(amount)
+			target.AdjustStun(amount)
 		if("knockdown")
-			target._REFACTORING_AdjustKnockdown(amount)
+			target.AdjustKnockdown(amount)
 		if("unconscious")
 			target.AdjustUnconscious(amount)
 		else

code/modules/surgery/organs/vocal_cords.dm

@@ -491,7 +491,7 @@
 		cooldown = COOLDOWN_DAMAGE //because stun removal
 		for(var/V in listeners)
 			var/mob/living/L = V
-			if(L._REFACTORING_resting)
+			if(L.resting)
 				L.set_resting(FALSE, FALSE, FALSE)
 			L.SetAllImmobility(0, FALSE)
 			L.SetUnconscious(0, FALSE) //i said get up i don't care if you're being tased
@@ -1114,7 +1114,7 @@
 				if(HAS_TRAIT(H, TRAIT_NYMPHO) && H.canbearoused && E.lewd) // probably a redundant check but for good measure
 					addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "<span class='love'>Your [E.enthrallGender] pushes you over the limit, overwhelming your body with pleasure.</b></span>"), 5)
 					H.mob_climax(forced_climax=TRUE)
-					H._REFACTORING_SetStun(20)
+					H.SetStun(20)
 					H.setArousalLoss(H.min_arousal)
 					E.resistanceTally = 0 //makes resistance 0, but resets arousal, resistance buildup is faster unaroused (massively so).
 					E.enthrallTally += power_multiplier
@@ -1253,8 +1253,8 @@
 					continue
 				else
 					user.emote("me", EMOTE_VISIBLE, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.")
-					user._REFACTORING_SetStun(1000)//Hands are handy, so you have to stay still
+					user.SetStun(1000)//Hands are handy, so you have to stay still
-					H._REFACTORING_SetStun(1000)
+					H.SetStun(1000)
 					if (E.mental_capacity >= 5)
 						var/trigger = html_decode(stripped_input(user, "Enter the trigger phrase", MAX_MESSAGE_LEN))
 						var/custom_words_words_list = list("Speak", "Echo", "Shock", "Cum", "Kneel", "Strip", "Trance", "Cancel")
@@ -1277,8 +1277,8 @@
 							to_chat(user, "<span class='warning'>Your pet looks at you confused, it seems they don't understand that effect!</b></span>")
 					else
 						to_chat(user, "<span class='warning'>Your pet looks at you with a vacant blase expression, you don't think you can program anything else into them</b></span>")
-					user._REFACTORING_SetStun(0)
+					user.SetStun(0)
-					H._REFACTORING_SetStun(0)
+					H.SetStun(0)
 
 	//CUSTOM ECHO
 	else if((findtext(message, custom_echo)))
@@ -1294,16 +1294,16 @@
 					continue
 				else
 					user.emote("me", EMOTE_VISIBLE, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.")
-					user._REFACTORING_SetStun(1000)//Hands are handy, so you have to stay still
+					user.SetStun(1000)//Hands are handy, so you have to stay still
-					H._REFACTORING_SetStun(1000)
+					H.SetStun(1000)
 					var/trigger = stripped_input(user, "Enter the loop phrase", MAX_MESSAGE_LEN)
 					var/customSpan = list("Notice", "Warning", "Hypnophrase", "Love", "Velvet")
 					var/trigger2 = input(user, "Pick the style", "Style") in customSpan
 					trigger2 = lowertext(trigger2)
 					E.customEcho = trigger
 					E.customSpan = trigger2
-					user._REFACTORING_SetStun(0)
+					user.SetStun(0)
-					H._REFACTORING_SetStun(0)
+					H.SetStun(0)
 					to_chat(user, "<span class='notice'><i>You sucessfully set an echoing phrase in [H]</i></span>")
 
 	//CUSTOM OBJECTIVE
@@ -1317,8 +1317,8 @@
 					continue
 				else
 					user.emote("me", EMOTE_VISIBLE, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
-					user._REFACTORING_SetStun(1000)//So you can't run away!
+					user.SetStun(1000)//So you can't run away!
-					H._REFACTORING_SetStun(1000)
+					H.SetStun(1000)
 					if (E.mental_capacity >= 200)
 						var/datum/objective/brainwashing/objective = stripped_input(user, "Add an objective to give your pet.", MAX_MESSAGE_LEN)
 						if(!LAZYLEN(objective))
@@ -1339,8 +1339,8 @@
 						to_chat(user, "<span class='notice'><i>You sucessfully give an objective to [H]</i></span>")
 					else
 						to_chat(user, "<span class='warning'>Your pet looks at you with a vacant blasé expression, you don't think you can program anything else into them</b></span>")
-					user._REFACTORING_SetStun(0)
+					user.SetStun(0)
-					H._REFACTORING_SetStun(0)
+					H.SetStun(0)
 
 	//INSTILL
 	else if((findtext(message, instill_words)))

modular_citadel/code/datums/status_effects/chems.dm

@@ -652,7 +652,7 @@
 				if (HAS_TRAIT(C, TRAIT_NYMPHO) && lewd)
 					if (C.getArousalLoss() > 80)
 						C.mob_climax(forced_climax=TRUE)
-						C._REFACTORING_SetStun(10)//We got your stun effects in somewhere, Kev.
+						C.SetStun(10)//We got your stun effects in somewhere, Kev.
 					else
 						C.adjustArousalLoss(10)
 						to_chat(C, "<span class='love'><i>You feel a surge of arousal!</i></span>")

modular_citadel/code/modules/mob/living/carbon/carbon.dm

@@ -33,7 +33,7 @@
 		if(combatmode)
 			if(world.time >= combatmessagecooldown)
 				if(a_intent != INTENT_HELP)
-					visible_message("<span class='warning'>[src] [_REFACTORING_resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].</span>")
+					visible_message("<span class='warning'>[src] [resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].</span>")
 				else
 					visible_message("<span class='notice'>[src] [pick("looks","seems","goes")] [pick("alert","attentive","vigilant")].</span>")
 			playsound_local(src, 'sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay!

modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm

@@ -6,7 +6,7 @@
 
 /mob/living/silicon/robot/movement_delay()
 	. = ..()
-	if(!_REFACTORING_resting && !sprinting)
+	if(!resting && !sprinting)
 		. += 1
 	. += speed