cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 13:30:42 +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/game/objects/items/skrell.dm
+40
View File
@@ -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)
code/game/objects/items/weapons/chewables.dm
+17 -4
View File
@@ -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."
code/game/objects/items/weapons/cigs_lighters.dm
+20
View File
@@ -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 //
////////////
code/game/objects/items/weapons/storage/internal.dm
+3
View File
@@ -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
)
code/game/objects/random/random.dm
+3 -1
View File
@@ -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