diff --git a/code/__defines/mapping.dm b/code/__defines/mapping.dm
index 5cf7407fb5e..d8219fb0c6e 100644
--- a/code/__defines/mapping.dm
+++ b/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"
diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm
index 07f7005f433..2996f20e2bb 100644
--- a/code/__defines/misc.dm
+++ b/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
diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 88e5450eb9c..77fa63d52ad 100644
--- a/code/controllers/configuration.dm
+++ b/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")
diff --git a/code/controllers/subsystems/ambience.dm b/code/controllers/subsystems/ambience.dm
index 6bbe3b27fea..879c6584d8c 100644
--- a/code/controllers/subsystems/ambience.dm
+++ b/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
diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm
index 2aac24ed7eb..38d84944812 100644
--- a/code/controllers/subsystems/mapping.dm
+++ b/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
\ No newline at end of file
diff --git a/code/controllers/subsystems/zcopy.dm b/code/controllers/subsystems/zcopy.dm
index fdadc76814b..058afaa1f3d 100644
--- a/code/controllers/subsystems/zcopy.dm
+++ b/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)
diff --git a/code/datums/trading/traders/ai.dm b/code/datums/trading/traders/ai.dm
index b14cc79939f..a698401b6ed 100644
--- a/code/datums/trading/traders/ai.dm
+++ b/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
- )
\ No newline at end of file
+ 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
+ )
\ No newline at end of file
diff --git a/code/datums/trading/traders/books.dm b/code/datums/trading/traders/books.dm
index 37868196b8a..5bc123f0fa1 100644
--- a/code/datums/trading/traders/books.dm
+++ b/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!!",
diff --git a/code/datums/trading/traders/food.dm b/code/datums/trading/traders/food.dm
index 49fa1e9b218..6325df8a7f4 100644
--- a/code/datums/trading/traders/food.dm
+++ b/code/datums/trading/traders/food.dm
@@ -5,7 +5,7 @@
possible_origins = list("Papa Joe's", "Pizza Ship", "Dominator Pizza", "Little Kaezars", "Pizza Planet", "Cheese Louise", "Little Taste o' Neo-Italy", "Pizza Gestapo")
trade_flags = TRADER_MONEY
possible_wanted_items = list() //They are a pizza shop, not a bargainer.
- possible_trading_items = list(/obj/item/chems/food/sliceable/pizza = TRADER_SUBTYPES_ONLY)
+ possible_trading_items = list(/obj/item/chems/food/sliceable/pizza = TRADER_SUBTYPES_ONLY)
speech = list("hail_generic" = "Hello! Welcome to ORIGIN, may I take your order?",
"hail_deny" = "Beeeep... I'm sorry, your connection has been severed.",
@@ -40,14 +40,15 @@
possible_origins = list("888 Shanghai Kitchen", "Mr. Lee's Greater Hong Kong", "The House of the Venerable and Inscrutable Colonel", "Lucky Dragon")
trade_flags = TRADER_MONEY
possible_wanted_items = list()
- possible_trading_items = list(/obj/item/chems/food/meatkabob = TRADER_THIS_TYPE,
- /obj/item/chems/food/monkeysdelight = TRADER_THIS_TYPE,
- /obj/item/chems/food/ricepudding = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/xenomeatbread/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/soydope = TRADER_THIS_TYPE,
- /obj/item/chems/food/stewedsoymeat = TRADER_THIS_TYPE,
- /obj/item/chems/drinks/dry_ramen = TRADER_THIS_TYPE
- )
+ possible_trading_items = list(
+ /obj/item/chems/food/meatkabob = TRADER_THIS_TYPE,
+ /obj/item/chems/food/monkeysdelight = TRADER_THIS_TYPE,
+ /obj/item/chems/food/ricepudding = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/xenomeatbread/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/soydope = TRADER_THIS_TYPE,
+ /obj/item/chems/food/stewedsoymeat = TRADER_THIS_TYPE,
+ /obj/item/chems/drinks/dry_ramen = TRADER_THIS_TYPE
+ )
var/list/fortunes = list("Today it's up to you to create the peacefulness you long for.",
"If you refuse to accept anything but the best, you very often get it.",
@@ -92,19 +93,20 @@
possible_origins = list("HyTee", "Kreugars", "Spaceway", "Privaxs", "FutureValue", "Phyvendyme", "Seller's Market")
trade_flags = TRADER_MONEY
- possible_trading_items = list(/obj/item/chems/food = TRADER_SUBTYPES_ONLY,
- /obj/item/chems/drinks/cans = TRADER_SUBTYPES_ONLY,
- /obj/item/chems/drinks/bottle = TRADER_SUBTYPES_ONLY,
- /obj/item/chems/drinks/bottle/small = TRADER_BLACKLIST,
- /obj/item/chems/food/checker = TRADER_BLACKLIST_ALL,
- /obj/item/chems/food/fruit_slice = TRADER_BLACKLIST,
- /obj/item/chems/food/slice = TRADER_BLACKLIST_ALL,
- /obj/item/chems/food/grown = TRADER_BLACKLIST_ALL,
- /obj/item/chems/food/human = TRADER_BLACKLIST_ALL,
- /obj/item/chems/food/sliceable/braincake = TRADER_BLACKLIST,
- /obj/item/chems/food/meat/human = TRADER_BLACKLIST,
- /obj/item/chems/food/variable = TRADER_BLACKLIST_ALL
- )
+ possible_trading_items = list(
+ /obj/item/chems/food = TRADER_SUBTYPES_ONLY,
+ /obj/item/chems/drinks/cans = TRADER_SUBTYPES_ONLY,
+ /obj/item/chems/drinks/bottle = TRADER_SUBTYPES_ONLY,
+ /obj/item/chems/drinks/bottle/small = TRADER_BLACKLIST,
+ /obj/item/chems/food/checker = TRADER_BLACKLIST_ALL,
+ /obj/item/chems/food/fruit_slice = TRADER_BLACKLIST,
+ /obj/item/chems/food/slice = TRADER_BLACKLIST_ALL,
+ /obj/item/chems/food/grown = TRADER_BLACKLIST_ALL,
+ /obj/item/chems/food/human = TRADER_BLACKLIST_ALL,
+ /obj/item/chems/food/sliceable/braincake = TRADER_BLACKLIST,
+ /obj/item/chems/food/meat/human = TRADER_BLACKLIST,
+ /obj/item/chems/food/variable = TRADER_BLACKLIST_ALL
+ )
speech = list("hail_generic" = "Hello, welcome to ORIGIN, grocery store of the future!",
"hail_deny" = "I'm sorry, we've blacklisted your communications due to rude behavior.",
@@ -145,20 +147,22 @@
"bribe_refusal" = "Oh ho ho! I'd never think of taking ORIGIN on the road!",
)
- possible_trading_items = list(/obj/item/chems/food/slice/birthdaycake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/carrotcake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/cheesecake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/chocolatecake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/lemoncake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/limecake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/orangecake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/plaincake/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/pumpkinpie/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/slice/bananabread/filled = TRADER_THIS_TYPE,
- /obj/item/chems/food/sliceable = TRADER_SUBTYPES_ONLY,
- /obj/item/chems/food/sliceable/pizza = TRADER_BLACKLIST_ALL,
- /obj/item/chems/food/sliceable/xenomeatbread = TRADER_BLACKLIST,
- /obj/item/chems/food/sliceable/flatdough = TRADER_BLACKLIST,
- /obj/item/chems/food/sliceable/braincake = TRADER_BLACKLIST,
- /obj/item/chems/food/pie = TRADER_THIS_TYPE,
- /obj/item/chems/food/applepie = TRADER_THIS_TYPE)
\ No newline at end of file
+ possible_trading_items = list(
+ /obj/item/chems/food/slice/birthdaycake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/carrotcake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/cheesecake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/chocolatecake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/lemoncake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/limecake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/orangecake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/plaincake/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/pumpkinpie/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/slice/bananabread/filled = TRADER_THIS_TYPE,
+ /obj/item/chems/food/sliceable = TRADER_SUBTYPES_ONLY,
+ /obj/item/chems/food/sliceable/pizza = TRADER_BLACKLIST_ALL,
+ /obj/item/chems/food/sliceable/xenomeatbread = TRADER_BLACKLIST,
+ /obj/item/chems/food/sliceable/flatdough = TRADER_BLACKLIST,
+ /obj/item/chems/food/sliceable/braincake = TRADER_BLACKLIST,
+ /obj/item/chems/food/pie = TRADER_THIS_TYPE,
+ /obj/item/chems/food/applepie = TRADER_THIS_TYPE
+ )
\ No newline at end of file
diff --git a/code/datums/trading/traders/goods.dm b/code/datums/trading/traders/goods.dm
index bc35fc9aece..4a10c72202e 100644
--- a/code/datums/trading/traders/goods.dm
+++ b/code/datums/trading/traders/goods.dm
@@ -71,24 +71,26 @@
"bribe_accept" = "Why not! Glad to be here for a few more minutes.",
)
- possible_trading_items = list(/obj/item/stock_parts/computer/battery_module = TRADER_SUBTYPES_ONLY,
- /obj/item/stock_parts/circuitboard = TRADER_SUBTYPES_ONLY,
- /obj/item/stock_parts/circuitboard/telecomms = TRADER_BLACKLIST,
- /obj/item/stock_parts/circuitboard/unary_atmos = TRADER_BLACKLIST,
- /obj/item/stock_parts/circuitboard/arcade = TRADER_BLACKLIST,
- /obj/item/stock_parts/circuitboard/broken = TRADER_BLACKLIST,
- /obj/item/stack/cable_coil = TRADER_SUBTYPES_ONLY,
- /obj/item/stack/cable_coil/cyborg = TRADER_BLACKLIST,
- /obj/item/stack/cable_coil/random = TRADER_BLACKLIST,
- /obj/item/stack/cable_coil/cut = TRADER_BLACKLIST,
- /obj/item/stock_parts/circuitboard/air_alarm = TRADER_THIS_TYPE,
- /obj/item/stock_parts/circuitboard/airlock_electronics = TRADER_ALL,
- /obj/item/cell = TRADER_THIS_TYPE,
- /obj/item/cell/crap = TRADER_THIS_TYPE,
- /obj/item/cell/high = TRADER_THIS_TYPE,
- /obj/item/cell/super = TRADER_THIS_TYPE,
- /obj/item/cell/hyper = TRADER_THIS_TYPE,
- /obj/item/tracker_electronics = TRADER_THIS_TYPE)
+ possible_trading_items = list(
+ /obj/item/stock_parts/computer/battery_module = TRADER_SUBTYPES_ONLY,
+ /obj/item/stock_parts/circuitboard = TRADER_SUBTYPES_ONLY,
+ /obj/item/stock_parts/circuitboard/telecomms = TRADER_BLACKLIST,
+ /obj/item/stock_parts/circuitboard/unary_atmos = TRADER_BLACKLIST,
+ /obj/item/stock_parts/circuitboard/arcade = TRADER_BLACKLIST,
+ /obj/item/stock_parts/circuitboard/broken = TRADER_BLACKLIST,
+ /obj/item/stack/cable_coil = TRADER_SUBTYPES_ONLY,
+ /obj/item/stack/cable_coil/cyborg = TRADER_BLACKLIST,
+ /obj/item/stack/cable_coil/random = TRADER_BLACKLIST,
+ /obj/item/stack/cable_coil/cut = TRADER_BLACKLIST,
+ /obj/item/stock_parts/circuitboard/air_alarm = TRADER_THIS_TYPE,
+ /obj/item/stock_parts/circuitboard/airlock_electronics = TRADER_ALL,
+ /obj/item/cell = TRADER_THIS_TYPE,
+ /obj/item/cell/crap = TRADER_THIS_TYPE,
+ /obj/item/cell/high = TRADER_THIS_TYPE,
+ /obj/item/cell/super = TRADER_THIS_TYPE,
+ /obj/item/cell/hyper = TRADER_THIS_TYPE,
+ /obj/item/tracker_electronics = TRADER_THIS_TYPE
+ )
/* Clothing stores: each a different type. A hat/glove store, a shoe store, and a jumpsuit store. */
@@ -117,60 +119,66 @@
"bribe_accept" = "Hm.... sure! We'll have a few minutes of 'engine troubles'.",
)
- possible_trading_items = list(/obj/item/clothing/under = TRADER_SUBTYPES_ONLY,
- /obj/item/clothing/under/chameleon = TRADER_BLACKLIST,
- /obj/item/clothing/under/color = TRADER_BLACKLIST,
- /obj/item/clothing/under/dress = TRADER_BLACKLIST,
- /obj/item/clothing/under/gimmick = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/under/lawyer = TRADER_BLACKLIST,
- /obj/item/clothing/under/pj = TRADER_BLACKLIST,
- /obj/item/clothing/under = TRADER_BLACKLIST,
- /obj/item/clothing/pants/shorts = TRADER_BLACKLIST,
- /obj/item/clothing/under/mankini = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/under/syndicate = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/under/tactical = TRADER_BLACKLIST,
- /obj/item/clothing/under/waiter/monke = TRADER_BLACKLIST,
- /obj/item/clothing/under/wedding = TRADER_BLACKLIST,
- /obj/item/clothing/pants/casual/mustangjeans/monke = TRADER_BLACKLIST)
+ possible_trading_items = list(
+ /obj/item/clothing/under = TRADER_SUBTYPES_ONLY,
+ /obj/item/clothing/under/chameleon = TRADER_BLACKLIST,
+ /obj/item/clothing/under/color = TRADER_BLACKLIST,
+ /obj/item/clothing/under/dress = TRADER_BLACKLIST,
+ /obj/item/clothing/under/gimmick = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/under/lawyer = TRADER_BLACKLIST,
+ /obj/item/clothing/under/pj = TRADER_BLACKLIST,
+ /obj/item/clothing/under = TRADER_BLACKLIST,
+ /obj/item/clothing/pants/shorts = TRADER_BLACKLIST,
+ /obj/item/clothing/under/mankini = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/under/syndicate = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/under/tactical = TRADER_BLACKLIST,
+ /obj/item/clothing/under/waiter/monke = TRADER_BLACKLIST,
+ /obj/item/clothing/under/wedding = TRADER_BLACKLIST,
+ /obj/item/clothing/pants/casual/mustangjeans/monke = TRADER_BLACKLIST
+ )
/datum/trader/ship/clothingshop/shoes
possible_origins = list("Foot Safe", "Paysmall", "Popular Footwear", "Grimbly's Shoes", "Right Steps")
- possible_trading_items = list(/obj/item/clothing/shoes = TRADER_SUBTYPES_ONLY,
- /obj/item/clothing/shoes/chameleon = TRADER_BLACKLIST,
- /obj/item/clothing/shoes/jackboots/swat/combat = TRADER_BLACKLIST,
- /obj/item/clothing/shoes/clown_shoes = TRADER_BLACKLIST,
- /obj/item/clothing/shoes/cult = TRADER_BLACKLIST,
- /obj/item/clothing/shoes/lightrig = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/shoes/magboots = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/shoes/jackboots/swat = TRADER_BLACKLIST,
- /obj/item/clothing/shoes/syndigaloshes = TRADER_BLACKLIST)
+ possible_trading_items = list(
+ /obj/item/clothing/shoes = TRADER_SUBTYPES_ONLY,
+ /obj/item/clothing/shoes/chameleon = TRADER_BLACKLIST,
+ /obj/item/clothing/shoes/jackboots/swat/combat = TRADER_BLACKLIST,
+ /obj/item/clothing/shoes/clown_shoes = TRADER_BLACKLIST,
+ /obj/item/clothing/shoes/cult = TRADER_BLACKLIST,
+ /obj/item/clothing/shoes/lightrig = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/shoes/magboots = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/shoes/jackboots/swat = TRADER_BLACKLIST,
+ /obj/item/clothing/shoes/syndigaloshes = TRADER_BLACKLIST
+ )
/datum/trader/ship/clothingshop/hatglovesaccessories
possible_origins = list("Baldie's Hats and Accessories", "The Right Fit", "Like a Glove", "Space Fashion")
- possible_trading_items = list(/obj/item/clothing/accessory = TRADER_ALL,
- /obj/item/clothing/accessory/badge = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/accessory/storage/holster = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/accessory/medal = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/accessory/storage = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/gloves = TRADER_SUBTYPES_ONLY,
- /obj/item/clothing/gloves/lightrig = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/gloves/rig = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/gloves/thick/swat = TRADER_BLACKLIST,
- /obj/item/clothing/gloves/chameleon = TRADER_BLACKLIST,
- /obj/item/clothing/head = TRADER_SUBTYPES_ONLY,
- /obj/item/clothing/head/HoS = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/head/bio_hood = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/head/bomb_hood = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/head/caphat = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/head/centhat = TRADER_BLACKLIST,
- /obj/item/clothing/head/chameleon = TRADER_BLACKLIST,
- /obj/item/clothing/head/collectable = TRADER_BLACKLIST,
- /obj/item/clothing/head/culthood = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/head/helmet = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/head/lightrig = TRADER_BLACKLIST_ALL,
- /obj/item/clothing/head/radiation = TRADER_BLACKLIST,
- /obj/item/clothing/head/warden = TRADER_BLACKLIST,
- /obj/item/clothing/head/welding = TRADER_BLACKLIST)
+ possible_trading_items = list(
+ /obj/item/clothing/accessory = TRADER_ALL,
+ /obj/item/clothing/accessory/badge = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/accessory/storage/holster = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/accessory/medal = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/accessory/storage = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/gloves = TRADER_SUBTYPES_ONLY,
+ /obj/item/clothing/gloves/lightrig = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/gloves/rig = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/gloves/thick/swat = TRADER_BLACKLIST,
+ /obj/item/clothing/gloves/chameleon = TRADER_BLACKLIST,
+ /obj/item/clothing/head = TRADER_SUBTYPES_ONLY,
+ /obj/item/clothing/head/HoS = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/head/bio_hood = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/head/bomb_hood = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/head/caphat = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/head/centhat = TRADER_BLACKLIST,
+ /obj/item/clothing/head/chameleon = TRADER_BLACKLIST,
+ /obj/item/clothing/head/collectable = TRADER_BLACKLIST,
+ /obj/item/clothing/head/culthood = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/head/helmet = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/head/lightrig = TRADER_BLACKLIST_ALL,
+ /obj/item/clothing/head/radiation = TRADER_BLACKLIST,
+ /obj/item/clothing/head/warden = TRADER_BLACKLIST,
+ /obj/item/clothing/head/welding = TRADER_BLACKLIST
+ )
@@ -182,43 +190,45 @@ Sells devices, odds and ends, and medical stuff
name_language = TRADER_DEFAULT_NAME
origin = "Drugstore"
possible_origins = list("Buy 'n Save", "Drug Carnival", "C&B", "Fentles", "Dr. Goods", "Beevees", "McGillicuddy's")
- possible_trading_items = list(/obj/item/flashlight = TRADER_ALL,
- /obj/item/kit/paint = TRADER_SUBTYPES_ONLY,
- /obj/item/aicard = TRADER_THIS_TYPE,
- /obj/item/binoculars = TRADER_THIS_TYPE,
- /obj/item/cable_painter = TRADER_THIS_TYPE,
- /obj/item/flash = TRADER_THIS_TYPE,
- /obj/item/paint_sprayer = TRADER_THIS_TYPE,
- /obj/item/multitool = TRADER_THIS_TYPE,
- /obj/item/lightreplacer = TRADER_THIS_TYPE,
- /obj/item/megaphone = TRADER_THIS_TYPE,
- /obj/item/paicard = TRADER_THIS_TYPE,
- /obj/item/scanner/health = TRADER_THIS_TYPE,
- /obj/item/scanner/breath = TRADER_THIS_TYPE,
- /obj/item/scanner/gas = TRADER_ALL,
- /obj/item/scanner/spectrometer = TRADER_ALL,
- /obj/item/scanner/reagent = TRADER_ALL,
- /obj/item/scanner/xenobio = TRADER_THIS_TYPE,
- /obj/item/suit_cooling_unit = TRADER_THIS_TYPE,
- /obj/item/t_scanner = TRADER_THIS_TYPE,
- /obj/item/taperecorder = TRADER_THIS_TYPE,
- /obj/item/batterer = TRADER_THIS_TYPE,
- /obj/item/synthesized_instrument/violin = TRADER_THIS_TYPE,
- /obj/item/hailer = TRADER_THIS_TYPE,
- /obj/item/uv_light = TRADER_THIS_TYPE,
- /obj/item/mmi = TRADER_ALL,
- /obj/item/robotanalyzer = TRADER_THIS_TYPE,
- /obj/item/chems/toner_cartridge = TRADER_THIS_TYPE,
- /obj/item/camera_film = TRADER_THIS_TYPE,
- /obj/item/camera = TRADER_THIS_TYPE,
- /obj/item/destTagger = TRADER_THIS_TYPE,
- /obj/item/gps = TRADER_THIS_TYPE,
- /obj/item/measuring_tape = TRADER_THIS_TYPE,
- /obj/item/ano_scanner = TRADER_THIS_TYPE,
- /obj/item/core_sampler = TRADER_THIS_TYPE,
- /obj/item/depth_scanner = TRADER_THIS_TYPE,
- /obj/item/pinpointer/radio = TRADER_THIS_TYPE,
- /obj/item/stack/medical/advanced = TRADER_BLACKLIST)
+ possible_trading_items = list(
+ /obj/item/flashlight = TRADER_ALL,
+ /obj/item/kit/paint = TRADER_SUBTYPES_ONLY,
+ /obj/item/aicard = TRADER_THIS_TYPE,
+ /obj/item/binoculars = TRADER_THIS_TYPE,
+ /obj/item/cable_painter = TRADER_THIS_TYPE,
+ /obj/item/flash = TRADER_THIS_TYPE,
+ /obj/item/paint_sprayer = TRADER_THIS_TYPE,
+ /obj/item/multitool = TRADER_THIS_TYPE,
+ /obj/item/lightreplacer = TRADER_THIS_TYPE,
+ /obj/item/megaphone = TRADER_THIS_TYPE,
+ /obj/item/paicard = TRADER_THIS_TYPE,
+ /obj/item/scanner/health = TRADER_THIS_TYPE,
+ /obj/item/scanner/breath = TRADER_THIS_TYPE,
+ /obj/item/scanner/gas = TRADER_ALL,
+ /obj/item/scanner/spectrometer = TRADER_ALL,
+ /obj/item/scanner/reagent = TRADER_ALL,
+ /obj/item/scanner/xenobio = TRADER_THIS_TYPE,
+ /obj/item/suit_cooling_unit = TRADER_THIS_TYPE,
+ /obj/item/t_scanner = TRADER_THIS_TYPE,
+ /obj/item/taperecorder = TRADER_THIS_TYPE,
+ /obj/item/batterer = TRADER_THIS_TYPE,
+ /obj/item/synthesized_instrument/violin = TRADER_THIS_TYPE,
+ /obj/item/hailer = TRADER_THIS_TYPE,
+ /obj/item/uv_light = TRADER_THIS_TYPE,
+ /obj/item/mmi = TRADER_ALL,
+ /obj/item/robotanalyzer = TRADER_THIS_TYPE,
+ /obj/item/chems/toner_cartridge = TRADER_THIS_TYPE,
+ /obj/item/camera_film = TRADER_THIS_TYPE,
+ /obj/item/camera = TRADER_THIS_TYPE,
+ /obj/item/destTagger = TRADER_THIS_TYPE,
+ /obj/item/gps = TRADER_THIS_TYPE,
+ /obj/item/measuring_tape = TRADER_THIS_TYPE,
+ /obj/item/ano_scanner = TRADER_THIS_TYPE,
+ /obj/item/core_sampler = TRADER_THIS_TYPE,
+ /obj/item/depth_scanner = TRADER_THIS_TYPE,
+ /obj/item/pinpointer/radio = TRADER_THIS_TYPE,
+ /obj/item/stack/medical/advanced = TRADER_BLACKLIST
+ )
speech = list("hail_generic" = "Hello, hello! Bits and bobs and everything in between, I hope you find what you're looking for!",
"hail_silicon" = "Ah! Hello, robot. We only sell things that, ah.... people can hold in their hands, unfortunately. You are still allowed to buy, though!",
"hail_deny" = "Oh no. I don't want to deal with YOU.",
@@ -243,10 +253,11 @@ Sells devices, odds and ends, and medical stuff
origin = "Robot Store"
possible_origins = list("AI for the Straight Guy", "Mechanical Buddies", "Bot Chop Shop", "Omni Consumer Projects")
possible_trading_items = list(
- /obj/item/bot_kit = TRADER_THIS_TYPE,
- /obj/item/paicard = TRADER_THIS_TYPE,
- /obj/item/aicard = TRADER_THIS_TYPE,
- /mob/living/bot = TRADER_SUBTYPES_ONLY)
+ /obj/item/bot_kit = TRADER_THIS_TYPE,
+ /obj/item/paicard = TRADER_THIS_TYPE,
+ /obj/item/aicard = TRADER_THIS_TYPE,
+ /mob/living/bot = TRADER_SUBTYPES_ONLY
+ )
speech = list("hail_generic" = "Welcome to ORIGIN! Let me walk you through our fine robotic selection!",
"hail_silicon" = "Welcome to ORIGIN! Let- oh, you're a synth! Well, your money is good anyway. Welcome, welcome!",
"hail_deny" = "ORIGIN no longer wants to speak to you.",
@@ -287,18 +298,21 @@ Sells devices, odds and ends, and medical stuff
"insult_bad" = "I have traded dogs with more bark than that.",
)
- possible_wanted_items = list(/mob/living/simple_animal/tindalos = TRADER_THIS_TYPE,
- /mob/living/simple_animal/tomato = TRADER_THIS_TYPE,
- /mob/living/simple_animal/yithian = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/diyaab = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/shantak= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/samak= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/carp = TRADER_THIS_TYPE)
-
- possible_trading_items = list(/mob/living/simple_animal/hostile/carp= TRADER_THIS_TYPE,
- /obj/item/dociler = TRADER_THIS_TYPE,
- /obj/item/beartrap = TRADER_THIS_TYPE,
- /obj/item/scanner/xenobio = TRADER_THIS_TYPE)
+ possible_wanted_items = list(
+ /mob/living/simple_animal/tindalos = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/tomato = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/yithian = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/diyaab = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/shantak = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/samak = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/carp = TRADER_THIS_TYPE
+ )
+ possible_trading_items = list(
+ /mob/living/simple_animal/hostile/carp = TRADER_THIS_TYPE,
+ /obj/item/dociler = TRADER_THIS_TYPE,
+ /obj/item/beartrap = TRADER_THIS_TYPE,
+ /obj/item/scanner/xenobio = TRADER_THIS_TYPE
+ )
/datum/trader/medical
name = "Medical Supplier"
@@ -323,35 +337,37 @@ Sells devices, odds and ends, and medical stuff
"insult_bad" = "*muffled laughter* Sorry, was that you trying to talk shit? Adorable.",
)
- possible_wanted_items = list(/obj/item/chems/drinks/bottle = TRADER_THIS_TYPE,
- /obj/item/organ/internal/liver = TRADER_THIS_TYPE,
- /obj/item/organ/internal/kidneys = TRADER_THIS_TYPE,
- /obj/item/organ/internal/lungs = TRADER_THIS_TYPE,
- /obj/item/organ/internal/heart = TRADER_THIS_TYPE,
- /obj/item/storage/fancy/cigarettes = TRADER_ALL
- )
-
- possible_trading_items = list(/obj/item/storage/pill_bottle = TRADER_SUBTYPES_ONLY,
- /obj/item/storage/firstaid/fire = TRADER_THIS_TYPE,
- /obj/item/storage/firstaid/toxin = TRADER_THIS_TYPE,
- /obj/item/storage/firstaid/adv = TRADER_THIS_TYPE,
- /obj/item/storage/box/bloodpacks = TRADER_THIS_TYPE,
- /obj/item/chems/ivbag = TRADER_SUBTYPES_ONLY,
- /obj/item/retractor = TRADER_THIS_TYPE,
- /obj/item/hemostat = TRADER_THIS_TYPE,
- /obj/item/cautery = TRADER_THIS_TYPE,
- /obj/item/surgicaldrill = TRADER_THIS_TYPE,
- /obj/item/scalpel = TRADER_THIS_TYPE,
- /obj/item/incision_manager = TRADER_THIS_TYPE,
- /obj/item/circular_saw = TRADER_THIS_TYPE,
- /obj/item/bonegel = TRADER_THIS_TYPE,
- /obj/item/bonesetter = TRADER_THIS_TYPE,
- /obj/item/chems/glass/bottle/stabilizer = TRADER_THIS_TYPE,
- /obj/item/chems/glass/bottle/sedatives = TRADER_THIS_TYPE,
- /obj/item/chems/glass/bottle/antitoxin = TRADER_THIS_TYPE,
- /obj/item/bodybag/cryobag = TRADER_THIS_TYPE,
- /obj/item/sign/medipolma = TRADER_THIS_TYPE
- )
+ possible_wanted_items = list(
+ /obj/item/chems/drinks/bottle = TRADER_THIS_TYPE,
+ /obj/item/organ/internal/liver = TRADER_THIS_TYPE,
+ /obj/item/organ/internal/kidneys = TRADER_THIS_TYPE,
+ /obj/item/organ/internal/lungs = TRADER_THIS_TYPE,
+ /obj/item/organ/internal/heart = TRADER_THIS_TYPE,
+ /obj/item/storage/fancy/cigarettes = TRADER_ALL
+ )
+
+ possible_trading_items = list(
+ /obj/item/storage/pill_bottle = TRADER_SUBTYPES_ONLY,
+ /obj/item/storage/firstaid/fire = TRADER_THIS_TYPE,
+ /obj/item/storage/firstaid/toxin = TRADER_THIS_TYPE,
+ /obj/item/storage/firstaid/adv = TRADER_THIS_TYPE,
+ /obj/item/storage/box/bloodpacks = TRADER_THIS_TYPE,
+ /obj/item/chems/ivbag = TRADER_SUBTYPES_ONLY,
+ /obj/item/retractor = TRADER_THIS_TYPE,
+ /obj/item/hemostat = TRADER_THIS_TYPE,
+ /obj/item/cautery = TRADER_THIS_TYPE,
+ /obj/item/surgicaldrill = TRADER_THIS_TYPE,
+ /obj/item/scalpel = TRADER_THIS_TYPE,
+ /obj/item/incision_manager = TRADER_THIS_TYPE,
+ /obj/item/circular_saw = TRADER_THIS_TYPE,
+ /obj/item/bonegel = TRADER_THIS_TYPE,
+ /obj/item/bonesetter = TRADER_THIS_TYPE,
+ /obj/item/chems/glass/bottle/stabilizer = TRADER_THIS_TYPE,
+ /obj/item/chems/glass/bottle/sedatives = TRADER_THIS_TYPE,
+ /obj/item/chems/glass/bottle/antitoxin = TRADER_THIS_TYPE,
+ /obj/item/bodybag/cryobag = TRADER_THIS_TYPE,
+ /obj/item/sign/medipolma = TRADER_THIS_TYPE
+ )
/datum/trader/mining
name = "Rock'n'Drill Mining Inc"
@@ -377,19 +393,19 @@ Sells devices, odds and ends, and medical stuff
)
possible_wanted_items = list(
- /obj/item/stack/material/ore = TRADER_SUBTYPES_ONLY,
- /obj/item/disk/survey = TRADER_THIS_TYPE,
- /obj/item/stack/material/ore/slag = TRADER_BLACKLIST
+ /obj/item/stack/material/ore = TRADER_SUBTYPES_ONLY,
+ /obj/item/disk/survey = TRADER_THIS_TYPE,
+ /obj/item/stack/material/ore/slag = TRADER_BLACKLIST
)
possible_trading_items = list(
- /obj/machinery/mining/drill = TRADER_THIS_TYPE,
- /obj/machinery/mining/brace = TRADER_THIS_TYPE,
- /obj/machinery/floodlight = TRADER_THIS_TYPE,
- /obj/item/storage/box/greenglowsticks = TRADER_THIS_TYPE,
+ /obj/machinery/mining/drill = TRADER_THIS_TYPE,
+ /obj/machinery/mining/brace = TRADER_THIS_TYPE,
+ /obj/machinery/floodlight = TRADER_THIS_TYPE,
+ /obj/item/storage/box/greenglowsticks = TRADER_THIS_TYPE,
/obj/item/clothing/suit/space/void/engineering/salvage/prepared = TRADER_THIS_TYPE,
- /obj/item/stack/material/puck/mapped/uranium/ten = TRADER_THIS_TYPE,
- /obj/item/stack/material/reinforced/mapped/plasteel/fifty = TRADER_THIS_TYPE,
- /obj/item/stack/material/sheet/mapped/steel/fifty = TRADER_THIS_TYPE,
- /obj/item/stack/material/ingot/mapped/copper/fifty = TRADER_THIS_TYPE
+ /obj/item/stack/material/puck/mapped/uranium/ten = TRADER_THIS_TYPE,
+ /obj/item/stack/material/reinforced/mapped/plasteel/fifty = TRADER_THIS_TYPE,
+ /obj/item/stack/material/sheet/mapped/steel/fifty = TRADER_THIS_TYPE,
+ /obj/item/stack/material/ingot/mapped/copper/fifty = TRADER_THIS_TYPE
)
diff --git a/code/datums/trading/traders/misc.dm b/code/datums/trading/traders/misc.dm
index e53ed1417c8..80b69e2dbb5 100644
--- a/code/datums/trading/traders/misc.dm
+++ b/code/datums/trading/traders/misc.dm
@@ -23,47 +23,51 @@
"bribe_accept" = "Hm. It'll be good for the animals, so sure.",
)
- possible_wanted_items = list(/mob/living/simple_animal/corgi = TRADER_THIS_TYPE,
- /mob/living/simple_animal/cat = TRADER_THIS_TYPE,
- /mob/living/simple_animal/crab = TRADER_THIS_TYPE,
- /mob/living/simple_animal/lizard = TRADER_THIS_TYPE,
- /mob/living/simple_animal/mouse = TRADER_THIS_TYPE,
- /mob/living/simple_animal/mushroom = TRADER_THIS_TYPE,
- /mob/living/simple_animal/tindalos = TRADER_THIS_TYPE,
- /mob/living/simple_animal/tomato = TRADER_THIS_TYPE,
- /mob/living/simple_animal/cow = TRADER_THIS_TYPE,
- /mob/living/simple_animal/chick = TRADER_THIS_TYPE,
- /mob/living/simple_animal/chicken = TRADER_THIS_TYPE,
- /mob/living/simple_animal/yithian = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/diyaab = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/bear= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/shantak= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/parrot = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/samak= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/goat = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/carp = TRADER_THIS_TYPE)
+ possible_wanted_items = list(
+ /mob/living/simple_animal/corgi = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/cat = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/crab = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/lizard = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/mouse = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/mushroom = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/tindalos = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/tomato = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/cow = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/chick = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/chicken = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/yithian = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/diyaab = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/bear = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/shantak = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/parrot = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/samak = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/goat = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/carp = TRADER_THIS_TYPE
+ )
- possible_trading_items = list(/mob/living/simple_animal/corgi = TRADER_THIS_TYPE,
- /mob/living/simple_animal/cat = TRADER_THIS_TYPE,
- /mob/living/simple_animal/crab = TRADER_THIS_TYPE,
- /mob/living/simple_animal/lizard = TRADER_THIS_TYPE,
- /mob/living/simple_animal/mouse = TRADER_THIS_TYPE,
- /mob/living/simple_animal/mushroom = TRADER_THIS_TYPE,
- /mob/living/simple_animal/tindalos = TRADER_THIS_TYPE,
- /mob/living/simple_animal/tomato = TRADER_THIS_TYPE,
- /mob/living/simple_animal/cow = TRADER_THIS_TYPE,
- /mob/living/simple_animal/chick = TRADER_THIS_TYPE,
- /mob/living/simple_animal/chicken = TRADER_THIS_TYPE,
- /mob/living/simple_animal/yithian = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/diyaab = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/bear= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/shantak= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/parrot = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/beast/samak= TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/retaliate/goat = TRADER_THIS_TYPE,
- /mob/living/simple_animal/hostile/carp= TRADER_THIS_TYPE,
- /obj/item/dociler = TRADER_THIS_TYPE,
- /obj/structure/dogbed = TRADER_THIS_TYPE)
+ possible_trading_items = list(
+ /mob/living/simple_animal/corgi = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/cat = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/crab = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/lizard = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/mouse = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/mushroom = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/tindalos = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/tomato = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/cow = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/chick = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/chicken = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/yithian = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/diyaab = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/bear = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/shantak = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/parrot = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/beast/samak = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/retaliate/goat = TRADER_THIS_TYPE,
+ /mob/living/simple_animal/hostile/carp = TRADER_THIS_TYPE,
+ /obj/item/dociler = TRADER_THIS_TYPE,
+ /obj/structure/dogbed = TRADER_THIS_TYPE
+ )
/datum/trader/ship/prank_shop
name = "Prank Shop Owner"
@@ -89,21 +93,23 @@
"bribe_refusal" = "We are sorry, but we cannot accept.",
"bribe_accept" = "We are happy to say that we accept this bribe.",
)
- possible_trading_items = list(/obj/item/clothing/mask/gas/clown_hat = TRADER_THIS_TYPE,
- /obj/item/clothing/mask/gas/mime = TRADER_THIS_TYPE,
- /obj/item/clothing/shoes/clown_shoes = TRADER_THIS_TYPE,
- /obj/item/clothing/under/clown = TRADER_THIS_TYPE,
- /obj/item/stamp/clown = TRADER_THIS_TYPE,
- /obj/item/storage/backpack/clown = TRADER_THIS_TYPE,
- /obj/item/bananapeel = TRADER_THIS_TYPE,
- /obj/item/gun/launcher/money = TRADER_THIS_TYPE,
- /obj/item/chems/food/pie = TRADER_THIS_TYPE,
- /obj/item/bikehorn = TRADER_THIS_TYPE,
- /obj/item/chems/spray/waterflower = TRADER_THIS_TYPE,
- /obj/item/gun/launcher/pneumatic/small = TRADER_THIS_TYPE,
- /obj/item/gun/projectile/revolver/capgun = TRADER_THIS_TYPE,
- /obj/item/clothing/mask/fakemoustache = TRADER_THIS_TYPE,
- /obj/item/grenade/spawnergrenade/fake_carp = TRADER_THIS_TYPE)
+ possible_trading_items = list(
+ /obj/item/clothing/mask/gas/clown_hat = TRADER_THIS_TYPE,
+ /obj/item/clothing/mask/gas/mime = TRADER_THIS_TYPE,
+ /obj/item/clothing/shoes/clown_shoes = TRADER_THIS_TYPE,
+ /obj/item/clothing/under/clown = TRADER_THIS_TYPE,
+ /obj/item/stamp/clown = TRADER_THIS_TYPE,
+ /obj/item/storage/backpack/clown = TRADER_THIS_TYPE,
+ /obj/item/bananapeel = TRADER_THIS_TYPE,
+ /obj/item/gun/launcher/money = TRADER_THIS_TYPE,
+ /obj/item/chems/food/pie = TRADER_THIS_TYPE,
+ /obj/item/bikehorn = TRADER_THIS_TYPE,
+ /obj/item/chems/spray/waterflower = TRADER_THIS_TYPE,
+ /obj/item/gun/launcher/pneumatic/small = TRADER_THIS_TYPE,
+ /obj/item/gun/projectile/revolver/capgun = TRADER_THIS_TYPE,
+ /obj/item/clothing/mask/fakemoustache = TRADER_THIS_TYPE,
+ /obj/item/grenade/spawnergrenade/fake_carp = TRADER_THIS_TYPE
+ )
/datum/trader/ship/replica_shop
name = "Replica Store Owner"
@@ -127,27 +133,29 @@
"bribe_refusal" = "Alas, traveler - I could stay all eve, but I've an client in waiting, and they are not known for patience.",
"bribe_accept" = "Mayhaps I could set a spell longer, and rest my weary feet.",
)
- possible_trading_items = list(/obj/item/clothing/head/wizard/magus = TRADER_THIS_TYPE,
- /obj/item/shield/buckler = TRADER_THIS_TYPE,
- /obj/item/clothing/head/redcoat = TRADER_THIS_TYPE,
- /obj/item/clothing/head/powdered_wig = TRADER_THIS_TYPE,
- /obj/item/clothing/head/hasturhood = TRADER_THIS_TYPE,
- /obj/item/clothing/head/helmet/gladiator=TRADER_THIS_TYPE,
- /obj/item/clothing/head/plaguedoctorhat= TRADER_THIS_TYPE,
- /obj/item/clothing/glasses/eyepatch/monocle = TRADER_THIS_TYPE,
- /obj/item/clothing/mask/smokable/pipe = TRADER_THIS_TYPE,
- /obj/item/clothing/mask/gas/plaguedoctor=TRADER_THIS_TYPE,
- /obj/item/clothing/suit/hastur = TRADER_THIS_TYPE,
- /obj/item/clothing/suit/imperium_monk = TRADER_THIS_TYPE,
- /obj/item/clothing/suit/judgerobe = TRADER_THIS_TYPE,
- /obj/item/clothing/suit/wizrobe/magusred=TRADER_THIS_TYPE,
- /obj/item/clothing/suit/wizrobe/magusblue=TRADER_THIS_TYPE,
- /obj/item/clothing/under/gladiator = TRADER_THIS_TYPE,
- /obj/item/clothing/under/kilt = TRADER_THIS_TYPE,
- /obj/item/clothing/under/redcoat = TRADER_THIS_TYPE,
- /obj/item/clothing/under/soviet = TRADER_THIS_TYPE,
- /obj/item/harpoon = TRADER_THIS_TYPE,
- /obj/item/sword = TRADER_ALL,
- /obj/item/scythe = TRADER_THIS_TYPE,
- /obj/item/star = TRADER_THIS_TYPE,
- /obj/item/twohanded/baseballbat = TRADER_THIS_TYPE)
\ No newline at end of file
+ possible_trading_items = list(
+ /obj/item/clothing/head/wizard/magus = TRADER_THIS_TYPE,
+ /obj/item/shield/buckler = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/redcoat = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/powdered_wig = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/hasturhood = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/helmet/gladiator = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/plaguedoctorhat = TRADER_THIS_TYPE,
+ /obj/item/clothing/glasses/eyepatch/monocle = TRADER_THIS_TYPE,
+ /obj/item/clothing/mask/smokable/pipe = TRADER_THIS_TYPE,
+ /obj/item/clothing/mask/gas/plaguedoctor = TRADER_THIS_TYPE,
+ /obj/item/clothing/suit/hastur = TRADER_THIS_TYPE,
+ /obj/item/clothing/suit/imperium_monk = TRADER_THIS_TYPE,
+ /obj/item/clothing/suit/judgerobe = TRADER_THIS_TYPE,
+ /obj/item/clothing/suit/wizrobe/magusred = TRADER_THIS_TYPE,
+ /obj/item/clothing/suit/wizrobe/magusblue = TRADER_THIS_TYPE,
+ /obj/item/clothing/under/gladiator = TRADER_THIS_TYPE,
+ /obj/item/clothing/under/kilt = TRADER_THIS_TYPE,
+ /obj/item/clothing/under/redcoat = TRADER_THIS_TYPE,
+ /obj/item/clothing/under/soviet = TRADER_THIS_TYPE,
+ /obj/item/harpoon = TRADER_THIS_TYPE,
+ /obj/item/sword = TRADER_ALL,
+ /obj/item/scythe = TRADER_THIS_TYPE,
+ /obj/item/star = TRADER_THIS_TYPE,
+ /obj/item/twohanded/baseballbat = TRADER_THIS_TYPE
+ )
\ No newline at end of file
diff --git a/code/datums/trading/traders/unique.dm b/code/datums/trading/traders/unique.dm
index 66b3d8b6732..b4a4cc110c8 100644
--- a/code/datums/trading/traders/unique.dm
+++ b/code/datums/trading/traders/unique.dm
@@ -30,13 +30,14 @@
origin = "SGS Severance"
possible_wanted_items = list(
- /obj/item/chems/food/human = TRADER_SUBTYPES_ONLY,
- /obj/item/chems/food/meat/human = TRADER_THIS_TYPE,
- /mob/living/carbon/human = TRADER_ALL
- )
+ /obj/item/chems/food/human = TRADER_SUBTYPES_ONLY,
+ /obj/item/chems/food/meat/human = TRADER_THIS_TYPE,
+ /mob/living/carbon/human = TRADER_ALL
+ )
- possible_trading_items = list(/obj/item/gun/projectile/automatic = TRADER_SUBTYPES_ONLY
- )
+ possible_trading_items = list(
+ /obj/item/gun/projectile/automatic = TRADER_SUBTYPES_ONLY
+ )
blacklisted_trade_items = null
@@ -62,9 +63,13 @@
name = "Bobo"
origin = "Floating rock"
- possible_wanted_items = list(/obj/item/stack/material/ore = TRADER_ALL)
- possible_trading_items = list(/obj/machinery/power/supermatter = TRADER_ALL,
- /obj/item/aiModule = TRADER_SUBTYPES_ONLY)
+ possible_wanted_items = list(
+ /obj/item/stack/material/ore = TRADER_ALL
+ )
+ possible_trading_items = list(
+ /obj/machinery/power/supermatter = TRADER_ALL,
+ /obj/item/aiModule = TRADER_SUBTYPES_ONLY
+ )
want_multiplier = 5000
speech = list("hail_generic" = "Blub am MERCHANT. Blub hunger for things. Boo bring them to blub, yes?",
@@ -91,25 +96,27 @@
possible_origins = list("An indistinct location", "Unknown location", "The Diamond Sphere", "Beyond the Veil", "Deadverse")
name_language = TRADER_DEFAULT_NAME
- possible_wanted_items = list(/mob/living/simple_animal/construct = TRADER_SUBTYPES_ONLY,
- /obj/item/sword/cultblade = TRADER_THIS_TYPE,
- /obj/item/clothing/head/culthood = TRADER_ALL,
- /obj/item/clothing/suit/space/cult = TRADER_ALL,
- /obj/item/clothing/suit/cultrobes = TRADER_ALL,
- /obj/item/clothing/head/helmet/space/cult = TRADER_ALL,
- /obj/structure/cult = TRADER_SUBTYPES_ONLY,
- /obj/structure/constructshell = TRADER_ALL,
- /mob/living/simple_animal/familiar = TRADER_SUBTYPES_ONLY,
- /mob/living/simple_animal/familiar/pet = TRADER_BLACKLIST,
- /mob/living/simple_animal/hostile/mimic = TRADER_ALL)
-
- possible_trading_items = list(/obj/item/clothing/gloves/wizard = TRADER_THIS_TYPE,
- /obj/item/clothing/head/helmet/space/void/wizard = TRADER_THIS_TYPE,
- /obj/item/clothing/head/wizard = TRADER_ALL,
- /obj/item/clothing/suit/space/void/wizard = TRADER_THIS_TYPE,
- /obj/item/toy/figure/wizard = TRADER_THIS_TYPE,
- /obj/item/staff = TRADER_ALL,
- ) //Probably see about getting some more wizard based shit
+ possible_wanted_items = list(
+ /mob/living/simple_animal/construct = TRADER_SUBTYPES_ONLY,
+ /obj/item/sword/cultblade = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/culthood = TRADER_ALL,
+ /obj/item/clothing/suit/space/cult = TRADER_ALL,
+ /obj/item/clothing/suit/cultrobes = TRADER_ALL,
+ /obj/item/clothing/head/helmet/space/cult = TRADER_ALL,
+ /obj/structure/cult = TRADER_SUBTYPES_ONLY,
+ /obj/structure/constructshell = TRADER_ALL,
+ /mob/living/simple_animal/familiar = TRADER_SUBTYPES_ONLY,
+ /mob/living/simple_animal/familiar/pet = TRADER_BLACKLIST,
+ /mob/living/simple_animal/hostile/mimic = TRADER_ALL
+ )
+ possible_trading_items = list(
+ /obj/item/clothing/gloves/wizard = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/helmet/space/void/wizard = TRADER_THIS_TYPE,
+ /obj/item/clothing/head/wizard = TRADER_ALL,
+ /obj/item/clothing/suit/space/void/wizard = TRADER_THIS_TYPE,
+ /obj/item/toy/figure/wizard = TRADER_THIS_TYPE,
+ /obj/item/staff = TRADER_ALL,
+ ) //Probably see about getting some more wizard based shit
speech = list("hail_generic" = "Hello! Are you here on pleasure or business?",
"hail_Golem" = "Interesting... how incredibly interesting... come! Let us do business!",
diff --git a/code/datums/trading/traders/weaponry.dm b/code/datums/trading/traders/weaponry.dm
index 1d2872f219a..2f9d25d5c04 100644
--- a/code/datums/trading/traders/weaponry.dm
+++ b/code/datums/trading/traders/weaponry.dm
@@ -18,15 +18,17 @@
"insult_bad" = "If I had my gun I'd shoot you!"
)
- possible_trading_items = list(/obj/item/gun/projectile/pistol/holdout = TRADER_ALL,
- /obj/item/gun/projectile/shotgun/pump= TRADER_SUBTYPES_ONLY,
- /obj/item/ammo_magazine = TRADER_SUBTYPES_ONLY,
- /obj/item/ammo_magazine/rifle/empty = TRADER_BLACKLIST,
- /obj/item/ammo_magazine/pistol/small/empty = TRADER_BLACKLIST,
- /obj/item/ammo_magazine/pistol/empty = TRADER_BLACKLIST,
- /obj/item/ammo_magazine/box/pistol/empty = TRADER_BLACKLIST,
- /obj/item/ammo_magazine/smg/empty = TRADER_BLACKLIST,
- /obj/item/clothing/accessory/storage/holster = TRADER_ALL)
+ possible_trading_items = list(
+ /obj/item/gun/projectile/pistol/holdout = TRADER_ALL,
+ /obj/item/gun/projectile/shotgun/pump = TRADER_SUBTYPES_ONLY,
+ /obj/item/ammo_magazine = TRADER_SUBTYPES_ONLY,
+ /obj/item/ammo_magazine/rifle/empty = TRADER_BLACKLIST,
+ /obj/item/ammo_magazine/pistol/small/empty = TRADER_BLACKLIST,
+ /obj/item/ammo_magazine/pistol/empty = TRADER_BLACKLIST,
+ /obj/item/ammo_magazine/box/pistol/empty = TRADER_BLACKLIST,
+ /obj/item/ammo_magazine/smg/empty = TRADER_BLACKLIST,
+ /obj/item/clothing/accessory/storage/holster = TRADER_ALL
+ )
/datum/trader/ship/egunshop
name = "Energy Gun Shop Employee"
@@ -48,16 +50,18 @@
"insult_bad" = "That's... very mean. I won't think twice about blacklisting your channel, so stop."
)
- possible_trading_items = list(/obj/item/gun/energy/taser = TRADER_THIS_TYPE,
- /obj/item/gun/energy/xray = TRADER_THIS_TYPE,
- /obj/item/gun/energy/laser = TRADER_THIS_TYPE,
- /obj/item/gun/energy/gun = TRADER_THIS_TYPE,
- /obj/item/cell = TRADER_THIS_TYPE,
- /obj/item/cell/crap = TRADER_THIS_TYPE,
- /obj/item/cell/high = TRADER_THIS_TYPE,
- /obj/item/cell/super = TRADER_THIS_TYPE,
- /obj/item/cell/hyper = TRADER_THIS_TYPE,
- /obj/item/clothing/accessory/storage/holster = TRADER_ALL)
+ possible_trading_items = list(
+ /obj/item/gun/energy/taser = TRADER_THIS_TYPE,
+ /obj/item/gun/energy/xray = TRADER_THIS_TYPE,
+ /obj/item/gun/energy/laser = TRADER_THIS_TYPE,
+ /obj/item/gun/energy/gun = TRADER_THIS_TYPE,
+ /obj/item/cell = TRADER_THIS_TYPE,
+ /obj/item/cell/crap = TRADER_THIS_TYPE,
+ /obj/item/cell/high = TRADER_THIS_TYPE,
+ /obj/item/cell/super = TRADER_THIS_TYPE,
+ /obj/item/cell/hyper = TRADER_THIS_TYPE,
+ /obj/item/clothing/accessory/storage/holster = TRADER_ALL
+ )
/datum/trader/dogan
name = "Dogan"
@@ -79,8 +83,10 @@
compliment_increase = 0
insult_drop = 0
- possible_trading_items = list(/obj/item/gun/projectile/zipgun = TRADER_THIS_TYPE,
- /obj/item/gun/projectile/bolt_action/sniper/ant = TRADER_THIS_TYPE,
- /obj/item/gun/energy/laser/dogan = TRADER_THIS_TYPE,
- /obj/item/gun/projectile/automatic/smg/usi = TRADER_THIS_TYPE,
- /obj/item/clothing/accessory/storage/holster = TRADER_ALL)
\ No newline at end of file
+ possible_trading_items = list(
+ /obj/item/gun/projectile/zipgun = TRADER_THIS_TYPE,
+ /obj/item/gun/projectile/bolt_action/sniper/ant = TRADER_THIS_TYPE,
+ /obj/item/gun/energy/laser/dogan = TRADER_THIS_TYPE,
+ /obj/item/gun/projectile/automatic/smg/usi = TRADER_THIS_TYPE,
+ /obj/item/clothing/accessory/storage/holster = TRADER_ALL
+ )
diff --git a/code/game/gamemodes/endgame/ftl_jump/ftl_jump.dm b/code/game/gamemodes/endgame/ftl_jump/ftl_jump.dm
index fae76f7aadc..ebb26b19070 100644
--- a/code/game/gamemodes/endgame/ftl_jump/ftl_jump.dm
+++ b/code/game/gamemodes/endgame/ftl_jump/ftl_jump.dm
@@ -9,12 +9,12 @@
affected_levels = zlevels
/datum/universal_state/jump/OnEnter()
- var/obj/abstract/level_data/space_zlevel = SSmapping.increment_world_z_size(/obj/abstract/level_data/space) //get a place for stragglers
+ var/datum/level_data/space_zlevel = SSmapping.increment_world_z_size(/datum/level_data/space) //get a place for stragglers
for(var/mob/living/M in SSmobs.mob_list)
if(M.z in affected_levels)
var/area/A = get_area(M)
if(istype(A,/area/space)) //straggler
- var/turf/T = locate(M.x, M.y, space_zlevel.my_z)
+ var/turf/T = locate(M.x, M.y, space_zlevel.level_z)
if(T)
M.forceMove(T)
else
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 912119325ee..2b6ca88221d 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -222,8 +222,8 @@
if(length(possible_locations))
newz = pick(possible_locations)
if(!newz)
- var/obj/abstract/level_data/level = SSmapping.increment_world_z_size(/obj/abstract/level_data/space)
- newz = level?.my_z
+ var/datum/level_data/level = SSmapping.increment_world_z_size(/datum/level_data/space)
+ newz = level.level_z
if(newz)
var/turf/nloc = locate(rand(TRANSITIONEDGE, world.maxx-TRANSITIONEDGE), rand(TRANSITIONEDGE, world.maxy-TRANSITIONEDGE), newz)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 96d124af584..218e980f804 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -186,6 +186,9 @@
/obj/item/storage/box/ammo/shotgunammo/WillContain()
return list(/obj/item/ammo_magazine/shotholder = 2)
+/obj/item/storage/box/ammo/shotgunammo/large/WillContain()
+ return list(/obj/item/ammo_magazine/shotholder = 4)
+
/obj/item/storage/box/ammo/shotgunshells
name = "box of shotgun shells"
/obj/item/storage/box/ammo/shotgunshells/WillContain()
@@ -201,6 +204,9 @@
/obj/item/storage/box/ammo/stunshells/WillContain()
return list(/obj/item/ammo_magazine/shotholder/stun = 2)
+/obj/item/storage/box/ammo/stunshells/large/WillContain()
+ return list(/obj/item/ammo_magazine/shotholder/stun = 4)
+
/obj/item/storage/box/ammo/sniperammo
name = "box of sniper shells"
/obj/item/storage/box/ammo/sniperammo/WillContain()
diff --git a/code/game/turfs/exterior/_exterior.dm b/code/game/turfs/exterior/_exterior.dm
index 57812497ba0..d61c708ab9e 100644
--- a/code/game/turfs/exterior/_exterior.dm
+++ b/code/game/turfs/exterior/_exterior.dm
@@ -18,8 +18,9 @@
// Bit faster than return_air() for exoplanet exterior turfs
/turf/exterior/get_air_graphic()
- var/obj/abstract/level_data/level = SSmapping.levels_by_z[z]
- return level?.exterior_atmosphere?.graphic
+ var/datum/level_data/level = SSmapping.levels_by_z[z]
+ var/datum/gas_mixture/atmos = level?.get_exterior_atmosphere()
+ return atmos?.graphic
/turf/exterior/Initialize(mapload, no_update_icon = FALSE)
@@ -82,7 +83,7 @@
. = ..()
/turf/exterior/return_air()
- var/obj/abstract/level_data/level = SSmapping.levels_by_z[z]
+ var/datum/level_data/level = SSmapping.levels_by_z[z]
var/datum/gas_mixture/gas = level?.get_exterior_atmosphere()
if(!gas)
return
diff --git a/code/modules/fabrication/designs/imprinter/designs_misc_circuits.dm b/code/modules/fabrication/designs/imprinter/designs_misc_circuits.dm
index eb02821ccad..6cb202ff7f3 100644
--- a/code/modules/fabrication/designs/imprinter/designs_misc_circuits.dm
+++ b/code/modules/fabrication/designs/imprinter/designs_misc_circuits.dm
@@ -505,3 +505,6 @@
/datum/fabricator_recipe/imprinter/circuit/holomap
path = /obj/item/stock_parts/circuitboard/holomap
+
+/datum/fabricator_recipe/imprinter/circuit/geothermal_generator
+ path = /obj/item/stock_parts/circuitboard/geothermal
\ No newline at end of file
diff --git a/code/modules/maps/_map_template.dm b/code/modules/maps/_map_template.dm
index cb5ffa982f1..8acc9e73fb1 100644
--- a/code/modules/maps/_map_template.dm
+++ b/code/modules/maps/_map_template.dm
@@ -114,7 +114,6 @@
var/list/bounds = list(1.#INF, 1.#INF, 1.#INF, -1.#INF, -1.#INF, -1.#INF)
var/list/atoms_to_initialise = list()
var/shuttle_state = pre_init_shuttles()
-
var/map_hash = modify_tag_vars && "[sequential_id("map_id")]"
ASSERT(isnull(global._preloader.current_map_hash)) // Recursive maploading is possible, but not from this block: recursive loads should be triggered in Initialize, from init_atoms below.
global._preloader.current_map_hash = map_hash
@@ -135,7 +134,7 @@
init_shuttles(shuttle_state, map_hash, initialized_areas_by_type)
after_load()
for(var/z_index = bounds[MAP_MINZ] to bounds[MAP_MAXZ])
- var/obj/abstract/level_data/level = SSmapping.levels_by_z[z_index]
+ var/datum/level_data/level = SSmapping.levels_by_z[z_index]
level.post_template_load(src)
if(SSlighting.initialized)
SSlighting.InitializeZlev(z_index)
diff --git a/code/modules/maps/reader.dm b/code/modules/maps/reader.dm
index 66640af2f4c..f25242d5c23 100644
--- a/code/modules/maps/reader.dm
+++ b/code/modules/maps/reader.dm
@@ -57,7 +57,7 @@ var/global/dmm_suite/preloader/_preloader = new
#endif
Master.StopLoadingMap()
-/dmm_suite/proc/load_map_impl(dmm_file, x_offset, y_offset, z_offset, cropMap, measureOnly, no_changeturf, clear_contents, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper = INFINITY, initialized_areas_by_type, level_data_type = /obj/abstract/level_data/space)
+/dmm_suite/proc/load_map_impl(dmm_file, x_offset, y_offset, z_offset, cropMap, measureOnly, no_changeturf, clear_contents, x_lower = -INFINITY, x_upper = INFINITY, y_lower = -INFINITY, y_upper = INFINITY, initialized_areas_by_type, level_data_type = /datum/level_data/space)
var/tfile = dmm_file//the map file we're creating
if(isfile(tfile))
tfile = safe_file2text(tfile, FALSE)
diff --git a/code/modules/materials/geology/_strata.dm b/code/modules/materials/geology/_strata.dm
index 80c930392e4..c72506db47f 100644
--- a/code/modules/materials/geology/_strata.dm
+++ b/code/modules/materials/geology/_strata.dm
@@ -7,8 +7,9 @@
var/maximum_temperature = INFINITY
/decl/strata/proc/is_valid_exoplanet_strata(var/obj/effect/overmap/visitable/sector/exoplanet/planet)
- var/obj/abstract/level_data/level_data = planet?.zlevels[1]
- var/check_temp = level_data?.exterior_atmosphere?.temperature || 0
+ var/datum/level_data/level_data = planet? SSmapping.levels_by_z[planet.map_z[1]] : null
+ var/datum/gas_mixture/atmos = level_data?.get_exterior_atmosphere()
+ var/check_temp = atmos?.temperature || 0
. = check_temp <= maximum_temperature
/decl/strata/Initialize()
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 6f5f80de575..8c828148b34 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -31,12 +31,12 @@
if(prob(20))
overlay_detail = "asteroid[rand(0,9)]"
. = ..()
- var/obj/abstract/level_data/mining_level/level = SSmapping.levels_by_z[z]
+ var/datum/level_data/mining_level/level = SSmapping.levels_by_z[z]
if(istype(level))
LAZYADD(level.mining_turfs, src)
/turf/simulated/floor/asteroid/Destroy()
- var/obj/abstract/level_data/mining_level/level = SSmapping.levels_by_z[z]
+ var/datum/level_data/mining_level/level = SSmapping.levels_by_z[z]
if(istype(level))
LAZYREMOVE(level.mining_turfs, src)
return ..()
diff --git a/code/modules/multiz/level_data.dm b/code/modules/multiz/level_data.dm
index fc85ce6c010..d0294cab20c 100644
--- a/code/modules/multiz/level_data.dm
+++ b/code/modules/multiz/level_data.dm
@@ -1,132 +1,237 @@
-/obj/abstract/level_data
- /// Name displayed on GPS when this sector is shown.
- var/gps_name
- /// z-level associated with this datum
- var/my_z
- /// A unique identifier for the level, used for SSmapping looup
+/// Returns all the turfs within a zlevel's transition edge, on a given direction.
+/// If include corners is true, the corners of the map will be included.
+/proc/get_transition_edge_turfs(var/z, var/dir_edge, var/include_corners = FALSE)
+ var/datum/level_data/LD = SSmapping.levels_by_z[z]
+
+ //minimum and maximum corners making up the box, between which the transition edge is
+ var/min_x = 1 //X of lower left corner of the edge
+ var/min_y = 1 //Y of lower left corner of the edge
+ var/max_x = 1 //X of upper right corner of the edge
+ var/max_y = 1 //Y of upper right corner of the edge
+
+ //Pos before or after the transition edge on either ends of each axis of the level. (Including corners or not)
+ var/x_bef_transit = include_corners? (LD.level_inner_min_x - TRANSITIONEDGE) : (LD.level_inner_min_x)
+ var/x_aft_transit = include_corners? (LD.level_inner_max_x + TRANSITIONEDGE) : (LD.level_inner_max_x)
+ var/y_bef_transit = include_corners? (LD.level_inner_min_y - TRANSITIONEDGE) : (LD.level_inner_min_y)
+ var/y_aft_transit = include_corners? (LD.level_inner_max_y + TRANSITIONEDGE) : (LD.level_inner_max_y)
+
+ switch(dir_edge)
+ if(NORTH)
+ min_x = x_bef_transit
+ min_y = LD.level_inner_max_y + 1 //Add one so we're outside the inner area (inner min/max are inclusive)
+ max_x = x_aft_transit
+ max_y = LD.level_inner_max_y + TRANSITIONEDGE //End of the transition edge on that axis
+ if(SOUTH)
+ min_x = x_bef_transit
+ min_y = LD.level_inner_min_y - TRANSITIONEDGE
+ max_x = x_aft_transit
+ max_y = LD.level_inner_min_y - 1
+ if(EAST)
+ min_x = LD.level_inner_max_x + 1
+ min_y = y_bef_transit
+ max_x = LD.level_inner_max_x + TRANSITIONEDGE
+ max_y = y_aft_transit
+ if(WEST)
+ min_x = LD.level_inner_min_x - TRANSITIONEDGE
+ min_y = y_bef_transit
+ max_x = LD.level_inner_min_x - 1
+ max_y = y_aft_transit
+
+ return block(
+ locate(min_x, min_y, LD.level_z),
+ locate(max_x, max_y, LD.level_z)
+ )
+
+///Returns all the turfs from all 4 corners of the transition border of a level.
+/proc/get_transition_edge_corner_turfs(var/z)
+ var/datum/level_data/LD = SSmapping.levels_by_z[z]
+ //South-West
+ . = block(
+ locate(LD.level_inner_min_x - TRANSITIONEDGE, LD.level_inner_min_y - TRANSITIONEDGE, LD.level_z),
+ locate(LD.level_inner_min_x - 1, LD.level_inner_min_y - 1, LD.level_z))
+ //South-East
+ . |= block(
+ locate(LD.level_inner_max_x + 1, LD.level_inner_min_y - TRANSITIONEDGE, LD.level_z),
+ locate(LD.level_inner_max_x + TRANSITIONEDGE, LD.level_inner_min_y - 1, LD.level_z))
+ //North-West
+ . |= block(
+ locate(LD.level_inner_min_x - TRANSITIONEDGE, LD.level_inner_max_y + 1, LD.level_z),
+ locate(LD.level_inner_min_x - 1, LD.level_inner_max_y + TRANSITIONEDGE, LD.level_z))
+ //North-East
+ . |= block(
+ locate(LD.level_inner_max_x + 1, LD.level_inner_max_y + 1, LD.level_z),
+ locate(LD.level_inner_max_x + TRANSITIONEDGE, LD.level_inner_max_y + TRANSITIONEDGE, LD.level_z))
+
+///Keeps details on how to generate, maintain and access a zlevel.
+/datum/level_data
+ ///Name displayed to the player to refer to this level in user interfaces and etc. If null, one will be generated.
+ var/name
+
+ /// The z-level that was assigned to this level_data
+ var/level_z
+ /// A unique string identifier for this particular z-level. Used to fetch a level without knowing its z-level.
var/level_id
- /// The base turf of the level (space, rock, etc)
- var/base_turf
- /// A list of ids that this level connects to horizontally.
- var/list/connects_to
/// Various flags indicating what this level functions as.
- var/level_flags
- /// Temperature of standard exterior atmosphere.
- var/exterior_atmos_temp = T20C
- /// Gaxmix datum returned to exterior return_air. Set to assoc list of material to moles to initialize the gas datum.
- var/datum/gas_mixture/exterior_atmosphere
- /// Default turf for this level on creation (if created via z-level incrementing)
- var/created_base_turf_type = /turf/space
- /// Default area for this level on creation (as above)
- var/created_base_area_type = /area/space
- /// Set to false to leave dark
- var/take_starlight_ambience = TRUE
- /// This default makes turfs not generate light. Adjust to have exterior areas be lit.
+ var/level_flags = 0
+ /// The desired width of the level, including the TRANSITIONEDGE.
+ ///If world.maxx is bigger, the exceeding area will be filled with turfs of "border_filler" type if defined, or base_turf otherwise.
+ var/level_max_width
+ /// The desired height of the level, including the TRANSITIONEDGE.
+ ///If world.maxy is bigger, the exceeding area will be filled with turfs of "border_filler" type if defined, or base_turf otherwise.
+ var/level_max_height
+
+ /// Filled by map gen on init. Indicates where the accessible level area starts past the transition edge.
+ var/level_inner_min_x
+ /// Filled by map gen on init. Indicates where the accessible level area starts past the transition edge.
+ var/level_inner_min_y
+ /// Filled by map gen on init. Indicates where the accessible level area starts past the transition edge.
+ var/level_inner_max_x
+ /// Filled by map gen on init. Indicates where the accessible level area starts past the transition edge.
+ var/level_inner_max_y
+
+ /// Filled by map gen on init. Indicates the width of the accessible area within the transition edges.
+ var/level_inner_width
+ /// Filled by map gen on init.Indicates the height of the accessible area within the transition edges.
+ var/level_inner_height
+
+ // *** Lighting ***
+ /// Set to false to override with our own.
+ var/use_global_exterior_ambience = TRUE
+ /// Ambient lighting light intensity turfs on this level should have. Value from 0 to 1.
var/ambient_light_level = 0
- /// Colour of ambient light.
+ /// Colour of ambient light for turfs on this level.
var/ambient_light_color = COLOR_WHITE
-INITIALIZE_IMMEDIATE(/obj/abstract/level_data)
-/obj/abstract/level_data/Initialize(var/ml, var/defer_level_setup = FALSE)
- . = ..()
+ // *** Level Gen ***
+ ///The default base turf type for the whole level. It will be the base turf type for the z level, unless loaded by map.
+ /// filler_turf overrides what turfs the level will be created with.
+ var/base_turf = /turf/space
+ /// When the level is created dynamically, all turfs on the map will be changed to this one type. If null, will use the base_turf instead.
+ var/filler_turf
+ ///The default area type for the whole level. It will be applied to all turfs in the level on creation, unless loaded by map.
+ var/base_area = /area/space
+ ///The turf to fill the border area beyond the bounds of the level with.
+ /// If null, nothing will be placed in the border area. (This is also placed when a border cannot be looped if loop_unconnected_borders is TRUE)
+ var/border_filler// = /turf/unsimulated/mineral
+ ///If set we will put a looping edge on every unconnected edge of the map. If null, will not loop unconnected edges.
+ /// If an unconnected edge is facing a connected edge, it will be instead filled with "border_filler" instead, if defined.
+ var/loop_turf_type// = /turf/unsimulated/mimc_edge/transition/loop
+ /// The turf type to use for zlevel lateral connections
+ var/transition_turf_type = /turf/unsimulated/mimic_edge/transition
+
+ // *** Atmos ***
+ /// Temperature of standard exterior atmosphere.
+ var/exterior_atmos_temp = T20C
+ /// Gas mixture datum returned to exterior return_air. Set to assoc list of material to moles to initialize the gas datum.
+ var/datum/gas_mixture/exterior_atmosphere
- my_z = z
- forceMove(null)
+ // *** Connections ***
+ ///A list of all level_ids, and a direction. Indicates what direction of the map connects to what level
+ var/list/connected_levels
+ ///A cached list of connected directions to their connected level id. Filled up at runtime.
+ var/tmp/list/cached_connections
- if(SSmapping.levels_by_z.len < my_z)
- SSmapping.levels_by_z.len = max(SSmapping.levels_by_z.len, my_z)
- PRINT_STACK_TRACE("Attempting to initialize a z-level that has not incremented world.maxz.")
+ ///A list of /datum/random_map types to apply to this level if we're running level generation.
+ /// Those are run before any parents/map_templates map generators.
+ var/list/level_generators
- // Swap out the old one but preserve any relevant references etc.
- if(SSmapping.levels_by_z[my_z])
- var/obj/abstract/level_data/old_level = SSmapping.levels_by_z[my_z]
- old_level.replace_with(src)
- qdel(old_level)
+ ///Whether the level data was setup already.
+ var/_level_setup_completed = FALSE
- SSmapping.levels_by_z[my_z] = src
- if(!level_id)
- level_id = "leveldata_[my_z]_[sequential_id(/obj/abstract/level_data)]"
- if(level_id in SSmapping.levels_by_id)
- PRINT_STACK_TRACE("Duplicate level_id '[level_id]' for z[my_z].")
- else
- SSmapping.levels_by_id[level_id] = src
+/datum/level_data/New(var/_z_level, var/defer_level_setup = FALSE)
+ . = ..()
+ level_z = _z_level
+ if(isnull(_z_level))
+ PRINT_STACK_TRACE("Attempting to initialize a null z-level.")
+ initialize_level_id()
+ SSmapping.register_level_data(src)
if(SSmapping.initialized && !defer_level_setup)
setup_level_data()
-/obj/abstract/level_data/proc/post_template_load(var/datum/map_template/template)
- if(template.accessibility_weight)
- SSmapping.accessible_z_levels[num2text(my_z)] = template.accessibility_weight
- SSmapping.player_levels |= my_z
+/datum/level_data/Destroy(force)
+ log_debug("Level data datum being destroyed: [log_info_line(src)]")
+ //Since this is a datum that lives inside the SSmapping subsystem, I'm not sure if we really need to prevent deletion.
+ // It was fine for the obj version of this, but not much point now?
+ SSmapping.unregister_level_data(src)
+ . = ..()
-/obj/abstract/level_data/Destroy(var/force)
- if(force)
- new type(locate(round(world.maxx/2), round(world.maxy/2), my_z))
- return ..()
- return QDEL_HINT_LETMELIVE
+///Generates a level_id if none were specified in the datum definition.
+/datum/level_data/proc/initialize_level_id()
+ if(level_id)
+ return
+ level_id = "leveldata_[level_z]_[sequential_id(/datum/level_data)]"
-/obj/abstract/level_data/proc/replace_with(var/obj/abstract/level_data/new_level)
+///Handle a new level_data datum overwriting us.
+/datum/level_data/proc/replace_with(var/datum/level_data/new_level)
new_level.copy_from(src)
-/obj/abstract/level_data/proc/copy_from(var/obj/abstract/level_data/old_level)
+///Handle copying data from a previous level_data we're replacing.
+/datum/level_data/proc/copy_from(var/datum/level_data/old_level)
return
-/obj/abstract/level_data/proc/initialize_level()
- var/change_turf = (created_base_turf_type && created_base_turf_type != world.turf)
- var/change_area = (created_base_area_type && created_base_area_type != world.area)
+///Initialize the turfs on the z-level.
+/datum/level_data/proc/initialize_new_level()
+ //#TODO: Is it really necessary to do this for any and all levels? Seems mainly useful for space levels?
+ var/picked_turf = filler_turf || base_turf //Pick the filler_turf for filling if it's set, otherwise use the base_turf
+ var/change_turf = (picked_turf && picked_turf != world.turf)
+ var/change_area = (base_area && base_area != world.area)
if(!change_turf && !change_area)
return
- var/corner_start = locate(1, 1, my_z)
- var/corner_end = locate(world.maxx, world.maxy, my_z)
- var/area/A = change_area ? new created_base_area_type : null
+ var/corner_start = locate(1, 1, level_z)
+ var/corner_end = locate(world.maxx, world.maxy, level_z)
+ var/area/A = change_area ? get_base_area_instance() : null
for(var/turf/T as anything in block(corner_start, corner_end))
if(change_turf)
- T = T.ChangeTurf(created_base_turf_type)
+ T = T.ChangeTurf(picked_turf)
if(change_area)
ChangeArea(T, A)
-/obj/abstract/level_data/proc/setup_level_data()
-
- if(take_starlight_ambience)
- ambient_light_level = config.exterior_ambient_light
- ambient_light_color = SSskybox.background_color
- if(base_turf)
- SSmapping.base_turf_by_z[my_z] = base_turf
- if(level_flags & ZLEVEL_STATION)
- SSmapping.station_levels |= my_z
- if(level_flags & ZLEVEL_ADMIN)
- SSmapping.admin_levels |= my_z
- if(level_flags & ZLEVEL_CONTACT)
- SSmapping.contact_levels |= my_z
- if(level_flags & ZLEVEL_PLAYER)
- SSmapping.player_levels |= my_z
- if(level_flags & ZLEVEL_SEALED)
- SSmapping.sealed_levels |= my_z
-
- build_exterior_atmosphere()
- if(config.generate_map)
- build_level()
-
-/obj/abstract/level_data/proc/build_level()
- return
-
-/obj/abstract/level_data/proc/find_connected_levels(var/list/found)
- for(var/other_id in connects_to)
- var/obj/abstract/level_data/neighbor = SSmapping.levels_by_id[other_id]
- neighbor.add_connected_levels(found)
-
-/obj/abstract/level_data/proc/add_connected_levels(var/list/found)
- . = found
- if((my_z in found))
+///Prepare level for being used. Setup borders, lateral z connections, ambient lighting, atmosphere, etc..
+/datum/level_data/proc/setup_level_data()
+ if(_level_setup_completed)
+ return //Since we can defer setup, make sure we only setup once
+
+ setup_level_bounds()
+ setup_ambient()
+ setup_exterior_atmosphere()
+ generate_level()
+ after_generate_level()
+ _level_setup_completed = TRUE
+
+///Calculate the bounds of the level, the border area, and the inner accessible area.
+/datum/level_data/proc/setup_level_bounds()
+ level_max_width = level_max_width ? level_max_width : world.maxx
+ level_max_height = level_max_height ? level_max_height : world.maxy
+ var/x_origin = round((world.maxx - level_max_width) / 2)
+ var/y_origin = round((world.maxy - level_max_height) / 2)
+
+ //The first x/y that's within the accessible level
+ level_inner_min_x = x_origin + TRANSITIONEDGE + 1
+ level_inner_min_y = y_origin + TRANSITIONEDGE + 1
+
+ //The last x/y that's within the accessible level
+ level_inner_max_x = (level_max_width - level_inner_min_x) + 1
+ level_inner_max_y = (level_max_height - level_inner_min_y) + 1
+
+ //The width of the accessible inner area of the level
+ level_inner_width = level_max_width - (2 * TRANSITIONEDGE)
+ level_inner_height = level_max_height - (2 * TRANSITIONEDGE)
+
+///Setup ambient lighting for the level
+/datum/level_data/proc/setup_ambient()
+ if(!use_global_exterior_ambience)
return
- LAZYADD(found, my_z)
- if(!length(connects_to))
+ ambient_light_level = config.exterior_ambient_light
+ ambient_light_color = SSskybox.background_color
+
+///Setup/generate atmosphere for exterior turfs on the level.
+/datum/level_data/proc/setup_exterior_atmosphere()
+ //Skip setup if we've been set to a ref already
+ if(istype(exterior_atmosphere))
+ exterior_atmosphere.update_values() //Might as well update
+ exterior_atmosphere.check_tile_graphic()
return
- for(var/other_id in connects_to)
- var/obj/abstract/level_data/neighbor = SSmapping.levels_by_id[other_id]
- neighbor.add_connected_levels(found)
-
-/obj/abstract/level_data/proc/build_exterior_atmosphere()
var/list/exterior_atmos_composition = exterior_atmosphere
exterior_atmosphere = new
if(islist(exterior_atmos_composition))
@@ -136,80 +241,306 @@ INITIALIZE_IMMEDIATE(/obj/abstract/level_data)
exterior_atmosphere.update_values()
exterior_atmosphere.check_tile_graphic()
-/obj/abstract/level_data/proc/get_exterior_atmosphere()
- if(isnull(exterior_atmosphere) || islist(exterior_atmosphere)) //#FIXME: remove once we get the level_data improvements in
- build_exterior_atmosphere()
+//
+// Level Load/Gen
+//
+
+///Called when setting up the level. Apply generators and anything that modifies the turfs of the level.
+/datum/level_data/proc/generate_level()
+ var/origx = level_inner_min_x
+ var/origy = level_inner_min_y
+ var/endx = level_inner_min_x + level_inner_width
+ var/endy = level_inner_min_y + level_inner_height
+ for(var/gen_type in level_generators)
+ new gen_type(origx, origy, level_z, endx, endy, FALSE, TRUE, get_base_area_instance())
+
+///Apply the parent entity's map generators. (Planets generally)
+///This proc is to give a chance to level_data subtypes to individually chose to ignore the parent generators.
+/datum/level_data/proc/apply_map_generators(var/list/map_gen)
+ var/origx = level_inner_min_x
+ var/origy = level_inner_min_y
+ var/endx = level_inner_min_x + level_inner_width
+ var/endy = level_inner_min_y + level_inner_height
+ for(var/gen_type in map_gen)
+ new gen_type(origx, origy, level_z, endx, endy, FALSE, TRUE, get_base_area_instance())
+
+///Called during level setup. Run anything that should happen only after the map is fully generated.
+/datum/level_data/proc/after_generate_level()
+ build_border()
+
+///Changes anything named we may need to rename accordingly to the parent location name. For instance, exoplanets levels.
+/datum/level_data/proc/adapt_location_name(var/location_name)
+ SHOULD_CALL_PARENT(TRUE)
+ if(!base_area || ispath(base_area, /area/space))
+ return FALSE
+ return TRUE
+
+///Called after a map_template has been loaded on our z-level. Only apply to templates loaded onto new z-levels.
+/datum/level_data/proc/post_template_load(var/datum/map_template/template)
+ if(template.accessibility_weight)
+ SSmapping.accessible_z_levels[num2text(level_z)] = template.accessibility_weight
+ SSmapping.player_levels |= level_z
+
+///Builds the map's transition edge if applicable
+/datum/level_data/proc/build_border()
+ var/list/edge_states = compute_level_edges_states()
+ for(var/edge_dir in global.cardinal)
+ build_border_edge(edge_states[edge_dir], edge_dir)
+
+ //Now prepare the corners of the border
+ build_border_corners()
+
+///Loop through the edges of the level and determine if they're connected, looping, filled, or untouched.
+/datum/level_data/proc/compute_level_edges_states()
+ var/list/edge_states = list()
+ edge_states.len = 8 //Largest cardinal direction is WEST or 8
+ var/should_loop_edges = ispath(loop_turf_type)
+ var/has_filler_edge = ispath(border_filler)
+
+ //First determine and validate the borders
+ for(var/adir in global.cardinal)
+ //First check for connections, or loop
+ if(get_connected_level_id(adir))
+ edge_states[adir] = LEVEL_EDGE_CON
+ var/reverse = global.reverse_dir[adir]
+ //When facing a connected edge that wasn't set yet, make sure we don't put a loop edge opposite of it.
+ if(should_loop_edges && ((edge_states[reverse] == LEVEL_EDGE_LOOP) || !edge_states[reverse]))
+ edge_states[reverse] = has_filler_edge? LEVEL_EDGE_WALL : LEVEL_EDGE_NONE
+
+ if(edge_states[adir])
+ continue //Skip edges which either connect to another z-level, or have been forced to a specific type already
+ if(should_loop_edges)
+ edge_states[adir] = LEVEL_EDGE_LOOP
+ else if(ispath(border_filler))
+ edge_states[adir] = LEVEL_EDGE_WALL //Apply filler wall last if we have no connections or loop
+ else
+ edge_states[adir] = LEVEL_EDGE_NONE
+
+ return edge_states
+
+///Apply the specified edge type to the specified edge's turfs
+/datum/level_data/proc/build_border_edge(var/edge_type, var/edge_dir)
+ if(edge_type == LEVEL_EDGE_NONE)
+ return
+
+ var/list/edge_turfs
+ switch(edge_type)
+ if(LEVEL_EDGE_LOOP)
+ edge_turfs = get_transition_edge_turfs(level_z, edge_dir, FALSE)
+ for(var/turf/T in edge_turfs)
+ T.ChangeTurf(loop_turf_type)
+ if(LEVEL_EDGE_CON)
+ edge_turfs = get_transition_edge_turfs(level_z, edge_dir, FALSE)
+ for(var/turf/T in edge_turfs)
+ T.ChangeTurf(transition_turf_type)
+ if(LEVEL_EDGE_WALL)
+ edge_turfs = get_transition_edge_turfs(level_z, edge_dir, TRUE)
+ for(var/turf/T in edge_turfs)
+ T.ChangeTurf(border_filler)
+
+///Handle preparing the level's border's corners after we've stup the edges.
+/datum/level_data/proc/build_border_corners()
+ //Now prepare the corners of the border
+ var/list/all_corner_turfs = get_transition_edge_corner_turfs(level_z)
+ for(var/turf/T in all_corner_turfs)
+ //In case we got filler turfs for borders, make sure to fill the corners with it
+ if(border_filler)
+ T.ChangeTurf(border_filler)
+ //Force corner turfs to be solid, so nothing end up being lost/stuck in there
+ T.set_density(TRUE)
+
+//
+// Accessors
+//
+/datum/level_data/proc/get_exterior_atmosphere()
+ if(!istype(exterior_atmosphere)) //#FIXME: Temporary measure until the exoplanet gen stuff is moved out of overmap markers
+ setup_exterior_atmosphere()
if(exterior_atmosphere)
var/datum/gas_mixture/gas = new
gas.copy_from(exterior_atmosphere)
return gas
-/obj/abstract/level_data/proc/get_gps_level_name()
- if(!gps_name)
- var/obj/effect/overmap/overmap_entity = global.overmap_sectors[num2text(z)]
+/datum/level_data/proc/get_display_name()
+ if(!name)
+ var/obj/effect/overmap/overmap_entity = global.overmap_sectors[num2text(level_z)]
if(overmap_entity?.name)
- gps_name = overmap_entity.name
- else if(name)
- gps_name = name
+ name = overmap_entity.name
else
- gps_name = "Sector #[my_z]"
- return gps_name
+ name = "Sector #[level_z]"
+ return name
+
+/datum/level_data/proc/get_connected_level_id(var/direction)
+ if(!length(cached_connections))
+ //Build a list that we can access with the direction value instead of having to do string conversions
+ cached_connections = list()
+ cached_connections.len = DOWN //Down is the largest of the directional values
+ for(var/lvlid in connected_levels)
+ cached_connections[connected_levels[lvlid]] = lvlid
+
+ if(istext(direction))
+ CRASH("Direction must be a direction flag.")
+ return cached_connections[direction]
+
+///Returns recursively a list of level_data for each connected levels.
+/datum/level_data/proc/get_all_connected_level_data(var/list/_connected_siblings)
+ . = list()
+ //Since levels may refer to eachothers, make sure we're in the siblings list to avoid infinite recursion
+ LAZYDISTINCTADD(_connected_siblings, src)
+ for(var/id in connected_levels)
+ var/datum/level_data/LD = SSmapping.levels_by_id[id]
+ if(LD in _connected_siblings)
+ continue
+ . |= LD
+ var/list/cur_con = LD.get_all_connected_level_data(_connected_siblings)
+ if(length(cur_con))
+ . |= cur_con
+
+///Returns recursively a list of level_ids for each connected levels.
+/datum/level_data/proc/get_all_connected_level_ids(var/list/_connected_siblings)
+ . = list()
+ //Since levels may refer to eachothers, make sure we're in the siblings list to avoid infinite recursion
+ LAZYDISTINCTADD(_connected_siblings, level_id)
+ for(var/id in connected_levels)
+ var/datum/level_data/LD = SSmapping.levels_by_id[id]
+ if(LD.level_id in _connected_siblings)
+ continue
+ . |= LD.level_id
+ var/list/cur_con = LD.get_all_connected_level_ids(_connected_siblings)
+ if(length(cur_con))
+ . |= cur_con
+
+///Returns recursively a list of z-level indices for each connected levels. Parameter is to keep trakc
+/datum/level_data/proc/get_all_connected_level_z(var/list/_connected_siblings)
+ . = list()
+ //Since levels may refer to eachothers, make sure we're in the siblings list to avoid infinite recursion
+ LAZYDISTINCTADD(_connected_siblings, level_z)
+ for(var/id in connected_levels)
+ var/datum/level_data/LD = SSmapping.levels_by_id[id]
+ if(LD.level_z in _connected_siblings)
+ continue
+ . |= LD.level_z
+ var/list/cur_con = LD.get_all_connected_level_z(_connected_siblings)
+ if(length(cur_con))
+ . |= cur_con
+
+
+/datum/level_data/proc/find_connected_levels(var/list/found)
+ LAZYDISTINCTADD(found, level_z)
+ for(var/other_id in connected_levels)
+ var/datum/level_data/neighbor = SSmapping.levels_by_id[other_id]
+ if(neighbor.level_z in found)
+ continue
+ LAZYADD(found, neighbor.level_z)
+ if(!length(neighbor.connected_levels))
+ continue
+ neighbor.find_connected_levels(found)
+
+///Returns the instance of the base area for this level
+/datum/level_data/proc/get_base_area_instance()
+ var/area/found = locate(base_area)
+ if(found)
+ return found
+ if(ispath(base_area))
+ return new base_area
+ return locate(world.area)
+
+////////////////////////////////////////////
+// Level Data Spawner
+////////////////////////////////////////////
+
+/// Mapper helper for spawning a specific level_data datum with the map as it gets loaded
+/obj/abstract/level_data_spawner
+ name = "level data spawner"
+ var/level_data_type = /datum/level_data/space
+
+INITIALIZE_IMMEDIATE(/obj/abstract/level_data_spawner)
+/obj/abstract/level_data_spawner/Initialize()
+ var/datum/level_data/LD = new level_data_type(z)
+ //Let the mapper forward a level name for the level_data, if none was defined
+ if(!length(LD.name) && length(name))
+ LD.name = name
+ ..()
+ return INITIALIZE_HINT_QDEL
+
+////////////////////////////////////////////
+// Mapper Templates
+////////////////////////////////////////////
+/obj/abstract/level_data_spawner/player
+ level_data_type = /datum/level_data/player_level
+
+/obj/abstract/level_data_spawner/main_level
+ level_data_type = /datum/level_data/main_level
+
+/obj/abstract/level_data_spawner/admin_level
+ level_data_type = /datum/level_data/admin_level
+
+/obj/abstract/level_data_spawner/debug
+ level_data_type = /datum/level_data/debug
+
+/obj/abstract/level_data_spawner/mining_level
+ level_data_type = /datum/level_data/mining_level
-/*
- * Mappable subtypes.
- */
-/obj/abstract/level_data/debug
+/obj/abstract/level_data_spawner/exoplanet
+ level_data_type = /datum/level_data/exoplanet
+
+////////////////////////////////////////////
+// Level Data Implementations
+////////////////////////////////////////////
+/datum/level_data/space
+
+/datum/level_data/debug
name = "Debug Level"
-/obj/abstract/level_data/main_level
+/datum/level_data/main_level
level_flags = (ZLEVEL_STATION|ZLEVEL_CONTACT|ZLEVEL_PLAYER)
-/obj/abstract/level_data/admin_level
+/datum/level_data/admin_level
level_flags = (ZLEVEL_ADMIN|ZLEVEL_SEALED)
-/obj/abstract/level_data/player_level
+/datum/level_data/player_level
level_flags = (ZLEVEL_CONTACT|ZLEVEL_PLAYER)
-/obj/abstract/level_data/space
-
-/obj/abstract/level_data/exoplanet
+/datum/level_data/exoplanet
exterior_atmosphere = list(
/decl/material/gas/oxygen = MOLES_O2STANDARD,
/decl/material/gas/nitrogen = MOLES_N2STANDARD
)
exterior_atmos_temp = T20C
level_flags = (ZLEVEL_PLAYER|ZLEVEL_SEALED)
- take_starlight_ambience = FALSE // This is set up by the exoplanet object.
+ use_global_exterior_ambience = FALSE // This is set up by the exoplanet object.
-/obj/abstract/level_data/unit_test
+/datum/level_data/unit_test
level_flags = (ZLEVEL_CONTACT|ZLEVEL_PLAYER|ZLEVEL_SEALED)
-// Used to generate mining ores etc.
-/obj/abstract/level_data/mining_level
+/datum/level_data/overmap
+ name = "Sensor Display"
+ level_flags = ZLEVEL_SEALED
+ use_global_exterior_ambience = FALSE // Overmap doesn't care about ambient lighting
+
+//#TODO: This seems like it could be generalized in a much better way?
+// Used specifically by /turf/simulated/floor/asteroid, and some away sites to generate mining turfs
+/datum/level_data/mining_level
level_flags = (ZLEVEL_PLAYER|ZLEVEL_SEALED)
var/list/mining_turfs
-/obj/abstract/level_data/mining_level/Destroy()
+/datum/level_data/mining_level/Destroy()
mining_turfs = null
return ..()
-/obj/abstract/level_data/mining_level/asteroid
+/datum/level_data/mining_level/asteroid
base_turf = /turf/simulated/floor/asteroid
-/obj/abstract/level_data/mining_level/post_template_load()
- ..()
- new /datum/random_map/automata/cave_system(1, 1, my_z, world.maxx, world.maxy)
- new /datum/random_map/noise/ore(1, 1, my_z, world.maxx, world.maxy)
+/datum/level_data/mining_level/generate_level()
+ //#FIXME: This config option is very ambiguous. Most RNG stuff doesn't care about it. Might be worth removing?
+ if(!config.generate_map)
+ return
+ new /datum/random_map/automata/cave_system(1, 1, level_z, world.maxx, world.maxy)
+ new /datum/random_map/noise/ore(1, 1, level_z, world.maxx, world.maxy)
refresh_mining_turfs()
-/obj/abstract/level_data/mining_level/proc/refresh_mining_turfs()
+/datum/level_data/mining_level/proc/refresh_mining_turfs()
set waitfor = FALSE
for(var/turf/simulated/floor/asteroid/mining_turf as anything in mining_turfs)
mining_turf.updateMineralOverlays()
CHECK_TICK
mining_turfs = null
-
-// Used as a dummy z-level for the overmap.
-/obj/abstract/level_data/overmap
- name = "Sensor Display"
- take_starlight_ambience = FALSE // Overmap doesn't care about ambient lighting
diff --git a/code/modules/multiz/turf_mimic_edge.dm b/code/modules/multiz/turf_mimic_edge.dm
new file mode 100644
index 00000000000..b8f28194f42
--- /dev/null
+++ b/code/modules/multiz/turf_mimic_edge.dm
@@ -0,0 +1,366 @@
+#define MIMIC_EDGE_NAME "world's edge"
+#define MIMIC_EDGE_DESC "Flatearther's nightmare."
+
+////////////////////////////////
+// Mimic Edges
+////////////////////////////////
+
+///Dummy mouse-opaque overlay to prevent people turning/shooting towards ACTUAL location of vis_content thing
+/obj/effect/overlay/click_bait
+ name = "distant terrain"
+ desc = "You need to come over there to take a better look."
+ mouse_opacity = 2
+
+////////////////////////////////
+// Simulated Mimic Edges
+////////////////////////////////
+
+///Simulated turf meant to replicate the appearence of another.
+/turf/simulated/mimic_edge
+ name = MIMIC_EDGE_NAME
+ desc = MIMIC_EDGE_DESC
+ icon = null
+ icon_state = null
+ density = FALSE
+ permit_ao = FALSE //would need AO proxy
+ blocks_air = TRUE //would need air zone proxy
+ dynamic_lighting = FALSE //Would need lighting proxy
+
+ ///Mimicked turf's x position
+ var/mimic_x
+ ///Mimicked turf's y position
+ var/mimic_y
+ ///Mimicked turf's z position
+ var/mimic_z
+ ///Ref to the dummy overlay
+ var/obj/effect/overlay/click_bait/click_eater
+
+/turf/simulated/mimic_edge/Initialize(ml)
+ . = ..()
+ //Clear ourselves from the ambient queue
+ SSambience.queued -= src
+ //Need to put a mouse-opaque overlay there to prevent people turning/shooting towards ACTUAL location of vis_content things
+ click_eater = new(src)
+ setup_mimic()
+
+/turf/simulated/mimic_edge/Destroy()
+ QDEL_NULL(click_eater) //Make sure we get rid of it if the turf is somehow replaced by map gen to prevent them accumulating.
+ return ..()
+
+//Properly install itself, and allow overriding how the target turf is picked
+/turf/simulated/mimic_edge/proc/setup_mimic()
+ return
+
+/turf/simulated/mimic_edge/on_update_icon()
+ return
+
+/turf/simulated/mimic_edge/get_vis_contents_to_add()
+ . = ..()
+ var/turf/NT = mimic_x && mimic_y && mimic_z && locate(mimic_x, mimic_y, mimic_z)
+ if(NT)
+ opacity = NT.opacity
+ //log_debug("[src]([x],[y],[z]) mirroring [NT]([NT.x],[NT.y],[NT.z])")
+ LAZYADD(., NT)
+
+/turf/simulated/mimic_edge/proc/set_mimic_turf(var/_x, var/_y, var/_z)
+ mimic_z = _z? _z : z
+ mimic_x = _x
+ mimic_y = _y
+ refresh_vis_contents()
+
+//Prevent ambient completely, we're not a real turf
+/turf/simulated/mimic_edge/set_ambient_light(color, multiplier)
+ return
+/turf/simulated/mimic_edge/update_ambient_light(no_corner_update)
+ return
+/turf/simulated/mimic_edge/update_ambient_light_from_z()
+ return
+/turf/simulated/mimic_edge/lighting_build_overlay(now)
+ return
+
+////////////////////////////////
+// Unsimulated Mimic Edges
+////////////////////////////////
+
+///Unsimulated turf meant to replicate the appearence of another.
+/turf/unsimulated/mimic_edge
+ name = MIMIC_EDGE_NAME
+ desc = MIMIC_EDGE_DESC
+ icon = null
+ icon_state = null
+ density = FALSE
+ permit_ao = FALSE
+ blocks_air = TRUE
+ dynamic_lighting = FALSE
+
+ ///Mimicked turf's x position
+ var/mimic_x
+ ///Mimicked turf's y position
+ var/mimic_y
+ ///Mimicked turf's z position
+ var/mimic_z
+ ///Ref to the dummy overlay
+ var/obj/effect/overlay/click_bait/click_eater
+
+/turf/unsimulated/mimic_edge/Initialize(ml)
+ . = ..()
+ //Clear ourselves from the ambient queue
+ SSambience.queued -= src
+ //Need to put a mouse-opaque overlay there to prevent people turning/shooting towards ACTUAL location of vis_content things
+ click_eater = new(src)
+ setup_mimic()
+
+/turf/unsimulated/mimic_edge/Destroy()
+ QDEL_NULL(click_eater)
+ return ..()
+
+//Properly install itself, and allow overriding how the target turf is picked
+/turf/unsimulated/mimic_edge/proc/setup_mimic()
+ return
+
+/turf/unsimulated/mimic_edge/on_update_icon()
+ return
+
+/turf/unsimulated/mimic_edge/get_vis_contents_to_add()
+ . = ..()
+ var/turf/NT = mimic_x && mimic_y && mimic_z && locate(mimic_x, mimic_y, mimic_z)
+ if(NT)
+ opacity = NT.opacity
+ //log_debug("[src]([x],[y],[z]) mirroring [NT]([NT.x],[NT.y],[NT.z])")
+ LAZYADD(., NT)
+
+/turf/unsimulated/mimic_edge/proc/set_mimic_turf(var/_x, var/_y, var/_z)
+ mimic_z = _z? _z : z
+ mimic_x = _x
+ mimic_y = _y
+ refresh_vis_contents()
+
+//Prevent ambient completely, we're not a real turf
+/turf/unsimulated/mimic_edge/set_ambient_light(color, multiplier)
+ return
+/turf/unsimulated/mimic_edge/update_ambient_light(no_corner_update)
+ return
+/turf/unsimulated/mimic_edge/update_ambient_light_from_z()
+ return
+/turf/unsimulated/mimic_edge/lighting_build_overlay(now)
+ return
+
+////////////////////////////////
+// Exterior Mimic Edges
+////////////////////////////////
+
+///Exterior turf meant to replicate the appearence of another.
+/turf/exterior/mimic_edge
+ name = MIMIC_EDGE_NAME
+ desc = MIMIC_EDGE_DESC
+ icon = null
+ icon_state = null
+ density = FALSE
+ permit_ao = FALSE
+ blocks_air = TRUE
+ dynamic_lighting = FALSE
+
+ ///Mimicked turf's x position
+ var/mimic_x
+ ///Mimicked turf's y position
+ var/mimic_y
+ ///Mimicked turf's z position
+ var/mimic_z
+ ///Ref to the dummy overlay
+ var/obj/effect/overlay/click_bait/click_eater
+
+/turf/exterior/mimic_edge/Initialize(ml)
+ . = ..()
+ //Clear ourselves from the ambient queue
+ SSambience.queued -= src
+ //Need to put a mouse-opaque overlay there to prevent people turning/shooting towards ACTUAL location of vis_content things
+ click_eater = new(src)
+ setup_mimic()
+
+/turf/exterior/mimic_edge/Destroy()
+ QDEL_NULL(click_eater)
+ return ..()
+
+//Properly install itself, and allow overriding how the target turf is picked
+/turf/exterior/mimic_edge/proc/setup_mimic()
+ return
+
+/turf/exterior/mimic_edge/on_update_icon()
+ return
+
+/turf/exterior/mimic_edge/get_vis_contents_to_add()
+ . = ..()
+ var/turf/NT = mimic_x && mimic_y && mimic_z && locate(mimic_x, mimic_y, mimic_z)
+ if(NT)
+ opacity = NT.opacity
+ //log_debug("[src]([x],[y],[z]) mirroring [NT]([NT.x],[NT.y],[NT.z])")
+ LAZYADD(., NT)
+
+/turf/exterior/mimic_edge/proc/set_mimic_turf(var/_x, var/_y, var/_z)
+ mimic_z = _z? _z : z
+ mimic_x = _x
+ mimic_y = _y
+ refresh_vis_contents()
+
+//Prevent ambient completely, we're not a real turf
+/turf/exterior/mimic_edge/set_ambient_light(color, multiplier)
+ return
+/turf/exterior/mimic_edge/update_ambient_light(no_corner_update)
+ return
+/turf/exterior/mimic_edge/update_ambient_light_from_z()
+ return
+/turf/exterior/mimic_edge/lighting_build_overlay(now)
+ return
+
+////////////////////////////////
+// Transition Edges Shared
+////////////////////////////////
+
+///Returns the a cardinal direction for a turf on the map that's beyond the transition edge
+/proc/get_turf_transition_edge_direction(var/turf/T, var/datum/level_data/target_ldat)
+ var/within_west_transit = T.x < target_ldat.level_inner_min_x //Is the turf X within the west transition edge?
+ var/within_east_transit = T.x > target_ldat.level_inner_max_x //Is the turf X within the east transition edge?
+ var/within_south_transit = T.y < target_ldat.level_inner_min_y //Is the turf Y within the south transition edge?
+ var/within_north_transit = T.y > target_ldat.level_inner_max_y //Is the turf Y within the north transition edge?
+
+ //Filter out corners, since we can't mimic those properly
+ if(within_west_transit && !within_south_transit && !within_north_transit)
+ return WEST
+ if(within_east_transit && !within_south_transit && !within_north_transit)
+ return EAST
+ if(within_south_transit && !within_west_transit && !within_east_transit)
+ return SOUTH
+ if(within_north_transit && !within_west_transit && !within_east_transit)
+ return NORTH
+
+ //Corners return null
+ return null
+
+/// Returns the turf that's opposite to the specified turf, on the level specified.
+/proc/shared_transition_edge_get_coordinates_turf_to_mimic(var/turf/T, var/datum/level_data/target_ldat)
+ var/translate_from_dir = get_turf_transition_edge_direction(T, target_ldat)
+ if(isnull(translate_from_dir))
+ //In this case we're in the corners of the map. We shouldn't mimic.
+ log_warning("Transition turf '[T]' at ([T.x], [T.y], [T.z]) was in a corner of the map. That's likely a mistake, since we can't mimic corners properly!")
+ return list(T.x, T.y, T.z)
+
+ var/newx = T.x
+ var/newy = T.y
+ switch(translate_from_dir)
+ if(NORTH)
+ newy = (target_ldat.level_inner_min_y - 1) + (T.y - target_ldat.level_inner_max_y) //The level_inner coords are inclusive, so we need to +- 1
+ if(SOUTH)
+ newy = (target_ldat.level_inner_max_y + 1) - (target_ldat.level_inner_min_y - T.y)
+ if(EAST)
+ newx = (target_ldat.level_inner_min_x - 1) + (T.x - target_ldat.level_inner_max_x)
+ if(WEST)
+ newx = (target_ldat.level_inner_max_x + 1) - (target_ldat.level_inner_min_x - T.x)
+
+ return list(newx, newy, target_ldat.level_z)
+
+///Grab the connected level data for the level connected in the direction the 'T' turf is in.
+/proc/shared_transition_edge_get_valid_level_data(var/turf/T)
+ var/datum/level_data/LD = SSmapping.levels_by_z[T.z]
+ var/edge_dir = get_turf_transition_edge_direction(T, LD)
+ var/connected_lvl_id = LD.get_connected_level_id(edge_dir)
+ if(!connected_lvl_id)
+ var/dirname = dir2text(edge_dir)
+ CRASH("Got transition_edge turf '[T]' ([T.x], [T.y], [T.z]), in direction '[dirname]', but there is no connections in level_data '[LD]' for '[dirname]'!")
+ return SSmapping.levels_by_id[connected_lvl_id]
+
+///Handles teleporting an atom that touches a transition edge/loop edge.
+/proc/shared_transition_edge_bumped(var/turf/T, var/atom/movable/AM, var/mimic_z)
+ var/datum/level_data/LDsrc = SSmapping.levels_by_z[T.z]
+ var/datum/level_data/LDdst = SSmapping.levels_by_z[mimic_z]
+ var/new_x = AM.x
+ var/new_y = AM.y
+
+ //Get the position inside the destination level's bounds to teleport the thing to
+ if(T.x <= LDsrc.level_inner_min_x)
+ new_x = LDdst.level_inner_max_x
+ else if (T.x >= LDsrc.level_inner_max_x)
+ new_x = LDdst.level_inner_min_x
+ else if (T.y <= LDsrc.level_inner_min_y)
+ new_y = LDdst.level_inner_max_y
+ else if (T.y >= LDsrc.level_inner_max_y)
+ new_y = LDdst.level_inner_min_y
+ else
+ return //If we're teleporting into the same spot just quit early
+
+ //Teleport to the turf
+ var/turf/dest = locate(new_x, new_y, mimic_z)
+ if(!dest)
+ CRASH("Turf '[T]' failed to teleport '[AM]' to [new_x], [new_y], [mimic_z]. Couldn't locate turf!")
+ if(dest.density)
+ return //If the target turf is dense, just siltently do nothing.
+
+ AM.forceMove(dest)
+ //Move grabbed things
+ if(isliving(AM))
+ var/mob/living/L = AM
+ for(var/obj/item/grab/G in L.get_active_grabs())
+ G.affecting.forceMove(dest)
+
+////////////////////////////////
+// Transition Edges
+////////////////////////////////
+
+///When soemthing touches this turf, it gets transported to the connected level matching the direction of the edge on the map
+/turf/simulated/mimic_edge/transition/setup_mimic()
+ var/list/coord = shared_transition_edge_get_coordinates_turf_to_mimic(src, shared_transition_edge_get_valid_level_data(src))
+ set_mimic_turf(coord[1], coord[2], coord[3])
+/turf/simulated/mimic_edge/transition/Entered(atom/movable/AM, atom/old_loc)
+ . = ..()
+ if(!AM.simulated || AM.anchored || istype(AM, /obj/effect/overlay))
+ return
+ if(istype(AM, /obj/effect/projectile)) //#FIXME: Once we support projectiles going through levels properly remove this
+ return
+ shared_transition_edge_bumped(src, AM, mimic_z)
+
+/turf/unsimulated/mimic_edge/transition/setup_mimic()
+ var/list/coord = shared_transition_edge_get_coordinates_turf_to_mimic(src, shared_transition_edge_get_valid_level_data(src))
+ set_mimic_turf(coord[1], coord[2], coord[3])
+/turf/unsimulated/mimic_edge/transition/Entered(atom/movable/AM, atom/old_loc)
+ . = ..()
+ if(!AM.simulated || AM.anchored || istype(AM, /obj/effect/overlay))
+ return
+ if(istype(AM, /obj/effect/projectile)) //#FIXME: Once we support projectiles going through levels properly remove this
+ return
+ shared_transition_edge_bumped(src, AM, mimic_z)
+
+/turf/exterior/mimic_edge/transition/setup_mimic()
+ var/list/coord = shared_transition_edge_get_coordinates_turf_to_mimic(src, shared_transition_edge_get_valid_level_data(src))
+ set_mimic_turf(coord[1], coord[2], coord[3])
+/turf/exterior/mimic_edge/transition/Entered(atom/movable/AM, atom/old_loc)
+ . = ..()
+ if(!AM.simulated || AM.anchored || istype(AM, /obj/effect/overlay))
+ return
+ if(istype(AM, /obj/effect/projectile)) //#FIXME: Once we support projectiles going through levels properly remove this
+ return
+ shared_transition_edge_bumped(src, AM, mimic_z)
+
+////////////////////////////////
+// Loop Edges
+////////////////////////////////
+
+///When something touches this turf, it gets transported to the symmetrically opposite turf it's mimicking.
+/turf/simulated/mimic_edge/transition/loop/set_mimic_turf(_x, _y, _z)
+ . = ..(_x, _y)
+/turf/simulated/mimic_edge/transition/loop/setup_mimic()
+ var/list/coord = shared_transition_edge_get_coordinates_turf_to_mimic(src, SSmapping.levels_by_z[src.z])
+ set_mimic_turf(coord[1], coord[2], coord[3])
+
+/turf/unsimulated/mimic_edge/transition/loop/set_mimic_turf(_x, _y, _z)
+ . = ..(_x, _y)
+/turf/unsimulated/mimic_edge/transition/loop/setup_mimic()
+ var/list/coord = shared_transition_edge_get_coordinates_turf_to_mimic(src, SSmapping.levels_by_z[src.z])
+ set_mimic_turf(coord[1], coord[2], coord[3])
+
+/turf/exterior/mimic_edge/transition/loop/set_mimic_turf(_x, _y, _z)
+ . = ..(_x, _y)
+/turf/exterior/mimic_edge/transition/loop/setup_mimic()
+ var/list/coord = shared_transition_edge_get_coordinates_turf_to_mimic(src, SSmapping.levels_by_z[src.z])
+ set_mimic_turf(coord[1], coord[2], coord[3])
+
+#undef MIMIC_EDGE_NAME
+#undef MIMIC_EDGE_DESC
\ No newline at end of file
diff --git a/code/modules/overmap/_overmap.dm b/code/modules/overmap/_overmap.dm
index e13d9884286..bb91f801571 100644
--- a/code/modules/overmap/_overmap.dm
+++ b/code/modules/overmap/_overmap.dm
@@ -9,7 +9,7 @@
var/overmap_edge_type = /turf/unsimulated/map/edge
var/overmap_turf_type = /turf/unsimulated/map
var/overmap_area_type = /area/overmap
- var/empty_level_type = /obj/abstract/level_data/space
+ var/empty_level_type = /datum/level_data/space
var/list/valid_event_types
@@ -56,7 +56,7 @@
/datum/overmap/proc/generate_overmap()
testing("Building overmap [name]...")
- SSmapping.increment_world_z_size(/obj/abstract/level_data/overmap)
+ SSmapping.increment_world_z_size(/datum/level_data/overmap)
assigned_z = world.maxz
testing("Putting [name] on [assigned_z].")
populate_overmap()
@@ -143,8 +143,8 @@
return res
// Create a new one.
- var/obj/abstract/level_data/level = SSmapping.increment_world_z_size(empty_level_type)
- return new /obj/effect/overmap/visitable/sector/temporary(null, x, y, level.my_z)
+ var/datum/level_data/level = SSmapping.increment_world_z_size(empty_level_type)
+ return new /obj/effect/overmap/visitable/sector/temporary(null, x, y, level.level_z)
/datum/overmap/proc/discard_temporary_sector(var/obj/effect/overmap/visitable/sector/temporary/sector)
if(!length(cached_temporary_sectors[empty_level_type]))
diff --git a/code/modules/overmap/exoplanets/_exoplanet.dm b/code/modules/overmap/exoplanets/_exoplanet.dm
index de817dc4ee1..87fe9e379a9 100644
--- a/code/modules/overmap/exoplanets/_exoplanet.dm
+++ b/code/modules/overmap/exoplanets/_exoplanet.dm
@@ -110,7 +110,8 @@
var/planet_name = generate_planet_name()
SetName("[planet_name], \a [name]")
- planetary_area = new planetary_area()
+ if(ispath(planetary_area))
+ planetary_area = new planetary_area()
global.using_map.area_purity_test_exempt_areas += planetary_area.type
planetary_area.SetName("Surface of [planet_name]")
@@ -173,13 +174,13 @@
update_daynight()
/obj/effect/overmap/visitable/sector/exoplanet/proc/update_daynight()
- var/obj/abstract/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
var/light = 0.1
if(!night)
light = level_data.ambient_light_level
for(var/turf/exterior/T in block(locate(daycolumn,1,min(map_z)),locate(daycolumn,maxy,max(map_z))))
if (light)
- T.set_ambient_light(COLOR_WHITE, light)
+ T.set_ambient_light(COLOR_WHITE, light) //#FIXME: Use the ambient color from the level!!
else
T.clear_ambient_light()
daycolumn++
@@ -221,7 +222,7 @@
spawned_features = seed_ruins(map_z, features_budget, /area/exoplanet, possible_features, maxx, maxy)
/obj/effect/overmap/visitable/sector/exoplanet/proc/generate_daycycle()
- var/obj/abstract/level_data/level_data = zlevels[1]
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
if(level_data.ambient_light_level)
night = FALSE //we start with a day if we have light.
@@ -264,8 +265,8 @@
/obj/effect/overmap/visitable/sector/exoplanet/get_scan_data(mob/user)
. = ..()
var/list/extra_data = list("
")
- var/obj/abstract/level_data/level_data = zlevels[1]
- var/datum/gas_mixture/atmosphere = level_data.exterior_atmosphere
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
+ var/datum/gas_mixture/atmosphere = level_data.get_exterior_atmosphere()
if(atmosphere)
if(user.skill_check(SKILL_SCIENCE, SKILL_EXPERT) || user.skill_check(SKILL_ATMOS, SKILL_EXPERT))
var/list/gases = list()
diff --git a/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm b/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm
index 1e715e9cc3a..9e5e68095e5 100644
--- a/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm
+++ b/code/modules/overmap/exoplanets/exoplanet_atmosphere.dm
@@ -10,13 +10,13 @@
//Skip fun gas gen for perfect terran worlds
if(habitability_class == HABITABILITY_IDEAL)
- for(var/obj/abstract/level_data/level_data in zlevels)
+ for(var/datum/level_data/level_data in zlevels)
level_data.exterior_atmos_temp = target_temp
level_data.exterior_atmosphere = list(
/decl/material/gas/oxygen = MOLES_O2STANDARD,
/decl/material/gas/nitrogen = MOLES_N2STANDARD
)
- level_data.setup_level_data()
+ level_data.setup_level_data() //#FIXME: That's not very nice! Calling this again, when it should have been called before?
return
var/total_moles = MOLES_CELLSTANDARD
@@ -90,7 +90,7 @@
for(var/g in gas_list)
var/adjusted_moles = gas_list[g] * target_moles / MOLES_CELLSTANDARD
set_gasmix[g] = adjusted_moles
- for(var/obj/abstract/level_data/level_data in zlevels)
+ for(var/datum/level_data/level_data in zlevels)
level_data.exterior_atmos_temp = target_temp
level_data.exterior_atmosphere = set_gasmix.Copy()
level_data.setup_level_data()
diff --git a/code/modules/overmap/exoplanets/exoplanet_fauna.dm b/code/modules/overmap/exoplanets/exoplanet_fauna.dm
index 2ede9f2f265..d3dac597b79 100644
--- a/code/modules/overmap/exoplanets/exoplanet_fauna.dm
+++ b/code/modules/overmap/exoplanets/exoplanet_fauna.dm
@@ -29,8 +29,8 @@
A.SetName("alien creature")
A.real_name = "alien creature"
A.verbs |= /mob/living/simple_animal/proc/name_species
- var/obj/abstract/level_data/level_data = zlevels[1]
- if(level_data.exterior_atmosphere)
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
+ if(level_data.get_exterior_atmosphere()) //Generates the atmos if uninitialized
//Set up gases for living things
var/list/all_gasses = decls_repository.get_decl_paths_of_subtype(/decl/material/gas)
if(!LAZYLEN(breathgas))
diff --git a/code/modules/overmap/exoplanets/exoplanet_flora.dm b/code/modules/overmap/exoplanets/exoplanet_flora.dm
index 2b5bed796ad..cc27c7fefe3 100644
--- a/code/modules/overmap/exoplanets/exoplanet_flora.dm
+++ b/code/modules/overmap/exoplanets/exoplanet_flora.dm
@@ -1,9 +1,9 @@
//Generates initial generic alien plants
/obj/effect/overmap/visitable/sector/exoplanet/proc/generate_flora()
- var/obj/abstract/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
- var/datum/gas_mixture/atmosphere = level_data?.get_exterior_atmosphere()
- var/temperature = atmosphere?.temperature || T20C
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
+ var/datum/gas_mixture/atmos = level_data.get_exterior_atmosphere() //#FIXME: Replace once exoplanet gen is merged
+ var/temperature = atmos?.temperature || T20C
for(var/i = 1 to flora_diversity)
var/datum/seed/S = new()
@@ -44,8 +44,8 @@
//Adapts seeds to this planet's atmopshere. Any special planet-speicific adaptations should go here too
/obj/effect/overmap/visitable/sector/exoplanet/proc/adapt_seed(var/datum/seed/S)
- var/obj/abstract/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
- var/datum/gas_mixture/atmosphere = level_data?.get_exterior_atmosphere()
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
+ var/datum/gas_mixture/atmosphere = level_data?.get_exterior_atmosphere() //#FIXME: Replace once exoplanet gen is merged
var/atmosphere_temperature = atmosphere?.temperature || T20C
var/atmosphere_pressure = atmosphere?.return_pressure() || 0
diff --git a/code/modules/overmap/exoplanets/exoplanet_skybox.dm b/code/modules/overmap/exoplanets/exoplanet_skybox.dm
index cd4f02c22b2..76b5ad99ce1 100644
--- a/code/modules/overmap/exoplanets/exoplanet_skybox.dm
+++ b/code/modules/overmap/exoplanets/exoplanet_skybox.dm
@@ -21,9 +21,9 @@
water.transform = water.transform.Turn(rand(0,360))
skybox_image.overlays += water
- var/obj/abstract/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
- var/datum/gas_mixture/atmosphere = level_data?.get_exterior_atmosphere()
- if(atmosphere?.return_pressure() > SOUND_MINIMUM_PRESSURE)
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
+ var/datum/gas_mixture/atmos = level_data.get_exterior_atmosphere()
+ if(atmos?.return_pressure() > SOUND_MINIMUM_PRESSURE)
var/atmo_color = get_atmosphere_color()
if(!atmo_color)
@@ -64,9 +64,9 @@
/obj/effect/overmap/visitable/sector/exoplanet/proc/get_atmosphere_color()
var/list/colors = list()
- for(var/Z in map_z)
- var/obj/abstract/level_data/level_data = SSmapping.levels_by_z[Z]
- for(var/g in level_data.exterior_atmosphere?.gas)
+ for(var/datum/level_data/level_data in zlevels)
+ var/datum/gas_mixture/atmos = level_data.get_exterior_atmosphere()
+ for(var/g in atmos?.gas)
var/decl/material/mat = GET_DECL(g)
colors += mat.color
if(colors.len)
diff --git a/code/modules/overmap/exoplanets/planet_themes/radiation_bombing.dm b/code/modules/overmap/exoplanets/planet_themes/radiation_bombing.dm
index 3ac6e115cbf..0d97a94343d 100644
--- a/code/modules/overmap/exoplanets/planet_themes/radiation_bombing.dm
+++ b/code/modules/overmap/exoplanets/planet_themes/radiation_bombing.dm
@@ -3,7 +3,7 @@
/datum/exoplanet_theme/radiation_bombing/adjust_atmosphere(obj/effect/overmap/visitable/sector/exoplanet/E)
var/add_temp = rand(20, 100)
- for(var/obj/abstract/level_data/level_data in E.zlevels)
+ for(var/datum/level_data/level_data in E.zlevels)
level_data.exterior_atmos_temp += add_temp
if(level_data.exterior_atmosphere)
level_data.exterior_atmosphere.temperature = level_data.exterior_atmos_temp
diff --git a/code/modules/overmap/exoplanets/planet_types/chlorine.dm b/code/modules/overmap/exoplanets/planet_types/chlorine.dm
index 958e6bfa843..e0e251580fb 100644
--- a/code/modules/overmap/exoplanets/planet_types/chlorine.dm
+++ b/code/modules/overmap/exoplanets/planet_types/chlorine.dm
@@ -23,7 +23,7 @@
return "#e5f2bd"
/obj/effect/overmap/visitable/sector/exoplanet/chlorine/generate_map()
- var/obj/abstract/level_data/level_data = zlevels[1]
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
if(prob(50))
level_data.ambient_light_level = rand(7,10)/10 //It could be night.
else
diff --git a/code/modules/overmap/exoplanets/planet_types/desert.dm b/code/modules/overmap/exoplanets/planet_types/desert.dm
index 63fab9ef8a1..d6097859d37 100644
--- a/code/modules/overmap/exoplanets/planet_types/desert.dm
+++ b/code/modules/overmap/exoplanets/planet_types/desert.dm
@@ -18,7 +18,7 @@
/obj/effect/overmap/visitable/sector/exoplanet/desert/generate_map()
if(prob(70))
- var/obj/abstract/level_data/level_data = zlevels[1]
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
level_data.ambient_light_level = rand(5,10)/10 //deserts are usually :lit:
..()
diff --git a/code/modules/overmap/exoplanets/planet_types/grass.dm b/code/modules/overmap/exoplanets/planet_types/grass.dm
index cef84c64384..c4a3b23e5be 100644
--- a/code/modules/overmap/exoplanets/planet_types/grass.dm
+++ b/code/modules/overmap/exoplanets/planet_types/grass.dm
@@ -12,7 +12,7 @@
/obj/effect/overmap/visitable/sector/exoplanet/grass/generate_map()
if(prob(40))
- var/obj/abstract/level_data/level_data = zlevels[1]
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
level_data.ambient_light_level = rand(1,7)/10 //give a chance of twilight jungle
..()
diff --git a/code/modules/overmap/exoplanets/planet_types/meat.dm b/code/modules/overmap/exoplanets/planet_types/meat.dm
index d2043b862b9..dbda6ece5ac 100644
--- a/code/modules/overmap/exoplanets/planet_types/meat.dm
+++ b/code/modules/overmap/exoplanets/planet_types/meat.dm
@@ -19,7 +19,7 @@
spawn_weight = 10 // meat
/obj/effect/overmap/visitable/sector/exoplanet/meat/generate_map()
- var/obj/abstract/level_data/level_data = zlevels[1]
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
level_data.ambient_light_level = rand(1,7)/10
..()
diff --git a/code/modules/overmap/exoplanets/planet_types/shrouded.dm b/code/modules/overmap/exoplanets/planet_types/shrouded.dm
index 2e5bb86845d..0d722680658 100644
--- a/code/modules/overmap/exoplanets/planet_types/shrouded.dm
+++ b/code/modules/overmap/exoplanets/planet_types/shrouded.dm
@@ -20,7 +20,7 @@
// TODO check if ambient lighting handles negatives
/obj/effect/overmap/visitable/sector/exoplanet/meat/generate_map()
- var/obj/abstract/level_data/level_data = zlevels[1]
+ var/datum/level_data/level_data = SSmapping.levels_by_z[map_z[1]]
level_data.ambient_light_level = -0.15
..()
diff --git a/code/modules/overmap/exoplanets/random_map.dm b/code/modules/overmap/exoplanets/random_map.dm
index d95a3c36c78..64fa3ada0e5 100644
--- a/code/modules/overmap/exoplanets/random_map.dm
+++ b/code/modules/overmap/exoplanets/random_map.dm
@@ -37,7 +37,6 @@
plantcolors = _plant_colors
..()
- SSmapping.base_turf_by_z[tz] = land_type
/datum/random_map/noise/exoplanet/get_map_char(var/value)
if(water_type && noise2value(value) < water_level)
diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm
index d0e2689fa6d..ae526becd47 100644
--- a/code/modules/overmap/ships/landable.dm
+++ b/code/modules/overmap/ships/landable.dm
@@ -9,7 +9,7 @@
var/use_mapped_z_levels = FALSE // If true, it will use the z level block on which it's mapped as the "Open Space" block; if false it creates a new block for that.
// If you use this, use /obj/effect/shuttle_landmark/ship as the landmark (set the landmark tag to match on the shuttle; no other setup needed)
var/status = SHIP_STATUS_LANDED
- var/level_type = /obj/abstract/level_data/space
+ var/level_type = /datum/level_data/space
icon_state = "shuttle"
moving_state = "shuttle_moving"
diff --git a/code/modules/power/geothermal/_geothermal.dm b/code/modules/power/geothermal/_geothermal.dm
index f6db7a6e433..9cad5e8ccd0 100644
--- a/code/modules/power/geothermal/_geothermal.dm
+++ b/code/modules/power/geothermal/_geothermal.dm
@@ -1,24 +1,86 @@
var/global/const/GEOTHERMAL_EFFICIENCY_MOD = 0.2
var/global/const/GEOTHERMAL_PRESSURE_LOSS = 0.3
-var/global/const/GEOTHERMAL_PRESSURE_CONSUMED_PER_TICK = 0.5
-var/global/const/GEOTHERMAL_PRESSURE_TO_POWER = 100
-var/global/const/MAX_GEOTHERMAL_PRESSURE = 2000
+var/global/const/GEOTHERMAL_PRESSURE_CONSUMED_PER_TICK = 0.05
+var/global/const/GEOTHERMAL_PRESSURE_TO_POWER = 800
+var/global/const/MAX_GEOTHERMAL_PRESSURE = 12000
+//////////////////////////////////////////////////////////////////////
+// Geyser Steam Particle Emitter
+//////////////////////////////////////////////////////////////////////
+
+///Particle emitter that emits a ~64 pixels by ~192 pixels high column of steam while active.
+/particles/geyser_steam
+ icon_state = "smallsmoke"
+ icon = 'icons/effects/effects.dmi'
+ width = WORLD_ICON_SIZE * 2 //Particles expand a bit as they climb, so need a bit of space on the width
+ height = WORLD_ICON_SIZE * 6 //Needs to be really tall, because particles stop being drawn outside of the canvas.
+ count = 64
+ spawning = 5
+ lifespan = generator("num", 1 SECOND, 2.5 SECONDS, LINEAR_RAND)
+ fade = 3 SECONDS
+ fadein = 0.25 SECONDS
+ grow = 0.1
+ velocity = generator("vector", list(0, 0), list(0, 0.2))
+ position = generator("circle", -6, 6, NORMAL_RAND)
+ gravity = list(0, 0.40)
+ scale = generator("vector", list(0.3, 0.3), list(1,1), NORMAL_RAND)
+ rotation = generator("num", -45, 45)
+ spin = generator("num", -20, 20)
+
+//////////////////////////////////////////////////////////////////////
+// Geyser Object
+//////////////////////////////////////////////////////////////////////
+
+///A prop that periodically emit steam spouts and can have a geothermal generator placed on top to generate power.
/obj/effect/geyser
- name = "geothermal vent"
- desc = "A crack in the ocean floor that occasionally vents gouts of superheated water and steam."
- icon = 'icons/effects/geyser.dmi'
+ name = "geothermal vent"
+ desc = "A vent leading to an underground geothermally heated reservoir, which periodically spews superheated liquid."
+ icon = 'icons/effects/geyser.dmi'
icon_state = "geyser"
- anchored = TRUE
- layer = TURF_LAYER + 0.01
+ anchored = TRUE
+ layer = TURF_LAYER + 0.01
+ level = 1 //Goes under floor/plating
+ ///The particle emitter that will generate the steam column effect for this geyser
+ var/particles/geyser_steam/steamfx
-/obj/effect/geyser/Initialize()
+/obj/effect/geyser/Initialize(ml)
. = ..()
if(prob(50))
var/matrix/M = matrix()
M.Scale(-1, 1)
transform = M
set_extension(src, /datum/extension/geothermal_vent)
+ steamfx = new //Prepare our FX
+
+///Async proc that enables the particle emitter for the steam column for a few seconds
+/obj/effect/geyser/proc/do_spout()
+ set waitfor = FALSE
+ particles = steamfx
+ particles.spawning = initial(particles.spawning)
+ sleep(6 SECONDS)
+ particles.spawning = 0
+
+/obj/effect/geyser/explosion_act(severity)
+ . = ..()
+ if(!QDELETED(src) && prob(100 - (25 * severity)))
+ physically_destroyed()
+
+/obj/effect/geyser/hide(hide)
+ var/datum/extension/geothermal_vent/E = get_extension(src, /datum/extension/geothermal_vent)
+ if(istype(E))
+ E.set_obstructed(hide)
+ . = ..()
+ update_icon()
+
+//////////////////////////////////////////////////////////////////////
+// Underwater Geyser Variant
+//////////////////////////////////////////////////////////////////////
+
+/obj/effect/geyser/underwater
+ desc = "A crack in the ocean floor that occasionally vents gouts of superheated water and steam."
+
+/obj/effect/geyser/underwater/Initialize(ml)
+ . = ..()
for(var/turf/exterior/seafloor/T in RANGE_TURFS(loc, 5))
var/dist = get_dist(loc, T)-1
if(prob(100 - (dist * 20)))
@@ -26,43 +88,125 @@ var/global/const/MAX_GEOTHERMAL_PRESSURE = 2000
if(prob(50 - (dist * 10)))
new /obj/random/seaweed(T)
-/obj/effect/geyser/explosion_act(severity)
- . = ..()
- if(!QDELETED(src) && prob(100 - (25 * severity)))
- physically_destroyed()
+/obj/effect/geyser/underwater/do_spout()
+ set waitfor = FALSE
+ var/turf/T = get_turf(src)
+ T.show_bubbles()
+//////////////////////////////////////////////////////////////////////
+// Geothermal Generator
+//////////////////////////////////////////////////////////////////////
+
+///A power generator that can create power from being placed on top of a geyser.
/obj/machinery/geothermal
- icon = 'icons/obj/machines/power/geothermal.dmi'
- icon_state = "geothermal-base"
- var/tmp/neighbors = 0
- var/tmp/current_pressure = 0
- var/efficiency = 0.5
+ name = "geothermal generator"
+ icon = 'icons/obj/machines/power/geothermal.dmi'
+ icon_state = "geothermal-base"
+ density = TRUE
+ anchored = TRUE
+ waterproof = TRUE
+ interact_offline = TRUE
+ stat_immune = NOSCREEN | NOINPUT | NOPOWER
+ core_skill = SKILL_ENGINES
+ required_interaction_dexterity = DEXTERITY_SIMPLE_MACHINES
+ construct_state = /decl/machine_construction/default/panel_closed
+ uncreated_component_parts = list(
+ /obj/item/stock_parts/power/terminal,
+ )
+ stock_part_presets = list(
+ /decl/stock_part_preset/terminal_setup/offset_dir,
+ )
+ var/tmp/neighbors = 0
+ var/tmp/current_pressure = 0
+ var/tmp/efficiency = 0.5
+ var/tmp/last_generated = 0
+ var/tmp/datum/extension/geothermal_vent/vent
+ var/tmp/obj/item/stock_parts/power/terminal/connector
+ var/tmp/image/glow
+ var/tmp/list/neighbor_connectors
+ var/tmp/list/neighbor_connectors_glow
+
+//#TODO: Maybe should cache neighbors and put listeners on them?
+
+/obj/machinery/geothermal/Initialize(mapload, d, populate_parts = TRUE)
+ . = ..()
+ if(get_turf(loc))
+ refresh_neighbors()
+ propagate_refresh_neighbors()
+ STOP_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/geothermal/LateInitialize()
+ . = ..()
+ setup_vent()
+
+/obj/machinery/geothermal/Destroy()
+ var/atom/last_loc = loc
+ unset_vent()
+ . = ..()
+ if(istype(last_loc))
+ propagate_refresh_neighbors(last_loc)
+
+///Tell all neighbors of the center atom to call update neighbors
+/obj/machinery/geothermal/proc/propagate_refresh_neighbors(var/atom/center = src)
+ for(var/adir in global.alldirs)
+ var/obj/machinery/geothermal/G = locate(/obj/machinery/geothermal) in get_step(center, adir)
+ if(G?.anchored)
+ G.refresh_neighbors()
+
+/obj/machinery/geothermal/examine(mob/user, distance)
+ . = ..()
+ if(distance < 2)
+ to_chat(user, SPAN_INFO("Pressure: [current_pressure]kPa"))
+ to_chat(user, SPAN_INFO("Output: [last_generated]W"))
+
+///Attempts to connect to any existing geothermal vents in our turf.
+/obj/machinery/geothermal/proc/setup_vent()
+ var/turf/T = get_turf(src)
+ for(var/obj/O in T)
+ var/datum/extension/geothermal_vent/GV = get_extension(O, /datum/extension/geothermal_vent)
+ if(!GV || QDELETED(GV))
+ continue
+ vent = GV
+ vent.set_my_generator(src)
+ return TRUE
+
+///Disconnect from any geothermal vents we may be connected to
+/obj/machinery/geothermal/proc/unset_vent()
+ if(QDELETED(vent))
+ return
+ vent.set_my_generator(null)
+ vent = null
/obj/machinery/geothermal/RefreshParts()
..()
efficiency = clamp(total_component_rating_of_type(/obj/item/stock_parts/capacitor) * GEOTHERMAL_EFFICIENCY_MOD, GEOTHERMAL_EFFICIENCY_MOD, 1)
+ connector = get_component_of_type(/obj/item/stock_parts/power/terminal)
/obj/machinery/geothermal/proc/add_pressure(var/pressure)
current_pressure = clamp(current_pressure + pressure, 0, MAX_GEOTHERMAL_PRESSURE)
- if(!is_processing)
- START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
+ var/leftover = round(pressure - current_pressure)
+ if(leftover > 0)
+ addtimer(CALLBACK(src, .proc/propagate_pressure, leftover), 5)
+ update_icon()
+ START_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
/obj/machinery/geothermal/Process()
- if(anchored && !(stat & BROKEN) && loc)
+ if(loc && anchored && !(stat & BROKEN))
var/consumed_pressure = current_pressure * GEOTHERMAL_PRESSURE_CONSUMED_PER_TICK
current_pressure -= consumed_pressure
var/remaining_pressure = consumed_pressure
- consumed_pressure = round(consumed_pressure * efficiency)
+ consumed_pressure = round(consumed_pressure * efficiency, 0.01)
remaining_pressure -= consumed_pressure
- var/generated_power = round(consumed_pressure * GEOTHERMAL_PRESSURE_TO_POWER)
- if(generated_power)
- generate_power(generated_power)
+ last_generated = round(consumed_pressure * GEOTHERMAL_PRESSURE_TO_POWER, 0.01)
+ if(last_generated)
+ generate_power(last_generated)
remaining_pressure = round(remaining_pressure * GEOTHERMAL_PRESSURE_LOSS)
if(remaining_pressure)
addtimer(CALLBACK(src, .proc/propagate_pressure, remaining_pressure), 5)
update_icon()
- if(current_pressure <= 10)
+ if(current_pressure <= 1)
return PROCESS_KILL
/obj/machinery/geothermal/proc/propagate_pressure(var/remaining_pressure)
@@ -86,46 +230,41 @@ var/global/const/MAX_GEOTHERMAL_PRESSURE = 2000
if(last_neighbors != neighbors)
update_icon()
-/obj/machinery/geothermal/Initialize()
- . = ..()
- refresh_neighbors()
- for(var/turf/T as anything in RANGE_TURFS(loc, 1))
- for(var/obj/machinery/geothermal/neighbor in T)
- neighbor.refresh_neighbors()
- STOP_PROCESSING_MACHINE(src, MACHINERY_PROCESS_SELF)
-
-/obj/machinery/geothermal/Destroy()
- var/atom/last_loc = loc
- . = ..()
- if(istype(last_loc))
- for(var/turf/T as anything in RANGE_TURFS(last_loc, 1))
- for(var/obj/machinery/geothermal/neighbor in T)
- neighbor.refresh_neighbors()
-
/obj/machinery/geothermal/on_update_icon()
-
- . = ..()
-
cut_overlays()
+ var/output_ratio = current_pressure / 3000
+ var/glow_alpha = clamp(round((current_pressure / MAX_GEOTHERMAL_PRESSURE) * 255), 10, 255)
+ if(!glow)
+ glow = emissive_overlay(icon, "geothermal-glow")
+ if(!length(neighbor_connectors))
+ for(var/neighbordir in global.cardinal)
+ LAZYSET(neighbor_connectors, "[neighbordir]", image(icon, "geothermal-connector", dir = neighbordir))
+ LAZYSET(neighbor_connectors_glow, "[neighbordir]", image(icon, "geothermal-connector-glow", dir = neighbordir))
if(neighbors)
for(var/neighbordir in global.cardinal)
if(neighbors & neighbordir)
- add_overlay(image(icon, "geothermal-connector", dir = neighbordir))
-
- if(current_pressure > 0)
- set_light(2, 0.5, COLOR_RED)
- add_overlay(image(icon, "geothermal-turbine-[clamp(round(current_pressure / 200), 0, 3)]"))
- var/glow_alpha = clamp(round((current_pressure / 500) * 255), 20, 255)
- var/image/I = emissive_overlay(icon, "geothermal-glow")
- I.alpha = glow_alpha
- add_overlay(I)
- if(neighbors)
- for(var/neighbordir in global.cardinal)
- if(neighbors & neighbordir)
- // emissive_overlay is not setting dir and setting plane/layer directly also causes dir to break :(
- I = image(icon, "geothermal-connector-glow", dir = neighbordir)
- I.alpha = glow_alpha
- add_overlay(I)
- else
+ add_overlay(neighbor_connectors["[neighbordir]"])
+ // emissive_overlay is not setting dir and setting plane/layer directly also causes dir to break :(
+ var/image/neighborglow = neighbor_connectors_glow["[neighbordir]"]
+ neighborglow.alpha = glow_alpha
+ add_overlay(neighborglow)
+
+ if(round(current_pressure, 0.1) <= 0)
set_light(0)
+ return
+
+ set_light(1, clamp(output_ratio, 0.2, 1.0), COLOR_RED)
+ add_overlay("geothermal-turbine-[clamp(round(output_ratio * 3), 0, 3)]")
+ glow.alpha = glow_alpha
+ add_overlay(glow)
+
+/obj/machinery/geothermal/dismantle()
+ . = ..()
+ unset_vent()
+
+/obj/machinery/geothermal/get_powernet()
+ return connector?.terminal?.get_powernet()
+
+/obj/machinery/geothermal/drain_power()
+ return -1
\ No newline at end of file
diff --git a/code/modules/power/geothermal/geothermal_circuit.dm b/code/modules/power/geothermal/geothermal_circuit.dm
index 2b34cbf2224..07d451d68fa 100644
--- a/code/modules/power/geothermal/geothermal_circuit.dm
+++ b/code/modules/power/geothermal/geothermal_circuit.dm
@@ -1,5 +1,5 @@
/obj/item/stock_parts/circuitboard/geothermal
- name = "circuitboard (geothermal turbine)"
+ name = "circuitboard (geothermal generator)"
build_path = /obj/machinery/geothermal
board_type = "machine"
origin_tech = "{'magnets':3,'powerstorage':3}"
@@ -8,3 +8,4 @@
/obj/item/stock_parts/manipulator = 2,
/obj/item/stack/cable_coil = 5
)
+ additional_spawn_components = null
diff --git a/code/modules/power/geothermal/geothermal_extension.dm b/code/modules/power/geothermal/geothermal_extension.dm
index 3eef52c7075..0d734d38116 100644
--- a/code/modules/power/geothermal/geothermal_extension.dm
+++ b/code/modules/power/geothermal/geothermal_extension.dm
@@ -1,34 +1,45 @@
/datum/extension/geothermal_vent
base_type = /datum/extension/geothermal_vent
- expected_type = /atom
+ expected_type = /obj/effect/geyser
flags = EXTENSION_FLAG_IMMEDIATE
var/pressure_min = 1000
var/pressure_max = 2000
- var/steam_min = 30 SECONDS
- var/steam_max = 1 MINUTE
+ var/steam_min = 20 SECONDS
+ var/steam_max = 60 SECONDS
var/tmp/next_steam = 0
- var/datum/effect/effect/system/steam_spread/steam
+ var/tmp/obstructed = FALSE
+ var/obj/machinery/geothermal/my_machine
+ var/obj/effect/geyser/my_vent
-/datum/extension/geothermal_vent/New()
+/datum/extension/geothermal_vent/New(datum/holder)
..()
START_PROCESSING(SSprocessing, src)
+ my_vent = holder
/datum/extension/geothermal_vent/Destroy()
+ my_machine = null
+ my_vent = null
. = ..()
STOP_PROCESSING(SSprocessing, src)
-
+
+/datum/extension/geothermal_vent/proc/set_my_generator(var/obj/machinery/geothermal/G)
+ my_machine = G
+
+/datum/extension/geothermal_vent/proc/set_obstructed(var/state)
+ obstructed = state
+ if(obstructed)
+ STOP_PROCESSING(SSprocessing, src)
+ else
+ START_PROCESSING(SSprocessing, src)
+
/datum/extension/geothermal_vent/Process()
- ..()
+ if(obstructed && !my_machine) //If we have a machine, don't care about obstruction, or it might cause problems
+ return PROCESS_KILL
+
if(world.time >= next_steam)
next_steam = world.time + rand(steam_min, steam_max)
- var/turf/T = get_turf(holder)
- if(!istype(T))
- return
- var/obj/machinery/geothermal/geothermal = locate() in T
- if(geothermal?.anchored)
- geothermal.add_pressure(rand(pressure_min, pressure_max))
- return
- if(!steam)
- steam = new
- steam.set_up(5, 0, holder)
- steam.start()
+ //If we cached something, make it work
+ if(my_machine?.anchored)
+ my_machine.add_pressure(rand(pressure_min, pressure_max))
+ else
+ my_vent.do_spout() //Let the holder decide what to do when spewing steam
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 090bd283b74..9eee66308bf 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -148,6 +148,10 @@
labels = list("flash")
ammo_type = /obj/item/ammo_casing/pistol/flash
+/obj/item/ammo_magazine/pistol/emp
+ labels = list("haywire")
+ ammo_type = /obj/item/ammo_casing/pistol/emp
+
/obj/item/ammo_magazine/pistol/small
icon_state = "holdout"
material = /decl/material/solid/metal/steel
@@ -243,6 +247,14 @@
max_ammo = 7
multiple_sprites = 1
+/obj/item/ammo_magazine/speedloader/rubber
+ labels = list("rubber")
+ ammo_type = /obj/item/ammo_casing/pistol/magnum/rubber
+
+/obj/item/ammo_magazine/speedloader/practice
+ labels = list("practice")
+ ammo_type = /obj/item/ammo_casing/pistol/magnum/practice
+
/obj/item/ammo_magazine/speedloader/laser_revolver
caliber = CALIBER_PISTOL_LASBULB
ammo_type = /obj/item/ammo_casing/lasbulb
diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm
index 8f727a8132a..54f6374aecf 100644
--- a/code/modules/projectiles/ammunition/bullets.dm
+++ b/code/modules/projectiles/ammunition/bullets.dm
@@ -63,6 +63,28 @@
projectile_type = /obj/item/projectile/bullet/pistol/strong
icon = 'icons/obj/ammo/casings/magnum.dmi'
+/obj/item/ammo_casing/pistol/magnum/rubber
+ desc = "A rubber bullet casing."
+ projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong
+ bullet_color = COLOR_GRAY40
+
+/obj/item/ammo_casing/pistol/magnum/practice
+ desc = "A practice bullet casing."
+ projectile_type = /obj/item/projectile/bullet/pistol/practice
+ bullet_color = COLOR_OFF_WHITE
+ marking_color = COLOR_SUN
+
+/obj/item/ammo_casing/pistol/magnum/stun
+ name = "stun round"
+ desc = "An energy stun cartridge."
+ icon_state = "stunshell"
+ spent_icon = "stunshell-spent"
+ projectile_type = /obj/item/projectile/energy/electrode/stunshot
+ leaves_residue = 0
+ material = /decl/material/solid/metal/steel
+ matter = list(/decl/material/solid/glass = MATTER_AMOUNT_REINFORCEMENT)
+ origin_tech = "{'combat':3,'materials':3}"
+
/obj/item/ammo_casing/shotgun
name = "shotgun slug"
desc = "A shotgun slug."
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 6122670a859..71f69f05964 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -12,6 +12,9 @@
/obj/item/gun/projectile/pistol/rubber
magazine_type = /obj/item/ammo_magazine/pistol/rubber
+/obj/item/gun/projectile/pistol/emp
+ magazine_type = /obj/item/ammo_magazine/pistol/emp
+
/obj/item/gun/projectile/pistol/update_base_icon()
var/base_state = get_world_inventory_state()
if(!length(ammo_magazine?.stored_ammo) && check_state_in_icon("[base_state]-e", icon))
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 71ed2ce36a3..2fdf3b7c45e 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -41,6 +41,9 @@
chamber_offset = 0
return ..()
+/obj/item/gun/projectile/revolver/stun
+ ammo_type = /obj/item/ammo_casing/pistol/magnum/stun
+
/obj/item/gun/projectile/revolver/capgun
name = "cap gun"
desc = "Looks almost like the real thing! Ages 8 and up."
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 8b00d325258..c431df0db47 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -91,6 +91,10 @@
agony = 30
embed = 0
+/obj/item/projectile/bullet/pistol/rubber/strong
+ damage = 8
+ agony = 38
+
/obj/item/projectile/bullet/pistol/rubber/holdout
agony = 20
diff --git a/code/modules/shuttles/docking_beacon.dm b/code/modules/shuttles/docking_beacon.dm
index 37dcaa79577..abaac314379 100644
--- a/code/modules/shuttles/docking_beacon.dm
+++ b/code/modules/shuttles/docking_beacon.dm
@@ -312,13 +312,13 @@
break
area_turf = get_step(area_turf, dir)
- // Otherwise, use the planetary or world area.
+ // Otherwise, use the level or world area.
if(!base_area)
- var/obj/effect/overmap/visitable/sector/exoplanet/planet = global.overmap_sectors[num2text(z)]
- if(istype(planet))
- base_area = ispath(planet.planetary_area) ? planet.planetary_area : planet.planetary_area.type
+ var/datum/level_data/LD = SSmapping.levels_by_z[z]
+ if(istype(LD))
+ base_area = LD.get_base_area_instance()
else
- base_area = world.area
+ base_area = locate(world.area)
var/turf/center_turf
switch(dir)
diff --git a/code/unit_tests/atmospherics_tests.dm b/code/unit_tests/atmospherics_tests.dm
index 4dd84f63b92..20ab46c5c9a 100644
--- a/code/unit_tests/atmospherics_tests.dm
+++ b/code/unit_tests/atmospherics_tests.dm
@@ -381,7 +381,7 @@
var/fail = FALSE
// make a place to test
- SSmapping.increment_world_z_size(/obj/abstract/level_data/unit_test)
+ SSmapping.increment_world_z_size(/datum/level_data/unit_test)
for(var/turf/T in block(locate(1, 1, world.maxz), locate(3, 3, world.maxz)))
T.ChangeTurf(/turf/simulated/floor)
var/turf/T = locate(2, 2, world.maxz)
diff --git a/code/unit_tests/del_the_world.dm b/code/unit_tests/del_the_world.dm
index 6beea4343c7..bbe1cc41271 100644
--- a/code/unit_tests/del_the_world.dm
+++ b/code/unit_tests/del_the_world.dm
@@ -26,6 +26,8 @@
// Not valid when spawned manually.
/obj/effect/overmap,
/obj/effect/shuttle_landmark,
+ // Docking controllers can only exist once with a given id_tag in the world. And some subtypes are defined with an id_tag
+ /obj/machinery/embedded_controller/radio/simple_docking_controller,
) + list(
// Exclude only this type, since it's not meant to be spawned but its subtypes are.
// TODO: Consider whether this warrants abstract_type?
diff --git a/code/unit_tests/zlevel_tests.dm b/code/unit_tests/zlevel_tests.dm
index 0b33829fc27..5c6829802b0 100644
--- a/code/unit_tests/zlevel_tests.dm
+++ b/code/unit_tests/zlevel_tests.dm
@@ -4,7 +4,7 @@
/datum/unit_test/all_zlevels_will_have_a_non_filler_data_object/start_test()
var/list/failures = list()
for(var/z = 1 to world.maxz)
- 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)
failures += "z[z] has no level data object"
if(length(failures))
diff --git a/code/unit_tests/~unit_test_subsystems.dm b/code/unit_tests/~unit_test_subsystems.dm
index 57d1f69a19e..e199cb31454 100644
--- a/code/unit_tests/~unit_test_subsystems.dm
+++ b/code/unit_tests/~unit_test_subsystems.dm
@@ -44,6 +44,9 @@ SUBSYSTEM_DEF(unit_tests)
if(MAP_TEMPLATE_CATEGORY_AWAYSITE in map_template.template_categories)
report_progress("Skipping template '[map_template]' ([map_template.type]): Is an Away Site")
continue
+ if(MAP_TEMPLATE_CATEGORY_MAIN_SITE in map_template.template_categories)
+ report_progress("Skipping template '[map_template]' ([map_template.type]): Is a main site template.")
+ continue
load_template(map_template)
if(map_template.template_flags & TEMPLATE_FLAG_TEST_DUPLICATES)
load_template(map_template)
@@ -52,7 +55,7 @@ SUBSYSTEM_DEF(unit_tests)
/datum/controller/subsystem/unit_tests/proc/load_template(datum/map_template/map_template)
// Suggestion: Do smart things here to squeeze as many templates as possible into the same Z-level
if(map_template.tallness == 1)
- SSmapping.increment_world_z_size(/obj/abstract/level_data/unit_test)
+ SSmapping.increment_world_z_size(/datum/level_data/unit_test)
var/corner = locate(world.maxx/2, world.maxy/2, world.maxz)
log_unit_test("Loading template '[map_template]' ([map_template.type]) at [log_info_line(corner)]")
map_template.load(corner)
diff --git a/html/changelog.html b/html/changelog.html
index 90c8145dcd1..4aa45b15d62 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -88,6 +88,42 @@ 18 January 2023
NataKilar updated:
- Items no longer appear heavily damaged regardless of their health
+ 25 March 2023
+ PsyCommando updated:
+
+ - Fixed geothermal generators.
+
+
+ 13 February 2023
+ Chinsky updated:
+
+ - Remapped Tradeship main shuttle to a slightly more spacious one
+ - Steel katanas were woefully underpowered, they are now actually sharp
+ - Steel is harder now
+
+
+ 10 February 2023
+ Chinsky updated:
+
+ - Remote terminal commands now properly check access of the target machine
+
+
+ 09 February 2023
+ PsyCommando updated:
+
+ - fixed vents being nearly silent.
+
+
+ 06 February 2023
+ Chinsky updated:
+
+ - Machines with network connector stock parts now expose all of their functions over network
+
+
+ 01 February 2023
+ quardbreak updated:
+
+ - Fixed missing circuit recipe for radiocarbon spectrometer.
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 491b4aee6d4..b11da7145eb 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -14461,3 +14461,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Remapped Tradeship main shuttle to a slightly more spacious one
- bugfix: Steel katanas were woefully underpowered, they are now actually sharp
- tweak: Steel is harder now
+2023-03-25:
+ PsyCommando:
+ - bugfix: Fixed geothermal generators.
diff --git a/maps/away/liberia/liberia.dmm b/maps/away/liberia/liberia.dmm
index 32eb3e83115..f7463e7bac5 100644
--- a/maps/away/liberia/liberia.dmm
+++ b/maps/away/liberia/liberia.dmm
@@ -6280,7 +6280,7 @@
/turf/simulated/floor/tiled,
/area/liberia/hallway)
"oJ" = (
-/obj/abstract/level_data/player_level{
+/obj/abstract/level_data_spawner/player{
name = "Liberia";
},
/turf/space,
diff --git a/maps/away/lost_supply_base/lost_supply_base.dm b/maps/away/lost_supply_base/lost_supply_base.dm
index d7784e76fd6..a5625609b6d 100644
--- a/maps/away/lost_supply_base/lost_supply_base.dm
+++ b/maps/away/lost_supply_base/lost_supply_base.dm
@@ -18,7 +18,7 @@
description = "An abandoned supply base."
suffixes = list("lost_supply_base/lost_supply_base.dmm")
cost = 1
- level_data_type = /obj/abstract/level_data/mining_level
+ level_data_type = /datum/level_data/mining_level
area_usage_test_exempted_root_areas = list(/area/lost_supply_base)
apc_test_exempt_areas = list(
/area/lost_supply_base/solar = NO_SCRUBBER|NO_VENT
diff --git a/maps/away/mining/mining.dm b/maps/away/mining/mining.dm
index c07027f296a..13113a762e7 100644
--- a/maps/away/mining/mining.dm
+++ b/maps/away/mining/mining.dm
@@ -29,7 +29,7 @@
suffixes = list("mining/mining-asteroid.dmm")
cost = 1
accessibility_weight = 10
- level_data_type = /obj/abstract/level_data/mining_level/asteroid
+ level_data_type = /datum/level_data/mining_level/asteroid
apc_test_exempt_areas = list(
/area/outpost/abandoned = NO_SCRUBBER,
/area/mine/explored = NO_SCRUBBER|NO_VENT|NO_APC,
@@ -97,7 +97,7 @@
description = "A mineral-rich, formerly-volcanic site on a planetoid."
suffixes = list("mining/mining-signal.dmm")
cost = 1
- level_data_type = /obj/abstract/level_data/mining_level/asteroid
+ level_data_type = /datum/level_data/mining_level/asteroid
area_usage_test_exempted_root_areas = list(/area/mine, /area/outpost)
apc_test_exempt_areas = list(
/area/mine/explored = NO_SCRUBBER|NO_VENT|NO_APC,
@@ -163,7 +163,7 @@
suffixes = list("mining/mining-orb.dmm")
cost = 1
accessibility_weight = 10
- level_data_type = /obj/abstract/level_data/mining_level/asteroid
+ level_data_type = /datum/level_data/mining_level/asteroid
area_usage_test_exempted_root_areas = list(/area/mine)
area_usage_test_exempted_areas = list(/area/djstation)
apc_test_exempt_areas = list(
diff --git a/maps/away/slavers/slavers_base.dm b/maps/away/slavers/slavers_base.dm
index 797e3b7096a..b7b2cf50157 100644
--- a/maps/away/slavers/slavers_base.dm
+++ b/maps/away/slavers/slavers_base.dm
@@ -20,7 +20,7 @@
description = "Asteroid with slavers base inside."
suffixes = list("slavers/slavers_base.dmm")
cost = 1
- level_data_type = /obj/abstract/level_data/mining_level
+ level_data_type = /datum/level_data/mining_level
area_usage_test_exempted_root_areas = list(/area/slavers_base)
apc_test_exempt_areas = list(
/area/slavers_base/hangar = NO_SCRUBBER
diff --git a/maps/away/smugglers/smugglers.dm b/maps/away/smugglers/smugglers.dm
index 44f24440d9b..7a2f7c45c49 100644
--- a/maps/away/smugglers/smugglers.dm
+++ b/maps/away/smugglers/smugglers.dm
@@ -14,7 +14,7 @@
description = "Yarr."
suffixes = list("smugglers/smugglers.dmm")
cost = 1
- level_data_type = /obj/abstract/level_data/mining_level
+ level_data_type = /datum/level_data/mining_level
area_usage_test_exempted_root_areas = list(/area/smugglers)
apc_test_exempt_areas = list(
/area/smugglers/base = NO_SCRUBBER|NO_VENT,
diff --git a/maps/away_sites_testing/blank.dmm b/maps/away_sites_testing/blank.dmm
index f52568add50..6d50a5c258f 100644
--- a/maps/away_sites_testing/blank.dmm
+++ b/maps/away_sites_testing/blank.dmm
@@ -13,7 +13,7 @@
/turf/simulated/floor/tiled,
/area/space)
"R" = (
-/obj/abstract/level_data/player_level,
+/obj/abstract/level_data_spawner/player,
/turf/space,
/area/space)
diff --git a/maps/example/example-1.dmm b/maps/example/example-1.dmm
index f7e6c7d9ef4..3d070c1ab1d 100644
--- a/maps/example/example-1.dmm
+++ b/maps/example/example-1.dmm
@@ -500,7 +500,7 @@
/turf/simulated/floor/tiled/dark/monotile,
/area/example/first)
"xq" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Example First Deck";
},
/turf/space,
diff --git a/maps/example/example-2.dmm b/maps/example/example-2.dmm
index bd41ffb1ab8..67795ddce76 100644
--- a/maps/example/example-2.dmm
+++ b/maps/example/example-2.dmm
@@ -328,7 +328,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/example/second)
"ug" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Example Second Deck";
},
/turf/space,
diff --git a/maps/example/example-3.dmm b/maps/example/example-3.dmm
index 8cc54b16aed..9a4f9d2dd89 100644
--- a/maps/example/example-3.dmm
+++ b/maps/example/example-3.dmm
@@ -227,7 +227,7 @@
/turf/simulated/floor,
/area/example/third)
"MO" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Example Third Deck";
},
/turf/space,
diff --git a/maps/exodus/exodus-1.dmm b/maps/exodus/exodus-1.dmm
index 6815df4a3fa..e066627d55d 100644
--- a/maps/exodus/exodus-1.dmm
+++ b/maps/exodus/exodus-1.dmm
@@ -5677,7 +5677,7 @@
/turf/simulated/floor/tiled/monotile,
/area/exodus/maintenance/telecomms)
"AE" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Exodus Underlevel";
},
/turf/space,
diff --git a/maps/exodus/exodus-2.dmm b/maps/exodus/exodus-2.dmm
index adcf87ecfc4..6f6a2db4d12 100644
--- a/maps/exodus/exodus-2.dmm
+++ b/maps/exodus/exodus-2.dmm
@@ -63398,7 +63398,7 @@
/turf/simulated/floor/tiled/steel_grid,
/area/ship/exodus_pod_mining)
"doN" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Exodus Operations Deck";
},
/turf/space,
diff --git a/maps/exodus/exodus-admin.dmm b/maps/exodus/exodus-admin.dmm
index 9e6dcf91984..7ef881d92c3 100644
--- a/maps/exodus/exodus-admin.dmm
+++ b/maps/exodus/exodus-admin.dmm
@@ -3205,7 +3205,7 @@
},
/area/tdome/tdomeadmin)
"sKA" = (
-/obj/abstract/level_data/admin_level{
+/obj/abstract/level_data_spawner/admin_level{
name = "Centcomm";
},
/turf/space,
diff --git a/maps/exodus/exodus-transit.dmm b/maps/exodus/exodus-transit.dmm
index f2b410ac743..048ce6549e1 100644
--- a/maps/exodus/exodus-transit.dmm
+++ b/maps/exodus/exodus-transit.dmm
@@ -42,7 +42,7 @@
/turf/space,
/area/space)
"QP" = (
-/obj/abstract/level_data/admin_level{
+/obj/abstract/level_data_spawner/admin_level{
name = "Exodus Transit Level";
},
/turf/space,
diff --git a/maps/kleibkhar/kleibkhar-1.dmm b/maps/kleibkhar/kleibkhar-1.dmm
index 7fab282c973..04b02bca7a7 100644
--- a/maps/kleibkhar/kleibkhar-1.dmm
+++ b/maps/kleibkhar/kleibkhar-1.dmm
@@ -41,7 +41,7 @@
/turf/exterior/barren/mining,
/area/exoplanet/kleibkhar/mines/exits)
"h" = (
-/turf/exterior/planet_edge,
+/turf/unsimulated/mineral,
/area/exoplanet/kleibkhar/mines/depth_2)
"i" = (
/obj/effect/floor_decal/industrial/warning/dust{
@@ -338,8 +338,8 @@
/turf/exterior/concrete/reinforced,
/area/exoplanet/kleibkhar/mines/exits)
"M" = (
-/obj/abstract/level_data/exoplanet/kleibkhar/underground/bottom,
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar/underground/bottom,
+/turf/exterior/barren/mining,
/area/exoplanet/kleibkhar/mines/depth_2)
(1,1,1) = {"
@@ -542,7 +542,7 @@ h
h
h
h
-M
+h
"}
(2,1,1) = {"
h
@@ -1949,7 +1949,7 @@ a
a
a
a
-a
+M
h
h
h
diff --git a/maps/kleibkhar/kleibkhar-2.dmm b/maps/kleibkhar/kleibkhar-2.dmm
index 430d8dc1055..fa473d97fb8 100644
--- a/maps/kleibkhar/kleibkhar-2.dmm
+++ b/maps/kleibkhar/kleibkhar-2.dmm
@@ -47,7 +47,7 @@
/turf/exterior/concrete/reinforced,
/area/exoplanet/kleibkhar/mines/exits)
"aj" = (
-/turf/exterior/planet_edge,
+/turf/unsimulated/mineral,
/area/exoplanet/kleibkhar/mines/depth_1)
"ak" = (
/obj/effect/floor_decal/industrial/warning/dust{
@@ -94,8 +94,8 @@
/turf/exterior/concrete/reinforced,
/area/exoplanet/kleibkhar/mines/exits)
"ao" = (
-/obj/abstract/level_data/exoplanet/kleibkhar/underground,
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar/underground,
+/turf/exterior/barren/mining,
/area/exoplanet/kleibkhar/mines/depth_1)
"ap" = (
/obj/machinery/light/small/emergency/cabled,
@@ -775,7 +775,7 @@ aj
aj
aj
aj
-ao
+aj
"}
(2,1,1) = {"
aj
@@ -2182,7 +2182,7 @@ ae
ae
ae
ae
-ae
+ao
aj
aj
aj
diff --git a/maps/kleibkhar/kleibkhar-3.dmm b/maps/kleibkhar/kleibkhar-3.dmm
index 31f32035301..b4a0297bbcd 100644
--- a/maps/kleibkhar/kleibkhar-3.dmm
+++ b/maps/kleibkhar/kleibkhar-3.dmm
@@ -108,7 +108,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/kleibkhar/outpost/mining)
"aq" = (
-/turf/exterior/planet_edge,
+/turf/unsimulated/dark_border,
/area/exoplanet/kleibkhar)
"ar" = (
/obj/machinery/conveyor{
@@ -1653,9 +1653,7 @@
/turf/simulated/floor/tiled/monotile,
/area/kleibkhar/outpost/hallway)
"ed" = (
-/obj/effect/shuttle_landmark/supply/station{
- dir = 8
- },
+/obj/effect/shuttle_landmark/supply/dock,
/turf/simulated/floor/plating,
/area/exoplanet/kleibkhar/supply_shuttle_dock)
"ee" = (
@@ -3835,13 +3833,18 @@
/area/kleibkhar/outpost/cargo)
"jk" = (
/obj/machinery/computer/modular/preset/supply_public{
- icon_state = "computer";
- dir = 8
+ dir = 8;
+ icon_state = "console-off"
},
/obj/machinery/light{
icon_state = "tube_map";
dir = 4
},
+/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/supply_station{
+ dir = 8;
+ icon_state = "airlock_control_off";
+ tag_door = "_k_cargo_dock_shutter"
+ },
/turf/simulated/floor/tiled,
/area/kleibkhar/outpost/cargo)
"jl" = (
@@ -4129,8 +4132,8 @@
/turf/exterior/concrete,
/area/exoplanet/kleibkhar)
"jQ" = (
-/obj/abstract/level_data/exoplanet/kleibkhar,
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar,
+/turf/exterior/kleibkhar_grass,
/area/exoplanet/kleibkhar)
"ry" = (
/turf/simulated/floor/tiled/techfloor,
@@ -4358,7 +4361,7 @@ aq
aq
aq
aq
-jQ
+aq
"}
(2,1,1) = {"
aq
@@ -5765,7 +5768,7 @@ ih
ih
ih
ih
-ih
+jQ
aq
aq
aq
diff --git a/maps/kleibkhar/kleibkhar-4.dmm b/maps/kleibkhar/kleibkhar-4.dmm
index 2cd77cc5446..0331288b2cb 100644
--- a/maps/kleibkhar/kleibkhar-4.dmm
+++ b/maps/kleibkhar/kleibkhar-4.dmm
@@ -1,13 +1,13 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
-/turf/exterior/planet_edge,
+/turf/unsimulated/dark_border,
/area/exoplanet/kleibkhar/sky)
"ab" = (
/turf/exterior/open,
/area/exoplanet/kleibkhar/sky)
"ac" = (
/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar,
-/turf/exterior/planet_edge,
+/turf/exterior/open,
/area/exoplanet/kleibkhar/sky)
"ad" = (
/obj/structure/railing/mapped{
@@ -599,14 +599,14 @@
/turf/simulated/floor,
/area/kleibkhar/atmos_pump)
"bn" = (
-/obj/abstract/level_data/exoplanet/kleibkhar/sky,
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar/sky,
+/turf/exterior/open,
/area/exoplanet/kleibkhar/sky)
"bo" = (
/obj/abstract/map_data{
height = 4
},
-/turf/exterior/planet_edge,
+/turf/exterior/open,
/area/exoplanet/kleibkhar/sky)
(1,1,1) = {"
@@ -808,8 +808,8 @@ aa
aa
aa
aa
-ac
-bn
+aa
+aa
"}
(2,1,1) = {"
aa
@@ -1011,7 +1011,7 @@ aa
aa
aa
aa
-bo
+aa
"}
(3,1,1) = {"
aa
@@ -2215,8 +2215,8 @@ ab
ab
ab
ab
-ab
-ab
+ac
+bn
aa
aa
aa
@@ -2418,7 +2418,7 @@ ab
ab
ab
ab
-ab
+bo
aa
aa
aa
diff --git a/maps/kleibkhar/kleibkhar_exoplanet.dm b/maps/kleibkhar/kleibkhar_exoplanet.dm
index 64ea96894eb..61fdb6966c9 100644
--- a/maps/kleibkhar/kleibkhar_exoplanet.dm
+++ b/maps/kleibkhar/kleibkhar_exoplanet.dm
@@ -4,7 +4,6 @@
daycycle = 25 MINUTES
daycycle_column_delay = 10 SECONDS
night = FALSE
- daycolumn = 1
start_x = 27
start_y = 23
@@ -26,37 +25,25 @@
flora_diversity = 6
fauna_types = list(/mob/living/simple_animal/yithian, /mob/living/simple_animal/tindalos, /mob/living/simple_animal/hostile/retaliate/jelly)
megafauna_types = list(/mob/living/simple_animal/hostile/retaliate/parrot/space/megafauna, /mob/living/simple_animal/hostile/retaliate/goose/dire)
+ possible_themes = null
-/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/Initialize(var/mapload, var/z_level)
+/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/Initialize(mapload, z_level)
. = ..()
- docking_codes = "[global.using_map.dock_name]"
+ return INITIALIZE_HINT_LATELOAD
- // Build Level workaround
- maxx = world.maxx
- maxy = world.maxy
- x_origin = TRANSITIONEDGE + 1
- y_origin = TRANSITIONEDGE + 1
- x_size = maxx - 2 * (TRANSITIONEDGE + 1)
- y_size = maxy - 2 * (TRANSITIONEDGE + 1)
- landing_points_to_place = min(round(0.1 * (x_size * y_size) / (shuttle_size * shuttle_size)), 3)
- planetary_area = ispath(planetary_area) ? new planetary_area : planetary_area
+/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/LateInitialize()
+ . = ..()
+ build_level()
+ name = initial(name)
+
+/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/select_strata()
+ return
- generate_habitability()
- generate_atmosphere()
- generate_flora()
- generate_map()
- generate_planet_image()
- START_PROCESSING(SSobj, src)
+/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/generate_landing()
+ return
-/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/generate_map()
- for(var/zlevel in map_z)
- var/list/edges
- edges += block(locate(1, 1, zlevel), locate(TRANSITIONEDGE, maxy, zlevel))
- edges |= block(locate(maxx-TRANSITIONEDGE, 1, zlevel),locate(maxx, maxy, zlevel))
- edges |= block(locate(1, 1, zlevel), locate(maxx, TRANSITIONEDGE, zlevel))
- edges |= block(locate(1, maxy-TRANSITIONEDGE, zlevel),locate(maxx, maxy, zlevel))
- for(var/turf/T in edges)
- T.ChangeTurf(/turf/exterior/planet_edge)
+/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/generate_features()
+ return
/obj/effect/overmap/visitable/sector/exoplanet/kleibkhar/generate_habitability()
habitability_class = HABITABILITY_IDEAL
diff --git a/maps/kleibkhar/kleibkhar_overmap.dm b/maps/kleibkhar/kleibkhar_overmap.dm
index 2302026db6b..0d881934e28 100644
--- a/maps/kleibkhar/kleibkhar_overmap.dm
+++ b/maps/kleibkhar/kleibkhar_overmap.dm
@@ -3,27 +3,6 @@
overmap_ids = list(OVERMAP_ID_SPACE = /datum/overmap/kleibkhar)
/datum/overmap/kleibkhar
- event_areas = 0
- map_size_x = 50
- map_size_y = 50
-
- // var/map_file = "maps/kleibkhar/kleibkhar-overmap.dmm"
-
-// /datum/overmap/kleibkhar/generate_overmap()
-// . = ..()
-// maploader.load_map(file(map_file), 1, 1, assigned_z)
-// testing("Overmap build for [name] complete.")
-
-/obj/effect/shuttle_landmark/supply/station
- landmark_tag = "nav_cargo_station"
- docking_controller = "cargo_bay"
- base_area = /area/exoplanet/kleibkhar/supply_shuttle_dock
- base_turf = /turf/simulated/floor/plating
-
-//supply
-/datum/shuttle/autodock/ferry/supply/cargo
- name = "Supply"
- warmup_time = 10
- location = 1
- dock_target = "supply_shuttle"
- waypoint_station = "nav_cargo_station"
\ No newline at end of file
+ event_areas = 12
+ map_size_x = 64
+ map_size_y = 64
diff --git a/maps/kleibkhar/kleibkhar_zlevels.dm b/maps/kleibkhar/kleibkhar_zlevels.dm
index 70051287fa1..9a84b2b43cd 100644
--- a/maps/kleibkhar/kleibkhar_zlevels.dm
+++ b/maps/kleibkhar/kleibkhar_zlevels.dm
@@ -1,42 +1,74 @@
-/datum/map/kleibkhar
-#ifndef UNIT_TEST
- // Hotloading module
- default_levels = list(
- "1" = "maps/kleibkhar/kleibkhar-1.dmm",
- "2" = "maps/kleibkhar/kleibkhar-2.dmm",
- "3" = "maps/kleibkhar/kleibkhar-3.dmm",
- "4" = "maps/kleibkhar/kleibkhar-4.dmm",
- "5" = "maps/utility/cargo_shuttle_tmpl.dmm",
+///Map template for loading the kelbkhar map
+/datum/map_template/persistent/kleibkhar
+ name = "planet kleibkhar"
+ template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED | TEMPLATE_FLAG_NO_RUINS
+ modify_tag_vars = FALSE
+ template_categories = list(MAP_TEMPLATE_CATEGORY_MAIN_SITE) //Templates must have a category, or they won't spawn
+ tallness = 4
+ mappaths = list(
+ "maps/kleibkhar/kleibkhar-1.dmm",
+ "maps/kleibkhar/kleibkhar-2.dmm",
+ "maps/kleibkhar/kleibkhar-3.dmm",
+ "maps/kleibkhar/kleibkhar-4.dmm",
)
-#else
- default_levels = list(
- "4" = "maps/kleibkhar/kleibkhar-1.dmm",
- "5" = "maps/kleibkhar/kleibkhar-2.dmm",
- "6" = "maps/kleibkhar/kleibkhar-3.dmm",
- "7" = "maps/kleibkhar/kleibkhar-4.dmm",
- "8" = "maps/utility/cargo_shuttle_tmpl.dmm",
- )
-#endif
+///////////////////////////////////////////////////////////////////////////////
+// Leve Data
+///////////////////////////////////////////////////////////////////////////////
-/obj/abstract/level_data/exoplanet/kleibkhar
- level_flags = (ZLEVEL_CONTACT|ZLEVEL_PLAYER|ZLEVEL_SAVED)
+/datum/level_data/exoplanet/kleibkhar
+ name = "kleibkhar surface"
+ level_id = "kleibkhar_surface"
+ level_flags = ZLEVEL_CONTACT | ZLEVEL_PLAYER | ZLEVEL_SAVED
ambient_light_level = 1.0
- base_turf = /turf/exterior/kleibkhar_grass
+ base_area = /area/exoplanet/kleibkhar
+ base_turf = /turf/exterior/kleibkhar_grass
+ loop_turf_type = /turf/exterior/mimic_edge/transition/loop
+ border_filler = /turf/unsimulated/dark_border
exterior_atmosphere = list(
/decl/material/gas/oxygen = MOLES_O2STANDARD,
/decl/material/gas/nitrogen = MOLES_N2STANDARD
)
-/obj/abstract/level_data/exoplanet/kleibkhar/sky
+/datum/level_data/exoplanet/kleibkhar/sky
+ name = "kleibkhar sky"
+ level_id = "kleibkhar_sky"
ambient_light_level = 1.0
- base_turf = /turf/exterior/open
+ base_area = /area/exoplanet/kleibkhar/sky
+ base_turf = /turf/exterior/open
+
+/datum/level_data/exoplanet/kleibkhar/underground
+ name = "kleibkhar underground"
+ level_id = "kleibkhar_underground"
+ level_flags = ZLEVEL_CONTACT | ZLEVEL_PLAYER | ZLEVEL_MINING | ZLEVEL_SAVED
+ ambient_light_level = 0.2
+ base_area = /area/exoplanet/kleibkhar/mines/depth_1
+ base_turf = /turf/exterior/barren/mining
+ border_filler = /turf/unsimulated/mineral
-/obj/abstract/level_data/exoplanet/kleibkhar/underground
- level_flags = (ZLEVEL_CONTACT|ZLEVEL_PLAYER|ZLEVEL_MINING)
+/datum/level_data/exoplanet/kleibkhar/underground/bottom
+ name = "kleibkhar abyss"
+ level_id = "kleibkhar_abyss"
ambient_light_level = 0.1
- base_turf = /turf/exterior/barren/mining
+ base_area = /area/exoplanet/kleibkhar/mines/depth_2
+ base_turf = /turf/exterior/barren/mining
+
+///////////////////////////////////////////////////////////////////////////////
+// Spawners
+///////////////////////////////////////////////////////////////////////////////
+
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar
+ name = "kleibkhar surface (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/kleibkhar
+
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar/sky
+ name = "kleibkhar sky (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/kleibkhar/sky
+
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar/underground
+ name = "kleibkhar underground (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/kleibkhar/underground
-/obj/abstract/level_data/exoplanet/kleibkhar/underground/bottom
- ambient_light_level = 0.0
- base_turf = /turf/exterior/barren/mining
\ No newline at end of file
+/obj/abstract/level_data_spawner/exoplanet/kleibkhar/underground/bottom
+ name = "kleibkhar abyss (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/kleibkhar/underground/bottom
\ No newline at end of file
diff --git a/maps/ministation/ministation.dmm b/maps/ministation/ministation.dmm
index 7771ca36273..d68949d0bbf 100644
--- a/maps/ministation/ministation.dmm
+++ b/maps/ministation/ministation.dmm
@@ -15135,7 +15135,7 @@
/turf/simulated/floor/plating,
/area/ministation/disused)
"NO" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Outpost Zebra";
},
/turf/space,
diff --git a/maps/ministation/space.dmm b/maps/ministation/space.dmm
index 852ee767338..8035ee94e44 100644
--- a/maps/ministation/space.dmm
+++ b/maps/ministation/space.dmm
@@ -454,7 +454,7 @@
/turf/space/transit/north,
/area/space)
"YY" = (
-/obj/abstract/level_data/admin_level,
+/obj/abstract/level_data_spawner/admin_level,
/turf/space,
/area/space)
diff --git a/maps/modpack_testing/blank.dmm b/maps/modpack_testing/blank.dmm
index f52568add50..6d50a5c258f 100644
--- a/maps/modpack_testing/blank.dmm
+++ b/maps/modpack_testing/blank.dmm
@@ -13,7 +13,7 @@
/turf/simulated/floor/tiled,
/area/space)
"R" = (
-/obj/abstract/level_data/player_level,
+/obj/abstract/level_data_spawner/player,
/turf/space,
/area/space)
diff --git a/maps/nexus/nexus-1.dmm b/maps/nexus/nexus-1.dmm
index ed952f31e80..717d86468df 100644
--- a/maps/nexus/nexus-1.dmm
+++ b/maps/nexus/nexus-1.dmm
@@ -2556,7 +2556,7 @@
/turf/simulated/floor/plating,
/area/nexus/command)
"xX" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Nexus Lower Deck";
},
/turf/space,
diff --git a/maps/nexus/nexus-2.dmm b/maps/nexus/nexus-2.dmm
index 473099b7a1b..23d356aa667 100644
--- a/maps/nexus/nexus-2.dmm
+++ b/maps/nexus/nexus-2.dmm
@@ -907,7 +907,7 @@
/turf/simulated/floor/carpet/blue3,
/area/nexus/civilian/bar)
"Oa" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Nexus Upper Deck";
},
/turf/space,
diff --git a/maps/outreach/outreach-1.dmm b/maps/outreach/outreach-1.dmm
index 1e7b3581625..98bf7d8b92b 100644
--- a/maps/outreach/outreach-1.dmm
+++ b/maps/outreach/outreach-1.dmm
@@ -33,1436 +33,1435 @@
/turf/exterior/barren,
/area/exoplanet/outreach/mines/exits)
"h" = (
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/outreach/mining/bottom,
+/turf/exterior/barren,
/area/exoplanet/outreach/mines/depth_2)
-"i" = (
-/obj/abstract/level_data/exoplanet/outreach/mining,
-/turf/exterior/planet_edge,
+"j" = (
+/turf/unsimulated/mineral,
/area/exoplanet/outreach/mines/depth_2)
(1,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-i
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(2,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(3,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(4,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(5,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(6,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(7,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(8,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-a
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -1649,21 +1648,22 @@ a
a
a
h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(9,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -1850,22 +1850,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(10,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -2052,22 +2052,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(11,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -2254,22 +2254,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(12,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -2456,22 +2456,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(13,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -2658,22 +2658,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(14,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -2860,22 +2860,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(15,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -3062,22 +3062,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(16,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -3264,22 +3264,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(17,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -3466,22 +3466,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(18,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -3668,22 +3668,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(19,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -3870,22 +3870,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(20,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -4072,22 +4072,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(21,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -4274,22 +4274,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(22,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -4476,22 +4476,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(23,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -4678,22 +4678,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(24,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -4880,22 +4880,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(25,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -5082,22 +5082,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(26,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -5284,22 +5284,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(27,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -5486,22 +5486,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(28,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -5688,22 +5688,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(29,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -5890,22 +5890,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(30,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -6092,22 +6092,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(31,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -6294,22 +6294,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(32,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -6496,22 +6496,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(33,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -6698,22 +6698,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(34,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -6900,22 +6900,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(35,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -7102,22 +7102,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(36,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -7304,22 +7304,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(37,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -7506,22 +7506,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(38,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -7708,22 +7708,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(39,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -7910,22 +7910,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(40,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -8112,22 +8112,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(41,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -8314,22 +8314,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(42,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -8516,22 +8516,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(43,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -8718,22 +8718,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(44,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -8920,22 +8920,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(45,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -9122,22 +9122,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(46,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -9324,22 +9324,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(47,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -9526,22 +9526,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(48,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -9728,22 +9728,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(49,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -9930,22 +9930,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(50,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -10132,22 +10132,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(51,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -10334,22 +10334,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(52,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -10536,22 +10536,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(53,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -10738,22 +10738,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(54,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -10940,22 +10940,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(55,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -11142,22 +11142,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(56,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -11344,22 +11344,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(57,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -11546,22 +11546,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(58,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -11748,22 +11748,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(59,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -11950,22 +11950,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(60,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -12152,22 +12152,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(61,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -12354,22 +12354,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(62,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -12556,22 +12556,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(63,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -12758,22 +12758,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(64,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -12960,22 +12960,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(65,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -13162,22 +13162,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(66,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -13364,22 +13364,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(67,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -13566,22 +13566,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(68,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -13768,22 +13768,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(69,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -13970,22 +13970,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(70,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -14172,22 +14172,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(71,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -14374,22 +14374,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(72,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -14576,22 +14576,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(73,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -14778,22 +14778,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(74,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -14980,22 +14980,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(75,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -15182,22 +15182,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(76,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -15384,22 +15384,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(77,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -15586,22 +15586,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(78,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -15788,22 +15788,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(79,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -15990,22 +15990,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(80,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -16192,22 +16192,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(81,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -16394,22 +16394,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(82,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -16596,22 +16596,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(83,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -16798,22 +16798,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(84,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -17000,22 +17000,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(85,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -17202,22 +17202,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(86,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -17404,22 +17404,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(87,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -17606,22 +17606,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(88,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -17808,22 +17808,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(89,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -18010,22 +18010,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(90,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -18212,22 +18212,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(91,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -18414,22 +18414,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(92,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -18616,22 +18616,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(93,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -18818,22 +18818,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(94,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -19020,22 +19020,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(95,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -19222,22 +19222,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(96,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -19424,22 +19424,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(97,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -19626,22 +19626,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(98,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -19828,22 +19828,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(99,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -20030,22 +20030,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(100,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -20232,22 +20232,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(101,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -20434,22 +20434,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(102,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -20636,22 +20636,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(103,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -20838,22 +20838,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(104,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -21040,22 +21040,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(105,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -21242,22 +21242,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(106,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -21444,22 +21444,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(107,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -21646,22 +21646,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(108,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -21848,22 +21848,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(109,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -22050,22 +22050,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(110,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -22252,22 +22252,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(111,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -22454,22 +22454,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(112,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -22656,22 +22656,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(113,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -22858,22 +22858,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(114,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -23060,22 +23060,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(115,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -23262,22 +23262,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(116,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -23464,22 +23464,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(117,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -23666,22 +23666,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(118,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -23868,22 +23868,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(119,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -24070,22 +24070,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(120,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -24272,22 +24272,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(121,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -24474,22 +24474,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(122,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -24676,22 +24676,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(123,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -24878,22 +24878,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(124,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -25080,22 +25080,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(125,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -25282,22 +25282,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(126,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -25484,22 +25484,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(127,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -25686,22 +25686,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(128,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -25888,22 +25888,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(129,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -26090,22 +26090,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(130,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -26292,22 +26292,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(131,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -26494,22 +26494,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(132,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -26696,22 +26696,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(133,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -26898,22 +26898,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(134,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -27100,22 +27100,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(135,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -27302,22 +27302,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(136,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -27504,22 +27504,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(137,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -27706,22 +27706,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(138,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -27908,22 +27908,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(139,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -28110,22 +28110,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(140,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -28312,22 +28312,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(141,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -28514,22 +28514,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(142,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -28716,22 +28716,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(143,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -28918,22 +28918,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(144,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -29120,22 +29120,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(145,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -29322,22 +29322,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(146,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -29524,22 +29524,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(147,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -29726,22 +29726,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(148,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -29928,22 +29928,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(149,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -30130,22 +30130,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(150,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -30332,22 +30332,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(151,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -30534,22 +30534,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(152,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -30736,22 +30736,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(153,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -30938,22 +30938,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(154,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -31140,22 +31140,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(155,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -31342,22 +31342,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(156,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -31544,22 +31544,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(157,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -31746,22 +31746,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(158,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -31948,22 +31948,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(159,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -32150,22 +32150,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(160,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -32352,22 +32352,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(161,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -32554,22 +32554,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(162,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -32756,22 +32756,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(163,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -32958,22 +32958,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(164,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -33160,22 +33160,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(165,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -33362,22 +33362,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(166,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -33564,22 +33564,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(167,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -33766,22 +33766,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(168,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -33968,22 +33968,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(169,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -34170,22 +34170,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(170,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -34372,22 +34372,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(171,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -34574,22 +34574,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(172,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -34776,22 +34776,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(173,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -34978,22 +34978,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(174,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -35180,22 +35180,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(175,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -35382,22 +35382,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(176,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -35584,22 +35584,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(177,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -35786,22 +35786,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(178,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -35988,22 +35988,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(179,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -36190,22 +36190,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(180,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -36392,22 +36392,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(181,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -36594,22 +36594,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(182,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -36796,22 +36796,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(183,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -36998,22 +36998,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(184,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -37200,22 +37200,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(185,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -37402,22 +37402,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(186,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -37604,22 +37604,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(187,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -37806,22 +37806,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(188,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -38008,22 +38008,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(189,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -38210,22 +38210,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(190,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -38412,22 +38412,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(191,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -38614,22 +38614,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(192,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -38816,22 +38816,22 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(193,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
a
a
a
@@ -39018,1425 +39018,1425 @@ a
a
a
a
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
"}
(194,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(195,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(196,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(197,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(198,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(199,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
(200,1,1) = {"
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
-h
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
+j
"}
diff --git a/maps/outreach/outreach-2.dmm b/maps/outreach/outreach-2.dmm
index eb72e36f809..e343e4c84b6 100644
--- a/maps/outreach/outreach-2.dmm
+++ b/maps/outreach/outreach-2.dmm
@@ -43,11 +43,11 @@
/turf/exterior/barren,
/area/exoplanet/outreach/mines/exits)
"j" = (
-/turf/exterior/planet_edge,
+/turf/unsimulated/mineral,
/area/exoplanet/outreach/mines/depth_1)
"k" = (
-/obj/abstract/level_data/exoplanet/outreach/mining,
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/outreach/mining,
+/turf/exterior/barren,
/area/exoplanet/outreach/mines/depth_1)
(1,1,1) = {"
@@ -250,7 +250,7 @@ j
j
j
j
-k
+j
"}
(2,1,1) = {"
j
@@ -1657,7 +1657,7 @@ e
e
e
e
-e
+k
j
j
j
diff --git a/maps/outreach/outreach-3.dmm b/maps/outreach/outreach-3.dmm
index 5eeb511b23b..f2dbdd6307b 100644
--- a/maps/outreach/outreach-3.dmm
+++ b/maps/outreach/outreach-3.dmm
@@ -114,7 +114,7 @@
/turf/simulated/floor/tiled,
/area/outreach/outpost/hallway)
"aq" = (
-/turf/exterior/planet_edge,
+/turf/unsimulated/dark_border,
/area/exoplanet/outreach)
"ar" = (
/obj/machinery/door/airlock,
@@ -2348,12 +2348,12 @@
/turf/simulated/floor/plating,
/area/outreach/outpost/atmospherics)
"fm" = (
-/obj/machinery/power/apc/critical{
- dir = 4;
- pixel_x = 24
- },
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/green,
+/obj/machinery/power/apc{
+ icon_state = "apc0";
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/outreach/outpost/hallway)
"fn" = (
@@ -3096,8 +3096,8 @@
/turf/simulated/floor/plating,
/area/outreach/outpost/atmospherics)
"gR" = (
-/obj/abstract/level_data/exoplanet/outreach,
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/outreach,
+/turf/exterior/chlorine_sand,
/area/exoplanet/outreach)
"gS" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
@@ -3908,7 +3908,7 @@ aq
aq
aq
aq
-gR
+aq
"}
(2,1,1) = {"
aq
@@ -5315,7 +5315,7 @@ aa
aa
aa
aa
-aa
+gR
aq
aq
aq
diff --git a/maps/outreach/outreach-4.dmm b/maps/outreach/outreach-4.dmm
index 61cf6f1dbd3..a8972f93a05 100644
--- a/maps/outreach/outreach-4.dmm
+++ b/maps/outreach/outreach-4.dmm
@@ -119,7 +119,7 @@
/area/outreach/outpost/barracks/fourth)
"au" = (
/turf/simulated/wall/r_titanium,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"av" = (
/turf/simulated/floor/wood/mahogany{
icon_state = "wood_broken2"
@@ -197,12 +197,12 @@
icon_state = "32-2"
},
/turf/simulated/open,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"aF" = (
/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers,
/obj/machinery/atmospherics/pipe/zpipe/down/supply,
/turf/simulated/open,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"aG" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -283,7 +283,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"aP" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
icon_state = "map-supply";
@@ -335,7 +335,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"aT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -387,17 +387,9 @@
/turf/simulated/floor/carpet/blue2,
/area/outreach/outpost/barracks/fourth)
"aZ" = (
-/obj/effect/floor_decal/industrial/warning/corner,
-/obj/machinery/airlock_sensor{
- id_tag = "outreach_4_exterior_sensor";
- pixel_x = 24
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/outreach/outpost/hallway)
-"ba" = (
/turf/simulated/wall/r_titanium,
-/area/outreach/outpost/hallway)
-"bb" = (
+/area/outreach/outpost/hallway/upper)
+"ba" = (
/obj/machinery/door/airlock/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -405,7 +397,15 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
+"bb" = (
+/obj/effect/floor_decal/industrial/warning/corner,
+/obj/machinery/airlock_sensor{
+ id_tag = "outreach_4_exterior_sensor";
+ pixel_x = 24
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/outreach/outpost/hallway/upper)
"bc" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
icon_state = "map_vent_out";
@@ -443,7 +443,7 @@
pixel_y = 24
},
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -454,54 +454,42 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bh" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bi" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bj" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/firedoor/autoset,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+ icon_state = "tube_map";
+ dir = 1
+ },
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bk" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/firedoor/autoset,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/filth,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bl" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- icon_state = "tube_map";
- dir = 1
- },
+/obj/effect/decal/cleanable/filth,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bm" = (
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "stripe";
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
- dir = 4;
- icon_state = "map_vent";
- id_tag = "outreach_4_pump_out_external"
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/outreach/outpost/hallway)
-"bn" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/filth,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
-"bo" = (
+/area/outreach/outpost/hallway/upper)
+"bn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
@@ -510,39 +498,41 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/catwalk_plated,
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"bp" = (
+/area/outreach/outpost/hallway/upper)
+"bo" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/railing/mapped{
icon_state = "railing0-1";
dir = 4
},
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
-"bq" = (
+/area/outreach/outpost/hallway/upper)
+"bp" = (
/turf/simulated/open,
-/area/outreach/outpost/hallway)
-"br" = (
+/area/outreach/outpost/hallway/upper)
+"bq" = (
/obj/machinery/light{
icon_state = "tube_map";
dir = 1
},
/turf/simulated/open,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
+"br" = (
+/obj/effect/wallframe_spawn/reinforced/titanium,
+/turf/simulated/floor/plating,
+/area/outreach/outpost/hallway/upper)
"bs" = (
-/obj/machinery/door/airlock/external{
- id_tag = "outreach_4_outer"
- },
-/obj/machinery/button/access/exterior{
- id_tag = "outreach_4";
- pixel_y = -24
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- icon_state = "intact";
+/obj/effect/floor_decal/industrial/warning{
+ icon_state = "stripe";
dir = 4
},
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
+ dir = 4;
+ icon_state = "map_vent";
+ id_tag = "outreach_4_pump_out_external"
+ },
/turf/simulated/floor/tiled/techmaint,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bt" = (
/obj/structure/cable/green{
icon_state = "1-4"
@@ -560,8 +550,22 @@
icon_state = "0-4"
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"bu" = (
+/obj/machinery/door/airlock/external{
+ id_tag = "outreach_4_outer"
+ },
+/obj/machinery/button/access/exterior{
+ id_tag = "outreach_4";
+ pixel_y = -24
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ icon_state = "intact";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/outreach/outpost/hallway/upper)
+"bv" = (
/obj/effect/floor_decal/industrial/hatch/orange,
/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
dir = 8;
@@ -578,8 +582,24 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/outreach/outpost/hallway)
-"bv" = (
+/area/outreach/outpost/hallway/upper)
+"bw" = (
+/obj/effect/floor_decal/industrial/hatch/orange,
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+ cycle_to_external_air = 1;
+ frequency = 1381;
+ id_tag = "outreach_4";
+ pixel_y = 24;
+ tag_airpump = null;
+ tag_exterior_door = null;
+ tag_interior_door = null
+ },
+/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
+ id_tag = "outreach_4_pump"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/outreach/outpost/hallway/upper)
+"bx" = (
/obj/machinery/door/airlock/external{
id_tag = "outreach_4_inner"
},
@@ -588,8 +608,8 @@
pixel_y = 24
},
/turf/simulated/floor/tiled/techmaint,
-/area/outreach/outpost/hallway)
-"bw" = (
+/area/outreach/outpost/hallway/upper)
+"by" = (
/obj/effect/catwalk_plated,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
@@ -601,8 +621,8 @@
icon_state = "1-4"
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"bx" = (
+/area/outreach/outpost/hallway/upper)
+"bz" = (
/obj/effect/catwalk_plated,
/obj/structure/cable/green{
icon_state = "1-4"
@@ -614,15 +634,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"by" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- icon_state = "stripecorner";
- dir = 4
- },
-/turf/simulated/floor/tiled/techmaint,
-/area/outreach/outpost/hallway)
-"bz" = (
+/area/outreach/outpost/hallway/upper)
+"bA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -635,8 +648,8 @@
/obj/effect/catwalk_plated,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"bA" = (
+/area/outreach/outpost/hallway/upper)
+"bB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
icon_state = "map-supply";
dir = 1
@@ -648,8 +661,8 @@
/obj/effect/catwalk_plated,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"bB" = (
+/area/outreach/outpost/hallway/upper)
+"bC" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -663,8 +676,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/filth,
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"bC" = (
+/area/outreach/outpost/hallway/upper)
+"bD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -678,8 +691,8 @@
/obj/machinery/door/firedoor/autoset,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/monotile,
-/area/outreach/outpost/hallway)
-"bD" = (
+/area/outreach/outpost/hallway/upper)
+"bE" = (
/obj/structure/cable/green{
icon_state = "1-8"
},
@@ -696,14 +709,7 @@
},
/obj/effect/catwalk_plated,
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"bE" = (
-/obj/effect/wallframe_spawn/reinforced/titanium,
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 6
- },
-/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bF" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
icon_state = "map";
@@ -725,28 +731,19 @@
/turf/simulated/floor/plating,
/area/exoplanet/outreach)
"bH" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ icon_state = "stripecorner";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techmaint,
+/area/outreach/outpost/hallway/upper)
+"bI" = (
/obj/effect/wallframe_spawn/reinforced/titanium,
/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 9
+ dir = 6
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
-"bI" = (
-/obj/effect/floor_decal/industrial/hatch/orange,
-/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
- cycle_to_external_air = 1;
- frequency = 1381;
- id_tag = "outreach_4";
- pixel_y = 24;
- tag_airpump = null;
- tag_exterior_door = null;
- tag_interior_door = null
- },
-/obj/machinery/atmospherics/unary/vent_pump/high_volume/external_air{
- id_tag = "outreach_4_pump"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5;
@@ -768,44 +765,47 @@
/turf/simulated/floor/plating,
/area/exoplanet/outreach)
"bL" = (
+/obj/effect/wallframe_spawn/reinforced/titanium,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/outreach/outpost/hallway/upper)
+"bM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/airlock_sensor{
+ id_tag = "outreach_4_interior_sensor";
+ pixel_x = -24
+ },
+/turf/simulated/floor/tiled,
+/area/outreach/outpost/hallway/upper)
+"bN" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
icon_state = "map_vent_out";
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
-"bM" = (
+/area/outreach/outpost/hallway/upper)
+"bO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
-"bN" = (
-/obj/machinery/light,
-/turf/simulated/open,
-/area/outreach/outpost/hallway)
-"bO" = (
-/obj/effect/wallframe_spawn/reinforced/titanium,
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bP" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -24
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"bQ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/obj/machinery/light,
+/turf/simulated/open,
+/area/outreach/outpost/hallway/upper)
"bR" = (
/turf/simulated/wall/r_titanium,
/area/outreach/outpost/barracks/third)
@@ -851,7 +851,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"bX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -907,8 +907,11 @@
/area/outreach/outpost/barracks/fourth)
"cf" = (
/obj/effect/wallframe_spawn/reinforced/titanium,
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
+ },
/turf/simulated/floor/plating,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"cg" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
@@ -917,24 +920,21 @@
/area/outreach/outpost/barracks/third)
"ch" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/airlock_sensor{
- id_tag = "outreach_4_interior_sensor";
- pixel_x = -24
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"ci" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
- icon_state = "tube_map";
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
},
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"cj" = (
-/turf/exterior/planet_edge,
+/turf/unsimulated/dark_border,
/area/exoplanet/outreach)
"ck" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -982,12 +982,12 @@
/area/outreach/outpost/barracks/third)
"cq" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -24
+/obj/machinery/light{
+ icon_state = "tube_map";
+ dir = 4
},
/turf/simulated/floor/tiled,
-/area/outreach/outpost/hallway)
+/area/outreach/outpost/hallway/upper)
"cr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1255,7 +1255,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"cW" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
@@ -1266,20 +1266,20 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/outreach/outpost/maint)
+/area/outreach/outpost/maint/upper)
"cX" = (
-/obj/abstract/level_data/exoplanet/outreach,
-/turf/exterior/planet_edge,
+/obj/effect/overmap/visitable/sector/exoplanet/outreach,
+/turf/exterior/open,
/area/exoplanet/outreach)
"cY" = (
-/obj/effect/overmap/visitable/sector/exoplanet/outreach,
-/turf/exterior/planet_edge,
+/obj/abstract/level_data_spawner/exoplanet/outreach/sky,
+/turf/exterior/open,
/area/exoplanet/outreach)
"cZ" = (
/obj/abstract/map_data{
height = 4
},
-/turf/exterior/planet_edge,
+/turf/exterior/open,
/area/exoplanet/outreach)
(1,1,1) = {"
@@ -1481,8 +1481,8 @@ cj
cj
cj
cj
-cX
-cY
+cj
+cj
"}
(2,1,1) = {"
cj
@@ -1684,7 +1684,7 @@ cj
cj
cj
cj
-cZ
+cj
"}
(3,1,1) = {"
cj
@@ -2888,8 +2888,8 @@ aa
aa
aa
aa
-aa
-aa
+cX
+cY
cj
cj
cj
@@ -3091,7 +3091,7 @@ aa
aa
aa
aa
-aa
+cZ
cj
cj
cj
@@ -22390,9 +22390,9 @@ aa
aJ
ab
ab
-aZ
-bm
-by
+bb
+bs
+bH
ab
ab
ab
@@ -22592,9 +22592,9 @@ aa
aJ
ab
ab
-ba
-bs
-ba
+aZ
+bu
+aZ
ab
ab
ab
@@ -22794,9 +22794,9 @@ aa
aJ
ab
ab
-ba
-bu
-bE
+aZ
+bv
+bI
bF
bJ
ab
@@ -22996,9 +22996,9 @@ aa
aJ
ab
ab
-ba
-bI
-bH
+aZ
+bw
+bL
bG
bK
ab
@@ -23197,13 +23197,13 @@ au
au
au
au
-ba
-ba
-bv
-ba
-bO
-bO
+aZ
+aZ
+bx
+aZ
cf
+cf
+br
ab
ab
ab
@@ -23399,13 +23399,13 @@ aE
bt
aO
cV
-ba
+aZ
bf
-bw
+by
+bM
ch
-bP
-bQ
-cf
+ci
+br
ab
ab
ab
@@ -23601,13 +23601,13 @@ aF
bW
aS
cW
-bb
+ba
bg
-bx
+bz
bh
bh
-ci
-cf
+cq
+br
ab
ab
ab
@@ -23805,7 +23805,7 @@ ac
ac
ac
bh
-bz
+bA
bh
bR
bR
@@ -24007,8 +24007,8 @@ aR
aY
ac
bi
-bA
-bL
+bB
+bN
bR
bU
cg
@@ -24209,8 +24209,8 @@ aT
bc
ac
bh
-bB
-bk
+bC
+bl
bR
bV
ck
@@ -24410,9 +24410,9 @@ ac
ac
ac
ac
-bl
-bz
-bM
+bj
+bA
+bO
bR
bR
bR
@@ -24613,7 +24613,7 @@ aU
bc
ac
bh
-bz
+bA
bh
bR
bV
@@ -24815,8 +24815,8 @@ aV
aY
ac
bi
-bA
-bL
+bB
+bN
bR
bU
cm
@@ -25016,9 +25016,9 @@ ac
ac
ac
ac
-bj
-bC
-bj
+bk
+bD
+bk
bR
bR
bR
@@ -25218,8 +25218,8 @@ am
aR
aY
ac
-bk
-bz
+bl
+bA
bh
bR
bU
@@ -25421,8 +25421,8 @@ aT
bc
ac
bh
-bz
-cq
+bA
+bP
bR
bV
ck
@@ -25622,9 +25622,9 @@ ac
ac
ac
ac
-bl
-bz
-bM
+bj
+bA
+bO
bR
bR
bR
@@ -25824,8 +25824,8 @@ an
aU
bc
ac
-bk
-bz
+bl
+bA
bh
bR
bV
@@ -26026,9 +26026,9 @@ am
aV
aY
ac
-bn
-bA
-bL
+bm
+bB
+bN
bR
bU
cm
@@ -26229,7 +26229,7 @@ ac
ac
ac
bh
-bz
+bA
bh
bR
bR
@@ -26430,9 +26430,9 @@ aP
aW
bd
be
-bo
-bD
-bo
+bn
+bE
+bn
bS
bX
cn
@@ -26632,9 +26632,9 @@ aQ
aX
af
ce
-bp
-bp
-bp
+bo
+bo
+bo
bT
bZ
co
@@ -26834,9 +26834,9 @@ ac
ac
ac
ac
-bq
-bq
-bq
+bp
+bp
+bp
bR
bR
bR
@@ -27036,9 +27036,9 @@ am
aR
aY
ac
-bq
-bq
-bq
+bp
+bp
+bp
bR
bU
cg
@@ -27238,9 +27238,9 @@ an
aT
bc
ac
-bq
-bq
-bq
+bp
+bp
+bp
bR
bV
ck
@@ -27440,9 +27440,9 @@ ac
ac
ac
ac
-br
bq
-bN
+bp
+bQ
bR
bR
bR
@@ -27642,9 +27642,9 @@ an
aU
bc
ac
-bq
-bq
-bq
+bp
+bp
+bp
bR
bV
cl
@@ -27844,9 +27844,9 @@ am
aV
aY
ac
-bq
-bq
-bq
+bp
+bp
+bp
bR
bU
cm
@@ -28046,9 +28046,9 @@ ac
ac
ac
ac
-cf
-cf
-cf
+br
+br
+br
bR
bR
bR
diff --git a/maps/outreach/outreach_areas.dm b/maps/outreach/outreach_areas.dm
index 2a2f513470b..2dce52c7cbb 100644
--- a/maps/outreach/outreach_areas.dm
+++ b/maps/outreach/outreach_areas.dm
@@ -1,5 +1,8 @@
/area/exoplanet/outreach
- name = "Outreach"
+ name = "\improper Outreach"
+
+/area/exoplanet/outreach/sky
+ name = "\improper Outreach sky"
/area/outreach/outpost
//safe_zone = TRUE
@@ -7,14 +10,20 @@
/area/outreach/outpost/maint
name = "\improper Maintenance"
icon_state = "maintcentral"
+/area/outreach/outpost/maint/upper
+ name = "\improper Maintenance"
+ icon_state = "maintcentral"
/area/outreach/outpost/sleeproom
name = "Cyrogenic Storage"
icon_state = "cryo"
/area/outreach/outpost/hallway
- name = "\improper Hallways"
+ name = "hallways"
icon_state = "hallC1"
+/area/outreach/outpost/hallway/upper
+ name = "upper hallways"
+ icon_state = "hallC2"
/area/outreach/outpost/judges
name = "judges room"
@@ -61,11 +70,14 @@
ignore_mining_regen = FALSE
/area/exoplanet/outreach/mines/depth_1
+ name = "\improper Outreach mines"
icon_state = "cave"
/area/exoplanet/outreach/mines/depth_2
+ name = "\improper Outreach mines bottom"
icon_state = "cave"
/area/exoplanet/outreach/mines/exits
+ name = "\improper Outreach mines exit"
icon_state = "exit"
ignore_mining_regen = TRUE
\ No newline at end of file
diff --git a/maps/outreach/outreach_exoplanet.dm b/maps/outreach/outreach_exoplanet.dm
index c8a275372a9..a79be2ef0fa 100644
--- a/maps/outreach/outreach_exoplanet.dm
+++ b/maps/outreach/outreach_exoplanet.dm
@@ -5,7 +5,6 @@
daycycle = 25 MINUTES
daycycle_column_delay = 10 SECONDS
night = TRUE
- daycolumn = 1
rock_colors = list(COLOR_GRAY80, COLOR_PALE_GREEN_GRAY, COLOR_PALE_BTL_GREEN)
plant_colors = list(COLOR_PALE_PINK, COLOR_PALE_GREEN_GRAY, COLOR_CIVIE_GREEN)
@@ -13,33 +12,34 @@
water_color = COLOR_BOTTLE_GREEN
crust_strata = /decl/strata/sedimentary
- ruin_tags_whitelist = RUIN_NATURAL | RUIN_WATER
features_budget = 0
-
has_trees = FALSE
flora_diversity = 5
fauna_types = list(/mob/living/simple_animal/thinbug, /mob/living/simple_animal/hostile/retaliate/beast/samak/alt, /mob/living/simple_animal/yithian, /mob/living/simple_animal/tindalos, /mob/living/simple_animal/hostile/retaliate/jelly)
megafauna_types = list(/mob/living/simple_animal/hostile/retaliate/jelly/mega)
-/obj/effect/overmap/visitable/sector/exoplanet/outreach/Initialize()
+
+/obj/effect/overmap/visitable/sector/exoplanet/outreach/Initialize(mapload, z_level)
+ . = ..()
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/effect/overmap/visitable/sector/exoplanet/outreach/LateInitialize()
. = ..()
- docking_codes = "[global.using_map.dock_name]"
-
- // Build Level workaround
- maxx = world.maxx
- maxy = world.maxy
- x_origin = TRANSITIONEDGE + 1
- y_origin = TRANSITIONEDGE + 1
- x_size = maxx - 2 * (TRANSITIONEDGE + 1)
- y_size = maxy - 2 * (TRANSITIONEDGE + 1)
- landing_points_to_place = 0
- planetary_area = ispath(planetary_area) ? new planetary_area : planetary_area
-
- generate_habitability()
- generate_atmosphere()
- generate_planet_image()
- START_PROCESSING(SSobj, src)
+ build_level()
+ name = initial(name)
+
+/obj/effect/overmap/visitable/sector/exoplanet/outreach/select_strata()
+ return
+
+/obj/effect/overmap/visitable/sector/exoplanet/outreach/generate_landing()
+ return
+
+/obj/effect/overmap/visitable/sector/exoplanet/outreach/generate_features()
+ return
+
+/obj/effect/overmap/visitable/sector/exoplanet/outreach/get_target_temperature()
+ return T0C
/obj/effect/overmap/visitable/sector/exoplanet/outreach/generate_habitability()
habitability_class = HABITABILITY_BAD
diff --git a/maps/outreach/outreach_test.dm b/maps/outreach/outreach_test.dm
index 14f6e0a862d..ce489935d57 100644
--- a/maps/outreach/outreach_test.dm
+++ b/maps/outreach/outreach_test.dm
@@ -1,34 +1,66 @@
/datum/map/outreach
-#ifndef UNIT_TEST
- // Hotloading module
- default_levels = list(
- "1" = "maps/outreach/outreach-1.dmm",
- "2" = "maps/outreach/outreach-2.dmm",
- "3" = "maps/outreach/outreach-3.dmm",
- "4" = "maps/outreach/outreach-4.dmm"
- )
-
-#else
- default_levels = list(
- "4" = "maps/outreach/outreach-1.dmm",
- "5" = "maps/outreach/outreach-2.dmm",
- "6" = "maps/outreach/outreach-3.dmm",
- "7" = "maps/outreach/outreach-4.dmm"
- )
-
-#endif
lobby_tracks = list(
/decl/music_track/dirtyoldfrogg
)
-/obj/abstract/level_data/exoplanet/outreach
- level_flags = ZLEVEL_PLAYER | ZLEVEL_SEALED | ZLEVEL_SAVED
- base_turf = /turf/exterior/barren
+/datum/map_template/persistent/outreach
+ name = "planet outreach"
+ template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED | TEMPLATE_FLAG_NO_RUINS
+ modify_tag_vars = FALSE
+ template_categories = list(MAP_TEMPLATE_CATEGORY_MAIN_SITE) //Templates must have a category, or they won't spawn
+ tallness = 4
+ mappaths = list(
+ "maps/outreach/outreach-1.dmm",
+ "maps/outreach/outreach-2.dmm",
+ "maps/outreach/outreach-3.dmm",
+ "maps/outreach/outreach-4.dmm"
+ )
+
+/datum/level_data/exoplanet/outreach
+ name = "outreach surface"
+ level_id = "outreach_surface"
+ level_flags = ZLEVEL_CONTACT | ZLEVEL_PLAYER | ZLEVEL_SEALED | ZLEVEL_SAVED
+ ambient_light_level = 0.8
+ base_area = /area/exoplanet/outreach
+ base_turf = /turf/exterior/barren
+ loop_turf_type = /turf/exterior/mimic_edge/transition/loop
+ border_filler = /turf/unsimulated/dark_border
exterior_atmosphere = list(
/decl/material/gas/chlorine = MOLES_CELLSTANDARD,
/decl/material/gas/nitrogen = MOLES_CELLSTANDARD,
)
-/obj/abstract/level_data/exoplanet/outreach/mining
- level_flags = ZLEVEL_PLAYER | ZLEVEL_SEALED | ZLEVEL_SAVED | ZLEVEL_MINING
- base_turf = /turf/exterior/barren
+/datum/level_data/exoplanet/outreach/sky
+ name = "outreach sky"
+ level_id = "outreach_sky"
+ base_area = /area/exoplanet/outreach/sky
+ base_turf = /turf/exterior/open
+
+/datum/level_data/exoplanet/outreach/mining
+ name = "outreach mines"
+ level_id = "outreach_mines"
+ level_flags = ZLEVEL_CONTACT | ZLEVEL_PLAYER | ZLEVEL_SEALED | ZLEVEL_SAVED | ZLEVEL_MINING
+ base_area = /area/exoplanet/outreach/mines/depth_1
+ base_turf = /turf/exterior/barren
+ border_filler = /turf/unsimulated/mineral
+
+/datum/level_data/exoplanet/outreach/mining/bottom
+ name = "outreach mines bottom"
+ level_id = "outreach_mines_bottom"
+ base_area = /area/exoplanet/outreach/mines/depth_2
+
+/obj/abstract/level_data_spawner/exoplanet/outreach
+ name = "outreach surface (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/outreach
+
+/obj/abstract/level_data_spawner/exoplanet/outreach/sky
+ name = "outreach sky (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/outreach/sky
+
+/obj/abstract/level_data_spawner/exoplanet/outreach/mining
+ name = "outreach mines (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/outreach/mining
+
+/obj/abstract/level_data_spawner/exoplanet/outreach/mining/bottom
+ name = "outreach mines bottom (level data spawner)"
+ level_data_type = /datum/level_data/exoplanet/outreach/mining/bottom
\ No newline at end of file
diff --git a/maps/tradeship/tradeship-0.dmm b/maps/tradeship/tradeship-0.dmm
index 2b3c0e8b655..09d6cef8705 100644
--- a/maps/tradeship/tradeship-0.dmm
+++ b/maps/tradeship/tradeship-0.dmm
@@ -1631,7 +1631,7 @@
/turf/simulated/floor,
/area/ship/trade/fore_port_underside_maint)
"Dt" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Tradeship Basement Deck";
},
/turf/space,
diff --git a/maps/tradeship/tradeship-1.dmm b/maps/tradeship/tradeship-1.dmm
index 70abb432e3c..3cea4760ba4 100644
--- a/maps/tradeship/tradeship-1.dmm
+++ b/maps/tradeship/tradeship-1.dmm
@@ -2047,7 +2047,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/trade/maintenance/techstorage)
"iS" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Tradeship Cargo Deck";
},
/turf/space,
diff --git a/maps/tradeship/tradeship-2.dmm b/maps/tradeship/tradeship-2.dmm
index 329624a3a4b..2b5119ee53f 100644
--- a/maps/tradeship/tradeship-2.dmm
+++ b/maps/tradeship/tradeship-2.dmm
@@ -5560,7 +5560,7 @@
/turf/simulated/floor/tiled,
/area/ship/trade/crew/saloon)
"xh" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Tradeship Habitation Deck"
},
/turf/space,
diff --git a/maps/tradeship/tradeship-3.dmm b/maps/tradeship/tradeship-3.dmm
index 86da21e922e..5d834be0f40 100644
--- a/maps/tradeship/tradeship-3.dmm
+++ b/maps/tradeship/tradeship-3.dmm
@@ -567,7 +567,7 @@
/turf/simulated/floor/plating,
/area/ship/trade/bridge_unused)
"dm" = (
-/obj/abstract/level_data/main_level{
+/obj/abstract/level_data_spawner/main_level{
name = "Tradeship Upper Deck";
},
/turf/space,
diff --git a/maps/utility/cargo_shuttle_tmpl.dm b/maps/utility/cargo_shuttle_tmpl.dm
index 48f44802c5b..d477c8a9aed 100644
--- a/maps/utility/cargo_shuttle_tmpl.dm
+++ b/maps/utility/cargo_shuttle_tmpl.dm
@@ -1,36 +1,114 @@
+///Default identifier for the starting waypoint for the cargo shuttle map template.
+#define CARGO_SHUTTLE_TEMPLATE_WAYPOINT_OFFSITE "nav_supply_shuttle_offsite_dock"
+///Default identifier for the station dock waypoint for the cargo shuttle map template.
+#define CARGO_SHUTTLE_TEMPLATE_WAYPOINT_STATION "nav_supply_shuttle_station_dock"
+
+///Default identifier for the off site docking controller id for the supply shuttle
+#define CARGO_SHUTTLE_TEMPLATE_CTRL_ID_OFFSITE "supply_shuttle_ctrl_offsite"
+///Default identifier for the station dock cargo shuttle template docking controller.
+#define CARGO_SHUTTLE_TEMPLATE_CTRL_ID_STATION "supply_shuttle_ctrl_station"
+///Default identifier for the cargo shuttle template's shuttle docking controller.
+#define CARGO_SHUTTLE_TEMPLATE_CTRL_ID_SHUTTLE "supply_shuttle_ctrl"
+
+///Id tag for the shuttle's own rear shutters
+#define CARGO_SHUTTLE_TEMPLATE_DOORS_ID_SHUTTLE "supply_shuttle_shutters"
+///Id tag for the offsite docks's shutters (Might get removed at one point)
+#define CARGO_SHUTTLE_TEMPLATE_DOORS_ID_OFFSITE "_supply_shuttle_offsite_shutters"
+///Id tag for station side docks's doors. That's just a default suggestion.
+#define CARGO_SHUTTLE_TEMPLATE_DOORS_ID_STATION "supply_shuttle_station_shutters"
+///Id tag for the conveyors inside the shuttle.
+#define CARGO_SHUTTLE_TEMPLATE_CONVEYORS_ID "supply_shuttle_conveyors"
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Areas
+///////////////////////////////////////////////////////////////////////////////////////////
+
+///Area for the cargo shuttle
/area/shuttle/supply_shuttle
- name = "Supply Shuttle"
+ name = "supply shuttle"
icon_state = "shuttle3"
+ area_flags = AREA_FLAG_SHUTTLE | AREA_FLAG_ION_SHIELDED | AREA_FLAG_RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT
+
+///Area for the small area where the supply shuttle docks to offsite
+/area/cargo_shuttle_dock
+ name = "supply shuttle offsite docks"
+ icon_state = "centcom"
+ requires_power = FALSE
+ dynamic_lighting = FALSE
+ area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP | AREA_FLAG_ION_SHIELDED | AREA_FLAG_RAD_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Template
+///////////////////////////////////////////////////////////////////////////////////////////
+
+///A utility template meant for adding a pre-mapped supply shuttle to any map that want to use one.
+/datum/map_template/cargo_shuttle
+ name = "supply shuttle"
+ template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED | TEMPLATE_FLAG_NO_RADS | TEMPLATE_FLAG_NO_RUINS
+ modify_tag_vars = FALSE
+ level_data_type = /datum/level_data/space
+ mappaths = list("maps/utility/cargo_shuttle_tmpl.dmm")
+ shuttles_to_initialise = list(/datum/shuttle/autodock/ferry/supply/cargo)
+ template_categories = list(MAP_TEMPLATE_CATEGORY_MAIN_SITE) //Wait until all the other templates are loaded first
+ apc_test_exempt_areas = list(
+ /area/shuttle/supply_shuttle = NO_SCRUBBER|NO_VENT|NO_APC,
+ /area/cargo_shuttle_dock = NO_SCRUBBER|NO_VENT|NO_APC,
+ )
-/obj/effect/shuttle_landmark/supply/start
- landmark_tag ="nav_cargo_start"
+///////////////////////////////////////////////////////////////////////////////////////////
+// Shuttle
+///////////////////////////////////////////////////////////////////////////////////////////
+///Cargo shuttle data
/datum/shuttle/autodock/ferry/supply/cargo
- shuttle_area = /area/shuttle/supply_shuttle
- waypoint_offsite = "nav_cargo_start"
+ name = "supply shuttle"
+ display_name = "supply shuttle"
+ defer_initialisation = TRUE
+ warmup_time = 10 //in seconds
+ location = 0 //Start at station or unit test will cry
+ shuttle_area = /area/shuttle/supply_shuttle
+ dock_target = CARGO_SHUTTLE_TEMPLATE_CTRL_ID_SHUTTLE
+ current_location = CARGO_SHUTTLE_TEMPLATE_WAYPOINT_OFFSITE
+ waypoint_offsite = CARGO_SHUTTLE_TEMPLATE_WAYPOINT_OFFSITE
+ waypoint_station = CARGO_SHUTTLE_TEMPLATE_WAYPOINT_STATION
-//
-// SSOverride
-//
+///////////////////////////////////////////////////////////////////////////////////////////
+// Waypoints
+///////////////////////////////////////////////////////////////////////////////////////////
+
+///Starting point in space for the cargo shuttle
+/obj/effect/shuttle_landmark/supply/offsite
+ name = "supply shuttle offsite"
+ landmark_tag = CARGO_SHUTTLE_TEMPLATE_WAYPOINT_OFFSITE
+ docking_controller = CARGO_SHUTTLE_TEMPLATE_CTRL_ID_OFFSITE
+
+///Point on the station where the supply shuttle will dock.
+/obj/effect/shuttle_landmark/supply/dock
+ name = "supply shuttle station dock"
+ landmark_tag = CARGO_SHUTTLE_TEMPLATE_WAYPOINT_STATION
+ docking_controller = CARGO_SHUTTLE_TEMPLATE_CTRL_ID_STATION
+
+///////////////////////////////////////////////////////////////////////////////////////////
+// Supply Override
+///////////////////////////////////////////////////////////////////////////////////////////
+
+///Returns turfs inside the shuttle that can be used for placing ordered items.
/datum/controller/subsystem/supply/get_clear_turfs()
var/list/clear_turfs = ..()
-
+ //Only place crates where there's a crate conveyor
for(var/turf/T in clear_turfs)
- var/had_outline = FALSE
- for(var/atom/movable/AM in T.contents)
- if(istype(AM, /obj/effect/floor_decal/industrial/outline))
- had_outline = TRUE
- break
- if(!had_outline)
- clear_turfs -= T //Remove turfs from the shuttle that we shouldn't put crap on
+ if(!(locate(/obj/machinery/conveyor) in T))
+ clear_turfs -= T
return clear_turfs
-
-//
+///////////////////////////////////////////////////////////////////////////////////////////
// Machines
-//
+///////////////////////////////////////////////////////////////////////////////////////////
+
+// *** Conveyors Switch ***
/obj/machinery/conveyor_switch/indestructible
stat_immune = BROKEN | NOPOWER | MAINT | EMPED | NOSCREEN | NOINPUT
+ id_tag = CARGO_SHUTTLE_TEMPLATE_CONVEYORS_ID
/obj/machinery/conveyor_switch/indestructible/take_damage(amount, damtype, silent)
return
/obj/machinery/door/airlock/hatch/indestructible/attackby(obj/item/C, mob/user)
@@ -39,8 +117,10 @@
SHOULD_CALL_PARENT(FALSE)
return
+// *** Conveyors ***
/obj/machinery/conveyor/indestructible
stat_immune = BROKEN | NOPOWER | MAINT | EMPED | NOSCREEN | NOINPUT
+ id_tag = CARGO_SHUTTLE_TEMPLATE_CONVEYORS_ID
/obj/machinery/conveyor/indestructible/take_damage(amount, damtype, silent)
return
/obj/machinery/conveyor/indestructible/attackby(obj/item/C, mob/user)
@@ -49,8 +129,10 @@
SHOULD_CALL_PARENT(FALSE)
return
+// *** Shutter Button ***
/obj/machinery/button/blast_door/indestructible
stat_immune = BROKEN | NOPOWER | MAINT | EMPED | NOSCREEN | NOINPUT
+ id_tag = CARGO_SHUTTLE_TEMPLATE_DOORS_ID_SHUTTLE
/obj/machinery/button/blast_door/indestructible/take_damage(amount, damtype, silent)
return
/obj/machinery/button/blast_door/indestructible/attackby(obj/item/C, mob/user)
@@ -59,29 +141,52 @@
SHOULD_CALL_PARENT(FALSE)
return
-/obj/machinery/door/airlock/hatch/indestructible
+// *** Shutters ***
+/obj/machinery/door/blast/shutters/indestructible
stat_immune = BROKEN | NOPOWER | MAINT | EMPED | NOSCREEN | NOINPUT
- hackProof = TRUE
-/obj/machinery/door/airlock/hatch/indestructible/take_damage(amount, damtype, silent)
+ id_tag = CARGO_SHUTTLE_TEMPLATE_DOORS_ID_SHUTTLE
+/obj/machinery/door/blast/shutters/indestructible/supply_dock
+ id_tag = CARGO_SHUTTLE_TEMPLATE_DOORS_ID_OFFSITE
+/obj/machinery/door/blast/shutters/indestructible/take_damage(amount, damtype, silent)
return
-/obj/machinery/door/airlock/hatch/indestructible/attackby(obj/item/C, mob/user)
+/obj/machinery/door/blast/shutters/indestructible/attackby(obj/item/C, mob/user)
return
-/obj/machinery/door/airlock/hatch/indestructible/physically_destroyed()
+/obj/machinery/door/blast/shutters/indestructible/physically_destroyed()
SHOULD_CALL_PARENT(FALSE)
return
-/obj/machinery/door/blast/shutters/indestructible
+// *** Airlock Door ***
+/obj/machinery/door/airlock/hatch/indestructible
stat_immune = BROKEN | NOPOWER | MAINT | EMPED | NOSCREEN | NOINPUT
-/obj/machinery/door/blast/shutters/indestructible/take_damage(amount, damtype, silent)
+ hackProof = TRUE
+/obj/machinery/door/airlock/hatch/indestructible/take_damage(amount, damtype, silent)
return
-/obj/machinery/door/blast/shutters/indestructible/attackby(obj/item/C, mob/user)
+/obj/machinery/door/airlock/hatch/indestructible/attackby(obj/item/C, mob/user)
return
-/obj/machinery/door/blast/shutters/indestructible/physically_destroyed()
+/obj/machinery/door/airlock/hatch/indestructible/physically_destroyed()
SHOULD_CALL_PARENT(FALSE)
return
+
+// *** Shuttle Docking Controller Templates ***
+
+///Indestructible variant of the simple_docking_controller
/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible
stat_immune = BROKEN | NOPOWER | MAINT | EMPED | NOSCREEN | NOINPUT
+///Controller for the supply shuttle
+/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/supply_shuttle
+ id_tag = CARGO_SHUTTLE_TEMPLATE_CTRL_ID_SHUTTLE
+ tag_door = CARGO_SHUTTLE_TEMPLATE_DOORS_ID_SHUTTLE
+///Controller for the supply shuttle offsite docks
+/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/supply_offsite
+ id_tag = CARGO_SHUTTLE_TEMPLATE_CTRL_ID_OFFSITE
+ tag_door = CARGO_SHUTTLE_TEMPLATE_DOORS_ID_OFFSITE
+///Controller for the supply shuttle station's docking area
+/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/supply_station
+ name = "supply shuttle docking controller"
+ id_tag = CARGO_SHUTTLE_TEMPLATE_CTRL_ID_STATION
+ tag_door = CARGO_SHUTTLE_TEMPLATE_DOORS_ID_STATION
+
/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/take_damage(amount, damtype, silent)
return
/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/attackby(obj/item/C, mob/user)
@@ -90,13 +195,52 @@
SHOULD_CALL_PARENT(FALSE)
return
-//
+///////////////////////////////////////////////////////////////////////////////////////////
+// Structures
+///////////////////////////////////////////////////////////////////////////////////////////
+
+///A dummy airtight plasticflap to hide the inside of the cargo shuttle offsite docks.
+/obj/structure/plasticflaps/airtight/indestructible
+ anchored = TRUE
+ density = TRUE
+ opacity = TRUE
+/obj/structure/plasticflaps/airtight/indestructible/clear_airtight()
+ return
+/obj/structure/plasticflaps/airtight/indestructible/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ return
+/obj/structure/plasticflaps/airtight/indestructible/explosion_act(severity)
+ SHOULD_CALL_PARENT(FALSE)
+ return
+/obj/structure/plasticflaps/airtight/indestructible/physically_destroyed()
+ SHOULD_CALL_PARENT(FALSE)
+ return
+/obj/structure/plasticflaps/airtight/indestructible/attackby(var/obj/item/C, var/mob/user)
+ return
+
+///Sign
+/obj/structure/sign/warning/hot_exhaust/indestructible/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+ return
+/obj/structure/sign/warning/hot_exhaust/indestructible/explosion_act(severity)
+ SHOULD_CALL_PARENT(FALSE)
+ return
+/obj/structure/sign/warning/hot_exhaust/indestructible/physically_destroyed()
+ SHOULD_CALL_PARENT(FALSE)
+ return
+/obj/structure/sign/warning/hot_exhaust/indestructible/attackby(var/obj/item/C, var/mob/user)
+ return
+/obj/structure/sign/warning/hot_exhaust/indestructible/attack_hand(mob/user)
+ return
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
// Turfs
-//
+///////////////////////////////////////////////////////////////////////////////////////////
+
+///Unbreakable floor tile for cargo shuttle
/turf/simulated/floor/indestructible
- name = "hull plating"
- icon = 'icons/turf/flooring/tiles.dmi'
- icon_state = "reinforced_light"
+ name = "hull plating"
+ icon = 'icons/turf/flooring/tiles.dmi'
+ icon_state = "reinforced_light"
footstep_type = /decl/footsteps/plating
/turf/simulated/floor/indestructible/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -109,6 +253,7 @@
/turf/simulated/floor/indestructible/attackby(var/obj/item/C, var/mob/user)
return
+///Unbreakable wall for cargo shuttle
/turf/simulated/wall/r_titanium/indestructible
name = "hull plating"
@@ -120,4 +265,7 @@
/turf/simulated/wall/r_titanium/indestructible/attack_hand(mob/user)
return
/turf/simulated/wall/r_titanium/indestructible/attackby(var/obj/item/C, var/mob/user)
- return
\ No newline at end of file
+ return
+
+#undef CARGO_SHUTTLE_TEMPLATE_DOORS_ID_OFFSITE
+#undef CARGO_SHUTTLE_TEMPLATE_CTRL_ID_OFFSITE
\ No newline at end of file
diff --git a/maps/utility/cargo_shuttle_tmpl.dmm b/maps/utility/cargo_shuttle_tmpl.dmm
index 3c899d3628b..9489af72ca2 100644
--- a/maps/utility/cargo_shuttle_tmpl.dmm
+++ b/maps/utility/cargo_shuttle_tmpl.dmm
@@ -1,16 +1,14 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
-/turf/space/transit/east,
-/area/space)
+/turf/unsimulated/wall,
+/area/cargo_shuttle_dock)
"b" = (
/obj/machinery/door/blast/shutters/indestructible{
dir = 4;
- icon_state = "shutter1";
- id_tag = "_cargo_shuttle_doors"
+ icon_state = "shutter1"
},
/obj/machinery/conveyor/indestructible{
- dir = 8;
- id_tag = "_cargo_shuttle_conveyors"
+ dir = 8
},
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
@@ -24,7 +22,6 @@
/obj/machinery/button/blast_door/indestructible{
dir = 8;
icon_state = "blastctrl";
- id_tag = "_cargo_shuttle_doors";
pixel_x = 0;
pixel_y = -24
},
@@ -32,8 +29,7 @@
/area/shuttle/supply_shuttle)
"e" = (
/obj/machinery/conveyor/indestructible{
- dir = 8;
- id_tag = "_cargo_shuttle_conveyors"
+ dir = 8
},
/obj/effect/floor_decal/industrial/outline/orange,
/turf/simulated/floor/indestructible,
@@ -44,8 +40,7 @@
"g" = (
/obj/effect/floor_decal/industrial/outline/orange,
/obj/machinery/conveyor/indestructible{
- dir = 8;
- id_tag = "_cargo_shuttle_conveyors"
+ dir = 8
},
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
@@ -57,35 +52,49 @@
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
"i" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/structure/railing/mapped{
dir = 8
},
+/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
"j" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible{
- dir = 8;
- id_tag = "cargo_bay";
- pixel_x = 20;
- pixel_y = 0;
- tag_door = "_cargo_shuttle_doors"
+/obj/structure/shuttle/engine/heater{
+ dir = 4;
+ icon_state = "heater";
+ pixel_x = -8;
+ pixel_y = 0
+ },
+/obj/structure/sign/warning/hot_exhaust/indestructible{
+ icon_state = "fire";
+ dir = 1
},
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
+"k" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/supply_offsite,
+/turf/unsimulated/floor/tiled/steel_grid,
+/area/cargo_shuttle_dock)
"l" = (
/obj/effect/floor_decal/industrial/outline/orange,
/obj/machinery/conveyor/indestructible{
- dir = 8;
- id_tag = "_cargo_shuttle_conveyors"
+ dir = 8
},
-/obj/effect/shuttle_landmark/supply/start,
+/obj/effect/shuttle_landmark/supply/offsite,
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
"m" = (
-/obj/structure/fake_computer{
+/obj/machinery/door/blast/shutters/indestructible{
+ dir = 4;
+ icon_state = "shutter1"
+ },
+/obj/machinery/conveyor/indestructible{
dir = 8
},
+/obj/machinery/conveyor_switch/indestructible{
+ pixel_x = -12;
+ pixel_y = -16
+ },
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
"n" = (
@@ -101,24 +110,135 @@
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
"p" = (
-/obj/machinery/conveyor_switch/indestructible{
- id_tag = "_cargo_shuttle_conveyors"
- },
+/obj/machinery/conveyor_switch/indestructible,
/obj/machinery/button/blast_door/indestructible{
dir = 8;
- id_tag = "_cargo_shuttle_doors";
pixel_x = 24;
pixel_y = 0
},
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
+"q" = (
+/turf/simulated/wall/r_titanium/indestructible,
+/area/cargo_shuttle_dock)
"r" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/chargen/light{
+ icon_state = "tube_map";
+ dir = 1
+ },
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"s" = (
+/obj/chargen/airlock,
+/turf/unsimulated/floor/tiled/steel_ridged,
+/area/cargo_shuttle_dock)
+"t" = (
+/turf/unsimulated/floor/tiled/steel_grid,
+/area/cargo_shuttle_dock)
+"u" = (
+/obj/machinery/conveyor/indestructible{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/orange,
+/obj/structure/railing/mapped{
+ icon_state = "railing_preview";
+ dir = 1
+ },
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"v" = (
+/obj/structure/plasticflaps/airtight/indestructible,
+/obj/machinery/door/blast/shutters/indestructible/supply_dock{
+ icon_state = "shutter1";
+ dir = 4
+ },
+/turf/unsimulated/floor/tiled/steel_ridged,
+/area/cargo_shuttle_dock)
+"x" = (
+/obj/effect/floor_decal/industrial/outline/orange,
+/obj/machinery/conveyor/indestructible{
+ dir = 8
+ },
+/obj/structure/railing/mapped{
+ icon_state = "railing_preview";
+ dir = 1
+ },
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"y" = (
+/obj/machinery/conveyor/indestructible{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/orange,
+/obj/structure/railing/mapped,
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"z" = (
+/obj/effect/floor_decal/industrial/outline/orange,
+/obj/machinery/conveyor/indestructible{
+ dir = 8
+ },
+/obj/structure/railing/mapped,
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"A" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"B" = (
+/obj/machinery/conveyor/indestructible{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/orange,
+/obj/structure/railing/mapped{
+ icon_state = "railing_preview";
+ dir = 1
+ },
+/obj/chargen/light{
+ icon_state = "tube_map";
+ dir = 1
+ },
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"C" = (
+/obj/structure/fake_computer,
+/obj/machinery/embedded_controller/radio/simple_docking_controller/indestructible/supply_shuttle{
+ dir = 8;
+ pixel_x = 20;
+ pixel_y = 0
+ },
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"D" = (
+/obj/chargen/light{
+ icon_state = "tube_map";
+ dir = 4
+ },
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"E" = (
+/obj/machinery/conveyor/indestructible{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/orange,
+/obj/structure/railing/mapped,
+/obj/chargen/light,
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"F" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/chargen/light,
+/turf/simulated/floor/indestructible,
+/area/shuttle/supply_shuttle)
+"G" = (
/obj/structure/shuttle/engine/heater{
dir = 4;
icon_state = "heater";
pixel_x = -8;
pixel_y = 0
},
+/obj/structure/sign/warning/hot_exhaust/indestructible,
/turf/simulated/floor/indestructible,
/area/shuttle/supply_shuttle)
@@ -137,113 +257,138 @@ a
"}
(2,1,1) = {"
a
+a
+q
+k
+t
+t
+t
+t
+q
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+q
+q
+v
+v
+v
+q
+q
+a
+a
+"}
+(4,1,1) = {"
+a
+a
d
c
b
b
-b
-b
-b
+m
c
o
a
+a
"}
-(3,1,1) = {"
+(5,1,1) = {"
a
-r
+a
+j
c
+B
e
-e
-e
-e
-e
+E
c
-r
+G
+a
a
"}
-(4,1,1) = {"
+(6,1,1) = {"
a
a
c
+c
+u
e
-e
-e
-e
-e
+y
+c
c
a
a
"}
-(5,1,1) = {"
+(7,1,1) = {"
a
a
c
+f
+x
g
-g
-g
-g
-g
+z
+f
c
a
a
"}
-(6,1,1) = {"
+(8,1,1) = {"
a
a
c
-g
-g
+f
+x
l
-g
-g
+z
+f
c
a
a
"}
-(7,1,1) = {"
-a
+(9,1,1) = {"
a
+q
c
+r
g
g
g
-g
-g
+F
c
-a
+q
a
"}
-(8,1,1) = {"
-a
+(10,1,1) = {"
a
+s
h
+A
i
n
-n
-n
i
+A
h
-a
+s
a
"}
-(9,1,1) = {"
-a
+(11,1,1) = {"
a
+q
c
-p
-j
-m
-f
+c
+C
+D
p
c
-a
+c
+q
a
"}
-(10,1,1) = {"
+(12,1,1) = {"
+a
a
a
-c
-c
c
c
c
@@ -251,8 +396,9 @@ c
c
a
a
+a
"}
-(11,1,1) = {"
+(13,1,1) = {"
a
a
a
diff --git a/maps/~mapsystem/maps.dm b/maps/~mapsystem/maps.dm
index 5e7b0a00138..69fa39b2d95 100644
--- a/maps/~mapsystem/maps.dm
+++ b/maps/~mapsystem/maps.dm
@@ -254,7 +254,7 @@ var/global/const/MAP_HAS_RANK = 2 //Rank system, also togglable
world.maxy = planet_size[2]
for(var/i = 0, i < num_exoplanets, i++)
var/exoplanet_type = pick_exoplanet()
- var/obj/abstract/level_data/exoplanet/planet_level = SSmapping.increment_world_z_size(/obj/abstract/level_data/exoplanet, TRUE)
+ var/datum/level_data/exoplanet/planet_level = SSmapping.increment_world_z_size(/datum/level_data/exoplanet, TRUE)
var/obj/effect/overmap/visitable/sector/exoplanet/new_planet = new exoplanet_type(locate(1, 1, world.maxz))
new_planet.zlevels += planet_level
new_planet.build_level(planet_size[1], planet_size[2])
@@ -414,3 +414,31 @@ var/global/const/MAP_HAS_RANK = 2 //Rank system, also togglable
/datum/map/proc/populate_overmap_events()
for(var/overmap_id in global.overmaps_by_name)
SSmapping.overmap_event_handler.create_events(global.overmaps_by_name[overmap_id])
+
+///Loads main sites templates. Main sites template are not always saved btw, and may still be loaded when there is saved data
+/datum/map/proc/build_main_sites()
+ report_progress("Loading main sites...")
+ var/list/sites_by_spawn_weight = list()
+ var/list/sites_templates = SSmapping.get_templates_by_category(MAP_TEMPLATE_CATEGORY_MAIN_SITE)
+
+ for (var/site_name in sites_templates)
+ var/datum/map_template/site = sites_templates[site_name]
+ if((site.template_flags & TEMPLATE_FLAG_SPAWN_GUARANTEED) && site.load_new_z()) // no check for budget, but guaranteed means guaranteed
+ report_progress("Processed guaranteed main site [site]!")
+ away_site_budget -= site.get_template_cost()
+ continue
+ sites_by_spawn_weight[site] = site.get_spawn_weight()
+
+ while (away_site_budget > 0 && sites_by_spawn_weight.len)
+ var/datum/map_template/selected_site = pickweight(sites_by_spawn_weight)
+ if (!selected_site)
+ break
+ sites_by_spawn_weight -= selected_site
+ var/site_cost = selected_site.get_template_cost()
+ if(site_cost > away_site_budget)
+ continue
+ if (selected_site.load_new_z())
+ report_progress("Loaded main site [selected_site]!")
+ away_site_budget -= site_cost
+
+ report_progress("Finished loading main sites, remaining budget [away_site_budget], remaining sites [sites_by_spawn_weight.len]")
diff --git a/maps/~unit_tests/proximity_tests.dmm b/maps/~unit_tests/proximity_tests.dmm
index 2c37f2e8236..7dad08da0e8 100644
--- a/maps/~unit_tests/proximity_tests.dmm
+++ b/maps/~unit_tests/proximity_tests.dmm
@@ -20,7 +20,7 @@
/turf/simulated/wall,
/area/test_area/proximity)
"Q" = (
-/obj/abstract/level_data/debug,
+/obj/abstract/level_data_spawner/debug,
/turf/space,
/area/space)
diff --git a/maps/~unit_tests/unit_tests.dmm b/maps/~unit_tests/unit_tests.dmm
index 2ec10d96ea5..9490330c1a8 100644
--- a/maps/~unit_tests/unit_tests.dmm
+++ b/maps/~unit_tests/unit_tests.dmm
@@ -70,7 +70,7 @@
/turf/space,
/area/test_area/general)
"X" = (
-/obj/abstract/level_data/debug,
+/obj/abstract/level_data_spawner/debug,
/turf/unsimulated/floor{
icon_state = "hydrofloor"
},
diff --git a/mods/content/government/away_sites/icarus/icarus.dm b/mods/content/government/away_sites/icarus/icarus.dm
index 684b17ac277..ca453f449b0 100644
--- a/mods/content/government/away_sites/icarus/icarus.dm
+++ b/mods/content/government/away_sites/icarus/icarus.dm
@@ -42,7 +42,7 @@
prefix = "mods/content/government/away_sites/"
suffixes = list("icarus/icarus-1.dmm", "icarus/icarus-2.dmm")
cost = 2
- level_data_type = /obj/abstract/level_data/mining_level
+ level_data_type = /datum/level_data/mining_level
area_usage_test_exempted_root_areas = list(/area/icarus)
area_coherency_test_exempt_areas = list(/area/icarus/vessel, /area/icarus/open)
apc_test_exempt_areas = list(
diff --git a/mods/persistence/_maps.dm b/mods/persistence/_maps.dm
index 803df000646..5453b5fb365 100644
--- a/mods/persistence/_maps.dm
+++ b/mods/persistence/_maps.dm
@@ -1,3 +1,2 @@
/datum/map
- var/list/saved_levels = list() // Z-levels that will be persisted to a database layer during saving intervals.
var/spawn_network // Network ID of the computer network used on the planetary base.
\ No newline at end of file
diff --git a/mods/persistence/_persistence.dme b/mods/persistence/_persistence.dme
index e4224ad97a4..367166e3ca7 100644
--- a/mods/persistence/_persistence.dme
+++ b/mods/persistence/_persistence.dme
@@ -141,6 +141,7 @@
#include "modules\hydroponics\spreading\spreading.dm"
#include "modules\integrated_electronics\printer.dm"
#include "modules\lighting\lighting_overlay.dm"
+#include "modules\map\map_template_persistent.dm"
#include "modules\materials\recipes_persistence.dm"
#include "modules\materials\definitions\materials_solid_metal.dm"
#include "modules\materials\definitions\materials_stone.dm"
diff --git a/mods/persistence/controllers/subsystems/initialization/chargen.dm b/mods/persistence/controllers/subsystems/initialization/chargen.dm
index c4505480a92..43e03219ceb 100644
--- a/mods/persistence/controllers/subsystems/initialization/chargen.dm
+++ b/mods/persistence/controllers/subsystems/initialization/chargen.dm
@@ -11,7 +11,7 @@ SUBSYSTEM_DEF(chargen)
var/obj/abstract/limbo_holder
/datum/controller/subsystem/chargen/Initialize()
- SSmapping.increment_world_z_size(/obj/abstract/level_data/chargen)
+ SSmapping.increment_world_z_size(/datum/level_data/chargen)
map_z = world.maxz
report_progress("Loading chargen map data.")
@@ -93,7 +93,7 @@ SUBSYSTEM_DEF(chargen)
SSchargen.release_spawn_pod(A)
return ..()
-/obj/abstract/level_data/chargen
+/datum/level_data/chargen
level_flags = ZLEVEL_SEALED
//Chargen spawnpoint
diff --git a/mods/persistence/controllers/subsystems/mapping.dm b/mods/persistence/controllers/subsystems/mapping.dm
index e55c78ea87b..1352c8d1923 100644
--- a/mods/persistence/controllers/subsystems/mapping.dm
+++ b/mods/persistence/controllers/subsystems/mapping.dm
@@ -1,45 +1,19 @@
/datum/controller/subsystem/mapping
- /// List of z-levels that are marked to be saved
- var/list/saved_levels = list()
/// List of z-levels that regenerates mining turfs periodically
var/list/mining_levels = list()
- var/tmp/loaded_maps = FALSE
-
/datum/controller/subsystem/mapping/Initialize(timeofday)
. = ..()
#ifndef UNIT_TEST
- var/save_exists = SSpersistence.SaveExists()
- if(save_exists)
- report_progress_serializer("Existing save found.")
+ if(SSpersistence.SaveExists())
+ report_progress_serializer("Existing save found. Loading save...")
+ SSpersistence.LoadWorld()
+ report_progress_serializer("Finished loading save!")
else
- report_progress_serializer("No existing save found.")
-#endif
- // Load our maps dynamically.
- for(var/z in global.using_map.default_levels)
- var/map_file = global.using_map.default_levels[z]
-#ifndef UNIT_TEST
- if(save_exists && (text2num(z) in SSpersistence.saved_levels)) //#FIXME: DANGER This should use level_ids not level z!!!!!
- // Load a default map instead.
- SSmapping.increment_world_z_size(/obj/abstract/level_data/space)
- continue
-#endif
- maploader.load_map(file(map_file), 1, 1, text2num(z), no_changeturf = TRUE)
- CHECK_TICK
-
- // Persistence overmaps use premapped overmaps at the moment, so we override here to delay building the overmaps until appropriate.
- loaded_maps = TRUE
- // Build the list of static persisted levels from our map.
-#ifdef UNIT_TEST
- report_progress_serializer("Unit testing, so not loading saved map")
+ report_progress_serializer("No existing save found. Loading from map files..")
#else
- if(save_exists)
- report_progress_serializer("Loading world save.")
- SSpersistence.LoadWorld()
+ report_progress_serializer("Unit testing, so not loading saved data.")
#endif
/datum/controller/subsystem/mapping/proc/Save()
SSpersistence.SaveWorld()
-
-/datum/map
- var/list/default_levels
\ No newline at end of file
diff --git a/mods/persistence/controllers/subsystems/persistence.dm b/mods/persistence/controllers/subsystems/persistence.dm
index 3cbbc3987e2..928b1140cbf 100644
--- a/mods/persistence/controllers/subsystems/persistence.dm
+++ b/mods/persistence/controllers/subsystems/persistence.dm
@@ -28,12 +28,9 @@
var/list/late_wrappers = list() // Some wrapped objects need special behavior post-load. This list is cleared post-atom Init.
-/datum/controller/subsystem/persistence/Initialize()
- saved_levels = global.using_map.saved_levels
-
/datum/controller/subsystem/persistence/proc/SaveExists()
if(!save_exists)
- save_exists = serializer.save_exists()
+ save_exists = establish_save_db_connection() && serializer.save_exists()
in_loaded_world = save_exists
return save_exists
@@ -133,16 +130,18 @@
var/list/z_transform = list()
var/new_z_index = 1
// First we find the highest non-dynamic z_level.
- for(var/z in SSmapping.station_levels) //#FIXME: That logic is flawed. We got levels that aren't dynamic and aren't station levels!!!!
+ for(var/z in SSmapping.player_levels) //#FIXME: That logic is flawed. We got levels that aren't dynamic and aren't station levels!!!!
if(z in saved_levels)
new_z_index = max(new_z_index, z)
// Now we go through our saved levels and remap all of those.
for(var/z in saved_levels)
var/datum/persistence/load_cache/z_level/z_level = new()
+ var/datum/level_data/LD = SSmapping.levels_by_z[z]
z_level.default_turf = get_base_turf(z)
z_level.index = z
- if(z in SSmapping.station_levels) //#FIXME: That logic is flawed. We got levels that aren't dynamic and aren't station levels!!!!
+ z_level.level_data_subtype = LD.type
+ if(z in SSmapping.player_levels) //#FIXME: That logic is flawed. We got levels that aren't dynamic and aren't station levels!!!!
z_level.dynamic = FALSE
z_level.new_index = z
else
@@ -162,6 +161,8 @@
z_level.default_turf = get_base_turf(T.z)
z_level.index = T.z
z_level.dynamic = TRUE
+ var/datum/level_data/LD = SSmapping.levels_by_z[T.z]
+ z_level.level_data_subtype = LD.type
if("[T.z]" in global.overmap_sectors)
var/obj/effect/overmap = global.overmap_sectors["[T.z]"]
z_level.metadata = "[overmap.x],[overmap.y]"
@@ -376,21 +377,49 @@
// Start with rebuilding the z-levels.
//var/last_index = world.maxz
+ var/list/unmapped_z = list()
+ var/list/mapped_z = list()
+ var/list/mapped_indices = list() //Indices reserved by mapped zlevels
+
+ ///Sort z-levels on whether they got a mapped z indice, or not
for(var/datum/persistence/load_cache/z_level/z_level in serializer.resolver.z_levels)
if(z_level.dynamic)
- SSmapping.increment_world_z_size(/obj/abstract/level_data/space)
- z_level.new_index = world.maxz
+ unmapped_z |= z_level
else
- z_level.new_index = z_level.index
- to_world_log("Mapping Save Z ([z_level.index]) to World Z ([z_level.new_index]) with default turf ([z_level.default_turf]).")
+ mapped_z |= z_level
+ mapped_indices |= z_level.index
+
+ //Then handle assigning z levels
+ for(var/datum/persistence/load_cache/z_level/z_level in mapped_z)
+ //If the world z isn't at the index we're loading this level at, increment
+ for(var/z_incr = 1 to max(z_level.index - world.maxz, 0))
+ // Always init to space new levels. It really doesn't matter
+ SSmapping.increment_world_z_size(text2path("[z_level.level_data_subtype]") || /datum/level_data/space, TRUE)
+ //If we have any unmapped z levels to place, use the empty space between
+ if(length(unmapped_z) && !(world.maxz in mapped_indices))
+ var/datum/persistence/load_cache/z_level/unmapped = unmapped_z[unmapped_z.len]
+ unmapped_z.len--
+ unmapped.new_index = world.maxz
+ serializer.z_map["[unmapped.index]"] = unmapped.new_index
+ report_progress_serializer("Mapping Save Z ([unmapped.index]) to World Z ([unmapped.new_index]) with default turf ([unmapped.default_turf]).")
+
+ report_progress_serializer("Mapping Save Z ([z_level.index]) to World Z ([z_level.new_index]) with default turf ([z_level.default_turf]).")
+ z_level.new_index = z_level.index
+ serializer.z_map[num2text(z_level.index)] = z_level.new_index
+
+ //If any unmapped left, add them
+ for(var/datum/persistence/load_cache/z_level/z_level in unmapped_z)
+ SSmapping.increment_world_z_size(/datum/level_data/space)
+ z_level.new_index = world.maxz
serializer.z_map["[z_level.index]"] = z_level.new_index
- to_world_log("Z-Levels loaded!")
+ report_progress_serializer("Mapping Save Z ([z_level.index]) to World Z ([z_level.new_index]) with default turf ([z_level.default_turf]).")
+ report_progress_serializer("Z-Levels loaded!")
// This is a sort-of hack. We're going to go back and edit all of the thing_references to their new Z from the z_levels we just modified.
for(var/thing_id in serializer.resolver.things)
var/datum/persistence/load_cache/thing/thing = serializer.resolver.things[thing_id]
thing.z = serializer.z_map["[thing.z]"]
- to_world_log("Dynamic z-levels populated!")
+ report_progress_serializer("Dynamic z-levels populated!")
// Now we're going to load the actual data from the save.
var/list/turfs_loaded = list()
@@ -411,7 +440,7 @@
to_world_log("Load complete! Took [(world.timeofday-start)/10]s to load [length(serializer.resolver.things)] things. Loaded [LAZYLEN(turfs_loaded)] turfs.")
in_loaded_world = LAZYLEN(turfs_loaded) > 0
- to_world_log("Adding default turfs and areas...")
+ report_progress_serializer("Adding default turfs and areas...")
start = world.timeofday
for(var/datum/persistence/load_cache/z_level/z_level in serializer.resolver.z_levels)
@@ -450,9 +479,9 @@
turf_count = 1
if(change_turf && !turfs_loaded["([T.x], [T.y], [T.z])"])
T.ChangeTurf(z_level.default_turf)
- to_world_log("Default turfs and areas complete! Took [(world.timeofday-start)/10]s.")
+ report_progress_serializer("Default turfs and areas complete! Took [(world.timeofday-start)/10]s.")
- to_world_log("Adding other areas...")
+ report_progress_serializer("Adding other areas...")
start = world.timeofday
for(var/datum/persistence/load_cache/area_chunk/area_chunk in serializer.resolver.area_chunks)
var/area/new_area = global.area_dictionary["[area_chunk.area_type], [area_chunk.name]"]
@@ -466,7 +495,7 @@
var/turf/T = locate(text2num(coords[1]), text2num(coords[2]), coords[3])
new_area.contents += T
- to_world_log("Adding other areas complete! Took [(world.timeofday-start)/10]s.")
+ report_progress_serializer("Adding other areas complete! Took [(world.timeofday-start)/10]s.")
// Cleanup the cache. It uses a *lot* of memory.
for(var/id in serializer.reverse_map)
@@ -474,13 +503,15 @@
T.after_deserialize()
for(var/id in serializer.reverse_list_map)
var/list/_list = serializer.reverse_list_map[id]
+ //#FIXME: If the elements in the list are numbers, this will be even slower than it is right now.
+ // Since it'll runtime if a number is out of range of the list.
for(var/element in _list)
var/datum/T = element
if(istype(T, /datum))
T.after_deserialize()
var/datum/TE
try
- TE = _list[element]
+ TE = _list[element] //#FIXME: We really need to get rid of this awful way to check list types.
catch
continue
try
@@ -528,8 +559,6 @@
saved_levels |= z
/datum/controller/subsystem/persistence/proc/RemoveSavedLevel(var/z)
- if(z in global.using_map.saved_levels)
- return
saved_levels -= z
/datum/controller/subsystem/persistence/proc/AddSavedArea(var/area/A)
diff --git a/mods/persistence/game/machinery/machinery.dm b/mods/persistence/game/machinery/machinery.dm
index f0b13d8e9df..b891ac3b40a 100644
--- a/mods/persistence/game/machinery/machinery.dm
+++ b/mods/persistence/game/machinery/machinery.dm
@@ -16,6 +16,8 @@
if(length(old_cpart))
for(var/obj/item/stock_parts/P in old_cpart)
if(!(P in component_parts))
+ if(!(P.atom_flags & ATOM_FLAG_INITIALIZED))
+ SSatoms.InitAtom(P) //Make sure parts are initialized first!
install_component(P, FALSE, FALSE)
RefreshParts()
CLEAR_SV("old_component_parts")
diff --git a/mods/persistence/game/turfs/turf.dm b/mods/persistence/game/turfs/turf.dm
index d53e1274acd..fed7dc507f6 100644
--- a/mods/persistence/game/turfs/turf.dm
+++ b/mods/persistence/game/turfs/turf.dm
@@ -46,3 +46,12 @@ SAVED_VAR(/turf, applied_decals)
if(T)
LAZYCLEARLIST(T.applied_decals) //If we apply a reset, just purge the decal info to avoid accumulating garbage
+///Edge blocker turf
+/turf/unsimulated/dark_border
+ name = "darkness"
+ icon = 'icons/turf/space.dmi'
+ icon_state = "black"
+ density = TRUE
+ opacity = TRUE
+ permit_ao = FALSE
+ dynamic_lighting = FALSE
\ No newline at end of file
diff --git a/mods/persistence/modules/map/map_template_persistent.dm b/mods/persistence/modules/map/map_template_persistent.dm
new file mode 100644
index 00000000000..4c54022b9da
--- /dev/null
+++ b/mods/persistence/modules/map/map_template_persistent.dm
@@ -0,0 +1,13 @@
+///Map template for the main map that skips loading from file when a save exists.
+/datum/map_template/persistent
+ template_parent_type = /datum/map_template/persistent
+
+/datum/map_template/persistent/load_new_z(no_changeturf, centered)
+ if(SSpersistence.SaveExists())
+ report_progress_serializer("Skipped loading map for persistent map template [name] on z [world.maxz], since we got a save!")
+ loaded++ //Always mark it as loaded
+ return locate(world.maxx/2, world.maxy/2, world.maxz)
+ . = ..()
+
+/datum/map_template/persistent/load(turf/T, centered)
+ CRASH("Persistent level templates cannot be loaded on an existing level!")
diff --git a/mods/persistence/modules/multiz/level_data.dm b/mods/persistence/modules/multiz/level_data.dm
index ee8916b7181..cbe2b1eb386 100644
--- a/mods/persistence/modules/multiz/level_data.dm
+++ b/mods/persistence/modules/multiz/level_data.dm
@@ -1,6 +1,6 @@
-/obj/abstract/level_data/setup_level_data()
+/datum/level_data/setup_level_data()
if(level_flags & ZLEVEL_SAVED)
- SSmapping.saved_levels |= my_z
+ SSpersistence.saved_levels |= level_z
if(level_flags & ZLEVEL_MINING)
- SSmapping.mining_levels |= my_z
+ SSmapping.mining_levels |= level_z
. = ..()
\ No newline at end of file
diff --git a/mods/persistence/modules/overmap/exoplanets/_exoplanet.dm b/mods/persistence/modules/overmap/exoplanets/_exoplanet.dm
index 353e0e5a622..1bea063991d 100644
--- a/mods/persistence/modules/overmap/exoplanets/_exoplanet.dm
+++ b/mods/persistence/modules/overmap/exoplanets/_exoplanet.dm
@@ -2,18 +2,11 @@
start_x = x
start_y = y
- old_loc = loc
+ old_loc = loc
// Force move the sector to its z level(s) so that it can properly reinitialize.
- forceMove(locate(world.maxx/2, world.maxy/2, map_z[1]))
+ forceMove(locate(world.maxx/2, world.maxy/2, max(map_z))) //Levels are loaded from bottom to top, so this should be fine
/obj/effect/overmap/visitable/sector/exoplanet/on_saving_end()
forceMove(old_loc)
-/turf/Initialize(mapload, ...)
- . = ..()
- if(persistent_id)
- //A bit of a fix for planetary areas being generally shit
- var/obj/effect/overmap/visitable/sector/exoplanet/EXO = LAZYACCESS(global.overmap_sectors, "[z]")
- if(istype(EXO) && EXO.planetary_area && istype(loc, world.area))
- ChangeArea(src, EXO.planetary_area)
\ No newline at end of file
diff --git a/mods/persistence/modules/overmap/sectors.dm b/mods/persistence/modules/overmap/sectors.dm
index d8ee52fa7b3..a3469333ce5 100644
--- a/mods/persistence/modules/overmap/sectors.dm
+++ b/mods/persistence/modules/overmap/sectors.dm
@@ -3,6 +3,7 @@
// If the area or z-level is saved, the overmap effect will be saved.
var/atom/old_loc // Where the ship was prior to saving. Used to relocate the ship following saving, not on load.
+ //#FIXME: Don't store this here.
var/rent_amount = 15000 // The amount of rent per period.
var/paid_rent = 0 // The rent paid so far.
var/rent_period = 14 DAYS // Time between rent payments.
diff --git a/mods/persistence/modules/overmap/stellar_anchor.dm b/mods/persistence/modules/overmap/stellar_anchor.dm
index 784267fd575..0a2496f8cf3 100644
--- a/mods/persistence/modules/overmap/stellar_anchor.dm
+++ b/mods/persistence/modules/overmap/stellar_anchor.dm
@@ -82,7 +82,7 @@
var/overmap_x = origin_sector.x
var/overmap_y = origin_sector.y
- SSmapping.increment_world_z_size(/obj/abstract/level_data/space) // Create a new z-level for the sector to correspond to.
+ SSmapping.increment_world_z_size(/datum/level_data/space) // Create a new z-level for the sector to correspond to.
new /obj/effect/portal(get_turf(src))
qdel_self()
diff --git a/mods/persistence/modules/world_save/load_cache.dm b/mods/persistence/modules/world_save/load_cache.dm
index d5b8ac6d983..b762b2e7ddf 100644
--- a/mods/persistence/modules/world_save/load_cache.dm
+++ b/mods/persistence/modules/world_save/load_cache.dm
@@ -45,6 +45,7 @@
var/dynamic = FALSE // Dynamic z_levels are transformed on load.
var/metadata
var/default_turf // The fill turf for the z_level.
+ var/level_data_subtype
var/list/areas = list() // List of lists corresponding to one horizontal row of areas.
// Format is list(list(type, name, tile count), ...)
@@ -56,6 +57,7 @@
default_turf = text2path(sql_row["default_turf"])
metadata = sql_row["metadata"]
areas = json_decode(sql_row["areas"])
+ level_data_subtype = text2path(sql_row["level_data_subtype"])
// A much less performant way of keeping track of areas by recording each individual turf.
/datum/persistence/load_cache/area_chunk
@@ -91,7 +93,7 @@
CRASH("Load_Cache: Couldn't establish DB connection!")
// Deserialize levels
var/start = world.timeofday
- var/DBQuery/query = dbcon_save.NewQuery("SELECT `z`,`dynamic`,`default_turf`,`metadata`,`areas` FROM `[SQLS_TABLE_Z_LEVELS]`;")
+ var/DBQuery/query = dbcon_save.NewQuery("SELECT `z`,`dynamic`,`default_turf`,`metadata`,`areas`,`level_data_subtype` FROM `[SQLS_TABLE_Z_LEVELS]`;")
SQLS_EXECUTE_AND_REPORT_ERROR(query, "DESERIALIZE Z LEVELS FAILED:")
while(query.NextRow())
var/items = query.GetRowData()
diff --git a/mods/persistence/modules/world_save/saved_vars/saved_skipped.dm b/mods/persistence/modules/world_save/saved_vars/saved_skipped.dm
index 4fdb5e3b9b0..2172dd6b1b1 100644
--- a/mods/persistence/modules/world_save/saved_vars/saved_skipped.dm
+++ b/mods/persistence/modules/world_save/saved_vars/saved_skipped.dm
@@ -39,4 +39,8 @@
should_save = FALSE
/particles
+ should_save = FALSE
+
+//This object is doing a bunch of nasty things, like initializing during new, and moving to nullspace, don't try saving it.
+/obj/abstract/weather_system
should_save = FALSE
\ No newline at end of file
diff --git a/mods/persistence/modules/world_save/serializers/sql_serializer.dm b/mods/persistence/modules/world_save/serializers/sql_serializer.dm
index e32dd865b0f..c4fbe70c303 100644
--- a/mods/persistence/modules/world_save/serializers/sql_serializer.dm
+++ b/mods/persistence/modules/world_save/serializers/sql_serializer.dm
@@ -27,7 +27,16 @@
while(query.NextRow())
to_chat(usr, "Z data: (ID: [query.item[1]], Z: [query.item[2]], Dynamic: [query.item[3]], Default Turf: [query.item[4]])")
- query = dbcon_save.NewQuery("SELECT `TABLE_NAME`, `TABLE_ROWS` FROM information_schema.tables WHERE `TABLE_NAME` IN ('[SQLS_TABLE_LIST_ELEM]', '[SQLS_TABLE_DATUM]', '[SQLS_TABLE_DATUM_VARS]')")
+ query = dbcon_save.NewQuery("SELECT DATABASE();")
+ var/my_db_name
+ if(!query.Execute())
+ to_chat(usr, "Error: [query.ErrorMsg()]")
+ return
+
+ query.NextRow()
+ my_db_name = query.item[1]
+
+ query = dbcon_save.NewQuery("SELECT `TABLE_NAME`, `TABLE_ROWS` FROM information_schema.tables WHERE `TABLE_SCHEMA` = '[my_db_name]' AND `TABLE_NAME` IN ('[SQLS_TABLE_LIST_ELEM]', '[SQLS_TABLE_DATUM]', '[SQLS_TABLE_DATUM_VARS]', '[SQLS_TABLE_AREAS]', '[SQLS_TABLE_LIMBO]', '[SQLS_TABLE_LIMBO_DATUM]', '[SQLS_TABLE_LIMBO_DATUM_VARS]', '[SQLS_TABLE_LIMBO_LIST_ELEM]', '[SQLS_TABLE_LIST_ELEM]')")
if(!query.Execute())
to_chat(usr, "Error: [query.ErrorMsg()]")
return
@@ -276,7 +285,7 @@ var/global/list/serialization_time_spent_type
var/EV = null
if(!isnum(key))
try
- EV = _list[key]
+ EV = _list[key] //#FIXME: We really need to get rid of this awful way to check if lists are associative.
catch
EV = null // NBD... No value.
if (isnull(key))
@@ -617,9 +626,9 @@ var/global/list/serialization_time_spent_type
var/z_insert_index = 1
for(var/z in z_transform)
var/datum/persistence/load_cache/z_level/z_level = z_transform[z]
- z_inserts += "([z_insert_index],[z_level.new_index],[z_level.dynamic],'[z_level.default_turf]','[z_level.metadata]','[json_encode(z_level.areas)]')"
+ z_inserts += "([z_insert_index],[z_level.new_index],[z_level.dynamic],'[z_level.default_turf]','[z_level.metadata]','[json_encode(z_level.areas)]','[z_level.level_data_subtype]')"
z_insert_index++
- var/DBQuery/query = dbcon_save.NewQuery("INSERT INTO `[SQLS_TABLE_Z_LEVELS]` (`id`,`z`,`dynamic`,`default_turf`,`metadata`,`areas`) VALUES[jointext(z_inserts, ",")]")
+ var/DBQuery/query = dbcon_save.NewQuery("INSERT INTO `[SQLS_TABLE_Z_LEVELS]` (`id`,`z`,`dynamic`,`default_turf`,`metadata`,`areas`,`level_data_subtype`) VALUES[jointext(z_inserts, ",")]")
SQLS_EXECUTE_AND_REPORT_ERROR(query, "Z_LEVEL SERIALIZATION FAILED:")
return TRUE
diff --git a/mods/persistence/modules/world_save/wrappers/map_data_wrapper.dm b/mods/persistence/modules/world_save/wrappers/map_data_wrapper.dm
index da6fd535001..c84ddf7c67c 100644
--- a/mods/persistence/modules/world_save/wrappers/map_data_wrapper.dm
+++ b/mods/persistence/modules/world_save/wrappers/map_data_wrapper.dm
@@ -16,6 +16,7 @@
/datum/wrapper/map_data/on_deserialize(var/serializer/curr_serializer)
var/list/coords = splittext(landmark_loc, ",")
+ report_progress_serializer("Deserialized map data on z [text2num(coords[3])]")
var/turf/T = locate(text2num(coords[1]), text2num(coords[2]), text2num(coords[3]))
return new /obj/abstract/map_data(T, text2num(height))
\ No newline at end of file
diff --git a/nebula.dme b/nebula.dme
index e5d7c96da0a..2069cc5b6cd 100644
--- a/nebula.dme
+++ b/nebula.dme
@@ -2724,6 +2724,7 @@
#include "code\modules\multiz\pipes.dm"
#include "code\modules\multiz\stairs.dm"
#include "code\modules\multiz\turf.dm"
+#include "code\modules\multiz\turf_mimic_edge.dm"
#include "code\modules\multiz\zmimic\mimic_common.dm"
#include "code\modules\multiz\zmimic\mimic_movable.dm"
#include "code\modules\multiz\zmimic\mimic_turf.dm"
diff --git a/sql/V100__Persistence.sql b/sql/V100__Persistence.sql
index f3044f46972..37805a8dd85 100644
--- a/sql/V100__Persistence.sql
+++ b/sql/V100__Persistence.sql
@@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS `z_level` (
`default_turf` varchar(256) DEFAULT NULL,
`metadata` varchar(64) DEFAULT NULL,
`areas` longtext NOT NULL,
+ `level_data_subtype` VARCHAR(256) NOT NULL DEFAULT 'space',
PRIMARY KEY (`id`),
UNIQUE KEY `id_UNIQUE` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/sql/migrate/V100__Persistence.sql b/sql/migrate/V100__Persistence.sql
index 62fcb0c2129..08ecf33a4b7 100644
--- a/sql/migrate/V100__Persistence.sql
+++ b/sql/migrate/V100__Persistence.sql
@@ -45,6 +45,7 @@ CREATE TABLE IF NOT EXISTS `z_level` (
`default_turf` varchar(256) DEFAULT NULL,
`metadata` varchar(64) DEFAULT NULL,
`areas` longtext NOT NULL,
+ `level_data_subtype` VARCHAR(256) NOT NULL DEFAULT 'space',
PRIMARY KEY (`id`),
UNIQUE KEY `id_UNIQUE` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/test/check-paths.sh b/test/check-paths.sh
index 43b8bfd3e98..475d7f3e106 100755
--- a/test/check-paths.sh
+++ b/test/check-paths.sh
@@ -37,7 +37,7 @@ exactly 1 "world.log<< uses" 'world.log<<|world.log[[:space:]]<<'
exactly 18 "<< uses" '(?> uses" '>>(?!>)' -P
exactly 0 "incorrect indentations" '^( {4,})' -P
-exactly 40 "text2path uses" 'text2path'
+exactly 42 "text2path uses" 'text2path'
exactly 5 "update_icon() override" '/update_icon\((.*)\)' -P
exactly 0 "goto uses" 'goto '
exactly 7 "atom/New uses" '^/(obj|atom|area|mob|turf).*/New\('