Merge pull request #1334 from Yawn-Wider/redgate

Redgate
Yawn-Wider · Dec 8, 2023 · 0d1c4d4 · 0d1c4d4
2 parents b47955d + c037b83
commit 0d1c4d4
Show file tree

Hide file tree

Showing 69 changed files with 1,163 additions and 133,241 deletions.
diff --git 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 = "Virgo 2"
+	name = "Borealis 3" //YW Edit - Borealis
 	desc = "Includes the Remmi Aerostat and associated ground mining complexes."
-	scanner_desc = @{"[i]Stellar Body[/i]: Virgo 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
@@ -2,7 +2,7 @@
 
 
 /obj/effect/overmap/visitable/sector/virgo2
-	name = "Virgo 2"
+	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
@@ -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"
@@ -168,7 +178,7 @@
 
 /obj/effect/overmap/visitable/ship/landable/luxury_boat/Initialize()
 	. = ..()
-	var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/gov/elysia]
+	var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/gov/almachi] //YW Change - gov we actually have
 	var/newname = "ECS-T [pick(O.ship_names)]"
 	name = newname
 	scanner_desc = {"\[i\]Registration\[/i\]: [newname]

diff --git a/maps/expedition_vr/space/debrisfield.dmm b/maps/expedition_vr/space/debrisfield.dmm
@@ -3,16 +3,13 @@
 /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"
-	},
+"d" = (
 /turf/space,
 /area/tether_away/debrisfield/shuttle_buffer)
-"c" = (
+"h" = (
+/turf/space,
+/area/space)
+"G" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/tether_away/debrisfield/shuttle_buffer;
 	base_turf = /turf/space;
@@ -21,12 +18,15 @@
 	},
 /turf/space,
 /area/tether_away/debrisfield/shuttle_buffer)
-"d" = (
+"J" = (
+/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)
-"h" = (
-/turf/space,
-/area/space)
 
 (1,1,1) = {"
 h
@@ -4319,7 +4319,7 @@ d
 d
 d
 d
-b
+J
 d
 d
 d
@@ -17760,7 +17760,7 @@ d
 d
 d
 d
-c
+G
 d
 d
 d