Merge branch 'master' into upstream-merge-37582

code/modules/surgery/advanced/bioware/bioware.dm

@@ -15,8 +15,9 @@
 		if(B.mod_type == mod_type)
 			qdel(src)
 			return
+	owner.bioware += src
 	on_gain()
-
+	
 /datum/bioware/Destroy()
 	owner = null
 	if(active)

code/modules/surgery/advanced/bioware/nerve_grounding.dm

@@ -31,7 +31,7 @@
 /datum/bioware/grounded_nerves
 	name = "Grounded Nerves"
 	desc = "Nerves form a safe path for electricity to traverse, protecting the body from electric shocks."
-	mod_type = "nerves"
+	mod_type = BIOWARE_NERVES
 	var/prev_coeff
 
 /datum/bioware/grounded_nerves/on_gain()

code/modules/surgery/advanced/bioware/nerve_splicing.dm

@@ -31,7 +31,7 @@
 /datum/bioware/spliced_nerves
 	name = "Spliced Nerves"
 	desc = "Nerves are connected to each other multiple times, greatly reducing the impact of stunning effects."
-	mod_type = "nerves"
+	mod_type = BIOWARE_NERVES
 
 /datum/bioware/spliced_nerves/on_gain()
 	..()

code/modules/surgery/advanced/bioware/vein_threading.dm

@@ -31,7 +31,7 @@
 /datum/bioware/threaded_veins
 	name = "Threaded Veins"
 	desc = "The circulatory system is woven into a mesh, severely reducing the amount of blood lost from wounds."
-	mod_type = "circulation"
+	mod_type = BIOWARE_CIRCULATION
 
 /datum/bioware/threaded_veins/on_gain()
 	..()

code/modules/surgery/organs/liver.dm

@@ -41,7 +41,7 @@
 			C.reagents.metabolize(C, can_overdose=TRUE)
 
 			if(damage > 10 && prob(damage/3))//the higher the damage the higher the probability
-				to_chat(C, "<span class='notice'>You feel [pick("nauseous", "dull pain in your lower body", "confused")].</span>")
+				to_chat(C, "<span class='notice'>You feel [pick("nauseated", "a dull pain in your lower body", "confused")].</span>")
 
 	if(damage > maxHealth)//cap liver damage
 		damage = maxHealth

code/modules/surgery/organs/lungs.dm

@@ -236,13 +236,13 @@
 
 		var/bz_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/bz][MOLES])
 		if(bz_pp > BZ_trip_balls_min)
-			H.hallucination += 20
+			H.hallucination += 10
 			H.reagents.add_reagent("bz_metabolites",5)
 			if(prob(33))
 				H.adjustBrainLoss(3, 150)
 
 		else if(bz_pp > 0.01)
-			H.hallucination += 5//Removed at 2 per tick so this will slowly build up
+			H.hallucination += 5
 			H.reagents.add_reagent("bz_metabolites",1)