Merge remote-tracking branch 'citadel/master' into tgsync

2025-12-10 01:49:19 +00:00 · 2021-01-08 00:33:57 -08:00
parent 16a9361345 76cb637f9d
commit ddad368d6a
231 changed files with 8727 additions and 6166 deletions
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -566,3 +566,20 @@
 	config_entry_value = 0.333
 	min_val = 0
 	integer = FALSE
+
+/// Amount of dirtyness tiles need to spawn dirt.
+/datum/config_entry/number/turf_dirt_threshold
+	config_entry_value = 100
+	min_val = 1
+	integer = TRUE
+
+/// Alpha dirt starts at
+/datum/config_entry/number/dirt_alpha_starting
+	config_entry_value = 127
+	max_val = 255
+	min_val = 0
+	integer = TRUE
+
+/// Dirtyness multiplier for making turfs dirty
+/datum/config_entry/number/turf_dirty_multiplier
+	config_entry_value = 1
--- a/code/controllers/configuration/entries/persistence.dm
+++ b/code/controllers/configuration/entries/persistence.dm
@@ -0,0 +1,20 @@
+/// Whether or not to use the persistence system for cleanable objects
+/datum/config_entry/flag/persistent_debris
+	config_entry_value = FALSE
+
+/// Whether or not to nuke all roundstart debris that isn't due to persistence if the above is true
+/datum/config_entry/flag/persistent_debris_only
+	config_entry_value = TRUE
+
+/// Max amount of objects to store, total
+/datum/config_entry/number/persistent_debris_global_max
+	config_entry_value = 10000
+	integer = TRUE
+
+/// Max amount of objects to store per type
+/datum/config_entry/number/persistent_debris_type_max
+	config_entry_value = 2000
+	integer = TRUE
+
+/// Wipe dirty stuff on nuke
+/datum/config_entry/flag/persistent_debris_wipe_on_nuke
--- a/code/controllers/subsystem/garbage.dm
+++ b/code/controllers/subsystem/garbage.dm
@@ -139,18 +139,22 @@ SUBSYSTEM_DEF(garbage)

 	lastlevel = level

-	for (var/refID in queue)
-		if (!refID)
+	//We do this rather then for(var/refID in queue) because that sort of for loop copies the whole list.
+	//Normally this isn't expensive, but the gc queue can grow to 40k items, and that gets costly/causes overrun.
+	for (var/i in 1 to length(queue))
+		var/list/L = queue[i]
+		if (length(L) < 2)
 			count++
 			if (MC_TICK_CHECK)
 				return
 			continue

-		var/GCd_at_time = queue[refID]
+		var/GCd_at_time = L[1]
 		if(GCd_at_time > cut_off_time)
 			break // Everything else is newer, skip them
 		count++

+		var/refID = L[2]
 		var/datum/D
 		D = locate(refID)

@@ -241,10 +245,7 @@ SUBSYSTEM_DEF(garbage)

 	D.gc_destroyed = gctime
 	var/list/queue = queues[level]
-	if (queue[refid])
-		queue -= refid // Removing any previous references that were GC'd so that the current object will be at the end of the list.
-
-	queue[refid] = gctime
+	queue[++queue.len] = list(gctime, refid) // not += for byond reasons

 //this is mainly to separate things profile wise.
 /datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -698,6 +698,8 @@ SUBSYSTEM_DEF(job)
 					if(polychromic && istype(polychromic))
 						var/list/polychromic_entry = polychromic.colors_by_atom[I]
 						if(polychromic_entry)
+							if(polychromic.suits_with_helmet_typecache[I.type]) //is this one of those toggleable hood/helmet things?
+								polychromic.connect_helmet(I,i[LOADOUT_COLOR])
 							polychromic.colors_by_atom[I] = i[LOADOUT_COLOR]
 							I.update_icon()
 				else
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -41,6 +41,8 @@ SUBSYSTEM_DEF(mapping)
 	var/datum/space_level/transit
 	var/datum/space_level/empty_space
 	var/num_of_res_levels = 1
+	/// Lookup for zlevel to station z. text = num.
+	var/list/z_to_station_z_index

 	var/stat_map_name = "Loading..."

@@ -259,6 +261,16 @@ SUBSYSTEM_DEF(mapping)
 		INIT_ANNOUNCE("Loaded [name] in [(REALTIMEOFDAY - start_time)/10]s!")
 	return parsed_maps

+/datum/controller/subsystem/mapping/proc/setup_station_z_index()
+	z_to_station_z_index = list()
+	var/sz = 1
+	var/cz = station_start
+	if(islist(config.map_file))
+		for(var/map in config.map_file)
+			z_to_station_z_index["[cz++]"] = sz++
+	else
+		z_to_station_z_index["[station_start]"] = 1
+
 /datum/controller/subsystem/mapping/proc/loadWorld()
 	//if any of these fail, something has gone horribly, HORRIBLY, wrong
 	var/list/FailedZs = list()
@@ -271,6 +283,8 @@ SUBSYSTEM_DEF(mapping)
 	INIT_ANNOUNCE("Loading [config.map_name]...")
 	LoadGroup(FailedZs, "Station", config.map_path, config.map_file, config.traits, ZTRAITS_STATION, FALSE, config.orientation)

+	setup_station_z_index()
+
 	if(SSdbcore.Connect())
 		var/datum/DBQuery/query_round_map_name = SSdbcore.NewQuery("UPDATE [format_table_name("round")] SET map_name = '[config.map_name]' WHERE id = [GLOB.round_id]")
 		query_round_map_name.Execute()
--- a/code/controllers/subsystem/persistence/_persistence.dm
+++ b/code/controllers/subsystem/persistence/_persistence.dm
@@ -5,18 +5,14 @@ SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
 	init_order = INIT_ORDER_PERSISTENCE
 	flags = SS_NO_FIRE
-	var/list/satchel_blacklist 		= list() //this is a typecache
-	var/list/new_secret_satchels 	= list() //these are objects
-	var/list/old_secret_satchels 	= list()
+
+	/// Marks if the station got horribly destroyed
+	var/station_was_destroyed = FALSE
+	/// Marks if persistence save should be disabled
+	var/station_persistence_save_disabled = FALSE

 	var/list/obj/structure/chisel_message/chisel_messages = list()
 	var/list/saved_messages = list()
-	var/list/saved_modes = list(1,2,3)
-	var/list/saved_dynamic_rules = list(list(),list(),list())
-	var/list/saved_storytellers = list("foo","bar","baz")
-	var/list/average_dynamic_threat = 50
-	var/list/saved_maps
-	var/list/saved_trophies = list()
 	var/list/spawned_objects = list()
 	var/list/antag_rep = list()
 	var/list/antag_rep_change = list()
@@ -28,63 +24,82 @@ SUBSYSTEM_DEF(persistence)
 	var/list/paintings = list()

 /datum/controller/subsystem/persistence/Initialize()
-	LoadSatchels()
-	LoadPoly()
-	LoadChiselMessages()
-	LoadTrophies()
-	LoadRecentModes()
-	LoadRecentStorytellers()
-	LoadRecentRulesets()
-	LoadRecentMaps()
-	LoadPhotoPersistence()
+	LoadServerPersistence()
+	LoadGamePersistence()
+	var/map_persistence_path = get_map_persistence_path()
+	if(map_persistence_path)
+		LoadMapPersistence()
+	return ..()
+
+/**
+ * Gets the persistence path of the current map.
+ */
+/datum/controller/subsystem/persistence/proc/get_map_persistence_path()
+	ASSERT(SSmapping.config)
+	if(!SSmapping.config.persistence_key || (SSmapping.config.persistence_key == "NO_PERSIST"))
+		return null
+	return "data/persistence/[ckey(SSmapping.config.persistence_key)]"
+
+/datum/controller/subsystem/persistence/proc/CollectData()
+	SaveServerPersistence()
+	if(station_persistence_save_disabled)
+		return
+	SaveGamePersistence()
+	var/map_persistence_path = get_map_persistence_path()
+	if(map_persistence_path)
+		SaveMapPersistence()
+
+/**
+ * Loads persistent data relevant to the server: Configurations, past gamemodes, votes, antag rep, etc
+ */
+/datum/controller/subsystem/persistence/proc/LoadServerPersistence()
 	for(var/client/C in GLOB.clients)
 		LoadSavedVote(C.ckey)
 	if(CONFIG_GET(flag/use_antag_rep))
 		LoadAntagReputation()
 	LoadRandomizedRecipes()
-	LoadPanicBunker()
 	LoadPaintings()
-	return ..()

-/datum/controller/subsystem/persistence/proc/LoadSatchels()
-	var/placed_satchel = 0
-	var/path
+/**
+ * Saves persistent data relevant to the server: Configurations, past gamemodes, votes, antag rep, etc
+ */
+/datum/controller/subsystem/persistence/proc/SaveServerPersistence()
+	if(CONFIG_GET(flag/use_antag_rep))
+		CollectAntagReputation()
+	SaveRandomizedRecipes()

-	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
-	var/list/json = list()
-	if(fexists(json_file))
-		json = json_decode(file2text(json_file))
+/**
+ * Loads persistent data relevant to the game in general: Photos, etc
+ *
+ * Legacy map persistence systems also use this.
+ */
+/datum/controller/subsystem/persistence/proc/LoadGamePersistence()
+	LoadChiselMessages()
+	LoadPhotoPersistence()
+	LoadPaintings()

-	old_secret_satchels = json["data"]
-	var/obj/item/storage/backpack/satchel/flat/F
-	if(old_secret_satchels && old_secret_satchels.len >= 10) //guards against low drop pools assuring that one player cannot reliably find his own gear.
-		var/pos = rand(1, old_secret_satchels.len)
-		F = new()
-		old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len)
-		F.x = old_secret_satchels[pos]["x"]
-		F.y = old_secret_satchels[pos]["y"]
-		F.z = SSmapping.station_start
-		path = text2path(old_secret_satchels[pos]["saved_obj"])
+/**
+ * Saves persistent data relevant to the game in general: Photos, etc
+ *
+ * Legacy map persistence systems also use this.
+ */
+/datum/controller/subsystem/persistence/proc/SaveGamePersistence()
+	CollectChiselMessages()
+	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
+	SavePaintings()
+	SaveScars()

-	if(F)
-		if(isfloorturf(F.loc) && !isplatingturf(F.loc))
-			F.hide(1)
-		if(ispath(path))
-			var/spawned_item = new path(F)
-			spawned_objects[spawned_item] = TRUE
-		placed_satchel++
-	var/free_satchels = 0
-	for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,SSmapping.station_start), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,SSmapping.station_start)))) //Nontrivially expensive but it's roundstart only
-		if(isfloorturf(T) && !isplatingturf(T))
-			new /obj/item/storage/backpack/satchel/flat/secret(T)
-			free_satchels++
-			if((free_satchels + placed_satchel) == 10) //ten tiles, more than enough to kill anything that moves
-				break
+/**
+ * Loads persistent data relevant to the current map: Objects, etc.
+ */
+/datum/controller/subsystem/persistence/proc/LoadMapPersistence()
+	return

-/datum/controller/subsystem/persistence/proc/LoadPoly()
-	for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
-		twitterize(P.speech_buffer, "polytalk")
-		break //Who's been duping the bird?!
+/**
+ * Saves persistent data relevant to the current map: Objects, etc.
+ */
+/datum/controller/subsystem/persistence/proc/SaveMapPersistence()
+	return

 /datum/controller/subsystem/persistence/proc/LoadChiselMessages()
 	var/list/saved_messages = list()
@@ -131,63 +146,6 @@ SUBSYSTEM_DEF(persistence)

 	log_world("Loaded [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")

-/datum/controller/subsystem/persistence/proc/LoadTrophies()
-	if(fexists("data/npc_saves/TrophyItems.sav")) //legacy compatability to convert old format to new
-		var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
-		var/saved_json
-		S >> saved_json
-		if(!saved_json)
-			return
-		saved_trophies = json_decode(saved_json)
-		fdel("data/npc_saves/TrophyItems.sav")
-	else
-		var/json_file = file("data/npc_saves/TrophyItems.json")
-		if(!fexists(json_file))
-			return
-		var/list/json = json_decode(file2text(json_file))
-		if(!json)
-			return
-		saved_trophies = json["data"]
-	SetUpTrophies(saved_trophies.Copy())
-
-/datum/controller/subsystem/persistence/proc/LoadRecentModes()
-	var/json_file = file("data/RecentModes.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_modes = json["data"]
-
-/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
-	var/json_file = file("data/RecentRulesets.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_dynamic_rules = json["data"]
-
-/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
-	var/json_file = file("data/RecentStorytellers.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_storytellers = json["data"]
-	if(saved_storytellers.len > 3)
-		average_dynamic_threat = saved_storytellers[4]
-	saved_storytellers.len = 3
-
-/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
-	var/json_file = file("data/RecentMaps.json")
-	if(!fexists(json_file))
-		return
-	var/list/json = json_decode(file2text(json_file))
-	if(!json)
-		return
-	saved_maps = json["maps"]

 /datum/controller/subsystem/persistence/proc/LoadAntagReputation()
 	var/json = file2text(FILE_ANTAG_REP)
@@ -208,59 +166,6 @@ SUBSYSTEM_DEF(persistence)
 		return
 	saved_votes[ckey] = json["data"]

-/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
-	for(var/A in GLOB.trophy_cases)
-		var/obj/structure/displaycase/trophy/T = A
-		if (T.showpiece)
-			continue
-		T.added_roundstart = TRUE
-
-		var/trophy_data = pick_n_take(trophy_items)
-
-		if(!islist(trophy_data))
-			continue
-
-		var/list/chosen_trophy = trophy_data
-
-		if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed
-			continue
-
-		var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null
-		if(!path)
-			continue
-
-		T.showpiece = new /obj/item/showpiece_dummy(T, path)
-		T.trophy_message = chosen_trophy["message"]
-		T.placer_key = chosen_trophy["placer_key"]
-		T.update_icon()
-
-/datum/controller/subsystem/persistence/proc/CollectData()
-	CollectChiselMessages()
-	CollectSecretSatchels()
-	CollectTrophies()
-	CollectRoundtype()
-	if(istype(SSticker.mode, /datum/game_mode/dynamic))
-		var/datum/game_mode/dynamic/mode = SSticker.mode
-		CollectStoryteller(mode)
-		CollectRulesets(mode)
-	RecordMaps()
-	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
-	if(CONFIG_GET(flag/use_antag_rep))
-		CollectAntagReputation()
-	SaveRandomizedRecipes()
-	SavePanicBunker()
-	SavePaintings()
-	SaveScars()
-
-/datum/controller/subsystem/persistence/proc/LoadPanicBunker()
-	var/bunker_path = file("data/bunker_passthrough.json")
-	if(fexists(bunker_path))
-		var/list/json = json_decode(file2text(bunker_path))
-		GLOB.bunker_passthrough = json["data"]
-		for(var/ckey in GLOB.bunker_passthrough)
-			if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days))
-				GLOB.bunker_passthrough -= ckey
-
 /datum/controller/subsystem/persistence/proc/GetPhotoAlbums()
 	var/album_path = file("data/photo_albums.json")
 	if(fexists(album_path))
@@ -330,35 +235,6 @@ SUBSYSTEM_DEF(persistence)

 	WRITE_FILE(frame_path, frame_json)

-/datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
-	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
-	var/list/satchels_to_add = list()
-	for(var/A in new_secret_satchels)
-		var/obj/item/storage/backpack/satchel/flat/F = A
-		if(QDELETED(F) || F.z != SSmapping.station_start || F.invisibility != INVISIBILITY_MAXIMUM)
-			continue
-		var/list/savable_obj = list()
-		for(var/obj/O in F)
-			if(is_type_in_typecache(O, satchel_blacklist) || (O.flags_1 & ADMIN_SPAWNED_1))
-				continue
-			if(O.persistence_replacement)
-				savable_obj += O.persistence_replacement
-			else
-				savable_obj += O.type
-		if(isemptylist(savable_obj))
-			continue
-		var/list/data = list()
-		data["x"] = F.x
-		data["y"] = F.y
-		data["saved_obj"] = pick(savable_obj)
-		satchels_to_add += list(data)
-
-	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
-	var/list/file_data = list()
-	fdel(json_file)
-	file_data["data"] = old_secret_satchels + satchels_to_add
-	WRITE_FILE(json_file, json_encode(file_data))
-
 /datum/controller/subsystem/persistence/proc/CollectChiselMessages()
 	var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")

@@ -374,84 +250,6 @@ SUBSYSTEM_DEF(persistence)
 /datum/controller/subsystem/persistence/proc/SaveChiselMessage(obj/structure/chisel_message/M)
 	saved_messages += list(M.pack()) // dm eats one list

-
-/datum/controller/subsystem/persistence/proc/CollectTrophies()
-	var/json_file = file("data/npc_saves/TrophyItems.json")
-	var/list/file_data = list()
-	file_data["data"] = remove_duplicate_trophies(saved_trophies)
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/SavePanicBunker()
-	var/json_file = file("data/bunker_passthrough.json")
-	var/list/file_data = list()
-	file_data["data"] = GLOB.bunker_passthrough
-	fdel(json_file)
-	WRITE_FILE(json_file,json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/remove_duplicate_trophies(list/trophies)
-	var/list/ukeys = list()
-	. = list()
-	for(var/trophy in trophies)
-		var/tkey = "[trophy["path"]]-[trophy["message"]]"
-		if(ukeys[tkey])
-			continue
-		else
-			. += list(trophy)
-			ukeys[tkey] = TRUE
-
-/datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
-	if(!T.added_roundstart && T.showpiece)
-		var/list/data = list()
-		data["path"] = T.showpiece.type
-		data["message"] = T.trophy_message
-		data["placer_key"] = T.placer_key
-		saved_trophies += list(data)
-
-/datum/controller/subsystem/persistence/proc/CollectRoundtype()
-	saved_modes[3] = saved_modes[2]
-	saved_modes[2] = saved_modes[1]
-	saved_modes[1] = SSticker.mode.config_tag
-	var/json_file = file("data/RecentModes.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_modes
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
-	saved_storytellers.len = 3
-	saved_storytellers[3] = saved_storytellers[2]
-	saved_storytellers[2] = saved_storytellers[1]
-	saved_storytellers[1] = mode.storyteller.name
-	average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
-	var/json_file = file("data/RecentStorytellers.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_storytellers + average_dynamic_threat
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/CollectRulesets(var/datum/game_mode/dynamic/mode)
-	saved_dynamic_rules[3] = saved_dynamic_rules[2]
-	saved_dynamic_rules[2] = saved_dynamic_rules[1]
-	saved_dynamic_rules[1] = list()
-	for(var/r in mode.executed_rules)
-		var/datum/dynamic_ruleset/rule = r
-		saved_dynamic_rules[1] += rule.config_tag
-	var/json_file = file("data/RecentRulesets.json")
-	var/list/file_data = list()
-	file_data["data"] = saved_dynamic_rules
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-/datum/controller/subsystem/persistence/proc/RecordMaps()
-	saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
-	var/json_file = file("data/RecentMaps.json")
-	var/list/file_data = list()
-	file_data["maps"] = saved_maps
-	fdel(json_file)
-	WRITE_FILE(json_file, json_encode(file_data))
-
-
 /datum/controller/subsystem/persistence/proc/CollectAntagReputation()
 	var/ANTAG_REP_MAXIMUM = CONFIG_GET(number/antag_rep_maximum)

--- a/code/controllers/subsystem/persistence/cleanable_debris.dm
+++ b/code/controllers/subsystem/persistence/cleanable_debris.dm
@@ -0,0 +1,177 @@
+/**
+ * Persistence for cleanable debris.
+ */
+/datum/controller/subsystem/persistence
+	/// tracks if we already loaded debris. Unlike everything else, this can actually be a major problem if some badmin procs it twice.
+	var/loaded_debris = FALSE
+
+/datum/controller/subsystem/persistence/LoadMapPersistence()
+	. = ..()
+	if(CONFIG_GET(flag/persistent_debris))
+		LoadMapDebris()
+
+/datum/controller/subsystem/persistence/SaveMapPersistence()
+	. = ..()
+	if(CONFIG_GET(flag/persistent_debris))
+		SaveMapDebris()
+
+/datum/controller/subsystem/persistence/proc/LoadMapDebris()
+	if(CONFIG_GET(flag/persistent_debris_only))
+		wipe_existing_debris()
+	if(!fexists("[get_map_persistence_path()]/debris.json"))
+		return
+	if(loaded_debris)
+		return
+	loaded_debris = TRUE
+	var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+	var/list/allowed_z_cache = list()
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+		allowed_z_cache[num2text(z)] = TRUE
+	var/list/data = json_decode(file2text("[get_map_persistence_path()]/debris.json"))
+	var/list/z_lookup = list()
+	var/loaded = 0
+	var/list/loaded_by_type = list()
+	var/nopath = 0
+	var/badloc = 0
+	var/noturf = 0
+	/// reverse it
+	for(var/z in SSmapping.z_to_station_z_index)
+		var/sz = SSmapping.z_to_station_z_index[z]
+		z_lookup[num2text(sz)] = text2num(z)
+	for(var/z in data)
+		var/actual_z = z_lookup[z]
+		var/list/L1 = data[z]
+		for(var/x in L1)
+			var/list/L2 = data[z][x]
+			for(var/y in L2)
+				var/turf/tile = locate(text2num(x), text2num(y), actual_z)
+				if(!tile)
+					noturf++
+					continue
+				var/list/objects = data[z][x][y]
+				for(var/_L in objects)
+					var/list/objdata
+					var/path
+					if(islist(_L))
+						objdata = _L
+						path = text2path(objdata["__PATH__"])
+					else
+						path = text2path(_L)
+						objdata = objects[_L]
+					if(!path)
+						nopath++
+						continue
+					if(!IsValidDebrisLocation(tile, allowed_turf_typecache, allowed_z_cache, path, TRUE))
+						badloc++
+						continue
+					var/obj/effect/decal/cleanable/instantiated = new path(tile)
+					loaded_by_type[path] += 1
+					loaded++
+					if(objdata)
+						instantiated.PersistenceLoad(objdata)
+	var/list/bytype = list()
+	for(var/path in loaded_by_type)
+		bytype += "[path] - [loaded_by_type[path]]"
+	subsystem_log(
+	{"Debris loading completed:
+	Errors:
+	No path: [nopath]
+	Invalid location: [badloc]
+	No turf on map: [noturf]
+	Total loaded: [loaded]
+	By type:
+	[bytype.Join("\n")]"}
+	)
+
+/datum/controller/subsystem/persistence/proc/SaveMapDebris()
+	if(fexists("[get_map_persistence_path()]/debris.json"))
+		fdel("[get_map_persistence_path()]/debris.json")
+	if(CONFIG_GET(flag/persistent_debris_wipe_on_nuke) && station_was_destroyed)
+		return		// local janitor cheers on nukeop team to save some work
+	var/list/data = list()
+	var/list/z_lookup = SSmapping.z_to_station_z_index
+	var/list/debris = RelevantPersistentDebris()
+	var/obj/effect/decal/cleanable/saving
+	var/global_max = CONFIG_GET(number/persistent_debris_global_max)
+	var/type_max = CONFIG_GET(number/persistent_debris_type_max)
+	var/stored = 0
+	var/list/stored_by_type = list()
+	for(var/i in debris)
+		saving = i
+		var/list/serializing = list()
+		var/path = saving.PersistenceSave(serializing)
+		if(!path)
+			continue
+		if(stored_by_type[path] > type_max)
+			continue
+		var/text_z = num2text(z_lookup[num2text(saving.z)])
+		var/text_y = num2text(saving.y)
+		var/text_x = num2text(saving.x)
+		LAZYINITLIST(data[text_z])
+		LAZYINITLIST(data[text_z][text_x])
+		LAZYINITLIST(data[text_z][text_x][text_y])
+		if(saving.persistence_allow_stacking)
+			serializing["__PATH__"] = path
+			data[text_z][text_x][text_y] += list(serializing)
+		else
+			data[text_z][text_x][text_y][path] = serializing
+		stored++
+		if(stored > global_max)
+			var/w = "Persistent debris saving globally aborted due to global max >= [global_max]. Either janitors never do their jobs or something is wrong."
+			message_admins(w)
+			subsystem_log(w)
+			return
+		stored_by_type[path] = stored_by_type[path]? stored_by_type[path] + 1 : 1
+		if(stored_by_type[path] > type_max)
+			var/w = "Persistent debris saving aborted for type [path] due to type max >= [global_max]. Either janitors never do their jobs or something is wrong."
+			message_admins(w)
+			subsystem_log(w)
+
+	var/list/bytype = list()
+	for(var/path in stored_by_type)
+		bytype += "[path] - [stored_by_type[path]]"
+	subsystem_log(
+ 	{"Debris saving completed:
+	Total: [stored]
+	By type:
+	[bytype.Join("\n")]"}
+	)
+	WRITE_FILE(file("[get_map_persistence_path()]/debris.json"), json_encode(data))
+
+/datum/controller/subsystem/persistence/proc/IsValidDebrisLocation(turf/tile, list/allowed_typecache, list/allowed_zcache, obj/effect/decal/cleanable/type, loading = FALSE)
+	if(!allowed_typecache[tile.type])
+		return FALSE
+	var/area/A = tile.loc
+	if(!A.persistent_debris_allowed)
+		return FALSE
+	if(!allowed_zcache[num2text(tile.z)])
+		return FALSE
+	if(loading)
+		if(!initial(type.persistence_allow_stacking))
+			var/obj/effect/decal/cleanable/C = locate(type) in tile
+			if(!QDELETED(C))
+				return FALSE
+	// Saving verifies allow stacking in the save proc.
+	for(var/obj/structure/window/W in tile)
+		if(W.fulltile)
+			return FALSE
+	return TRUE
+
+/datum/controller/subsystem/persistence/proc/wipe_existing_debris()
+	var/list/existing = RelevantPersistentDebris()
+	QDEL_LIST(existing)
+
+/datum/controller/subsystem/persistence/proc/RelevantPersistentDebris()
+	var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+	var/list/allowed_z_cache = list()
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+		allowed_z_cache[num2text(z)] = TRUE
+	. = list()
+	for(var/obj/effect/decal/cleanable/C in world)
+		if(!C.loc || QDELETED(C))
+			continue
+		if(!C.persistent)
+			continue
+		if(!IsValidDebrisLocation(C.loc, allowed_turf_typecache, allowed_z_cache, C.type, FALSE))
+			continue
+		. += C
--- a/code/controllers/subsystem/persistence/panic_bunker.dm
+++ b/code/controllers/subsystem/persistence/panic_bunker.dm
@@ -0,0 +1,26 @@
+/**
+ * Persists panic bunker whitelisting for a configured period of time
+ */
+/datum/controller/subsystem/persistence/LoadServerPersistence()
+	. = ..()
+	LoadPanicBunker()
+
+/datum/controller/subsystem/persistence/SaveServerPersistence()
+	. = ..()
+	SavePanicBunker()
+
+/datum/controller/subsystem/persistence/proc/LoadPanicBunker()
+	var/bunker_path = file("data/bunker_passthrough.json")
+	if(fexists(bunker_path))
+		var/list/json = json_decode(file2text(bunker_path))
+		GLOB.bunker_passthrough = json["data"]
+		for(var/ckey in GLOB.bunker_passthrough)
+			if(daysSince(GLOB.bunker_passthrough[ckey]) >= CONFIG_GET(number/max_bunker_days))
+				GLOB.bunker_passthrough -= ckey
+
+/datum/controller/subsystem/persistence/proc/SavePanicBunker()
+	var/json_file = file("data/bunker_passthrough.json")
+	var/list/file_data = list()
+	file_data["data"] = GLOB.bunker_passthrough
+	fdel(json_file)
+	WRITE_FILE(json_file,json_encode(file_data))
--- a/code/controllers/subsystem/persistence/poly_parrot.dm
+++ b/code/controllers/subsystem/persistence/poly_parrot.dm
@@ -0,0 +1,11 @@
+/**
+ * Persists poly messages across rounds
+ */
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+	. = ..()
+	LoadPoly()
+
+/datum/controller/subsystem/persistence/proc/LoadPoly()
+	for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.alive_mob_list)
+		twitterize(P.speech_buffer, "polytalk")
+		break //Who's been duping the bird?!
--- a/code/controllers/subsystem/persistence/recent_votes_etc.dm
+++ b/code/controllers/subsystem/persistence/recent_votes_etc.dm
@@ -0,0 +1,107 @@
+/**
+ * Stores recently played gamemodes, maps, etc.
+ */
+/datum/controller/subsystem/persistence
+	var/list/saved_modes = list(1,2,3)
+	var/list/saved_dynamic_rules = list(list(),list(),list())
+	var/list/saved_storytellers = list("foo","bar","baz")
+	var/list/average_dynamic_threat = 50
+	var/list/saved_maps
+
+/datum/controller/subsystem/persistence/SaveServerPersistence()
+	. = ..()
+	CollectRoundtype()
+	if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		CollectStoryteller(mode)
+		CollectRulesets(mode)
+	RecordMaps()
+
+/datum/controller/subsystem/persistence/LoadServerPersistence()
+	. = ..()
+	LoadRecentModes()
+	LoadRecentStorytellers()
+	LoadRecentRulesets()
+	LoadRecentMaps()
+
+/datum/controller/subsystem/persistence/proc/CollectRoundtype()
+	saved_modes[3] = saved_modes[2]
+	saved_modes[2] = saved_modes[1]
+	saved_modes[1] = SSticker.mode.config_tag
+	var/json_file = file("data/RecentModes.json")
+	var/list/file_data = list()
+	file_data["data"] = saved_modes
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/CollectStoryteller(var/datum/game_mode/dynamic/mode)
+	saved_storytellers.len = 3
+	saved_storytellers[3] = saved_storytellers[2]
+	saved_storytellers[2] = saved_storytellers[1]
+	saved_storytellers[1] = mode.storyteller.name
+	average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
+	var/json_file = file("data/RecentStorytellers.json")
+	var/list/file_data = list()
+	file_data["data"] = saved_storytellers + average_dynamic_threat
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/CollectRulesets(var/datum/game_mode/dynamic/mode)
+	saved_dynamic_rules[3] = saved_dynamic_rules[2]
+	saved_dynamic_rules[2] = saved_dynamic_rules[1]
+	saved_dynamic_rules[1] = list()
+	for(var/r in mode.executed_rules)
+		var/datum/dynamic_ruleset/rule = r
+		saved_dynamic_rules[1] += rule.config_tag
+	var/json_file = file("data/RecentRulesets.json")
+	var/list/file_data = list()
+	file_data["data"] = saved_dynamic_rules
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/RecordMaps()
+	saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
+	var/json_file = file("data/RecentMaps.json")
+	var/list/file_data = list()
+	file_data["maps"] = saved_maps
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/LoadRecentModes()
+	var/json_file = file("data/RecentModes.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_modes = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentRulesets()
+	var/json_file = file("data/RecentRulesets.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_dynamic_rules = json["data"]
+
+/datum/controller/subsystem/persistence/proc/LoadRecentStorytellers()
+	var/json_file = file("data/RecentStorytellers.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_storytellers = json["data"]
+	if(saved_storytellers.len > 3)
+		average_dynamic_threat = saved_storytellers[4]
+	saved_storytellers.len = 3
+
+/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
+	var/json_file = file("data/RecentMaps.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_maps = json["maps"]
--- a/code/controllers/subsystem/persistence/secret_satchels.dm
+++ b/code/controllers/subsystem/persistence/secret_satchels.dm
@@ -0,0 +1,79 @@
+/**
+ * Secret satchel persistence - allows storing of items in underfloor satchels that's loaded later.
+ */
+/datum/controller/subsystem/persistence
+	var/list/satchel_blacklist 		= list() //this is a typecache
+	var/list/new_secret_satchels 	= list() //these are objects
+	var/list/old_secret_satchels 	= list()
+
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+	. = ..()
+	LoadSatchels()
+
+/datum/controller/subsystem/persistence/SaveGamePersistence()
+	. = ..()
+	CollectSecretSatchels()
+
+/datum/controller/subsystem/persistence/proc/LoadSatchels()
+	var/placed_satchel = 0
+	var/path
+
+	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+	var/list/json = list()
+	if(fexists(json_file))
+		json = json_decode(file2text(json_file))
+
+	old_secret_satchels = json["data"]
+	var/obj/item/storage/backpack/satchel/flat/F
+	if(old_secret_satchels && old_secret_satchels.len >= 10) //guards against low drop pools assuring that one player cannot reliably find his own gear.
+		var/pos = rand(1, old_secret_satchels.len)
+		F = new()
+		old_secret_satchels.Cut(pos, pos+1 % old_secret_satchels.len)
+		F.x = old_secret_satchels[pos]["x"]
+		F.y = old_secret_satchels[pos]["y"]
+		F.z = SSmapping.station_start
+		path = text2path(old_secret_satchels[pos]["saved_obj"])
+
+	if(F)
+		if(isfloorturf(F.loc) && !isplatingturf(F.loc))
+			F.hide(1)
+		if(ispath(path))
+			var/spawned_item = new path(F)
+			spawned_objects[spawned_item] = TRUE
+		placed_satchel++
+	var/free_satchels = 0
+	for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,SSmapping.station_start), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,SSmapping.station_start)))) //Nontrivially expensive but it's roundstart only
+		if(isfloorturf(T) && !isplatingturf(T))
+			new /obj/item/storage/backpack/satchel/flat/secret(T)
+			free_satchels++
+			if((free_satchels + placed_satchel) == 10) //ten tiles, more than enough to kill anything that moves
+				break
+
+/datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
+	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
+	var/list/satchels_to_add = list()
+	for(var/A in new_secret_satchels)
+		var/obj/item/storage/backpack/satchel/flat/F = A
+		if(QDELETED(F) || F.z != SSmapping.station_start || F.invisibility != INVISIBILITY_MAXIMUM)
+			continue
+		var/list/savable_obj = list()
+		for(var/obj/O in F)
+			if(is_type_in_typecache(O, satchel_blacklist) || (O.flags_1 & ADMIN_SPAWNED_1))
+				continue
+			if(O.persistence_replacement)
+				savable_obj += O.persistence_replacement
+			else
+				savable_obj += O.type
+		if(isemptylist(savable_obj))
+			continue
+		var/list/data = list()
+		data["x"] = F.x
+		data["y"] = F.y
+		data["saved_obj"] = pick(savable_obj)
+		satchels_to_add += list(data)
+
+	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+	var/list/file_data = list()
+	fdel(json_file)
+	file_data["data"] = old_secret_satchels + satchels_to_add
+	WRITE_FILE(json_file, json_encode(file_data))
--- a/code/controllers/subsystem/persistence/trophies.dm
+++ b/code/controllers/subsystem/persistence/trophies.dm
@@ -0,0 +1,84 @@
+/**
+ * Stores trophies in curator display cases
+ */
+/datum/controller/subsystem/persistence
+	var/list/saved_trophies = list()
+
+/datum/controller/subsystem/persistence/LoadGamePersistence()
+	. = ..()
+	LoadTrophies()
+
+/datum/controller/subsystem/persistence/SaveGamePersistence()
+	. = ..()
+	CollectTrophies()
+
+/datum/controller/subsystem/persistence/proc/LoadTrophies()
+	if(fexists("data/npc_saves/TrophyItems.sav")) //legacy compatability to convert old format to new
+		var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
+		var/saved_json
+		S >> saved_json
+		if(!saved_json)
+			return
+		saved_trophies = json_decode(saved_json)
+		fdel("data/npc_saves/TrophyItems.sav")
+	else
+		var/json_file = file("data/npc_saves/TrophyItems.json")
+		if(!fexists(json_file))
+			return
+		var/list/json = json_decode(file2text(json_file))
+		if(!json)
+			return
+		saved_trophies = json["data"]
+	SetUpTrophies(saved_trophies.Copy())
+
+/datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
+	for(var/A in GLOB.trophy_cases)
+		var/obj/structure/displaycase/trophy/T = A
+		if (T.showpiece)
+			continue
+		T.added_roundstart = TRUE
+
+		var/trophy_data = pick_n_take(trophy_items)
+
+		if(!islist(trophy_data))
+			continue
+
+		var/list/chosen_trophy = trophy_data
+
+		if(!chosen_trophy || isemptylist(chosen_trophy)) //Malformed
+			continue
+
+		var/path = text2path(chosen_trophy["path"]) //If the item no longer exist, this returns null
+		if(!path)
+			continue
+
+		T.showpiece = new /obj/item/showpiece_dummy(T, path)
+		T.trophy_message = chosen_trophy["message"]
+		T.placer_key = chosen_trophy["placer_key"]
+		T.update_icon()
+
+/datum/controller/subsystem/persistence/proc/CollectTrophies()
+	var/json_file = file("data/npc_saves/TrophyItems.json")
+	var/list/file_data = list()
+	file_data["data"] = remove_duplicate_trophies(saved_trophies)
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+/datum/controller/subsystem/persistence/proc/remove_duplicate_trophies(list/trophies)
+	var/list/ukeys = list()
+	. = list()
+	for(var/trophy in trophies)
+		var/tkey = "[trophy["path"]]-[trophy["message"]]"
+		if(ukeys[tkey])
+			continue
+		else
+			. += list(trophy)
+			ukeys[tkey] = TRUE
+
+/datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
+	if(!T.added_roundstart && T.showpiece)
+		var/list/data = list()
+		data["path"] = T.showpiece.type
+		data["message"] = T.trophy_message
+		data["placer_key"] = T.placer_key
+		saved_trophies += list(data)