literally everything Bhjin has been complaining about

also modularizes stuff and adds more comments. Like responsible downstream repos should have.

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

@@ -207,7 +207,6 @@
 
 	spreadFire(AM)
 
-
 /mob/living/carbon/human/Topic(href, href_list)
 	if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
 		if(href_list["embedded_object"])
@@ -217,9 +216,11 @@
 			var/obj/item/I = locate(href_list["embedded_object"]) in L.embedded_objects
 			if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the person anymore
 				return
-			var/time_taken = I.embedding.embedded_unsafe_removal_time*I.w_class
+			var/time_taken = I.embedding.embedded_unsafe_removal_time/I.w_class //Citadel Change from * to /
 			usr.visible_message("<span class='warning'>[usr] attempts to remove [I] from [usr.p_their()] [L.name].</span>","<span class='notice'>You attempt to remove [I] from your [L.name]... (It will take [DisplayTimeText(time_taken)].)</span>")
 			if(do_after(usr, time_taken, needhand = 1, target = src))
+				remove_embedded_unsafe(L, I, usr)
+				/* CITADEL EDIT: remove_embedded_unsafe replaces this code
 				if(!I || !L || I.loc != src || !(I in L.embedded_objects))
 					return
 				L.embedded_objects -= I
@@ -230,7 +231,7 @@
 				usr.visible_message("[usr] successfully rips [I] out of [usr.p_their()] [L.name]!","<span class='notice'>You successfully remove [I] from your [L.name].</span>")
 				if(!has_embedded_objects())
 					clear_alert("embeddedobject")
-					SEND_SIGNAL(usr, COMSIG_CLEAR_MOOD_EVENT, "embedded")
+					SEND_SIGNAL(usr, COMSIG_CLEAR_MOOD_EVENT, "embedded") */
 			return
 
 		if(href_list["item"])
@@ -918,7 +919,7 @@
 
 /mob/living/carbon/human/species/felinid
 	race = /datum/species/human/felinid
-	
+
 /mob/living/carbon/human/species/fly
 	race = /datum/species/fly
 

code/modules/mob/living/living.dm

@@ -617,7 +617,7 @@
 			resist_fire() //stop, drop, and roll
 		else if(resting) //cit change - allows resisting out of resting
 			resist_a_rest() // ditto
-		else if(istype(src, /mob/living/carbon))
+		else if(iscarbon(src)) //Citadel Change for embedded removal memes
 			var/mob/living/carbon/C = src
 			if(!C.handcuffed && !C.legcuffed)
 				return TRUE