Replaces a bunch of loc assignments with forcemoves and moves to nullspace

code/modules/paperwork/contract.dm

@@ -302,11 +302,11 @@
 			if(istype(worn, /obj/item/device/pda))
 				var/obj/item/device/pda/PDA = worn
 				PDA.id = id
-				id.loc = worn
+				id.forceMove(worn)
 			else if(istype(worn, /obj/item/storage/wallet))
 				var/obj/item/storage/wallet/W = worn
 				W.front_id = id
-				id.loc = worn
+				id.forceMove(worn)
 				worn.update_icon()
 	var/datum/round_event/ion_storm/add_law_only/ion = new()
 	ion.announceEvent = -1

code/modules/paperwork/filingcabinet.dm

@@ -36,7 +36,7 @@
 	if(mapload)
 		for(var/obj/item/I in loc)
 			if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo))
-				I.loc = src
+				I.forceMove(src)
 
 /obj/structure/filingcabinet/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
@@ -90,7 +90,7 @@
 	if(contents.len)
 		if(prob(40 + contents.len * 5))
 			var/obj/item/I = pick(contents)
-			I.loc = loc
+			I.forceMove(loc)
 			if(prob(25))
 				step_rand(I)
 			to_chat(user, "<span class='notice'>You pull \a [I] out of [src] at random.</span>")
@@ -184,7 +184,12 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
 	icon_state = "employmentcabinet"
 	var/virgin = 1
 
+<<<<<<< HEAD
 /obj/structure/filingcabinet/employment/New()
+=======
+/obj/structure/filingcabinet/employment/Initialize()
+	. = ..()
+>>>>>>> a162837... Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
 	GLOB.employmentCabinets += src
 	return ..()
 

code/modules/paperwork/paper_cutter.dm

@@ -55,7 +55,7 @@
 		if(!user.transferItemToLoc(P, src))
 			return
 		to_chat(user, "<span class='notice'>You replace [src]'s [P].</span>")
-		P.loc = src
+		P.forceMove(src)
 		storedcutter = P
 		update_icon()
 		return

code/modules/paperwork/paperbin.dm

@@ -22,7 +22,7 @@
 		return
 	var/obj/item/pen/P = locate(/obj/item/pen) in src.loc
 	if(P && !bin_pen)
-		P.loc = src
+		P.forceMove(src)
 		bin_pen = P
 		update_icon()
 
@@ -69,7 +69,7 @@
 	user.changeNext_move(CLICK_CD_MELEE)
 	if(bin_pen)
 		var/obj/item/pen/P = bin_pen
-		P.loc = user.loc
+		P.forceMove(user.loc)
 		user.put_in_hands(P)
 		to_chat(user, "<span class='notice'>You take [P] out of \the [src].</span>")
 		bin_pen = null
@@ -90,7 +90,7 @@
 					P.rigged = 1
 					P.updateinfolinks()
 
-		P.loc = user.loc
+		P.forceMove(user.loc)
 		user.put_in_hands(P)
 		to_chat(user, "<span class='notice'>You take [P] out of \the [src].</span>")
 	else
@@ -169,4 +169,4 @@
 			CHECK_TICK
 		qdel(src)
 	else
-		..()
+		..()