Conflicts!!!

code/modules/spells/spell_types/devil.dm

@@ -118,14 +118,14 @@
 				revert_cast()
 				return ..()
 		else
-			user.notransform = TRUE
+			user.mob_transforming = TRUE
 			user.fakefire()
 			to_chat(src, "<span class='warning'>You begin to phase back into sinful flames.</span>")
 			if(do_mob(user,user,150))
 				user.infernalphaseout()
 			else
 				to_chat(user, "<span class='warning'>You must remain still while exiting.</span>")
-				user.notransform = FALSE
+				user.mob_transforming = FALSE
 				user.fakefireextinguish()
 		start_recharge()
 		return
@@ -149,11 +149,11 @@
 	ExtinguishMob()
 	forceMove(holder)
 	holder = holder
-	notransform = 0
+	mob_transforming = 0
 	fakefireextinguish()
 
 /mob/living/proc/infernalphasein()
-	if(notransform)
+	if(mob_transforming)
 		to_chat(src, "<span class='warning'>You're too busy to jaunt in.</span>")
 		return FALSE
 	fakefire()

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -22,14 +22,14 @@
 		INVOKE_ASYNC(src, .proc/do_jaunt, target)
 
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/do_jaunt(mob/living/target)
-	target.notransform = 1
+	target.mob_transforming = 1
 	var/turf/mobloc = get_turf(target)
 	var/obj/effect/dummy/phased_mob/spell_jaunt/holder = new /obj/effect/dummy/phased_mob/spell_jaunt(mobloc)
 	new jaunt_out_type(mobloc, target.dir)
 	target.ExtinguishMob()
 	target.forceMove(holder)
 	target.reset_perspective(holder)
-	target.notransform=0 //mob is safely inside holder now, no need for protection.
+	target.mob_transforming=0 //mob is safely inside holder now, no need for protection.
 	jaunt_steam(mobloc)
 
 	sleep(jaunt_duration)
@@ -102,4 +102,4 @@
 	return
 
 /obj/effect/dummy/phased_mob/spell_jaunt/bullet_act(blah)
-	return BULLET_ACT_FORCE_PIERCE
+	return BULLET_ACT_FORCE_PIERCE

code/modules/spells/spell_types/rod_form.dm

@@ -18,7 +18,7 @@
 		W.damage_bonus += spell_level * 20 //You do more damage when you upgrade the spell
 		W.start_turf = start
 		M.forceMove(W)
-		M.notransform = 1
+		M.mob_transforming = 1
 		M.status_flags |= GODMODE
 
 //Wizard Version of the Immovable Rod
@@ -37,7 +37,7 @@
 /obj/effect/immovablerod/wizard/Destroy()
 	if(wizard)
 		wizard.status_flags &= ~GODMODE
-		wizard.notransform = 0
+		wizard.mob_transforming = 0
 		wizard.forceMove(get_turf(src))
 	return ..()
 

code/modules/spells/spell_types/shapeshift.dm

@@ -100,7 +100,7 @@
 	if(stored.mind)
 		stored.mind.transfer_to(shape)
 	stored.forceMove(src)
-	stored.notransform = TRUE
+	stored.mob_transforming = TRUE
 	if(source.convert_damage)
 		var/damage_percent = (stored.maxHealth - stored.health)/stored.maxHealth;
 		var/damapply = damage_percent * shape.maxHealth;
@@ -148,7 +148,7 @@
 	restoring = TRUE
 	qdel(slink)
 	stored.forceMove(get_turf(src))
-	stored.notransform = FALSE
+	stored.mob_transforming = FALSE
 	if(shape.mind)
 		shape.mind.transfer_to(stored)
 	if(death)

code/modules/spells/spell_types/summonitem.dm

@@ -76,20 +76,6 @@
 							break
 						M.dropItemToGround(item_to_retrieve)
 
-						if(iscarbon(M)) //Edge case housekeeping
-							var/mob/living/carbon/C = M
-							if(C.stomach_contents && (item_to_retrieve in C.stomach_contents))
-								C.stomach_contents -= item_to_retrieve
-							for(var/X in C.bodyparts)
-								var/obj/item/bodypart/part = X
-								if(item_to_retrieve in part.embedded_objects)
-									part.embedded_objects -= item_to_retrieve
-									to_chat(C, "<span class='warning'>The [item_to_retrieve] that was embedded in your [L] has mysteriously vanished. How fortunate!</span>")
-									if(!C.has_embedded_objects())
-										C.clear_alert("embeddedobject")
-										SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "embedded")
-									break
-
 					else
 						if(istype(item_to_retrieve.loc, /obj/machinery/portable_atmospherics/)) //Edge cases for moved machinery
 							var/obj/machinery/portable_atmospherics/P = item_to_retrieve.loc