diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index 1b31c8f4c2..de8966bd3a 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -1,92 +1,60 @@
 /obj/item/paper/fluff/jobs/cargo/manifest
-	var/order_cost = 0
-	var/order_id = 0
-	var/errors = 0
-
+	var/order_cost = 0
+	var/order_id = 0
+	var/errors = 0
+
 /obj/item/paper/fluff/jobs/cargo/manifest/New(atom/A, id, cost)
-	..()
-	order_id = id
-	order_cost = cost
-
-	if(prob(MANIFEST_ERROR_CHANCE))
-		errors |= MANIFEST_ERROR_NAME
-	if(prob(MANIFEST_ERROR_CHANCE))
-		errors |= MANIFEST_ERROR_CONTENTS
-	if(prob(MANIFEST_ERROR_CHANCE))
-		errors |= MANIFEST_ERROR_ITEM
-
+	..()
+	order_id = id
+	order_cost = cost
+
+	if(prob(MANIFEST_ERROR_CHANCE))
+		errors |= MANIFEST_ERROR_NAME
+	if(prob(MANIFEST_ERROR_CHANCE))
+		errors |= MANIFEST_ERROR_CONTENTS
+	if(prob(MANIFEST_ERROR_CHANCE))
+		errors |= MANIFEST_ERROR_ITEM
+
 /obj/item/paper/fluff/jobs/cargo/manifest/proc/is_approved()
-	return stamped && stamped.len && !is_denied()
-
+	return stamped && stamped.len && !is_denied()
+
 /obj/item/paper/fluff/jobs/cargo/manifest/proc/is_denied()
-	return stamped && ("stamp-deny" in stamped)
-
-/datum/supply_order
-	var/id
-	var/orderer
-	var/orderer_rank
-	var/orderer_ckey
-	var/reason
-	var/datum/supply_pack/pack
-
-/datum/supply_order/New(datum/supply_pack/pack, orderer, orderer_rank, orderer_ckey, reason)
-	id = SSshuttle.ordernum++
-	src.pack = pack
-	src.orderer = orderer
-	src.orderer_rank = orderer_rank
-	src.orderer_ckey = orderer_ckey
-	src.reason = reason
-
-/datum/supply_order/proc/generateRequisition(turf/T)
-	var/obj/item/paper/P = new(T)
-
-	P.name = "requisition form - #[id] ([pack.name])"
-	P.info += "<h2>[station_name()] Supply Requisition</h2>"
-	P.info += "<hr/>"
-	P.info += "Order #[id]<br/>"
-	P.info += "Item: [pack.name]<br/>"
-	P.info += "Access Restrictions: [get_access_desc(pack.access)]<br/>"
-	P.info += "Requested by: [orderer]<br/>"
-	P.info += "Rank: [orderer_rank]<br/>"
-	P.info += "Comment: [reason]<br/>"
-
-	P.update_icon()
-	return P
-
-/datum/supply_order/proc/generateManifest(obj/structure/closet/crate/C)
+	return stamped && ("stamp-deny" in stamped)
+
+/datum/supply_order
+	var/id
+	var/orderer
+	var/orderer_rank
+	var/orderer_ckey
+	var/reason
+	var/datum/supply_pack/pack
+
+/datum/supply_order/New(datum/supply_pack/pack, orderer, orderer_rank, orderer_ckey, reason)
+	id = SSshuttle.ordernum++
+	src.pack = pack
+	src.orderer = orderer
+	src.orderer_rank = orderer_rank
+	src.orderer_ckey = orderer_ckey
+	src.reason = reason
+
+/datum/supply_order/proc/generateRequisition(turf/T)
+	var/obj/item/paper/P = new(T)
+
+	P.name = "requisition form - #[id] ([pack.name])"
+	P.info += "<h2>[station_name()] Supply Requisition</h2>"
+	P.info += "<hr/>"
+	P.info += "Order #[id]<br/>"
+	P.info += "Item: [pack.name]<br/>"
+	P.info += "Access Restrictions: [get_access_desc(pack.access)]<br/>"
+	P.info += "Requested by: [orderer]<br/>"
+	P.info += "Rank: [orderer_rank]<br/>"
+	P.info += "Comment: [reason]<br/>"
+
+	P.update_icon()
+	return P
+
+/datum/supply_order/proc/generateManifest(obj/structure/closet/crate/C)
 	var/obj/item/paper/fluff/jobs/cargo/manifest/P = new(C, id, pack.cost)
-<<<<<<< HEAD
-
-	var/station_name = (P.errors & MANIFEST_ERROR_NAME) ? new_station_name() : station_name()
-
-	P.name = "shipping manifest - #[id] ([pack.name])"
-	P.info += "<h2>[command_name()] Shipping Manifest</h2>"
-	P.info += "<hr/>"
-	P.info += "Order #[id]<br/>"
-	P.info += "Destination: [station_name]<br/>"
-	P.info += "Item: [pack.name]<br/>"
-	P.info += "Contents: <br/>"
-	P.info += "<ul>"
-	for(var/atom/movable/AM in C.contents - P)
-		if((P.errors & MANIFEST_ERROR_CONTENTS))
-			if(prob(50))
-				P.info += "<li>[AM.name]</li>"
-			else
-				continue
-		P.info += "<li>[AM.name]</li>"
-	P.info += "</ul>"
-	P.info += "<h4>Stamp below to confirm receipt of goods:</h4>"
-
-	P.update_icon()
-	P.loc = C
-	C.manifest = P
-	C.update_icon()
-
-	return P
-
-/datum/supply_order/proc/generate(turf/T)
-	var/obj/structure/closet/crate/C = pack.generate(T)
-=======
 
 	var/station_name = (P.errors & MANIFEST_ERROR_NAME) ? new_station_name() : station_name()
 
@@ -117,14 +85,13 @@
 
 /datum/supply_order/proc/generate(turf/T)
 	var/obj/structure/closet/crate/C = pack.generate(T)
->>>>>>> a162837... Replaces a bunch of loc assignments with forcemoves and moves to nullspace (#33465)
 	var/obj/item/paper/fluff/jobs/cargo/manifest/M = generateManifest(C)
-
-	if(M.errors & MANIFEST_ERROR_ITEM)
-		if(istype(C, /obj/structure/closet/crate/secure) || istype(C, /obj/structure/closet/crate/large))
-			M.errors &= ~MANIFEST_ERROR_ITEM
-		else
-			var/lost = max(round(C.contents.len / 10), 1)
-			while(--lost >= 0)
-				qdel(pick(C.contents))
-	return C
+
+	if(M.errors & MANIFEST_ERROR_ITEM)
+		if(istype(C, /obj/structure/closet/crate/secure) || istype(C, /obj/structure/closet/crate/large))
+			M.errors &= ~MANIFEST_ERROR_ITEM
+		else
+			var/lost = max(round(C.contents.len / 10), 1)
+			while(--lost >= 0)
+				qdel(pick(C.contents))
+	return C