Skip to content

Commit

Permalink
[FIX] Cult Shadow Shackles can now cuff people who are missing an arm. (
Browse files Browse the repository at this point in the history
#26707)

* Copies the requirements from handcuff code

* This proc is never implemented

* Removes unused procs
  • Loading branch information
Daylight2 authored Sep 11, 2024
1 parent 4f6641c commit 965b42b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 27 deletions.
5 changes: 2 additions & 3 deletions code/game/gamemodes/cult/blood_magic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
..()

Expand Down
6 changes: 0 additions & 6 deletions code/modules/mob/living/carbon/human/human_mob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 0 additions & 18 deletions code/modules/surgery/organs/organ_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 965b42b

Please sign in to comment.