From d7e680a575f8fb0c2d225a4a7a7321ccd37373d0 Mon Sep 17 00:00:00 2001 From: Chada-1 Date: Sun, 26 Jul 2020 05:19:41 -0500 Subject: [PATCH] Full rename of all real chems to bone apple tea'd versions. (#9400) As a continuation of #9389 As a bonus, any drugs that mentioned their IRL counterpart in their description now describe their predecessor as ancient, and the new ones as modern. The biggest difference here is just the Antihistamine which was given a full new name. They're similar enough that they'll be recognized (most of them) but different enough for us to call our own and not care what the real medicines are/do since these are our sci-fantasy versions just inspired by them. --- code/__defines/chemistry.dm | 2 +- code/datums/brain_damage/brain_trauma.dm | 2 +- code/datums/brain_damage/mild.dm | 2 +- code/datums/brain_damage/severe.dm | 1 - code/datums/outfits/ert/iac.dm | 2 +- code/datums/outfits/ert/med_eridani.dm | 2 +- code/datums/trading/ai.dm | 2 +- .../changeling/implements/powers/body.dm | 2 +- code/game/gamemodes/vampire/vampire_powers.dm | 2 +- code/game/machinery/Sleeper.dm | 3 +- code/game/machinery/vending_types.dm | 8 +- .../items/devices/lighting/flashlight.dm | 2 +- code/game/objects/items/weapons/chewables.dm | 4 +- .../items/weapons/grenades/chem_grenade.dm | 2 +- .../objects/items/weapons/storage/firstaid.dm | 30 +- code/game/objects/random/random.dm | 4 +- code/modules/cargo/bounties/reagent.dm | 20 +- code/modules/cargo/random_stock/t1_common.dm | 6 +- .../modules/cargo/random_stock/t2_uncommon.dm | 2 +- code/modules/clothing/rings/rings.dm | 2 +- .../spacesuits/rig/modules/utility.dm | 10 +- code/modules/events/vent_clog.dm | 2 +- code/modules/hydroponics/seed.dm | 3 +- code/modules/hydroponics/seed_datums.dm | 2 +- code/modules/item_worth/reagents.dm | 33 +-- .../living/carbon/human/MedicalSideEffects.dm | 4 +- .../living/carbon/human/chem_side_effects.dm | 4 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../simple_animal/borer/borer_powers.dm | 2 +- code/modules/organs/organ.dm | 2 +- code/modules/paperwork/pen.dm | 2 +- .../Chemistry-Reagents-Drugs.dm | 12 +- .../Chemistry-Reagents-Food-Drinks.dm | 2 +- .../Chemistry-Reagents-Medicine.dm | 269 ++++++++---------- .../Chemistry-Reagents-Toxins.dm | 24 +- code/modules/reagents/Chemistry-Recipes.dm | 169 ++++++----- .../reagents/dispenser/cartridge_presets.dm | 14 +- .../reagents/dispenser/dispenser_presets.dm | 12 +- .../reagents/reagent_containers/borghydro.dm | 4 +- .../reagent_containers/food/snacks.dm | 26 +- .../reagent_containers/glass/bottle.dm | 4 +- .../reagents/reagent_containers/hypospray.dm | 8 +- .../reagents/reagent_containers/pill.dm | 39 +-- .../reagents/reagent_containers/syringes.dm | 10 +- .../self/conjure/plant_sanctuary.dm | 4 +- html/changelogs/reallifechemsbegone.yml | 42 +++ maps/aurora/aurora-1_centcomm.dmm | 6 +- maps/aurora/aurora-4_mainlevel.dmm | 12 +- maps/aurora/aurora-5_interstitial.dmm | 6 +- maps/exodus/exodus-1_station.dmm | 4 +- 51 files changed, 417 insertions(+), 418 deletions(-) create mode 100644 html/changelogs/reallifechemsbegone.yml diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index ced9d925590..9cc2442fa6d 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -51,7 +51,7 @@ #define CE_BERSERK "berserk" #define CE_CLUMSY "clumsy" // Peridaxon side effects, etc #define CE_DROPITEM "dropitem" // keloderm side effect -#define CE_EMETIC "emetic" // thetamycin side effect, ipecac +#define CE_EMETIC "emetic" // thetamycin side effect, verunol #define CE_FEVER "fever" // causes fever #define CE_NOCOUGH "nocough" // suppresses coughing #define CE_NOFEVER "nofever" // suppresses fever diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm index 3bc1f451d0b..379d94a38c8 100644 --- a/code/datums/brain_damage/brain_trauma.dm +++ b/code/datums/brain_damage/brain_trauma.dm @@ -1,6 +1,6 @@ //Brain Traumas are the new actual brain damage. Brain damage itself acts as a way to acquire traumas: every time brain damage is dealt, there's a chance of receiving a trauma. //This chance gets higher the higher the mob's brainloss is. Removing traumas is a separate thing from removing brain damage: you can get restored to full brain operativity, -//but keep the quirks, until repaired by mannitol (for mild/special ones) or brain surgery (for severe ones). +//but keep the quirks, until repaired by Cataleptinol (for mild/special ones) or brain surgery (for severe ones). /datum/brain_trauma var/name = "Brain Trauma" var/desc = "A trauma caused by brain damage, which causes issues to the patient." diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 8b3397854da..002ff6075a3 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -1,5 +1,5 @@ //Mild traumas are the most common; they are generally minor annoyances. -//They can be suppressed with escitalopram, but not chemically cured, although brain surgery still works. +//They can be suppressed with minaphobin, but not chemically cured, although brain surgery still works. //Most of the old brain damage effects have been transferred to the dumbness trauma. /datum/brain_trauma/mild diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm index 64d8c1416aa..715dcde7c75 100644 --- a/code/datums/brain_damage/severe.dm +++ b/code/datums/brain_damage/severe.dm @@ -1,6 +1,5 @@ //Severe traumas, when your brain gets abused way too much. //These range from very annoying to completely debilitating. -//They can be suppressed with paroxetine, and require brain surgery to solve. /datum/brain_trauma/severe diff --git a/code/datums/outfits/ert/iac.dm b/code/datums/outfits/ert/iac.dm index 5a2a2d2f9e9..60ba936d784 100644 --- a/code/datums/outfits/ert/iac.dm +++ b/code/datums/outfits/ert/iac.dm @@ -11,7 +11,7 @@ belt = /obj/item/storage/belt/medical back = /obj/item/storage/backpack/satchel_med accessory = /obj/item/clothing/accessory/storage/white_vest - accessory_contents = list(/obj/item/reagent_containers/hypospray/cmo = 1, /obj/item/storage/pill_bottle/dexalin_plus = 1, /obj/item/storage/pill_bottle/tramadol = 1) + accessory_contents = list(/obj/item/reagent_containers/hypospray/cmo = 1, /obj/item/storage/pill_bottle/dexalin_plus = 1, /obj/item/storage/pill_bottle/mortaphenyl = 1) id = /obj/item/card/id/distress/iac l_ear = /obj/item/device/radio/headset/distress diff --git a/code/datums/outfits/ert/med_eridani.dm b/code/datums/outfits/ert/med_eridani.dm index 6bbcf93ceee..aa5da4c87cf 100644 --- a/code/datums/outfits/ert/med_eridani.dm +++ b/code/datums/outfits/ert/med_eridani.dm @@ -11,7 +11,7 @@ belt = /obj/item/storage/belt/medical back = /obj/item/storage/backpack/satchel_med accessory = /obj/item/clothing/accessory/storage/white_vest - accessory_contents = list(/obj/item/reagent_containers/hypospray/cmo = 1, /obj/item/storage/pill_bottle/dexalin_plus = 1, /obj/item/storage/pill_bottle/tramadol = 1) + accessory_contents = list(/obj/item/reagent_containers/hypospray/cmo = 1, /obj/item/storage/pill_bottle/dexalin_plus = 1, /obj/item/storage/pill_bottle/mortaphenyl = 1) id = /obj/item/card/id/distress/iac l_ear = /obj/item/device/radio/headset/distress diff --git a/code/datums/trading/ai.dm b/code/datums/trading/ai.dm index c004e6215da..6dc80b7ad0a 100644 --- a/code/datums/trading/ai.dm +++ b/code/datums/trading/ai.dm @@ -182,7 +182,7 @@ They sell generic supplies and ask for generic supplies. /obj/item/storage/box/beakers = TRADER_THIS_TYPE, /obj/item/reagent_containers/glass/bottle/inaprovaline = TRADER_THIS_TYPE, /obj/item/reagent_containers/glass/bottle/stoxin = TRADER_THIS_TYPE, - /obj/item/reagent_containers/glass/bottle/chloralhydrate = TRADER_THIS_TYPE, + /obj/item/reagent_containers/glass/bottle/polysomnine = TRADER_THIS_TYPE, /obj/item/reagent_containers/glass/bottle/antitoxin = TRADER_THIS_TYPE, /obj/item/device/handheld_medical = TRADER_THIS_TYPE, /obj/item/stack/medical/advanced/bruise_pack/spaceklot = TRADER_THIS_TYPE diff --git a/code/game/gamemodes/changeling/implements/powers/body.dm b/code/game/gamemodes/changeling/implements/powers/body.dm index ca28c3fec4c..31144d928eb 100644 --- a/code/game/gamemodes/changeling/implements/powers/body.dm +++ b/code/game/gamemodes/changeling/implements/powers/body.dm @@ -254,7 +254,7 @@ C.SetWeakened(0) C.lying = FALSE C.reagents.add_reagent(/datum/reagent/hyperzine, 0.10) //Certainly this can't be abused. - Geeves - C.reagents.add_reagent(/datum/reagent/oxycodone, 0.10) + C.reagents.add_reagent(/datum/reagent/oxycomorphine, 0.10) C.update_canmove() src.verbs -= /mob/proc/changeling_unstun diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 7802dba998e..bc1cfa9aaac 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -832,7 +832,7 @@ vampire.use_blood(50) T.reagents.add_reagent(/datum/reagent/rezadone, 3) - T.reagents.add_reagent(/datum/reagent/oxycodone, 0.15) //enough to get back onto their feet + T.reagents.add_reagent(/datum/reagent/oxycomorphine, 0.15) //enough to get back onto their feet // Convert a human into a vampire. /mob/living/carbon/human/proc/vampire_embrace() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 41a0753e3dc..8251f574976 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -22,10 +22,11 @@ var/list/available_chemicals = list( /datum/reagent/inaprovaline, /datum/reagent/soporific, - /datum/reagent/paracetamol, + /datum/reagent/perconol, /datum/reagent/dylovene, /datum/reagent/dexalin ) + var/obj/item/reagent_containers/glass/beaker = null var/filtering = 0 var/allow_occupant_types = list(/mob/living/carbon/human) diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index d2b8fa51b3b..a7d4f679164 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -407,8 +407,8 @@ /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2, /obj/item/reagent_containers/pill/antitox = 6, - /obj/item/reagent_containers/pill/antihistamine = 6, - /obj/item/reagent_containers/pill/paracetamol = 6, + /obj/item/reagent_containers/pill/cetahydramine = 6, + /obj/item/reagent_containers/pill/perconol = 6, /obj/item/reagent_containers/food/drinks/medcup = 4 ) contraband = list( @@ -471,7 +471,7 @@ /obj/item/reagent_containers/pill/tox = 1 ) premium = list( - /obj/item/reagent_containers/pill/tramadol = 4 + /obj/item/reagent_containers/pill/mortaphenyl = 4 ) random_itemcount = 0 temperature_setting = -1 @@ -497,7 +497,7 @@ /obj/item/reagent_containers/pill/tox = 3 ) premium = list( - /obj/item/reagent_containers/pill/tramadol = 4 + /obj/item/reagent_containers/pill/mortaphenyl = 4 ) random_itemcount = 0 temperature_setting = -1 diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm index 2923e92c8d5..20967cfd4c1 100644 --- a/code/game/objects/items/devices/lighting/flashlight.dm +++ b/code/game/objects/items/devices/lighting/flashlight.dm @@ -109,7 +109,7 @@ if(M.getBrainLoss() > 15) to_chat(user, SPAN_NOTICE("There's visible lag between left and right pupils' reactions.")) - var/list/pinpoint = list(/datum/reagent/oxycodone=1,/datum/reagent/tramadol=5) + var/list/pinpoint = list(/datum/reagent/oxycomorphine=1,/datum/reagent/mortaphenyl=5) var/list/dilating = list(/datum/reagent/space_drugs=5,/datum/reagent/mindbreaker=1) var/datum/reagents/ingested = H.get_ingested_reagents() if(H.reagents.has_any_reagent(pinpoint) || ingested.has_any_reagent(pinpoint)) diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index d14c309fdde..fcb5eb31332 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -232,8 +232,8 @@ obj/item/clothing/mask/chewable/Destroy() /obj/item/clothing/mask/chewable/candy/lolli/meds/Initialize() . = ..() var/datum/reagent/payload = pick(list( - /datum/reagent/paracetamol, - /datum/reagent/tramadol, + /datum/reagent/perconol, + /datum/reagent/mortaphenyl, /datum/reagent/dylovene)) reagents.add_reagent(payload, 15) color = reagents.get_color() diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 78945365339..513a7192e9b 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -271,7 +271,7 @@ B1.reagents.add_reagent(/datum/reagent/potassium,20) B1.reagents.add_reagent(/datum/reagent/soporific, 10) B1.reagents.add_reagent(/datum/reagent/dylovene, 10) - B2.reagents.add_reagent(/datum/reagent/chloralhydrate,40) + B2.reagents.add_reagent(/datum/reagent/polysomnine,40) B2.reagents.add_reagent(/datum/reagent/phosphorus,20) detonator = new/obj/item/device/assembly_holder/timer_igniter(src) diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 66d03ce72ef..36684cebcf3 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -99,7 +99,7 @@ /obj/item/storage/pill_bottle/dermaline = 1, /obj/item/storage/pill_bottle/dexalin_plus = 1, /obj/item/storage/pill_bottle/dylovene = 1, - /obj/item/storage/pill_bottle/tramadol = 1, + /obj/item/storage/pill_bottle/mortaphenyl = 1, /obj/item/reagent_containers/inhaler/hyperzine = 1, /obj/item/stack/medical/splint = 1 ) @@ -213,29 +213,29 @@ starts_with = list(/obj/item/reagent_containers/pill/inaprovaline = 7) /obj/item/storage/pill_bottle/kelotane - name = "bottle of kelotane pills" + name = "bottle of Kelotane pills" desc = "Contains pills used to treat burns." starts_with = list(/obj/item/reagent_containers/pill/kelotane = 7) -/obj/item/storage/pill_bottle/antihistamine - name = "bottle of diphenhydramine pills" - desc = "Diphenhydramine, a common antihistamine used to reduce symptoms of allergies. Helps with sneezing." - starts_with = list(/obj/item/reagent_containers/pill/antihistamine = 7) +/obj/item/storage/pill_bottle/cetahydramine + name = "bottle of Cetahydramine pills" + desc = "Often compared to ancient brands, Cetahydramine is a modern chem used to reduce symptoms of allergies. Helps with sneezing." + starts_with = list(/obj/item/reagent_containers/pill/cetahydramine = 7) -/obj/item/storage/pill_bottle/tramadol - name = "bottle of Tramadol pills" +/obj/item/storage/pill_bottle/mortaphenyl + name = "bottle of Mortaphenyl pills" desc = "Contains pills used to relieve pain." - starts_with = list(/obj/item/reagent_containers/pill/tramadol = 7) + starts_with = list(/obj/item/reagent_containers/pill/mortaphenyl = 7) -/obj/item/storage/pill_bottle/paracetamol - name = "bottle of paracetamol pills" +/obj/item/storage/pill_bottle/perconol + name = "bottle of Perconol pills" desc = "Contains pills used to relieve pain and reduce fevers." - starts_with = list(/obj/item/reagent_containers/pill/paracetamol = 7) + starts_with = list(/obj/item/reagent_containers/pill/perconol = 7) -/obj/item/storage/pill_bottle/escitalopram - name = "bottle of Escitalopram pills" +/obj/item/storage/pill_bottle/minaphobin + name = "bottle of Minaphobin pills" desc = "Contains pills used to stabilize a patient's mood." - starts_with = list(/obj/item/reagent_containers/pill/escitalopram = 7) + starts_with = list(/obj/item/reagent_containers/pill/minaphobin = 7) /obj/item/storage/pill_bottle/rmt name = "bottle of RMT pills" diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 8527521dd0e..0c4237135b2 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -152,7 +152,7 @@ /obj/item/bodybag/cryobag = 1, /obj/item/storage/pill_bottle/kelotane = 2, /obj/item/storage/pill_bottle/antitox = 2, - /obj/item/storage/pill_bottle/tramadol = 2, + /obj/item/storage/pill_bottle/mortaphenyl = 2, /obj/item/reagent_containers/syringe/dylovene = 2, /obj/item/reagent_containers/syringe/inaprovaline = 2, /obj/item/stack/nanopaste = 1 @@ -178,7 +178,7 @@ icon_state = "purplecomb" // spawn_nothing_percentage = 50 problist = list( - /obj/item/storage/pill_bottle/tramadol = 3, + /obj/item/storage/pill_bottle/mortaphenyl = 3, /obj/item/storage/pill_bottle/happy = 2, /obj/item/storage/pill_bottle/zoom = 2, /obj/item/reagent_containers/glass/beaker/vial/random/toxin = 1, diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index 1a502e7cdca..e88dcdea402 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -143,20 +143,20 @@ /datum/reagent/clonexadone, /datum/reagent/space_drugs, /datum/reagent/thermite, - /datum/reagent/antihistamine, + /datum/reagent/cetahydramine, /datum/reagent/sterilizine, - /datum/reagent/mental/duloxetine, - /datum/reagent/mental/escitalopram, - /datum/reagent/mental/risperidone, + /datum/reagent/mental/emoxanyl, + /datum/reagent/mental/minaphobin, + /datum/reagent/mental/neurapan, /datum/reagent/rmt, - /datum/reagent/tramadol, - /datum/reagent/oxycodone, - /datum/reagent/imidazoline, + /datum/reagent/mortaphenyl, + /datum/reagent/oxycomorphine, + /datum/reagent/oculine, /datum/reagent/peridaxon, - /datum/reagent/mannitol, - /datum/reagent/ipecac, + /datum/reagent/cataleptinol, + /datum/reagent/verunol, /datum/reagent/hyperzine, - /datum/reagent/calomel, + /datum/reagent/fluvectionem, /datum/reagent/pacifier, /datum/reagent/dexalin/plus, /datum/reagent/ryetalyn, diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 2c5757500bc..f2f96080c9d 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -331,9 +331,9 @@ STOCK_ITEM_COMMON(pills, 1.2) /obj/item/storage/pill_bottle/dylovene, \ /obj/item/storage/pill_bottle/inaprovaline, \ /obj/item/storage/pill_bottle/kelotane, \ - /obj/item/storage/pill_bottle/antihistamine, \ - /obj/item/storage/pill_bottle/tramadol, \ - /obj/item/storage/pill_bottle/paracetamol \ + /obj/item/storage/pill_bottle/cetahydramine, \ + /obj/item/storage/pill_bottle/mortaphenyl, \ + /obj/item/storage/pill_bottle/perconol \ ) var/newtype = pick(options) new newtype(L) diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 51020e18a04..c05790587c9 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -86,7 +86,7 @@ STOCK_ITEM_UNCOMMON(mediumcell, 3) STOCK_ITEM_UNCOMMON(chempack, 5) var/list/chems = SSchemistry.chemical_reagents.Copy() - var/list/exclusion = list(/datum/reagent/drink, /datum/reagent, /datum/reagent/adminordrazine, /datum/reagent/chloralhydrate/beer2, /datum/reagent/azoth, /datum/reagent/elixir,\ + var/list/exclusion = list(/datum/reagent/drink, /datum/reagent, /datum/reagent/adminordrazine, /datum/reagent/polysomnine/beer2, /datum/reagent/azoth, /datum/reagent/elixir,\ /datum/reagent/liquid_fire, /datum/reagent/philosopher_stone, /datum/reagent/toxin/undead, /datum/reagent/love_potion, /datum/reagent/shapesand, /datum/reagent/usolve,\ /datum/reagent/sglue, /datum/reagent/black_matter, /datum/reagent/bottle_lightning, /datum/reagent/toxin/trioxin, /datum/reagent/toxin/phoron_salt, /datum/reagent/toxin/nanites, /datum/reagent/nitroglycerin) chems -= exclusion diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index d79e697adf2..854a38623d9 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -43,7 +43,7 @@ /obj/item/clothing/ring/reagent/sleepy/Initialize() . = ..() - reagents.add_reagent(/datum/reagent/chloralhydrate, 15) + reagents.add_reagent(/datum/reagent/polysomnine, 15) //Seals and Signet Rings diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index a4c6868bc4d..ab271f68237 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -172,7 +172,7 @@ charges = list( list("tricordrazine", "tricordrazine",/datum/reagent/tricordrazine, 80), - list("tramadol", "tramadol", /datum/reagent/tramadol, 80), + list("mortaphenyl", "mortaphenyl", /datum/reagent/mortaphenyl, 80), list("dexalin plus", "dexalinp", /datum/reagent/dexalin/plus, 80), list("antibiotics", "thetamycin", /datum/reagent/thetamycin, 80), list("antitoxins", "dylovene", /datum/reagent/dylovene, 80), @@ -192,7 +192,7 @@ //just over a syringe worth of each. Want more? Go refill. Gives the ninja another reason to have to show their face. charges = list( list("tricordrazine", "tricordrazine",/datum/reagent/tricordrazine, 20), - list("tramadol", "tramadol", /datum/reagent/tramadol, 20), + list("mortaphenyl", "mortaphenyl", /datum/reagent/mortaphenyl, 20), list("dexalin plus", "dexalinp", /datum/reagent/dexalin/plus, 20), list("antibiotics", "thetamycin", /datum/reagent/thetamycin, 20), list("antitoxins", "dylovene", /datum/reagent/dylovene, 20), @@ -293,7 +293,7 @@ charges = list( list("synaptizine", "synaptizine", /datum/reagent/synaptizine, 30), list("hyperzine", "hyperzine", /datum/reagent/hyperzine, 30), - list("oxycodone", "oxycodone", /datum/reagent/oxycodone, 30), + list("oxycomorphine", "oxycomorphine", /datum/reagent/oxycomorphine, 30), list("nutrients", "glucose", /datum/reagent/nutriment/glucose, 80), list("saline", "saline", /datum/reagent/saline, 80) ) @@ -311,7 +311,7 @@ charges = list( list("synaptizine", "synaptizine", /datum/reagent/synaptizine, 30), list("hyperzine", "hyperzine", /datum/reagent/hyperzine, 30), - list("oxycodone", "oxycodone", /datum/reagent/oxycodone, 30), + list("oxycomorphine", "oxycomorphine", /datum/reagent/oxycomorphine, 30), list("phoron", "phoron", /datum/reagent/toxin/phoron,60), list("kois", "k'ois paste", /datum/reagent/kois, 80), list("saline", "saline", /datum/reagent/saline, 80) @@ -358,7 +358,7 @@ charges = list( list("tricordrazine", "tricordrazine", /datum/reagent/tricordrazine, 40), - list("tramadol", "tramadol", /datum/reagent/tramadol, 40), + list("mortaphenyl", "mortaphenyl", /datum/reagent/mortaphenyl, 40), list("dexalin", "dexalin", /datum/reagent/dexalin, 40), list("inaprovaline", "inaprovaline", /datum/reagent/inaprovaline, 40) ) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index d925a3e6ca9..d0c3fdea360 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -26,7 +26,7 @@ /datum/reagent/fuel, /datum/reagent/blood, /datum/reagent/sterilizine, - /datum/reagent/ipecac, + /datum/reagent/verunol, /datum/reagent/toxin/fertilizer/monoammoniumphosphate ) var/list/gunk_data = list( diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 186252b82f2..09e15be99d0 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -397,7 +397,6 @@ /datum/reagent/hyperzine, /datum/reagent/hyronalin, /datum/reagent/impedrezene, - /datum/reagent/mental/paroxetine, /datum/reagent/mercury, /datum/reagent/mindbreaker, /datum/reagent/slimetoxin, @@ -416,7 +415,7 @@ /datum/reagent/synaptizine, /datum/reagent/thermite, /datum/reagent/toxin, - /datum/reagent/tramadol, + /datum/reagent/mortaphenyl, /datum/reagent/water, /datum/reagent/woodpulp, ) diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm index 243641f2810..f7912d451f8 100644 --- a/code/modules/hydroponics/seed_datums.dm +++ b/code/modules/hydroponics/seed_datums.dm @@ -889,7 +889,7 @@ name = "carrot" seed_name = "carrot" display_name = "carrots" - chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/imidazoline = list(3,5), /datum/reagent/drink/carrotjuice = list(10,20)) + chems = list(/datum/reagent/nutriment = list(1,20), /datum/reagent/oculine = list(3,5), /datum/reagent/drink/carrotjuice = list(10,20)) kitchen_tag = "carrot" /datum/seed/carrots/setup_traits() diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index 7e609d3d604..ae6915f2442 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -519,13 +519,13 @@ /datum/reagent/clonexadone value = 5.5 -/datum/reagent/paracetamol +/datum/reagent/perconol value = 3.3 -/datum/reagent/tramadol +/datum/reagent/mortaphenyl value = 3.1 -/datum/reagent/oxycodone +/datum/reagent/oxycomorphine value = 3.3 /datum/reagent/synaptizine @@ -534,7 +534,7 @@ /datum/reagent/alkysine value = 5.9 -/datum/reagent/imidazoline +/datum/reagent/oculine value = 4.2 /datum/reagent/peridaxon @@ -570,31 +570,28 @@ /datum/reagent/leporazine value = 2 -/datum/reagent/mental/methylphenidate +/datum/reagent/mental/corophenidate value = 6 -/datum/reagent/mental/sertraline +/datum/reagent/mental/parvosil value = 6 -/datum/reagent/mental/fluvoxamine +/datum/reagent/mental/neurostabin value = 6 -/datum/reagent/mental/escitalopram +/datum/reagent/mental/minaphobin value = 6 -/datum/reagent/mental/paroxetine - value = 3.5 - -/datum/reagent/mental/duloxetine +/datum/reagent/mental/emoxanyl value = 6 -/datum/reagent/mental/venlafaxine +/datum/reagent/mental/orastabin value = 6 -/datum/reagent/mental/risperidone +/datum/reagent/mental/neurapan value = 6 -/datum/reagent/mental/olanzapine +/datum/reagent/mental/nerospectan value = 6 /datum/reagent/mental/truthserum @@ -606,7 +603,7 @@ /datum/reagent/rezadone value = 5 -/datum/reagent/ipecac +/datum/reagent/verunol value = 2 /datum/reagent/crayon_dust @@ -708,10 +705,10 @@ /datum/reagent/soporific value = 2.5 -/datum/reagent/chloralhydrate +/datum/reagent/polysomnine value = 2.6 -/datum/reagent/chloralhydrate/beer2 +/datum/reagent/polysomnine/beer2 value = 2.2 /datum/reagent/space_drugs diff --git a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm index b9fca407869..9d24922091f 100644 --- a/code/modules/mob/living/carbon/human/MedicalSideEffects.dm +++ b/code/modules/mob/living/carbon/human/MedicalSideEffects.dm @@ -83,7 +83,7 @@ /datum/medical_effect/headache name = "Headache" triggers = list(/datum/reagent/cryoxadone = 10, /datum/reagent/bicaridine = 15, /datum/reagent/tricordrazine = 15) - cures = list(/datum/reagent/alkysine, /datum/reagent/tramadol, /datum/reagent/paracetamol, /datum/reagent/oxycodone) + cures = list(/datum/reagent/alkysine, /datum/reagent/mortaphenyl, /datum/reagent/perconol, /datum/reagent/oxycomorphine) cure_message = "Your head stops throbbing..." /datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength) @@ -116,7 +116,7 @@ // ====== /datum/medical_effect/cramps name = "Cramps" - triggers = list(/datum/reagent/dylovene = 30, /datum/reagent/tramadol = 15) + triggers = list(/datum/reagent/dylovene = 30, /datum/reagent/mortaphenyl = 15) cures = list(/datum/reagent/inaprovaline) cure_message = "The cramps let up..." diff --git a/code/modules/mob/living/carbon/human/chem_side_effects.dm b/code/modules/mob/living/carbon/human/chem_side_effects.dm index b9fca407869..9d24922091f 100644 --- a/code/modules/mob/living/carbon/human/chem_side_effects.dm +++ b/code/modules/mob/living/carbon/human/chem_side_effects.dm @@ -83,7 +83,7 @@ /datum/medical_effect/headache name = "Headache" triggers = list(/datum/reagent/cryoxadone = 10, /datum/reagent/bicaridine = 15, /datum/reagent/tricordrazine = 15) - cures = list(/datum/reagent/alkysine, /datum/reagent/tramadol, /datum/reagent/paracetamol, /datum/reagent/oxycodone) + cures = list(/datum/reagent/alkysine, /datum/reagent/mortaphenyl, /datum/reagent/perconol, /datum/reagent/oxycomorphine) cure_message = "Your head stops throbbing..." /datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength) @@ -116,7 +116,7 @@ // ====== /datum/medical_effect/cramps name = "Cramps" - triggers = list(/datum/reagent/dylovene = 30, /datum/reagent/tramadol = 15) + triggers = list(/datum/reagent/dylovene = 30, /datum/reagent/mortaphenyl = 15) cures = list(/datum/reagent/inaprovaline) cure_message = "The cramps let up..." diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 37e77fa75f3..ad372b1c732 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -636,7 +636,7 @@ var/normal_temp = species?.body_temperature || (T0C+37) var/fever = chem_effects[CE_FEVER] if(CE_NOFEVER in chem_effects) - fever -= chem_effects[CE_NOFEVER] // a dose of 16u paracetamol should offset a stage 4 virus + fever -= chem_effects[CE_NOFEVER] // a dose of 16u Perconol should offset a stage 4 virus bodytemperature = Clamp(bodytemperature+fever, normal_temp, normal_temp + 9) // temperature should range from 37C to 46C, 98.6F to 115F if(fever > 1) if(prob(20/3)) // every 30 seconds, roughly diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 9e94023b114..6fcab0d069f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -630,7 +630,7 @@ var/global/list/robot_modules = list( var/datum/reagents/RG = new /datum/reagents(50) src.emag.reagents = RG RG.my_atom = src.emag - RG.add_reagent(/datum/reagent/chloralhydrate/beer2, 50) + RG.add_reagent(/datum/reagent/polysomnine/beer2, 50) src.emag.name = "Mickey Finn's Special Brew" /obj/item/robot_module/clerical/general diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index 8c8075ed7ae..481201cd115 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -205,7 +205,7 @@ to_chat(src, SPAN_WARNING("You don't have enough chemicals!")) return - var/list/choices = list("Inaprovaline" = /datum/reagent/inaprovaline, "Bicaridine" = /datum/reagent/bicaridine, "Kelotane" = /datum/reagent/kelotane, "Dylovene" = /datum/reagent/dylovene, "Hyperzine" = /datum/reagent/hyperzine, "Peridaxon" = /datum/reagent/peridaxon, "Tramadol" = /datum/reagent/tramadol, "Fluvoxamine" = /datum/reagent/mental/fluvoxamine) + var/list/choices = list("Inaprovaline" = /datum/reagent/inaprovaline, "Bicaridine" = /datum/reagent/bicaridine, "Kelotane" = /datum/reagent/kelotane, "Dylovene" = /datum/reagent/dylovene, "Hyperzine" = /datum/reagent/hyperzine, "Peridaxon" = /datum/reagent/peridaxon, "Mortaphenyl" = /datum/reagent/mortaphenyl, "Neurostabin" = /datum/reagent/mental/neurostabin) var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in choices if(!chem || chemicals < 20 || !host || controlling || !src || stat) //Sanity check. diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 35b2a6b41b6..25e9aa38e0d 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -216,7 +216,7 @@ germ_level++ if(germ_level >= INFECTION_LEVEL_ONE) - owner.add_chemical_effect(CE_FEVER, germ_level/INFECTION_LEVEL_ONE) //10u of paracetamol minimum for a level 3 infection + owner.add_chemical_effect(CE_FEVER, germ_level/INFECTION_LEVEL_ONE) //10u of Perconol minimum for a level 3 infection if (germ_level >= INFECTION_LEVEL_TWO) var/obj/item/organ/external/parent = owner.get_organ(parent_organ) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 8bea48e990a..473913bbdb9 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -202,7 +202,7 @@ Pen exclusive commands /obj/item/pen/reagent/sleepy desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\"" origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5) - reagents_to_add = list(/datum/reagent/chloralhydrate = 22) + reagents_to_add = list(/datum/reagent/polysomnine = 22) /* diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm index 1933e8e4de4..eebec5c9754 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drugs.dm @@ -97,7 +97,7 @@ /datum/reagent/mindbreaker name = "Mindbreaker Toxin" - description = "A powerful hallucinogen, it can cause fatal effects in users." + description = "An incredibly potent hallucinogen designed to wreak havoc on the brain, resulting in disturbing hallucinations with long-term impacts on those given the drug - this drug is not pleasant, thus the name, and only hardcore addicts use the drug recreationally." reagent_state = LIQUID color = "#B31008" metabolism = REM * 0.25 @@ -109,7 +109,7 @@ M.add_chemical_effect(CE_HALLUCINATE, 2) /datum/reagent/psilocybin - name = "Psilocybin" + name = "psilocybin" description = "A strong psycotropic derived from certain species of mushroom." color = "#E700E7" overdose = REAGENTS_OVERDOSE @@ -218,7 +218,7 @@ /datum/reagent/guwan_painkillers/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) if(dose > 5 && volume <= 3) - M.adjustHalLoss(removed*300) //So oxycodone can't be used with it. + M.adjustHalLoss(removed*300) //So oxycomorphine can't be used with it. else if(dose > 5) M.add_chemical_effect(CE_PAINKILLER, 50) @@ -270,7 +270,7 @@ /datum/reagent/toxin/lean/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.hallucination = max(M.hallucination, 40) - M.add_chemical_effect(CE_PAINKILLER, 40) // basically like paracetamol, but a bit worse + M.add_chemical_effect(CE_PAINKILLER, 40) // basically like Perconol, but a bit worse // doesn't make you vomit, though if(prob(7)) M.emote(pick("twitch", "drool", "moan", "giggle")) @@ -283,7 +283,7 @@ /datum/reagent/toxin/krok name = "Krok Juice" - description = "An Eridanian variant of krokodil, known for causing prosthetic malfunctions." + description = "An advanced Eridanian variant of ancient krokodil, known for causing prosthetic malfunctions." strength = 3 metabolism = REM overdose = 15 @@ -305,7 +305,7 @@ if(HAND_RIGHT, ARM_RIGHT) H.drop_r_hand() if(robo) - H.add_chemical_effect(CE_PAINKILLER, 80) // equivalent to tramadol + H.add_chemical_effect(CE_PAINKILLER, 80) // equivalent to mortaphenyl var/obj/item/organ/internal/eyes/eyes = H.internal_organs_by_name[H.species.vision_organ || BP_EYES] if(eyes.status & ORGAN_ROBOT) M.hallucination = max(M.hallucination, 40) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 4565f582fca..cf7d5281a70 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -788,7 +788,7 @@ /datum/reagent/drink/carrotjuice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) ..() if(alien != IS_DIONA) - M.reagents.add_reagent(/datum/reagent/imidazoline, removed * 0.2) + M.reagents.add_reagent(/datum/reagent/oculine, removed * 0.2) /datum/reagent/drink/grapejuice name = "Grape Juice" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 5d764b57428..926e79f9e18 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -2,7 +2,7 @@ /datum/reagent/inaprovaline name = "Inaprovaline" - description = "Inaprovaline is a chemical that narrows blood vessels, raises blood pressure, and helps the blood pump more efficiently. Commonly used to stabilize patients." + description = "Inaprovaline is a cardiostimulant which stabilises myocardial contractility, working towards maintaining a steady pulse and blood pressure. Inaprovaline also acts as a weak analgesic" reagent_state = LIQUID color = "#00BFFF" overdose = REAGENTS_OVERDOSE * 2 @@ -18,7 +18,7 @@ /datum/reagent/bicaridine name = "Bicaridine" - description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma. Lasts twice as long when inhaled, however it is generally twice as weak." + description = "Bicaridine is a complex medication which specifically targets damaged tissues and damaged blood vessels by encouraging the rate at which the damaged tissues are regenerated. Overdosing bicaridine allows the drug to take effect on damaged muscular tissues of arteries." reagent_state = LIQUID color = "#BF0000" overdose = REAGENTS_OVERDOSE @@ -39,7 +39,7 @@ /datum/reagent/kelotane name = "Kelotane" - description = "Kelotane is a drug used to treat burns." + description = "Kelotane is a complex medication which specifically targets tissues which have been lost to severe burning by encouraging the rate at which these damaged tissues are regenerated." reagent_state = LIQUID color = "#FFA800" overdose = REAGENTS_OVERDOSE @@ -53,7 +53,7 @@ /datum/reagent/dermaline name = "Dermaline" - description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue." + description = "Dermaline is a recent improvement of kelotane, working in a similar way, though twice as effective. Dermaline is capable of recovering even the most dire of burnt tissues, being able to treat full-thickness burning." reagent_state = LIQUID color = "#FF8000" fallback_specific_heat = 1 @@ -67,7 +67,7 @@ /datum/reagent/dylovene name = "Dylovene" - description = "Dylovene is a broad-spectrum antitoxin." + description = "Dylovene is a broad-spectrum over-the-counter antitoxin. It is used in response to a variety of poisoning cases, being able to neutralise and remove harmful toxins from the bloodstream." reagent_state = LIQUID color = "#00A000" scannable = TRUE @@ -101,7 +101,7 @@ /datum/reagent/dexalin name = "Dexalin" - description = "Dexalin is used in the treatment of oxygen deprivation. The medication is twice as powerful and lasts twice as long when inhaled." + description = "Dexalin is a complex oxygen therapeutic and is available OTC. The chemical utilises carbon nanostructures which cling to oxygen and, in pathological conditions where tissues are hypoxic, will oxygenate these regions. Dexalin is twice as efficient when inhaled." reagent_state = LIQUID color = "#0080FF" overdose = REAGENTS_OVERDOSE @@ -130,14 +130,14 @@ /datum/reagent/dexalin/plus name = "Dexalin Plus" fallback_specific_heat = 1 - description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective, and is twice as powerful and lasts twice as long when inhaled." + description = "Dexalin Plus was a ground-breaking improvement of Dexalin, capable of transporting several times the amount of oxygen, allowing it to have more clinical uses in treating hypoxia. Dexalin Plus is twice as efficient when inhaled." color = "#0040FF" overdose = REAGENTS_OVERDOSE * 0.5 strength = 12 /datum/reagent/tricordrazine name = "Tricordrazine" - description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries, however it does not work when inhaled. Has different healing properties depending on the chemical's temperature." + description = "Tricordrazine is an old, though still useful, medication largely set aside following bicaridine and kelotane’s development. The drug increases the rate at which tissues regenerate, though far slower than modern medications." reagent_state = LIQUID color = "#8040FF" scannable = 1 @@ -154,7 +154,7 @@ /datum/reagent/cryoxadone name = "Cryoxadone" - description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." + description = "Cryoxadone is a ground-breaking and complex medication that, when acting on bodies cooler than 170K, is capable of increasing the rate at which wounds regenerate, as well as treating genetic damage. Cryoxadone, alongside Clonexadone, are the backbones of the cloning industry." reagent_state = LIQUID color = "#8080FF" metabolism = REM * 0.5 @@ -170,7 +170,7 @@ /datum/reagent/clonexadone name = "Clonexadone" - description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly." + description = "Clonexadone is a ground-breaking, complex medication that improved upon Cryoxadone. When acting on bodies cooler than 170K, the drug is capable of increasing the rate at which wounds regenerate, as well as treating genetic damage. Clonexadone, alongside Cryoxadone, are the backbones of the cloning industry." reagent_state = LIQUID color = "#80BFFF" metabolism = REM * 0.5 @@ -186,9 +186,9 @@ /* Painkillers */ -/datum/reagent/paracetamol - name = "Paracetamol" - description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller. Does not work when inhaled." +/datum/reagent/perconol + name = "Perconol" + description = "Perconol is an advanced NSAID medication which is highly effective at treating minor-mild pain, inflammation and high fevers. The drug is available over-the-counter for treating minor illnesses and mild pain. Perconol is not effective when inhaled." reagent_state = LIQUID color = "#C8A5DC" overdose = 60 @@ -200,17 +200,17 @@ metabolism_min = 0.005 breathe_mul = 0 -/datum/reagent/paracetamol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/perconol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_PAINKILLER, 50) M.add_chemical_effect(CE_NOFEVER, ((max_dose/2)^2-(dose-max_dose/2))/(max_dose/4)) // creates a smooth curve peaking at half the dose metabolised -/datum/reagent/paracetamol/overdose(var/mob/living/carbon/M, var/alien) +/datum/reagent/perconol/overdose(var/mob/living/carbon/M, var/alien) ..() M.hallucination = max(M.hallucination, 25) -/datum/reagent/tramadol - name = "Tramadol" - description = "Tramadol is a very effective painkiller designed for victims of heavy physical trauma. Does not work when inhaled." +/datum/reagent/mortaphenyl + name = "Mortaphenyl" + description = "Mortaphenyl is an advanced synthetic opioid medication which is highly effective at treating mild-severe pain as a result of severe, physical injury. Mortaphenyl is not effective when inhaled." reagent_state = LIQUID color = "#CB68FC" overdose = 30 @@ -222,16 +222,16 @@ metabolism_min = 0.005 breathe_mul = 0 -/datum/reagent/tramadol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/mortaphenyl/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_PAINKILLER, 80) -/datum/reagent/tramadol/overdose(var/mob/living/carbon/M, var/alien) +/datum/reagent/mortaphenyl/overdose(var/mob/living/carbon/M, var/alien) ..() M.hallucination = max(M.hallucination, 40) -/datum/reagent/oxycodone - name = "Oxycodone" - description = "Oxycodone is incredibly potent and very addictive painkiller. Do not mix with alcohol. Does not work when inhaled." +/datum/reagent/oxycomorphine + name = "Oxycomorphine" + description = "Oxycomorphine is a highly advanced synthetic opioid medication which is extremely effective at treating severe-agonising pain as a result of injuries usually incompatible with life. The drug is highly addictive and sense-numbing. Oxycomorphine is not effective when inhaled." reagent_state = LIQUID color = "#800080" overdose = 20 @@ -242,7 +242,7 @@ metabolism_min = 0.005 breathe_mul = 0 -/datum/reagent/oxycodone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/oxycomorphine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_PAINKILLER, 200) var/mob/living/carbon/human/H = M if(!istype(H)) @@ -252,7 +252,7 @@ M.hallucination = max(M.hallucination, bac * 300) M.druggy = max(M.druggy, bac * 100) -/datum/reagent/oxycodone/overdose(var/mob/living/carbon/M, var/alien) +/datum/reagent/oxycomorphine/overdose(var/mob/living/carbon/M, var/alien) ..() M.druggy = max(M.druggy, 20) M.hallucination = max(M.hallucination, 60) @@ -261,7 +261,7 @@ /datum/reagent/synaptizine name = "Synaptizine" - description = "Synaptizine is used to treat a robust array of conditions, such as drowsyness, paralysis, weakness, LSD overdose, hallucinations, and pain. Moderately poisonous, and should only be used as a last resort." + description = "Synaptizine is an advanced synaptic stimulant and nootropic which improves synaptic transmission and keeps one alert, giving it many clinical uses in the treatment of paralysis, weakness, narcolepsy and hallucinations. Synaptizine is difficult to metabolise and is hard on the liver." reagent_state = LIQUID color = "#99CCFF" metabolism = REM * 0.05 @@ -290,7 +290,7 @@ /datum/reagent/alkysine name = "Alkysine" - description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue." + description = "Alkysine is a complex drug which increases cerebral circulation, ensuring the brain does not become hypoxic and increasing the rate at which neurological function returns after a catastrophic injury." reagent_state = LIQUID color = "#FFFF66" metabolism = REM * 0.25 @@ -307,9 +307,9 @@ M.hallucination = max(M.hallucination, 25) ..() -/datum/reagent/imidazoline - name = "Imidazoline" - description = "Heals eye damage" +/datum/reagent/oculine + name = "Oculine" + description = "Oculine is a complex organ-regenerative medication which increases the rate at which cells can differentiate into those required to recover damage to ocular tissues." reagent_state = LIQUID color = "#C8A5DC" overdose = REAGENTS_OVERDOSE @@ -317,7 +317,7 @@ taste_mult = 0.33 //Specifically to cut the dull toxin taste out of foods using carrot taste_description = "dull toxin" -/datum/reagent/imidazoline/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/oculine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.eye_blurry = max(M.eye_blurry - 5 * removed, 0) M.eye_blind = max(M.eye_blind - 5 * removed, 0) if(ishuman(M)) @@ -327,13 +327,13 @@ if(E.damage > 0) E.damage = max(E.damage - 5 * removed, 0) -/datum/reagent/imidazoline/overdose(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/oculine/overdose(var/mob/living/carbon/M, var/alien, var/removed) M.hallucination = max(M.hallucination, 15) ..() /datum/reagent/peridaxon name = "Peridaxon" - description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." + description = "Peridaxon is complex, broad-spectrum organ-regenerative medication which increases the rate at which cells can differentiate into organ cells to recover damaged organ tissues. The drug is hard on the body, leading to confusion and drowsiness." reagent_state = LIQUID color = "#561EC3" overdose = 10 @@ -353,7 +353,7 @@ /datum/reagent/ryetalyn name = "Ryetalyn" - description = "Ryetalyn can cure all genetic abnomalities via a catalytic process." + description = "Ryetalyn is a novel, highly advanced, broad-spectrum medication, developed by Dominian scientists, which has varying clinical uses in treating genetic abnormalities including certain cancers, autoimmune conditions, and Hulk Syndrome." reagent_state = SOLID color = "#004000" overdose = REAGENTS_OVERDOSE @@ -375,7 +375,7 @@ /datum/reagent/hyperzine name = "Hyperzine" - description = "Hyperzine is a highly effective, long lasting, muscle stimulant. Lasts twice as long when inhaled." + description = "Hyperzine is a complex cardio-synaptic stimulant drug designed to increase the performance of the body. Downsides include violent muscle spasms and tremors." reagent_state = LIQUID color = "#FF3300" metabolism = REM * 0.15 @@ -404,7 +404,7 @@ //Once all alcohol in the body is neutralised, it will then cure intoxication and sober the patient up /datum/reagent/ethylredoxrazine name = "Ethylredoxrazine" - description = "A powerful oxidizer that reacts with ethanol." + description = "Ethylredoxrazine is a powerful medication which oxidises ethanol in the bloodstream, reducing the burden on the liver to complete this task. Ethylredoxrazine also blocks the reuptake of neurotransmitters responsible for symptoms of alcohol intoxication." reagent_state = SOLID color = "#605048" metabolism = REM * 0.3 @@ -450,7 +450,7 @@ /datum/reagent/hyronalin name = "Hyronalin" - description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." + description = "Hyronalin is a complex anti-radiation medication which specifically targets ionised cells, reducing their cell division rate to prevent their growth before gradually destroying these afflicted cells." reagent_state = LIQUID color = "#408000" metabolism = REM * 0.25 @@ -472,7 +472,7 @@ /datum/reagent/arithrazine name = "Arithrazine" - description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." + description = "Arithrazine is a recent improvement of Hyronalin, rapidly destroying any ionised cells, though this often leads to collateral cell damage, resulting in contusions across affected parts of the body." reagent_state = LIQUID color = "#008000" metabolism = REM * 0.25 @@ -496,7 +496,7 @@ /datum/reagent/thetamycin name = "Thetamycin" - description = "A theta-lactam antibiotic, effective against wound and organ bacterial infections." + description = "Thetamycin is a complex, broad-spectrum antibiotic developed to treat wound infections, organ infections, and septicaemia, even those caused by superbugs with high anti-bacterial resistances." reagent_state = LIQUID color = "#41C141" metabolism = REM * 0.05 @@ -511,22 +511,22 @@ M.add_chemical_effect(CE_EMETIC, dose/8) // chance per 2 second tick to cause vomiting M.add_chemical_effect(CE_ANTIBIOTIC, dose) // strength of antibiotics; amount absorbed, need >5 to be effective. takes 50 seconds to work -/datum/reagent/ondansetron - name = "Ondansetron" - description = "Ondansetron is a medication used to prevent nausea and vomiting." +/datum/reagent/asinodryl + name = "Asinodryl" + description = "Asinodryl is an anti-emetic medication which acts by preventing the two regions in the brain responsible for vomiting from controlling the act of emesis." color = "#f5f2d0" taste_description = "bitterness" metabolism = REM * 0.25 fallback_specific_heat = 1 -/datum/reagent/ondansetron/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/asinodryl/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_DIONA) return M.add_chemical_effect(CE_ANTIEMETIC, dose/4) // 1u should suppress 2u thetamycin /datum/reagent/coughsyrup name = "Cough Syrup" - description = "A chemical that is used as a cough suppressant in low doses, and in higher doses it can be recreationally (ab)used." + description = "A complex antitussive medication available OTC which is very effective at suppressing cough reflexes. The medication also acts as a very weak analgesic medication, leading to it being a very cheap recreational drug or precursor to other recreational drugs." scannable = 1 reagent_state = LIQUID taste_description = "bitterness" @@ -553,9 +553,9 @@ if(prob(50)) M.drowsyness = max(M.drowsyness, 3) -/datum/reagent/antihistamine - name = "Diphenhydramine" - description = "A common antihistamine medication, also known as Benadryl. Known for causing drowsiness in larger doses." +/datum/reagent/cetahydramine + name = "Cetahydramine" + description = "Cetahydramine is a complex antihistamine medication available OTC which blocks the release of histamine, thus making it effective at suppressing allergies and sneezing. Cetahydramine can cause drowsiness in larger doses, making it an effective sleep aid." scannable = 1 reagent_state = LIQUID taste_description = "bitterness" @@ -566,13 +566,13 @@ ingest_mul = 1 fallback_specific_heat = 0.605 // assuming it's ethanol-based -/datum/reagent/antihistamine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/cetahydramine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(prob(dose/2)) M.drowsyness += 2 /datum/reagent/sterilizine name = "Sterilizine" - description = "Sterilizes wounds in preparation for surgery and thoroughly removes blood." + description = "Sterilizine is a chemical product composed of bleach and anti-toxins which can thoroughly disinfect wound sites and any biohazardous waste." reagent_state = LIQUID color = "#C8A5DC" touch_met = 5 @@ -605,7 +605,7 @@ /datum/reagent/leporazine name = "Leporazine" - description = "Leporazine can be use to stabilize an individual's body temperature." + description = "Leporazine is a complex medication which improves thermal homeostasis, stabilising and regulating the body’s core temperature. Leporazine often results in hyperventilation which should be monitored." reagent_state = LIQUID color = "#C8A5DC" overdose = REAGENTS_OVERDOSE @@ -707,7 +707,7 @@ /datum/reagent/mental/nicotine name = "Nicotine" - description = "Nicotine is a stimulant and relaxant commonly found in tobacco products. It is very poisonous, unless at very low doses." + description = "Nicotine is an ancient stimulant and relaxant commonly found in tobacco products. It is very poisonous, unless at very low doses." reagent_state = LIQUID color = "#333333" metabolism = 0.0016 * REM @@ -735,9 +735,9 @@ M.Weaken(10 * removed * scale) M.add_chemical_effect(CE_PULSE, 0.5) -/datum/reagent/mental/methylphenidate - name = "Methylphenidate" - description = "Methylphenidate is an AHDH treatment drug that treats basic distractions such as phobias and hallucinations at moderate doses. Withdrawl effects are rare. Side effects are rare, and include hallucinations." +/datum/reagent/mental/corophenidate + name = "Corophenidate" + description = "Corophenidate is a new generation, psychoactive stimulant used in the treatment of ADHD and ADD. It has far fewer side effects than previous generations of CNS stimulants. Withdrawal symptoms include hallucinations and disruption of focus." reagent_state = LIQUID color = "#8888AA" metabolism = 0.01 * REM @@ -759,13 +759,13 @@ /datum/brain_trauma/mild/hallucinations = 2 ) -/datum/reagent/mental/methylphenidate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/mental/corophenidate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_HALLUCINATE, -1) ..() -/datum/reagent/mental/fluvoxamine - name = "Fluvoxamine" - description = "Fluvoxamine is safe and effective at treating basic phobias, as well as schizophrenia and muscle weakness at higher doses. Withdrawl effects are rare. Side effects are rare, and include hallucinations." +/datum/reagent/mental/neurostabin + name = "Neurostabin" + description = "Neurostabin is a new generation, psychoactive drug used in the treatment of psychoses, and also has clinical significance in treating muscle weakness. It has far fewer side effects than previous generations of psychoactive drugs. Withdrawal symptoms include hallucinations and the development of phobias." reagent_state = LIQUID color = "#888888" metabolism = 0.01 * REM @@ -788,9 +788,9 @@ /datum/brain_trauma/mild/hallucinations = 2 ) -/datum/reagent/mental/sertraline - name = "Sertraline" - description = "Sertraline is cheap, safe, and effective at treating basic phobias, however it does not last as long as other drugs of it's class. Withdrawl effects are uncommon. Side effects are rare." +/datum/reagent/mental/parvosil + name = "Parvosil" + description = "Parvosil is a new generation, psychoactive drug used in the treatment of anxiety disorders such as phobias and social anxiety. It has far fewer side effects than previous generations of pysychoactive drugs. Withdrawal symptoms include hallucinations and heightened anxiety." reagent_state = LIQUID color = "#88AA88" metabolism = 0.02 * REM @@ -809,11 +809,11 @@ /datum/brain_trauma/mild/phobia/ = 10, /datum/brain_trauma/mild/hallucinations = 5 ) - suppressing_reagents = list(/datum/reagent/mental/fluvoxamine = 5) + suppressing_reagents = list(/datum/reagent/mental/neurostabin = 5) -/datum/reagent/mental/escitalopram - name = "Escitalopram" - description = "Escitalopram is expensive, safe and very effective at treating basic phobias as well as advanced phobias like monophobia. A common side effect is drowsiness, and a rare side effect is hallucinations. Withdrawl effects are uncommon." +/datum/reagent/mental/minaphobin + name = "Minaphobin" + description = "Minaphobin is a new generation, psychoactive drug used in the treatment of anxiety disorders such as phobias and social anxiety. It has far fewer side effects than previous generations of psychoactive drugs. Withdrawal symptoms include hallucinations and heightened anxiety." reagent_state = LIQUID color = "#FF8888" metabolism = 0.01 * REM @@ -834,46 +834,13 @@ /datum/brain_trauma/mild/hallucinations = 10 ) suppressing_reagents = list( - /datum/reagent/mental/fluvoxamine = 5, - /datum/reagent/mental/sertraline = 5 + /datum/reagent/mental/neurostabin = 5, + /datum/reagent/mental/parvosil = 5 ) -/datum/reagent/mental/paroxetine - name = "Paroxetine" - description = "Paroxetine is effective at treating basic phobias while also preventing the body from overheating. Side effects are rare, and include hallucinations. Withdrawl effects are frequent and unsafe." - reagent_state = LIQUID - color = "#AA8866" - metabolism = 0.01 * REM - data = 0 - taste_description = "bandaid" - goodmessage = list("You do not feel the need to worry about simple things.","You feel calm and level-headed.","You feel decent.") - badmessage = list("You worry about the littlest thing.","You feel like you are at risk.","You think you see things.") - worstmessage = list("You start to overreact to sounds and movement...","Your hear dangerous thoughts in your head...","You are really starting to see things...") - messagedelay = ANTIDEPRESSANT_MESSAGE_DELAY * 0.75 - suppress_traumas = list( - /datum/brain_trauma/mild/phobia/ = 5 - ) - dosage_traumas = list( - /datum/brain_trauma/mild/hallucinations = 5 - ) - withdrawal_traumas = list( - /datum/brain_trauma/mild/phobia/ = 25, - /datum/brain_trauma/mild/hallucinations = 50 - ) - suppressing_reagents = list( - /datum/reagent/mental/escitalopram = 5, - /datum/reagent/mental/fluvoxamine = 10, - /datum/reagent/mental/sertraline = 10 - ) - -/datum/reagent/mental/paroxetine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - removed*100) - . = ..() - -/datum/reagent/mental/duloxetine - name = "Duloxetine" - description = "Duloxetine is effective at treating basic phobias and concussions. A rare side effect is hallucinations. Withdrawl effects are common." +/datum/reagent/mental/emoxanyl + name = "Emoxanyl" + description = "Emoxanyl is a novel, antioxidant medication which increases cerebral circulation and is used to treat anxiety, depression, concussion, and epilepsy. It has fewer side effects than many other forms of psychoactive drugs. Withdrawal symptoms include hallucinations and heightened anxiety." reagent_state = LIQUID color = "#88FFFF" metabolism = 0.01 * REM @@ -896,15 +863,15 @@ /datum/brain_trauma/mild/concussion = 10 ) suppressing_reagents = list( - /datum/reagent/mental/paroxetine = 5, - /datum/reagent/mental/escitalopram = 5, - /datum/reagent/mental/fluvoxamine = 10, - /datum/reagent/mental/sertraline = 10 + /datum/reagent/mental/neurapan = 5, + /datum/reagent/mental/minaphobin = 5, + /datum/reagent/mental/neurostabin = 10, + /datum/reagent/mental/parvosil = 10 ) -/datum/reagent/mental/venlafaxine - name = "Venlafaxine" - description = "Venlafaxine is effective at treating basic phobias, monophobia, and stuttering. Side effects are uncommon and include hallucinations. Withdrawl effects are common." +/datum/reagent/mental/orastabin + name = "Orastabin" + description = "Orastabin is a new generation, complex psychoactive medication used in the treatment of anxiety disorders and speech impediments. It has fewer side effects than many other forms of psychoactive drugs. Withdrawal symptoms include hallucinations and heightened anxiety." reagent_state = LIQUID color = "#FF88FF" metabolism = 0.01 * REM @@ -927,16 +894,16 @@ /datum/brain_trauma/mild/hallucinations = 25 ) suppressing_reagents = list( - /datum/reagent/mental/duloxetine = 5, - /datum/reagent/mental/paroxetine = 5, - /datum/reagent/mental/escitalopram = 5, - /datum/reagent/mental/fluvoxamine = 10, - /datum/reagent/mental/sertraline = 10 + /datum/reagent/mental/emoxanyl = 5, + /datum/reagent/mental/neurapan = 5, + /datum/reagent/mental/minaphobin = 5, + /datum/reagent/mental/neurostabin = 10, + /datum/reagent/mental/parvosil = 10 ) -/datum/reagent/mental/risperidone - name = "Risperidone" - description = "Risperidone is a potent antipsychotic medication used to treat schizophrenia, stuttering, speech impediment, monophobia, hallucinations, tourettes, and muscle spasms. Side effects are common and include pacifism. Withdrawl symptoms are dangerous and almost always occur." +/datum/reagent/mental/neurapan + name = "Neurapan" + description = "Neurapan is a groundbreaking, expensive antipsychotic medication capable of treating a whole spectrum of mental illnesses, including psychoses, anxiety disorders, Tourette Syndrome and depression, and can alleviate symptoms of stress. Neurapan can be addictive due to its tranquilising effects, and withdrawal symptoms are dangerous." reagent_state = LIQUID color = "#FF4444" metabolism = 0.02 * REM @@ -967,19 +934,19 @@ /datum/brain_trauma/severe/monophobia = 50 ) suppressing_reagents = list( - /datum/reagent/mental/venlafaxine = 20, - /datum/reagent/mental/duloxetine = 20, - /datum/reagent/mental/paroxetine = 20, - /datum/reagent/mental/escitalopram = 20 + /datum/reagent/mental/orastabin = 20, + /datum/reagent/mental/emoxanyl = 20, + /datum/reagent/mental/neurapan = 20, + /datum/reagent/mental/minaphobin = 20 ) -/datum/reagent/mental/risperidone/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/mental/neurapan/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_HALLUCINATE, -2) ..() -/datum/reagent/mental/olanzapine - name = "Olanzapine" - description = "Olanzapine is a high-strength, expensive antipsychotic medication used to treat schizophrenia, stuttering, speech impediment, monophobia, hallucinations, tourettes, and muscle spasms. Side effects are common and include pacifism. The medication metabolizes quickly, and withdrawl is dangerous." +/datum/reagent/mental/nerospectan + name = "Nerospectan" + description = "Nerospectan is an expensive, new generation anti-psychotic medication capable of treating a whole spectrum of mental illnesses, including psychoses, anxiety disorders, Tourette Syndrome and depression, and can alleviate symptoms of stress. Nerospectan can be addictive due to its tranquilising effects, and withdrawal symptoms are dangerous." reagent_state = LIQUID color = "#FF8844" metabolism = 0.02 * REM @@ -1007,19 +974,19 @@ /datum/brain_trauma/special/imaginary_friend = 50 ) suppressing_reagents = list( - /datum/reagent/mental/venlafaxine = 20, - /datum/reagent/mental/duloxetine = 20, - /datum/reagent/mental/paroxetine = 20, - /datum/reagent/mental/escitalopram = 20 + /datum/reagent/mental/orastabin = 20, + /datum/reagent/mental/emoxanyl = 20, + /datum/reagent/mental/neurapan = 20, + /datum/reagent/mental/minaphobin = 20 ) -/datum/reagent/mental/olanzapine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/mental/nerospectan/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.add_chemical_effect(CE_HALLUCINATE, -2) ..() /datum/reagent/mental/truthserum name = "Truth serum" - description = "This highly illegal, expensive, military strength truth serum is a must have for secret corporate interrogations. Do not ingest." + description = "Truth Serum, a refined variant of Paxazide, is an expensive and very unethical psychoactive drug capable of inhibiting defensive measures and reasoning in regards to communication, resulting in those under the effects of the drug to be very open to telling the truth." reagent_state = LIQUID color = "#888888" metabolism = 0.05 * REM @@ -1104,9 +1071,9 @@ if (!modifier) modifier = M.add_modifier(/datum/modifier/stimulant, MODIFIER_REAGENT, src, _strength = 1, override = MODIFIER_OVERRIDE_STRENGTHEN) -/datum/reagent/mannitol - name = "Mannitol" - description = "Mannitol is a super strength chemical that heals brain tissue damage and cures dumbness, cerebral blindness, cerebral paralysis, colorblindness, and aphasia. More effective when the patient's body temperature is less than 170K." +/datum/reagent/cataleptinol + name = "Cataleptinol" + description = "Cataleptinol is a highly advanced, expensive medication capable of regenerating the most damaged of brain tissues. Cataleptinol is used in the treatment of dumbness, cerebral blindness, cerebral paralysis and aphasia. The drug is more effective when the patient’s core temperature is below 170K." reagent_state = LIQUID color = "#FFFF00" metabolism = REM * 2 //0.4 @@ -1122,7 +1089,7 @@ /datum/brain_trauma/severe/aphasia/ ) -/datum/reagent/mannitol/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed) +/datum/reagent/cataleptinol/affect_blood(var/mob/living/carbon/human/M, var/alien, var/removed) M.add_chemical_effect(CE_PAINKILLER, 10) var/chance = dose*removed @@ -1145,9 +1112,9 @@ //Narcolepsy //Discoordination -/datum/reagent/calomel - name = "Calomel" - description = "A highly toxic medicine that quickly purges most chemicals from the bloodstream. Overdose causes bloodloss and more toxin buildup, however works twice as fast." +/datum/reagent/fluvectionem + name = "Fluvectionem" + description = "Fluvectionem is a complex anti-toxin medication that is capable of purging the bloodstream of toxic reagents. The drug is capable of neutralising the most difficult of compounds and acts very fast, however it is inefficient and results in benign waste products that can be damaging to the liver." color = "#222244" metabolism = 0.5 * REM overdose = 30 @@ -1155,7 +1122,7 @@ taste_description = "thick salt" reagent_state = SOLID -/datum/reagent/calomel/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/fluvectionem/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) var/is_overdosed = overdose && (dose > overdose) if(is_overdosed) removed *= 2 @@ -1181,7 +1148,7 @@ /datum/reagent/pulmodeiectionem name = "Pulmodeiectionem" - description = "A powdery chemical that damages the mucus lining in the the main broncus and the trachea, allowing particles to easily escape the lungs. Only works when inhaled. May cause long term damage to the lungs, and oxygen deprevation." + description = "Pulmodeiectionem is a complex anti-toxin medication that is capable of purging the lungs of toxic reagents by damaging the mucous lining of the bronchi and trachea, allowing particulate to be coughed out of the lungs. Pulmodeiectionem works only when inhaled and can cause long-term damage to the lungs." color = "#550055" metabolism = 2 * REM overdose = 10 @@ -1211,7 +1178,7 @@ /datum/reagent/pneumalin name = "Pneumalin" - description = "A chemical that, when inhaled, restores tearing and bruising of the lungs. Overdosing can lower a patient's pulse to dangerous levels." + description = "Pneumalin is a powerful, organ-regenerative medication that increases the rate at which lung tissues are regenerated. Pneumalin only works when inhaled, and overdosing can lead to severe bradycardia." color = "#8154b4" overdose = 15 scannable = 1 @@ -1229,7 +1196,7 @@ /datum/reagent/rezadone name = "Rezadone" - description = "A powder with almost magical properties, this substance can effectively treat genetic damage in humanoids, though excessive consumption has side effects." + description = "Rezadone is an extremely expensive, ground-breaking miracle drug that is widely. The compound is capable of treating all kinds of physical damage, disfiguration, as well as genetic damage. Excessive consumption of rezadone can lead to severe disorientation." reagent_state = SOLID color = "#669900" overdose = REAGENTS_OVERDOSE @@ -1247,22 +1214,22 @@ M.make_dizzy(5) M.make_jittery(5) -/datum/reagent/ipecac - name = "Ipecac" - description = "A simple emetic, Induces vomiting in the patient, emptying stomach contents" +/datum/reagent/verunol + name = "Verunol Syrup" + description = "A complex emetic medication that causes the patient to vomit due to gastric irritation and the stimulating of the vomit centres of the brain." reagent_state = LIQUID color = "#280f0b" overdose = REAGENTS_OVERDOSE scannable = 1 taste_description = "sweet syrup" -/datum/reagent/ipecac/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/verunol/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed) if (prob(10+dose)) to_chat(M, pick("You feel nauseous!", "Your stomach churns uncomfortably.", "You feel like you're about to throw up.", "You feel queasy.", "You feel bile in your throat.")) M.add_chemical_effect(CE_EMETIC, dose) -/datum/reagent/ipecac/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/verunol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) M.adjustToxLoss(2 * removed) //If you inject it you're doing it wrong /datum/reagent/azoth @@ -1298,7 +1265,7 @@ /datum/reagent/adipemcina //Based on quinapril name = "Adipemcina" - description = "Adipemcina is a heart medication used for treating high blood pressure, heart failure, and diabetes. Causes vomiting and liver damage when overdosed." + description = "Adipemcina is a complex, organ-regenerative medication that increases the rate at which cells differentiate into myocardial cells. Adipemcina overdoses result in severe liver damage and vomiting." reagent_state = LIQUID color = "#008000" overdose = REAGENTS_OVERDOSE @@ -1385,7 +1352,7 @@ /datum/reagent/pacifier name = "Paxazide" - description = "A mind altering chemical compound capable of suppressing violent tendencies." + description = "Paxazide is an expensive and unethical, psychoactive drug used to pacify people, suppressing regions of the brain responsible for anger and violence. Paxazide can be addictive due to its tranquilising effects, though withdrawal symptoms are scarce." reagent_state = LIQUID color = "#1ca9c9" taste_description = "numbness" @@ -1395,7 +1362,7 @@ /datum/reagent/rmt name = "Regenerative-Muscular Tissue Supplements" - description = "A chemical rampantly used by those seeking to remedy the effects of prolonged zero-gravity adaptations." + description = "RMT Supplement is a bioengineered, fast-acting growth factor that specifically helps recover bone and muscle mass caused by prolonged zero-gravity adaptations. It can also be used to treat chronic muscle weakness." reagent_state = LIQUID color = "#AA8866" metabolism = 0.2 * REM diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index f62308154de..155200e46b4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -229,7 +229,7 @@ /datum/reagent/toxin/potassium_chlorophoride name = "Potassium Chlorophoride" - description = "A specific chemical based on Potassium Chloride to stop the heart for surgery. Not safe to eat!" + description = "Potassium Chlorophoride is an expensive, vastly improved variant of Potassium Chloride. Potassium Chlorophoride, unlike the original drug, acts immediately to block neuromuscular junctions, causing general paralysis." reagent_state = SOLID color = "#FFFFFF" strength = 10 @@ -384,7 +384,7 @@ /datum/reagent/lexorin name = "Lexorin" - description = "Lexorin temporarily stops respiration. Causes tissue damage." + description = "Lexorin is a complex toxin that attempts to induce general hypoxia by weakening the diaphragm to prevent respiration and also by binding to haemoglobins to prevent oxygen molecules from doing the same." reagent_state = LIQUID color = "#C8A5DC" overdose = REAGENTS_OVERDOSE @@ -450,7 +450,7 @@ /datum/reagent/soporific name = "Soporific" - description = "An effective hypnotic used to treat insomnia, can act as a sedative. Lasts three times longer when inhaled." + description = "Soporific is highly diluted polysomnine which results in slower and more gradual sedation. This makes the drug ideal at treating insomnia and anxiety disorders, however is generally not reliable for sedation in preparation for surgery except in high doses." reagent_state = LIQUID color = "#009CA8" metabolism = REM * 0.5 @@ -477,9 +477,9 @@ M.sleeping = max(M.sleeping, 20) M.drowsyness = max(M.drowsyness, 60) -/datum/reagent/chloralhydrate - name = "Chloral Hydrate" - description = "A powerful sedative. Lasts two times longer when inhaled." +/datum/reagent/polysomnine + name = "Polysomnine" + description = "Polysomnine is a complex drug which rapidly induces sedation in preparation for surgery. Polysomnine’s sedative effect is fast acting, and sedated individuals wake up with zero amnesia regarding the events leading up to their sedation, however the only downside is how hard the drug is on the liver." reagent_state = SOLID color = "#000067" metabolism = REM * 0.5 @@ -487,7 +487,7 @@ taste_description = "bitterness" breathe_met = REM * 0.5 * 0.5 -/datum/reagent/chloralhydrate/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) +/datum/reagent/polysomnine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) var/mob/living/carbon/human/H = M if(istype(H) && (H.species.flags & NO_BLOOD)) return @@ -503,7 +503,7 @@ if(dose > 1) M.add_chemical_effect(CE_TOXIN, removed) -/datum/reagent/chloralhydrate/beer2 //disguised as normal beer for use by emagged brobots +/datum/reagent/polysomnine/beer2 //disguised as normal beer for use by emagged brobots name = "Beer" description = "An alcoholic beverage made from malted grains, hops, yeast, and water. The fermentation appears to be incomplete." //If the players manage to analyze this, they deserve to know something is wrong. reagent_state = LIQUID @@ -521,7 +521,7 @@ /datum/reagent/slimetoxin name = "Mutation Toxin" - description = "A corruptive toxin produced by slimes." + description = "A transformative toxin isolated from jelly extract from green slimes. Use of the chemical has profound effects on the body’s cells, converting animal cells into unique slime cells. These slime cells begin to replace the normal cells of the body, resulting in the development of ‘slime people’, though eventually these degenerate into grey slimes." reagent_state = LIQUID color = "#13BC5E" taste_description = "sludge" @@ -535,7 +535,7 @@ /datum/reagent/aslimetoxin name = "Advanced Mutation Toxin" - description = "An advanced corruptive toxin produced by slimes." + description = "A transformative toxin isolated from jelly extract from black slimes. The chemical is fundamentally the same as regular Mutation Toxin, however its effect is magnitudes faster, degenerating a body into a grey slime immediately." reagent_state = LIQUID color = "#13BC5E" taste_description = "sludge" @@ -616,7 +616,7 @@ /datum/reagent/toxin/berserk name = "Red Nightshade" - description = "An illegal chemical enhancer, may cause aggressive and violent behavior." + description = "An illegal combat performance enhancer originating from the criminal syndicates of Mars. The drug stimulates regions of the brain responsible for violence and rage, inducing a feral, berserk state in users." reagent_state = LIQUID color = "#AF111C" strength = 5 @@ -642,7 +642,7 @@ /datum/reagent/toxin/spectrocybin name = "Spectrocybin" - description = "A hallucinogen chemical, rumored to be used by mystics and religious figures in their rituals." + description = "Spectrocybin is a hallucinogenic chemical found in a unique strain of fungi. Little research has been conducted into the hallucinogenic properties of spectrocybin, though many spiritual creeds utilise the drug in rituals and claim it allows people to act as mediums between the living and dead." reagent_state = LIQUID color = "#800080" strength = 5 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index a60d22cafef..5ee625d8c07 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -153,25 +153,25 @@ required_reagents = list(/datum/reagent/silicon = 1, /datum/reagent/potassium = 1, /datum/reagent/ammonia = 1) result_amount = 3 -/datum/chemical_reaction/tramadol - name = "Tramadol" - id = "tramadol" - result = /datum/reagent/tramadol +/datum/chemical_reaction/mortaphenyl + name = "Mortaphenyl" + id = "mortaphenyl" + result = /datum/reagent/mortaphenyl required_reagents = list(/datum/reagent/inaprovaline = 1, /datum/reagent/alcohol/ethanol = 1, /datum/reagent/acetone = 1) result_amount = 3 -/datum/chemical_reaction/paracetamol - name = "Paracetamol" - id = "paracetamol" - result = /datum/reagent/paracetamol - required_reagents = list(/datum/reagent/tramadol = 1, /datum/reagent/sugar = 1, /datum/reagent/water = 1) +/datum/chemical_reaction/perconol + name = "Perconol" + id = "perconol" + result = /datum/reagent/perconol + required_reagents = list(/datum/reagent/mortaphenyl = 1, /datum/reagent/sugar = 1, /datum/reagent/water = 1) result_amount = 3 -/datum/chemical_reaction/oxycodone - name = "Oxycodone" - id = "oxycodone" - result = /datum/reagent/oxycodone - required_reagents = list(/datum/reagent/alcohol/ethanol = 1, /datum/reagent/tramadol = 1) +/datum/chemical_reaction/oxycomorphine + name = "Oxycomorphine" + id = "oxycomorphine" + result = /datum/reagent/oxycomorphine + required_reagents = list(/datum/reagent/alcohol/ethanol = 1, /datum/reagent/mortaphenyl = 1) catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 1 @@ -371,25 +371,25 @@ required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/dylovene = 1) result_amount = 2 -/datum/chemical_reaction/antihistamine - name = "Diphenhydramine" - id = "diphenhydramine" - result = /datum/reagent/antihistamine +/datum/chemical_reaction/cetahydramine + name = "Cetahydramine" + id = "cetahydramine" + result = /datum/reagent/cetahydramine required_reagents = list(/datum/reagent/cryptobiolin = 1, /datum/reagent/inaprovaline = 1) result_amount = 2 -/datum/chemical_reaction/ondansetron - name = "Ondansetron" - id = "ondansetron" - result = /datum/reagent/ondansetron - required_reagents = list(/datum/reagent/antihistamine = 1, /datum/reagent/synaptizine = 1, /datum/reagent/water = 3) +/datum/chemical_reaction/asinodryl + name = "Asinodryl" + id = "asinodryl" + result = /datum/reagent/asinodryl + required_reagents = list(/datum/reagent/cetahydramine = 1, /datum/reagent/synaptizine = 1, /datum/reagent/water = 3) catalysts = list(/datum/reagent/tungsten = 5) result_amount = 3 -/datum/chemical_reaction/imidazoline - name = "imidazoline" - id = "imidazoline" - result = /datum/reagent/imidazoline +/datum/chemical_reaction/oculine + name = "oculine" + id = "oculine" + result = /datum/reagent/oculine required_reagents = list(/datum/reagent/carbon = 1, /datum/reagent/hydrazine = 1, /datum/reagent/dylovene = 1) result_amount = 2 @@ -400,10 +400,10 @@ required_reagents = list(/datum/reagent/acetone = 1, /datum/reagent/dylovene = 1, /datum/reagent/carbon = 1) result_amount = 3 -/datum/chemical_reaction/ipecac - name = "Ipecac" - id = "ipecac" - result = /datum/reagent/ipecac +/datum/chemical_reaction/verunol + name = "Verunol Syrup" + id = "verunol" + result = /datum/reagent/verunol required_reagents = list(/datum/reagent/hydrazine = 1, /datum/reagent/dylovene = 1, /datum/reagent/alcohol/ethanol = 1) result_amount = 3 @@ -418,14 +418,14 @@ name = "Soporific" id = "stoxin" result = /datum/reagent/soporific - required_reagents = list(/datum/reagent/chloralhydrate = 1, /datum/reagent/sugar = 4) + required_reagents = list(/datum/reagent/polysomnine = 1, /datum/reagent/sugar = 4) inhibitors = list(/datum/reagent/phosphorus) // Messes with the smoke result_amount = 5 -/datum/chemical_reaction/chloralhydrate - name = "Chloral Hydrate" - id = "chloralhydrate" - result = /datum/reagent/chloralhydrate +/datum/chemical_reaction/polysomnine + name = "Polysomnine" + id = "polysomnine" + result = /datum/reagent/polysomnine required_reagents = list(/datum/reagent/alcohol/ethanol = 1, /datum/reagent/acid/hydrochloric = 3, /datum/reagent/water = 1) result_amount = 1 @@ -440,7 +440,7 @@ name = "Potassium Chlorophoride" id = "potassium_chlorophoride" result = /datum/reagent/toxin/potassium_chlorophoride - required_reagents = list(/datum/reagent/toxin/potassium_chloride = 1, /datum/reagent/toxin/phoron = 1, /datum/reagent/chloralhydrate = 1) + required_reagents = list(/datum/reagent/toxin/potassium_chloride = 1, /datum/reagent/toxin/phoron = 1, /datum/reagent/polysomnine = 1) result_amount = 4 /datum/chemical_reaction/zombiepowder @@ -568,10 +568,10 @@ catalysts = list(/datum/reagent/toxin/phoron = 5) result_amount = 3 -/datum/chemical_reaction/calomel - name = "Calomel" - id = "calomel" - result = /datum/reagent/calomel +/datum/chemical_reaction/fluvectionem + name = "Fluvectionem" + id = "fluvectionem" + result = /datum/reagent/fluvectionem required_reagents = list(/datum/reagent/mercury = 1, /datum/reagent/sodiumchloride = 1, /datum/reagent/ammonia = 1) result_amount = 3 @@ -608,7 +608,7 @@ name = "Pulmodeiectionem" id = "pulmodeiectionem" result = /datum/reagent/pulmodeiectionem - required_reagents = list(/datum/reagent/calomel = 1, /datum/reagent/lexorin = 1) + required_reagents = list(/datum/reagent/fluvectionem = 1, /datum/reagent/lexorin = 1) result_amount = 2 /datum/chemical_reaction/pneumalin @@ -625,10 +625,10 @@ required_reagents = list(/datum/reagent/sugar = 0.4, /datum/reagent/water = 1, /datum/reagent/sodiumchloride = 0.9) result_amount = 1 -/datum/chemical_reaction/mannitol - name = "Mannitol" - id = "mannitol" - result = /datum/reagent/mannitol +/datum/chemical_reaction/cataleptinol + name = "Cataleptinol" + id = "cataleptinol" + result = /datum/reagent/cataleptinol required_reagents = list(/datum/reagent/toxin/phoron = 0.1, /datum/reagent/alkysine = 1, /datum/reagent/cryoxadone = 0.1) result_amount = 1 @@ -641,17 +641,17 @@ //Mental Medication -/datum/chemical_reaction/methylphenidate - name = "Methylphenidate" - id = "methylphenidate" - result = /datum/reagent/mental/methylphenidate +/datum/chemical_reaction/corophenidate + name = "Corophenidate" + id = "corophenidate" + result = /datum/reagent/mental/corophenidate required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/hydrazine = 1) result_amount = 2 -/datum/chemical_reaction/escitalopram - name = "Escitalopram" - id = "escitalopram" - result = /datum/reagent/mental/escitalopram +/datum/chemical_reaction/minaphobin + name = "Minaphobin" + id = "minaphobin" + result = /datum/reagent/mental/minaphobin required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/carbon = 1) result_amount = 2 @@ -661,52 +661,45 @@ required_reagents = list(/datum/reagent/inaprovaline = 1, /datum/reagent/hyperzine = 1, /datum/reagent/dexalin/plus = 1) result_amount = 3 -/datum/chemical_reaction/paroxetine - name = "Paroxetine" - id = "paroxetine" - result = /datum/reagent/mental/paroxetine - required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/ammonia = 1, /datum/reagent/copper = 1) - result_amount = 3 - -/datum/chemical_reaction/fluvoxamine - name = "Fluvoxamine" - id = "fluvoxamine" - result = /datum/reagent/mental/fluvoxamine +/datum/chemical_reaction/neurostabin + name = "Neurostabin" + id = "neurostabin" + result = /datum/reagent/mental/neurostabin required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/iron = 1, /datum/reagent/potassium = 1) result_amount = 3 -/datum/chemical_reaction/sertraline - name = "Sertraline" - id = "sertraline" - result = /datum/reagent/mental/sertraline +/datum/chemical_reaction/parvosil + name = "Parvosil" + id = "parvosil" + result = /datum/reagent/mental/parvosil required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/aluminum = 1, /datum/reagent/potassium = 1) result_amount = 3 -/datum/chemical_reaction/duloxetine - name = "Duloxetine" - id = "duloxetine" - result = /datum/reagent/mental/duloxetine +/datum/chemical_reaction/emoxanyl + name = "Emoxanyl" + id = "emoxanyl" + result = /datum/reagent/mental/emoxanyl required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/silicon = 1, /datum/reagent/alcohol/ethanol = 1) result_amount = 3 -/datum/chemical_reaction/venlafaxine - name = "Venlafaxine" - id = "venlafaxine" - result = /datum/reagent/mental/venlafaxine +/datum/chemical_reaction/orastabin + name = "Orastabin" + id = "orastabin" + result = /datum/reagent/mental/orastabin required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/sodium = 1, /datum/reagent/tungsten = 1) result_amount = 3 -/datum/chemical_reaction/risperidone - name = "Risperidone" - id = "risperidone" - result = /datum/reagent/mental/risperidone +/datum/chemical_reaction/neurapan + name = "Neurapan" + id = "neurapan" + result = /datum/reagent/mental/neurapan required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/space_drugs = 1, /datum/reagent/alcohol/ethanol = 1) result_amount = 3 -/datum/chemical_reaction/olanzapine - name = "Olanzapine" - id = "olanzapine" - result = /datum/reagent/mental/olanzapine +/datum/chemical_reaction/nerospectan + name = "Nerospectan" + id = "nerospectan" + result = /datum/reagent/mental/nerospectan required_reagents = list(/datum/reagent/mindbreaker = 1, /datum/reagent/space_drugs = 1, /datum/reagent/silicon = 1) result_amount = 3 @@ -721,7 +714,7 @@ name = "Paxazide" id = "paxazide" result = /datum/reagent/pacifier - required_reagents = list(/datum/reagent/mental/truthserum = 1, /datum/reagent/mental/sertraline = 1) + required_reagents = list(/datum/reagent/mental/truthserum = 1, /datum/reagent/mental/parvosil = 1) result_amount = 1 /datum/chemical_reaction/berserk @@ -766,8 +759,8 @@ name = "Nightlife" id = "night_juice" result = /datum/reagent/night_juice - required_reagents = list(/datum/reagent/mental/methylphenidate = 1, /datum/reagent/synaptizine = 1, /datum/reagent/nitroglycerin = 1) - required_temperatures_min = list(/datum/reagent/mental/methylphenidate = T0C+200, /datum/reagent/synaptizine = T0C+200, /datum/reagent/nitroglycerin = T0C+200) + required_reagents = list(/datum/reagent/mental/corophenidate = 1, /datum/reagent/synaptizine = 1, /datum/reagent/nitroglycerin = 1) + required_temperatures_min = list(/datum/reagent/mental/corophenidate = T0C+200, /datum/reagent/synaptizine = T0C+200, /datum/reagent/nitroglycerin = T0C+200) result_amount = 3 /* Solidification */ diff --git a/code/modules/reagents/dispenser/cartridge_presets.dm b/code/modules/reagents/dispenser/cartridge_presets.dm index e64fc492f17..6ff626cb6ab 100644 --- a/code/modules/reagents/dispenser/cartridge_presets.dm +++ b/code/modules/reagents/dispenser/cartridge_presets.dm @@ -81,9 +81,9 @@ // ERT alkysine spawn_reagent = /datum/reagent/alkysine arithrazine spawn_reagent = /datum/reagent/arithrazine - benadryl spawn_reagent = /datum/reagent/antihistamine + cetahydramine spawn_reagent = /datum/reagent/cetahydramine bicaridine spawn_reagent = /datum/reagent/bicaridine - chloral spawn_reagent = /datum/reagent/chloralhydrate + chloral spawn_reagent = /datum/reagent/polysomnine clonexadone spawn_reagent = /datum/reagent/clonexadone coughsyrup spawn_reagent = /datum/reagent/coughsyrup cryoxadone spawn_reagent = /datum/reagent/cryoxadone @@ -95,12 +95,12 @@ ethylredox spawn_reagent = /datum/reagent/ethylredoxrazine hyperzine spawn_reagent = /datum/reagent/hyperzine hyronalin spawn_reagent = /datum/reagent/hyronalin - imidazoline spawn_reagent = /datum/reagent/imidazoline + oculine spawn_reagent = /datum/reagent/oculine kelotane spawn_reagent = /datum/reagent/kelotane leporazine spawn_reagent = /datum/reagent/leporazine - norepi spawn_reagent = /datum/reagent/inaprovaline - oxycodone spawn_reagent = /datum/reagent/oxycodone - paracetamol spawn_reagent = /datum/reagent/paracetamol + inaprov spawn_reagent = /datum/reagent/inaprovaline + oxycomorphine spawn_reagent = /datum/reagent/oxycomorphine + perconol spawn_reagent = /datum/reagent/perconol peridaxon spawn_reagent = /datum/reagent/peridaxon pneumalin spawn_reagent = /datum/reagent/pneumalin rezadone spawn_reagent = /datum/reagent/rezadone @@ -109,5 +109,5 @@ sterilizine spawn_reagent = /datum/reagent/sterilizine synaptizine spawn_reagent = /datum/reagent/synaptizine thetamycin spawn_reagent = /datum/reagent/thetamycin - tramadol spawn_reagent = /datum/reagent/tramadol + mortaphenyl spawn_reagent = /datum/reagent/mortaphenyl tricord spawn_reagent = /datum/reagent/tricordrazine diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm index 6be60192add..d4d274e55dd 100644 --- a/code/modules/reagents/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/dispenser/dispenser_presets.dm @@ -26,11 +26,11 @@ /obj/machinery/chemical_dispenser/ert name = "medicine dispenser" spawn_cartridges = list( - /obj/item/reagent_containers/chem_disp_cartridge/norepi, + /obj/item/reagent_containers/chem_disp_cartridge/inaprov, /obj/item/reagent_containers/chem_disp_cartridge/ryetalyn, - /obj/item/reagent_containers/chem_disp_cartridge/paracetamol, - /obj/item/reagent_containers/chem_disp_cartridge/tramadol, - /obj/item/reagent_containers/chem_disp_cartridge/oxycodone, + /obj/item/reagent_containers/chem_disp_cartridge/perconol, + /obj/item/reagent_containers/chem_disp_cartridge/mortaphenyl, + /obj/item/reagent_containers/chem_disp_cartridge/oxycomorphine, /obj/item/reagent_containers/chem_disp_cartridge/sterilizine, /obj/item/reagent_containers/chem_disp_cartridge/leporazine, /obj/item/reagent_containers/chem_disp_cartridge/kelotane, @@ -42,12 +42,12 @@ /obj/item/reagent_containers/chem_disp_cartridge/hyronalin, /obj/item/reagent_containers/chem_disp_cartridge/arithrazine, /obj/item/reagent_containers/chem_disp_cartridge/alkysine, - /obj/item/reagent_containers/chem_disp_cartridge/imidazoline, + /obj/item/reagent_containers/chem_disp_cartridge/oculine, /obj/item/reagent_containers/chem_disp_cartridge/peridaxon, /obj/item/reagent_containers/chem_disp_cartridge/bicaridine, /obj/item/reagent_containers/chem_disp_cartridge/thetamycin, /obj/item/reagent_containers/chem_disp_cartridge/coughsyrup, - /obj/item/reagent_containers/chem_disp_cartridge/benadryl, + /obj/item/reagent_containers/chem_disp_cartridge/cetahydramine, /obj/item/reagent_containers/chem_disp_cartridge/ethylredox, /obj/item/reagent_containers/chem_disp_cartridge/sleeptox, /obj/item/reagent_containers/chem_disp_cartridge/chloral, diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index ed27aa108ba..84504c3add9 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -20,10 +20,10 @@ center_of_mass = null /obj/item/reagent_containers/borghypo/medical - reagent_ids = list(/datum/reagent/bicaridine, /datum/reagent/kelotane, /datum/reagent/dylovene, /datum/reagent/dexalin, /datum/reagent/inaprovaline, /datum/reagent/tramadol, /datum/reagent/thetamycin) + reagent_ids = list(/datum/reagent/bicaridine, /datum/reagent/kelotane, /datum/reagent/dylovene, /datum/reagent/dexalin, /datum/reagent/inaprovaline, /datum/reagent/mortaphenyl, /datum/reagent/thetamycin) /obj/item/reagent_containers/borghypo/rescue - reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/inaprovaline, /datum/reagent/tramadol, /datum/reagent/adrenaline) + reagent_ids = list(/datum/reagent/tricordrazine, /datum/reagent/inaprovaline, /datum/reagent/mortaphenyl, /datum/reagent/adrenaline) /obj/item/reagent_containers/borghypo/Initialize() . = ..() diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index b578755df65..775364e5682 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1628,7 +1628,7 @@ if(10) reagents.add_reagent(/datum/reagent/nutriment, 6) reagents.add_reagent(/datum/reagent/drink/tomatojuice, 5) - reagents.add_reagent(/datum/reagent/imidazoline, 5) + reagents.add_reagent(/datum/reagent/oculine, 5) /obj/item/reagent_containers/food/snacks/soup/wish name = "wish soup" @@ -1885,7 +1885,7 @@ pickup_sound = 'sound/items/pickup/shovel.ogg' filling_color = "#9E673A" center_of_mass = list("x"=16, "y"=5) - reagents_to_add = list(/datum/reagent/nutriment = 6, /datum/reagent/nutriment/protein = 4, /datum/reagent/drink/tomatojuice = 5, /datum/reagent/imidazoline = 5, /datum/reagent/water = 5) + reagents_to_add = list(/datum/reagent/nutriment = 6, /datum/reagent/nutriment/protein = 4, /datum/reagent/drink/tomatojuice = 5, /datum/reagent/oculine = 5, /datum/reagent/water = 5) reagent_data = list(/datum/reagent/nutriment = list("potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2)) bitesize = 10 is_liquid = TRUE @@ -2018,7 +2018,7 @@ trash = /obj/item/trash/plate filling_color = "#FAA005" center_of_mass = list("x"=16, "y"=11) - reagents_to_add = list(/datum/reagent/nutriment = 3, /datum/reagent/imidazoline = 3) + reagents_to_add = list(/datum/reagent/nutriment = 3, /datum/reagent/oculine = 3) reagent_data = list(/datum/reagent/nutriment = list("carrot" = 3, "salt" = 1)) bitesize = 2 @@ -2274,7 +2274,7 @@ reagent_data = list(/datum/reagent/nutriment = list("mushroom" = 2, "potato" = 2, "carrot" = 2)) bitesize = 6 - reagents_to_add = list(/datum/reagent/nutriment/protein = 4, /datum/reagent/hyperzine = 5, /datum/reagent/drink/tomatojuice = 5, /datum/reagent/imidazoline = 5, /datum/reagent/water = 5) + reagents_to_add = list(/datum/reagent/nutriment/protein = 4, /datum/reagent/hyperzine = 5, /datum/reagent/drink/tomatojuice = 5, /datum/reagent/oculine = 5, /datum/reagent/water = 5) /obj/item/reagent_containers/food/snacks/bibimbap name = "bibimbap bowl" @@ -2283,7 +2283,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#4f2100" center_of_mass = list("x"=15, "y"=9) - reagents_to_add = list(/datum/reagent/nutriment = 6, /datum/reagent/nutriment/protein = 6, /datum/reagent/imidazoline = 3, /datum/reagent/spacespice = 2, /datum/reagent/nutriment/protein/egg = 3) + reagents_to_add = list(/datum/reagent/nutriment = 6, /datum/reagent/nutriment/protein = 6, /datum/reagent/oculine = 3, /datum/reagent/spacespice = 2, /datum/reagent/nutriment/protein/egg = 3) reagent_data = list(/datum/reagent/nutriment = list("rice" = 2, "mushroom" = 2, "carrot" = 2)) bitesize = 4 @@ -2295,7 +2295,7 @@ trash = /obj/item/trash/plate filling_color = "#FCEE81" center_of_mass = list("x"=16, "y"=10) - reagents_to_add = list(/datum/reagent/nutriment = 8, /datum/reagent/nutriment/protein = 2, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/imidazoline = 1) + reagents_to_add = list(/datum/reagent/nutriment = 8, /datum/reagent/nutriment/protein = 2, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/oculine = 1) reagent_data = list(/datum/reagent/nutriment = list("rice" = 2, "mushroom" = 2, "cabbage" = 2)) bitesize = 2 @@ -2307,7 +2307,7 @@ trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" center_of_mass = list("x"=17, "y"=11) - reagents_to_add = list(/datum/reagent/nutriment = 8, /datum/reagent/nutriment/rice = 5, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/imidazoline = 1) + reagents_to_add = list(/datum/reagent/nutriment = 8, /datum/reagent/nutriment/rice = 5, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/oculine = 1) reagent_data = list(/datum/reagent/nutriment = list("soy" = 2,)) bitesize = 2 @@ -2395,7 +2395,7 @@ trash = /obj/item/trash/snacktray filling_color = "#edd7d7" center_of_mass = list("x"=15, "y"=9) - reagents_to_add = list(/datum/reagent/nutriment = 13, /datum/reagent/spacespice = 4, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/imidazoline = 1) + reagents_to_add = list(/datum/reagent/nutriment = 13, /datum/reagent/spacespice = 4, /datum/reagent/drink/carrotjuice = 3, /datum/reagent/oculine = 1) reagent_data = list(/datum/reagent/nutriment = list("buns" = 2, "cabbage" = 4)) bitesize = 3 @@ -2575,7 +2575,7 @@ slices_num = 5 filling_color = "#FFD675" center_of_mass = list("x"=16, "y"=10) - reagents_to_add = list(/datum/reagent/nutriment = 25, /datum/reagent/imidazoline = 10) + reagents_to_add = list(/datum/reagent/nutriment = 25, /datum/reagent/oculine = 10) reagent_data = list(/datum/reagent/nutriment = list("cake" = 10, "sweetness" = 10, "carrot" = 15)) bitesize = 2 @@ -2589,7 +2589,7 @@ center_of_mass = list("x"=16, "y"=14) /obj/item/reagent_containers/food/snacks/cakeslice/carrot/filled - reagents_to_add = list(/datum/reagent/nutriment = 5, /datum/reagent/imidazoline = 1) + reagents_to_add = list(/datum/reagent/nutriment = 5, /datum/reagent/oculine = 1) reagent_data = list(/datum/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "carrot" = 5)) bitesize = 2 @@ -3120,7 +3120,7 @@ slice_path = /obj/item/reagent_containers/food/snacks/vegetablepizzaslice slices_num = 6 center_of_mass = list("x"=16, "y"=11) - reagents_to_add = list(/datum/reagent/nutriment = 25, /datum/reagent/drink/tomatojuice = 6, /datum/reagent/imidazoline = 12) + reagents_to_add = list(/datum/reagent/nutriment = 25, /datum/reagent/drink/tomatojuice = 6, /datum/reagent/oculine = 12) reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 10, "eggplant" = 5, "carrot" = 5, "corn" = 5)) bitesize = 2 @@ -3133,7 +3133,7 @@ center_of_mass = list("x"=18, "y"=13) /obj/item/reagent_containers/food/snacks/vegetablepizzaslice/filled - reagents_to_add = list(/datum/reagent/nutriment = 4, /datum/reagent/drink/tomatojuice = 2, /datum/reagent/imidazoline = 2) + reagents_to_add = list(/datum/reagent/nutriment = 4, /datum/reagent/drink/tomatojuice = 2, /datum/reagent/oculine = 2) reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)) /obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch @@ -3694,7 +3694,7 @@ icon_state = "koisjelly" filling_color = "#E6E600" bitesize = 5 - reagents_to_add = list(/datum/reagent/kois = 25, /datum/reagent/imidazoline = 20, /datum/reagent/toxin/phoron = 25) + reagents_to_add = list(/datum/reagent/kois = 25, /datum/reagent/oculine = 20, /datum/reagent/toxin/phoron = 25) //unathi snacks - sprites by Araskael diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index a9ac4f39cd2..53a6de88be4 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -85,11 +85,11 @@ icon_state = "bottle-3" reagents_to_add = list(/datum/reagent/soporific = 60) -/obj/item/reagent_containers/glass/bottle/chloralhydrate +/obj/item/reagent_containers/glass/bottle/polysomnine name = "chloral hydrate bottle" desc = "A small bottle of Choral Hydrate. Mickey's Favorite!" icon_state = "bottle-3" - reagents_to_add = list(/datum/reagent/chloralhydrate = 30) + reagents_to_add = list(/datum/reagent/polysomnine = 30) /obj/item/reagent_containers/glass/bottle/antitoxin name = "dylovene bottle" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 9ce7545218f..aa898976f1f 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -170,11 +170,11 @@ /obj/item/reagent_containers/hypospray/autoinjector/stimpack name = "stimpack" - desc = "A simple chemical cocktail of hyperzine and tramadol designed to boost efficiency by 6,000% (estimated). Hoo-rah!" + desc = "A simple chemical cocktail of hyperzine and mortaphenyl designed to boost efficiency by 6,000% (estimated). Hoo-rah!" volume = 20 amount_per_transfer_from_this = 20 - reagents_to_add = list(/datum/reagent/hyperzine = 12, /datum/reagent/tramadol = 8) + reagents_to_add = list(/datum/reagent/hyperzine = 12, /datum/reagent/mortaphenyl = 8) /obj/item/reagent_containers/hypospray/autoinjector/survival name = "survival autoinjector" @@ -182,7 +182,7 @@ volume = 35 amount_per_transfer_from_this = 35 - reagents_to_add = list(/datum/reagent/tricordrazine = 15, /datum/reagent/inaprovaline = 5, /datum/reagent/dexalin/plus = 5, /datum/reagent/oxycodone = 5, /datum/reagent/mental/methylphenidate = 5) + reagents_to_add = list(/datum/reagent/tricordrazine = 15, /datum/reagent/inaprovaline = 5, /datum/reagent/dexalin/plus = 5, /datum/reagent/oxycomorphine = 5, /datum/reagent/mental/corophenidate = 5) /obj/item/reagent_containers/hypospray/combat name = "combat hypospray" @@ -193,4 +193,4 @@ armorcheck = 0 time = 0 - reagents_to_add = list(/datum/reagent/oxycodone = 5, /datum/reagent/synaptizine = 5, /datum/reagent/hyperzine = 5, /datum/reagent/arithrazine = 5) \ No newline at end of file + reagents_to_add = list(/datum/reagent/oxycomorphine = 5, /datum/reagent/synaptizine = 5, /datum/reagent/hyperzine = 5, /datum/reagent/arithrazine = 5) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 18b46d220e9..39339c4b1d5 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -122,29 +122,30 @@ icon_state = "pill11" reagents_to_add = list(/datum/reagent/kelotane = 15) -/obj/item/reagent_containers/pill/paracetamol - name = "paracetamol pill" - desc = "Tylenol! A painkiller for the ages. Chewables!" +/obj/item/reagent_containers/pill/perconol + name = "perconol pill" + desc = "A painkiller for the ages. Chewables!" icon_state = "pill8" - reagents_to_add = list(/datum/reagent/paracetamol = 15) + reagents_to_add = list(/datum/reagent/perconol = 15) + + +/obj/item/reagent_containers/pill/mortaphenyl + name = "mortaphenyl pill" /obj/item/reagent_containers/pill/tramadol name = "tramadol pill" - desc = "A simple painkiller." - icon_state = "pill8" - reagents_to_add = list(/datum/reagent/tramadol = 15) -/obj/item/reagent_containers/pill/methylphenidate - name = "methylphenidate pill" +/obj/item/reagent_containers/pill/corophenidate + name = "corophenidate pill" desc = "Improves the ability to concentrate." icon_state = "pill8" - reagents_to_add = list(/datum/reagent/mental/methylphenidate = 15) - -/obj/item/reagent_containers/pill/escitalopram - name = "escitalopram pill" + reagents_to_add = list(/datum/reagent/mental/corophenidate = 15) + +/obj/item/reagent_containers/pill/minaphobin + name = "minaphobin pill" desc = "Mild anti-depressant." icon_state = "pill8" - reagents_to_add = list(/datum/reagent/mental/escitalopram = 15) + reagents_to_add = list(/datum/reagent/mental/minaphobin = 15) /obj/item/reagent_containers/pill/inaprovaline name = "inaprovaline pill" @@ -159,7 +160,7 @@ reagents_to_add = list(/datum/reagent/dexalin = 15) /obj/item/reagent_containers/pill/dexalin_plus - name = "dexalin plus pill" + name = "dexalin Plus pill" desc = "Used to treat extreme oxygen deprivation." icon_state = "pill8" reagents_to_add = list(/datum/reagent/dexalin/plus = 15) @@ -216,8 +217,8 @@ icon_state = "pill19" reagents_to_add = list(/datum/reagent/rmt = 15) -/obj/item/reagent_containers/pill/antihistamine - name = "antihistamine" - desc = "Contains diphenhydramine, also known as Benadryl. Helps with sneezing, can cause drowsiness." +/obj/item/reagent_containers/pill/cetahydramine + name = "cetahydramine pill" + desc = "Contains modern Cetahydramine, often compared to ancient Benadryl. Helps with sneezing, can cause drowsiness." icon_state = "pill19" - reagents_to_add = list(/datum/reagent/antihistamine = 5) + reagents_to_add = list(/datum/reagent/cetahydramine = 5) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 8b09d4ed8a3..2a0b65d3471 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -431,19 +431,19 @@ mode = SYRINGE_INJECT update_icon() -/obj/item/reagent_containers/syringe/calomel - name = "Syringe (calomel)" +/obj/item/reagent_containers/syringe/fluvectionem + name = "Syringe (fluvectionem)" desc = "Contains purging medicine." - reagents_to_add = list(/datum/reagent/calomel = 15) + reagents_to_add = list(/datum/reagent/fluvectionem = 15) -/obj/item/reagent_containers/syringe/calomel/Initialize() +/obj/item/reagent_containers/syringe/fluvectionem/Initialize() . = ..() mode = SYRINGE_INJECT update_icon() /obj/item/reagent_containers/syringe/ld50_syringe/chloral - reagents_to_add = list(/datum/reagent/chloralhydrate = 60) + reagents_to_add = list(/datum/reagent/polysomnine = 60) /obj/item/reagent_containers/syringe/ld50_syringe/chloral/Initialize() . = ..() diff --git a/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm b/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm index 653527afc74..65da8ee1a2c 100644 --- a/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm +++ b/code/modules/spell_system/spells/spell_list/self/conjure/plant_sanctuary.dm @@ -7,7 +7,7 @@ spell_flags = IGNOREDENSE | IGNORESPACE | NEEDSCLOTHES | Z2NOCAST | IGNOREPREV cooldown_min = 600 cast_sound = 'sound/species/diona/gestalt_grow.ogg' - + level_max = list(Sp_TOTAL = 3, Sp_SPEED = 3, Sp_POWER = 1) seed_type = /datum/seed/merlin_tear @@ -27,7 +27,7 @@ name = "merlin tears" seed_name = "merlin tears" display_name = "merlin tears" - chems = list(/datum/reagent/bicaridine = list(3,7), /datum/reagent/dermaline = list(3,7), /datum/reagent/dylovene = list(3,7), /datum/reagent/tricordrazine = list(3,7), /datum/reagent/alkysine = list(1,2), /datum/reagent/imidazoline = list(1,2), /datum/reagent/peridaxon = list(4,5)) + chems = list(/datum/reagent/bicaridine = list(3,7), /datum/reagent/dermaline = list(3,7), /datum/reagent/dylovene = list(3,7), /datum/reagent/tricordrazine = list(3,7), /datum/reagent/alkysine = list(1,2), /datum/reagent/oculine = list(1,2), /datum/reagent/peridaxon = list(4,5)) kitchen_tag = "berries" /datum/seed/merlin_tear/setup_traits() diff --git a/html/changelogs/reallifechemsbegone.yml b/html/changelogs/reallifechemsbegone.yml new file mode 100644 index 00000000000..96d5b209adc --- /dev/null +++ b/html/changelogs/reallifechemsbegone.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Chada + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Turned every real life chem into a new, fake version. They should still be relatively easy to recognize..." + - rscdel: "Deleted Peroxitin as a Chem, it's not very helpful and noone really used it.." diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index c6531c3e07b..0002ecd463b 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -27420,14 +27420,14 @@ /obj/item/storage/pill_bottle/antitox{ pixel_x = 6 }, -/obj/item/storage/pill_bottle/tramadol{ +/obj/item/storage/pill_bottle/mortaphenyl{ pixel_y = -12 }, -/obj/item/storage/pill_bottle/tramadol{ +/obj/item/storage/pill_bottle/mortaphenyl{ pixel_x = -6; pixel_y = -12 }, -/obj/item/storage/pill_bottle/tramadol{ +/obj/item/storage/pill_bottle/mortaphenyl{ pixel_x = 6; pixel_y = -12 }, diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 6abe9217681..eb88d061b81 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -8645,7 +8645,7 @@ /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, /obj/item/reagent_containers/pill/kelotane, -/obj/item/reagent_containers/pill/paracetamol, +/obj/item/reagent_containers/pill/perconol, /obj/item/reagent_containers/pill/antitox, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) @@ -12131,7 +12131,7 @@ icon_state = "1-8" }, /obj/item/reagent_containers/pill/kelotane, -/obj/item/reagent_containers/pill/paracetamol, +/obj/item/reagent_containers/pill/perconol, /obj/item/reagent_containers/pill/antitox, /turf/simulated/floor/tiled, /area/engineering/locker_room) @@ -31902,7 +31902,7 @@ /obj/item/reagent_containers/glass/bottle/inaprovaline, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/effect/floor_decal/corner/beige{ dir = 10 }, @@ -35674,7 +35674,7 @@ }, /obj/item/reagent_containers/glass/bottle/antitoxin, /obj/item/storage/pill_bottle/dermaline, -/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/item/storage/pill_bottle/dylovene, /obj/item/storage/pill_bottle/dylovene, /obj/item/reagent_containers/syringe/antibiotic, @@ -42670,7 +42670,7 @@ /obj/item/reagent_containers/glass/bottle/inaprovaline, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, -/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -42715,7 +42715,7 @@ }, /obj/item/reagent_containers/glass/bottle/antitoxin, /obj/item/storage/pill_bottle/dermaline, -/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/item/storage/pill_bottle/dylovene, /obj/item/storage/pill_bottle/dylovene, /obj/item/reagent_containers/syringe/antibiotic, diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index 8548865596e..feccc099872 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -5433,9 +5433,9 @@ req_access = list(64) }, /obj/item/clothing/suit/straight_jacket, -/obj/item/reagent_containers/pill/methylphenidate, -/obj/item/reagent_containers/pill/escitalopram, -/obj/item/reagent_containers/pill/escitalopram, +/obj/item/reagent_containers/pill/corophenidate, +/obj/item/reagent_containers/pill/minaphobin, +/obj/item/reagent_containers/pill/minaphobin, /obj/item/reagent_containers/syringe, /obj/item/clothing/mask/muzzle, /obj/random/soap, diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 03406b0a7f0..927f872958f 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -36769,7 +36769,7 @@ pixel_y = -32 }, /obj/item/storage/pill_bottle/antitox, -/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/structure/table/standard{ name = "plastic table frame" }, @@ -42884,7 +42884,7 @@ name = "Pill Cabinet" }, /obj/item/storage/pill_bottle/antitox, -/obj/item/storage/pill_bottle/tramadol, +/obj/item/storage/pill_bottle/mortaphenyl, /obj/item/reagent_containers/syringe/inaprovaline, /turf/simulated/wall, /area/medical/sleeper)