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 fb5c38e7ca3..afec444d880 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/donator/mob/inhands/donator_left.dmi b/modular_skyrat/master_files/icons/donator/mob/inhands/donator_left.dmi index 03ce692af5f..08778840e27 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/inhands/donator_left.dmi and b/modular_skyrat/master_files/icons/donator/mob/inhands/donator_left.dmi differ diff --git a/modular_skyrat/master_files/icons/donator/mob/inhands/donator_right.dmi b/modular_skyrat/master_files/icons/donator/mob/inhands/donator_right.dmi index f35d8689a3f..6e014e618fb 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/inhands/donator_right.dmi and b/modular_skyrat/master_files/icons/donator/mob/inhands/donator_right.dmi differ diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/masks.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/masks.dmi index cba71a988f3..ce141e98765 100644 Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/masks.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/masks.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/plushes.dmi b/modular_skyrat/master_files/icons/obj/plushes.dmi index 18fcb682a86..65c3b1d56be 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 0325b181380..0593b540bd9 100644 --- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm +++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm @@ -1414,4 +1414,16 @@ worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/suit.dmi' icon_state = "razurath_coat" - +// Donation reward for MaSvedish +/obj/item/clothing/mask/holocigarette/masvedishcigar + name = "holocigar" + desc = "A soft buzzing device that, using holodeck technology, replicates a slow burn cigar. Now with less-shock technology." + icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/masks.dmi' + worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/mask.dmi' + lefthand_file = 'modular_skyrat/master_files/icons/donator/mob/inhands/donator_left.dmi' + righthand_file = 'modular_skyrat/master_files/icons/donator/mob/inhands/donator_right.dmi' + inhand_icon_state = "masvedishcigar_off" + worn_icon_state = "masvedishcigar_off" + icon_state = "masvedishcigar_off" + icon_on = "masvedishcigar_on" + icon_off = "masvedishcigar_off" diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index c579300f410..e143d01bd25 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -617,3 +617,8 @@ name = "Golden Nanotrasen Officer Coat" item_path = /obj/item/clothing/suit/razurathcoat ckeywhitelist = list("razurath") + +/datum/loadout_item/pocket_items/masvedishcigar + name = "Holocigar" + item_path = /obj/item/clothing/mask/holocigarette/masvedishcigar + ckeywhitelist = list("masvedish") diff --git a/modular_skyrat/modules/modular_items/code/ciggies.dm b/modular_skyrat/modules/modular_items/code/ciggies.dm index 377686b5eb0..359a90efe4a 100644 --- a/modular_skyrat/modules/modular_items/code/ciggies.dm +++ b/modular_skyrat/modules/modular_items/code/ciggies.dm @@ -31,13 +31,16 @@ var/mob/living/carbon/smoker = owner if(smoked.lit == FALSE) smoked.icon_state = smoked.icon_on + smoked.worn_icon_state = smoked.icon_on smoked.inhand_icon_state = smoked.icon_on smoked.lit = TRUE smoked.name = "lit [smoked.name]" else smoked.icon_state = smoked.icon_off + smoked.worn_icon_state = smoked.icon_off smoked.inhand_icon_state = smoked.icon_off smoked.lit = FALSE smoked.name = copytext_char(smoked.name, 5) //5 == length_char("lit ") + 1 smoked.update_icon() smoker.update_worn_mask() + smoker.update_held_items()