diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 0573ef0bfb7..7d73bd617c2 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -41,27 +41,28 @@
 			chassis.occupant.dust()
 			SM.Bumped(chassis)
 			return
-
-		if(!O.anchored)
-			if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
-				chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
-				O.anchored = TRUE
-				if(do_after_cooldown(target))
-					cargo_holder.cargo += O
-					O.loc = chassis
-					O.anchored = FALSE
-					occupant_message("<span class='notice'>[target] successfully loaded.</span>")
-					log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
-				else
-					O.anchored = initial(O.anchored)
-			else
-				occupant_message("<span class='warning'>Not enough room in cargo compartment!</span>")
-		else
+		if(O.anchored)
 			occupant_message("<span class='warning'>[target] is firmly secured!</span>")
+			return
+		if(cargo_holder.cargo.len >= cargo_holder.cargo_capacity)
+			occupant_message("<span class='warning'>Not enough room in cargo compartment!</span>")
+			return
+		chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
+		O.anchored = TRUE
+		if(!do_after_cooldown(target))
+			O.anchored = initial(O.anchored)
+			return
+		cargo_holder.cargo += O
+		O.loc = chassis
+		O.anchored = FALSE
+		occupant_message("<span class='notice'>[target] successfully loaded.</span>")
+		log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
+		return
 
-	else if(istype(target,/mob/living))
+	if(istype(target,/mob/living))
 		var/mob/living/M = target
-		if(M.stat == DEAD) return
+		if(M.stat == DEAD)
+			return
 		if(chassis.occupant.a_intent == INTENT_HARM)
 			M.take_overall_damage(dam_force)
 			if(!M)
@@ -72,12 +73,10 @@
 								"<span class='italics'>You hear something crack.</span>")
 			add_attack_logs(chassis.occupant, M, "Squeezed with [src] ([uppertext(chassis.occupant.a_intent)]) ([uppertext(damtype)])")
 			start_cooldown()
-		else
-			step_away(M,chassis)
-			occupant_message("<span class='notice'>You push [target] out of the way.</span>")
-			chassis.visible_message("<span class='notice'>[chassis] pushes [target] out of the way.</span>")
-		return 1
-
+			return
+		step_away(M,chassis)
+		occupant_message("<span class='notice'>You push [target] out of the way.</span>")
+		chassis.visible_message("<span class='notice'>[chassis] pushes [target] out of the way.</span>")
 
 
 //This is pretty much just for the death-ripley