diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index c0bc4e827a1..532aea59a36 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -200,6 +200,10 @@
 	var/disabled = 0 //malf
 
 	action(atom/target)
+		if(istype(target,/area/shuttle)||istype(target, /turf/space/transit))//>implying these are ever made -Sieve
+			disabled = 1
+		else
+			disabled = 0
 		if(!istype(target, /turf) && !istype(target, /obj/machinery/door/airlock))
 			target = get_turf(target)
 		if(!action_checks(target) || disabled || get_dist(chassis, target)>3) return
diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm
index 36001689c58..e1a7ac7b123 100644
--- a/code/game/objects/items/robot_items.dm
+++ b/code/game/objects/items/robot_items.dm
@@ -227,7 +227,7 @@
 
 
 	afterattack(atom/A, mob/user as mob)
-		if(istype(A,/area/shuttle))//||istype(A,/turf/space/transit))//No RCDs on the shuttles -Sieve
+		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//No RCDs on the shuttles -Sieve
 			disabled = 1
 		else
 			disabled = 0
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 9df99a58173..25f32a39343 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -71,6 +71,10 @@ RCD
 
 
 	afterattack(atom/A, mob/user as mob)
+		if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))//Nanotrasen Matter Jammer TM -Sieve
+			disabled = 1
+		else
+			disabled = 0
 		if(!(istype(A, /turf) || istype(A, /obj/machinery/door/airlock)))
 			return