diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 7470728b5b..1e0a6ce6dc 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -163,7 +163,6 @@ color = pick(cable_colors) /obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params) - ..() if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I if (R.use(1)) @@ -203,7 +202,9 @@ custom_materials = null breakouttime = 450 //Deciseconds = 45s trashtype = /obj/item/restraints/handcuffs/cable/zipties/used - color = null + +/obj/item/restraints/handcuffs/cable/zipties/attack_self() //Zipties arent cable + return /obj/item/restraints/handcuffs/cable/zipties/used desc = "A pair of broken zipties." diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 49848824e4..8b671f4b3a 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -556,14 +556,14 @@ By design, d1 is the smallest direction and d2 is the highest new_cable.update_icon() /obj/item/stack/cable_coil/attack_self(mob/user) - if(!use(15)) - to_chat(user, "You dont have enough cable coil to make restraints out of them") + if(amount < 15) + to_chat(user, "You don't have enough cable coil to make restraints out of them") return to_chat(user, "You start making some cable restraints.") if(!do_after(user, 30, TRUE, user, TRUE)) - to_chat(user, "You fail to make cable restraints, you need to stand still while doing so.") - give(15) + to_chat(user, "You fail to make cable restraints, you need to be standing still to do it") return + use(15) var/obj/item/restraints/handcuffs/cable/result = new(get_turf(user)) user.put_in_hands(result) result.color = color