diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index b93201b6141..05f8236005c 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -25,27 +25,28 @@
 			return
 		if (user && src.imp)
 			for (var/mob/O in viewers(M, null))
-				if (target != user)
-					O.show_message(text("\red <B>[] is trying to implant [] with [src.name]!</B>", user, target), 1)
+				if (M != user)
+					O.show_message(text("\red <B>[] is trying to implant [] with [src.name]!</B>", user, M), 1)
 				else
 					O.show_message("\red <B>[user] is trying to inject themselves with [src.name]!</B>", 1)
-			if(!do_mob(user, target,60)) return
-			var/picked = 0
-			var/mob/living/carbon/T = target
-			var/list/datum/organ/external/E = T.GetOrgans()
-			while(picked == 0 && E.len > 0)
-				var/datum/organ/external/O = pick(E)
-				E -= O
-				if(!E.implant)
-					O.implant = src.imp
-					picked = 1
-			if(picked == 0)
-				for (var/mob/O in viewers(M, null))
-					O.show_message(text("[user.name] can't find anywhere to implant [target.name]"), 1)
-				return
+			if(!do_mob(user, M,60)) return
+			if(istype(M, /mob/living/carbon/human))
+				var/picked = 0
+				var/mob/living/carbon/human/T = M
+				var/list/datum/organ/external/E = T.organs
+				while(picked == 0 && E.len > 0)
+					var/datum/organ/external/O = pick(E)
+					E -= O
+					if(!E.implant)
+						O.implant = src.imp
+						picked = 1
+				if(picked == 0)
+					for (var/mob/O in viewers(M, null))
+						O.show_message(text("[user.name] can't find anywhere to implant [M.name]"), 1)
+					return
 			for (var/mob/O in viewers(M, null))
-				if (target != user)
-					O.show_message(text("\red [] implants [] with [src.name]!", user, target), 1)
+				if (M != user)
+					O.show_message(text("\red [] implants [] with [src.name]!", user, M), 1)
 				else
 					O.show_message("\red [user] implants themself with [src.name]!", 1)
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'> Implanted with [src.name] ([src.imp.name])  by [user.name] ([user.ckey])</font>")
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 85e1b925d5a..aeb34d66ddd 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -468,6 +468,18 @@
 				message = "<B>[src]</B> makes a very loud noise."
 				m_type = 2
 
+		if ("hungry")
+			if(prob(1))
+				message = "<B>Blue Elf</B> needs food Badly."
+			else
+				message = "<B>[src]'s</B> stomach growls."
+
+		if ("thirsty")
+			if(prob(1))
+				message = "<B>[src]</B> cancels destory station: Drinking."
+			else
+				message = "<B>[src]</B> looks thirsty."
+
 		if ("help")
 			src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough,\ncry, custom, deathgasp, drool, eyebrow, frown, gasp, giggle, groan, grumble, handshake, hug-(none)/mob, glare-(none)/mob,\ngrin, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, raise, salute, shake, shiver, shrug,\nsigh, signal-#1-10, smile, sneeze, sniff, snore, stare-(none)/mob, tremble, twitch, twitch_s, whimper,\nwink, yawn"
 
diff --git a/code/modules/mob/organ/organ.dm b/code/modules/mob/organ/organ.dm
index db29229dff5..0de3cd6ede2 100644
--- a/code/modules/mob/organ/organ.dm
+++ b/code/modules/mob/organ/organ.dm
@@ -29,6 +29,7 @@
 		max_damage = 0
 		wound_size = 0
 		max_size = 0
+	var/obj/item/weapon/implant/implant = null
 
 
 	proc/take_damage(brute, burn)