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/game/objects/structures/extinguisher.dm

@@ -17,7 +17,7 @@
 		return
 	if(istype(O, /obj/item/weapon/extinguisher))
 		if(!has_extinguisher && opened)
-			user.drop_item(O)
+			user.remove_from_mob(O)
 			contents += O
 			has_extinguisher = O
 			user << "<span class='notice'>You place [O] in [src].</span>"
@@ -31,12 +31,13 @@
 /obj/structure/extinguisher_cabinet/attack_hand(mob/user)
 	if(isrobot(user))
 		return
-	if (hasorgans(user))
-		var/datum/organ/external/temp = user:organs_by_name["r_hand"]
+	if (ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
 		if (user.hand)
-			temp = user:organs_by_name["l_hand"]
+			temp = H.organs_by_name["l_hand"]
 		if(temp && !temp.is_usable())
-			user << "<span class='notice'>You try to move your [temp.display_name], but cannot!"
+			user << "<span class='notice'>You try to move your [temp.name], but cannot!"
 			return
 	if(has_extinguisher)
 		user.put_in_hands(has_extinguisher)

code/game/objects/structures/mineral_doors.dm

@@ -249,7 +249,7 @@
 	TryToSwitchState(atom/user)
 
 		var/mob/living/carbon/M = user
-		if(istype(M) && locate(/datum/organ/internal/xenos/hivenode) in M.internal_organs)
+		if(istype(M) && locate(/obj/item/organ/xenos/hivenode) in M.internal_organs)
 			return ..()
 
 	Open()

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -45,10 +45,10 @@
 	var/mob/living/carbon/xenos = user
 	var/mob/living/carbon/victim = M
 
-	if(istype(victim) && locate(/datum/organ/internal/xenos/hivenode) in victim.internal_organs)
+	if(istype(victim) && locate(/obj/item/organ/xenos/hivenode) in victim.internal_organs)
 		return
 
-	if(istype(xenos) && !(locate(/datum/organ/internal/xenos/hivenode) in xenos.internal_organs))
+	if(istype(xenos) && !(locate(/obj/item/organ/xenos/hivenode) in xenos.internal_organs))
 		return
 
 	if(M == usr)

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -10,7 +10,7 @@
 /obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
 	if (prob(5) && istype(M,/mob/living))
 		user.visible_message("\red [user] breaks [src] over [M]'s back!")
-		user.u_equip(src)
+		user.remove_from_mob(src)
 		var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
 		m.loc = get_turf(src)
 		del src
@@ -43,5 +43,5 @@
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		new /obj/item/stack/sheet/metal(src.loc)
-		del(src)
+		del(src)
 	..()

code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

@@ -137,10 +137,10 @@
 	..()
 	if(!buckled_mob)	return
 
-	if(propelled || (pulling && (pulling.a_intent == "hurt")))
+	if(propelled || (pulling && (pulling.a_intent == I_HURT)))
 		var/mob/living/occupant = unbuckle_mob()
 
-		if (pulling && (pulling.a_intent == "hurt"))
+		if (pulling && (pulling.a_intent == I_HURT))
 			occupant.throw_at(A, 3, 3, pulling)
 		else if (propelled)
 			occupant.throw_at(A, 3, propelled)

code/game/objects/structures/tables_racks.dm

@@ -363,7 +363,7 @@
 		if (istype(G.affecting, /mob/living))
 			var/mob/living/M = G.affecting
 			if (G.state < 2)
-				if(user.a_intent == "hurt")
+				if(user.a_intent == I_HURT)
 					if (prob(15))	M.Weaken(5)
 					M.apply_damage(8,def_zone = "head")
 					visible_message("<span class='danger'>[G.assailant] slams [G.affecting]'s face against \the [src]!</span>")

code/game/objects/structures/target_stake.dm

@@ -26,7 +26,7 @@
 		if(istype(W, /obj/item/target))
 			density = 0
 			W.density = 1
-			user.drop_item(src)
+			user.remove_from_mob(W)
 			W.loc = loc
 			W.layer = 3.1
 			pinned_target = W

code/game/objects/structures/watercloset.dm

@@ -346,12 +346,13 @@
 	var/busy = 0 	//Something's being washed at the moment
 
 /obj/structure/sink/attack_hand(mob/user as mob)
-	if (hasorgans(user))
-		var/datum/organ/external/temp = user:organs_by_name["r_hand"]
+	if (ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
 		if (user.hand)
-			temp = user:organs_by_name["l_hand"]
+			temp = H.organs_by_name["l_hand"]
 		if(temp && !temp.is_usable())
-			user << "<span class='notice'>You try to move your [temp.display_name], but cannot!"
+			user << "<span class='notice'>You try to move your [temp.name], but cannot!"
 			return
 
 	if(isrobot(user) || isAI(user))

code/game/objects/structures/window.dm

@@ -180,7 +180,7 @@
 		user.visible_message("<span class='danger'>[user] smashes through [src]!</span>")
 		shatter()
 
-	else if (usr.a_intent == "hurt")
+	else if (usr.a_intent == I_HURT)
 
 		if (istype(usr,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = usr