mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
TG: - Ported cable restraints from Bay12. You make them by using a verb on cable
coils. Takes 15 lengths to make, applied the same way as handcuffs, they have the same effects as handcuffs, but only take 30s to remove if you resist. They can also be removed by using wirecutters on a handcuffed mob. - Added 4 new cable colors. Pink (ported from Bay12), orange, cyan and white. - Engineer tool belts can now also spawn with orange wire, in addition to yellow and red. - Tool closets and electrical toolboxes can now spawn with cables in any of the 8 colors. - Added cablecuff.ogg from bay12, played when you apply cable cuffs on someone - Added this stuff to the changelog So yeah, some stuff is credited to bay12, tho some of it was nearly enough completely recoded. Screenshots: http://www.kamletos.si/wire%20colors.png http://www.kamletos.si/cuff%20restraints.png Revision: r3770 Author: baloh.matevz
This commit is contained in:
@@ -694,6 +694,10 @@
|
||||
if(resisting)
|
||||
for(var/mob/O in viewers(usr, null))
|
||||
O.show_message(text("\red <B>[] resists!</B>", usr), 1)
|
||||
|
||||
|
||||
|
||||
//breaking out of handcuffs
|
||||
if(usr:handcuffed && usr:canmove && (usr.last_special <= world.time))
|
||||
var/breakouttime = 1200
|
||||
var/displaytime = 2
|
||||
@@ -716,10 +720,13 @@
|
||||
del(usr:handcuffed)
|
||||
usr:handcuffed = null
|
||||
else
|
||||
if(istype(usr:handcuffed, /obj/item/weapon/handcuffs/cable))
|
||||
breakouttime = 300
|
||||
displaytime = 0.5
|
||||
usr << "\red You attempt to remove \the [usr:handcuffed]. (This will take around [displaytime] minutes and you need to stand still)"
|
||||
var/obj/item/weapon/handcuffs/HC = usr:handcuffed
|
||||
var/breakouttime = 1200 //A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type
|
||||
var/displaytime = 2 //Minutes to display in the "this will take X minutes."
|
||||
if(istype(HC)) //If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future...
|
||||
breakouttime = HC.breakouttime
|
||||
displaytime = breakouttime / 600 //Minutes
|
||||
usr << "\red You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)"
|
||||
for(var/mob/O in viewers(usr))
|
||||
O.show_message(text("\red <B>[] attempts to remove \the [usr:handcuffed]!</B>", usr), 1)
|
||||
spawn(0)
|
||||
|
||||
+19
-12
@@ -246,19 +246,18 @@
|
||||
set name = "Make Cable Restraints"
|
||||
set category = "Object"
|
||||
var/mob/M = usr
|
||||
if (istype(M, /mob/dead/)) return
|
||||
if (usr.stat) return
|
||||
if(!istype(usr.loc,/turf)) return
|
||||
if(src.amount <= 14)
|
||||
usr << "\red You need at least 15 lengths to make restraints!"
|
||||
return
|
||||
var/obj/item/weapon/handcuffs/cable/B = new /obj/item/weapon/handcuffs/cable(usr.loc)
|
||||
usr << "\blue You wind some cable together to make some restraints."
|
||||
if(src.amount == 15)
|
||||
del(src)
|
||||
|
||||
if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned)
|
||||
if(!istype(usr.loc,/turf)) return
|
||||
if(src.amount <= 14)
|
||||
usr << "\red You need at least 15 lengths to make restraints!"
|
||||
return
|
||||
var/obj/item/weapon/handcuffs/cable/B = new /obj/item/weapon/handcuffs/cable(usr.loc)
|
||||
B.icon_state = "cuff_[color]"
|
||||
usr << "\blue You wind some cable together to make some restraints."
|
||||
src.use(15)
|
||||
else
|
||||
src.amount -= 15
|
||||
B.layer = 20
|
||||
usr << "\blue You cannot do that."
|
||||
..()
|
||||
|
||||
/obj/item/weapon/cable_coil/attackby(obj/item/weapon/W, mob/user)
|
||||
@@ -561,3 +560,11 @@ obj/structure/cable/proc/cableColor(var/colorC)
|
||||
icon = 'power_cond_green.dmi'
|
||||
if("blue")
|
||||
icon = 'power_cond_blue.dmi'
|
||||
if("pink")
|
||||
icon = 'power_cond_pink.dmi'
|
||||
if("orange")
|
||||
icon = 'power_cond_orange.dmi'
|
||||
if("cyan")
|
||||
icon = 'power_cond_cyan.dmi'
|
||||
if("white")
|
||||
icon = 'power_cond_white.dmi'
|
||||
|
||||
Reference in New Issue
Block a user