Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/game/machinery/iv_drip.dm

@@ -112,7 +112,8 @@
 
 			if (B)
 				beaker.reagents.reagent_list |= B
-				beaker.reagents.update_total()
+				beaker.reagents.del_reagent("clonexadone")	//Fix for infinite meat spawning when taking blood from human
+				beaker.reagents.update_total()				//to an IV drip full of clonex
 				beaker.on_reagent_change()
 				beaker.reagents.handle_reactions()
 				update_icon()

code/game/mecha/mecha_construction_paths.dm

@@ -571,6 +571,7 @@
 	custom_action(step, atom/used_atom, mob/user)
 		user.visible_message("[user] has connected [used_atom] to [holder].", "You connect [used_atom] to [holder]")
 		holder.overlays += used_atom.icon_state+"+o"
+		user.drop_item()
 		del used_atom
 		return 1
 

code/game/objects/effects/aliens.dm

@@ -110,6 +110,11 @@
 		for(var/mob/O in oviewers(src))
 			O.show_message("\red [usr] destroys the [name]!", 1)
 		health = 0
+	else
+		usr << "\blue You claw at the [name]."
+		for(var/mob/O in oviewers(src))
+			O.show_message("\red [usr] claws at the [name]!", 1)
+		health -= rand(5,10)
 	healthcheck()
 	return
 

code/game/objects/storage/coat.dm

@@ -211,8 +211,14 @@
 	orient2hud()
 	return
 
-/obj/item/weapon/storage/emp_act(severity)
+/obj/item/clothing/suit/emp_act(severity)
 	if(!istype(src.loc, /mob/living))
 		for(var/obj/O in contents)
 			O.emp_act(severity)
-	..()
+	..()
+
+/obj/item/clothing/suit/hear_talk(mob/M, var/msg)
+	for (var/atom/A in src)
+		if(istype(A,/obj/))
+			var/obj/O = A
+			O.hear_talk(M, msg)

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

@@ -380,7 +380,7 @@
 	u_equip(item)
 	update_icons()
 
-	if (istype(usr, /mob/living/carbon/monkey)) //Check if a monkey is throwing. Modify/remove this line as required.
+	if (istype(usr, /mob/living/carbon)) //Check if a carbon mob is throwing. Modify/remove this line as required.
 		item.loc = src.loc
 		if(src.client)
 			src.client.screen -= item