Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme

code/modules/mining/minebot.dm

@@ -69,7 +69,7 @@
 	visible_message("<span class='warning'>[src] crackles and buzzes violently!</span>")
 
 /mob/living/simple_animal/hostile/mining_drone/sentience_act()
-	AIStatus = AI_OFF
+	..()
 	check_friendly_fire = 0
 
 /mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params)

code/modules/mining/satchel_ore_boxdm.dm

@@ -83,6 +83,9 @@ obj/structure/ore_box/ex_act(severity, target)
 		O.forceMove(loc)
 		CHECK_TICK
 
+/obj/structure/ore_box/onTransitZ()
+	return 
+
 /obj/structure/ore_box/verb/empty_box()
 	set name = "Empty Ore Box"
 	set category = "Object"