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

Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi

code/modules/mining/coins.dm

@@ -25,43 +25,43 @@
 /obj/item/weapon/coin/gold
 	cmineral = "gold"
 	icon_state = "coin_gold_heads"
-	materials = list(MAT_GOLD = 200)
+	materials = list(MAT_GOLD = 400)
 	credits = 160
 
 /obj/item/weapon/coin/silver
 	cmineral = "silver"
 	icon_state = "coin_silver_heads"
-	materials = list(MAT_SILVER = 200)
+	materials = list(MAT_SILVER = 400)
 	credits = 40
 
 /obj/item/weapon/coin/diamond
 	cmineral = "diamond"
 	icon_state = "coin_diamond_heads"
-	materials = list(MAT_DIAMOND = 200)
+	materials = list(MAT_DIAMOND = 400)
 	credits = 120
 
 /obj/item/weapon/coin/iron
 	cmineral = "iron"
 	icon_state = "coin_iron_heads"
-	materials = list(MAT_METAL = 200)
+	materials = list(MAT_METAL = 400)
 	credits = 20
 
 /obj/item/weapon/coin/plasma
 	cmineral = "plasma"
 	icon_state = "coin_plasma_heads"
-	materials = list(MAT_PLASMA = 200)
+	materials = list(MAT_PLASMA = 400)
 	credits = 80
 
 /obj/item/weapon/coin/uranium
 	cmineral = "uranium"
 	icon_state = "coin_uranium_heads"
-	materials = list(MAT_URANIUM = 200)
+	materials = list(MAT_URANIUM = 400)
 	credits = 160
 
 /obj/item/weapon/coin/clown
 	cmineral = "bananium"
 	icon_state = "coin_bananium_heads"
-	materials = list(MAT_BANANIUM = 200)
+	materials = list(MAT_BANANIUM = 400)
 	credits = 600 //makes the clown cri
 
 /obj/item/weapon/coin/adamantine

code/modules/mining/equipment_locker.dm

@@ -101,22 +101,23 @@
 			inserted_id = I
 			interact(user)
 		return
+		
 	if(exchange_parts(user, W))
 		return
 
-	if(default_deconstruction_crowbar(W))
-		return
-
-	if(default_unfasten_wrench(user, W))
-		return
-	if(default_deconstruction_screwdriver(user, "ore_redemption-open", "ore_redemption", W))
-		updateUsrDialog()
-		return
 	if(panel_open)
 		if(istype(W, /obj/item/weapon/crowbar))
 			empty_content()
 			default_deconstruction_crowbar(W)
-		return 1
+		return
+
+	if(default_unfasten_wrench(user, W))
+		return
+		
+	if(default_deconstruction_screwdriver(user, "ore_redemption-open", "ore_redemption", W))
+		updateUsrDialog()
+		return
+
 	..()
 
 /obj/machinery/mineral/ore_redemption/proc/SmeltMineral(var/obj/item/weapon/ore/O)
@@ -253,7 +254,7 @@
 		while(s.amount > s.max_amount)
 			new s.type(loc,s.max_amount)
 			s.use(s.max_amount)
-		s.loc = loc
+		s.forceMove(loc)
 		s.layer = initial(s.layer)
 
 /**********************Mining Equipment Locker**************************/

code/modules/mining/mine_items.dm

@@ -58,7 +58,7 @@
 	throwforce = 10.0
 	item_state = "pickaxe"
 	w_class = 4.0
-	materials = list(MAT_METAL=3750) //one sheet, but where can you make them?
+	materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("hit", "pierced", "sliced", "attacked")