Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

code/modules/holodeck/area_copy.dm

@@ -5,6 +5,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
 	))
 
 /proc/DuplicateObject(atom/original, perfectcopy = TRUE, sameloc = FALSE, atom/newloc = null, nerf = FALSE, holoitem=FALSE)
+	RETURN_TYPE(original.type)
 	if(!original)
 		return
 	var/atom/O
@@ -122,7 +123,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list(
 
 	if(toupdate.len)
 		for(var/turf/T1 in toupdate)
-			T1.CalculateAdjacentTurfs()
+			CALCULATE_ADJACENT_TURFS(T1)
 			SSair.add_to_active(T1,1)