cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Skrell recreational additions: 2 brands of cigarettes, 2 brands of chewing tobacco, wulumunusha cigarettes (#16091)

Browse Source 
* initial commit with placeholders

- adds wulumunusha cigarette variant
- adds federation (tobacco) and traverse (wulu) cigarette packets w/ placeholder names and description

* initial fixes + changes for skrell team

- fixes sprite names
- removes the initial_affect from wulu extract; it's slow-acting, there should be no instantaneously noticeable effect
- traverse cigarettes no longer contain wulu, and instead are now mentholated with dyn
- traverse cigarettes are now added to vendors
- separate wulu cigarette added as a placeholder pending lore decision

* chewing tobacco and brand names

- brand names
- regular and menthol (dyn) chewables added
- added to loadout/vendors
- sprite changes

* descriptions + flavours

- added descriptions given by skrell team
- changed contents to give proper flavour messages

* cl, and wulu flavour description

- adds cl
- changes wulu flavour desc
- restricts diona from selecting the wulu pouch

* fixes

- adds wulu cigarette description

* updates packet descriptions

- short and wide

* pedantic description change

the old description bothered me

* adverbs of frequency go before the verb

* Update code/game/objects/items/weapons/cigs_lighters.dm

erroneous comma

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* ash-tray to ashtray on all the descriptions whilst we're here

and wulu desc changed by brotendo's request

* Typo Fix

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Llywelwyn
2023-03-28 12:40:42 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 9868636c15
commit e17a924751
12 changed files with 118 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm
+1 -5
View File
@@ -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)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
+6
View File
@@ -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."