diff --git a/modular_sand/code/game/machinery/pipe/construction.dm b/modular_sand/code/game/machinery/pipe/construction.dm
index fc16dcc2ba..aedfeaf92c 100644
--- a/modular_sand/code/game/machinery/pipe/construction.dm
+++ b/modular_sand/code/game/machinery/pipe/construction.dm
@@ -5,7 +5,7 @@
 	desc = "Transmits gas across large distances of space. Developed using bluespace technology. Use a multitool on it to set its network."
 
 /obj/item/pipe/bluespace/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/multitool))
+	if(W.tool_behaviour == TOOL_MULTITOOL)
 		var/new_name = input(user, "Enter identifier for bluespace pipe network", "bluespace pipe", bluespace_network_name) as text|null
 		if(!isnull(new_name))
 			bluespace_network_name = new_name
diff --git a/modular_sand/code/game/objects/items/airlock_painter.dm b/modular_sand/code/game/objects/items/airlock_painter.dm
index c55e691007..0a32ec34b3 100644
--- a/modular_sand/code/game/objects/items/airlock_painter.dm
+++ b/modular_sand/code/game/objects/items/airlock_painter.dm
@@ -1,4 +1,3 @@
-
 /obj/item/airlock_painter/decal/proc/check_menu(mob/living/user)
 	if(!istype(user))
 		return FALSE
diff --git a/modular_sand/code/game/objects/items/borg_shapeshifter.dm b/modular_sand/code/game/objects/items/borg_shapeshifter.dm
index 72baaf1f93..99bad8f0ff 100644
--- a/modular_sand/code/game/objects/items/borg_shapeshifter.dm
+++ b/modular_sand/code/game/objects/items/borg_shapeshifter.dm
@@ -35,9 +35,9 @@
 	var/mob/living/silicon/robot/user // needed for process()
 	var/animation_playing = FALSE
 	var/list/borgmodels = list(
-							"(Standard) Default", 
+							"(Standard) Default",
 							"(Standard) Heavy",
-							"(Standard) Sleek", 
+							"(Standard) Sleek",
 							"(Standard) Marina",
 							"(Standard) Robot",
 							"(Standard) Eyebot",
@@ -107,8 +107,8 @@
 	return TRUE
 
 /obj/item/borg_shapeshifter/attack_self(mob/living/silicon/robot/user)
-	if (user && user.cell && user.cell.charge >  activationCost)
-		if (isturf(user.loc))
+	if(user && user.cell && user.cell.charge > activationCost)
+		if(isturf(user.loc))
 			toggle(user)
 		else
 			to_chat(user, "<span class='warning'>You can't use [src] while inside something!</span>")
diff --git a/modular_sand/code/modules/mining/machine_bluespaceminer.dm b/modular_sand/code/modules/mining/machine_bluespaceminer.dm
index 5c094c11ca..a2c8632f3d 100644
--- a/modular_sand/code/modules/mining/machine_bluespaceminer.dm
+++ b/modular_sand/code/modules/mining/machine_bluespaceminer.dm
@@ -17,8 +17,8 @@
 	materials = null
 	return ..()
 
-/obj/machinery/mineral/bluespace_miner/multitool_act(mob/living/user, obj/item/multitool/M)
-	if(istype(M))
+/obj/machinery/mineral/bluespace_miner/multitool_act(mob/living/user, obj/item/M)
+	if(M.tool_behaviour == TOOL_MULTITOOL)
 		if(!M.buffer || !istype(M.buffer, /obj/machinery/ore_silo))
 			to_chat(user, "<span class='warning'>You need to multitool the ore silo first.</span>")
 			return FALSE
@@ -71,11 +71,13 @@
 	. = ..()
 	if(default_deconstruction_crowbar(I, FALSE))
 		return TRUE
-	
-/obj/machinery/mineral/bluespace_miner/screwdriver_act(mob/living/user, obj/item/screwdriver/I)
+
+/obj/machinery/mineral/bluespace_miner/screwdriver_act(mob/living/user, obj/item/I)
 	. = TRUE
 	if(..())
 		return
+	if(!I.tool_behaviour == TOOL_SCREWDRIVER)
+		return
 	if(!state_open)
 		if(powered())
 			if(default_deconstruction_screwdriver(user, "bsminer-maintenance", "bsminer", I))
diff --git a/modular_sand/code/modules/telescience/telesci_computer.dm b/modular_sand/code/modules/telescience/telesci_computer.dm
index 71e63e0ee8..c2869a6c07 100644
--- a/modular_sand/code/modules/telescience/telesci_computer.dm
+++ b/modular_sand/code/modules/telescience/telesci_computer.dm
@@ -73,11 +73,10 @@
 				return
 			inserted_gps = W
 			user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "<span class='notice'>You insert [W] into \the [src]'s GPS device slot.</span>")
-	else if(istype(W, /obj/item/multitool))
-		var/obj/item/multitool/M = W
-		if(M.buffer && istype(M.buffer, /obj/machinery/telepad))
-			telepad = M.buffer
-			M.buffer = null
+	else if(W.tool_behaviour == TOOL_MULTITOOL)
+		if(W.buffer && istype(W.buffer, /obj/machinery/telepad))
+			telepad = W.buffer
+			W.buffer = null
 			to_chat(user, "<span class='caution'>You upload the data from the [W.name]'s buffer.</span>")
 	else
 		return ..()