diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm index 412e653888b..7d52f3ba78f 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -7,8 +7,7 @@ w_class = WEIGHT_CLASS_SMALL gas_transfer_coefficient = 0.90 put_on_delay = 2 SECONDS - /// How long you need to gnaw to get rid of the gag, 0 to make it impossible to remove - var/resist_time = 0 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. @@ -87,7 +86,7 @@ icon_state = "tapegag" item_state = null w_class = WEIGHT_CLASS_TINY - resist_time = 30 SECONDS + resist_time = 300 SECONDS mute = MUZZLE_MUTE_MUFFLE flags = DROPDEL @@ -207,7 +206,7 @@ flags_cover = MASKCOVERSMOUTH gas_transfer_coefficient = 0.90 permeability_coefficient = 0.01 - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 0, ACID = 0) actions_types = list(/datum/action/item_action/adjust) can_toggle = TRUE @@ -500,18 +499,6 @@ desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..." icon_state = "banddurathread" -/obj/item/clothing/mask/false_cluwne_mask - name = "cursed clown mask" - desc = "This is a very, very odd looking mask." - icon = 'icons/goonstation/objects/clothing/mask.dmi' - icon_state = "cursedclown" - item_state = "cclown_hat" - icon_override = 'icons/goonstation/mob/clothing/mask.dmi' - lefthand_file = 'icons/goonstation/mob/inhands/clothing_lefthand.dmi' - righthand_file = 'icons/goonstation/mob/inhands/clothing_righthand.dmi' - flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR - flags_cover = MASKCOVERSMOUTH - /obj/item/clothing/mask/cursedclown name = "cursed clown mask" desc = "This is a very, very odd looking mask." diff --git a/tgui/packages/tgui/interfaces/MechaControlConsole.js b/tgui/packages/tgui/interfaces/MechaControlConsole.js index 671f0157c4e..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 })} />