diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index ba966cba51a..b6fee25ce47 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -112,6 +112,14 @@ icon_on = "blackzippoon" icon_off = "blackzippo" +/obj/item/weapon/lighter/zippo/fluff/sniperyeti_1 //sniperyeti: Patrick Harris/Susan Harris + name = "red black zippo" + desc = "A shiny red zippo lighter that looks like it's in perfect condition." + icon = 'custom_items.dmi' + icon_state = "redzippo" + icon_on = "redzippoon" + icon_off = "redzippo" + /obj/item/weapon/fluff/cado_keppel_1 //sparklysheep: Cado Keppel name = "purple comb" desc = "A pristine purple comb made from flexible plastic. It has a small K etched into its side." @@ -237,6 +245,12 @@ icon = 'custom_items.dmi' icon_state = "yuki_matsuda_1" +/obj/item/clothing/head/helmet/welding/fluff/norah_briggs_1 //bountylord13: Norah Briggs + name = "blue flame decal welding helmet" + desc = "A welding helmet with blue flame decals on it." + icon = 'custom_items.dmi' + icon_state = "norah_briggs_1" + /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1 //themij: Taryn Kifer name = "orange bandana" desc = "Hey, I think we're missing a hazard vest..." @@ -280,6 +294,13 @@ icon = 'custom_items.dmi' icon_state = "labcoat_burnt_open" +/obj/item/clothing/suit/armor/vest/fluff/deus_blueshield //deusdactyl + name = "blue shield security armor" + desc = "An armored vest with the badge of a Blue Shield Security lieutenant." + icon = 'custom_items.dmi' + icon_state = "deus_blueshield" + item_state = "deus_blueshield" + //////////// Uniforms //////////// /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda @@ -305,6 +326,14 @@ icon_state = "jeremy_wolf_1" color = "jeremy_wolf_1" +/obj/item/clothing/under/fluff/tian_dress //phaux: Tian Yinhu + name = "purple dress" + desc = "A nicely tailored purple dress made for the taller woman." + icon = 'custom_items.dmi' + icon_state = "tian_dress" + item_state = "tian_dress" + color = "tian_dress" + //////////// Masks //////////// /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell diff --git a/config/custom_items.txt b/config/custom_items.txt index 2e32aedef1e..afda096b9a4 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -39,4 +39,9 @@ vinceluk: Seth Sealis: /obj/item/clothing/suit/storage/det_suit/fluff/graycoat whitellama: Ethan Way: /obj/item/fluff/ethan_way_1 whitewolf41: Jeremy Wolf: /obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 jamini: Edwin Atweeke: /obj/item/clothing/suit/storage/labcoat/fluff/burnt -cubejackal: Barry Sharke: /obj/item/clothing/mask/fluff/electriccig \ No newline at end of file +cubejackal: Barry Sharke: /obj/item/clothing/mask/fluff/electriccig +sniperyeti: Patrick Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1 +sniperyeti: Susan Harris: /obj/item/weapon/lighter/zippo/fluff/sniperyeti_1 +bountylord13: Norah Briggs: /obj/item/clothing/head/helmet/welding/fluff/norah_briggs_1 +deusdactyl: James Girard: /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield +phaux: Tian Yinhu: /obj/item/clothing/under/fluff/tian_dress \ No newline at end of file diff --git a/icons/mob/critter.dmi b/icons/mob/critter.dmi index 67b8bac8a10..b42570ab7ef 100644 Binary files a/icons/mob/critter.dmi and b/icons/mob/critter.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 7ae983d16f6..58b96e97d0a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index cf3efa853be..94c25a7b4a0 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 372da713194..afc061ffe4d 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 1449da2447b..2b6b4cb638c 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 6bc0d81e937..d5a6aa6004a 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index eb5e42b0849..3c5db517cba 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ