FIx runtime since HAS_TRAIT doesn't null test

cmss13-devs · Feb 25, 2024 · f89439a · f89439a
1 parent 6cd49d3
commit f89439a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/code/game/objects/structures/barricade/barricade.dm b/code/game/objects/structures/barricade/barricade.dm
@@ -387,7 +387,9 @@
 	update_health(-200)
 	playsound(src.loc, 'sound/items/Welder2.ogg', 25, TRUE)
 
-	welder = user.get_active_hand()
+	var/current_tool = user.get_active_hand()
+	if(current_tool != welder)
+		return TRUE // Swapped hands or tool
 	if(repeat && can_weld(welder, user, silent = TRUE))
 		// Assumption: The implementation of can_weld will return false if fully repaired
 		if(!try_weld_cade(welder, user, repeat = TRUE, skip_check = TRUE))