diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 51714df4c99..ba966cba51a 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -158,6 +158,7 @@ new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src ) new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src ) new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src ) + /obj/item/weapon/reagent_containers/pill/fluff/listermed name = "anti-depressant pill" desc = "Used to deal with depression." @@ -167,6 +168,18 @@ reagents.add_reagent("stoxin", 5) reagents.add_reagent("sugar", 10) reagents.add_reagent("ethanol", 5) + +/obj/item/clothing/mask/fluff/electriccig //CubeJackal: Barry Sharke + name = "Electronic cigarette" + desc = "An electronic cigarette. Most of the relief of a real cigarette with none of the side effects. Often used by smokers who are trying to quit the habit." + icon = 'custom_items.dmi' + icon_state = "cigon" + throw_speed = 0.5 + item_state = "ciglit" + w_class = 1 + body_parts_covered = null + flags = FPRINT|TABLEPASS + ////////////////////////////////// //////////// Clothing //////////// ////////////////////////////////// @@ -261,6 +274,12 @@ item_state = "leatherjack" color = "leatherjack" +/obj/item/clothing/suit/storage/labcoat/fluff/burnt //Jamini: Edwin Atweeke + name = "burnt labcoat" + desc = "This lab coat has clearly seen better, less burnt, days." + icon = 'custom_items.dmi' + icon_state = "labcoat_burnt_open" + //////////// Uniforms //////////// /obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda diff --git a/config/custom_items.txt b/config/custom_items.txt index dc2dbad3132..507ac4fd99d 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -38,4 +38,6 @@ themij: Taryn Kifer: /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kif tzefa: Wes Solari: /obj/item/fluff/wes_solari_1 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 \ No newline at end of file +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 diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index 25e0331d237..fa909660e26 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index 61319b20f9e..190315199dc 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 78328e97bf8..372da713194 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 93e64a4a618..eb5e42b0849 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ