Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/game/area/areas.dm

@@ -87,6 +87,8 @@
 			for(var/area/RA in related)
 				for(var/obj/machinery/camera/C in RA)
 					C.network.Remove("Atmosphere Alarms")
+				for (var/obj/machinery/alarm/AA in RA)
+					AA.update_icon()
 			for(var/mob/living/silicon/aiPlayer in player_list)
 				aiPlayer.cancelAlarm("Atmosphere", src, src)
 			for(var/obj/machinery/computer/station_alert/a in machines)
@@ -99,6 +101,8 @@
 				for(var/obj/machinery/camera/C in RA)
 					cameras += C
 					C.network.Add("Atmosphere Alarms")
+				for (var/obj/machinery/alarm/AA in RA)
+					AA.update_icon()
 			for(var/mob/living/silicon/aiPlayer in player_list)
 				aiPlayer.triggerAlarm("Atmosphere", src, cameras, src)
 			for(var/obj/machinery/computer/station_alert/a in machines)

code/game/machinery/machinery.dm

@@ -235,10 +235,6 @@ Class Procs:
 
 	src.add_fingerprint(user)
 
-	if(!allowed(user))
-		user << "\red Access Denied."
-		return 1
-
 	var/area/A = get_area(src)
 	A.master.powerupdate = 1
 
@@ -286,4 +282,4 @@ Class Procs:
 			I.crit_fail = 1
 		I.loc = loc
 	del(src)
-	return 1
+	return 1

code/modules/mob/mob.dm

@@ -780,7 +780,7 @@ note dizziness decrements automatically in the mob's Life() proc.
 		lying = 0
 	else if (!buckled)
 		lying = !can_stand
-		//canmove = has_limbs
+		canmove = has_limbs
 
 	if(lying)
 		density = 0

code/modules/shuttles/shuttle_console.dm

@@ -12,7 +12,10 @@
 	if(..(user))
 		return
 	//src.add_fingerprint(user)	//shouldn't need fingerprints just for looking at it.
-
+	if(!allowed(user))
+		user << "\red Access Denied."
+		return 1
+	
 	ui_interact(user)
 
 /obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)