[MDB IGNORE] NAUTILUS Station 13

code/controllers/subsystem/shuttle.dm

@@ -545,6 +545,7 @@
 	// Because of shuttle rotation, the "width" of the shuttle is not
 	// always x.
 	var/travel_dir = M.preferred_direction
+	var/space_elevator = M.space_elevator
 	// Remember, the direction is the direction we appear to be
 	// coming from
 	var/dock_angle = dir2angle(M.preferred_direction) + dir2angle(M.port_direction) + 180
@@ -569,15 +570,18 @@
 */
 
 	var/transit_path = /turf/open/space/transit
-	switch(travel_dir)
-		if(NORTH)
-			transit_path = /turf/open/space/transit/north
-		if(SOUTH)
-			transit_path = /turf/open/space/transit/south
-		if(EAST)
-			transit_path = /turf/open/space/transit/east
-		if(WEST)
-			transit_path = /turf/open/space/transit/west
+	if(space_elevator)
+		transit_path = /turf/open/space/transit/space_elevator
+	else
+		switch(travel_dir)
+			if(NORTH)
+				transit_path = /turf/open/space/transit/north
+			if(SOUTH)
+				transit_path = /turf/open/space/transit/south
+			if(EAST)
+				transit_path = /turf/open/space/transit/east
+			if(WEST)
+				transit_path = /turf/open/space/transit/west
 
 	var/datum/turf_reservation/proposal = SSmapping.request_turf_block_reservation(
 		transit_width,

code/game/area/areas/shuttles.dm

@@ -142,6 +142,12 @@
 	name = "Mining Shuttle"
 	blob_allowed = FALSE
 
+/area/shuttle/space_elevator
+	name = "Space Elevator"
+	blob_allowed = FALSE
+	lighting_colour_tube = "#ffdde6"
+	lighting_colour_bulb = "#ffc1d9"
+
 /area/shuttle/labor
 	name = "Labor Camp Shuttle"
 	blob_allowed = FALSE

code/game/objects/effects/decals/turfdecal/tilecoloring.dm

@@ -65,6 +65,49 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/green)
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_green)
 
 
+/// Dark Blue tiles
+
+/obj/effect/turf_decal/tile/darkblue
+	name = "darkblue corner"
+	color = "#384e6d"
+	alpha = 220
+
+/obj/effect/turf_decal/tile/darkblue/opposingcorners
+	icon_state = "tile_opposing_corners"
+	name = "opposing darkblue corners"
+
+/obj/effect/turf_decal/tile/darkblue/half
+	icon_state = "tile_half"
+	name = "darkblue half"
+
+/obj/effect/turf_decal/tile/darkblue/darkblue/contrasted
+	icon_state = "tile_half_contrasted"
+	name = "contrasted darkblue half"
+
+/obj/effect/turf_decal/tile/darkblue/anticorner
+	icon_state = "tile_anticorner"
+	name = "darkblue anticorner"
+
+/obj/effect/turf_decal/tile/darkblue/anticorner/contrasted
+	icon_state = "tile_anticorner_contrasted"
+	name = "contrasted darkblue anticorner"
+
+/obj/effect/turf_decal/tile/darkblue/fourcorners
+	icon_state = "tile_fourcorners"
+	name = "darkblue fourcorners"
+
+/obj/effect/turf_decal/tile/darkblue/full
+	icon_state = "tile_full"
+	name = "darkblue full"
+
+/obj/effect/turf_decal/tile/darkblue/diagonal_centre
+	icon_state = "diagonal_centre"
+	name = "darkblue diagonal centre"
+
+/obj/effect/turf_decal/tile/darkblue/diagonal_edge
+	icon_state = "diagonal_edge"
+	name = "darkblue diagonal edge"
+
 /// Yellow tiles
 
 /obj/effect/turf_decal/tile/yellow
@@ -73,6 +116,48 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_green)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow)
 
+//Engie Yellow
+/obj/effect/turf_decal/tile/engieyellow
+	name = "engieyellow corner"
+	color = "#CCB223"
+	alpha = 220
+
+/obj/effect/turf_decal/tile/engieyellow/opposingcorners
+	icon_state = "tile_opposing_corners"
+	name = "opposing engieyellow corners"
+
+/obj/effect/turf_decal/tile/engieyellow/half
+	icon_state = "tile_half"
+	name = "engieyellow half"
+
+/obj/effect/turf_decal/tile/engieyellow/half/contrasted
+	icon_state = "tile_half_contrasted"
+	name = "contrasted engieyellow half"
+
+/obj/effect/turf_decal/tile/engieyellow/anticorner
+	icon_state = "tile_anticorner"
+	name = "engieyellow anticorner"
+
+/obj/effect/turf_decal/tile/engieyellow/anticorner/contrasted
+	icon_state = "tile_anticorner_contrasted"
+	name = "contrasted engieyellow anticorner"
+
+/obj/effect/turf_decal/tile/engieyellow/fourcorners
+	icon_state = "tile_fourcorners"
+	name = "engieyellow fourcorners"
+
+/obj/effect/turf_decal/tile/engieyellow/full
+	icon_state = "tile_full"
+	name = "engieyellow full"
+
+/obj/effect/turf_decal/tile/engieyellow/diagonal_centre
+	icon_state = "diagonal_centre"
+	name = "engieyellow diagonal centre"
+
+/obj/effect/turf_decal/tile/engieyellow/diagonal_edge
+	icon_state = "diagonal_edge"
+	name = "engieyellow diagonal edge"
+
 /// Red tiles
 
 /obj/effect/turf_decal/tile/red

code/game/objects/structures/watercloset.dm

@@ -216,7 +216,6 @@
 	icon_state = "rubberducky"
 	item_state = "rubberducky"
 
-
 /obj/structure/sink
 	name = "sink"
 	icon = 'icons/obj/watercloset.dmi'
@@ -343,7 +342,11 @@
 	new /obj/item/stack/sheet/metal (loc, 3)
 	qdel(src)
 
-
+/obj/structure/sink/shamblers
+	name = "shambler's juice branded sink"
+	desc = "Fresh water brought to you by Shambler's Juice! Now with 1% less sugar!"
+	icon_state = "shamblers_sink"
+	dispensedreagent = /datum/reagent/consumable/shamblers
 
 /obj/structure/sink/kitchen
 	name = "kitchen sink"

code/modules/shuttle/shuttle.dm

@@ -348,6 +348,11 @@
 		reserved_area = null
 	return ..()
 
+/obj/docking_port/mobile/space_elevator
+	name = "space elevator"
+	space_elevator = TRUE
+	preferred_direction = null
+
 /obj/docking_port/stationary/picked
 	///Holds a list of map name strings for the port to pick from
 	var/list/shuttlekeys
@@ -467,6 +472,9 @@
 	/// time spent after transit 'landing' before actually arriving
 	var/prearrivalTime = 0
 
+	/// whether or not to load the space elevator transit stage
+	var/space_elevator = FALSE
+
 	/// The direction the shuttle prefers to travel in, ie what direction
 	/// the animation will cause it to appear to be traveling in
 	var/preferred_direction = NORTH

code/modules/shuttle/space_elevator.dm

@@ -0,0 +1,9 @@
+/obj/machinery/computer/shuttle/space_elevator
+	name = "elevator buttons"
+	desc = "Buttons to control the space elevator."
+	shuttleId = "space_elevator"
+	possible_destinations = "space_elevator_home;space_elevator_away"
+	no_destination_swap = TRUE
+	density = FALSE
+	icon = 'icons/obj/terminals.dmi'
+	icon_state = "dorm_available"

yogstation.dme

@@ -3660,6 +3660,7 @@
 #include "code\modules\shuttle\ripple.dm"
 #include "code\modules\shuttle\shuttle.dm"
 #include "code\modules\shuttle\shuttle_rotate.dm"
+#include "code\modules\shuttle\space_elevator.dm"
 #include "code\modules\shuttle\spaceship_navigation_beacon.dm"
 #include "code\modules\shuttle\special.dm"
 #include "code\modules\shuttle\supply.dm"

yogstation/code/game/objects/effects/decals/turfdecal.dm

@@ -1,7 +1,5 @@
-/obj/effect/turf_decal/tile/darkblue
-	name = "dark blue corner"
-	color = "#44718A"
-
 /obj/effect/turf_decal/tile/slightlydarkerblue
 	name = "slightly darker blue corner"
-	color = "#6F9AB3"
+	color = "#6F9AB3"
+
+///whoever made this you suck