Fix cuff sprites, touch up code (#7387)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Moves fuzzy cuff and bola sprites (all subtypes of handcuffs) to
handcuffs.dmi

Replaces the vague and mysterious magic numbers with SECOND and MINUTE
macros.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Fixes fuzzy cuff & sinew cuff sprites and cleans up the code by
centralizing icons and using macro times.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog
Moves fuzzy cuff and bola sprites (all subtypes of handcuffs) to
handcuffs.dmi

Replaces the vague and mysterious magic numbers with SECOND and MINUTE
macros.
<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

🆑
fix: fix fuzzy cuff & sinew cuff sprites
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
This commit is contained in:
Sorrowfulwinds
2025-11-14 11:29:11 -06:00
committed by GitHub
parent c96b176045
commit 97d3f44efb
4 changed files with 10 additions and 13 deletions

View File

@@ -19,10 +19,10 @@
worth_intrinsic = 10
var/elastic
var/dispenser = 0
var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
var/breakouttime = 2 MINUTES
var/cuff_sound = 'sound/weapons/handcuffs.ogg'
var/cuff_type = "handcuffs"
var/use_time = 30
var/use_time = 3 SECONDS
/obj/item/handcuffs/legacy_mob_melee_hook(mob/target, mob/user, clickchain_flags, list/params, mult, target_zone, intent)
var/mob/living/carbon/C = target
@@ -141,11 +141,10 @@ var/last_chew = 0
name = "fuzzy cuffs"
icon_state = "fuzzycuff"
desc = "Use this to keep... 'prisoners' in line."
breakouttime = 30 //3sec breakout time. why did this not exist before. bruh moment.
breakouttime = 3 SECONDS
/obj/item/handcuffs/sinew
name = "sinew cuffs"
icon = 'icons/obj/mining.dmi'
icon_state = "sinewcuff"
desc = "A complex weave of sinew repurposed as handcuffs."
@@ -153,7 +152,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_white"
breakouttime = 300 //Deciseconds = 30s
breakouttime = 30 SECONDS
cuff_sound = 'sound/weapons/cablecuff.ogg'
cuff_type = "cable restraints"
elastic = 0 //citadel change, why would cable be better than actual handcuffs? who knows.
@@ -204,7 +203,7 @@ var/last_chew = 0
icon_state = "tape_cross"
item_state = null
icon = 'icons/obj/bureaucracy.dmi'
breakouttime = 200
breakouttime = 20 SECONDS
cuff_type = "duct tape"
/obj/item/handcuffs/cable/tape/cyborg
@@ -232,12 +231,11 @@ var/last_chew = 0
name = "legcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon_state = "legcuff"
throw_force = 0
w_class = WEIGHT_CLASS_NORMAL
origin_tech = list(TECH_MATERIAL = 1)
breakouttime = 300 //Deciseconds = 30s = 0.5 minute
breakouttime = 30 SECONDS
cuff_type = "legcuffs"
elastic = 0
cuff_sound = 'sound/weapons/handcuffs.ogg' //This shold work for now.
@@ -317,9 +315,8 @@ var/last_chew = 0
/obj/item/handcuffs/legcuffs/fuzzy
name = "fuzzy legcuffs"
desc = "Use this to keep... 'prisoners' in line."
icon = 'icons/obj/items_vr.dmi'
icon_state = "fuzzylegcuff"
breakouttime = 30 //3sec
breakouttime = 3 SECONDS
/obj/item/handcuffs/legcuffs/bola
@@ -328,7 +325,7 @@ var/last_chew = 0
icon_state = "bola"
elastic = 1
use_time = 0
breakouttime = 30
breakouttime = 3 SECONDS
cuff_sound = 'sound/weapons/towelwipe.ogg' //Is there anything this sound can't do?
/obj/item/handcuffs/legcuffs/bola/can_place(var/mob/target, var/mob/user)
@@ -362,13 +359,13 @@ var/last_chew = 0
name = "reinforced bola"
desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody."
icon_state = "bola_r"
breakouttime = 70
breakouttime = 7 SECONDS
/obj/item/handcuffs/legcuffs/bola/cult
name = "\improper paranatural bola"
desc = "A strong bola, bound with dark magic that allows it to pass harmlessly through allied cultists. Throw it to trip and slow your victim."
icon_state = "bola_cult"
breakouttime = 60
breakouttime = 6 SECONDS
/obj/item/handcuffs/legcuffs/bola/cult/pickup(mob/user, flags, atom/oldLoc)
. = ..()

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB