merge conflict fix

code/modules/mining/abandoned_crates.dm

@@ -83,7 +83,7 @@
 			new /obj/item/clothing/suit/hooded/ian_costume(src)
 		if(67 to 68)
 			for(var/i in 1 to rand(4, 7))
-				var /newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace)
+				var/newitem = pick(subtypesof(/obj/item/stock_parts) - /obj/item/stock_parts/subspace)
 				new newitem(src)
 		if(69 to 70)
 			for(var/i in 1 to 5)
@@ -184,7 +184,7 @@
 /obj/structure/closet/crate/secure/loot/AltClick(mob/living/user)
 	if(!user.canUseTopic(src))
 		return
-	attack_hand(user)
+	attack_hand(user) //this helps you not blow up so easily by overriding unlocking which results in an immediate boom.
 
 /obj/structure/closet/crate/secure/loot/attackby(obj/item/W, mob/user)
 	if(locked)

code/modules/mining/equipment/survival_pod.dm

@@ -104,10 +104,6 @@
 	direction = expected_dir
 	..()
 
-/obj/machinery/door/airlock/survival_pod/shuttleRotate(rotation)
-	expected_dir = angle2dir(rotation+dir2angle(dir))
-	..()
-
 /obj/machinery/door/airlock/survival_pod/vertical
 	dir = EAST
 	expected_dir = EAST
@@ -127,10 +123,6 @@
 	direction = expected_dir
 	..()
 
-/obj/structure/door_assembly/door_assembly_pod/shuttleRotate(rotation)
-	expected_dir = angle2dir(rotation+dir2angle(dir))
-	..()
-
 /obj/structure/door_assembly/door_assembly_pod/vertical
 	dir = EAST
 	expected_dir = EAST
@@ -307,7 +299,7 @@
 						/obj/item/melee/supermatter_sword,
 						/obj/item/shield/changeling,
 						/obj/item/lava_staff,
-						/obj/item/dash/energy_katana,
+						/obj/item/energy_katana,
 						/obj/item/hierophant_club,
 						/obj/item/his_grace,
 						/obj/item/gun/ballistic/minigun,

code/modules/mining/equipment/wormhole_jaunter.dm

@@ -94,7 +94,7 @@
 	if(!ismob(M) && !isobj(M))	//No don't teleport lighting and effects!
 		return
 
-	if(M.anchored && (!ismob(M) || (istype(M, /obj/mecha) && !mech_sized)))
+	if(M.anchored && (!ismob(M) || (ismecha(M) && !mech_sized)))
 		return
 
 	if(do_teleport(M, hard_target, 6))

code/modules/mining/lavaland/necropolis_chests.dm

@@ -435,7 +435,7 @@
 		if(!over_object)
 			return
 
-		if (istype(usr.loc, /obj/mecha))
+		if(ismecha(usr.loc))
 			return
 
 		if(!M.incapacitated())

code/modules/mining/machine_stacking.dm

@@ -4,6 +4,7 @@
 	name = "stacking machine console"
 	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "console"
+	desc = "Controls a stacking machine... in theory."
 	density = FALSE
 	anchored = TRUE
 	var/obj/machinery/mineral/stacking_machine/machine = null
@@ -61,6 +62,7 @@
 	name = "stacking machine"
 	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "stacker"
+	desc = "A machine that automatically stacks acquired materials. Controlled by a nearby console."
 	density = TRUE
 	anchored = TRUE
 	var/obj/machinery/mineral/stacking_unit_console/CONSOLE
@@ -91,4 +93,4 @@
 		var/obj/item/stack/sheet/out = new inp.type()
 		out.amount = stack_amt
 		unload_mineral(out)
-		storage.amount -= stack_amt
+		storage.amount -= stack_amt

code/modules/mining/machine_vending.dm

@@ -8,6 +8,7 @@
 	density = TRUE
 	anchored = TRUE
 	circuit = /obj/item/circuitboard/machine/mining_equipment_vendor
+	var/icon_deny = "mining-deny"
 	var/obj/item/card/id/inserted_id
 	var/list/prize_list = list( //if you add something to this, please, for the love of god, use tabs and not spaces.
 		new /datum/data/mining_equipment("1 Marker Beacon",		/obj/item/stack/marker_beacon,											10),
@@ -108,6 +109,7 @@
 	if(href_list["choice"])
 		if(istype(inserted_id))
 			if(href_list["choice"] == "eject")
+				to_chat(usr, "<span class='notice'>You eject the ID from [src]'s card slot.</span>")
 				inserted_id.loc = loc
 				inserted_id.verb_pickup()
 				inserted_id = null
@@ -118,21 +120,31 @@
 					return
 				I.loc = src
 				inserted_id = I
-			else
-				to_chat(usr, "<span class='danger'>No valid ID.</span>")
+				to_chat(usr, "<span class='notice'>You insert the ID into [src]'s card slot.</span>")
+			else 
+				to_chat(usr, "<span class='warning'>Error: No valid ID!</span>")
+				flick(icon_deny, src)
 	if(href_list["purchase"])
 		if(istype(inserted_id))
 			var/datum/data/mining_equipment/prize = locate(href_list["purchase"])
 			if (!prize || !(prize in prize_list))
+				to_chat(usr, "<span class='warning'>Error: Invalid choice!</span>")
+				flick(icon_deny, src)
 				return
 			if(prize.cost > inserted_id.mining_points)
+				to_chat(usr, "<span class='warning'>Error: Insufficent points for [prize.equipment_name]!</span>")
+				flick(icon_deny, src)
 			else
 				inserted_id.mining_points -= prize.cost
+				to_chat(usr, "<span class='notice'>[src] clanks to life briefly before vending [prize.equipment_name]!</span>")
 				new prize.equipment_path(src.loc)
 				SSblackbox.add_details("mining_equipment_bought",
 					"[src.type]|[prize.equipment_path]")
 				// Add src.type to keep track of free golem purchases
 				// separately.
+		else
+			to_chat(usr, "<span class='warning'>Error: Please insert a valid ID!</span>")
+			flick(icon_deny, src)
 	updateUsrDialog()
 	return
 
@@ -147,6 +159,7 @@
 				return
 			C.loc = src
 			inserted_id = C
+			to_chat(usr, "<span class='notice'>You insert the ID into [src]'s card slot.</span>")
 			interact(user)
 		return
 	if(default_deconstruction_screwdriver(user, "mining-open", "mining", I))