diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/mask.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/mask.dmi index 2599467f377..6932cee70b5 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/clothing/mask.dmi and b/modular_skyrat/master_files/icons/donator/mob/clothing/mask.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/plushes.dmi b/modular_skyrat/master_files/icons/obj/plushes.dmi index 1c41ca44212..798d854f7ff 100644 Binary files a/modular_skyrat/master_files/icons/obj/plushes.dmi and b/modular_skyrat/master_files/icons/obj/plushes.dmi differ diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm index fc14234b534..c2d43333862 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -392,21 +392,17 @@ /obj/item/clothing/mask/kindle name = "mask of Kindle" desc = "The mask which belongs to Nanotrasen's Outpost Captain Kindle, it is the symbol of her 'Kindled' cult. The material feels like it's made entirely out of inexpensive plastic." - actions_types = list(/datum/action/item_action/adjust) icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/masks.dmi' icon_state = "kindle" worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/mask.dmi' inhand_icon_state = "kindle" mutant_variants = NONE - flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT - flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES - visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT - visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES + clothing_flags = MASKINTERNALS + flags_inv = HIDEFACIALHAIR | HIDESNOUT + visor_flags_inv = HIDEFACIALHAIR | HIDESNOUT + alternate_worn_layer = ABOVE_BODY_FRONT_HEAD_LAYER w_class = WEIGHT_CLASS_SMALL -/obj/item/clothing/mask/kindle/ui_action_click(mob/user, action) - adjustmask(user) - /obj/item/clothing/mask/kindle/Initialize() . = ..() AddComponent(/datum/component/knockoff,50,list(BODY_ZONE_HEAD),list(ITEM_SLOT_MASK)) @@ -423,8 +419,8 @@ var/mob/living/crusher = movable if(crusher.m_intent != MOVE_INTENT_WALK && (!(crusher.movement_type & (FLYING|FLOATING)) || crusher.buckled)) playsound(src, 'modular_skyrat/master_files/sound/effects/plastic_crush.ogg', 75) - visible_message(span_warning("[crusher] steps on the [src], crushing it with ease.")) - take_damage(200, sound_effect = FALSE) + visible_message(span_warning("[crusher] steps on [src], crushing it with ease.")) + take_damage(100, sound_effect = FALSE) /obj/item/clothing/mask/kindle/atom_destruction(damage_flag) . = ..()