adds a second elevator to tether (#6282)

code/game/area/Tether_areas.dm

@@ -58,6 +58,43 @@
 	lift_floor_name = "Chapel, Cargo, EVA, Gateway"
 	lift_announce_str = "Arriving at Station Level 2."
 
+/area/turbolift/tether/elevator_two/transit
+	name = "tether (midway)"
+	lift_floor_label = "Tether Midpoint"
+	lift_floor_name = "Midpoint"
+	lift_announce_str = "Arriving at tether midway point."
+	delay_time = 5 SECONDS
+
+/area/turbolift/t_surface/elevator_two/level1
+	name = "surface (level 1)"
+	lift_floor_label = "Surface 1"
+	lift_floor_name = "Tram, Dorms, Mining, Surf. EVA"
+	lift_announce_str = "Arriving at Base Level 1."
+
+/area/turbolift/t_surface/elevator_two/level2
+	name = "surface (level 2)"
+	lift_floor_label = "Surface 2"
+	lift_floor_name = "Atmos, Maintenance"
+	lift_announce_str = "Arriving at Base Level 2."
+
+/area/turbolift/t_surface/elevator_two/level3
+	name = "surface (level 3)"
+	lift_floor_label = "Surface 3"
+	lift_floor_name = "Bar, Bridge, Pool, Science"
+	lift_announce_str = "Arriving at Base Level 3."
+
+/area/turbolift/t_station/elevator_two/level1
+	name = "asteroid (level 1)"
+	lift_floor_label = "Asteroid 1"
+	lift_floor_name = "AI Core, Eng, Exploration, Secondary Bridge"
+	lift_announce_str = "Arriving at Station Level 1."
+
+/area/turbolift/t_station/elevator_two/level2
+	name = "asteroid (level 2)"
+	lift_floor_label = "Asteroid 2"
+	lift_floor_name = "Chapel, Cargo, EVA, Gateway"
+	lift_announce_str = "Arriving at Station Level 2."
+
 /area/vacant/vacant_restaurant_upper
 	name = "\improper Vacant Restaurant"
 	icon_state = "vacant_site"
@@ -1443,6 +1480,9 @@
 
 	requires_power = FALSE
 
+/area/tether/elevator/two
+	name = "\improper Tether Elevator Two"
+
 /area/tether/midpoint
 	name = "\improper Tether Midpoint"
 

code/modules/turbolift/turbolift_map.dm

@@ -200,6 +200,7 @@
 							qdel(thing)
 				if(checking.type == floor_type) // Don't build over empty space on lower levels.
 					var/obj/machinery/door/airlock/lift/newdoor = new door_type(checking)
+					newdoor.setDir(got_rotated_by_maploader ? got_rotated_by_maploader : dir)
 					if(internal)
 						lift.doors += newdoor
 						newdoor.lift = cfloor

maps/generic/turbolifts.dm

@@ -94,6 +94,17 @@
 		/area/turbolift/t_station/level2
 		)
 
+/obj/turbolift_map_holder/tether/two
+	dir = WEST
+	areas_to_use = list(
+		/area/turbolift/t_surface/elevator_two/level1,
+		/area/turbolift/t_surface/elevator_two/level2,
+		/area/turbolift/t_surface/elevator_two/level3,
+		/area/turbolift/tether/elevator_two/transit,
+		/area/turbolift/t_station/elevator_two/level1,
+		/area/turbolift/t_station/elevator_two/level2
+		)
+
 /**Euthenia Lifts
  */
 

maps/tether/levels/station1.dmm

@@ -3046,6 +3046,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/secondary/escape/medical_escape_pod_hallway)
+"fY" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/station/atrium)
 "fZ" = (
 /obj/machinery/computer/station_alert/all{
 	dir = 4
@@ -4873,8 +4879,8 @@
 /area/bridge/secondary)
 "jX" = (
 /obj/machinery/door/airlock/multi_tile/metal{
-	name = "Cryogenic Storage";
-	dir = 8
+	dir = 8;
+	name = "Cryogenic Storage"
 	},
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -5375,15 +5381,13 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/multi_tile/metal/mait{
-	name = "Maintenance Access";
-	dir = 4
+	dir = 4;
+	name = "Maintenance Access"
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/station/docks)
 "kX" = (
-/turf/simulated/shuttle/wall/voidcraft/green{
-	hard_corner = 1
-	},
+/turf/simulated/wall/r_wall/prepainted,
 /area/tether/elevator)
 "kY" = (
 /obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -9495,6 +9499,9 @@
 "ts" = (
 /turf/simulated/floor/wood/broken,
 /area/maintenance/station/eng_lower)
+"tt" = (
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/tether/elevator/two)
 "tu" = (
 /obj/structure/catwalk,
 /obj/structure/cable{
@@ -12878,15 +12885,15 @@
 "AE" = (
 /obj/machinery/door/blast/regular{
 	density = 0;
+	dir = 4;
 	icon_state = "pdoor0";
 	id = "englockdown";
 	name = "Engineering Lockdown";
-	opacity = 0;
-	dir = 4
+	opacity = 0
 	},
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
-	name = "CE Polarized";
-	id = "ce_office"
+	id = "ce_office";
+	name = "CE Polarized"
 	},
 /obj/effect/paint_stripe/sun,
 /turf/simulated/floor,
@@ -13981,8 +13988,8 @@
 /area/maintenance/abandonedlibrary)
 "CK" = (
 /obj/machinery/door/airlock/multi_tile/metal/mait{
-	req_one_access = list(5,67);
-	dir = 4
+	dir = 4;
+	req_one_access = list(5,67)
 	},
 /obj/machinery/door/firedoor/glass,
 /obj/structure/cable{
@@ -16546,6 +16553,9 @@
 /obj/machinery/light/flamp/noshade,
 /turf/simulated/floor/grass,
 /area/hallway/station/atrium)
+"HS" = (
+/turf/simulated/open,
+/area/tether/elevator/two)
 "HV" = (
 /turf/simulated/wall/prepainted/engineering,
 /area/engineering/hallway)
@@ -18505,16 +18515,9 @@
 /obj/random/cutout,
 /turf/simulated/floor,
 /area/constructionsite)
-"LS" = (
-/obj/machinery/atmospherics/component/unary/vent_scrubber/on{
-	dir = 4
-	},
-/obj/structure/disposalpipe/junction{
-	dir = 1;
-	icon_state = "pipe-j2"
-	},
-/turf/simulated/floor/tiled,
-/area/hallway/station/atrium)
+"LU" = (
+/turf/simulated/wall/r_wall/prepainted,
+/area/tether/elevator/two)
 "LV" = (
 /obj/machinery/sleeper{
 	dir = 4
@@ -18805,8 +18808,8 @@
 "Mz" = (
 /obj/structure/cable/green,
 /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{
-	name = "CE Polarized";
-	id = "ce_office"
+	id = "ce_office";
+	name = "CE Polarized"
 	},
 /obj/effect/paint_stripe/sun,
 /turf/simulated/floor,
@@ -21078,13 +21081,6 @@
 "Rs" = (
 /turf/simulated/wall/prepainted/engineering/atmos,
 /area/engineering/atmos/backup)
-"Rt" = (
-/obj/machinery/disposal,
-/obj/structure/disposalpipe/trunk{
-	dir = 4
-	},
-/turf/simulated/floor/grass,
-/area/hallway/station/atrium)
 "Ru" = (
 /obj/effect/floor_decal/borderfloor{
 	dir = 8
@@ -22361,9 +22357,7 @@
 /area/hallway/station/docks)
 "TO" = (
 /obj/structure/sign/deck1,
-/turf/simulated/shuttle/wall/voidcraft/green{
-	hard_corner = 1
-	},
+/turf/simulated/wall/r_wall/prepainted,
 /area/tether/elevator)
 "TP" = (
 /obj/machinery/atmospherics/component/unary/vent_pump/on{
@@ -25144,6 +25138,9 @@
 	},
 /turf/simulated/floor,
 /area/constructionsite)
+"Zv" = (
+/turf/simulated/open,
+/area/tether/elevator)
 "Zw" = (
 /turf/simulated/mineral/vacuum,
 /area/mine/explored/upper_level)
@@ -47986,10 +47983,10 @@ qU
 Sa
 IW
 kX
-uW
-uW
-uW
-uW
+Zv
+Zv
+Zv
+Zv
 kX
 fz
 ek
@@ -48180,10 +48177,10 @@ mj
 yI
 IW
 kX
-uW
-uW
-uW
-uW
+Zv
+Zv
+Zv
+Zv
 kX
 fz
 sT
@@ -48374,10 +48371,10 @@ IW
 IW
 IW
 kX
-uW
-uW
-uW
-uW
+Zv
+Zv
+Zv
+Zv
 kX
 fz
 Tg
@@ -48568,10 +48565,10 @@ GX
 ym
 UX
 kX
-uW
-uW
-uW
-uW
+Zv
+Zv
+Zv
+Zv
 kX
 fz
 Cp
@@ -49731,12 +49728,12 @@ gq
 Fo
 az
 az
-Fo
-rQ
 ui
+OA
+OA
+OA
+dz
 ui
-rQ
-Fo
 Fo
 Fo
 Fo
@@ -49925,13 +49922,13 @@ Fo
 Fo
 Ld
 UA
+LU
+LU
+tt
+tt
+LU
+LU
 Fo
-Fo
-ui
-ui
-Fo
-Hy
-UA
 Qe
 uy
 Fo
@@ -50119,13 +50116,13 @@ Fo
 Fo
 tx
 tx
+LU
+HS
+HS
+HS
+HS
+LU
 Fo
-Fo
-ui
-ui
-Fo
-Hy
-Ie
 gZ
 el
 Fo
@@ -50313,13 +50310,13 @@ Fo
 mL
 sR
 mL
-sR
-uM
-ui
-ui
-sR
-Hy
-UA
+LU
+HS
+HS
+HS
+HS
+LU
+Fo
 xT
 el
 Fo
@@ -50504,15 +50501,15 @@ ZP
 RV
 cf
 sR
-NI
-NI
-NI
-NI
-NI
-NI
-hJ
-hJ
-mL
+Fo
+Fo
+Fo
+LU
+HS
+HS
+HS
+HS
+LU
 Fo
 Dq
 Ub
@@ -50698,17 +50695,17 @@ iD
 pU
 cf
 uM
-fQ
-ho
-ho
-ho
-ho
-Ka
-PC
-hJ
-sR
 Fo
-UA
+Fo
+Fo
+LU
+HS
+HS
+HS
+HS
+LU
+Fo
+Ie
 UA
 Fo
 SA
@@ -50891,16 +50888,16 @@ bZ
 iD
 pU
 cf
-ui
-qt
-hJ
-hJ
-hJ
-hJ
-Ka
-PC
-hJ
-HR
+Fo
+Fo
+Fo
+Fo
+LU
+LU
+LU
+LU
+LU
+LU
 Fo
 tx
 tx
@@ -51086,17 +51083,17 @@ iD
 pU
 cf
 ui
-iJ
-hk
-iq
-eb
-hJ
-SE
-PC
-hJ
 ui
 ui
 ui
+fY
+ui
+ui
+ui
+ui
+fY
+ui
+ui
 ui
 ui
 cf
@@ -51278,21 +51275,21 @@ Vv
 Fd
 iD
 Vn
-KB
-rj
-vq
-le
-pV
-Tk
+cf
+NI
+NI
+NI
+NI
+NI
 hJ
-SE
-PC
 hJ
 ui
 ui
 ui
 ui
 ui
+ui
+ui
 cf
 vg
 PW
@@ -51473,15 +51470,15 @@ iD
 iD
 lm
 cf
-ui
-Mg
-hJ
-hJ
-hJ
-hJ
-Ka
+fQ
+ho
+ho
+ho
+ho
+SE
 PC
-hJ
+ui
+Fo
 HR
 Fo
 az
@@ -51667,15 +51664,15 @@ zK
 au
 Uq
 cf
-uM
-pg
-RY
-RY
-RY
-RY
-Ka
-PC
+qt
 hJ
+hJ
+hJ
+hJ
+SE
+PC
+ui
+Fo
 sR
 Fo
 ON
@@ -51861,15 +51858,15 @@ GG
 au
 SQ
 cf
-sR
-fH
-fH
-fH
-fH
-fH
-fH
-hJ
+iJ
+hk
+iq
+eb
 hJ
+SE
+PC
+ui
+Fo
 mL
 Fo
 Bx
@@ -52054,14 +52051,14 @@ QO
 Om
 au
 Jv
-cf
-Fo
-mL
-sR
-mL
-sR
-uM
-ui
+KB
+vq
+le
+pV
+Tk
+hJ
+SE
+PC
 ui
 sR
 Hy
@@ -52249,13 +52246,13 @@ OU
 au
 Vn
 cf
-Fo
-Fo
-az
-az
-Fo
-Fo
-ui
+Mg
+hJ
+hJ
+hJ
+hJ
+Ka
+PC
 ui
 Fo
 Hy
@@ -52443,13 +52440,13 @@ lQ
 au
 Fz
 cf
-Fo
-Fo
-ON
-UA
-Fo
-Fo
-ui
+pg
+RY
+RY
+RY
+RY
+Ka
+PC
 ui
 Fo
 Hy
@@ -52637,13 +52634,13 @@ Dy
 au
 IE
 yy
-Rt
-Fo
-tx
-tx
-Fo
-rQ
-ui
+fH
+fH
+fH
+fH
+fH
+fH
+hJ
 ui
 rQ
 Fo
@@ -52831,7 +52828,7 @@ lV
 au
 by
 SF
-LS
+lM
 rj
 rj
 rj