new beginnings

code/modules/surgery/bodyparts/helpers.dm

@@ -151,12 +151,14 @@
 	clear_alert("embeddedobject")
 	SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "embedded")
 
-/mob/living/carbon/proc/has_embedded_objects()
-	. = FALSE
+/mob/living/carbon/proc/has_embedded_objects(include_harmless=FALSE)
+	. = 0
 	for(var/X in bodyparts)
 		var/obj/item/bodypart/L = X
 		for(var/obj/item/I in L.embedded_objects)
-			return TRUE
+			if(!include_harmless && I.is_embed_harmless())
+				continue
+			return 1
 
 
 //Helper for quickly creating a new limb - used by augment code in species.dm spec_attacked_by

code/modules/surgery/remove_embedded_object.dm

@@ -30,11 +30,7 @@
 			var/objects = 0
 			for(var/obj/item/I in L.embedded_objects)
 				objects++
-				I.forceMove(get_turf(H))
-				L.embedded_objects -= I
-			if(!H.has_embedded_objects())
-				H.clear_alert("embeddedobject")
-				SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "embedded")
+				SEND_SIGNAL(H, COMSIG_HUMAN_EMBED_REMOVAL, I, L)
 
 			if(objects > 0)
 				display_results(user, target, "<span class='notice'>You successfully remove [objects] objects from [H]'s [L.name].</span>",