From 9b3dc9f81b27ba2e0749f4b4a75cf872952ef6bf Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawamanthing@gmail.com>
Date: Sat, 20 Oct 2018 07:56:54 -0500
Subject: [PATCH] Removes snowflake cuffs add law speech for borg cuffs

---
 code/game/objects/items/handcuffs.dm          |  2 ++
 .../living/silicon/robot/dogborg_equipment.dm | 23 -------------------
 .../mob/living/silicon/robot/robot_modules.dm |  2 +-
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 8a2e5d1292..1f3019fe65 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -94,6 +94,8 @@
 	target.update_handcuffed()
 	if(trashtype && !dispense)
 		qdel(src)
+	if(iscyborg(user))
+		playsound(user, "law", 50, 0)
 	return
 
 /obj/item/restraints/handcuffs/sinew
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
index 9b3dd8619d..967e824c17 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
@@ -56,29 +56,6 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
 				to_chat(user, "<span class='notice'>Your jaws are now [status ? "Combat" : "Pup'd"].</span>")
 	update_icon()
 
-
-//Cuffs
-
-/obj/item/restraints/handcuffs/cable/zipties/cyborg/dog/attack(mob/living/carbon/C, mob/user, proximity)
-	if(!proximity)
-		return
-
-	if(!C.handcuffed)
-		playsound(loc, 'sound/weapons/cablecuff.ogg', 60, 1, -2)
-		C.visible_message("<span class='danger'>[user] is trying to put zipties on [C]!</span>", \
-							"<span class='userdanger'>[user] is trying to put zipties on [C]!</span>")
-		if(!do_mob(user, C, 60))
-			to_chat(user,"<span class='warning'>You fail to handcuff [C]!</span>")
-			return
-
-		if(!C.handcuffed)
-			C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C)
-			C.update_inv_handcuffed(0)
-			to_chat(user,"<span class='notice'>You handcuff [C].</span>")
-			playsound(loc, pick('sound/voice/beepsky/criminal.ogg', 'sound/voice/beepsky/justice.ogg', 'sound/voice/beepsky/freeze.ogg'), 50, FALSE)
-			log_combat(user, C, "handcuffed")
-
-
 //Boop
 
 /obj/item/analyzer/nose
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
index 8858934a53..0efe493c35 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -30,7 +30,7 @@
 /obj/item/robot_module/k9
 	name = "Security K-9 Unit"
 	basic_modules = list(
-		/obj/item/restraints/handcuffs/cable/zipties/cyborg/dog,
+		/obj/item/restraints/handcuffs/cable/zipties,
 		/obj/item/storage/bag/borgdelivery,
 		/obj/item/dogborg/jaws/big,
 		/obj/item/dogborg/pounce,