Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -35,13 +35,13 @@
 	if(!target)
 		return
 
-	if(user.a_intent != "hurt" || !isGlass)
+	if(user.a_intent != I_HURT || !isGlass)
 		return ..()
 
 
 	force = 15 //Smashing bottles over someoen's head hurts.
 
-	var/datum/organ/external/affecting = user.zone_sel.selecting //Find what the player is aiming at
+	var/obj/item/organ/external/affecting = user.zone_sel.selecting //Find what the player is aiming at
 
 	var/armor_block = 0 //Get the target's armour values for normal attack damage.
 	var/armor_duration = 0 //The more force the bottle has, the longer the duration.

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -158,9 +158,7 @@
 				return
 
 			user << "\red You slip [W] inside [src]."
-			user.u_equip(W)
-			if ((user.client && user.s_active != src))
-				user.client.screen -= W
+			user.remove_from_mob(W)
 			W.dropped(user)
 			add_fingerprint(user)
 			contents += W
@@ -1569,9 +1567,9 @@
 			surprise.transform *= 0.6
 			surprise.add_blood(M)
 			var/mob/living/carbon/human/H = M
-			var/datum/organ/external/E = H.get_organ("chest")
+			var/obj/item/organ/external/E = H.get_organ("chest")
 			E.fracture()
-			for (var/datum/organ/internal/I in E.internal_organs)
+			for (var/obj/item/organ/I in E.internal_organs)
 				I.take_damage(rand(I.min_bruised_damage, I.min_broken_damage+1))
 
 			if (!E.hidden && prob(60)) //set it snuggly

code/modules/reagents/reagent_containers/pill.dm

@@ -242,8 +242,8 @@
 		reagents.add_reagent("synaptizine", 5)
 		reagents.add_reagent("hyperzine", 5)
 
- /obj/item/weapon/reagent_containers/pill/spaceacillin
-	name = "Spaceacillin"
+/obj/item/weapon/reagent_containers/pill/spaceacillin
+	name = "Spaceacillin pill"
 	desc = "Contains antiviral agents."
 	icon_state = "pill19"
 	New()

code/modules/reagents/reagent_containers/syringes.dm

@@ -58,8 +58,8 @@
 		if(mode == SYRINGE_BROKEN)
 			user << "<span class='warning'>This syringe is broken!</span>"
 			return
-
-		if(user.a_intent == "hurt" && ismob(target))
+
+		if(user.a_intent == I_HURT && ismob(target))
 			if((CLUMSY in user.mutations) && prob(50))
 				target = user
 			syringestab(target, user)
@@ -228,14 +228,17 @@
 			var/mob/living/carbon/human/H = target
 
 			var/target_zone = ran_zone(check_zone(user.zone_sel.selecting, target))
+<<<<<<< HEAD
 			var/datum/organ/external/affecting = H.get_organ(target_zone)
+=======
+			var/obj/item/organ/external/affecting = target:get_organ(target_zone)
+>>>>>>> dev
 
-			if (!affecting)
+			if (!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump())
+				user << "<span class='danger'>They are missing that limb!</span>"
 				return
-			if(affecting.status & ORGAN_DESTROYED)
-				user << "What [affecting.display_name]?"
-				return
-			var/hit_area = affecting.display_name
+
+			var/hit_area = affecting.name
 
 			if((user != target) && H.check_shields(7, "the [src.name]"))
 				return
@@ -243,7 +246,7 @@
 			if (target != user && H.getarmor(target_zone, "melee") > 5 && prob(50))
 				for(var/mob/O in viewers(world.view, user))
 					O.show_message(text("\red <B>[user] tries to stab [target] in \the [hit_area] with [src.name], but the attack is deflected by armor!</B>"), 1)
-				user.u_equip(src)
+				user.remove_from_mob(src)
 				del(src)
 				return
 
@@ -257,8 +260,13 @@
 			target.take_organ_damage(3)// 7 is the same as crowbar punch
 
 		var/syringestab_amount_transferred = rand(0, (reagents.total_volume - 5)) //nerfed by popular demand
+<<<<<<< HEAD
 		reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
 		break_syringe(target, user)
+=======
+		src.reagents.trans_to(target, syringestab_amount_transferred)
+		src.break_syringe(target, user)
+>>>>>>> dev
 
 	proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user)
 		desc += " It is broken."