From a1b61fa2b6a08fd1fd05ede67822defed1c5ae59 Mon Sep 17 00:00:00 2001 From: Alan Date: Sun, 17 May 2026 14:42:20 -0400 Subject: [PATCH] Put disabled welders in open closets. (#31995) * Put disabled welders in open closets. * Include crates. * Apply suggestions from CRUNCH review. Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan --------- Signed-off-by: Alan Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> --- code/game/objects/structures/crates_lockers/closets.dm | 2 ++ code/game/objects/structures/crates_lockers/crates.dm | 2 ++ 2 files changed, 4 insertions(+) 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