From 823cd2a5ebfd81d4875769cea55d07b13269b8d5 Mon Sep 17 00:00:00 2001 From: Daylight <18598676+Daylight2@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:11:56 +0200 Subject: [PATCH 1/2] Update MechaControlConsole.js --- tgui/packages/tgui/interfaces/MechaControlConsole.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tgui/packages/tgui/interfaces/MechaControlConsole.js b/tgui/packages/tgui/interfaces/MechaControlConsole.js index 1adfcc393eb..443eaa136e1 100644 --- a/tgui/packages/tgui/interfaces/MechaControlConsole.js +++ b/tgui/packages/tgui/interfaces/MechaControlConsole.js @@ -64,7 +64,7 @@ export const MechaControlConsole = (props, context) => { act('shock', { mt: beacon.uid })} /> From 004502ff10ada43f12bb0a35a253b9f6a80a90ab Mon Sep 17 00:00:00 2001 From: Daylight <18598676+Daylight2@users.noreply.github.com> Date: Wed, 7 Dec 2022 20:04:28 +0200 Subject: [PATCH 2/2] Changes breakout time to 30, refactors ds into s --- code/modules/clothing/masks/miscellaneous.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 52f9fdb2d00..7d52f3ba78f 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -6,8 +6,8 @@ flags_cover = MASKCOVERSMOUTH w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.90 - put_on_delay = 20 - var/resist_time = 0 //deciseconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove + put_on_delay = 2 SECONDS + var/resist_time = 0 SECONDS //seconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove var/mute = MUZZLE_MUTE_ALL var/security_lock = FALSE // Requires brig access to remove 0 - Remove as normal var/locked = FALSE //Indicates if a mask is locked, should always start as 0. @@ -86,7 +86,7 @@ icon_state = "tapegag" item_state = null w_class = WEIGHT_CLASS_TINY - resist_time = 150 + resist_time = 300 SECONDS mute = MUZZLE_MUTE_MUFFLE flags = DROPDEL @@ -112,7 +112,7 @@ desc = "A muzzle designed to prevent biting." icon_state = "muzzle_secure" item_state = "muzzle_secure" - resist_time = 0 + resist_time = 0 SECONDS mute = MUZZLE_MUTE_NONE security_lock = TRUE locked = FALSE