From a55cb88fb00aa29277ad94f5ec6a6b8322626b21 Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Mon, 11 Nov 2024 13:11:24 -0600
Subject: [PATCH] Two random things (#618)

---
 code/game/objects/items/handcuffs.dm          | 28 +++++++++++++++----
 .../mob/dead/new_player/sprite_accessories.dm |  1 +
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index e1feb5b512cb..4f15e60094e8 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -78,8 +78,24 @@
 		return
 
 	if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))) //Clumsy people have a 50% chance to handcuff themselves instead of their target.
-		to_chat(user, span_warning("Uh... how do those things work?!"))
-		apply_cuffs(user,user)
+		to_chat(user, span_smallnoticeital("Uh... how do these things work?!"))
+		if(iscarbon(user))
+			var/mob/living/carbon/carbuser = user
+			if(!carbuser.handcuffed && carbuser.canBeHandcuffed())
+				user.visible_message(
+					span_danger("You fumble with [src] and accidentally put them on yourself!"),
+					span_userdanger("[user] fumbles with [src] and accidentally puts them on [user.p_them()]self!")
+				)
+				playsound(src, cuffsound, 30, TRUE, -2)
+				log_combat(user, C, "failed to handcuff", src, "(handcuffed self, clumsy)")
+				apply_cuffs(user, user)
+				return
+
+		user.do_attack_animation(user)
+		user.visible_message(
+			span_danger("You fumble with [src]."),
+			span_danger("[user] fumbles with [src].")
+		)
 		return
 
 	if(!C.handcuffed)
@@ -88,8 +104,8 @@
 								span_userdanger("[user] is trying to put [src] on you!"))
 			if(C.is_blind())
 				to_chat(C, span_userdanger("As you feel someone grab your wrists, [src] start digging into your skin!"))
-			playsound(loc, cuffsound, 30, TRUE, -2)
-			log_combat(user, C, "attempted to handcuff")
+			playsound(src, cuffsound, 30, TRUE, -2)
+			log_combat(user, C, "attempted to handcuff", src)
 			if(do_after(user, handcuff_time, C, timed_action_flags = IGNORE_SLOWDOWNS) && C.canBeHandcuffed())
 				if(iscyborg(user))
 					apply_cuffs(C, user, TRUE)
@@ -99,10 +115,10 @@
 									span_userdanger("[user] handcuffs you."))
 				SSblackbox.record_feedback("tally", "handcuffs", 1, type)
 
-				log_combat(user, C, "handcuffed")
+				log_combat(user, C, "handcuffed", src)
 			else
 				to_chat(user, span_warning("You fail to handcuff [C]!"))
-				log_combat(user, C, "failed to handcuff")
+				log_combat(user, C, "failed to handcuff", src)
 		else
 			to_chat(user, span_warning("[C] doesn't have two hands..."))
 
diff --git a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm
index 7b0e405642a5..2520d30660e4 100644
--- a/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/maplestation_modules/code/modules/mob/dead/new_player/sprite_accessories.dm
@@ -342,6 +342,7 @@
 	name = "Big"
 	icon = 'maplestation_modules/icons/mob/tails.dmi'
 	icon_state = "snaketail"
+	spine_key = NONE
 
 // https://github.com/Skyrat-SS13/Skyrat-tg/pull/969 (same for Divinity/Big below. TODO group)
 /datum/sprite_accessory/frills/horns