From 27563ccd7de9c5679c7a93bbd1847e2c64d75a4f Mon Sep 17 00:00:00 2001
From: Bloop <13398309+vinylspiders@users.noreply.github.com>
Date: Sat, 6 Jan 2024 08:45:15 -0500
Subject: [PATCH] [MISSED MIRROR] fixes touching minebots not changing combat
 mode (#80789) (#340)

fixes touching minebots not changing combat mode (#80789)

## About The Pull Request

uhh touch with empty hand and off combat mode and they change combat
mode now

## Why It's Good For The Game

fixes #80584

## Changelog
:cl:
fix: you can use your hand to make minebots go into combat mode again
/:cl:

Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com>
---
 code/modules/mob/living/basic/minebots/minebot.dm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/basic/minebots/minebot.dm b/code/modules/mob/living/basic/minebots/minebot.dm
index 6bc0202aed5..f9a22f955f1 100644
--- a/code/modules/mob/living/basic/minebots/minebot.dm
+++ b/code/modules/mob/living/basic/minebots/minebot.dm
@@ -118,10 +118,8 @@
 	return ..()
 
 /mob/living/basic/mining_drone/attack_hand(mob/living/carbon/human/user, list/modifiers)
-	. = ..()
-
-	if(. || user.combat_mode)
-		return
+	if(user.combat_mode)
+		return ..()
 	set_combat_mode(!combat_mode)
 	balloon_alert(user, "now [combat_mode ? "attacking wildlife" : "collecting loose ore"]")