diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 296b46bf85..f54e03e265 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -245,6 +245,9 @@ slowdown = 7 breakouttime = 300 //Deciseconds = 30s = 0.5 minute +/obj/item/restraints/legcuffs/proc/on_removed() + return + /obj/item/restraints/legcuffs/beartrap name = "bear trap" throw_speed = 1 @@ -376,4 +379,20 @@ icon_state = "ebola" hitsound = 'sound/weapons/taserhit.ogg' w_class = WEIGHT_CLASS_SMALL - breakouttime = 60 + breakouttime = 20 + +/obj/item/restraints/legcuffs/bola/energy/on_removed() + new /obj/item/restraints/legcuffs/bola/energy/used(src) + qdel(src) + +/obj/item/restraints/legcuffs/bola/energy/used + name = "energy bola fragments" + icon_state = "ebola_used" + desc = "The shattered fragments of a specialized hard-light bola. Probably won't ensnare fleeing criminals, nor will it aid in arrests - or exist, actually." + +/obj/item/restraints/legcuffs/bola/energy/used/Initialize() + . = ..() + QDEL_IN(src, 10) + +/obj/item/restraints/legcuffs/bola/energy/used/ensnare(mob/living/carbon/C) + return diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 979baeb065..f143f6302d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -434,6 +434,9 @@ legcuffed.forceMove(drop_location()) legcuffed = null I.dropped(src) + if(istype(I, /obj/item/restraints/legcuffs)) + var/obj/item/restraints/legcuffs/lgcf = I + lgcf.on_removed() update_inv_legcuffed() return else diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index e832bf64d3..978ffbda27 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ