Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298

code/modules/mining/abandonedcrates.dm

@@ -146,7 +146,7 @@
 		return
 
 	to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
-	var/input = input(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "") as text
+	var/input = tgui_input_text(usr, "Enter [codelen] digits. All digits must be unique.", "Deca-Code Lock", "")
 	if(!Adjacent(user))
 		return
 	var/list/sanitised = list()
@@ -215,3 +215,10 @@
 				to_chat(user, "<span class='notice'>Last code attempt, [previousattempt], had [bulls] correct digits at correct positions and [cows] correct digits at incorrect positions.</span>")
 			return
 	..()
+
+/obj/structure/closet/crate/secure/loot/damage(var/damage)
+	if(contents.len)
+		visible_message("<font color='red'><b>[src] makes a grinding noise as its contents are destroyed by the deca-lock safety!</b></font>")
+		for(var/obj/O in src.contents)
+			qdel(O)
+	..()

code/modules/mining/drilling/drill.dm

@@ -173,7 +173,7 @@
 /obj/machinery/mining/drill/attackby(obj/item/O as obj, mob/user as mob)
 	if(!active)
 		if(istype(O, /obj/item/device/multitool))
-			var/newtag = text2num(sanitizeSafe(input(user, "Enter new ID number or leave empty to cancel.", "Assign ID number") as text, 4))
+			var/newtag = text2num(sanitizeSafe(tgui_input_text(user, "Enter new ID number or leave empty to cancel.", "Assign ID number", null, 4), 4))
 			if(newtag)
 				name = "[initial(name)] #[newtag]"
 				to_chat(user, "<span class='notice'>You changed the drill ID to: [newtag]</span>")

code/modules/mining/drilling/scanner.dm

@@ -51,7 +51,7 @@
 
 			if(ore_type) metals[ore_type] += T.resources[metal]
 
-	var/message = "[bicon(src)] <span class='notice'>The scanner beeps and displays a readout.</span>"
+	var/message = "\icon[src][bicon(src)] <span class='notice'>The scanner beeps and displays a readout.</span>"
 
 	for(var/ore_type in metals)
 		var/result = "no sign"

code/modules/mining/kinetic_crusher.dm

@@ -230,7 +230,7 @@
 	desc = "A modified design of a proto-kinetic crusher, it is still little more of a combination of various mining tools cobbled together \
 	and kit-bashed into a high-tech cleaver on a stick - with a handguard and a goliath hide grip. While it is still of little use to any \
 	but the most skilled and/or suicidal miners against local fauna, it's an elegant weapon for a more civilized hunter."
-    
+
     look gary there i am
     - hatterhat
 */
@@ -256,6 +256,9 @@
 	backstab_bonus = 40 // 100
 	thrown_bonus = 20 // 120
 	update_item_state = FALSE
+	slot_flags = SLOT_BELT
+
+		
 
 
 /obj/item/weapon/kinetic_crusher/machete/gauntlets
@@ -275,6 +278,7 @@
 	detonation_damage = 37 // 75
 	backstab_bonus = 55 // 130
 	var/obj/item/offhand/crushergauntlets/offhand
+	slot_flags = null
 
 /obj/item/weapon/kinetic_crusher/machete/gauntlets/equipped()
 	. = ..()
@@ -381,6 +385,7 @@
 	thrown_bonus = 50 // 135 but you drop your knife because you threw it
 
 
+
 //destablizing force
 /obj/item/projectile/destabilizer
 	name = "destabilizing force"

code/modules/mining/mine_turfs.dm

@@ -352,7 +352,7 @@ var/list/mining_overlay_cache = list()
 //Not even going to touch this pile of spaghetti
 /turf/simulated/mineral/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+	if (!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 
@@ -403,30 +403,14 @@ var/list/mining_overlay_cache = list()
 					F.attackby(W,user)
 					return
 
-		else if(istype(W, /obj/item/stack/rods))
-			var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
-			if(L)
-				return
-			var/obj/item/stack/rods/R = W
-			if (R.use(1))
-				to_chat(user, "<span class='notice'>Constructing support lattice ...</span>")
-				playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
-				new /obj/structure/lattice(get_turf(src))
-
 		else if(istype(W, /obj/item/stack/tile/floor))
-			var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
-			if(L)
-				var/obj/item/stack/tile/floor/S = W
-				if (S.get_amount() < 1)
-					return
-				qdel(L)
-				playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
-				ChangeTurf(/turf/simulated/floor)
-				S.use(1)
-				return
-			else
-				to_chat(user, "<span class='warning'>The plating is going to need some support.</span>")
+			var/obj/item/stack/tile/floor/S = W
+			if (S.get_amount() < 1)
 				return
+			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+			ChangeTurf(/turf/simulated/floor)
+			S.use(1)
+			return
 
 
 	else