From 9ebee935cdd9d84144b8ce1ff5e44f1c1be69cd4 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 22 Apr 2021 21:10:58 +0200
Subject: [PATCH] [MIRROR] You can now unbuckle others from a borg (#5093)

* You can now unbuckle others from a borg (#58570)

* buc

* yeah

* You can now unbuckle others from a borg

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
---
 .../mob/living/silicon/silicon_defense.dm     | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm
index 9e59959f1f6..dd2c052c61e 100644
--- a/code/modules/mob/living/silicon/silicon_defense.dm
+++ b/code/modules/mob/living/silicon/silicon_defense.dm
@@ -64,17 +64,20 @@
 	. = FALSE
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
 		. = TRUE
-	if(user.combat_mode)
-		user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
-		playsound(src.loc, 'sound/effects/bang.ogg', 10, TRUE)
-		visible_message("<span class='danger'>[user] punches [src], but doesn't leave a dent!</span>", \
-						"<span class='warning'>[user] punches you, but doesn't leave a dent!</span>", null, COMBAT_MESSAGE_RANGE, user)
-		to_chat(user, "<span class='danger'>You punch [src], but don't leave a dent!</span>")
+	if(has_buckled_mobs() && !user.combat_mode)
+		user_unbuckle_mob(buckled_mobs[1], user)
 	else
-		visible_message("<span class='notice'>[user] pets [src].</span>", \
-						"<span class='notice'>[user] pets you.</span>", null, null, user)
-		to_chat(user, "<span class='notice'>You pet [src].</span>")
-		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT_RND, "pet_borg", /datum/mood_event/pet_borg)
+		if(user.combat_mode)
+			user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
+			playsound(src.loc, 'sound/effects/bang.ogg', 10, TRUE)
+			visible_message("<span class='danger'>[user] punches [src], but doesn't leave a dent!</span>", \
+							"<span class='warning'>[user] punches you, but doesn't leave a dent!</span>", null, COMBAT_MESSAGE_RANGE, user)
+			to_chat(user, "<span class='danger'>You punch [src], but don't leave a dent!</span>")
+		else
+			visible_message("<span class='notice'>[user] pets [src].</span>", \
+							"<span class='notice'>[user] pets you.</span>", null, null, user)
+			to_chat(user, "<span class='notice'>You pet [src].</span>")
+			SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT_RND, "pet_borg", /datum/mood_event/pet_borg)
 
 
 /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M)