Merge branch 'master' into upstream-merge-33498

code/game/objects/structures/artstuff.dm

@@ -20,7 +20,7 @@
 		var/obj/item/canvas/C = I
 		user.dropItemToGround(C)
 		painting = C
-		C.loc = get_turf(src)
+		C.forceMove(get_turf(src))
 		C.layer = layer+0.1
 		user.visible_message("<span class='notice'>[user] puts \the [C] on \the [src].</span>","<span class='notice'>You place \the [C] on \the [src].</span>")
 	else
@@ -32,7 +32,7 @@
 	var/turf/T = get_turf(src)
 	..()
 	if(painting && painting.loc == T) //Only move if it's near us.
-		painting.loc = get_turf(src)
+		painting.forceMove(get_turf(src))
 	else
 		painting = null
 

code/game/objects/structures/displaycase.dm

@@ -224,7 +224,7 @@
 			G.use(10)
 			var/obj/structure/displaycase/display = new(src.loc)
 			if(electronics)
-				electronics.loc = display
+				electronics.forceMove(display)
 				display.electronics = electronics
 				if(electronics.one_access)
 					display.req_one_access = electronics.accesses

code/game/objects/structures/electricchair.dm

@@ -15,7 +15,7 @@
 		var/obj/structure/chair/C = new /obj/structure/chair(loc)
 		playsound(loc, W.usesound, 50, 1)
 		C.setDir(dir)
-		part.loc = loc
+		part.forceMove(loc)
 		part.master = null
 		part = null
 		qdel(src)

code/game/objects/structures/kitchen_spike.dm

@@ -81,7 +81,7 @@
 				return
 			playsound(src.loc, 'sound/effects/splat.ogg', 25, 1)
 			L.visible_message("<span class='danger'>[user] slams [L] onto the meat spike!</span>", "<span class='userdanger'>[user] slams you onto the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
-			L.loc = src.loc
+			L.forceMove(drop_location())
 			L.emote("scream")
 			L.add_splatter_floor()
 			L.adjustBruteLoss(30)

code/game/objects/structures/noticeboard.dm

@@ -18,7 +18,7 @@
 		if(notices > 4)
 			break
 		if(istype(I, /obj/item/paper))
-			I.loc = src
+			I.forceMove(src)
 			notices++
 	icon_state = "nboard0[notices]"
 
@@ -58,7 +58,7 @@
 			return
 		var/obj/item/I = locate(href_list["remove"]) in contents
 		if(istype(I) && I.loc == src)
-			I.loc = usr.loc
+			I.forceMove(usr.loc)
 			usr.put_in_hands(I)
 			notices--
 			icon_state = "nboard0[notices]"

code/game/objects/structures/tables_racks.dm

@@ -121,7 +121,7 @@
 			T.quick_empty()
 
 			for(var/obj/item/C in oldContents)
-				C.loc = src.loc
+				C.forceMove(drop_location())
 
 			user.visible_message("[user] empties [I] on [src].")
 			return

code/game/objects/structures/target_stake.dm

@@ -18,7 +18,7 @@
 /obj/structure/target_stake/Move()
 	..()
 	if(pinned_target)
-		pinned_target.loc = loc
+		pinned_target.forceMove(loc)
 
 /obj/structure/target_stake/attackby(obj/item/target/T, mob/user)
 	if(pinned_target)
@@ -36,7 +36,7 @@
 
 /obj/structure/target_stake/proc/removeTarget(mob/user)
 	pinned_target.layer = OBJ_LAYER
-	pinned_target.loc = user.loc
+	pinned_target.forceMove(user.loc)
 	pinned_target.nullPinnedLoc()
 	nullPinnedTarget()
 	if(ishuman(user))
@@ -44,7 +44,7 @@
 			user.put_in_hands(pinned_target)
 			to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
 	else
-		pinned_target.loc = get_turf(user)
+		pinned_target.forceMove(user.drop_location())
 		to_chat(user, "<span class='notice'>You take the target out of the stake.</span>")
 
 /obj/structure/target_stake/bullet_act(obj/item/projectile/P)

code/game/objects/structures/windoor_assembly.dm

@@ -216,13 +216,13 @@
 
 				if(do_after(user, 40, target = src))
 					if(!src || electronics)
-						W.loc = src.loc
+						W.forceMove(drop_location())
 						return
 					to_chat(user, "<span class='notice'>You install the airlock electronics.</span>")
 					name = "near finished windoor assembly"
 					electronics = W
 				else
-					W.loc = loc
+					W.forceMove(drop_location())
 
 			//Screwdriver to remove airlock electronics. Step 6 undone.
 			else if(istype(W, /obj/item/screwdriver))
@@ -240,7 +240,7 @@
 					var/obj/item/electronics/airlock/ae
 					ae = electronics
 					electronics = null
-					ae.loc = loc
+					ae.forceMove(drop_location())
 
 			else if(istype(W, /obj/item/pen))
 				var/t = stripped_input(user, "Enter the name for the door.", name, created_name,MAX_NAME_LEN)
@@ -285,7 +285,7 @@
 							else
 								windoor.req_access = electronics.accesses
 							windoor.electronics = electronics
-							electronics.loc = windoor
+							electronics.forceMove(windoor)
 							if(created_name)
 								windoor.name = created_name
 							qdel(src)

code/game/objects/structures/window.dm

@@ -283,11 +283,10 @@
 		return
 	if(!disassembled)
 		playsound(src, breaksound, 70, 1)
-		var/turf/T = loc
 		if(!(flags_1 & NODECONSTRUCT_1))
 			for(var/i in debris)
 				var/obj/item/I = i
-				I.loc = T
+				I.forceMove(drop_location())
 				transfer_fingerprints_to(I)
 	qdel(src)
 	update_nearby_icons()