diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 7d734339bb..c2f941c016 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -285,16 +285,18 @@ BLIND     // can't see anything
 	var/mob/M = usr
 	if (istype(M, /mob/dead/)) return
 	if (usr.stat) return
-	if(src.has_sensor >= 2)
+	if(has_sensor >= 2)
 		usr << "The controls are locked."
 		return 0
-	if(src.has_sensor <= 0)
+	if(has_sensor <= 0)
 		usr << "This suit does not have any sensors."
 		return 0
-	src.sensor_mode += 1
-	if(src.sensor_mode > 3)
-		src.sensor_mode = 0
-	switch(src.sensor_mode)
+
+	var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon")
+	var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes
+	sensor_mode = modes.Find(switchMode) - 1
+
+	switch(sensor_mode)
 		if(0)
 			usr << "You disable your suit's remote sensing equipment."
 		if(1)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index ca74ee74e9..14e07c3f8c 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -233,6 +233,7 @@ proc/move_mining_shuttle()
 		digspeed = 30
 		origin_tech = "materials=2;powerstorage=3;engineering=2"
 		desc = "Yours is the drill that will pierce through the rock walls."
+		drill_verb = "drilling"
 
 	jackhammer
 		name = "sonic jackhammer"
@@ -241,6 +242,7 @@ proc/move_mining_shuttle()
 		digspeed = 20 //faster than drill, but cannot dig
 		origin_tech = "materials=3;powerstorage=2;engineering=2"
 		desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
+		drill_verb = "hammering"
 
 	gold
 		name = "golden pickaxe"
@@ -259,6 +261,7 @@ proc/move_mining_shuttle()
 		digspeed = 20 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/ light thermite on fire
 		origin_tech = "materials=4;plasmatech=3;engineering=3"
 		desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
+		drill_verb = "cutting"
 
 	diamond
 		name = "diamond pickaxe"
@@ -275,6 +278,7 @@ proc/move_mining_shuttle()
 		digspeed = 5 //Digs through walls, girders, and can dig up sand
 		origin_tech = "materials=6;powerstorage=4;engineering=5"
 		desc = "Yours is the drill that will pierce the heavens!"
+		drill_verb = "drilling"
 
 	borgdrill
 		name = "cyborg mining drill"
@@ -282,6 +286,7 @@ proc/move_mining_shuttle()
 		item_state = "jackhammer"
 		digspeed = 15
 		desc = ""
+		drill_verb = "drilling"
 
 /*****************************Shovel********************************/