some fixes

maps/exodus/exodus.dm

@@ -2,7 +2,7 @@
 
 	#include "../../mods/content/mundane.dm"
 	#include "../../mods/content/baychems/_baychems.dme"
-	#include "../../mods/content/bigpharma/_bigpharma.dme"
+//	#include "../../mods/content/bigpharma/_bigpharma.dme"
 	#include "../../mods/content/corporate/_corporate.dme"
 	#include "../../mods/content/government/_government.dme"
 	#include "../../mods/content/matchmaking/_matchmaking.dme"

mods/content/baychems/chems_painkillers.dm

@@ -1,5 +1,5 @@
 // RENAMED:
-/decl/material/liquid/painkillers
+/decl/material/liquid/painkillers/strong
 	name = "tramadol"
 	lore_text = "A simple, yet effective opioid painkiller. Don't mix with alcohol."
 	sedation = 0.05
@@ -14,7 +14,7 @@
 	dizziness_severity = 1
 
 // NEW, NOT RENAMED:
-/decl/material/liquid/painkillers/paracetamol
+/decl/material/liquid/painkillers
 	name = "paracetamol"
 	lore_text = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
 	overdose = 60
@@ -23,6 +23,7 @@
 	breathloss_severity = 0 //Not an opioid. Should not suppress breathing.
 	uid = "chem_paracetamol"
 
+// NEW:
 /decl/material/liquid/painkillers/nefopam
 	name = "nefopam" //better in every way than paracetamol. Very minor side effects.
 	lore_text = "A strong, effective non-opioid alternative to tramadol."

mods/content/baychems/items.dm

@@ -25,11 +25,12 @@
 		)
 
 
-DEFINE_CARTRIDGE_FOR_CHEM(opium, /decl/material/liquid/opium)
+/obj/item/chems/glass/bottle/opium/populate_reagents()
+	add_to_reagents(/decl/material/liquid/opium, volume)
+	. = ..()
 
-/obj/item/chems/glass/bottle/opium
-	desc = "A small bottle of opium."
 
+DEFINE_CARTRIDGE_FOR_CHEM(opium, /decl/material/liquid/opium)
 
 /obj/item/chems/glass/bottle/opium/populate_reagents()
 	var/opium_amount = round(reagents.maximum_volume / 2)
@@ -61,3 +62,10 @@ DEFINE_CARTRIDGE_FOR_CHEM(opium, /decl/material/liquid/opium)
 			/obj/item/chems/chem_disp_cartridge/tungsten,
 			/obj/item/chems/chem_disp_cartridge/opium
 		)
+
+/obj/item/chems/glass/bottle/tramadol
+	desc = "A small bottle of tramadol, an effective but dangerous and addictive painkiller. Do not mix with alcohol."
+
+/obj/item/chems/glass/bottle/tramadol/populate_reagents()
+	add_to_reagents(/decl/material/liquid/painkillers/strong, reagents.maximum_volume)
+	. = ..()

mods/content/baychems/pills.dm

@@ -8,6 +8,9 @@
 	name = "kelotane (15u)"
 
 /obj/item/chems/pill/painkillers
+	name = "paracetamol (15u)"
+
+/obj/item/chems/pill/strong_painkillers
 	name = "tramadol (15u)"
 
 /obj/item/chems/pill/stabilizer
@@ -33,32 +36,32 @@
 
 ////Bottles
 
-/obj/item/storage/pill_bottle/antitox
-	name = "pill bottle (dylovene)"
+/obj/item/pill_bottle/antitox
+	labeled_name = "dylovene"
 
-/obj/item/storage/pill_bottle/brute_meds
-	name = "pill bottle (bicaridine)"
+/obj/item/pill_bottle/brute_meds
+	labeled_name = "bicaridine"
 
-/obj/item/storage/pill_bottle/oxygen
-	name = "pill bottle (dexalin)"
+/obj/item/pill_bottle/oxygen
+	labeled_name = "dexalin"
 
-/obj/item/storage/pill_bottle/antitoxins
-	name = "pill bottle (dylovene)"
+/obj/item/pill_bottle/antitoxins
+	labeled_name = "dylovene"
 
-/obj/item/storage/pill_bottle/adrenaline
-	name = "pill bottle (inaprovaline)"
+/obj/item/pill_bottle/adrenaline
+	labeled_name = "inaprovaline"
 
-/obj/item/storage/pill_bottle/burn_meds
-	name = "pill bottle (kelotane)"
+/obj/item/pill_bottle/burn_meds
+	labeled_name = "kelotane"
 
-/obj/item/storage/pill_bottle/antibiotics
-	name = "pill bottle (spaceacillin)"
+/obj/item/pill_bottle/antibiotics
+	labeled_name = "spaceacillin"
 
-/obj/item/storage/pill_bottle/painkillers
-	name = "pill bottle (tramadol)"
+/obj/item/pill_bottle/painkillers
+	labeled_name = "tramadol"
 
-/obj/item/storage/pill_bottle/antidepressants
-	name = "pill bottle (citalopram)"
+/obj/item/pill_bottle/antidepressants
+	labeled_name = "citalopram"
 
-/obj/item/storage/pill_bottle/stimulants
-	name = "pill bottle (methylphenidate)"
+/obj/item/pill_bottle/stimulants
+	labeled_name = "methylphenidate"

mods/content/baychems/reactions.dm

@@ -1,60 +1,60 @@
-/decl/chemical_reaction/arithrazine
+/decl/chemical_reaction/drug/arithrazine
 	name = "Arithrazine"
 	result = /decl/material/liquid/antirads/arithrazine
 	required_reagents = list(/decl/material/liquid/antirads = 1, /decl/material/liquid/fuel/hydrazine = 1)
 	result_amount = 2
 
-/decl/chemical_reaction/dermaline
+/decl/chemical_reaction/drug/dermaline
 	name = "Dermaline"
 	result = /decl/material/liquid/burn_meds/dermaline
 	required_reagents = list(/decl/material/liquid/acetone = 1, /decl/material/solid/phosphorus = 1, /decl/material/liquid/burn_meds = 1)
 	result_amount = 3
 	minimum_temperature = -150 CELSIUS
 	maximum_temperature = -50 CELSIUS
 
-/decl/chemical_reaction/oxy_meds
+/decl/chemical_reaction/drug/oxy_meds
 	name = "Dexalin"
 	result_amount = 1
 	required_reagents = list(/decl/material/liquid/acetone = 1, /decl/material/liquid/acid = 0.1)
 	catalysts = list(/decl/material/solid/metal/tungsten = 5)
 
-/decl/chemical_reaction/dexalinp
+/decl/chemical_reaction/drug/dexalinp
 	name = "Dexalin Plus"
 	result = /decl/material/liquid/oxy_meds/dexalinp
 	required_reagents = list(/decl/material/liquid/oxy_meds = 1, /decl/material/solid/carbon = 1, /decl/material/solid/metal/iron = 1)
 	result_amount = 3
 
-/decl/chemical_reaction/paracetamol
+/decl/chemical_reaction/drug/paracetamol
 	name = "Paracetamol"
-	result = /decl/material/liquid/painkillers/paracetamol
+	result = /decl/material/liquid/painkillers
 	required_reagents = list(/decl/material/liquid/ethanol = 1, /decl/material/liquid/nutriment/sugar = 1, /decl/material/liquid/water = 1)
 	result_amount = 3
 
-/decl/chemical_reaction/nefopam
+/decl/chemical_reaction/drug/nefopam
 	name = "Nefopam"
 	result = /decl/material/liquid/painkillers/nefopam
-	required_reagents = list(/decl/material/solid/carbon = 1, /decl/material/liquid/painkillers/paracetamol = 3)
+	required_reagents = list(/decl/material/solid/carbon = 1, /decl/material/liquid/painkillers = 3)
 	result_amount = 1
 
-/decl/chemical_reaction/painkillers
+/decl/chemical_reaction/drug/painkillers
 	name = "Tramadol"
 	result = /decl/material/liquid/painkillers
 	required_reagents = list(/decl/material/liquid/opium = 1, /decl/material/liquid/ethanol = 1, /decl/material/liquid/acetone = 1)
 	result_amount = 3
 
-/decl/chemical_reaction/morphine
+/decl/chemical_reaction/drug/morphine
 	name = "Morphine"
 	result = /decl/material/liquid/painkillers/morphine
 	required_reagents = list(/decl/material/liquid/opium = 1, /decl/material/liquid/painkillers = 1)
 	result_amount = 2
 
-/decl/chemical_reaction/fentanyl
+/decl/chemical_reaction/drug/fentanyl
 	name = "Fentanyl"
 	result = /decl/material/liquid/painkillers/fentanyl
 	required_reagents = list(/decl/material/liquid/opium = 1, /decl/material/liquid/painkillers/morphine = 1, /decl/material/liquid/sedatives = 1, /decl/material/liquid/hallucinogenics = 1)
 	result_amount = 2
 
-/decl/chemical_reaction/paroxetine
+/decl/chemical_reaction/drug/paroxetine
 	name = "Paroxetine"
 	result = /decl/material/liquid/antidepressants/paroxetine
 	required_reagents = list(/decl/material/liquid/hallucinogenics = 1, /decl/material/liquid/acetone = 1, /decl/material/liquid/stabilizer = 1)