diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm index b09e0e9ea5..02a4ad6da3 100644 --- a/code/game/objects/items/weapons/ecigs.dm +++ b/code/game/objects/items/weapons/ecigs.dm @@ -12,7 +12,7 @@ body_parts_covered = 0 var/brightness_on = 1 chem_volume = 0 //ecig has no storage on its own but has reagent container created by parent obj - item_state = "ecigoff" + item_state = "ecigoff1" is_pipe = TRUE //to avoid a runtime in examine() var/icon_off var/icon_empty @@ -24,7 +24,7 @@ /obj/item/clothing/mask/smokable/ecig/examine(mob/user) . = ..() - + if(active) . += "It is turned on." else @@ -61,6 +61,7 @@ icon_off = "ecigoff1" icon_empty = "ecigoff1" icon_on = "ecigon" + /obj/item/clothing/mask/smokable/ecig/util/Initialize() . = ..() color = pick(ecig_colors) @@ -69,6 +70,7 @@ name = "deluxe electronic cigarette" desc = "A premium model eGavana MK3 electronic cigarette, shaped like a cigar." description_fluff = "The eGavana is a product of Morpheus Cyberkinetics, and comes standard with additional jacks that allow cyborgs and positronics to experience a simulation of soothing artificial oil residues entering their lungs. It's a pretty good cig for meatbags, too." + cartridge_type = /obj/item/reagent_containers/ecig_cartridge/high_nicotine icon_state = "pcigoff1" icon_off = "pcigoff1" icon_empty = "pcigoff2" @@ -88,15 +90,15 @@ /obj/item/clothing/mask/smokable/ecig/update_icon() if (active) - item_state = icon_on + item_state = "ecigon" icon_state = icon_on set_light(brightness_on) else if (ec_cartridge) set_light(0) - item_state = icon_off + item_state = "ecigoff1" icon_state = icon_off else - icon_state = icon_empty + icon_state = "ecigoff2" item_state = icon_empty set_light(0) if(ismob(loc)) @@ -243,13 +245,12 @@ reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) reagents.add_reagent("coffee", 5) -/* -/obj/item/reagent_containers/ecig_cartridge/cannabis - name = "herb flavour cartridge" - desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label seems to be suspiciously scuffed off..." -/obj/item/reagent_containers/ecig_cartridge/cannabis/Initialize() + +/obj/item/reagent_containers/ecig_cartridge/ambrosia + name = "ambrosia flavour cartridge" + desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says it contains ambrosia extract." +/obj/item/reagent_containers/ecig_cartridge/ambrosia/Initialize() . = ..() reagents.add_reagent("nicotine", 5) reagents.add_reagent("water", 10) - reagents.add_reagent("cannabis", 5) -*/ + reagents.add_reagent("ambrosia_extract", 5) diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 39b7564572..0b723bd798 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -55,7 +55,11 @@ display_name = "electronic cigarette" path = /obj/item/clothing/mask/smokable/ecig/util -/datum/gear/ecig/deluxe +/datum/gear/ecig_simple + display_name = "electronic cigarette, simple" + path = /obj/item/clothing/mask/smokable/ecig/simple + +/datum/gear/ecig_deluxe display_name = "electronic cigarette, deluxe" path = /obj/item/clothing/mask/smokable/ecig/deluxe cost = 2 diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 9d0a6ca206..03ef96aad3 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -313,7 +313,6 @@ /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/clothing/mask/smokable/ecig/util = 2, - ///obj/item/clothing/mask/smokable/ecig/deluxe = 2, /obj/item/clothing/mask/smokable/ecig/simple = 2, /obj/item/reagent_containers/ecig_cartridge/med_nicotine = 10, /obj/item/reagent_containers/ecig_cartridge/high_nicotine = 5, @@ -325,10 +324,12 @@ /obj/item/reagent_containers/ecig_cartridge/coffee = 5, /obj/item/reagent_containers/ecig_cartridge/blanknico = 2, /obj/item/storage/box/fancy/chewables/tobacco/nico = 5) - contraband = list(/obj/item/flame/lighter/zippo = 4) + contraband = list(/obj/item/flame/lighter/zippo = 4, + /obj/item/reagent_containers/ecig_cartridge/ambrosia = 5) premium = list(/obj/item/storage/fancy/cigar = 5, /obj/item/storage/fancy/cigarettes/carcinomas = 5, - /obj/item/storage/fancy/cigarettes/professionals = 5) + /obj/item/storage/fancy/cigarettes/professionals = 5, + /obj/item/clothing/mask/smokable/ecig/deluxe = 2) prices = list(/obj/item/storage/fancy/cigarettes = 12, /obj/item/storage/fancy/cigarettes/dromedaryco = 20, /obj/item/storage/fancy/cigarettes/killthroat = 14, @@ -341,9 +342,8 @@ /obj/item/storage/chewables/tobacco/fine = 20, /obj/item/storage/box/matches = 1, /obj/item/flame/lighter/random = 2, - /obj/item/clothing/mask/smokable/ecig/util = 100, - ///obj/item/clothing/mask/smokable/ecig/deluxe = 300, - /obj/item/clothing/mask/smokable/ecig/simple = 150, + /obj/item/clothing/mask/smokable/ecig/util = 150, + /obj/item/clothing/mask/smokable/ecig/simple = 100, /obj/item/reagent_containers/ecig_cartridge/med_nicotine = 10, /obj/item/reagent_containers/ecig_cartridge/high_nicotine = 15, /obj/item/reagent_containers/ecig_cartridge/orange = 15, diff --git a/icons/mob/items/lefthand_masks.dmi b/icons/mob/items/lefthand_masks.dmi index f35288c06f..6d2110b2b4 100644 Binary files a/icons/mob/items/lefthand_masks.dmi and b/icons/mob/items/lefthand_masks.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 38d605e42d..fd9dbb035d 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/mob/items/righthand_masks.dmi b/icons/mob/items/righthand_masks.dmi index 30fe71f2d2..3e9bc78c10 100644 Binary files a/icons/mob/items/righthand_masks.dmi and b/icons/mob/items/righthand_masks.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 843c049f38..9106290db4 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi index 3ed57d9810..65c915e0fe 100644 Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ diff --git a/icons/mob/species/teshari/masks.dmi b/icons/mob/species/teshari/masks.dmi index 8fb58b6bca..c7c2401250 100644 Binary files a/icons/mob/species/teshari/masks.dmi and b/icons/mob/species/teshari/masks.dmi differ diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi index 7e8658104c..60776293f1 100644 Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ