Merge branch 'Aurorastation/development' into Map-Development

code/defines/obj.dm

@@ -114,7 +114,7 @@ var/global/ManifestJSON
 			department = 1
 			if(depthead && sci.len != 1)
 				sci.Swap(1,sci.len)
-				
+
 		if(real_rank in cargo_positions)
 			car[++car.len] = list("name" = name, "rank" = rank, "active" = isactive)
 			department = 1
@@ -146,7 +146,7 @@ var/global/ManifestJSON
 		"bot" = bot,\
 		"misc" = misc\
 		)
-	ManifestJSON = list2json(PDA_Manifest)
+	ManifestJSON = json_encode(PDA_Manifest)
 	return