From 965b42bf51c2e04ae1cfe4527373c75ef1d3af10 Mon Sep 17 00:00:00 2001
From: Daylight <18598676+Daylight2@users.noreply.github.com>
Date: Wed, 11 Sep 2024 20:34:20 +0300
Subject: [PATCH] [FIX] Cult Shadow Shackles can now cuff people who are
 missing an arm. (#26707)

* Copies the requirements from handcuff code

* This proc is never implemented

* Removes unused procs
---
 code/game/gamemodes/cult/blood_magic.dm        |  5 ++---
 .../mob/living/carbon/human/human_mob.dm       |  6 ------
 code/modules/surgery/organs/organ_helpers.dm   | 18 ------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 5ad1dd22dfe..6bb2febd075 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -566,11 +566,10 @@
 		return
 	if(iscarbon(target) && proximity)
 		var/mob/living/carbon/C = target
-		if(C.canBeHandcuffed() || C.get_arm_ignore())
-			CuffAttack(C, user)
-		else
+		if(!(C.has_left_hand() || C.has_right_hand()))
 			user.visible_message("<span class='cultitalic'>This victim doesn't have enough arms to complete the restraint!</span>")
 			return
+		CuffAttack(C, user)
 		source.UpdateButtons()
 		..()
 
diff --git a/code/modules/mob/living/carbon/human/human_mob.dm b/code/modules/mob/living/carbon/human/human_mob.dm
index 7c1d9dc48f1..2a68cfd0467 100644
--- a/code/modules/mob/living/carbon/human/human_mob.dm
+++ b/code/modules/mob/living/carbon/human/human_mob.dm
@@ -1608,12 +1608,6 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
 #undef CPR_CHEST_COMPRESSION_RESTORATION
 #undef CPR_BREATHS_RESTORATION
 
-/mob/living/carbon/human/canBeHandcuffed()
-	if(get_num_arms() >= 2)
-		return TRUE
-	else
-		return FALSE
-
 /mob/living/carbon/human/has_mutated_organs()
 	for(var/obj/item/organ/external/E in bodyparts)
 		if(E.status & ORGAN_MUTATED)
diff --git a/code/modules/surgery/organs/organ_helpers.dm b/code/modules/surgery/organs/organ_helpers.dm
index c10db1e6678..6ec762dee73 100644
--- a/code/modules/surgery/organs/organ_helpers.dm
+++ b/code/modules/surgery/organs/organ_helpers.dm
@@ -74,24 +74,6 @@
 		return TRUE
 	return FALSE
 
-//Limb numbers
-/mob/proc/get_num_arms()
-	return 2
-
-/mob/living/carbon/human/get_num_arms()
-	. = 0
-	for(var/X in bodyparts)
-		var/obj/item/organ/external/affecting = X
-		if(affecting.body_part == ARM_RIGHT)
-			.++
-		if(affecting.body_part == ARM_LEFT)
-			.++
-
-//sometimes we want to ignore that we don't have the required amount of arms.
-/mob/proc/get_arm_ignore()
-	return FALSE
-
-
 /mob/proc/get_num_legs()
 	return 2