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

code/modules/mob/living/carbon/human/death.dm

@@ -15,7 +15,7 @@
 
 	for(var/obj/item/organ/I in internal_organs)
 		if(istype(loc,/turf))
-			I.removed(src)
+			I.removed()
 			spawn()
 				I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
 

code/modules/mob/living/carbon/human/human_organs.dm

@@ -89,7 +89,7 @@
 		stance_damage = 0
 
 	// standing is poor
-	if(stance_damage >= 4)
+	if(stance_damage >= 8)
 		if(!(lying || resting))
 			if(species && !(species.flags & NO_PAIN))
 				emote("scream")

code/modules/mob/living/simple_animal/bees.dm

@@ -3,6 +3,7 @@
 	name = "bees"
 	icon = 'icons/obj/apiary_bees_etc.dmi'
 	icon_state = "bees1"
+	icon_living = "bees1"
 	icon_dead = "bees1"
 	var/strength = 1
 	var/feral = 0
@@ -79,8 +80,8 @@
 				B.strength = rand(1,5)
 				src.strength -= B.strength
 				if(src.strength <= 5)
-					src.icon_state = "bees[src.strength]"
-				B.icon_state = "bees[B.strength]"
+					src.icon_living = "bees[src.strength]"
+				B.icon_living = "bees[B.strength]"
 				if(src.parent)
 					B.parent = src.parent
 					src.parent.owned_bee_swarms.Add(B)
@@ -117,9 +118,9 @@
 			if(feral > 0)
 				src.strength += B.strength
 				qdel(B)
-				src.icon_state = "bees[src.strength]"
+				src.icon_living = "bees[src.strength]"
 				if(strength > 5)
-					icon_state = "bees_swarm"
+					icon_living = "bees_swarm"
 			else if(prob(10))
 				//make the other swarm of bees stronger, then move away
 				var/total_bees = B.strength + src.strength
@@ -127,11 +128,11 @@
 					B.strength = min(5, total_bees)
 					src.strength = total_bees - B.strength
 
-					B.icon_state = "bees[B.strength]"
+					B.icon_living = "bees[B.strength]"
 					if(src.strength <= 0)
 						qdel(src)
 						return
-					src.icon_state = "bees[B.strength]"
+					src.icon_living = "bees[B.strength]"
 					var/turf/simulated/floor/T = get_turf(get_step(src, pick(1,2,4,8)))
 					density = 1
 					if(T.Enter(src, get_turf(src)))
@@ -180,9 +181,9 @@
 		if(strength <= 0)
 			qdel(src)
 		else if(strength <= 5)
-			icon_state = "bees[strength]"
+			icon_living = "bees[strength]"
 
 	//debugging
-	/*icon_state = "[strength]"
+	/*icon_living = "[strength]"
 	if(strength > 5)
-		icon_state = "unknown"*/
+		icon_living = "unknown"*/

code/modules/mob/mob.dm

@@ -106,7 +106,21 @@
 	for(var/mob/M in get_mobs_in_view(range, src))
 		if(self_message && M==src)
 			msg = self_message
-		M.show_message( msg, 2, deaf_message, 1)
+		M.show_message(msg, 2, deaf_message, 1)
+	
+	// based on say code
+	var/omsg = replacetext(message, "<B>[src]</B> ", "")
+	var/list/listening_obj = new
+	for(var/atom/movable/A in view(range, src))
+		if(istype(A, /mob))
+			var/mob/M = A
+			for(var/obj/O in M.contents)
+				listening_obj |= O
+		else if(istype(A, /obj))
+			var/obj/O = A
+			listening_obj |= O
+	for(var/obj/O in listening_obj)
+		O.hear_message(src, omsg)
 
 // Show a message to all mobs in earshot of this atom
 // Use for objects performing audible actions