x

code/game/objects/structures/crates_lockers/closets.dm

@@ -243,19 +243,22 @@
 	else if(istype(W, /obj/item/packageWrap) || istype(W, /obj/item/explosive/plastic))
 		return
 	else if(iswelder(W))
+		if(material != MATERIAL_METAL && material != MATERIAL_PLASTEEL)
+			to_chat(user, SPAN_WARNING("You cannot weld [material]!"))
+			return FALSE//Can't weld wood/plastic.
 		if(!HAS_TRAIT(W, TRAIT_TOOL_BLOWTORCH))
 			to_chat(user, SPAN_WARNING("You need a stronger blowtorch!"))
-			return
+			return FALSE
 		var/obj/item/tool/weldingtool/WT = W
 		if(!WT.isOn())
 			to_chat(user, SPAN_WARNING("\The [WT] needs to be on!"))
-			return
+			return FALSE
 		if(!WT.remove_fuel(0, user))
 			to_chat(user, SPAN_NOTICE("You need more welding fuel to complete this task."))
-			return
+			return FALSE
 		playsound(src, 'sound/items/Welder.ogg', 25, 1)
 		if(!do_after(user, 10 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
-			return
+			return FALSE
 		welded = !welded
 		update_icon()
 		for(var/mob/M as anything in viewers(src))
@@ -264,9 +267,9 @@
 		if(isxeno(user))
 			var/mob/living/carbon/xenomorph/opener = user
 			src.attack_alien(opener)
-			return
+			return FALSE
 		src.attack_hand(user)
-	return
+	return TRUE
 
 /obj/structure/closet/MouseDrop_T(atom/movable/O, mob/user)
 	if(!opened)