mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-17 11:05:16 +01:00
Adds a new brand of cigarettes, Mainthol Greys (#91328)
**We all like a little flavor, and a new brand in the sector promises a dark smoke, questionable trace compounds, and the robust flavors of maintenance...**  ## About The Pull Request I've added a new brand of cigarettes! Mainthol greys, now available in hacked cigarette vending machines for an immodest sum, hand rolled & grown in the Sybil sector. The syndicate stock some stolen surplus too. The goal was to create another nice little flavor item, a compliment to grey bull and other maintenance loot. <details> <summary>Chemical contents in code, for the joy of discovery!</summary> ``` 1u oculine is in every cigarette, an imperceptible buffer against the welder harming an enterprising assistant's eyes. Extremely trace amount for cigarette microdosing. Each cigarette has a 40% chance to have an extra reagent from a list of 14 minor toxins, drugs, and things like glitter. They're inconsequential via cigarette, but still noticed and experienced. ``` </details> I tested these bad boys extensively, blending them, ate them, blinded myself with a welder, spammed a health analyzer while smoking to gauge chemicals and ensure intended effects are noticed and add a nice je ne sais quois. **Our sprites!**  ## Why It's Good For The Game It's an extra little flavor item with a couple simple surprises to spice up your assisting. ## Changelog 🆑 add: Added a new brand of cigarettes to hacked & syndicate vending machines+spawner list. /🆑 --------- Co-authored-by: Tim <timothymtorres@gmail.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: san7890 <the@san7890.com>
This commit is contained in:
@@ -151,6 +151,7 @@
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_candy = 1,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_greytide = 1,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/entertainment/cigarette
|
||||
@@ -165,6 +166,7 @@
|
||||
/obj/item/cigarette/robust = 2,
|
||||
/obj/item/cigarette/carp = 1,
|
||||
/obj/item/cigarette/robustgold = 1,
|
||||
/obj/item/cigarette/greytide = 3,
|
||||
)
|
||||
|
||||
/obj/effect/spawner/random/entertainment/cigar
|
||||
|
||||
@@ -637,6 +637,35 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
/obj/item/cigarette/robust
|
||||
desc = "A Robust brand cigarette."
|
||||
|
||||
/obj/item/cigarette/greytide
|
||||
name = "grey mainthol"
|
||||
desc = "Made by hand, has a funky smell."
|
||||
chem_volume = 60
|
||||
lung_harm = 2.5
|
||||
list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/consumable/menthol = 6, /datum/reagent/medicine/oculine = 1)
|
||||
/// Weighted list of random reagents to add
|
||||
var/static/list/possible_reagents = list(
|
||||
/datum/reagent/toxin/fentanyl = 2,
|
||||
/datum/reagent/glitter = 2,
|
||||
/datum/reagent/drug/aranesp = 2,
|
||||
/datum/reagent/consumable/laughter = 2,
|
||||
/datum/reagent/medicine/insulin = 2,
|
||||
/datum/reagent/drug/maint/powder = 2,
|
||||
/datum/reagent/drug/maint/sludge = 2,
|
||||
/datum/reagent/toxin/staminatoxin = 2,
|
||||
/datum/reagent/toxin/leadacetate = 2,
|
||||
/datum/reagent/drug/space_drugs = 2,
|
||||
/datum/reagent/drug/pumpup = 2,
|
||||
/datum/reagent/drug/kronkaine = 2,
|
||||
/datum/reagent/consumable/mintextract = 2,
|
||||
/datum/reagent/pax = 1,
|
||||
)
|
||||
|
||||
/obj/item/cigarette/greytide/Initialize(mapload)
|
||||
. = ..()
|
||||
if(prob(40))
|
||||
reagents.add_reagent(pick_weight(possible_reagents), rand(10, 15))
|
||||
|
||||
/obj/item/cigarette/robustgold
|
||||
desc = "A Robust Gold brand cigarette."
|
||||
list_reagents = list(/datum/reagent/drug/nicotine = 15, /datum/reagent/gold = 3) // Just enough to taste a hint of expensive metal.
|
||||
@@ -772,6 +801,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
desc = "A manky old roach, or for non-stoners, a used rollup."
|
||||
icon_state = "roach"
|
||||
|
||||
/obj/item/cigbutt/greycigbutt
|
||||
name = "butt"
|
||||
desc = "It's low tide, now."
|
||||
icon_state = "cigbutt"
|
||||
|
||||
/obj/item/cigbutt/roach/Initialize(mapload)
|
||||
. = ..()
|
||||
pixel_x = rand(-5, 5)
|
||||
|
||||
@@ -315,6 +315,13 @@
|
||||
base_icon_state = "robustg"
|
||||
spawn_type = /obj/item/cigarette/robustgold
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_greytide
|
||||
name = "\improper Mainthol Grey packet"
|
||||
desc = "The thin grey line."
|
||||
icon_state = "greytide"
|
||||
base_icon_state = "greytide"
|
||||
spawn_type = /obj/item/cigarette/greytide
|
||||
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_carp
|
||||
name = "\improper Carp Classic packet"
|
||||
desc = "Since 2313."
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
contraband = list(
|
||||
/obj/item/vape = 5,
|
||||
/obj/item/cigarette/dart = 1,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_greytide = 1,
|
||||
)
|
||||
premium = list(
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3,
|
||||
@@ -43,6 +44,7 @@
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_robust = 2,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
|
||||
/obj/item/storage/fancy/cigarettes/cigpack_greytide = 1,
|
||||
/obj/item/storage/box/matches = 10,
|
||||
/obj/item/lighter/greyscale = 4,
|
||||
/obj/item/storage/fancy/rollingpapers = 5,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 23 KiB |
Reference in New Issue
Block a user