diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index ee4592f971e..a85a34caffb 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -308,8 +308,35 @@ user.update_inv_wear_suit() qdel(src) +/obj/item/device/fluff/fei_gasmask_kit //Fei Hazelwood: Tariq Yon-Dale + name = "gas mask conversion kit" + desc = "A gas mask conversion kit." + icon_state = "modkit" + w_class = WEIGHT_CLASS_SMALL + +/obj/item/device/fluff/fei_gasmask_kit/afterattack(atom/target, mob/user, proximity) + if(!proximity || !ishuman(user) || user.incapacitated()) + return + + if(istype(target, /obj/item/clothing/mask/gas) && !istype(target, /obj/item/clothing/mask/gas/welding)) + to_chat(user, "You modify the appearance of [target].") + var/obj/item/clothing/mask/gas/M = target + M.name = "Prescription Gas Mask" + M.desc = "It looks heavily modified, but otherwise functions as a gas mask. The words “Property of Yon-Dale” can be seen on the inner band." + M.icon = 'icons/obj/custom_items.dmi' + M.icon_state = "gas_tariq" + M.species_fit = list("Vulpkanin") + M.sprite_sheets = list( + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + ) + user.update_icons() + qdel(src) + return + + to_chat(user, "You can't modify [target]!") + /obj/item/device/fluff/desolate_baton_kit //DesolateG: Michael Smith - name = "stun baton converstion kit" + name = "stun baton conversion kit" desc = "Some sci-fi looking parts for a stun baton." icon = 'icons/obj/custom_items.dmi' icon_state = "scifikit" @@ -742,6 +769,17 @@ species_fit = null sprite_sheets = null +/obj/item/clothing/suit/jacket/fluff/jacksvest // Anxipal: Jack Harper + name = "Jack's vest" + desc = "A rugged leather vest with a tag labelled \"President\"." + icon = 'icons/obj/custom_items.dmi' + icon_state = "jacksvest" + ignore_suitadjust = TRUE + actions_types = list() + adjust_flavour = null + species_fit = null + sprite_sheets = null + /obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen name = "Nano Fibre Jacket" desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials." diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 8f2c49b09d7..9605302e11f 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/species/vulpkanin/mask.dmi index 14a70e1bb4c..bbf9e085256 100644 Binary files a/icons/mob/species/vulpkanin/mask.dmi and b/icons/mob/species/vulpkanin/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index dea74b81df1..8edfd1eb0ea 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index cda504411b4..f48c88b807f 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ