diff --git a/code/game/machinery/vending/cigarette.dm b/code/game/machinery/vending/cigarette.dm index cf4f4a63a87..124e31d6b21 100644 --- a/code/game/machinery/vending/cigarette.dm +++ b/code/game/machinery/vending/cigarette.dm @@ -25,6 +25,7 @@ /obj/item/storage/box/fancy/cigarettes/federation = 3, /obj/item/storage/box/fancy/cigarettes/dyn = 3, /obj/item/storage/box/fancy/cigarettes/oracle = 3, + /obj/item/storage/box/fancy/cigarettes/koko = 3, /obj/item/storage/chewables/rollable = 8, /obj/item/storage/chewables/rollable/unathi = 6, /obj/item/storage/chewables/rollable/fine = 5, @@ -73,6 +74,7 @@ /obj/item/storage/box/fancy/cigarettes/federation = 11.50, /obj/item/storage/box/fancy/cigarettes/dyn = 10.25, /obj/item/storage/box/fancy/cigarettes/oracle = 10.25, + /obj/item/storage/box/fancy/cigarettes/koko = 11.50, /obj/item/storage/chewables/rollable = 7.50, /obj/item/storage/chewables/rollable/unathi = 7.75, /obj/item/storage/chewables/rollable/fine = 8.00, @@ -109,6 +111,7 @@ /obj/item/storage/box/fancy/cigarettes = 2, /obj/item/storage/box/fancy/cigarettes/dpra = 2, /obj/item/storage/box/fancy/cigarettes/federation = 1, + /obj/item/storage/box/fancy/cigarettes/koko = 1, /obj/item/storage/chewables/rollable = 2, /obj/item/storage/chewables/rollable/unathi = 1, /obj/item/storage/chewables/tobacco/bad = 2, diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 462d5edf486..648712b015b 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -453,6 +453,11 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable) /singleton/reagent/mental/caromeg = 5 ) +/obj/item/clothing/mask/smokable/cigarette/koko + name = "unathi cigarette" + desc = "An Unathi cigarette made with koko reed." + reagents_to_add = list(/singleton/reagent/mental/kokoreed = 15) + //////////// // CIGARS // //////////// diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 60981d61511..5bc4abcdc70 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -439,6 +439,13 @@ item_state = "Fpacket" cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/oracle +/obj/item/storage/box/fancy/cigarettes/koko + name = "\improper Ha'zana Corsair Afterburners cigarette packet" + desc = "Made exclusively on the Compact ruled world of Ha'zana, these cigarettes are made using koko reed instead of tobacco; a good pick-me-up for Unathi, but has no effect on other species." + icon_state = "kokopacket" + item_state = "kokopacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/koko + /obj/item/storage/box/fancy/cigarettes/case name = "cigarette case" desc = "A simple cigarette case for the aspiring chain-smoker." diff --git a/code/modules/client/preference_setup/loadout/items/drugs_meds.dm b/code/modules/client/preference_setup/loadout/items/drugs_meds.dm index c141888a2c4..a0513f78783 100644 --- a/code/modules/client/preference_setup/loadout/items/drugs_meds.dm +++ b/code/modules/client/preference_setup/loadout/items/drugs_meds.dm @@ -61,6 +61,7 @@ cigarettes["Eriuyushi Sunset cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/federation cigarettes["Xaqixal Dyn Fields cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/dyn cigarettes["Natural Vysokan Soothsayer oracle cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/oracle + cigarettes["Koko-Reed cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/koko gear_tweaks += new /datum/gear_tweak/path(cigarettes) /datum/gear/drugs_meds/chew diff --git a/html/changelogs/crozarius-kokociggies.yml b/html/changelogs/crozarius-kokociggies.yml new file mode 100644 index 00000000000..b61be8cb618 --- /dev/null +++ b/html/changelogs/crozarius-kokociggies.yml @@ -0,0 +1,8 @@ +author: Crozarius + +delete-after: True + +changes: + - rscadd: "Added Sinta'Unathi cigarettes containing Koko reed, an Unathi-specific drug." + - imageadd: "Adds sprites for Koko reed cigarettes." + - qol: "Corrected the Ha'zana chewing koko sprite to no longer have the K'ois bar colour scheme." diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index 2e15a2a56a1..8e91292ae90 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ