Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

code/modules/organs/organ.dm

@@ -62,7 +62,6 @@
 		else
 			E.process()
 			number_wounds += E.number_wounds
-
 			//Robotic limb malfunctions
 			var/malfunction = 0
 			if (E.status & ORGAN_ROBOT && prob(E.brute_dam + E.burn_dam))
@@ -81,20 +80,24 @@
 					I.take_damage(rand(3,5))
 
 			//Special effects for limbs.
-			if(E.name in list("l_hand","l_arm","r_hand","r_arm") && (broken||malfunction))
+			if(E.name in list("l_hand","l_arm","r_hand","r_arm"))
 				var/obj/item/c_hand		//Getting what's in this hand
+				var/hand
 				if(E.name == "l_hand" || E.name == "l_arm")
 					c_hand = l_hand
+					hand = "left hand"
 				if(E.name == "r_hand" || E.name == "r_arm")
 					c_hand = r_hand
-
+					hand = "right hand"
 				if (c_hand)
-					u_equip(c_hand)
 
 					if(broken)
-						emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : "screams in pain and"] drops what they were holding in their [E.display_name?"[E.display_name]":"[E]"]!")
+						u_equip(c_hand)
+						var/emote_scream = pick("screams in pain and", "let's out a sharp hiss and", "cries out and")
+						emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : emote_scream ] drops what they were holding in their [hand]!")
 					if(malfunction)
-						emote("me", 1, "drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!")
+						u_equip(c_hand)
+						emote("me", 1, "drops what they were holding, their [hand] malfunctioning!")
 						var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 						spark_system.set_up(5, 0, src)
 						spark_system.attach(src)

code/modules/organs/organ_external.dm

@@ -376,20 +376,21 @@ This function completely restores a damaged organ to perfect condition.
 
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
 		if(W.internal && !W.is_treated() && owner.bodytemperature >= 170)
-			if(!owner.reagents.has_reagent("bicaridine"))	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
+			var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
+			if(!bicardose)	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
+			if(bicardose >= 30)	//overdose of bicaridine begins healing IB
+				W.damage = max(0, W.damage - 0.2)
+
 			if(!owner.reagents.has_reagent("inaprovaline")) //This little copypaste will allow inaprovaline to work too, giving it a much needed buff to help medical.
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
 
-			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)//Bicaridine slows Internal Bleeding
+			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)
 			if(prob(1 * wound_update_accuracy))
 				owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
 
-			//overdose of bicaridine begins healing IB
-			if(owner.reagents.get_reagent_amount("bicaridine") >= 30)
-				W.damage = max(0, W.damage - 0.2)
 
 		// slow healing
 		var/heal_amt = 0

code/modules/organs/organ_internal.dm

@@ -129,10 +129,8 @@
 					// Ethanol and all drinks are bad
 					if(istype(R, /datum/reagent/ethanol))
 						owner.adjustToxLoss(0.1 * process_accuracy)
-
-				// Can't cope with toxins at all
-				for(var/toxin in list("toxin", "phoron", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker"))
-					if(owner.reagents.has_reagent(toxin))
+					// Can't cope with toxins at all
+					if(istype(R, /datum/reagent/toxin))
 						owner.adjustToxLoss(0.3 * process_accuracy)
 
 /datum/organ/internal/kidney