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

code/modules/mining/mine_turfs.dm

@@ -342,8 +342,8 @@
 				R.amount = rand(5,25)
 
 			if(2)
-				var/obj/item/stack/tile/R = new(src)
-				R.amount = rand(1,5)
+				var/obj/item/stack/tile/plasteel/R = new(src)
+				R.amount = rand(5,25)
 
 			if(3)
 				var/obj/item/stack/material/steel/R = new(src)

code/modules/recycling/conveyor2.dm

@@ -95,8 +95,9 @@
 // attack with item, place item on conveyor
 /obj/machinery/conveyor/attackby(var/obj/item/I, mob/user)
 	if(isrobot(user))	return //Carn: fix for borgs dropping their modules on conveyor belts
-	user.drop_item()
-	if(I && I.loc)	I.loc = src.loc
+	if(I.loc != user)	return // This should stop mounted modules ending up outside the module.
+		
+	user.drop_item(src)
 	return
 
 // attack with hand, move pulled object onto conveyor