From 8e8ab17241045fe70d713f861f42a190afada034 Mon Sep 17 00:00:00 2001 From: Repede Date: Fri, 8 Dec 2023 15:56:41 -0500 Subject: [PATCH] fixed debrisfield somehow --- maps/expedition_vr/aerostat/_aerostat.dm | 4 +-- .../aerostat/_aerostat_science_outpost.dm | 2 +- maps/expedition_vr/space/_debrisfield.dm | 10 ++++++ maps/expedition_vr/space/debrisfield.dmm | 34 +++++++------------ maps/submaps/pois_vr/aerostat/virgo2.dm | 4 +-- maps/yw/submaps/aerostat/submaps/virgo2.dm | 4 +-- maps/yw/submaps/gateway/snow_outpost.dmm | 15 +++----- 7 files changed, 34 insertions(+), 39 deletions(-) diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index a5a1aa4a31f..9a600d27d89 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -1,9 +1,9 @@ #include "../../submaps/pois_vr/aerostat/virgo2.dm" /obj/effect/overmap/visitable/sector/virgo2 - name = "Borealis 2" //YW Edit - Borealis + name = "Borealis 3" //YW Edit - Borealis desc = "Includes the Remmi Aerostat and associated ground mining complexes." - scanner_desc = @{"[i]Stellar Body[/i]: Borealis 2 + scanner_desc = @{"[i]Stellar Body[/i]: Borealis 3 [i]Class[/i]: R-Class Planet [i]Habitability[/i]: Low (High Temperature, Toxic Atmosphere) [b]Notice[/b]: Planetary environment not suitable for life. Landing may be hazardous."} diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm index ed1e0286279..d1029627508 100644 --- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm +++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm @@ -2,7 +2,7 @@ /obj/effect/overmap/visitable/sector/virgo2 - name = "Borealis 2" //YW Edit - Borealis + name = "Borealis 3" //YW Edit - Borealis desc = "Includes the Remmi Aerostat and associated ground mining complexes." scanner_desc = @{"[i]Stellar Body[/i]: Virgo 2 [i]Class[/i]: R-Class Planet diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index 1932b748e4f..fe25381d8fb 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -53,6 +53,16 @@ icon = 'icons/turf/areas_vr.dmi' icon_state = "dark" +//YW ADDITIONS - DEBRIS FIELD LANDMARK +/obj/effect/shuttle_landmark/premade/debrisfield/east + name = "Debris Field - East" + landmark_tag = "debrisfield_nw" + +/obj/effect/shuttle_landmark/premade/debrisfield/west + name = "Debris Field - West" + landmark_tag = "debrisfield_se" +//END YW ADDITIONS + /area/tether_away/debrisfield/shuttle_buffer //For space around shuttle landmarks to keep submaps from generating to block them icon_state = "debrisexplored" name = "\improper Space" diff --git a/maps/expedition_vr/space/debrisfield.dmm b/maps/expedition_vr/space/debrisfield.dmm index cd6afac5a54..7cc14c9890f 100644 --- a/maps/expedition_vr/space/debrisfield.dmm +++ b/maps/expedition_vr/space/debrisfield.dmm @@ -3,30 +3,20 @@ /obj/effect/overmap/visitable/sector/debrisfield, /turf/space, /area/space) -"b" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether_away/debrisfield/shuttle_buffer; - base_turf = /turf/space; - landmark_tag = "debrisfield_nw"; - name = "North West" - }, -/turf/space, -/area/tether_away/debrisfield/shuttle_buffer) -"c" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/tether_away/debrisfield/shuttle_buffer; - base_turf = /turf/space; - landmark_tag = "debrisfield_se"; - name = "South East" - }, -/turf/space, -/area/tether_away/debrisfield/shuttle_buffer) "d" = ( /turf/space, /area/tether_away/debrisfield/shuttle_buffer) "h" = ( /turf/space, /area/space) +"w" = ( +/obj/effect/shuttle_landmark/premade/debrisfield/west, +/turf/space, +/area/tether_away/debrisfield/shuttle_buffer) +"U" = ( +/obj/effect/shuttle_landmark/premade/debrisfield/east, +/turf/space, +/area/tether_away/debrisfield/shuttle_buffer) (1,1,1) = {" h @@ -2329,7 +2319,7 @@ d d d d -b +d d d d @@ -2470,7 +2460,7 @@ d d d d -d +U d d d @@ -15770,7 +15760,7 @@ d d d d -c +d d d d @@ -18184,7 +18174,7 @@ d d d d -d +w d d d diff --git a/maps/submaps/pois_vr/aerostat/virgo2.dm b/maps/submaps/pois_vr/aerostat/virgo2.dm index 8442cb231d0..a7ab981e6ed 100644 --- a/maps/submaps/pois_vr/aerostat/virgo2.dm +++ b/maps/submaps/pois_vr/aerostat/virgo2.dm @@ -29,8 +29,8 @@ #endif /datum/map_template/virgo2 - name = "Surface Content - Borealis 2" // YW EDIT - Borealis 2 - desc = "For seeding submaps on Borealis 2" // YW EDIT - Borealis 2 + name = "Surface Content - Borealis 3" // YW EDIT - Borealis 3 + desc = "For seeding submaps on Borealis 3" // YW EDIT - Borealis 3 allow_duplicates = FALSE /datum/map_template/virgo2/Flake diff --git a/maps/yw/submaps/aerostat/submaps/virgo2.dm b/maps/yw/submaps/aerostat/submaps/virgo2.dm index 1341db61b81..757d314114b 100644 --- a/maps/yw/submaps/aerostat/submaps/virgo2.dm +++ b/maps/yw/submaps/aerostat/submaps/virgo2.dm @@ -29,8 +29,8 @@ #endif /datum/map_template/virgo2 - name = "Surface Content - Borealis 2" // YW EDIT - Borealis 2 - desc = "For seeding submaps on Borealis 2" // YW EDIT - Borealis 2 + name = "Surface Content - Borealis 3" // YW EDIT - Borealis 3 + desc = "For seeding submaps on Borealis 3" // YW EDIT - Borealis 3 allow_duplicates = FALSE /datum/map_template/virgo2/Flake diff --git a/maps/yw/submaps/gateway/snow_outpost.dmm b/maps/yw/submaps/gateway/snow_outpost.dmm index 97cfb2754d0..87ad1a82389 100644 --- a/maps/yw/submaps/gateway/snow_outpost.dmm +++ b/maps/yw/submaps/gateway/snow_outpost.dmm @@ -1735,13 +1735,8 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/awaymission/snow_outpost/powered) -"fV" = ( -/obj/cryogaia_away_spawner/aerostat_inside, -/turf/simulated/floor/outdoors/snow, -/area/awaymission/snow_outpost/dark) "fW" = ( /obj/item/weapon/ore/gold, -/obj/cryogaia_away_spawner/aerostat_inside, /turf/simulated/floor/outdoors/snow, /area/awaymission/snow_outpost/dark) "fX" = ( @@ -3918,9 +3913,9 @@ Lh Lh Lh fW -fV -fV -fV +Lq +Lq +Lq Lq Lq Lq @@ -24344,7 +24339,7 @@ ab ab ab ab -Jn +ab ab ab ab @@ -24660,7 +24655,7 @@ ab ab ab ab -ab +Jn ab ab ab