From b023a0976bb0b6d956f84c4f2eed5a68198bbad4 Mon Sep 17 00:00:00 2001 From: Artur Date: Thu, 16 Apr 2020 10:10:39 +0300 Subject: [PATCH 1/3] Makes zipties red again --- code/game/objects/items/handcuffs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 22c9bdc451..7470728b5b 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -197,6 +197,7 @@ name = "zipties" desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use." item_state = "zipties" + color = "white" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' custom_materials = null From 75dab9fa5725ef6093fe1aae43b3aebb5cc304ee Mon Sep 17 00:00:00 2001 From: Artur Date: Thu, 16 Apr 2020 10:51:17 +0300 Subject: [PATCH 2/3] And some other fixes --- code/game/objects/items/handcuffs.dm | 5 +++-- code/modules/power/cable.dm | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) 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 From bbd038bba65ff2e9b61b5a74c36fbe276a0e0e4b Mon Sep 17 00:00:00 2001 From: Artur Date: Sat, 18 Apr 2020 14:06:38 +0300 Subject: [PATCH 3/3] Ghommies suggestion --- code/modules/power/cable.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 8b671f4b3a..ed90ed407f 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -560,10 +560,9 @@ By design, d1 is the smallest direction and d2 is the highest 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)) + if(!do_after(user, 30, TRUE, user, TRUE) || !use(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