Merge pull request #2616 from CHOMPStationBot/upstream-merge-11180

[MIRROR] Update gateways

code/modules/mob/dead/observer/observer.dm

@@ -360,7 +360,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	
 	return mobs
 
-/mob/observer/dead/verb/dead_tele(areaname as null|anything in jumpable_areas())
+/mob/observer/dead/verb/dead_tele(areaname as anything in jumpable_areas())
 	set name = "Teleport"
 	set category = "Ghost"
 	set desc = "Teleport to a location."
@@ -387,7 +387,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	usr.forceMove(pick(get_area_turfs(A || jumpable_areas()[areaname])))
 	usr.on_mob_jump()
 
-/mob/observer/dead/verb/follow(mobname as null|anything in jumpable_mobs())
+/mob/observer/dead/verb/follow(mobname as anything in jumpable_mobs())
 	set name = "Follow"
 	set category = "Ghost"
 	set desc = "Follow and haunt a mob."

maps/gateway_vr/carpfarm.dmm

@@ -749,6 +749,10 @@
 /obj/effect/overmap/visitable/sector/tether_gateway/carpfarm,
 /turf/space,
 /area/space)
+"Ia" = (
+/obj/effect/landmark/hidden_level,
+/turf/space,
+/area/space)
 "Zb" = (
 /obj/effect/shuttle_landmark{
 	base_area = /area/space;
@@ -1182,7 +1186,7 @@ aa
 aa
 aa
 aa
-aa
+Ia
 aa
 "}
 (4,1,1) = {"

maps/gateway_vr/listeningpost.dmm

@@ -416,6 +416,10 @@
 /obj/effect/floor_decal/rust,
 /turf/simulated/floor/airless,
 /area/awaymission/listeningpost)
+"Hp" = (
+/obj/effect/landmark/hidden_level,
+/turf/space,
+/area/space)
 
 (1,1,1) = {"
 aa
@@ -840,7 +844,7 @@ aa
 aa
 aa
 aa
-aa
+Hp
 aa
 "}
 (4,1,1) = {"

maps/gateway_vr/snowfield.dmm

@@ -1634,6 +1634,14 @@
 	temperature = 243.15
 	},
 /area/awaymission/snowfield/base)
+"no" = (
+/obj/effect/landmark/hidden_level,
+/turf/simulated/floor/outdoors/snow{
+	nitrogen = 93.7835;
+	oxygen = 20.7263;
+	temperature = 243.15
+	},
+/area/awaymission/snowfield/restricted)
 "Bw" = (
 /obj/effect/overmap/visitable/sector/tether_gateway/snowfield,
 /turf/simulated/floor/outdoors/snow{
@@ -2066,7 +2074,7 @@ ab
 ab
 ab
 ab
-ab
+no
 aa
 "}
 (4,1,1) = {"

maps/gateway_vr/variable/arynthilake_a.dmm

@@ -2068,6 +2068,10 @@
 	},
 /turf/simulated/floor/tiled/eris/white/brown_platform,
 /area/gateway/arynthilake/dome)
+"Or" = (
+/obj/effect/landmark/hidden_level,
+/turf/simulated/mineral/ignore_cavegen,
+/area/gateway/arynthilake/caves)
 "OC" = (
 /turf/simulated/floor/carpet/blucarpet{
 	outdoors = 1
@@ -3052,7 +3056,7 @@ Qr
 Qr
 Qr
 Qr
-Qr
+Or
 aa
 "}
 (5,1,1) = {"

maps/gateway_vr/variable/arynthilake_b.dmm

@@ -2022,6 +2022,10 @@
 	},
 /turf/simulated/floor/tiled/eris/steel/gray_platform,
 /area/gateway/arynthilake/dome)
+"Ry" = (
+/obj/effect/landmark/hidden_level,
+/turf/simulated/mineral/ignore_cavegen,
+/area/gateway/arynthilake/caves)
 "RK" = (
 /obj/structure/table/fancyblack,
 /obj/effect/landmark/mcguffin_spawner,
@@ -3022,7 +3026,7 @@ ek
 ek
 ek
 ek
-ek
+Ry
 nF
 "}
 (5,1,1) = {"

maps/gateway_vr/variable/arynthilakeunderground_a.dmm

@@ -121,6 +121,10 @@
 /obj/random/awayloot,
 /turf/simulated/floor/tiled/eris/steel/techfloor,
 /area/gateway/arynthilake/engine)
+"nD" = (
+/obj/effect/landmark/hidden_level,
+/turf/simulated/mineral/ignore_cavegen,
+/area/gateway/arynthilake/underground)
 "nO" = (
 /turf/simulated/mineral/floor/ignore_cavegen,
 /area/gateway/arynthilake/underground)
@@ -670,7 +674,7 @@ gh
 gh
 gh
 gh
-gh
+nD
 Ft
 "}
 (3,1,1) = {"

maps/gateway_vr/variable/arynthilakeunderground_b.dmm

@@ -103,6 +103,10 @@
 /obj/random/awayloot,
 /turf/simulated/floor/tiled/eris/techmaint,
 /area/gateway/arynthilake/engine)
+"jX" = (
+/obj/effect/landmark/hidden_level,
+/turf/simulated/mineral/ignore_cavegen,
+/area/gateway/arynthilake/underground)
 "kb" = (
 /turf/simulated/wall/r_wall,
 /area/gateway/arynthilake/engine)
@@ -723,7 +727,7 @@ bL
 bL
 bL
 bL
-bL
+jX
 bX
 "}
 (3,1,1) = {"

maps/gateway_vr/variable/honlethhighlands_a.dmm

@@ -1984,6 +1984,12 @@
 /obj/item/weapon/stool/padded,
 /turf/simulated/floor/lino,
 /area/gateway/honlethhighlands/town/bar)
+"Ey" = (
+/obj/effect/landmark/hidden_level,
+/turf/simulated/floor/water/deep{
+	temperature = 253.15
+	},
+/area/gateway/honlethhighlands/beach)
 "EP" = (
 /obj/structure/table/glass,
 /obj/item/weapon/paper_bin,
@@ -3504,7 +3510,7 @@ bm
 bm
 bm
 bm
-bm
+Ey
 aa
 "}
 (5,1,1) = {"

maps/gateway_vr/variable/honlethhighlands_b.dmm

@@ -2048,6 +2048,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/gateway/honlethhighlands)
+"Gm" = (
+/obj/effect/landmark/hidden_level,
+/turf/simulated/floor/water/deep{
+	temperature = 253.15
+	},
+/area/gateway/honlethhighlands/beach)
 "Gn" = (
 /obj/structure/cable/pink{
 	d1 = 2;
@@ -3543,7 +3549,7 @@ bm
 bm
 bm
 bm
-bm
+Gm
 aa
 "}
 (5,1,1) = {"

maps/gateway_vr/wildwest.dmm

@@ -1983,6 +1983,10 @@
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/awaymission/wwmines)
+"RC" = (
+/obj/effect/landmark/hidden_level,
+/turf/space,
+/area/space)
 "RP" = (
 /obj/structure/bed/padded,
 /obj/item/weapon/bedsheet/blue,
@@ -2468,7 +2472,7 @@ ia
 ia
 ia
 ia
-ia
+RC
 aa
 "}
 (3,1,1) = {"

maps/tether/tether_defines.dm

@@ -167,8 +167,7 @@
 		list("Carp Farm"),
 		list("Snow Field"),
 		list("Listening Post"),
-		list("Honleth Highlands A"),
-		list("Honleth Highlands B"),
+		list(list("Honleth Highlands A", "Honleth Highlands B")),
 		list("Arynthi Lake Underground A","Arynthi Lake A"),
 		list("Arynthi Lake Underground B","Arynthi Lake B"),
 		list("Eggnog Town Underground","Eggnog Town"),