Merge pull request #4676 from Citadel-Station-13/upstream-merge-34056

[MIRROR]  Fixes infernal jaunt causing devils to get stuck if interrupted

code/modules/spells/spell_types/devil.dm

@@ -118,14 +118,15 @@
 				revert_cast()
 				return ..()
 		else
-			user.notransform = 1
+			user.notransform = 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.ExtinguishMob()
+				user.notransform = FALSE
+				user.fakefireextinguish()
 		start_recharge()
 		return
 	revert_cast()