bug fixes

code/game/machinery/_machinery.dm

@@ -187,7 +187,7 @@ Class Procs:
 	density = TRUE
 	if(!target)
 		for(var/am in loc)
-		if (!(can_be_occupant(am)))
+			if (!(can_be_occupant(am)))
 				continue
 			var/atom/movable/AM = am
 			if(AM.has_buckled_mobs())

code/game/machinery/stasis.dm

@@ -10,8 +10,6 @@
 	circuit = /obj/item/circuitboard/machine/stasis
 	idle_power_usage = 40
 	active_power_usage = 340
-	fair_market_price = 10
-	payment_department = ACCOUNT_MED
 	var/stasis_enabled = TRUE
 	var/last_stasis_sound = FALSE
 	var/stasis_can_toggle = 0
@@ -108,7 +106,7 @@
 	if(!can_be_occupant(L))
 		return
 	occupant = L
-	if(stasis_running() && check_nap_violations())
+	if(stasis_running())
 		chill_out(L)
 	update_icon()
 
@@ -119,7 +117,7 @@
 	update_icon()
 
 /obj/machinery/stasis/process()
-	if( !( occupant && isliving(occupant) && check_nap_violations() ) )
+	if( !( occupant && isliving(occupant)) )
 		use_power = IDLE_POWER_USE
 		return
 	var/mob/living/L_occupant = occupant
@@ -136,6 +134,4 @@
 /obj/machinery/stasis/crowbar_act(mob/living/user, obj/item/I)
 	return default_deconstruction_crowbar(I)
 
-/obj/machinery/stasis/nap_violation(mob/violator)
-	unbuckle_mob(violator, TRUE)
 #undef STASIS_TOGGLE_COOLDOWN

code/modules/mob/living/living.dm

@@ -339,7 +339,7 @@
 		death()
 
 
-/mob/living/incapacitated(ignore_restraints, ignore_grab. ignore_stasis)
+/mob/living/incapacitated(ignore_restraints, ignore_grab, ignore_stasis)
 	if(stat || IsUnconscious() || IsStun() || IsKnockdown() || recoveringstam || (!ignore_restraints && restrained(ignore_grab))) // CIT CHANGE - adds recoveringstam check here
 		return TRUE
 
@@ -603,7 +603,7 @@
 		..(pressure_difference, direction, pressure_resistance_prob_delta)
 
 /mob/living/can_resist()
-	return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE. ignore_stasis= TRUE))
+	return !((next_move > world.time) || incapacitated(ignore_restraints = TRUE, ignore_stasis= TRUE))
 
 /mob/living/verb/resist()
 	set name = "Resist"
@@ -1012,7 +1012,7 @@
 	var/has_arms = get_num_arms()
 	var/ignore_legs = get_leg_ignore()
 	var/in_stasis = IsInStasis()
-	var/canmove = !IsImmobilized() && !stun && conscious && !paralyzed && !buckled && (!stat_softcrit || !pulledby) && !chokehold && !IsFrozen() && !in_stasis && (has_arms || ignore_legs || has_legs)
+	var/canmove = !buckled && (pulledby) && !chokehold && !IsFrozen() && !in_stasis && (has_arms || ignore_legs || has_legs)
 	var/pinned = resting && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE // Cit change - adds pinning for aggressive-grabbing people on the ground
 	if(ko || move_and_fall || IsStun() || chokehold) // Cit change - makes resting not force you to drop everything
 		drop_all_held_items()