More medical changes.

- Added tramadol and oxycodone, both effective painkillers.
- Shock now takes drunkness into account.
- Added some firstaid stuff to the table in the medbay lobby, so people can do treatment when there's no doctors.

code/game/objects/storage/firstaid.dm

@@ -81,6 +81,20 @@
 	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
 	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
 
+/obj/item/weapon/storage/pill_bottle/tramadol
+	name = "Pill bottle (tramadol)"
+	desc = "Contains painkiller pills."
+
+/obj/item/weapon/storage/pill_bottle/kelotane/New()
+	..()
+	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+	new /obj/item/weapon/reagent_containers/pill/tramadol( src )
+
 /obj/item/weapon/storage/pill_bottle/antitox
 	name = "Pill bottle (Anti-toxin)"
 	desc = "Contains pills used to counter toxins."

code/modules/chemical/Chemistry-Reagents.dm

@@ -1311,6 +1311,19 @@ 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"
 
 		impedrezene
 			name = "Impedrezene"

code/modules/chemical/Chemistry-Recipes.dm

@@ -70,6 +70,13 @@ 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
+
 		//cyanide
 		//	name = "Cyanide"
 		//	id = "cyanide"

code/modules/chemical/Chemistry-Tools.dm

@@ -2711,6 +2711,14 @@
 		..()
 		reagents.add_reagent("kelotane", 30)
 
+/obj/item/weapon/reagent_containers/pill/tramadol
+	name = "Tramadol pill"
+	desc = "A simple painkiller."
+	icon_state = "pill8"
+	New()
+		..()
+		reagents.add_reagent("tramadol", 30)
+
 /obj/item/weapon/reagent_containers/pill/inaprovaline
 	name = "Inaprovaline pill"
 	desc = "Used to stabilize patients."

code/modules/mob/living/carbon/shock.dm

@@ -8,8 +8,12 @@
 		src.traumatic_shock -= 10
 	if(reagents.has_reagent("inaprovaline"))
 		src.traumatic_shock -= 25
-	if(reagents.has_reagent("synaptizine"))
-		src.traumatic_shock -= 100 // make synaptizine function as good painkiller
+	if(reagents.has_reagent("tramadol"))
+		src.traumatic_shock -= 80 // make synaptizine function as good painkiller
+	if(reagents.has_reagent("oxycodone"))
+		src.traumatic_shock -= 200 // make synaptizine function as good painkiller
+	if(src.slurring)
+		src.traumatic_shock -= 20
 
 	// broken or ripped off organs will add quite a bit of pain
 	if(istype(src,/mob/living/carbon/human))
@@ -19,7 +23,10 @@
 			if(organ.destroyed || organ.open)
 				src.traumatic_shock += 60
 			else if(organ.broken)
-				src.traumatic_shock += 40
+				src.traumatic_shock += 30
+
+	if(src.traumatic_shock < 0)
+		src.traumatic_shock = 0
 
 	return src.traumatic_shock