Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

code/modules/reagents/Chemistry-Reagents.dm

@@ -881,6 +881,20 @@ datum
 				..()
 				return
 
+		tramadol
+			name = "Tramadol"
+			id = "tramadol"
+			description = "A simple, yet effective painkiller."
+			reagent_state = LIQUID
+			color = "#C8A5DC"
+
+		oxycodone
+			name = "Oxycodone"
+			id = "oxycodone"
+			description = "An effective and very addictive painkiller."
+			reagent_state = LIQUID
+			color = "#C805DC"
+
 		virus_food
 			name = "Virus Food"
 			id = "virusfood"

code/modules/reagents/Chemistry-Recipes.dm

@@ -90,6 +90,20 @@ datum
 			required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
 			result_amount = 3
 
+		tramadol
+			name = "Tramadol"
+			id = "tramadol"
+			result = "tramadol"
+			required_reagents = list("inaprovaline" = 1, "ethanol" = 1, "oxygen" = 1)
+			result_amount = 3
+
+		oxycodone
+			name = "Oxycodone"
+			id = "oxycodone"
+			result = "oxycodone"
+			required_reagents = list("ethanol" = 1, "tramadol" = 1, "plasma" = 1)
+			result_amount = 1
+
 		//cyanide
 		//	name = "Cyanide"
 		//	id = "cyanide"