From 1d184b8cad9afe2a98385b9f950c8a50f913b1e5 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 16 Jan 2020 00:21:21 -0700
Subject: [PATCH] s

---
 code/datums/action.dm                                    | 4 ++--
 code/game/machinery/_machinery.dm                        | 2 +-
 code/game/mecha/mecha.dm                                 | 2 +-
 code/game/objects/structures.dm                          | 2 +-
 code/modules/surgery/organs/vocal_cords.dm               | 9 +++++----
 .../modules/mob/living/silicon/robot/robot_movement.dm   | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/code/datums/action.dm b/code/datums/action.dm
index 78c9aa8467..00a8e8513d 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -104,10 +104,10 @@
 		if(owner.restrained())
 			return FALSE
 	if(check_flags & AB_CHECK_STUN)
-		if(!CHECK_MOBILITY(owner, MOBILITY_USE))
+		if(istype(L) && !CHECK_MOBILITY(L, MOBILITY_USE))
 			return FALSE
 	if(check_flags & AB_CHECK_LYING)
-		if(!CHECK_MOBILITY(owner, MOBILITY_STAND))
+		if(istype(L) && !CHECK_MOBILITY(L, MOBILITY_STAND))
 			return FALSE
 	if(check_flags & AB_CHECK_CONSCIOUS)
 		if(owner.stat)
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index 5f44fccdac..3bbd54e6d4 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -180,7 +180,7 @@ Class Procs:
 		A.forceMove(T)
 		if(isliving(A))
 			var/mob/living/L = A
-			L.update_canmove()
+			L.update_mobility()
 	if(occupant)
 		SEND_SIGNAL(src, COMSIG_MACHINE_EJECT_OCCUPANT, occupant)
 		occupant = null
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index c19242be3f..7f62e76c3f 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -750,7 +750,7 @@
 	AI.cancel_camera()
 	AI.controlled_mech = src
 	AI.remote_control = src
-	AI.mobility_flags = MOBILIITY_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_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.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>")
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index e8f8d5a3a6..493a11d27b 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -46,7 +46,7 @@
 		return
 	if(user == O && iscarbon(O))
 		var/mob/living/L = O
-		if(CHECK_MOBILITY(O, MOBILITY_MOVE))
+		if(CHECK_MOBILITY(L, MOBILITY_MOVE))
 			climb_structure(user)
 			return
 	if(!istype(O, /obj/item) || user.get_active_held_item() != O)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 15ed883734..dfdec70cad 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -491,10 +491,11 @@
 		cooldown = COOLDOWN_DAMAGE //because stun removal
 		for(var/V in listeners)
 			var/mob/living/L = V
-			if(L.resting)
-				L.lay_down() //aka get up
-			L.SetAllImmobility(0)
-			L.SetUnconscious(0) //i said get up i don't care if you're being tased
+			if(L._REFACTORING_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
+			L.update_mobility()
 
 	//SIT
 	else if((findtext(message, sit_words)))
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
index 526ea497c4..eb28b610f9 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -6,7 +6,7 @@
 
 /mob/living/silicon/robot/movement_delay()
 	. = ..()
-	if(!resting && !sprinting)
+	if(!_REFACTORING_resting && !sprinting)
 		. += 1
 	. += speed