Merge remote-tracking branch 'upstream/master' into dev-freeze

code/game/machinery/computer/prisoner.dm

@@ -45,7 +45,7 @@
 				if(!T.implanted) continue
 				var/loc_display = "Unknown"
 				var/mob/living/carbon/M = T.imp_in
-				if(M.z in config.station_levels && !istype(M.loc, /turf/space))
+				if((M.z in config.station_levels) && !istype(M.loc, /turf/space))
 					var/turf/mob_loc = get_turf(M)
 					loc_display = mob_loc.loc
 				if(T.malfunction)

code/game/machinery/kitchen/smartfridge.dm

@@ -136,6 +136,7 @@
 
 /obj/machinery/smartfridge/drying_rack/proc/dry()
 	for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents)
+		if(S.dry) continue
 		if(S.dried_type == S.type)
 			S.dry = 1
 			item_quants[S.name]--