From 08df09afb85a5962e8c122fe8cc236e02fb12cc1 Mon Sep 17 00:00:00 2001
From: Sean Williams <12197162+S34NW@users.noreply.github.com>
Date: Mon, 5 Apr 2021 15:49:35 +0100
Subject: [PATCH] Cuffs now block arm implant use (#15825)
* no more implant interaction with cuffs
* delete pascal case
---
code/modules/surgery/organs/augments_arms.dm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 571d3f06c18..035cb1b31b2 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -62,8 +62,13 @@
Retract()
..()
+/obj/item/organ/internal/cyberimp/arm/proc/check_cuffs()
+ if(owner.handcuffed)
+ to_chat(owner, "The handcuffs interfere with [src]!")
+ return TRUE
+
/obj/item/organ/internal/cyberimp/arm/proc/Retract()
- if(!holder || (holder in src))
+ if(!holder || (holder in src) || check_cuffs())
return
owner.visible_message("[owner] retracts [holder] back into [owner.p_their()] [parent_organ == "r_arm" ? "right" : "left"] arm.",
@@ -80,10 +85,9 @@
playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
/obj/item/organ/internal/cyberimp/arm/proc/Extend(obj/item/item)
- if(!(item in src))
+ if(!(item in src) || check_cuffs())
return
-
holder = item
holder.flags |= NODROP