Merge pull request #3425 from Zuhayr/feature

Compile fixes for organ/reagent code.

code/modules/organs/pain.dm

@@ -7,7 +7,7 @@ mob/var/next_pain_time = 0
 
 // partname is the name of a body part
 // amount is a num from 1 to 100
-mob/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
+mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0)
 	if(stat >= 2) return
 	if(reagents.has_reagent("tramadol"))
 		return

code/modules/reagents/Chemistry-Reagents.dm

@@ -2808,7 +2808,7 @@ datum
 					M:paralysis = max(M:paralysis, 20)
 					M:drowsyness  = max(M:drowsyness, 30)
 					if(ishuman(M))
-						var/mob/living/cabon.huan/H = M
+						var/mob/living/carbon/human/H = M
 						var/datum/organ/internal/liver/L = H.internal_organs["liver"]
 						if (istype(L))
 							L.take_damage(0.1, 1)