Added new drugs from lore and otherwise (#16773)

* Initial commit of new drugs

Start on caromeg and oracle

Further work on caromeg

Fix nicotine and caromeg

Begin populating map

Designer cocaine effects

Weaken heroin, Joy now causes genetic damage

Added an artificial alternative to morphine, tramarine, that can be used in its place.

Nerf new opioids, fix tramaline recipe

Added special mentholated adhomian cigarettes, for NKA cigarettes

General fixes

Fix recipe pathing

Add coca leaves, cocaine recipes, and coca drinks

Update Chemistry-Reagents-Medicine.dm

Null name for abstract drug class

Remove abstract_class from reagents (shouldn't be used there)

* Oracle sprites by Wezzy

* .

* Begin resolving issues from code review

* Remove all per-player data from drug singletons

* Resolve Arrow's code review

* Apply suggestions from code review

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

Update code/modules/hydroponics/seed_datums/smokables.dm

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

* Removed coca plants from the standard garden and hydroponics vendors (they remain as contraband and in the xenobotany garden)

* Fix merge conflict errors caused by snack PR

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
Cody Brittain
2023-10-20 13:55:13 -04:00
committed by GitHub
parent 38b107398d
commit 4e2b58f02a
43 changed files with 893 additions and 203 deletions
+28 -3
View File
@@ -16,6 +16,31 @@
desc = "Highly illegal drug. Bang - and your stress is gone."
starts_with = list(/obj/item/reagent_containers/pill/joy = 3)
/obj/item/storage/pill_bottle/heroin
name = "bottle of heroin pills"
desc = "Highly illegal drug. For quick pain removal."
starts_with = list(/obj/item/reagent_containers/pill/heroin = 3)
/obj/item/storage/pill_bottle/cocaine
name = "bottle of cocaine tablets"
desc = "Supposedly a highly illegal drug... yet the labeling on the bottle is suspiciously perfect..."
starts_with = list(/obj/item/reagent_containers/pill/cocaine = 5)
/obj/item/storage/pill_bottle/contemplus
name = "bottle of Contemplus tablets"
desc = "A Yomi Genetics bottle clearly marked as 'for animal testing only.' You doubt this is followed often on Venus..."
starts_with = list(/obj/item/reagent_containers/pill/contemplus = 5)
/obj/item/storage/pill_bottle/spotlight
name = "bottle of Spotlight tablets"
desc = "A Zavodskoi bottle with a conspicuous 'defective' stamp on it. You doubt this was actually defective."
starts_with = list(/obj/item/reagent_containers/pill/spotlight = 5)
/obj/item/storage/pill_bottle/sparkle
name = "bottle of Sparkle tablets"
desc = "A Zeng-Hu bottle clearly marked as being for 'medical testing purposes only.' As if..."
starts_with = list(/obj/item/reagent_containers/pill/sparkle = 5)
/obj/item/storage/pill_bottle/smart
name = "bottle of Smart pills"
desc = "Highly illegal drug. For exam season."
@@ -27,13 +52,13 @@
/obj/item/reagent_containers/glass/beaker/vial/random/toxin
random_reagent_list = list(
list(/singleton/reagent/mindbreaker = 10, /singleton/reagent/space_drugs = 20) = 3,
list(/singleton/reagent/drugs/mindbreaker = 10, /singleton/reagent/drugs/mms = 20) = 3,
list(/singleton/reagent/mercury = 15) = 3,
list(/singleton/reagent/toxin/carpotoxin = 15) = 2,
list(/singleton/reagent/impedrezene = 15) = 2,
list(/singleton/reagent/drugs/impedrezene = 15) = 2,
list(/singleton/reagent/toxin/dextrotoxin = 10) = 1,
list(/singleton/reagent/toxin/spectrocybin = 15) = 1,
list(/singleton/reagent/joy = 10, /singleton/reagent/water = 20) = 1,
list(/singleton/reagent/drugs/joy = 10, /singleton/reagent/water = 20) = 1,
list(/singleton/reagent/toxin/berserk = 10) = 1,
list(/singleton/reagent/ammonia = 15) = 3)
@@ -279,7 +279,7 @@
to_chat(user, SPAN_NOTICE("There's visible lag between the left and right pupils' reactions."))
var/list/pinpoint = list(/singleton/reagent/oxycomorphine=1,/singleton/reagent/mortaphenyl=5)
var/list/dilating = list(/singleton/reagent/space_drugs=5,/singleton/reagent/mindbreaker=1)
var/list/dilating = list(/singleton/reagent/drugs/mms=5,/singleton/reagent/drugs/mindbreaker=1)
var/datum/reagents/ingested = H.get_ingested_reagents()
if(H.reagents.has_any_reagent(pinpoint) || ingested.has_any_reagent(pinpoint))
to_chat(user, SPAN_NOTICE("\The [H]'s pupils are already pinpoint and cannot narrow any more."))
+1 -1
View File
@@ -32,7 +32,7 @@
desc_extended = "Imported from the New Kingdom of Adhomai."
icon_state = "nkapacket"
item_state = "Fpacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai/menthol
/obj/item/tajcard
name = "collectable tajaran card"
@@ -159,6 +159,11 @@
/singleton/reagent/drink/dynjuice = 1
)
/obj/item/clothing/mask/chewable/oracle
name = "chewing oracle"
desc = "A chewy wad of oracle. Cut in long strands."
reagents_to_add = list(/singleton/reagent/toxin/oracle = 2)
/obj/item/clothing/mask/chewable/candy
name = "wad"
desc = "A chewy wad of wadding material."
@@ -143,6 +143,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
//FINE SMOKABLES//
//////////////////
/obj/item/clothing/mask/smokable
abstract_type = /obj/item/clothing/mask/smokable
name = "smokable item"
desc = "You're not sure what this is. You should probably ahelp it."
icon = 'icons/obj/smokables.dmi'
@@ -382,7 +383,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/singleton/reagent/toxin/tobacco = 5,
/singleton/reagent/mental/nicotine = 5,
/singleton/reagent/lexorin = 2,
/singleton/reagent/serotrotium = 3
/singleton/reagent/drugs/serotrotium = 3
)
/obj/item/clothing/mask/smokable/cigarette/blank
@@ -416,6 +417,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/singleton/reagent/mental/nicotine = 5
)
/obj/item/clothing/mask/smokable/cigarette/adhomai/menthol
name = "adhomian menthol cigarette"
desc = "An adhomian cigarette made from processed S'rendarr's Hand, with menthol added."
reagents_to_add = list(
/singleton/reagent/toxin/tobacco = 5,
/singleton/reagent/mental/nicotine = 5,
/singleton/reagent/menthol = 5
)
/obj/item/clothing/mask/smokable/cigarette/sweet
reagents_to_add = list(
/singleton/reagent/toxin/tobacco/sweet = 10,
@@ -436,6 +446,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A wulumunusha cigarette commonly smoked by Skrell for religious purposes."
reagents_to_add = list(/singleton/reagent/wulumunusha = 15)
/obj/item/clothing/mask/smokable/cigarette/oracle
name = "oracle cigarette"
desc = "A roll of oracle and caromeg."
reagents_to_add = list(
/singleton/reagent/toxin/oracle = 10,
/singleton/reagent/mental/caromeg = 5
)
////////////
// CIGARS //
////////////
@@ -499,6 +517,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/singleton/reagent/fuel = 5
)
/obj/item/clothing/mask/smokable/cigarette/cigar/oracle
name = "\improper Vedamor cigar"
desc = "A premium oracle cigar, originating from Vedamor."
icon_state = "vedamor_cigaroff"
icon_on = "vedamor_cigaron"
icon_off = "vedamor_cigaroff"
item_state = "vedamor_cigaroff"
reagents_to_add = list(
/singleton/reagent/toxin/oracle/rich = 25,
/singleton/reagent/mental/caromeg = 5
)
/obj/item/trash/cigbutt
name = "cigarette butt"
desc = "A manky old cigarette butt."
@@ -1064,6 +1094,20 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/reagent_containers/food/snacks/grown/dried_tobacco/pure
plantname = "puretobacco"
//oracle sold seperately if you're too snobby to grow it yourself.
/obj/item/reagent_containers/food/snacks/grown/dried_oracle
plantname = "oracle"
w_class = ITEMSIZE_TINY
/obj/item/reagent_containers/food/snacks/grown/dried_oracle/Initialize()
. = ..()
dry = TRUE
name = "dried [name]"
color = "#ff6f6f"
/obj/item/reagent_containers/food/snacks/grown/dried_oracle/fine
plantname = "vedamororacle"
/obj/item/clothing/mask/smokable/cigarette/rolled/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/cigarette_filter))
if(filter)
+10
View File
@@ -272,6 +272,11 @@
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its tobacco flavored, with extra nicotine."
reagents_to_add = list(/singleton/reagent/toxin/tobacco/liquid = 10, /singleton/reagent/water = 10)
/obj/item/reagent_containers/ecig_cartridge/menthol
name = "menthol flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says it's menthol flavored."
reagents_to_add = list(/singleton/reagent/toxin/tobacco/liquid = 5, /singleton/reagent/water = 10, /singleton/reagent/menthol = 5)
/obj/item/reagent_containers/ecig_cartridge/orange
name = "orange flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its orange flavored."
@@ -296,3 +301,8 @@
name = "coffee flavour cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says its coffee flavored."
reagents_to_add = list(/singleton/reagent/toxin/tobacco/liquid = 10, /singleton/reagent/water = 10, /singleton/reagent/drink/coffee = 5)
/obj/item/reagent_containers/ecig_cartridge/caromeg
name = "flavorless caromeg cartridge"
desc = "A small metal cartridge which contains an atomizing coil and a solution to be atomized. The label says you can add whatever flavoring agents you want."
reagents_to_add = list(/singleton/reagent/toxin/oracle/liquid = 5, /singleton/reagent/water = 10)
@@ -425,6 +425,13 @@
/obj/item/storage/box/fancy/cigarettes/cigar/prank
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/cigar/prank
/obj/item/storage/box/fancy/cigarettes/oracle
name = "\improper Natural Vysokan Soothsayer oracle cigarette packet"
desc = "Featuring an illustration of a soothsayer from Vysoka on its packaging, these cigarettes are advertised as containing oracle instead of the normal tobacco. A warning box stating \"These oracle cigarettes are not healthier than tobacco alternatives\" appears to have been haphazardly placed on the packet."
icon_state = "Opacket"
item_state = "Fpacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/oracle
/*
* Vial Box
*/
@@ -163,6 +163,13 @@
item_state = "Dpacket"
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/fine = 6)
/obj/item/storage/chewables/oracle
name = "can of Natural Vysokan Fields chewing oracle"
desc = "A can of chewing oracle, advertising Vysoka's natural beauty. A warning box stating \"This chewing oracle is not healthier than tobacco alternatives\" appears to have been haphazardly placed on the can."
icon_state = "oracle_chew"
item_state = "Fpacket"
starts_with = list(/obj/item/clothing/mask/chewable/oracle = 6)
/obj/item/storage/box/fancy/chewables/tobacco/nico
name = "box of Nico-Tine gum"
desc = "A Sol-approved brand of nicotine gum. Cut out the middleman for your addiction fix."
@@ -223,3 +230,17 @@
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco/pure = 8)
icon_state = "roll_nico"
item_state = "Epacket"
/obj/item/storage/chewables/rollable/oracle
name = "box of Vysokan Plains oracle leaves"
desc = "This box gives a large list of potential sources for the oracle inside of it, reflecting the unstable and volatile state of Vysokan politics."
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_oracle = 8)
icon_state = "roll_oracle"
item_state = "Dpacket"
/obj/item/storage/chewables/rollable/vedamor
name = "box of Velhalktai Marathon oracle leaves"
desc = "Packaged by a major sponsor of the Velhalktai races, and exported by NanoTrasen, this box promises quality oracle grown directly in the city-state of Vedamor."
starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_oracle/fine = 8)
icon_state = "roll_vedamor"
item_state = "Epacket"