Upstream merge again

code/__defines/mapping.dm

@@ -36,3 +36,5 @@ if(other_init) { \
 #define MAP_TEMPLATE_CATEGORY_EXOPLANET "exoplanet_template"
 #define MAP_TEMPLATE_CATEGORY_SPACE     "space_template"
 #define MAP_TEMPLATE_CATEGORY_AWAYSITE  "awaysite_template"
+///PS13 Template that is spawned as part of the main map, and shouldn't be considered an away site during unit tests.
+#define MAP_TEMPLATE_CATEGORY_MAIN_SITE "main_site_template"

code/__defines/misc.dm

@@ -7,9 +7,20 @@
 #define TURF_IS_HOLOMAP_PATH          BITFLAG(4)
 #define TURF_IS_HOLOMAP_ROCK          BITFLAG(5)
 
-#define TRANSITIONEDGE 7 // Distance from edge to move to another z-level.
+///Width or height of a transition edge area along the map's borders where transition edge turfs are placed to connect levels together.
+#define TRANSITIONEDGE 7
+///Extra spacing needed between any random ruins and the transition edge of a level.
 #define RUIN_MAP_EDGE_PAD 15
 
+///Enum value for a level edge that's to be untouched
+#define LEVEL_EDGE_NONE 0
+///Enum value for a level edge that's to be looped with the opposite edge
+#define LEVEL_EDGE_LOOP 1
+///Enum value for a level edge that's to be filled with a wall filler turfs
+#define LEVEL_EDGE_WALL 2
+///Enum value for a level edge that's to be connected with another z-level
+#define LEVEL_EDGE_CON  3
+
 // Invisibility constants.
 #define INVISIBILITY_LIGHTING    20
 #define INVISIBILITY_LEVEL_ONE   35

code/controllers/configuration.dm

@@ -928,7 +928,12 @@ var/global/list/gamemode_cache = list()
 					config.withdraw_period = value DAYS
 				if("interest_period")
 					config.interest_period = value DAYS
-
+				if("grant_default_darksight")
+					config.grant_default_darksight = TRUE
+				if("default_darksight_range")
+					config.default_darksight_range = max(text2num(value), 0)
+				if("default_darksight_effectiveness")
+					config.default_darksight_effectiveness = clamp(text2num(value), 0, 1)
 				if("interest_mod_delay")
 					config.interest_mod_delay = value DAYS
 				if("withdraw_mod_delay")

code/controllers/subsystems/ambience.dm

@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(ambience)
 
 	if(lit)
 		// Grab what we need to set ambient light from our level handler.
-		var/obj/abstract/level_data/level_data = SSmapping.levels_by_z[z]
+		var/datum/level_data/level_data = SSmapping.levels_by_z[z]
 		if(level_data?.ambient_light_level)
 			set_ambient_light(level_data.ambient_light_color, level_data.ambient_light_level)
 			return TRUE

code/controllers/subsystems/mapping.dm

@@ -81,6 +81,8 @@ SUBSYSTEM_DEF(mapping)
 	// This needs to be non-null even if the overmap isn't created for this map.
 	overmap_event_handler = GET_DECL(/decl/overmap_event_handler)
 
+	//PS13 Build main map sites templates
+	global.using_map.build_main_sites()
 	// Build away sites.
 	global.using_map.build_away_sites()
 
@@ -89,9 +91,9 @@ SUBSYSTEM_DEF(mapping)
 	config.generate_map = TRUE
 #endif
 	for(var/z = 1 to world.maxz)
-		var/obj/abstract/level_data/level = levels_by_z[z]
+		var/datum/level_data/level = levels_by_z[z]
 		if(!istype(level))
-			level = new /obj/abstract/level_data/space(locate(round(world.maxx*0.5), round(world.maxy*0.5), z))
+			level = new /datum/level_data/space(z)
 			PRINT_STACK_TRACE("Missing z-level data object for z[num2text(z)]!")
 		level.setup_level_data()
 
@@ -141,9 +143,10 @@ SUBSYSTEM_DEF(mapping)
 // Z-Level procs after this point.
 /datum/controller/subsystem/mapping/proc/get_gps_level_name(var/z)
 	if(z)
-		var/obj/abstract/level_data/level = levels_by_z[z]
-		if(level?.name)
-			return level.get_gps_level_name()
+		var/datum/level_data/level = levels_by_z[z]
+		. = level.get_display_name()
+		if(length(.))
+			return .
 	return "Unknown Sector"
 
 /datum/controller/subsystem/mapping/proc/reindex_lists()
@@ -162,24 +165,72 @@ SUBSYSTEM_DEF(mapping)
 		PRINT_STACK_TRACE("Missing z-level data type for z["[world.maxz]"]!")
 		return
 
-	var/obj/abstract/level_data/level = new new_level_type(locate(round(world.maxx*0.5), round(world.maxy*0.5), world.maxz), defer_setup)
-	level.initialize_level()
+	var/datum/level_data/level = new new_level_type(world.maxz, defer_setup)
+	level.initialize_new_level()
 	return level
 
 /datum/controller/subsystem/mapping/proc/get_connected_levels(z)
 	if(z <= 0  || z > length(levels_by_z))
 		CRASH("Invalid z-level supplied to get_connected_levels: [isnull(z) ? "NULL" : z]")
-	. = list(z)
+	var/list/root_stack = list(z)
 	// Traverse up and down to get the multiz stack.
 	for(var/level = z, HasBelow(level), level--)
-		. |= level-1
+		root_stack |= level-1
 	for(var/level = z, HasAbove(level), level++)
-		. |= level+1
+		root_stack |= level+1
+	. = list()
 	// Check stack for any laterally connected neighbors.
-	for(var/tz in .)
-		var/obj/abstract/level_data/level = levels_by_z[tz]
+	for(var/tz in root_stack)
+		var/datum/level_data/level = levels_by_z[tz]
 		if(level)
-			level.find_connected_levels(.)
+			var/list/cur_connected = level.get_all_connected_level_z()
+			if(length(cur_connected))
+				. |= cur_connected
+	. |= root_stack
+
+///Returns a list of all the level data of all the connected z levels to the given z.DBColumn
+/datum/controller/subsystem/mapping/proc/get_connected_levels_data(z)
+	if(z <= 0  || z > length(levels_by_z))
+		CRASH("Invalid z-level supplied to get_connected_levels_data: [isnull(z) ? "NULL" : z]")
+	var/list/root_lvl_data = list(levels_by_z[z])
+
+	// Traverse up and down to get the multiz stack.
+	for(var/level = z, HasBelow(level), level--)
+		root_lvl_data |= levels_by_z[level - 1]
+	for(var/level = z, HasAbove(level), level++)
+		root_lvl_data |= levels_by_z[level + 1]
+
+	. = list()
+	// Check stack for any laterally connected neighbors.
+	for(var/datum/level_data/L in root_lvl_data)
+		var/list/cur_connected = L.get_all_connected_level_data()
+		if(length(cur_connected))
+			. |= cur_connected
+	. |= root_lvl_data
+
+/datum/controller/subsystem/mapping/proc/get_connected_levels_ids(z)
+	if(z <= 0  || z > length(levels_by_z))
+		CRASH("Invalid z-level supplied to get_connected_levels_ids: [isnull(z) ? "NULL" : z]")
+	var/datum/level_data/LD = levels_by_z[z]
+	var/list/root_lvl_ids = list(LD.level_id)
+
+	// Traverse up and down to get the multiz stack.
+	for(var/level = z, HasBelow(level), level--)
+		var/datum/level_data/L = levels_by_z[level - 1]
+		root_lvl_ids |= L.level_id
+	for(var/level = z, HasAbove(level), level++)
+		var/datum/level_data/L = levels_by_z[level + 1]
+		root_lvl_ids |= L.level_id
+
+	. = list()
+	// Check stack for any laterally connected neighbors.
+	for(var/id in root_lvl_ids)
+		var/datum/level_data/level = levels_by_id[id]
+		if(level)
+			var/list/cur_connected = level.get_all_connected_level_ids()
+			if(length(cur_connected))
+				. |= cur_connected
+	. |= root_lvl_ids
 
 /datum/controller/subsystem/mapping/proc/are_connected_levels(var/zA, var/zB)
 	if (zA <= 0 || zB <= 0 || zA > world.maxz || zB > world.maxz)
@@ -196,3 +247,56 @@ SUBSYSTEM_DEF(mapping)
 		connected_z_cache.len = zA
 	connected_z_cache[zA] = new_entry
 	return new_entry[zB]
+
+/// Registers all the needed infos from a level_data into the mapping subsystem
+/datum/controller/subsystem/mapping/proc/register_level_data(var/datum/level_data/LD)
+	if(levels_by_z.len < LD.level_z)
+		levels_by_z.len = max(levels_by_z.len, LD.level_z)
+		PRINT_STACK_TRACE("Attempting to initialize a z-level([LD.level_z]) that has not incremented world.maxz.")
+
+	//Assign level z
+	var/datum/level_data/old_level = levels_by_z[LD.level_z]
+	levels_by_z[LD.level_z] = LD
+
+	if(old_level)
+		// Swap out the old one but preserve any relevant references etc.
+		old_level.replace_with(LD)
+		QDEL_NULL(old_level)
+
+	//Setup ID ref
+	if(isnull(LD.level_id))
+		PRINT_STACK_TRACE("Null level_id specified for z[LD.level_z].")
+	else if(LD.level_id in levels_by_id)
+		PRINT_STACK_TRACE("Duplicate level_id '[LD.level_id]' for z[LD.level_z].")
+	else
+		levels_by_id[LD.level_id] = LD
+
+	//Always add base turf for Z. It'll get replaced as needed.
+	base_turf_by_z[LD.level_z] = LD.base_turf || world.turf
+
+	//Add to level flags lookup lists
+	if(LD.level_flags & ZLEVEL_STATION)
+		station_levels |= LD.level_z
+	if(LD.level_flags & ZLEVEL_ADMIN)
+		admin_levels   |= LD.level_z
+	if(LD.level_flags & ZLEVEL_CONTACT)
+		contact_levels |= LD.level_z
+	if(LD.level_flags & ZLEVEL_PLAYER)
+		player_levels  |= LD.level_z
+	if(LD.level_flags & ZLEVEL_SEALED)
+		sealed_levels  |= LD.level_z
+	return TRUE
+
+/datum/controller/subsystem/mapping/proc/unregister_level_data(var/datum/level_data/LD)
+	if(levels_by_z[LD.level_z] == LD)
+		//Clear the level data ref from the list if we're in it.
+		levels_by_z[LD.level_z] = null
+	levels_by_id -= LD.level_id
+
+	base_turf_by_z[LD.level_z] = world.turf
+	station_levels -= LD.level_z
+	admin_levels   -= LD.level_z
+	contact_levels -= LD.level_z
+	player_levels  -= LD.level_z
+	sealed_levels  -= LD.level_z
+	return TRUE

code/controllers/subsystems/zcopy.dm

@@ -432,10 +432,11 @@ SUBSYSTEM_DEF(zcopy)
 		qo_idex = 1
 
 /datum/controller/subsystem/zcopy/proc/flush_z_state(turf/T)
-	if (T.below.mimic_above_copy)
-		QDEL_NULL(T.below.mimic_above_copy)
-	if (T.below.mimic_proxy)
-		QDEL_NULL(T.below.mimic_proxy)
+	if(T.below)
+		if (T.below.mimic_above_copy)
+			QDEL_NULL(T.below.mimic_above_copy)
+		if (T.below.mimic_proxy)
+			QDEL_NULL(T.below.mimic_proxy)
 	for (var/atom/movable/openspace/OO in T)
 		if (istype(OO, /atom/movable/openspace/mimic))
 			qdel(OO)

code/datums/trading/traders/ai.dm

@@ -75,48 +75,49 @@ They sell generic supplies and ask for generic supplies.
 	origin = "Mining Beacon"
 
 	possible_trading_items = list(
-		/obj/item/stack/material/ore =                        TRADER_SUBTYPES_ONLY,
-		/obj/item/stack/material/pane/mapped/glass =          TRADER_ALL,
-		/obj/item/stack/material/pane/mapped/glass/fifty =    TRADER_BLACKLIST,
-		/obj/item/stack/material/ingot/mapped/iron =          TRADER_THIS_TYPE,
-		/obj/item/stack/material/brick/mapped/sandstone =     TRADER_THIS_TYPE,
-		/obj/item/stack/material/brick/mapped/marble =        TRADER_THIS_TYPE,
-		/obj/item/stack/material/gemstone/mapped/diamond =    TRADER_THIS_TYPE,
-		/obj/item/stack/material/puck/mapped/uranium =        TRADER_THIS_TYPE,
-		/obj/item/stack/material/panel/mapped/plastic =       TRADER_THIS_TYPE,
-		/obj/item/stack/material/ingot/mapped/gold =          TRADER_THIS_TYPE,
-		/obj/item/stack/material/ingot/mapped/silver =        TRADER_THIS_TYPE,
-		/obj/item/stack/material/ingot/mapped/platinum =      TRADER_THIS_TYPE,
-		/obj/item/stack/material/segment/mapped/mhydrogen =   TRADER_THIS_TYPE,
-		/obj/item/stack/material/aerogel/mapped/tritium =     TRADER_THIS_TYPE,
-		/obj/item/stack/material/ingot/mapped/osmium =        TRADER_THIS_TYPE,
-		/obj/item/stack/material/sheet/mapped/steel =         TRADER_THIS_TYPE,
+		/obj/item/stack/material/ore                        = TRADER_SUBTYPES_ONLY,
+		/obj/item/stack/material/pane/mapped/glass          = TRADER_ALL,
+		/obj/item/stack/material/pane/mapped/glass/fifty    = TRADER_BLACKLIST,
+		/obj/item/stack/material/ingot/mapped/iron          = TRADER_THIS_TYPE,
+		/obj/item/stack/material/brick/mapped/sandstone     = TRADER_THIS_TYPE,
+		/obj/item/stack/material/brick/mapped/marble        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/gemstone/mapped/diamond    = TRADER_THIS_TYPE,
+		/obj/item/stack/material/puck/mapped/uranium        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/panel/mapped/plastic       = TRADER_THIS_TYPE,
+		/obj/item/stack/material/ingot/mapped/gold          = TRADER_THIS_TYPE,
+		/obj/item/stack/material/ingot/mapped/silver        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/ingot/mapped/platinum      = TRADER_THIS_TYPE,
+		/obj/item/stack/material/segment/mapped/mhydrogen   = TRADER_THIS_TYPE,
+		/obj/item/stack/material/aerogel/mapped/tritium     = TRADER_THIS_TYPE,
+		/obj/item/stack/material/ingot/mapped/osmium        = TRADER_THIS_TYPE,
+		/obj/item/stack/material/sheet/mapped/steel         = TRADER_THIS_TYPE,
 		/obj/item/stack/material/reinforced/mapped/plasteel = TRADER_THIS_TYPE,
-		/obj/machinery/mining =                               TRADER_SUBTYPES_ONLY
+		/obj/machinery/mining                               = TRADER_SUBTYPES_ONLY
 	)
 
 /datum/trader/trading_beacon/manufacturing
 	origin = "Manifacturing Beacon"
 
-	possible_trading_items = list(/obj/structure/aicore             = TRADER_THIS_TYPE,
-								/obj/structure/girder               = TRADER_THIS_TYPE,
-								/obj/structure/grille               = TRADER_THIS_TYPE,
-								/obj/structure/mopbucket            = TRADER_THIS_TYPE,
-								/obj/structure/ore_box              = TRADER_THIS_TYPE,
-								/obj/structure/coatrack             = TRADER_THIS_TYPE,
-								/obj/structure/bookcase             = TRADER_THIS_TYPE,
-								/obj/item/bee_pack                  = TRADER_THIS_TYPE,
-								/obj/item/bee_smoker                = TRADER_THIS_TYPE,
-								/obj/item/beehive_assembly          = TRADER_THIS_TYPE,
-								/obj/item/glass_jar                 = TRADER_THIS_TYPE,
-								/obj/item/honey_frame               = TRADER_THIS_TYPE,
-								/obj/item/target                    = TRADER_ALL,
-								/obj/structure/tank_rack            = TRADER_SUBTYPES_ONLY,
-								/obj/structure/filing_cabinet       = TRADER_THIS_TYPE,
-								/obj/structure/safe                 = TRADER_THIS_TYPE,
-								/obj/structure/plushie              = TRADER_SUBTYPES_ONLY,
-								/obj/structure/sign                 = TRADER_SUBTYPES_ONLY,
-								/obj/structure/sign/double          = TRADER_BLACKLIST_ALL,
-								/obj/structure/sign/goldenplaque    = TRADER_BLACKLIST_ALL,
-								/obj/structure/sign/poster          = TRADER_BLACKLIST
-								)
+	possible_trading_items = list(
+		/obj/structure/aicore            = TRADER_THIS_TYPE,
+		/obj/structure/girder            = TRADER_THIS_TYPE,
+		/obj/structure/grille            = TRADER_THIS_TYPE,
+		/obj/structure/mopbucket         = TRADER_THIS_TYPE,
+		/obj/structure/ore_box           = TRADER_THIS_TYPE,
+		/obj/structure/coatrack          = TRADER_THIS_TYPE,
+		/obj/structure/bookcase          = TRADER_THIS_TYPE,
+		/obj/item/bee_pack               = TRADER_THIS_TYPE,
+		/obj/item/bee_smoker             = TRADER_THIS_TYPE,
+		/obj/item/beehive_assembly       = TRADER_THIS_TYPE,
+		/obj/item/glass_jar              = TRADER_THIS_TYPE,
+		/obj/item/honey_frame            = TRADER_THIS_TYPE,
+		/obj/item/target                 = TRADER_ALL,
+		/obj/structure/tank_rack         = TRADER_SUBTYPES_ONLY,
+		/obj/structure/filing_cabinet    = TRADER_THIS_TYPE,
+		/obj/structure/safe              = TRADER_THIS_TYPE,
+		/obj/structure/plushie           = TRADER_SUBTYPES_ONLY,
+		/obj/structure/sign              = TRADER_SUBTYPES_ONLY,
+		/obj/structure/sign/double       = TRADER_BLACKLIST_ALL,
+		/obj/structure/sign/goldenplaque = TRADER_BLACKLIST_ALL,
+		/obj/structure/sign/poster       = TRADER_BLACKLIST
+	)

code/datums/trading/traders/books.dm

@@ -6,27 +6,29 @@
 	possible_wanted_items = list()
 	price_rng = 30
 
-	possible_trading_items = list(/obj/item/book/skill/organizational/literacy = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/organizational/finance = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/general/eva = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/general/mech = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/general/pilot = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/general/hauling = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/general/computer = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/service/botany = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/service/cooking = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/security/combat = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/security/weapons = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/security/forensics = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/engineering/construction = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/engineering/electrical = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/engineering/atmos = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/engineering/engines = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/research/devices = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/research/science = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/medical/chemistry = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/medical/medicine = TRADER_SUBTYPES_ONLY,
-								/obj/item/book/skill/medical/anatomy = TRADER_SUBTYPES_ONLY)
+	possible_trading_items = list(
+		/obj/item/book/skill/organizational/literacy  = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/organizational/finance   = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/general/eva              = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/general/mech             = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/general/pilot            = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/general/hauling          = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/general/computer         = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/service/botany           = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/service/cooking          = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/security/combat          = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/security/weapons         = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/security/forensics       = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/engineering/construction = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/engineering/electrical   = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/engineering/atmos        = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/engineering/engines      = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/research/devices         = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/research/science         = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/medical/chemistry        = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/medical/medicine         = TRADER_SUBTYPES_ONLY,
+		/obj/item/book/skill/medical/anatomy          = TRADER_SUBTYPES_ONLY
+	)
 
 	speech = list("hail_generic" = "Yes hello hello! Many fine paperstacks for sale! Please buy!",
 					"hail_deny" = "Not in! I'm not here! Go away!!",