Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

code/modules/mining/abandoned_crates.dm

@@ -13,8 +13,7 @@
 
 /obj/structure/closet/crate/secure/loot/New()
 	..()
-	var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
-
+	var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "z")
 	code = ""
 	for(var/i = 0, i < codelen, i++)
 		var/dig = pick(digits)
@@ -169,7 +168,7 @@
 				user << "<span class='notice'>You leave the crate alone.</span>"
 			else
 				user << "<span class='warning'>A red light flashes.</span>"
-				lastattempt = input
+				lastattempt = replacetext(input, 0, "z")
 				attempts--
 				if (attempts == 0)
 					user << "<span class='danger'>The crate's anti-tamper system activates!</span>"

code/modules/mining/equipment_locker.dm

@@ -655,18 +655,19 @@
 	wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
 						  /obj/item/weapon/ore/plasma,  /obj/item/weapon/ore/uranium,    /obj/item/weapon/ore/iron,
 						  /obj/item/weapon/ore/bananium)
+	healable = 0
 
 /mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/weldingtool))
 		var/obj/item/weapon/weldingtool/W = I
 		if(W.welding && !stat)
-			if(AIStatus == AI_ON)
+			if(AIStatus != AI_OFF && AIStatus != AI_IDLE)
 				user << "<span class='info'>[src] is moving around too much to repair!</span>"
 				return
 			if(maxHealth == health)
 				user << "<span class='info'>[src] is at full integrity.</span>"
 			else
-				health += 10
+				adjustBruteLoss(-10)
 				user << "<span class='info'>You repair some of the armor on [src].</span>"
 			return
 	if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner))
@@ -741,7 +742,7 @@
 		O.loc = src.loc
 	return
 
-/mob/living/simple_animal/hostile/mining_drone/adjustBruteLoss()
+/mob/living/simple_animal/hostile/mining_drone/adjustHealth()
 	if(search_objects)
 		SetOffenseBehavior()
 	..()

code/modules/mining/lavaland/weather.dm

@@ -36,9 +36,9 @@
 		if(M.z == target_z)
 			M << start_up_message
 
-	sleep(start_up_time)
-	stage = MAIN_STAGE
-	weather_main()
+	spawn(start_up_time)
+		stage = MAIN_STAGE
+		weather_main()
 
 
 /datum/weather/proc/weather_main()

code/modules/mining/lavaland/weather_types.dm

@@ -47,12 +47,13 @@
 	duration_overlay = ""
 	overlay_layer = 10
 
-/datum/weather/advanced_darkness/advanced_darkness/update_areas()
-	..()
+/datum/weather/advanced_darkness/update_areas()
 	for(var/area/A in impacted_areas)
 		if(stage == MAIN_STAGE)
+			A.invisibility = 0
 			A.opacity = 1
 		else
+			A.invisibility = 100
 			A.opacity = 0
 //Ash storms
 

code/modules/mining/mine_items.dm

@@ -52,6 +52,7 @@
 	circuit = /obj/item/weapon/circuitboard/mining_shuttle
 	shuttleId = "mining"
 	possible_destinations = "mining_home;mining_away"
+	no_destination_swap = 1
 
 /*********************Pickaxe & Drills**************************/
 

code/modules/mining/mine_turfs.dm

@@ -16,6 +16,7 @@ var/global/list/rockTurfEdgeCache
 	opacity = 1
 	density = 1
 	blocks_air = 1
+	layer = TURF_LAYER + 0.05
 	temperature = TCMB
 	var/environment_type = "asteroid"
 	var/turf/simulated/floor/plating/asteroid/turf_type = /turf/simulated/floor/plating/asteroid //For basalt vs normal asteroid
@@ -89,7 +90,7 @@ var/global/list/rockTurfEdgeCache
 		icon_state = "rock"
 	return
 
-/turf/simulated/mineral/proc/Spread(turf/T)
+/turf/simulated/mineral/Spread(turf/T)
 	new src.type(T)
 
 /turf/simulated/mineral/random
@@ -284,16 +285,14 @@ var/global/list/rockTurfEdgeCache
 		countdown(notify_admins)
 
 /turf/simulated/mineral/gibtonite/proc/countdown(notify_admins = 0)
-	spawn(0)
-		while(stage == 1 && det_time > 0 && mineralAmt >= 1)
-			det_time--
-			sleep(5)
-		if(stage == 1 && det_time <= 0 && mineralAmt >= 1)
-			var/turf/bombturf = get_turf(src)
-			mineralAmt = 0
-			explosion(bombturf,1,3,5, adminlog = notify_admins)
-		if(stage == 0 || stage == 2)
-			return
+	set waitfor = 0
+	while(stage == 1 && det_time > 0 && mineralAmt >= 1)
+		det_time--
+		sleep(5)
+	if(stage == 1 && det_time <= 0 && mineralAmt >= 1)
+		var/turf/bombturf = get_turf(src)
+		mineralAmt = 0
+		explosion(bombturf,1,3,5, adminlog = notify_admins)
 
 /turf/simulated/mineral/gibtonite/proc/defuse()
 	if(stage == 1)
@@ -685,7 +684,7 @@ var/global/list/rockTurfEdgeCache
 
 /turf/simulated/chasm/proc/drop(atom/movable/AM)
 	visible_message("[AM] falls into [src]!")
-	AM.Move(locate(drop_x, drop_y, drop_z))
+	AM.forceMove(locate(drop_x, drop_y, drop_z))
 	AM.visible_message("[AM] falls from above!")
 	if(istype(AM, /mob/living))
 		var/mob/living/L = AM