diff --git a/code/__defines/map.dm b/code/__defines/map.dm index 7d0f3706af..f2584cffe0 100644 --- a/code/__defines/map.dm +++ b/code/__defines/map.dm @@ -9,4 +9,4 @@ #define MAP_LEVEL_XENOARCH_EXEMPT 0x080 // Z-levels exempt from xenoarch digsite generation. // Misc map defines. -#define SUBMAP_MAP_EDGE_PAD 15 // Automatically created submaps are forbidden from being this close to the main map's edge. \ No newline at end of file +#define SUBMAP_MAP_EDGE_PAD 3 // Automatically created submaps are forbidden from being this close to the main map's edge. //VOREStation Edit \ No newline at end of file diff --git a/code/modules/maps/tg/map_template.dm b/code/modules/maps/tg/map_template.dm index 63a597ac8e..132d76445c 100644 --- a/code/modules/maps/tg/map_template.dm +++ b/code/modules/maps/tg/map_template.dm @@ -225,8 +225,8 @@ orientation = pick(list(0, 90, 180, 270)) chosen_template.preload_size(chosen_template.mappath, orientation) - var/width_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.height : chosen_template.width) / 2) // %180 catches East/West (90,270) rotations on true, North/South (0,180) rotations on false - var/height_border = TRANSITIONEDGE + SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.width : chosen_template.height) / 2) + var/width_border = SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.height : chosen_template.width) / 2) // %180 catches East/West (90,270) rotations on true, North/South (0,180) rotations on false //VOREStation Edit + var/height_border = SUBMAP_MAP_EDGE_PAD + round(((orientation%180) ? chosen_template.width : chosen_template.height) / 2) //VOREStation Edit var/z_level = pick(z_levels) var/turf/T = locate(rand(width_border, world.maxx - width_border), rand(height_border, world.maxy - height_border), z_level) var/valid = TRUE diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index c72329a127..453b4dc8c0 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -160,7 +160,7 @@ /datum/map_template/tether_lateload/away_debrisfield/on_map_loaded(z) . = ..() //Commented out until we actually get POIs - seed_submaps(list(Z_LEVEL_DEBRISFIELD), 150, /area/tether_away/debrisfield/unexplored, /datum/map_template/debrisfield) + seed_submaps(list(Z_LEVEL_DEBRISFIELD), 200, /area/tether_away/debrisfield/unexplored, /datum/map_template/debrisfield) /datum/map_z_level/tether_lateload/away_debrisfield name = "Away Mission - Debris Field" diff --git a/maps/tether/submaps/space/pois/_templates.dm b/maps/tether/submaps/space/pois/_templates.dm index 670f9d9d4d..9eee024ac1 100644 --- a/maps/tether/submaps/space/pois/_templates.dm +++ b/maps/tether/submaps/space/pois/_templates.dm @@ -7,4 +7,44 @@ name = "Food Stand" mappath = 'foodstand.dmm' cost = 20 - allow_duplicates = FALSE \ No newline at end of file + allow_duplicates = FALSE + +/datum/map_template/debrisfield/asteroids1 + name = "Asteroids 1" + mappath = 'asteroids1.dmm' + cost = 2 + +/datum/map_template/debrisfield/asteroids2 + name = "Asteroids 2" + mappath = 'asteroids2.dmm' + cost = 2 + +/datum/map_template/debrisfield/asteroids3 + name = "Asteroids 3" + mappath = 'asteroids3.dmm' + cost = 2 + +/datum/map_template/debrisfield/carp_asteroids1 + name = "Carp Asteroids 1" + mappath = 'carp_asteroids1.dmm' + cost = 5 + +/datum/map_template/debrisfield/carp_asteroids2 + name = "Carp Asteroids 2" + mappath = 'carp_asteroids2.dmm' + cost = 5 + +/datum/map_template/debrisfield/carp_asteroids3 + name = "Carp Asteroids 3" + mappath = 'carp_asteroids3.dmm' + cost = 5 + +/datum/map_template/debrisfield/carp_asteroids4 + name = "Carp Asteroids 4" + mappath = 'carp_asteroids4.dmm' + cost = 5 + +/datum/map_template/debrisfield/debris1 + name = "Debris 1" + mappath = 'debris1.dmm' + cost = 2 diff --git a/maps/tether/submaps/space/pois/carp_asteroids1.dmm b/maps/tether/submaps/space/pois/carp_asteroids1.dmm index 0754265f0a..a45cd9c3fa 100644 --- a/maps/tether/submaps/space/pois/carp_asteroids1.dmm +++ b/maps/tether/submaps/space/pois/carp_asteroids1.dmm @@ -1,6 +1,6 @@ -"a" = (/turf/template_noop,/area/space) -"b" = (/turf/simulated/mineral/vacuum,/area/space) -"c" = (/obj/tether_away_spawner/debrisfield/carp,/turf/template_noop,/area/space) +"a" = (/turf/template_noop,/area/tether_away/debrisfield/explored) +"b" = (/turf/simulated/mineral/vacuum,/area/tether_away/debrisfield/explored) +"c" = (/obj/tether_away_spawner/debrisfield/carp,/turf/template_noop,/area/tether_away/debrisfield/explored) (1,1,1) = {" aaaaaabbbba