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

# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm

code/modules/mining/abandoned_crates.dm

@@ -4,10 +4,12 @@
 	name = "abandoned crate"
 	desc = "What could be inside?"
 	icon_state = "securecrate"
+	integrity_failure = 0 //no breaking open the crate
 	var/code = null
 	var/lastattempt = null
 	var/attempts = 10
 	var/codelen = 4
+	tamperproof = 90
 
 /obj/structure/closet/crate/secure/loot/New()
 	..()
@@ -54,7 +56,7 @@
 		if(46 to 50)
 			new /obj/item/clothing/under/chameleon(src)
 			for(var/i in 1 to 7)
-				new /obj/item/clothing/tie/horrible(src)
+				new /obj/item/clothing/neck/tie/horrible(src)
 		if(51 to 52) // 2% chance
 			new /obj/item/weapon/melee/classic_baton(src)
 		if(53 to 54)
@@ -71,7 +73,7 @@
 		if(61 to 62)
 			for(var/i in 1 to 5)
 				new /obj/item/clothing/head/kitty(src)
-				new /obj/item/clothing/tie/petcollar(src)
+				new /obj/item/clothing/neck/petcollar(src)
 		if(63 to 64)
 			for(var/i in 1 to rand(4, 7))
 				var/newcoin = pick(/obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/diamond, /obj/item/weapon/coin/plasma, /obj/item/weapon/coin/uranium)
@@ -223,11 +225,3 @@
 
 /obj/structure/closet/crate/secure/loot/deconstruct(disassembled = TRUE)
 	boom()
-
-/obj/structure/closet/crate/secure/loot/proc/boom(mob/user)
-	if(user)
-		user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
-	for(var/atom/movable/AM in src)
-		qdel(AM)
-	explosion(get_turf(src), 0, 1, 5, 5)
-	qdel(src)

code/modules/mining/lavaland/necropolis_chests.dm

@@ -536,8 +536,9 @@
 			orbiters += A.orbiters
 
 	for(var/thing in orbiters)
-		if (isobserver(thing))
-			var/mob/dead/observer/G = thing
+		var/datum/orbit/O = thing
+		if (isobserver(O.orbiter))
+			var/mob/dead/observer/G = O.orbiter
 			ghost_counter++
 			G.invisibility = 0
 			current_spirits |= G

code/modules/mining/mine_items.dm

@@ -493,7 +493,7 @@
 interface with the mining shuttle at the landing site if a mobile beacon is also deployed."
 	var/launch_warning = TRUE
 
-	req_access = list(access_heads)
+	req_one_access = list(access_cargo, access_construction, access_heads)
 	possible_destinations = null
 	clockwork = TRUE
 	var/obj/item/device/gps/internal/base/locator