diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm index 7d067a16464..1d969625811 100644 --- a/code/game/objects/effects/spawners/random/entertainment.dm +++ b/code/game/objects/effects/spawners/random/entertainment.dm @@ -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 diff --git a/code/game/objects/items/cigarettes.dm b/code/game/objects/items/cigarettes.dm index 7ed9353c073..2c9d0f382bc 100644 --- a/code/game/objects/items/cigarettes.dm +++ b/code/game/objects/items/cigarettes.dm @@ -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) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 1d03c690cb1..a08d7d1825c 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -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." diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index 450c8e74100..05c939bbcb8 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -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, diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi index 99046841093..7b155f73216 100644 Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ