diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9243880886b..197758ddfca 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -358,6 +358,8 @@ if(!opened && user.loc == src) to_chat(user, SPAN_WARNING("You can't weld [src] from inside!")) return + if(!I.tool_enabled && opened) // If the welder isn't on, just put it in the open closet. + return FALSE if(!I.tool_use_check(user, 0)) return if(opened) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 688b5ab4615..ac6c7cf7d81 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -130,6 +130,8 @@ if(!opened && user.loc == src) to_chat(user, SPAN_WARNING("You can't weld [src] from inside!")) return + if(!I.tool_enabled && opened) // If the welder isn't on, just put it in the open closet. + return FALSE if(!I.tool_use_check(user, 0) || !opened) return WELDER_ATTEMPT_SLICING_MESSAGE