Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176

[MIRROR] loc -- > forcemove

code/modules/spells/spell_types/area_teleport.dm

@@ -66,7 +66,7 @@
 				tempL.Remove(attempt)
 
 		if(!success)
-			target.loc = pick(L)
+			target.forceMove(L)
 			playsound(get_turf(user), sound2, 50,1)
 
 	return

code/modules/spells/spell_types/devil.dm

@@ -142,31 +142,23 @@
 /mob/living/proc/infernalphaseout()
 	dust_animation()
 	spawn_dust()
-	src.visible_message("<span class='warning'>[src] disappears in a flashfire!</span>")
+	visible_message("<span class='warning'>[src] disappears in a flashfire!</span>")
 	playsound(get_turf(src), 'sound/magic/enter_blood.ogg', 100, 1, -1)
 	var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(loc)
-	src.ExtinguishMob()
-	if(buckled)
-		buckled.unbuckle_mob(src,force=1)
-	if(has_buckled_mobs())
-		unbuckle_all_mobs(force=1)
-	if(pulledby)
-		pulledby.stop_pulling()
-	if(pulling)
-		stop_pulling()
-	src.loc = holder
-	src.holder = holder
-	src.notransform = 0
+	ExtinguishMob()
+	forceMove(holder)
+	holder = holder
+	notransform = 0
 	fakefireextinguish()
 
 /mob/living/proc/infernalphasein()
-	if(src.notransform)
+	if(notransform)
 		to_chat(src, "<span class='warning'>You're too busy to jaunt in.</span>")
-		return 0
+		return FALSE
 	fakefire()
-	src.loc = get_turf(src)
-	src.client.eye = src
-	src.visible_message("<span class='warning'><B>[src] appears in a fiery blaze!</B></span>")
+	forceMove(drop_location())
+	client.eye = src
+	visible_message("<span class='warning'><B>[src] appears in a fiery blaze!</B></span>")
 	playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
 	addtimer(CALLBACK(src, .proc/fakefireextinguish), 15, TIMER_UNIQUE)
 

code/modules/spells/spell_types/dumbfire.dm

@@ -57,14 +57,14 @@
 
 	var/current_loc = user.loc
 
-	projectile.loc = current_loc
+	projectile.forceMove(current_loc)
 
 	for(var/i = 0,i < proj_lifespan,i++)
 		if(!projectile)
 			break
 
 		if(proj_insubstantial)
-			projectile.loc = get_step(projectile, projectile.dir)
+			projectile.forceMove(get_step(projectile, projectile.dir))
 		else
 			step(projectile, projectile.dir)
 

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -28,14 +28,7 @@
 	var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt(mobloc)
 	new jaunt_out_type(mobloc, target.dir)
 	target.ExtinguishMob()
-	if(target.buckled)
-		target.buckled.unbuckle_mob(target,force=1)
-	if(target.pulledby)
-		target.pulledby.stop_pulling()
-	target.stop_pulling()
-	if(target.has_buckled_mobs())
-		target.unbuckle_all_mobs(force=1)
-	target.loc = holder
+	target.forceMove(holder)
 	target.reset_perspective(holder)
 	target.notransform=0 //mob is safely inside holder now, no need for protection.
 	jaunt_steam(mobloc)
@@ -92,7 +85,7 @@
 	var/turf/newLoc = get_step(src,direction)
 	setDir(direction)
 	if(!(newLoc.flags_1 & NOJAUNT_1))
-		loc = newLoc
+		forceMove(newLoc)
 	else
 		to_chat(user, "<span class='warning'>Some strange aura is blocking the way!</span>")
 	movedelay = world.time + movespeed

code/modules/spells/spell_types/projectile.dm

@@ -47,7 +47,7 @@
 
 	var/current_loc = user.loc
 
-	projectile.loc = current_loc
+	projectile.forceMove(current_loc)
 
 	for(var/i = 0,i < proj_lifespan,i++)
 		if(!projectile)
@@ -56,12 +56,12 @@
 		if(proj_homing)
 			if(proj_insubstantial)
 				projectile.setDir(get_dir(projectile,target))
-				projectile.loc = get_step_to(projectile,target)
+				projectile.forceMove(get_step_to(projectile,target))
 			else
 				step_to(projectile,target)
 		else
 			if(proj_insubstantial)
-				projectile.loc = get_step(projectile,dir)
+				projectile.forceMove(get_step(projectile,dir))
 			else
 				step(projectile,dir)
 

code/modules/spells/spell_types/summonitem.dm

@@ -66,7 +66,7 @@
 
 						if(issilicon(M)) //Items in silicons warp the whole silicon
 							M.loc.visible_message("<span class='warning'>[M] suddenly disappears!</span>")
-							M.loc = L.loc
+							M.forceMove(L.loc)
 							M.loc.visible_message("<span class='caution'>[M] suddenly appears!</span>")
 							item_to_retrieve = null
 							break
@@ -101,7 +101,7 @@
 			if(item_to_retrieve.loc)
 				item_to_retrieve.loc.visible_message("<span class='warning'>The [item_to_retrieve.name] suddenly disappears!</span>")
 			if(!L.put_in_hands(item_to_retrieve))
-				item_to_retrieve.loc = L.loc
+				item_to_retrieve.forceMove(L.loc)
 				item_to_retrieve.loc.visible_message("<span class='caution'>The [item_to_retrieve.name] suddenly appears!</span>")
 				playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, 1)
 			else

code/modules/spells/spell_types/turf_teleport.dm

@@ -41,9 +41,5 @@
 			return
 
 		if(!target.Move(picked))
-			if(target.buckled)
-				target.buckled.unbuckle_mob(target,force=1)
-			if(target.has_buckled_mobs())
-				target.unbuckle_all_mobs(force=1)
-			target.loc = picked
+			target.forceMove(picked)
 			playsound(get_turf(user), sound2, 50,1)