From b7aa472430c41d1e94dbda5a2b96000791d34949 Mon Sep 17 00:00:00 2001
From: Matt <116982774+Burzah@users.noreply.github.com>
Date: Tue, 28 May 2024 23:15:42 +0000
Subject: [PATCH 1/2] Adjusted arguments for use_tool (#25662)
---
code/modules/mining/satchel_ore_boxdm.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 06b4cd19f0b1..92ed05e83c2a 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -26,7 +26,7 @@
/obj/structure/ore_box/crowbar_act(mob/living/user, obj/item/I)
. = TRUE
- if(!I.use_tool(src, user, 5 SECONDS, I.tool_volume))
+ if(!I.use_tool(src, user, 5 SECONDS, volume = I.tool_volume))
return
user.visible_message("[user] pries [src] apart.", "You pry apart [src].", "You hear splitting wood.")
deconstruct(TRUE, user)
From 40d03dd6690b0c21cb14d2caf800563c7c37d5e5 Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Tue, 28 May 2024 22:08:03 -0400
Subject: [PATCH 2/2] Fixes beepsky (#25675)
* yowza
* whabam
---
code/modules/mob/living/simple_animal/bot/secbot.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 79f7c56c449d..cd5435da4d0c 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -195,7 +195,7 @@
..()
if(istype(W, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) // Any intent but harm will heal, so we shouldn't get angry.
return
- if(!isscrewdriver(W) && !locked && (W.force) && (!target) && (W.damtype != STAMINA))//If the target is locked, they are recieving damage from the screwdriver
+ if(W.force && !target && W.damtype != STAMINA)
retaliate(user)
/mob/living/simple_animal/bot/secbot/emag_act(mob/user)