Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Handcuff + Increased time #5925

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/datums/autolathe/security.dm
Original file line number Diff line number Diff line change
@@ -6,6 +6,10 @@
name = "handcuffs"
build_path = /obj/item/handcuffs

/datum/design/autolathe/sec/handcuffs_adv
name = "handgauntlet"
build_path = /obj/item/handcuffs/advanced

/datum/design/autolathe/sec/zipties
name = "zip ties"
build_path = /obj/item/handcuffs/zipties
Original file line number Diff line number Diff line change
@@ -186,6 +186,7 @@
/datum/design/autolathe/cell/small/excelsior,
/datum/design/autolathe/device/excelsiormine, //security
/datum/design/autolathe/sec/beartrap,
/datum/design/autolathe/sec/handcuffs_adv,
/datum/design/autolathe/prosthesis/excelsior/l_arm, //prostheses
/datum/design/autolathe/prosthesis/excelsior/r_arm,
/datum/design/autolathe/prosthesis/excelsior/l_leg,
@@ -246,6 +247,7 @@
/datum/design/autolathe/ammo/maxim, //maxim
/datum/design/autolathe/sec/silencer, //misc
/datum/design/autolathe/sec/excelsior_shield,
/datum/design/autolathe/sec/handcuffs_adv,
/datum/design/autolathe/tool/excelsior_hammer,
/datum/design/autolathe/clothing/excelsior_armor,
/datum/design/autolathe/container/ammocan_excel
1 change: 1 addition & 0 deletions code/game/objects/items/weapons/autolathe_disk/marshal.dm
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
/datum/design/autolathe/sec/secflashlight,
/datum/design/research/item/light_replacer,
/datum/design/autolathe/sec/handcuffs,
/datum/design/autolathe/sec/handcuffs_adv = 5,
/datum/design/autolathe/sec/zipties = 0,
/datum/design/autolathe/sec/electropack,
/datum/design/autolathe/tool/tacknife,
18 changes: 13 additions & 5 deletions code/game/objects/items/weapons/handcuffs.dm
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
price_tag = 30
var/elastic
var/dispenser = 0
var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
var/breakouttime = 1800 //Deciseconds = 180s = 3 minutes
var/cuff_sound = 'sound/weapons/handcuffs.ogg'
var/cuff_type = "handcuffs"

@@ -124,19 +124,27 @@ var/last_chew = 0
last_chew = world.time


/obj/item/handcuffs/advanced
name = "hand gauntlets"
desc = "Use this to keep prisoners in line. This gauntlet verson is much harder to break out as well as able to wrap around a RIG's gauntlet."
icon = 'icons/obj/items.dmi'
icon_state = "handcuff_advanced"
matter = list(MATERIAL_STEEL = 8, MATERIAL_PLASTEEL = 5)
breakouttime = 6000 //Deciseconds = 600 = 6 minutes
elastic = 1 //advanced

/obj/item/handcuffs/fuzzy
name = "fuzzy cuffs"
icon_state = "fuzzycuff"
breakouttime = 200
desc = "Use this to keep... 'prisoners' in line."


/obj/item/handcuffs/zipties
name = "zip ties"
desc = "Plastic, disposable zipties that can be used to restrain someone."
icon_state = "cuff"
matter = list(MATERIAL_PLASTIC = 2)
breakouttime = 700 //Deciseconds = 70s, this is higher than usual ss13 because breakout time is subtracted by 1 second for every robustness stat
breakouttime = 1200 //Deciseconds = 120s, this is higher than usual ss13 because breakout time is subtracted by robustness stat
cuff_sound = 'sound/weapons/cablecuff.ogg'
cuff_type = "zip ties"
elastic = 1
@@ -145,7 +153,7 @@ var/last_chew = 0
name = "cable restraints"
desc = "Looks like some cables tied together. Could be used to tie something up."
icon_state = "cuff"
breakouttime = 300 //Deciseconds = 30s
breakouttime = 800 //Deciseconds = 80s
cuff_sound = 'sound/weapons/cablecuff.ogg'
cuff_type = "cable restraints"
elastic = 1
@@ -199,7 +207,7 @@ var/last_chew = 0
icon_state = "tape_cross"
item_state = null
icon = 'icons/obj/bureaucracy.dmi'
breakouttime = 200
breakouttime = 600
cuff_type = "duct tape"

/obj/item/handcuffs/fake
16 changes: 8 additions & 8 deletions code/game/objects/items/weapons/storage/hardcases.dm
Original file line number Diff line number Diff line change
@@ -184,7 +184,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/ih/wo/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/voucher/marshal/wosecondary(src) // They no longer spawn with an Amnesty, moved it to this selection of secondaries.
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
new /obj/item/cell/small/high(src)
@@ -195,7 +195,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/ih/spec_officer/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
new /obj/item/cell/small/high(src)
new /obj/item/gun/energy/gun/martin/preloaded(src)
@@ -206,7 +206,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/ih/ranger_officer/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/ammo_magazine/speed_loader_kurtz_50/rubber(src)
new /obj/item/ammo_magazine/speed_loader_kurtz_50/rubber(src)
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
@@ -217,7 +217,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/ih/marshal_officer/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/gun/energy/gun/martin/preloaded(src)
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
new /obj/item/cell/small/high(src)
@@ -234,7 +234,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/blackmarket/co/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/voucher/blackshield/COsecondary(src) // They don't spawn with a Lamia anymore, but come with their own secondary voucher.
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
new /obj/item/cell/small/high(src)
@@ -246,7 +246,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/blackmarket/serg/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
new /obj/item/cell/small/high(src)
new /obj/item/gun/energy/gun/martin/preloaded(src)
@@ -257,7 +257,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/blackmarket/medspec/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
new /obj/item/cell/small/high(src)
new /obj/item/gun/energy/gun/martin/preloaded(src)
@@ -267,7 +267,7 @@ obj/item/storage/hcases/attackby(obj/item/W, mob/user)
exspand_when_spawned = FALSE //No exspanding cheats

/obj/item/storage/hcases/ammo/blackmarket/trooper/populate_contents()
new /obj/item/handcuffs(src)
new /obj/item/handcuffs/advanced(src)
new /obj/item/device/lighting/toggleable/flashlight/seclite(src)
new /obj/item/cell/small/high(src)
new /obj/item/gun/energy/gun/martin/preloaded(src)
Binary file modified icons/obj/items.dmi
Binary file not shown.