diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 674bd74c750..8f5a8c6e2f7 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -422,6 +422,8 @@ /obj/item/storage/box/fancy/cigarettes/pra = 6, /obj/item/storage/box/fancy/cigarettes/dpra = 6, /obj/item/storage/box/fancy/cigarettes/nka = 6, + /obj/item/storage/box/fancy/cigarettes/federation = 3, + /obj/item/storage/box/fancy/cigarettes/dyn = 3, /obj/item/storage/chewables/rollable = 8, /obj/item/storage/chewables/rollable/unathi = 6, /obj/item/storage/chewables/rollable/fine = 5, @@ -429,6 +431,8 @@ /obj/item/storage/chewables/tobacco/bad = 6, /obj/item/storage/chewables/tobacco = 8, /obj/item/storage/chewables/tobacco/fine = 5, + /obj/item/storage/chewables/tobacco/federation = 2, + /obj/item/storage/chewables/tobacco/dyn = 2, /obj/item/storage/box/fancy/chewables/tobacco/nico = 3, /obj/item/storage/cigfilters = 6, /obj/item/storage/box/fancy/cigpaper = 6, @@ -461,6 +465,8 @@ /obj/item/storage/box/fancy/cigarettes/pra = 79, /obj/item/storage/box/fancy/cigarettes/dpra = 84, /obj/item/storage/box/fancy/cigarettes/nka = 74, + /obj/item/storage/box/fancy/cigarettes/federation = 93, + /obj/item/storage/box/fancy/cigarettes/dyn = 84, /obj/item/storage/chewables/rollable = 63, /obj/item/storage/chewables/rollable/unathi = 65, /obj/item/storage/chewables/rollable/fine = 69, @@ -468,6 +474,8 @@ /obj/item/storage/chewables/tobacco/bad = 55, /obj/item/storage/chewables/tobacco = 74, /obj/item/storage/chewables/tobacco/fine = 86, + /obj/item/storage/chewables/tobacco/federation = 88, + /obj/item/storage/chewables/tobacco/dyn = 85, /obj/item/storage/box/fancy/chewables/tobacco/nico = 91, /obj/item/storage/box/fancy/matches = 12, /obj/item/flame/lighter/random = 12, diff --git a/code/game/objects/items/skrell.dm b/code/game/objects/items/skrell.dm index eb24079e4e3..6f1539e2838 100644 --- a/code/game/objects/items/skrell.dm +++ b/code/game/objects/items/skrell.dm @@ -281,3 +281,43 @@ flippable = FALSE v_flippable = FALSE badge_string = null + +/obj/item/storage/box/fancy/cigarettes/federation + name = "\improper Eriuyushi Sunset cigarette packet" + desc = "A short, wide packet of cigarettes with the Nralakk Federation's flag printed on the front. The label says that they are 'regular' flavour." + desc_extended = "Meticulously grown and machine rolled in the Nralakk Federation, these cigarettes are the Federation's attempt at entering the tobacco market. They use tobacco hydroponically grown in the underwater town of Eriyushi on Qerrbalak." + icon_state = "nfpacket" + item_state = "nfpacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/sweet + +/obj/item/storage/box/fancy/cigarettes/dyn + name = "\improper Xaqixal Dyn Fields cigarette packet" + desc = "A short, wide packet of cigarettes with the Nralakk Federation's flag printed on the front. The label says that they are 'dyn menthol' flavour." + desc_extended = "Meticulously grown and machine rolled in the Nralakk Federation, these cigarettes are the Federation's attempt at entering the tobacco market. Dyn leaves grown on Xaqixal are used to add the refreshing menthol flavour." + icon_state = "dynpacket" + item_state = "dynpacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/dyn + +/obj/item/storage/box/fancy/cigarettes/wulu + name = "wulumunusha joint pouch" + desc = "A leather pouch of pre-rolled wulumunusha joints. A common sight in Federation space, they can be smoked for recreational or religious purposes." + desc_extended = "Wulumunusha holds a cultural and religious importance for Skrell throughout the Spur. While disposable pouches of wulumunusha are readily available in Federation space, many Skrell choose to refill a reusable pouch like this one when away from home, typically decorated with unique colours and designs." + icon_state = "wulupacket" + item_state = "wulupacket" + cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/wulu + +/obj/item/storage/chewables/tobacco/federation + name = "tin of Leviathan Chew" + desc = "A sweet-smelling tin of saltwater taffy flavoured chewing tobacco, made using finely aged tobacco from the Nralakk Federation. The tin has a Vru'qos on the label, a whale-like creature common throughout Federation space." + desc_extended = "Imported from the Nralakk Federation, this brand of chewing tobacco is noticeably sweeter than usual to accommodate Skrellian tastes." + icon_state = "chew_fed" + item_state = "chew_fed" + starts_with = list(/obj/item/clothing/mask/chewable/tobacco/sweet = 6) + +/obj/item/storage/chewables/tobacco/dyn + name = "tin of Weibi's Breeze" + desc = "A sweet-smelling tin of menthol flavoured chewing tobacco, made using finely aged tobacco from the Nralakk Federation. The tin has a dyn leaf on the label." + desc_extended = "Imported from the Nralakk Federation, this brand of chewing tobacco is noticeably sweeter than usual to accommodate Skrellian tastes." + icon_state = "chew_dyn" + item_state = "chew_dyn" + starts_with = list(/obj/item/clothing/mask/chewable/tobacco/dyn = 6) \ No newline at end of file diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 952408a0a5f..523c432d8e9 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -82,7 +82,7 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/tobacco name = "wad" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ashtray when you stuff it into your face." throw_speed = 0.5 icon_state = "chew" type_butt = /obj/item/trash/spitwad @@ -125,17 +125,17 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/tobacco/bad name = "chewing tobacco" - desc = "A chewy wad of cheap tobacco. Cut in long strands and treated with syrup so it tastes less like an ash-tray when you stuff it into your face." + desc = "A chewy wad of cheap tobacco. Cut in long strands and treated with syrup so it tastes less like an ashtray when you stuff it into your face." reagents_to_add = list(/singleton/reagent/toxin/tobacco/fake = 2) /obj/item/clothing/mask/chewable/tobacco/generic name = "chewing tobacco" - desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face." + desc = "A chewy wad of tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ashtray when you stuff it into your face." reagents_to_add = list(/singleton/reagent/toxin/tobacco = 2) /obj/item/clothing/mask/chewable/tobacco/fine name = "chewing tobacco" - desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ash-tray when you stuff it into your face." + desc = "A chewy wad of fine tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ashtray when you stuff it into your face." reagents_to_add = list(/singleton/reagent/toxin/tobacco/rich = 2) /obj/item/clothing/mask/chewable/tobacco/nico @@ -146,6 +146,19 @@ obj/item/clothing/mask/chewable/Destroy() type_butt = /obj/item/trash/spitgum wrapped = TRUE +/obj/item/clothing/mask/chewable/tobacco/sweet + name = "chewing tobacco" + desc = "A chewy wad of sweet tobacco. Cut in long strands and treated with syrup so it doesn't taste like an ashtray when you stuff it in your face." + reagents_to_add = list(/singleton/reagent/toxin/tobacco/sweet = 2) + +/obj/item/clothing/mask/chewable/tobacco/dyn + name = "dyn chewing tobacco" + desc = "A chewy wad of menthol tobacco. Cut in long strands and treated with syrup and menthol so it doesn't taste like an ashtray when you stuff it into your face." + reagents_to_add = list( + /singleton/reagent/toxin/tobacco/sweet = 1, + /singleton/reagent/drink/dynjuice = 1 + ) + /obj/item/clothing/mask/chewable/candy name = "wad" desc = "A chewy wad of wadding material." diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 4379d09beac..42dac843270 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -415,6 +415,26 @@ CIGARETTE PACKETS ARE IN FANCY.DM /singleton/reagent/mental/nicotine = 5 ) +/obj/item/clothing/mask/smokable/cigarette/sweet + reagents_to_add = list( + /singleton/reagent/toxin/tobacco/sweet = 10, + /singleton/reagent/mental/nicotine = 5 + ) + +/obj/item/clothing/mask/smokable/cigarette/dyn + name = "dyn cigarette" + desc = "A mentholated cigarette from Nralakk made with processed dyn." + reagents_to_add = list( + /singleton/reagent/toxin/tobacco/sweet = 5, + /singleton/reagent/mental/nicotine = 5, + /singleton/reagent/drink/dynjuice = 5 + ) + +/obj/item/clothing/mask/smokable/cigarette/wulu + name = "wulumunusha cigarette" + desc = "A wulumunusha cigarette commonly smoked by Skrell for religious purposes." + reagents_to_add = list(/singleton/reagent/wulumunusha = 15) + //////////// // CIGARS // //////////// diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index f0a5472fc3b..0a8a3725fbd 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -128,6 +128,9 @@ /obj/item/storage/box/fancy/cigarettes/pra = HELMET_GARB_PASS_ICON, /obj/item/storage/box/fancy/cigarettes/dpra = HELMET_GARB_PASS_ICON, /obj/item/storage/box/fancy/cigarettes/nka = HELMET_GARB_PASS_ICON, + /obj/item/storage/box/fancy/cigarettes/federation = HELMET_GARB_PASS_ICON, + /obj/item/storage/box/fancy/cigarettes/dyn = HELMET_GARB_PASS_ICON, + /obj/item/storage/box/fancy/cigarettes/wulu = HELMET_GARB_PASS_ICON, /obj/item/clothing/head/hachimaki = HELMET_GARB_PASS_ICON, /obj/item/clothing/head/leader_headband = HELMET_GARB_PASS_ICON ) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 9232cb26252..557efa4bb99 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -229,7 +229,9 @@ /obj/item/storage/box/fancy/cigarettes/rugged = 10, /obj/item/storage/box/fancy/cigarettes/pra = 5, /obj/item/storage/box/fancy/cigarettes/dpra = 2, - /obj/item/storage/box/fancy/cigarettes/nka = 2 + /obj/item/storage/box/fancy/cigarettes/nka = 2, + /obj/item/storage/box/fancy/cigarettes/federation = 2, + /obj/item/storage/box/fancy/cigarettes/dyn = 2 ) /obj/random/energy diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 960bbc9d253..448455c871e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -55,6 +55,8 @@ cigarettes["Working Tajara cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/pra cigarettes["Shastar Leaves cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/dpra cigarettes["Royal Choice cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/nka + 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 gear_tweaks += new /datum/gear_tweak/path(cigarettes) /datum/gear/smoking/chew @@ -70,6 +72,8 @@ chews["Rredouane Cuts chewing tobacco"] = /obj/item/storage/chewables/tobacco/bad chews["Mendell Smooth chewing tobacco"] = /obj/item/storage/chewables/tobacco chews["Taba-Kamu chewing tobacco"] = /obj/item/storage/chewables/tobacco/fine + chews["Leviathan Chew chewing tobacco"] = /obj/item/storage/chewables/tobacco/federation + chews["Weibi's Breeze chewing tobacco"] = /obj/item/storage/chewables/tobacco/dyn chews["box of Nico-Tine gum"] = /obj/item/storage/box/fancy/chewables/tobacco/nico gear_tweaks += new /datum/gear_tweak/path(chews) diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm index 798f1c564b1..1f6a02ce441 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/skrell.dm @@ -136,6 +136,13 @@ sort_category = "Xenowear - Skrell" flags = GEAR_NO_SELECTION +/datum/gear/wulu_pouch + display_name = "wulumunusha joint pouch" + path = /obj/item/storage/box/fancy/cigarettes/wulu + whitelisted = list(SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) + sort_category = "Xenowear - Skrell" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + /datum/gear/ears/skrell/goop display_name = "glowing algae" path = /obj/item/clothing/ears/skrell/goop diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index 704eca25d7a..d3fefa8172c 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -357,17 +357,13 @@ name = "Wulumunusha Extract" description = "The extract of the wulumunusha fruit, it can cause hallucinations and muteness." color = "#61E2EC" - taste_description = "sourness" + taste_description = "earthiness" fallback_specific_heat = 1 overdose = 10 condiment_name = "Wulumunusha Extract Bottle" condiment_desc = "A small dropper bottle full of a stoner's paradise. A warning label warns of muteness as a side effect." condiment_icon_state = "wuluextract" - -/singleton/reagent/wulumunusha/initial_effect(var/mob/living/carbon/human/M, var/alien, var/holder) - to_chat(M, SPAN_GOOD(pick("Your eyes open wide and you look upon this new world you now see.", "You close your eyes, and when they open, everything appears so much more vibrant."))) - /singleton/reagent/wulumunusha/affect_blood(var/mob/living/carbon/M, var/alien, var/removed, var/datum/reagents/holder) M.druggy = max(M.druggy, 100) M.silent = max(M.silent, 5) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 709b0bc65db..6d6f315447e 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -661,6 +661,12 @@ taste_description = "acrid smoke" nicotine = 0.1 +/singleton/reagent/toxin/tobacco/sweet + name = "Sweet Tobacco" + description = "This tobacco is much sweeter than the strains usually found in human space." + taste_description = "sweet tobacco" + nicotine = 0.3 + /singleton/reagent/toxin/tobacco/liquid name = "Nicotine Solution" description = "A diluted nicotine solution." diff --git a/html/changelogs/llywelwyn-skrell-recreational.yml b/html/changelogs/llywelwyn-skrell-recreational.yml new file mode 100644 index 00000000000..5caaedb2be7 --- /dev/null +++ b/html/changelogs/llywelwyn-skrell-recreational.yml @@ -0,0 +1,9 @@ +author: Llywelwyn, RyverStyx + +delete-after: True + +changes: + - rscadd: "Added two brands of Skrellian cigarettes: Eriuyushi Sunset and Xaqixal Dyn Fields." + - rscadd: "Added two brands of Skrellian chewing tobacco: Leviathan Chew and Weibi's Breeze." + - rscadd: "Added a pouch of wulumunusha cigarettes to the loadout, only selectable by Skrell." + - tweak: "Touched up the wulumunusha reagent by giving it a unique flavour description and removing the initial effect." diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index bbbe5678726..1247df5b67d 100644 Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ