Merge remote-tracking branch 'upstream/master'

ErdGinalD · May 29, 2024 · 99f72ed · 99f72ed
2 parents 4e47b49 + 40d03dd
commit 99f72ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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("<span class='notice'>[user] pries [src] apart.</span>", "<span class='notice'>You pry apart [src].</span>", "<span class='italics'>You hear splitting wood.</span>")
 	deconstruct(TRUE, user)

diff --git 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)