diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index f3190658e99..20e9147ee27 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -24,11 +24,12 @@ Buildable meters
 	var/pipe_type = 0
 	//var/pipe_dir = 0
 	var/pipename
+	force = 7
 	icon = 'pipe-item.dmi'
 	icon_state = "simple"
 	item_state = "buildpipe"
 	flags = TABLEPASS|FPRINT
-	w_class = 4
+	w_class = 3
 	level = 2
 
 /obj/item/pipe/New(var/loc, var/pipe_type as num, var/dir as num, var/obj/machinery/atmospherics/make_from = null)
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 6e5f00878ae..c69f9e59f85 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -136,9 +136,11 @@ var/ordernum=0
 		//if((locate(/mob/living) in T) && (!locate(/mob/living/carbon/monkey) in T)) return 0  //old check for living excluded monkeys
 		if((locate(/mob/living) in T)) return 0
 		if((locate(/obj/item/device/radio/beacon) in T)) return 0
+		if((locate(/obj/mecha) in T)) return 0
 		for(var/atom/ATM in T)
 			if((locate(/mob/living) in ATM)) return 0
 			if((locate(/obj/item/device/radio/beacon) in ATM)) return 0
+			if((locate(/obj/mecha ) in ATM)) return 0
 
 	return 1
 
@@ -401,7 +403,7 @@ var/ordernum=0
 		if(!supply_shuttle_at_station || supply_shuttle_moving) return
 
 		if (!supply_can_move())
-			usr << "\red The supply shuttle can not transport station employees or homing beacons."
+			usr << "\red The supply shuttle can not transport station employees, exosuits, or homing beacons."
 			return
 
 		src.temp = "Shuttle sent.<BR><BR><A href='?src=\ref[src];mainmenu=1'>OK</A>"