diff --git a/code/game/machinery/rotating_alarm.dm b/code/game/machinery/rotating_alarm.dm
index 9d0149ffa19..2e98f9160f3 100644
--- a/code/game/machinery/rotating_alarm.dm
+++ b/code/game/machinery/rotating_alarm.dm
@@ -107,14 +107,11 @@
 	if(on)
 		vis_contents += spin_effect
 
-
-/obj/machinery/rotating_alarm/proc/set_on()
-	vis_contents += spin_effect
-	set_light(2, 0.5, alarm_light_color)
-	on = TRUE
-
-
-/obj/machinery/rotating_alarm/proc/set_off()
-	vis_contents -= spin_effect
-	set_light(0)
-	on = FALSE
+/obj/machinery/rotating_alarm/proc/toggle_state()
+	if(on)
+		vis_contents -= spin_effect
+		set_light(0)
+	else
+		vis_contents += spin_effect
+		set_light(2, 0.5, alarm_light_color)
+	on = !on
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index a93e6181ede..cbf072804d8 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -119,24 +119,7 @@
 					AddOverlays(emissive_appearance(icon, "outline", src, alpha = src.alpha))
 				return 1
 		if(STATUS_DISPLAY_MESSAGE)	//custom messages
-			var/line1_metric
-			var/line2_metric
-			var/line_pair
-			var/datum/font/display_font = new STATUS_DISPLAY_FONT_DATUM()
-			line1_metric = display_font.get_metrics(message1)
-			line2_metric = display_font.get_metrics(message2)
-			line_pair = (line1_metric > line2_metric ? line1_metric : line2_metric)
-			var/overlay = update_message(message1_overlay, LINE1_Y, message1, LINE1_X, line_pair)
-			if(overlay)
-				message1_overlay = overlay
-			overlay = update_message(message2_overlay, LINE2_Y, message2, LINE2_X, line_pair)
-			if(overlay)
-				message2_overlay = overlay
-			if(message1 == "" && message2 == "")
-				return 1
-			else
-				AddOverlays(emissive_appearance(icon, "outline", src, alpha = src.alpha))
-				return 1
+			arrange_displayed_texts(message1, message2)
 		if(STATUS_DISPLAY_ALERT)
 			set_picture(picture_state)
 			return 1
@@ -144,26 +127,29 @@
 			message1 = "-Time-"
 			message2 = worldtime2text()
 			set_messages(message1, message2)
-			var/line1_metric
-			var/line2_metric
-			var/line_pair
-			var/datum/font/display_font = new STATUS_DISPLAY_FONT_DATUM()
-			line1_metric = display_font.get_metrics(message1)
-			line2_metric = display_font.get_metrics(message2)
-			line_pair = (line1_metric > line2_metric ? line1_metric : line2_metric)
-			var/overlay = update_message(message1_overlay, LINE1_Y, message1, LINE1_X, line_pair)
-			if(overlay)
-				message1_overlay = overlay
-			overlay = update_message(message2_overlay, LINE2_Y, message2, LINE2_X, line_pair)
-			if(overlay)
-				message2_overlay = overlay
-			if(message1 == "" && message2 == "")
-				return 1
-			else
-				AddOverlays(emissive_appearance(icon, "outline", src, alpha = src.alpha))
-			return 1
+			arrange_displayed_texts(message1, message2)
 	return 0
 
+/obj/machinery/status_display/proc/arrange_displayed_texts(message1, message2)
+	var/line1_metric
+	var/line2_metric
+	var/line_pair
+	var/datum/font/display_font = new STATUS_DISPLAY_FONT_DATUM()
+	line1_metric = display_font.get_metrics(message1)
+	line2_metric = display_font.get_metrics(message2)
+	line_pair = (line1_metric > line2_metric ? line1_metric : line2_metric)
+	var/overlay = update_message(message1_overlay, LINE1_Y, message1, LINE1_X, line_pair)
+	if(overlay)
+		message1_overlay = overlay
+	overlay = update_message(message2_overlay, LINE2_Y, message2, LINE2_X, line_pair)
+	if(overlay)
+		message2_overlay = overlay
+	if(message1 == "" && message2 == "")
+		return 1
+	else
+		AddOverlays(emissive_appearance(icon, "outline", src, alpha = src.alpha))
+		return 1
+
 /obj/machinery/status_display/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
 	. = ..()
 	if(mode != STATUS_DISPLAY_BLANK && mode != STATUS_DISPLAY_ALERT)
diff --git a/code/game/machinery/status_display_snowflakes.dm b/code/game/machinery/status_display_snowflakes.dm
index 38562880b83..b7dc4e103fd 100644
--- a/code/game/machinery/status_display_snowflakes.dm
+++ b/code/game/machinery/status_display_snowflakes.dm
@@ -20,11 +20,11 @@
 				message2 = "ETA"
 		else
 			if(shuttle.at_station())
-				message2 = "Docked"
+				message2 = "Elevator Arrived"
 			else
 				message1 = ""
 		set_messages(message1, message2)
-		return 1
+		arrange_displayed_texts(message1, message2)
 	return 0
 
 /obj/machinery/status_display/supply_display/receive_signal(datum/signal/signal)
diff --git a/code/game/objects/structures/cargo_elevator.dm b/code/game/objects/structures/cargo_elevator.dm
index 0aac2352d0e..db2587de7cd 100644
--- a/code/game/objects/structures/cargo_elevator.dm
+++ b/code/game/objects/structures/cargo_elevator.dm
@@ -22,9 +22,8 @@
 
 // Cargo Elevator Plating
 /turf/simulated/floor/plating/cargo_elevator
-	name = "cargo elevator plating"
-	desc = "The cargo elevator's plating."
-	mouse_opacity = MOUSE_OPACITY_TRANSPARENT // Obscured by the hatch, shouldn't be examinable by players.
+	name = "cargo hatch plating"
+	desc = "The cargo hatch's plating."
 
 // Sanity checks in case someone somehow tries to interact with one of the platings.
 /turf/simulated/floor/plating/cargo_elevator/attack_hand(mob/user)
@@ -32,3 +31,32 @@
 
 /turf/simulated/floor/plating/cargo_elevator/attackby(obj/item/attacking_item, mob/user)
 	to_chat(user, SPAN_NOTICE("You hit \the [src] with \the [attacking_item]. Nothing happens."))
+
+/obj/effect/elevator
+	name = "\proper elevator shaft"
+	desc = "There seems to be an awful lot of machinery down below."
+	icon = 'icons/effects/224x192.dmi'
+	icon_state = "elevator_shaft"
+	unacidable = TRUE
+	layer = TURF_DETAIL_LAYER
+	appearance_flags = KEEP_TOGETHER
+
+/obj/effect/elevator/ex_act(severity)
+	return
+
+/obj/effect/elevator/animation_overlay
+	icon_state = null
+	layer = TURF_SHADOW_LAYER
+	blend_mode = BLEND_INSET_OVERLAY
+	appearance_flags = KEEP_TOGETHER
+
+/obj/effect/elevator/animation_overlay/hatch
+	name = "elevator hatch"
+	icon_state = "hatch"
+
+/obj/effect/elevator/animation_overlay/hatch/left
+	icon_state = "hatch_L"
+
+/obj/effect/elevator/animation_overlay/hatch/right
+	icon_state = "hatch_R"
+
diff --git a/code/game/objects/structures/railing.dm b/code/game/objects/structures/railing.dm
index 85cfcc46a9a..6b761a9fd94 100644
--- a/code/game/objects/structures/railing.dm
+++ b/code/game/objects/structures/railing.dm
@@ -18,6 +18,11 @@
 	var/maxhealth = 70
 	var/neighbor_status = 0
 
+	/// If the object shouldn't inherit a material, set this to True.
+	var/non_material_object = FALSE
+	var/can_wrench = TRUE
+	var/can_screwdriver = TRUE
+
 	can_astar_pass = CANASTARPASS_ALWAYS_PROC
 
 /obj/structure/railing/condition_hints(mob/user, distance, is_adjacent)
@@ -72,19 +77,20 @@
 /obj/structure/railing/Initialize()
 	. = ..()
 
-	if(!isnull(material) && !istype(material))
-		material = SSmaterials.get_material_by_name(material)
-	if(!istype(material))
-		return INITIALIZE_HINT_QDEL
+	if(!non_material_object)
+		if(!isnull(material) && !istype(material))
+			material = SSmaterials.get_material_by_name(material)
+		if(!istype(material))
+			return INITIALIZE_HINT_QDEL
 
-	name = "[material.display_name] [initial(name)]"
-	desc = "A simple [material.display_name] railing designed to protect against careless trespass."
-	maxhealth = round(material.integrity / 5)
-	health = maxhealth
-	color = material.icon_colour
+		name = "[material.display_name] [initial(name)]"
+		desc = "A simple [material.display_name] railing designed to protect against careless trespass."
+		maxhealth = round(material.integrity / 5)
+		health = maxhealth
+		color = material.icon_colour
 
-	if(material.products_need_process())
-		START_PROCESSING(SSprocessing, src)
+		if(material.products_need_process())
+			START_PROCESSING(SSprocessing, src)
 	if(anchored)
 		update_icon(FALSE)
 
@@ -246,6 +252,9 @@
 
 	// Dismantle
 	if(attacking_item.iswrench())
+		if(!can_wrench)
+			to_chat(user, SPAN_WARNING("This [src] cannot be adjusted."))
+			return
 		if(!anchored)
 			user.visible_message(SPAN_NOTICE("\The [user] starts dismantling \the [src]..."), SPAN_NOTICE("You start dismantling \the [src]..."))
 			if(attacking_item.use_tool(src, user, 20, volume = 50))
@@ -283,6 +292,9 @@
 
 	// Install
 	if(attacking_item.isscrewdriver())
+		if(!can_screwdriver)
+			to_chat(user, SPAN_WARNING("This [src] cannot be adjusted."))
+			return
 		if(!density)
 			to_chat(user, SPAN_NOTICE("You need to wrench \the [src] from back into place first."))
 			return
@@ -365,3 +377,67 @@
 /obj/structure/railing/fence/New(var/newloc, var/material_key = MATERIAL_WOOD)
 	material = material_key
 	..(newloc)
+
+/obj/structure/railing/retractable
+	name = "\improper retractable railing"
+	icon = 'icons/obj/doors/retractable_railing.dmi'
+	icon_state = "railing1"
+	anchored = TRUE
+	health = 150
+	maxhealth = 150
+	non_material_object = TRUE
+	can_wrench = FALSE
+	can_screwdriver = FALSE
+
+	var/closed_layer = ABOVE_DOOR_LAYER
+	var/open_layer = OPEN_DOOR_LAYER
+	var/icon_state_open = "railing0"
+	var/icon_state_opening = "railingc0"
+	var/icon_state_closed = "railing1"
+	var/icon_state_closing = "railingc1"
+	var/operating
+
+/obj/structure/railing/retractable/Initialize()
+	. = ..()
+	if(dir == SOUTH)
+		closed_layer = ABOVE_HUMAN_LAYER
+	if(density)//Allows preset-open to work
+		layer = closed_layer
+
+	set_opacity(initial(opacity))
+
+/obj/structure/railing/retractable/update_icon()
+	if(density)
+		icon_state = icon_state_closed
+	else
+		icon_state = icon_state_open
+
+/obj/structure/railing/retractable/proc/toggle_state()
+	if(operating)
+		return
+
+	operating = TRUE
+	flick(density ? icon_state_opening : icon_state_closing, src)
+	playsound(get_turf(src), 'sound/machines/retractable_railing_openclose.ogg', 20)
+	if(density)
+		icon_state = icon_state_open
+		layer = open_layer
+	else
+		icon_state = icon_state_closed
+		layer = closed_layer
+
+	addtimer(CALLBACK(src, PROC_REF(finish_toggling)), 1.2 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT)
+	return TRUE
+
+/obj/structure/railing/retractable/proc/finish_toggling()
+	density = !density
+	operating = FALSE
+
+/obj/structure/railing/retractable/NeighborsCheck()
+	return
+
+/obj/structure/railing/retractable/flip()
+	return
+
+/obj/structure/railing/retractable/open
+	density = FALSE
diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index e6788a1b204..abeab64a4f3 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -351,6 +351,7 @@
 	icon_state = "stairs_railing"
 	anchored = TRUE
 	density = TRUE
+	layer = ABOVE_ABOVE_HUMAN_LAYER
 
 /obj/structure/stairs_railing/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(mover?.movement_type & PHASING)
diff --git a/code/modules/shuttles/shuttle_supply.dm b/code/modules/shuttles/shuttle_supply.dm
index 5f3c8c6f143..4a0d4150179 100644
--- a/code/modules/shuttles/shuttle_supply.dm
+++ b/code/modules/shuttles/shuttle_supply.dm
@@ -1,12 +1,84 @@
+/// Used for placing '/obj/effect/elevator' to the northern corners of the shaft.
+#define SHAFT_WIDTH 6
+/// Used for locating center of the shaft.
+#define SHAFT_CENTER_OFFSET 3
+#define ELEVATOR_DEPARTING_X 224
+#define ELEVATOR_DEPARTING_Y -96
+
 /datum/shuttle/autodock/ferry/supply
 	category = /datum/shuttle/autodock/ferry/supply
-	var/away_location = 1	//the location to hide at while pretending to be in-transit
+	/// The location to hide at while pretending to be in-transit.
+	var/away_location = 1
 	var/late_chance = 80
 	var/max_late_time = 300
 
+	/// A list for step_triggers, used for toggling fall functionality. Making the elevator shaft tiles safe to stand or not depening on where the elevator is.
+	var/list/step_trigger_group = list()
+
+	/// Elevator effects for each northern corners of the shaft. This way the entire elevator won't disappear if there's an opaque obstacle in the sight line of original turf.
+	/// Later on hardcoded to have their icons positioned on top of each other.
+	/// These contain elevator shaft sprite. '/obj/effect/elevator/animation_overlay/elevator_animation' is used as a masked layer onto this.
+	var/obj/effect/elevator/NW
+	var/obj/effect/elevator/NE
+
+	/// This effect will contain an image, copy of the turfs at CC supply shuttle zone. Added onto the elevator shaft effect as an off-centered overlay.
+	var/obj/effect/elevator/animation_overlay/elevator_animation
+
+	/// Hatch layers. Works similar to 'elevator_animation'.
+	var/obj/effect/elevator/animation_overlay/hatch/left/hatch_left
+	var/obj/effect/elevator/animation_overlay/hatch/right/hatch_right
+
+	/// Locations caches for Horizon elevator bay.
+	var/target_dest_x
+	var/target_dest_y
+	var/target_dest_z
+
+	/// Area cache of Horizon elevator bay.
+	var/area/horizon_elevator_area
+
 /datum/shuttle/autodock/ferry/supply/New(var/_name, var/obj/effect/shuttle_landmark/start_waypoint)
 	..(_name, start_waypoint)
 	SScargo.shuttle = src
+	addtimer(CALLBACK(src, PROC_REF(prepare_elevator)), 1 MINUTE) // pseudo initialize. We give mapload some time before initializing rest of the properties
+
+/datum/shuttle/autodock/ferry/supply/proc/prepare_elevator()
+	var/obj/dest_helper = locate(/obj/effect/landmark/destination_helper/cargo_elevator)
+	target_dest_x = dest_helper.x
+	target_dest_y = dest_helper.y
+	target_dest_z = dest_helper.z
+	horizon_elevator_area = get_area(dest_helper)
+
+	var/center_dest_x = target_dest_x + SHAFT_CENTER_OFFSET
+	var/group_number
+	for(var/obj/effect/step_trigger/cargo_elevator/ST in horizon_elevator_area) // sorts step triggers by their distance to the shaft center
+		group_number = "distance_[abs(ST.x - center_dest_x)]"
+		LAZYADDASSOCLIST(step_trigger_group, group_number, ST)
+
+	elevator_animation = new /obj/effect/elevator/animation_overlay()
+	elevator_animation.pixel_x = ELEVATOR_DEPARTING_X // 7 tiles
+	elevator_animation.pixel_y = ELEVATOR_DEPARTING_Y // 3 tiles
+
+	hatch_left = new /obj/effect/elevator/animation_overlay/hatch/left()
+	hatch_right = new /obj/effect/elevator/animation_overlay/hatch/right()
+
+	// North-West corner
+	NW = new /obj/effect/elevator(get_turf(src))
+	NW.pixel_y = -192 // 6 tiles
+	NW.vis_contents += elevator_animation
+	NW.vis_contents += hatch_left
+	NW.vis_contents += hatch_right
+
+	// North-East corner
+	NE = new /obj/effect/elevator(get_turf(src))
+	NE.pixel_x = -192
+	NE.pixel_y = -192
+	NE.vis_contents += elevator_animation
+	NE.vis_contents += hatch_left
+	NE.vis_contents += hatch_right
+
+	// We position the shaft beforehand
+	NW.forceMove(locate(target_dest_x, target_dest_y, target_dest_z))
+	NE.forceMove(locate(target_dest_x + SHAFT_WIDTH, target_dest_y, target_dest_z))
 
 /datum/shuttle/autodock/ferry/supply/short_jump(var/area/destination)
 	if(moving_status != SHUTTLE_IDLE)
@@ -26,9 +98,13 @@
 			moving_status = SHUTTLE_IDLE
 			return
 
-		if (!at_station())	//at centcom
+		if (!at_station()) //at centcom
 			if(!SScargo.buy()) //Check if the shuttle can be sent
 				moving_status = SHUTTLE_IDLE //Dont move the shuttle
+				return
+
+			flip_rotating_alarms() // elevator is coming up, prepare the lights
+			playsound(locate(target_dest_x + SHAFT_CENTER_OFFSET, target_dest_y - SHAFT_CENTER_OFFSET, target_dest_z), 'sound/machines/warning-buzzer-2.ogg', 60, FALSE)
 
 		//We pretend it's a long_jump by making the shuttle stay at centcom for the "in-transit" period.
 		var/obj/effect/shuttle_landmark/away_waypoint = get_location_waypoint(away_location)
@@ -37,6 +113,7 @@
 		//If we are at the away_landmark then we are just pretending to move, otherwise actually do the move
 		if (next_location == away_waypoint)
 			attempt_move(away_waypoint)
+			play_elevator_animation(TRUE) // returning to CC, play the animation after elevator physically leaves
 
 		//wait ETA here.
 		arrive_time = world.time + SScargo.movetime
@@ -48,6 +125,7 @@
 			if (prob(late_chance))
 				sleep(rand(0,max_late_time))
 
+			play_elevator_animation() // coming from CC, play the animation before elevator physically arrives, delay the process
 			attempt_move(destination)
 
 		moving_status = SHUTTLE_IDLE
@@ -75,3 +153,162 @@
 /datum/shuttle/autodock/ferry/supply/proc/eta_minutes()
 	var/ticksleft = arrive_time - world.time
 	return round(ticksleft/600,1)
+
+/**************************
+	Elevator Animations
+***************************/
+
+/datum/shuttle/autodock/ferry/supply/proc/play_elevator_animation(returning_to_CC = FALSE)
+	// Positioning the shafts
+	NW.forceMove(locate(target_dest_x, target_dest_y, target_dest_z))
+	NE.forceMove(locate(target_dest_x + SHAFT_WIDTH, target_dest_y, target_dest_z))
+
+	for(var/area/A in shuttle_area) // an image copy of the elevator platform is prepared here
+		for(var/turf/T in A)
+			elevator_animation.vis_contents += T
+
+	if(!returning_to_CC)
+		handle_arrival_sequence() // coming to Horizon
+	else
+		handle_departure_sequence() // leaving the Horizon
+
+	elevator_animation.vis_contents.Cut() // animation is done, we can get rid of the elevator platform image
+
+/datum/shuttle/autodock/ferry/supply/proc/handle_arrival_sequence()
+	var/obj/effect/step_trigger/cargo_elevator/trigger
+
+	playsound(locate(target_dest_x + SHAFT_CENTER_OFFSET, target_dest_y - SHAFT_CENTER_OFFSET, target_dest_z), 'sound/machines/industrial_lift_raising.ogg', 100, FALSE)
+
+	INVOKE_ASYNC(src, PROC_REF(handle_step_triggers))
+	animate(hatch_left, pixel_x = -112, time = 5 SECONDS)
+	animate(hatch_right, pixel_x = 112, time = 5 SECONDS)
+	sleep(4 SECONDS)
+
+	animate(elevator_animation, pixel_x = 0, pixel_y = 0, time = 4 SECONDS)
+	sleep(4.2 SECONDS)
+
+	for(var/group_key in step_trigger_group)
+		for(trigger in step_trigger_group[group_key])
+			trigger.safe_to_walk = TRUE
+
+	// We move the shafts away to avoid layering issues with turfs
+	NW.moveToNullspace()
+	NE.moveToNullspace()
+
+	addtimer(CALLBACK(src, PROC_REF(flip_rotating_alarms)), 4 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(toggle_railings)), 2 SECONDS)
+
+/datum/shuttle/autodock/ferry/supply/proc/handle_departure_sequence()
+	flip_rotating_alarms()
+	toggle_railings()
+	sleep(2 SECONDS)
+
+	// checking for standers is redundant here, since the elevator won't leave if a forbidden type is standing
+	// we also want to avoid sending people to CC level in a case where we don't immediately retrieve them back after doing so
+	playsound(locate(target_dest_x + SHAFT_CENTER_OFFSET, target_dest_y - SHAFT_CENTER_OFFSET, target_dest_z), 'sound/machines/industrial_lift_lowering.ogg', 100, FALSE)
+	animate(elevator_animation, pixel_x = ELEVATOR_DEPARTING_X, pixel_y = ELEVATOR_DEPARTING_Y, time = 4 SECONDS)
+	sleep(4.2 SECONDS)
+
+	animate(hatch_left, pixel_x = 0, time = 5 SECONDS)
+	animate(hatch_right, pixel_x = 0, time = 5 SECONDS)
+	addtimer(CALLBACK(src, PROC_REF(flip_rotating_alarms)), 9 SECOND)
+
+/// This attempts to sync up with hatch animation, by activating groups of step triggers in delayed order.
+/datum/shuttle/autodock/ferry/supply/proc/handle_step_triggers()
+	var/obj/effect/step_trigger/cargo_elevator/trigger
+	var/group_key
+	for(var/i in 0 to 3)
+		group_key = "distance_[i]"
+		for(trigger in step_trigger_group[group_key]) // checking for the things standing on top of the hatch, then we send them to falling
+			for(var/atom/movable/AM in get_turf(trigger))
+				if(istype(AM, /obj/effect)) // avoid picking up step_triggers
+					continue
+				trigger.handle_falling(AM)
+			trigger.safe_to_walk = FALSE
+
+		sleep(1 SECOND)
+
+/datum/shuttle/autodock/ferry/supply/proc/flip_rotating_alarms()
+	for(var/obj/machinery/rotating_alarm/RA in horizon_elevator_area)
+		RA.toggle_state()
+
+/datum/shuttle/autodock/ferry/supply/proc/toggle_railings()
+	for(var/obj/structure/railing/retractable/R in horizon_elevator_area)
+		R.toggle_state()
+
+/obj/effect/landmark/destination_helper/cargo_elevator
+	name = "cargo elevator destination helper"
+
+/obj/effect/step_trigger/cargo_elevator
+	name = "cargo elevator shaft"
+	icon = 'icons/effects/map_effects.dmi'
+	simulated = FALSE // this prevents the effects getting transported along with the elevator
+
+	/// List of turfs within the 'area/supply/dock'. Shared between all instances.
+	var/static/list/possible_turfs_to_land_on = list()
+
+	/// Boolean, determines whether the movables should fall or not.
+	var/safe_to_walk = TRUE
+
+/obj/effect/step_trigger/cargo_elevator/Initialize()
+	. = ..()
+	if(!possible_turfs_to_land_on.len)
+		possible_turfs_to_land_on = get_area_turfs(/area/supply/dock)
+
+/obj/effect/step_trigger/cargo_elevator/Destroy()
+	LAZYNULL(possible_turfs_to_land_on)
+	return ..()
+
+/obj/effect/step_trigger/cargo_elevator/Trigger(atom/movable/AM)
+	if(safe_to_walk)
+		return
+	INVOKE_ASYNC(src, PROC_REF(handle_falling), AM)
+
+/obj/effect/step_trigger/cargo_elevator/proc/handle_falling(atom/movable/AM)
+
+	if(!isliving(AM) && !isobj(AM)) // only mobs and objects
+		return
+
+	if(isliving(AM))
+		var/mob/living/L = AM
+		if(L.CanAvoidGravity())
+			return
+		L.apply_effect(2, WEAKEN)
+
+	INVOKE_ASYNC(src, PROC_REF(animate_falling), AM) // this needs to run asynchronously, otherwise will cause issues
+
+/obj/effect/step_trigger/cargo_elevator/proc/animate_falling(atom/movable/AM)
+	sleep(0.1 SECOND) // allowing some time for mobs to get weaken effect applied
+	var/oldalpha = AM.alpha
+	var/oldcolor = AM.color
+	var/old_pixel_y = AM.pixel_y
+	animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 1 SECOND)
+
+	for(var/i in 1 to 5)
+		//Make sure the item is still there after our sleep
+		if(!AM || QDELETED(AM))
+			return
+		AM.pixel_y--
+		sleep(0.2 SECONDS)
+
+	//Make sure the item is still there after our sleep
+	if(!AM || QDELETED(AM))
+		return
+
+	AM.visible_message(SPAN_WARNING("[AM] falls into [src]!"), SPAN_DANGER("You stumble and stare into \the [src] as you fall. It will be a long ride..."))
+	AM.forceMove(pick(possible_turfs_to_land_on))
+
+	AM.alpha = oldalpha
+	AM.color = oldcolor
+	AM.transform = matrix()
+	AM.pixel_y = old_pixel_y
+
+	if(isliving(AM))
+		var/mob/living/L = AM
+		L.adjustBruteLoss(rand(30,50))
+		L.dir = pick(GLOB.cardinals)
+
+#undef SHAFT_WIDTH
+#undef SHAFT_CENTER_OFFSET
+#undef ELEVATOR_DEPARTING_X
+#undef ELEVATOR_DEPARTING_Y
diff --git a/html/changelogs/kano-dot-cargo-elevator-animationening.yml b/html/changelogs/kano-dot-cargo-elevator-animationening.yml
new file mode 100644
index 00000000000..e663b231a52
--- /dev/null
+++ b/html/changelogs/kano-dot-cargo-elevator-animationening.yml
@@ -0,0 +1,8 @@
+author: Kano, KingOfThePing
+
+delete-after: True
+
+changes:
+  - rscadd: "Added an elevator animation logic for cargo elevator, heavily inspired from CM."
+  - rscadd: "Added hatch and shaft sprites for cargo elevator, made by KingOfThePing!"
+  - rscadd: "Ported some sounds and sprites from CM."
diff --git a/icons/effects/224x192.dmi b/icons/effects/224x192.dmi
new file mode 100644
index 00000000000..3e4d63de725
Binary files /dev/null and b/icons/effects/224x192.dmi differ
diff --git a/icons/obj/doors/retractable_railing.dmi b/icons/obj/doors/retractable_railing.dmi
new file mode 100644
index 00000000000..b538a48d4e8
Binary files /dev/null and b/icons/obj/doors/retractable_railing.dmi differ
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 750b740fadc..77a5ea6aa6c 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -43,6 +43,12 @@
 /turf/simulated/floor/tiled/full,
 /area/horizon/hallway/primary/deck_3/port/docks)
 "aal" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "aam" = (
@@ -759,11 +765,11 @@
 /obj/machinery/conveyor{
 	id = "cargo_1"
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/supply/dock)
 "aes" = (
 /obj/item/tank/oxygen,
@@ -945,6 +951,16 @@
 /obj/structure/flora/ausbushes/ywflowers,
 /turf/simulated/floor/exoplanet/grass/grove,
 /area/centcom/shared_dream)
+"aeW" = (
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
+	},
+/obj/item/modular_computer/console/preset/supply{
+	dir = 1
+	},
+/obj/effect/floor_decal/industrial/outline/operations,
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "aeY" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -2855,17 +2871,9 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/engineering/atmos)
 "arH" = (
-/obj/structure/railing/mapped{
-	dir = 8
-	},
-/obj/structure/railing/mapped,
-/obj/item/hullbeacon/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 10
-	},
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/obj/structure/railing/retractable,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "arI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -4369,19 +4377,9 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/service/kitchen)
 "aCd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/conveyor{
-	id = "cargo_1"
-	},
-/obj/effect/floor_decal/corner/brown{
-	dir = 5
-	},
-/turf/simulated/floor/tiled,
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/alarm/south,
+/turf/simulated/floor/plating,
 /area/horizon/hangar/operations)
 "aCe" = (
 /obj/effect/floor_decal/corner/dark_green{
@@ -8339,10 +8337,8 @@
 /turf/simulated/floor/tiled,
 /area/horizon/rnd/xenoarch/hallway/elevator)
 "bgo" = (
-/obj/machinery/alarm/west,
 /obj/effect/floor_decal/corner/brown/full,
-/obj/machinery/portable_atmospherics/powered/pump/filled,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack/folding_table,
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "bgr" = (
@@ -11551,18 +11547,17 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/main/port)
 "bCN" = (
-/obj/structure/railing/mapped{
-	dir = 8
-	},
 /obj/structure/railing/mapped{
 	dir = 1
 	},
-/obj/item/hullbeacon/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
 	},
-/turf/simulated/floor/tiled/full,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "bCO" = (
 /obj/effect/floor_decal/corner/beige{
@@ -12561,11 +12556,18 @@
 /turf/simulated/floor/plating,
 /area/horizon/engineering/atmos/turbine)
 "bMc" = (
-/obj/structure/railing/mapped,
-/obj/effect/floor_decal/industrial/outline/operations,
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/obj/structure/stairs_railing{
+	dir = 4;
+	pixel_x = -32;
+	pixel_y = 10
+	},
+/obj/structure/stairs_railing{
+	dir = 8;
+	pixel_y = 10
+	},
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
+/area/horizon/hangar/operations)
 "bMf" = (
 /turf/simulated/floor/tiled/ramp/bottom{
 	dir = 8
@@ -13442,6 +13444,14 @@
 	},
 /turf/unsimulated/floor,
 /area/antag/mercenary)
+"bSQ" = (
+/obj/machinery/conveyor{
+	id = "cargo_1"
+	},
+/obj/effect/floor_decal/industrial/hatch/operations,
+/obj/structure/railing/retractable,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "bSR" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -15246,6 +15256,9 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
 	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "cgH" = (
@@ -16425,18 +16438,17 @@
 /turf/unsimulated/floor,
 /area/centcom/legion/hangar5)
 "cpO" = (
-/obj/structure/railing/mapped{
-	dir = 4
-	},
 /obj/structure/railing/mapped{
 	dir = 1
 	},
-/obj/item/hullbeacon/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
 	},
-/turf/simulated/floor/tiled/full,
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "cpP" = (
 /obj/structure/disposalpipe/segment{
@@ -17626,15 +17638,9 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "cxs" = (
@@ -18428,10 +18434,6 @@
 /turf/simulated/floor/holofloor/tiled,
 /area/horizon/holodeck/source_emptycourt)
 "cCF" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
-/obj/machinery/alarm/east,
 /obj/effect/floor_decal/corner/brown/diagonal,
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
@@ -20947,6 +20949,20 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/maintenance/deck_2/wing/port/nacelle)
+"cUJ" = (
+/obj/machinery/rotating_alarm,
+/obj/structure/platform{
+	dir = 8
+	},
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 4
+	},
+/obj/structure/platform,
+/obj/structure/platform_deco{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "cUM" = (
 /obj/machinery/door/airlock/glass_security{
 	autoclose = 0;
@@ -22162,6 +22178,9 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
+/obj/structure/bed/stool/chair/folding{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "ddz" = (
@@ -23589,6 +23608,12 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "dmG" = (
@@ -25380,14 +25405,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/security/interrogation/monitoring)
 "dzc" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
+/obj/item/hullbeacon/red,
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 4
 	},
-/obj/structure/sign/drop,
-/obj/structure/railing/mapped{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/outline/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "dzd" = (
 /obj/effect/floor_decal/industrial/outline/research,
@@ -26883,14 +26906,11 @@
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/tcommsat/entrance)
 "dIJ" = (
-/obj/structure/railing/mapped{
-	dir = 4
-	},
-/obj/effect/floor_decal/industrial/outline/operations,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/full,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "dIK" = (
 /obj/structure/cable/green{
@@ -28844,18 +28864,24 @@
 /obj/machinery/conveyor{
 	id = "cargo_1"
 	},
-/obj/effect/floor_decal/corner/brown{
-	dir = 10
+/obj/effect/floor_decal/industrial/hatch/operations,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "dYC" = (
 /obj/machinery/conveyor{
 	dir = 1;
 	id = "QMLoad"
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/supply/dock)
 "dYF" = (
 /obj/effect/floor_decal/industrial/outline/service,
@@ -29727,13 +29753,11 @@
 /turf/simulated/floor/tiled/dark,
 /area/shuttle/legion)
 "eea" = (
-/obj/structure/railing/mapped{
-	dir = 1
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/full,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "eed" = (
 /obj/structure/table/reinforced/wood,
@@ -29863,8 +29887,8 @@
 /obj/machinery/conveyor{
 	id = "cargo_1"
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/supply/dock)
 "eeB" = (
 /obj/effect/floor_decal/corner/lime/full{
@@ -32522,8 +32546,10 @@
 	dir = 4;
 	id = "cargo_1"
 	},
-/obj/structure/plasticflaps,
-/turf/simulated/floor/tiled,
+/obj/structure/plasticflaps{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/loading)
 "eyV" = (
 /obj/structure/window/reinforced/holowindow,
@@ -32538,16 +32564,16 @@
 /turf/simulated/floor/holofloor/wood,
 /area/horizon/holodeck/source_courtroom)
 "eze" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/structure/platform{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/brown{
-	dir = 5
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/structure/railing/retractable{
 	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "ezf" = (
 /obj/structure/morgue{
@@ -34653,19 +34679,11 @@
 /turf/simulated/floor/plating,
 /area/horizon/service/custodial/disposals/deck_1)
 "ePY" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
-/obj/effect/floor_decal/corner/brown{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/rotating_alarm{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/plating,
 /area/horizon/hangar/operations)
 "ePZ" = (
 /turf/simulated/floor/exoplanet/snow,
@@ -36842,9 +36860,14 @@
 /turf/unsimulated/floor,
 /area/centcom/control)
 "fgm" = (
-/obj/effect/floor_decal/industrial/outline/operations,
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "QMLoad"
+	},
+/obj/effect/floor_decal/industrial/hatch/operations,
+/obj/structure/railing/retractable,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "fgq" = (
 /obj/machinery/vending/medical{
 	density = 0;
@@ -36991,12 +37014,6 @@
 /area/horizon/ai/upload_foyer)
 "fha" = (
 /obj/item/modular_computer/console/preset/supply,
-/obj/machinery/button/remote/blast_door{
-	dir = 1;
-	id = "cargo_desk";
-	pixel_x = -7;
-	pixel_y = 25
-	},
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
 	},
@@ -37007,6 +37024,9 @@
 	req_access = list(31)
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/status_display{
+	pixel_y = 32
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "fhi" = (
@@ -37116,20 +37136,8 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/cargo_compartment)
 "fie" = (
-/obj/structure/railing/mapped{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
-	frequency = 1380;
-	id_tag = "cargo_shuttle";
-	name = "cargo elevator docking controller";
-	req_one_access = list(13,31);
-	tag_door = "cargo_shuttle_airlock";
-	pixel_y = -6
-	},
+/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/light/floor,
 /turf/simulated/floor/tiled/full,
 /area/supply/dock)
 "fip" = (
@@ -37569,9 +37577,6 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/medical/hallway)
 "flJ" = (
-/obj/machinery/status_display/supply_display{
-	pixel_y = 32
-	},
 /obj/machinery/light{
 	dir = 1
 	},
@@ -38671,7 +38676,9 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/operations/starboard)
 "ftG" = (
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "ftT" = (
 /obj/machinery/light{
@@ -38719,14 +38726,16 @@
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/crew/fitness/gym)
 "fub" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/platform_deco{
 	dir = 4
 	},
-/obj/structure/sign/drop,
-/obj/structure/railing/mapped{
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 8
+	},
+/obj/structure/railing/retractable{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/full,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "fuh" = (
 /obj/effect/decal/cleanable/dirt,
@@ -38830,7 +38839,12 @@
 /obj/structure/sign/emergency/evacuation{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "fuY" = (
@@ -43786,7 +43800,8 @@
 	name = "Cargo Shuttle";
 	req_access = list(13,31)
 	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/loading)
 "gff" = (
 /obj/structure/disposalpipe/segment{
@@ -45464,12 +45479,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/service/bar)
 "grP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
@@ -50967,8 +50976,8 @@
 /turf/unsimulated/floor/monotile,
 /area/antag/loner)
 "hfK" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "hfL" = (
 /obj/effect/floor_decal/corner/dark_green{
@@ -51375,15 +51384,12 @@
 /turf/simulated/floor/tiled,
 /area/horizon/security/hallway)
 "hiV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
+/obj/structure/table/standard{
+	no_cargo = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "hiX" = (
@@ -55015,13 +55021,13 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/rnd/xenobiology)
 "hHY" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/structure/platform{
 	dir = 4
 	},
-/obj/structure/railing/mapped{
-	dir = 4
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/full,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "hIb" = (
 /obj/structure/table/steel,
@@ -57846,12 +57852,6 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/machinery/button/remote/blast_door{
 	id = "miningbay";
 	name = "Mining Bay Entrance";
@@ -57872,6 +57872,10 @@
 /obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled,
 /area/horizon/operations/warehouse)
+"iev" = (
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/turf/simulated/floor/plating,
+/area/horizon/hangar/operations)
 "iey" = (
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/port)
@@ -58588,13 +58592,12 @@
 /turf/unsimulated/floor,
 /area/centcom/distress_prep)
 "ikg" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning,
 /obj/machinery/conveyor{
 	dir = 1;
 	id = "QMLoad"
 	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "iki" = (
 /obj/machinery/embedded_controller/radio/simple_docking_controller{
@@ -63144,12 +63147,6 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/machinery/newscaster/north,
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
@@ -63243,12 +63240,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/engineering/atmos/turbine)
 "iSQ" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 4
 	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/obj/structure/bed/stool/chair/folding{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "iSR" = (
@@ -64176,11 +64176,11 @@
 	dir = 1;
 	id = "QMLoad"
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/supply/dock)
 "iZw" = (
 /obj/effect/shuttle_landmark/burglar_ship/interim{
@@ -66053,15 +66053,26 @@
 /area/horizon/engineering/atmos)
 "jni" = (
 /obj/structure/table/standard,
-/obj/item/folder/yellow,
+/obj/item/folder/yellow{
+	pixel_x = 6
+	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
 	},
 /obj/item/paper_bin{
-	pixel_y = 5
+	pixel_y = 5;
+	pixel_x = 6
 	},
 /obj/item/pen/black,
-/obj/item/device/price_scanner,
+/obj/item/device/price_scanner{
+	pixel_x = 6
+	},
+/obj/machinery/button/remote/blast_door{
+	dir = 6;
+	id = "cargo_desk";
+	pixel_x = -7;
+	pixel_y = 8
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/operations/office)
 "jnl" = (
@@ -66317,16 +66328,10 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/engineer_maintenance/pipe/wall,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
+/obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "jow" = (
@@ -75678,6 +75683,20 @@
 /obj/structure/lattice,
 /turf/space/dynamic,
 /area/horizon/exterior)
+"kDB" = (
+/obj/machinery/rotating_alarm,
+/obj/structure/platform{
+	dir = 4
+	},
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 8
+	},
+/obj/structure/platform,
+/obj/structure/platform_deco{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "kDC" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -77503,12 +77522,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
@@ -81048,7 +81061,8 @@
 	id = "cargo_1"
 	},
 /obj/machinery/alarm/south,
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/loading)
 "lrt" = (
 /obj/structure/railing/mapped{
@@ -81514,6 +81528,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/hangar/starboard)
+"lup" = (
+/obj/effect/floor_decal/corner/brown{
+	dir = 9
+	},
+/obj/machinery/alarm/west,
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "luu" = (
 /obj/machinery/power/apc/north,
 /obj/structure/cable/green{
@@ -83113,6 +83134,14 @@
 "lEZ" = (
 /turf/simulated/wall,
 /area/horizon/engineering/gravity_gen)
+"lFb" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/sign/drop{
+	pixel_x = 32
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "lFm" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -83607,20 +83636,10 @@
 /turf/unsimulated/floor/plating,
 /area/centcom/specops)
 "lIU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/floor_decal/spline/plain/black{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad"
-	},
-/obj/effect/floor_decal/corner/brown{
-	dir = 5
-	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "lIV" = (
 /obj/effect/floor_decal/industrial/outline/research,
@@ -86516,6 +86535,11 @@
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/horizon/rnd/xenoarch/atrium)
+"mfN" = (
+/obj/structure/railing/retractable,
+/obj/effect/landmark/destination_helper/cargo_elevator,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "mfO" = (
 /obj/effect/floor_decal/corner/green/full,
 /turf/simulated/floor/holofloor/tiled,
@@ -86819,6 +86843,11 @@
 	},
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_3/aft/starboard)
+"mhL" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/platform_stairs,
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "mhS" = (
 /obj/machinery/camera/network/crescent{
 	c_tag = "Crescent Arrivals - Holding Cell";
@@ -87847,12 +87876,13 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/primary/deck_3/port)
 "mqV" = (
-/obj/item/hullbeacon/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/industrial/warning/corner{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/railing/mapped{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/outline_straight/operations,
+/turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "mqW" = (
 /obj/structure/disposaloutlet{
@@ -88388,16 +88418,16 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 1
 	},
 /obj/machinery/alarm/north,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "muQ" = (
@@ -88816,9 +88846,11 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/warning{
-	dir = 4
+	dir = 6
 	},
-/turf/simulated/floor/tiled/full,
+/obj/structure/railing/mapped,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "myu" = (
 /obj/structure/shuttle_part/tcfl{
@@ -92539,13 +92571,13 @@
 /turf/unsimulated/floor/linoleum,
 /area/antag/actor)
 "ncx" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 4
+	},
+/obj/structure/railing/retractable{
 	dir = 8
 	},
-/obj/structure/railing/mapped{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/full,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "ncE" = (
 /obj/structure/lattice/catwalk/indoor/grate/dark,
@@ -92830,10 +92862,20 @@
 /turf/simulated/floor/reinforced,
 /area/horizon/command/bridge/controlroom)
 "nem" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
+/obj/machinery/light/floor{
+	dir = 1
+	},
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+	frequency = 1380;
+	id_tag = "cargo_shuttle";
+	name = "cargo elevator docking controller";
+	req_one_access = list(13,31);
+	tag_door = "cargo_shuttle_airlock";
+	pixel_y = -6
+	},
 /turf/simulated/floor/tiled/full,
 /area/supply/dock)
 "nen" = (
@@ -93930,6 +93972,25 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/rnd/xenoarch/atrium)
+"nmg" = (
+/obj/structure/platform,
+/obj/effect/floor_decal/corner/black{
+	dir = 10
+	},
+/obj/structure/platform{
+	dir = 4
+	},
+/obj/structure/platform{
+	dir = 8
+	},
+/obj/structure/platform_deco{
+	dir = 5
+	},
+/obj/structure/platform_deco{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/dark,
+/area/horizon/hangar/operations)
 "nmh" = (
 /obj/structure/table/wood,
 /obj/item/device/megaphone/sec,
@@ -93939,6 +94000,20 @@
 	icon_state = "wood"
 	},
 /area/centcom/distress_prep)
+"nmm" = (
+/obj/effect/floor_decal/corner/brown{
+	dir = 5
+	},
+/obj/structure/table/standard{
+	no_cargo = 1
+	},
+/obj/item/paper_bin{
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/obj/item/pen,
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "nmw" = (
 /obj/machinery/door/airlock/external{
 	dir = 4
@@ -99944,15 +100019,17 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/service/hydroponics/lower)
 "ofT" = (
-/obj/structure/railing/mapped,
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "QMLoad"
+/obj/effect/floor_decal/corner/brown{
+	dir = 10
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "ofX" = (
 /obj/machinery/artifact_analyser,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -100628,15 +100705,9 @@
 /obj/machinery/light/spot{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 6
-	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "ojO" = (
@@ -100790,6 +100861,12 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "okS" = (
@@ -105426,13 +105503,6 @@
 /turf/unsimulated/floor/plating,
 /area/shuttle/legion)
 "oSy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/machinery/firealarm/north,
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
@@ -105975,6 +106045,12 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "oWt" = (
@@ -106949,12 +107025,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
@@ -107490,6 +107560,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/storage/eva)
+"piG" = (
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/powered/pump/filled,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "piI" = (
 /obj/machinery/power/smes/buildable/horizon_shuttle{
 	RCon_tag = "Canary"
@@ -107943,6 +108018,18 @@
 /obj/structure/lattice/catwalk/indoor/grate/dark,
 /turf/simulated/floor,
 /area/horizon/maintenance/deck_3/aft/port)
+"pmp" = (
+/obj/effect/floor_decal/corner/brown{
+	dir = 6
+	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "pmr" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 8
@@ -113860,14 +113947,17 @@
 /turf/simulated/floor/tiled,
 /area/horizon/command/bridge/controlroom)
 "qix" = (
-/obj/structure/railing/mapped,
-/obj/machinery/conveyor{
-	id = "cargo_1"
+/obj/structure/platform_deco{
+	dir = 1
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/obj/effect/floor_decal/spline/plain/black{
+	dir = 8
+	},
+/obj/structure/railing/retractable{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "qiX" = (
 /obj/machinery/shower{
 	pixel_y = 24
@@ -114854,7 +114944,8 @@
 	dir = 4;
 	id = "cargo_1"
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/loading)
 "qqf" = (
 /obj/machinery/computer/slot_machine,
@@ -117422,7 +117513,12 @@
 /turf/simulated/floor/bluegrid,
 /area/tdome)
 "qIU" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "qIW" = (
@@ -120066,6 +120162,7 @@
 /turf/simulated/floor/carpet/rubber,
 /area/horizon/command/bridge/controlroom)
 "rdV" = (
+/obj/effect/step_trigger/cargo_elevator,
 /turf/simulated/floor/plating/cargo_elevator,
 /area/horizon/hangar/operations)
 "rdW" = (
@@ -121152,6 +121249,14 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
 /area/horizon/engineering/locker_room)
+"rlY" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "QMLoad"
+	},
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/operations/loading)
 "rlZ" = (
 /obj/effect/floor_decal/corner/dark_blue{
 	dir = 5
@@ -122650,6 +122755,9 @@
 /obj/structure/railing/mapped{
 	dir = 4
 	},
+/obj/machinery/status_display{
+	pixel_y = 32
+	},
 /turf/simulated/open,
 /area/horizon/operations/office)
 "rvX" = (
@@ -122746,11 +122854,11 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/port/far)
 "rwv" = (
-/obj/structure/railing/mapped,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/obj/structure/railing/retractable{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "rww" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -122946,10 +123054,14 @@
 	dir = 1;
 	id = "QMLoad"
 	},
-/obj/effect/floor_decal/corner/brown{
-	dir = 10
+/obj/effect/floor_decal/industrial/hatch/operations,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/floor/tiled,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "rxT" = (
 /obj/machinery/atmospherics/pipe/manifold/visible,
@@ -125347,7 +125459,12 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/teleporter)
 "rPV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "rPW" = (
@@ -125653,6 +125770,14 @@
 /obj/random/dirt_75,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/maintenance/deck_2/wing/port/nacelle)
+"rSu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/platform_stairs/full/east_west_cap{
+	dir = 8
+	},
+/obj/structure/platform/cutout,
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "rSx" = (
 /obj/structure/disposalpipe/segment{
 	icon_state = "pipe-c"
@@ -126003,6 +126128,15 @@
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/white,
 /area/horizon/medical/hallway/upper)
+"rUy" = (
+/obj/machinery/conveyor{
+	id = "cargo_1"
+	},
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
+/area/supply/dock)
 "rUz" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 6
@@ -126551,6 +126685,12 @@
 	icon_state = "5,6"
 	},
 /area/shuttle/legion)
+"rZb" = (
+/obj/machinery/light/spot{
+	dir = 8
+	},
+/turf/unsimulated/floor/plating,
+/area/centcom/suppy)
 "rZf" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -127649,6 +127789,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/auxiliary)
+"shf" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "QMLoad"
+	},
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
+/area/supply/dock)
 "shh" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 6
@@ -128582,9 +128730,13 @@
 /turf/simulated/floor/wood,
 /area/horizon/service/bar)
 "snq" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/corner/brown,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "snr" = (
@@ -129347,11 +129499,19 @@
 /area/horizon/service/custodial/disposals/deck_1)
 "ssE" = (
 /obj/machinery/conveyor_switch/oneway{
-	id = "QMLoad"
+	id = "QMLoad";
+	pixel_x = -13;
+	pixel_y = -5
 	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "ssF" = (
@@ -130470,12 +130630,11 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/service/kitchen)
 "sAU" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning,
 /obj/machinery/conveyor{
 	id = "cargo_1"
 	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "sBb" = (
 /obj/structure/table/rack,
@@ -130771,7 +130930,8 @@
 	dir = 9;
 	id = "cargo_1"
 	},
-/turf/simulated/floor/tiled,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/loading)
 "sDh" = (
 /obj/structure/table/reinforced/glass,
@@ -133550,7 +133710,8 @@
 	name = "Cargo Shuttle";
 	req_access = list(13,31)
 	},
-/turf/simulated/floor/tiled/full,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/operations/loading)
 "sVT" = (
 /obj/effect/floor_decal/spline/plain,
@@ -135496,18 +135657,19 @@
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_1/wing/starboard)
 "tkO" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
 /obj/machinery/status_display/supply_display{
 	pixel_y = 32
 	},
+/obj/structure/table/standard{
+	no_cargo = 1
+	},
+/obj/item/device/hand_labeler{
+	pixel_x = -14;
+	pixel_y = 2
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "tkR" = (
@@ -136333,19 +136495,13 @@
 /turf/simulated/wall,
 /area/horizon/engineering/hallway/aft)
 "tqK" = (
-/obj/structure/cable/green{
-	icon_state = "4-8"
+/obj/structure/platform{
+	dir = 8
 	},
-/obj/effect/floor_decal/corner/brown{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/effect/floor_decal/spline/plain/black{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/tiled/dark/full,
 /area/horizon/hangar/operations)
 "tqS" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -139446,13 +139602,11 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/medical/equipment)
 "tMx" = (
-/obj/structure/railing/mapped{
-	dir = 8
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/full,
+/obj/structure/lattice/catwalk/indoor/grate,
+/turf/simulated/floor/plating,
 /area/supply/dock)
 "tMC" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -141485,12 +141639,6 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
@@ -142575,6 +142723,13 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/medical/psych)
+"uln" = (
+/obj/effect/floor_decal/industrial/outline_straight/operations,
+/obj/effect/floor_decal/industrial/arrow/operations{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/full,
+/area/horizon/hangar/operations)
 "ulu" = (
 /obj/structure/holostool{
 	dir = 1
@@ -142837,6 +142992,17 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/primary/deck_3/central)
+"unD" = (
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/effect/floor_decal/industrial/warning{
+	dir = 10
+	},
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/railing/mapped,
+/turf/simulated/floor/plating,
+/area/supply/dock)
 "unH" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
@@ -148015,8 +148181,12 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
-/obj/machinery/portable_atmospherics/powered/pump/filled,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/table/rack/folding_table,
+/obj/item/material/ashtray/bronze{
+	pixel_y = 7;
+	pixel_x = -7
+	},
+/obj/item/deck/cards,
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "uXE" = (
@@ -148152,6 +148322,13 @@
 /obj/machinery/alarm/west,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/service/custodial/disposals/deck_1)
+"uYt" = (
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "uYC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -148691,6 +148868,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/maintenance/deck_2/wing/starboard/nacelle)
+"vcw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/floor_decal/corner/brown/diagonal,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "vcx" = (
 /obj/structure/bed/stool/chair/sofa/pew/right{
 	dir = 8
@@ -150383,12 +150568,8 @@
 	},
 /area/horizon/shuttle/canary)
 "vof" = (
-/obj/effect/shuttle_landmark/supply/horizon/dock{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/cargo_elevator_hatch,
+/obj/effect/floor_decal/industrial/hatch/operations,
+/obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/full,
 /area/horizon/hangar/operations)
 "vog" = (
@@ -151749,8 +151930,8 @@
 	},
 /area/antag/raider)
 "vyG" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/outline_straight/operations,
+/obj/effect/floor_decal/industrial/arrow/operations,
 /turf/simulated/floor/tiled/full,
 /area/horizon/hangar/operations)
 "vyO" = (
@@ -155180,17 +155361,15 @@
 /turf/simulated/floor/tiled/white,
 /area/horizon/rnd/xenobiology)
 "vXM" = (
-/obj/structure/railing/mapped{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/platform_stairs/full{
 	dir = 4
 	},
-/obj/structure/railing/mapped,
-/obj/item/hullbeacon/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 6
+/obj/structure/platform{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/turf/simulated/floor/tiled,
+/area/horizon/hangar/operations)
 "vXR" = (
 /obj/structure/lattice/catwalk/indoor/grate/dark,
 /obj/structure/cable{
@@ -157229,6 +157408,13 @@
 	icon_state = "dark_preview"
 	},
 /area/centcom/control)
+"wmb" = (
+/obj/effect/shuttle_landmark/supply/horizon/dock{
+	dir = 1
+	},
+/obj/structure/railing/retractable,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "wmg" = (
 /obj/structure/morgue/crematorium{
 	_wifi_id = "xenobio_crema"
@@ -158580,8 +158766,8 @@
 /area/horizon/engineering/storage/lower)
 "wtA" = (
 /obj/item/hullbeacon/red,
-/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/effect/floor_decal/industrial/warning/corner,
+/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/outline/operations,
 /turf/simulated/floor/tiled/full,
 /area/horizon/hangar/operations)
 "wtE" = (
@@ -158971,6 +159157,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/horizon/service/bar)
+"wwq" = (
+/obj/effect/floor_decal/corner/black{
+	dir = 10
+	},
+/obj/structure/platform_stairs,
+/turf/simulated/floor/tiled/dark,
+/area/horizon/hangar/operations)
 "wwr" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor,
@@ -159594,13 +159787,10 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
 /obj/structure/engineer_maintenance/electric/wall,
+/obj/structure/engineer_maintenance/pipe/wall{
+	pixel_y = 28
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "wAp" = (
@@ -163413,10 +163603,15 @@
 /turf/unsimulated/floor/dark_monotile,
 /area/antag/actor)
 "xaT" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/corner/brown{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "xbj" = (
@@ -163582,15 +163777,16 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/intrepid)
 "xcw" = (
-/obj/structure/railing/mapped{
+/obj/structure/platform{
+	dir = 4
+	},
+/obj/item/hullbeacon/red,
+/obj/effect/floor_decal/spline/plain/black{
 	dir = 8
 	},
 /obj/effect/floor_decal/industrial/outline/operations,
-/obj/effect/floor_decal/industrial/warning{
-	dir = 8
-	},
-/turf/simulated/floor/tiled/full,
-/area/supply/dock)
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/hangar/operations)
 "xcO" = (
 /turf/simulated/wall/shuttle/unique/ert{
 	icon_state = "7,0"
@@ -165750,11 +165946,19 @@
 /area/antag/mercenary)
 "xuh" = (
 /obj/machinery/conveyor_switch/oneway{
-	id = "cargo_1"
+	id = "cargo_1";
+	pixel_x = 12;
+	pixel_y = -5
 	},
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/horizon/hangar/operations)
 "xuj" = (
@@ -169283,9 +169487,7 @@
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/horizon/engineering/atmos)
 "xUL" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/sign/drop,
-/obj/structure/railing/mapped,
+/obj/effect/floor_decal/industrial/outline_straight/operations,
 /turf/simulated/floor/tiled/full,
 /area/horizon/hangar/operations)
 "xUO" = (
@@ -194767,7 +194969,7 @@ lUt
 bdU
 qtD
 eCu
-qtD
+lup
 pOq
 lUt
 mEZ
@@ -195026,11 +195228,11 @@ cgv
 cgv
 cgv
 cgv
+rSu
+vXM
 cgv
 cgv
-cgv
-cgv
-cgv
+pmp
 iSQ
 hCu
 hCu
@@ -195275,20 +195477,20 @@ htg
 iJa
 lro
 jgx
-hiV
-cUv
+nmm
+ofT
 wtA
+sWR
+kDB
+hHY
+eze
+eze
 fub
+qix
+eze
+eze
 hHY
-hHY
-hHY
-hHY
-fub
-hHY
-hHY
-hHY
-hHY
-fub
+xcw
 hCu
 hCu
 hCu
@@ -195533,19 +195735,19 @@ rKg
 qqd
 jgx
 tkO
-cUv
+ofT
 xUL
+wwq
+iev
+mfN
 rdV
 rdV
 rdV
 rdV
 rdV
 rdV
-rdV
-rdV
-rdV
-rdV
-rdV
+rwv
+ePY
 hCu
 hCu
 hCu
@@ -195792,17 +195994,17 @@ jgx
 hiV
 xuh
 vyG
+wwq
+iev
+arH
 rdV
 rdV
 rdV
 rdV
 rdV
 rdV
-rdV
-rdV
-rdV
-rdV
-rdV
+rwv
+iev
 hCu
 hCu
 hCu
@@ -196046,20 +196248,20 @@ vPf
 fxe
 sDe
 gfd
-aCd
+sAU
 dYm
 sAU
+sAU
+sAU
+bSQ
 rdV
 rdV
 rdV
 rdV
 rdV
 rdV
-rdV
-rdV
-rdV
-rdV
-rdV
+rwv
+piG
 hCu
 hCu
 hCu
@@ -196303,20 +196505,20 @@ kaU
 oSt
 uSb
 bzE
-hiV
-cUv
+aeW
+ofT
 vof
+nmg
+bMc
+wmb
 rdV
 rdV
 rdV
 rdV
 rdV
 rdV
-rdV
-rdV
-rdV
-rdV
-rdV
+rwv
+iev
 hCu
 hCu
 hCu
@@ -196557,23 +196759,23 @@ iXz
 jEc
 jEc
 hpH
-jEc
-jEc
+rlY
+rlY
 sVR
-lIU
+ikg
 rxS
 ikg
+ikg
+ikg
+fgm
 rdV
 rdV
 rdV
 rdV
 rdV
 rdV
-rdV
-rdV
-rdV
-rdV
-rdV
+rwv
+piG
 hCu
 hCu
 hCu
@@ -196819,18 +197021,18 @@ dgw
 jgx
 oSy
 ssE
-vyG
-rdV
-rdV
-rdV
-rdV
-rdV
+uln
+wwq
+iev
+arH
 rdV
 rdV
 rdV
 rdV
 rdV
 rdV
+rwv
+aCd
 hCu
 hCu
 hCu
@@ -197074,20 +197276,20 @@ ibl
 fMA
 adt
 ibM
-eze
+oSy
 oWn
 xUL
+wwq
+iev
+arH
 rdV
 rdV
 rdV
 rdV
 rdV
 rdV
-rdV
-rdV
-rdV
-rdV
-rdV
+rwv
+ePY
 hCu
 hCu
 hCu
@@ -197332,18 +197534,18 @@ jbh
 dlj
 jgx
 grP
-cUv
-mqV
-dzc
+ofT
+wtA
+sWR
+cUJ
+tqK
 ncx
 ncx
 ncx
 ncx
-dzc
-ncx
-ncx
 ncx
 ncx
+lIU
 dzc
 hCu
 hCu
@@ -197591,16 +197793,16 @@ krH
 jov
 xaT
 wRa
+vcw
+mqV
+mhL
 vfg
-vfg
-vfg
-vfg
-vfg
+lFb
 mdN
 vfg
+lFb
 vfg
-vfg
-vfg
+uYt
 cCF
 hCu
 hCu
@@ -198359,7 +198561,7 @@ uAF
 rTP
 tUo
 nZx
-ePY
+cxm
 rPV
 osN
 sWR
@@ -199130,7 +199332,7 @@ jMf
 ieE
 chK
 fOk
-tqK
+cxm
 fuR
 oKm
 sWR
@@ -376820,11 +377022,11 @@ sJv
 sJv
 sJv
 sJv
-sJv
-sJv
-sJv
-sJv
-sJv
+eSV
+eSV
+eSV
+eSV
+eSV
 eSV
 eSV
 eSV
@@ -377071,12 +377273,7 @@ sJv
 dFx
 dFx
 dFx
-dFx
-dFx
-dFx
-dFx
-dFx
-dFx
+rZb
 dFx
 dFx
 dFx
@@ -377089,6 +377286,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -377329,14 +377531,9 @@ dFx
 bCN
 tMx
 tMx
-xcw
-xcw
 tMx
-xcw
-xcw
 tMx
-xcw
-arH
+unD
 dFx
 sJv
 eSV
@@ -377346,6 +377543,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -377583,17 +377785,12 @@ qlW
 aLf
 sJv
 dFx
-fie
+eea
+hfK
+hfK
+hfK
+hfK
 ftG
-ftG
-fgm
-fgm
-ftG
-fgm
-fgm
-ftG
-fgm
-bMc
 dFx
 sJv
 eSV
@@ -377603,6 +377800,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -377845,12 +378047,7 @@ eeA
 eeA
 eeA
 eeA
-eeA
-eeA
-eeA
-eeA
-eeA
-qix
+rUy
 dFx
 sJv
 eSV
@@ -377860,6 +378057,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -378102,12 +378304,7 @@ hfK
 hfK
 hfK
 hfK
-hfK
-hfK
-hfK
-hfK
-hfK
-rwv
+fie
 dFx
 sJv
 eSV
@@ -378117,6 +378314,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -378355,16 +378557,11 @@ aLf
 sJv
 dFx
 iZt
+shf
+shf
+shf
+shf
 dYC
-dYC
-dYC
-dYC
-dYC
-dYC
-dYC
-dYC
-dYC
-ofT
 dFx
 sJv
 eSV
@@ -378374,6 +378571,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -378612,16 +378814,11 @@ aLf
 sJv
 dFx
 eea
+hfK
+hfK
+hfK
+hfK
 ftG
-ftG
-fgm
-fgm
-ftG
-fgm
-fgm
-ftG
-fgm
-bMc
 dFx
 sJv
 eSV
@@ -378631,6 +378828,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -378869,16 +379071,11 @@ aLf
 sJv
 dFx
 cpO
-myr
-myr
+dIJ
+dIJ
 dIJ
 dIJ
 myr
-dIJ
-dIJ
-myr
-dIJ
-vXM
 dFx
 sJv
 eSV
@@ -378888,6 +379085,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -379132,11 +379334,6 @@ dFx
 dFx
 dFx
 dFx
-dFx
-dFx
-dFx
-dFx
-dFx
 sJv
 eSV
 eSV
@@ -379145,6 +379342,11 @@ eSV
 eSV
 eSV
 eSV
+eSV
+eSV
+eSV
+eSV
+eSV
 nBU
 fSU
 eSV
@@ -379390,11 +379592,11 @@ sJv
 sJv
 sJv
 sJv
-sJv
-sJv
-sJv
-sJv
-sJv
+eSV
+eSV
+eSV
+eSV
+eSV
 eSV
 eSV
 eSV
diff --git a/sound/machines/industrial_lift_lowering.ogg b/sound/machines/industrial_lift_lowering.ogg
new file mode 100644
index 00000000000..c1283fe708e
Binary files /dev/null and b/sound/machines/industrial_lift_lowering.ogg differ
diff --git a/sound/machines/industrial_lift_raising.ogg b/sound/machines/industrial_lift_raising.ogg
new file mode 100644
index 00000000000..3d0df6cebdb
Binary files /dev/null and b/sound/machines/industrial_lift_raising.ogg differ
diff --git a/sound/machines/retractable_railing_openclose.ogg b/sound/machines/retractable_railing_openclose.ogg
new file mode 100644
index 00000000000..d188f99be5c
Binary files /dev/null and b/sound/machines/retractable_railing_openclose.ogg differ
diff --git a/sound/machines/warning-buzzer-2.ogg b/sound/machines/warning-buzzer-2.ogg
new file mode 100644
index 00000000000..cb8371a3546
Binary files /dev/null and b/sound/machines/warning-buzzer-2.ogg differ