diff --git a/code/datums/medical_effects.dm b/code/datums/medical_effects.dm index f7c027223de..afbb820dd5e 100644 --- a/code/datums/medical_effects.dm +++ b/code/datums/medical_effects.dm @@ -81,7 +81,7 @@ /datum/medical_effect/headache name = "Headache" triggers = list("cryoxadone" = 10) - cures = list("mannitol", "tramadol", "paracetamol", "oxycodone") + cures = list("mannitol", "morphine", "acetaminophen", "hydrocodone") cure_message = "Your head stops throbbing..." /datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength) @@ -114,7 +114,7 @@ // ====== /datum/medical_effect/cramps name = "Cramps" - triggers = list("tramadol" = 15) + triggers = list("morphine" = 15) cures = list("epinephrine") cure_message = "The cramps let up..." diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 18aaa20b2e4..d2536da66ec 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -40,9 +40,9 @@ name = pick("lunar","vorpal","hardcore","willow", "void","loopy","electro", "cyber","heavy", "ninja", "hydro", "blue", "red", "green", "purple", "strong", "divine","carp" ,"deadly","dead","vicious" ,"wild" ,"demon", "chill", "solid", "liquid", "crazy", "super", "hyper", "space", "wizard", "rainbow", "star", "turbo", "prism", "sticky") + " " + pick("jack","zero","null","beat","nip","bubbles" ,"ice","medicine","venom","shock","solar" ,"spice" ,"shredder", "heart" , "heat", "pill","hopper","scum","fruit", "bolt", "deck", "butter", "runoff", "grease", "flair", "sweat", "zone", "blast") - reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) - reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) - reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "oxycodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) + reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "hydrocodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) + reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "hydrocodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) + reagents.add_reagent(pick("pancuronium","neurotoxin","frostoil", "toxin","morphine", "carpotoxin", "hippiesdelight","methamphetamine","haloperidol" ,"cryptobiolin", "hydrocodone", "psilocybin", "mindbreaker", "capsaicin", "space_drugs" , "epinephrine", "serotrotium"), pick(5,7,10,13,15)) diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 32c5d3da566..8a638a8176a 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -61,7 +61,7 @@ // identify_probability = 0 New() ..() - var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","leporazine","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","clonexadone","spaceacillin","carpotoxin","mindbreaker","fluorosurfactant","foaming_agent","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amatoxin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin") + var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","clonexadone","spaceacillin","carpotoxin","mindbreaker","fluorosurfactant","foaming_agent","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amatoxin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin") var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine") var/datum/reagent/R = pick(chems_only + rare_chems) @@ -123,7 +123,7 @@ New() ..() - var/global/list/meds_only = list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","mutadone","mutagen","leporazine","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","spaceacillin","carpotoxin","mindbreaker","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amatoxin","psilocybin","nothing","salglu_solution","neurotoxin") + var/global/list/meds_only = list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","mutadone","mutagen","teporone","cryptobiolin","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","spaceacillin","carpotoxin","mindbreaker","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amatoxin","psilocybin","nothing","salglu_solution","neurotoxin") var/global/list/rare_meds = list("nanites","xenomicrobes","minttoxin","adminordrazine","blood") var/i = 1 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index d025d7a217d..28d56989dc0 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -569,8 +569,8 @@ New() ..() - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine(src) - new /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine(src) + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone(src) + new /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone(src) new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src) new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src) new /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack(src) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 6a4a784ba8b..e342c727b90 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -430,7 +430,7 @@ /obj/item/weapon/reagent_containers/hypospray/fluff/asher_spock_1/New() ..() - reagents.add_reagent("oxycodone", 15) + reagents.add_reagent("hydrocodone", 15) update_icon() return diff --git a/code/modules/events/tgevents/vent_clog.dm b/code/modules/events/tgevents/vent_clog.dm index e9cd02bd9e6..ea1145c8723 100755 --- a/code/modules/events/tgevents/vent_clog.dm +++ b/code/modules/events/tgevents/vent_clog.dm @@ -22,7 +22,7 @@ var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube", "atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid", - "blood","morphine","fluorine","mutadone","mutagen","oxycodone","fuel","cryptobiolin", + "blood","morphine","fluorine","mutadone","mutagen","hydrocodone","fuel","cryptobiolin", "haloperidol","mindbreaker","nanites","lipolicide","frostoil","salglu_solution","beepskysmash", "omnizine", "amatoxin", "adminordrazine", "neurotoxin", "synaptizine") var/datum/reagents/R = new/datum/reagents(50) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 61569fb57d5..d3e955d13c4 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -149,7 +149,7 @@ var/obj/item/weapon/card/id/inserted_id var/list/prize_list = list( new /datum/data/mining_equipment("Stimpack MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimpack, 50), - new /datum/data/mining_equipment("Leporazine MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine, 50), + new /datum/data/mining_equipment("Teporone MediPen", /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone, 50), new /datum/data/mining_equipment("MediPen Bundle", /obj/item/weapon/storage/box/autoinjector/utility, 200), new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm index 7ad544b9e82..4a4be2997c8 100644 --- a/code/modules/mob/living/carbon/shock.dm +++ b/code/modules/mob/living/carbon/shock.dm @@ -11,11 +11,11 @@ 1 * src.getCloneLoss() + \ 1 * src.halloss - if(reagents.has_reagent("paracetamol")) + if(reagents.has_reagent("acetaminophen")) src.traumatic_shock -= 40 - if(reagents.has_reagent("tramadol")) + if(reagents.has_reagent("morphine")) src.traumatic_shock -= 60 - if(reagents.has_reagent("oxycodone")) + if(reagents.has_reagent("hydrocodone")) src.traumatic_shock -= 200 if(src.slurring) src.traumatic_shock -= 10 diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm index 2044b3c0b77..6a1916c25f5 100644 --- a/code/modules/mob/living/simple_animal/borer.dm +++ b/code/modules/mob/living/simple_animal/borer.dm @@ -259,7 +259,7 @@ if(chemicals < 50) src << "You don't have enough chemicals!" - var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","tramadol") + var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","acetaminophen") if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check. return diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index b064fdf6621..f606f7b7838 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -9,11 +9,11 @@ mob/var/next_pain_time = 0 // amount is a num from 1 to 100 mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0) if(stat >= 2) return - if(reagents.has_reagent("paracetamol")) + if(reagents.has_reagent("acetaminophen")) return - if(reagents.has_reagent("tramadol")) + if(reagents.has_reagent("morphine")) return - if(reagents.has_reagent("oxycodone")) + if(reagents.has_reagent("hydrocodone")) return if(analgesic) return @@ -58,9 +58,9 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength) if(species && species.flags & NO_PAIN) return - if(reagents.has_reagent("tramadol")) + if(reagents.has_reagent("morphine")) return - if(reagents.has_reagent("oxycodone")) + if(reagents.has_reagent("hydrocodone")) return if(analgesic) return @@ -80,9 +80,9 @@ mob/living/carbon/human/proc/handle_pain() if(species && species.flags & NO_PAIN) return if(stat >= 2) return - if(reagents.has_reagent("tramadol")) + if(reagents.has_reagent("morphine")) return - if(reagents.has_reagent("oxycodone")) + if(reagents.has_reagent("hydrocodone")) return if(analgesic) return diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index c5f94b50bf4..830ecee82d1 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -858,10 +858,10 @@ datum ..() return - paracetamol - name = "Paracetamol" - id = "paracetamol" - description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller." + acetaminophen + name = "Acetaminophenl" + id = "acetaminophen" + description = "Most probably know this as Tylenol. This chemical is a mild, simple painkiller." reagent_state = LIQUID color = "#C855DC" metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units @@ -899,23 +899,10 @@ datum ..() return - tramadol - name = "Tramadol" - id = "tramadol" - description = "A simple, yet effective painkiller." - reagent_state = LIQUID - color = "#C8A5DC" - metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - ..() - return - - oxycodone - name = "Oxycodone" - id = "oxycodone" - description = "An effective and very addictive painkiller." + hydrocodone + name = "Hydrocodone-Acetaminophen" + id = "hydrocodone" + description = "An extremely effective painkiller; may have long term abuse consequences." reagent_state = LIQUID color = "#C805DC" metabolization_rate = 0.3 // Lasts 1.5 minutes for 15 units @@ -1157,22 +1144,6 @@ datum ..() return - leporazine - name = "Leporazine" - id = "leporazine" - description = "Leporazine can be use to stabilize an individuals body temperature." - reagent_state = LIQUID - color = "#E9D66B" // rgb: 233, 214, 107 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(M.bodytemperature > 310) - M.bodytemperature = max(310, M.bodytemperature - (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) - else if(M.bodytemperature < 311) - M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) - ..() - return - cryptobiolin name = "Cryptobiolin" id = "cryptobiolin" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 63a551ac6b4..0850ceb1c15 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -75,27 +75,21 @@ datum result_amount = 3 mix_message = "The substance turns neon green and bubbles unnervingly." - tramadol - name = "Tramadol" - id = "tramadol" - result = "tramadol" - required_reagents = list("epinephrine" = 1, "ethanol" = 1, "oxygen" = 1) - result_amount = 3 + acetaminophen + name = "Acetaminophen" + id = "acetaminophen" + result = "acetaminophen" + required_reagents = list("phenol" = 1, "sodium" = 1, "oxygen" = 1, "nitrogen" = 1, "sacid" = 1, "water" = 1) + result_amount = 6 + mix_message = "The mixture becomes a fine white powder." - paracetamol - name = "Paracetamol" - id = "paracetamol" - result = "paracetamol" - required_reagents = list("tramadol" = 1, "sugar" = 1, "water" = 1) + hydrocodone + name = "Hydrocodone" + id = "hydrocodone" + result = "hydrocodone" + required_reagents = list("morphine" = 1, "acetaminophen" = 1, "sacid" = 1, "water" = 1, "oil" = 1) result_amount = 3 - oxycodone - name = "Oxycodone" - id = "oxycodone" - result = "oxycodone" - required_reagents = list("ethanol" = 1, "tramadol" = 1, "plasma" = 1) - result_amount = 1 - thermite name = "Thermite" id = "thermite" @@ -140,14 +134,6 @@ datum required_reagents = list("water" = 1, "milk" = 1) result_amount = 5 - leporazine - name = "Leporazine" - id = "leporazine" - result = "leporazine" - required_reagents = list("silicon" = 1, "copper" = 1) - required_catalysts = list("plasma" = 5) - result_amount = 2 - cryptobiolin name = "Cryptobiolin" id = "cryptobiolin" diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index 77720840bbc..567f22a2ba0 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -850,7 +850,10 @@ datum/reagent/teporone datum/reagent/teporone/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.bodytemperature = 310 + if(M.bodytemperature > 310) + M.bodytemperature -= 10 + if(M.bodytemperature < 310) + M.bodytemperature += 10 ..() return diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 47be3be3568..1f4d1b517c0 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -21,7 +21,7 @@ reagent_ids = list("styptic_powder", "epinephrine", "salbutamol") /obj/item/weapon/reagent_containers/borghypo/crisis - reagent_ids = list("salglu_solution", "epinephrine", "tramadol") + reagent_ids = list("salglu_solution", "epinephrine", "acetaminophen") /obj/item/weapon/reagent_containers/borghypo/New() ..() diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 0d9b44439d3..63a62c27ae0 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -112,15 +112,15 @@ else usr << "\blue It is spent." -/obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine //basilisks - name = "leporazine autoinjector" +/obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone //basilisks + name = "teporone autoinjector" desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction at the cost of some shortness of breath." icon_state = "lepopen" -/obj/item/weapon/reagent_containers/hypospray/autoinjector/leporazine/New() +/obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone/New() ..() reagents.remove_reagent("epinephrine", 10) - reagents.add_reagent("leporazine", 9) + reagents.add_reagent("teporone", 9) reagents.add_reagent("lexorin", 1) update_icon() return diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 0511529fedb..5a03b9c0032 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -121,15 +121,6 @@ ..() reagents.add_reagent("adminordrazine", 50) -/obj/item/weapon/reagent_containers/pill/tramadol - name = "Tramadol pill" - desc = "A simple painkiller." - icon_state = "pill8" - New() - ..() - reagents.add_reagent("tramadol", 15) - - /obj/item/weapon/reagent_containers/pill/methamphetamine name = "Methamphetamine pill" desc = "Helps improve the ability to concentrate." diff --git a/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm b/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm index c446b3e04ae..b345844d57d 100644 --- a/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm +++ b/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm @@ -62,7 +62,7 @@ icon_state = "valeleaves" New(var/loc, var/potency) ..() - reagents.add_reagent("paracetamol", potency * 5) + reagents.add_reagent("acetaminophen", potency * 5) reagents.add_reagent("salbutamol", potency * 2) reagents.add_reagent("nutriment", potency) bitesize = 1+round(reagents.total_volume / 2, 1) diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 09a9f9d31ec..fc2fe0d2e7a 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -51,7 +51,7 @@ coolant_reagents_purity["icecoffee"] = 0.6 coolant_reagents_purity["icetea"] = 0.6 coolant_reagents_purity["milkshake"] = 0.6 - coolant_reagents_purity["leporazine"] = 0.7 + coolant_reagents_purity["teporone"] = 0.7 coolant_reagents_purity["sterilizine"] = 0.7 coolant_reagents_purity["cryoxadone"] = 0.9 coolant_reagents_purity["coolant"] = 1