diff --git a/modular_ss220/clothing/code/clothing_vendors.dm b/modular_ss220/clothing/code/clothing_vendors.dm index f81c968c0b00..fc2c06a42e5f 100644 --- a/modular_ss220/clothing/code/clothing_vendors.dm +++ b/modular_ss220/clothing/code/clothing_vendors.dm @@ -2,8 +2,12 @@ products += list( /obj/item/clothing/head/ratge = 1, ) + contraband += list( + /obj/item/clothing/mask/rooster = 1, + ) prices += list( /obj/item/clothing/head/ratge = 75, + /obj/item/clothing/mask/rooster = 100, ) . = ..() diff --git a/modular_ss220/clothing/code/mask.dm b/modular_ss220/clothing/code/mask.dm index 53f8378b0142..5ad3ba3f981d 100644 --- a/modular_ss220/clothing/code/mask.dm +++ b/modular_ss220/clothing/code/mask.dm @@ -68,3 +68,30 @@ icon = 'modular_ss220/clothing/icons/object/masks.dmi' icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' icon_state = "breathscarf" + +/obj/item/clothing/mask/rooster + w_class = WEIGHT_CLASS_SMALL + flags = BLOCKHAIR + flags_inv = HIDEEARS | HIDEEYES | HIDEFACE + flags_cover = MASKCOVERSMOUTH + modifies_speech = TRUE + species_restricted = list("Human", "Nian", "Skrell", "Slime People", "Diona", "Skeleton", "Shadow") + +/obj/item/clothing/mask/rooster + name = "маска петуха" + desc = "Прямо из Острой дороги космо-Майами. Со встроенными фразами." + icon = 'modular_ss220/clothing/icons/object/masks.dmi' + icon_override = 'modular_ss220/clothing/icons/mob/mask.dmi' + icon_state = "rooster_mask" + +/obj/item/clothing/mask/rooster/handle_speech(datum/source, list/speech_args) + var/message = speech_args[SPEECH_MESSAGE] + if(!length(message)) + return + if(prob(3)) + message += pick( + ". Тебе нравится причинять людям боль?", + ". Вы вернулись, да?", + ". Что, бля, за неуважение?", + ) + speech_args[SPEECH_MESSAGE] = trim(message) diff --git a/modular_ss220/clothing/icons/mob/mask.dmi b/modular_ss220/clothing/icons/mob/mask.dmi index 2362205420f4..e711da15cb6e 100644 Binary files a/modular_ss220/clothing/icons/mob/mask.dmi and b/modular_ss220/clothing/icons/mob/mask.dmi differ diff --git a/modular_ss220/clothing/icons/object/masks.dmi b/modular_ss220/clothing/icons/object/masks.dmi index 9c82cc1ce066..bae752bebd16 100644 Binary files a/modular_ss220/clothing/icons/object/masks.dmi and b/modular_ss220/clothing/icons/object/masks.dmi differ