Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom

Attempt to resolve merge conflict.

code/modules/mining/drilling/drill.dm

@@ -388,5 +388,5 @@
 		usr << "It is anchored in place!"
 		return 0
 
-	src.dir = turn(src.dir, 90)
+	src.set_dir(turn(src.dir, 90))
 	return 1

code/modules/mining/satchel_ore_boxdm.dm

@@ -40,7 +40,8 @@
 	user << "That's an [src]."
 	user << desc
 
-	if(!istype(user, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can check the contents of ore boxes.
+	// Borgs can now check contents too.
+	if((!istype(user, /mob/living/carbon/human)) && (!istype(user, /mob/living/silicon/robot)))
 		return
 
 	if(!Adjacent(user)) //Can only check the contents of ore boxes if you can physically reach them.