diff --git a/_maps/map_files/vonneumann/vnmk3.dmm b/_maps/map_files/vonneumann/vnmk3.dmm
index 9262497defc..1e6dabf6803 100644
--- a/_maps/map_files/vonneumann/vnmk3.dmm
+++ b/_maps/map_files/vonneumann/vnmk3.dmm
@@ -23,10 +23,10 @@
 /turf/open/floor/carpet/ship,
 /area/hydroponics)
 "abl" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/requests_console{
 	pixel_x = -32
 	},
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "abo" = (
@@ -503,6 +503,9 @@
 	dir = 4
 	},
 /obj/machinery/light_switch/east,
+/obj/machinery/requests_console{
+	pixel_x = 32
+	},
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
 "ayV" = (
@@ -3071,7 +3074,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 6
+	dir = 4
 	},
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
@@ -4529,7 +4532,8 @@
 	icon_state = "2-8";
 	tag = ""
 	},
-/turf/open/floor/engine/light,
+/obj/machinery/telecomms/processor/preset_four,
+/turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "dSU" = (
 /obj/structure/cable/yellow{
@@ -6289,12 +6293,12 @@
 	},
 /area/nsv/weapons/fore)
 "fAW" = (
-/obj/machinery/telecomms/receiver/preset_right,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/telecomms/server/presets/munitions,
 /turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "fAX" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "fBb" = (
@@ -6818,11 +6822,8 @@
 /area/security)
 "fVq" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/caution/stand_clear/red,
 /obj/structure/railing,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
+/obj/effect/turf_decal/caution/red,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "fVD" = (
@@ -7679,9 +7680,6 @@
 	icon_state = "2-8";
 	tag = ""
 	},
-/obj/machinery/requests_console{
-	pixel_x = 32
-	},
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
 "gPs" = (
@@ -8645,7 +8643,7 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/aft)
 "hAn" = (
-/obj/machinery/telecomms/server/presets/security,
+/obj/machinery/telecomms/broadcaster/preset_left,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "hBC" = (
@@ -8661,16 +8659,9 @@
 /turf/open/floor/plating,
 /area/maintenance/port/aft)
 "hDS" = (
-/obj/docking_port/stationary{
-	dir = 2;
-	dwidth = 3;
-	height = 7;
-	id = "supply_home";
-	name = "Serendipity Cargo";
-	width = 7
-	},
-/obj/effect/turf_decal/ship/delivery/yellow,
-/turf/open/floor/engine,
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/arrows,
+/turf/open/floor/plasteel,
 /area/cargo/lobby)
 "hEe" = (
 /obj/structure/lattice/catwalk,
@@ -8932,8 +8923,8 @@
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
 "hOG" = (
-/obj/machinery/telecomms/server/presets/engineering,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/telecomms/server/presets/common,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "hPl" = (
@@ -9510,6 +9501,11 @@
 /obj/item/kirbyplants/random,
 /turf/open/floor/carpet/ship,
 /area/hydroponics)
+"isp" = (
+/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/telecomms/server/presets/service,
+/turf/open/floor/circuit/telecomms,
+/area/tcommsat/server)
 "isJ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -9862,8 +9858,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
 	dir = 4
 	},
-/obj/machinery/telecomms/receiver/preset_left,
-/turf/open/floor/circuit/telecomms/server,
+/turf/open/floor/engine/light,
 /area/tcommsat/server)
 "iJD" = (
 /obj/structure/cable{
@@ -10295,11 +10290,8 @@
 /turf/open/floor/plating,
 /area/maintenance/central)
 "iWR" = (
-/obj/machinery/telecomms/server/presets/service,
 /obj/machinery/light,
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 8
-	},
+/obj/machinery/telecomms/receiver/preset_left,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "iYy" = (
@@ -10482,13 +10474,12 @@
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
 "jgX" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/caution,
-/obj/structure/railing,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/caution/stand_clear/red,
+/obj/effect/turf_decal/stripes/red/line{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/stripes/red/line,
+/turf/open/floor/engine,
 /area/cargo/lobby)
 "jht" = (
 /obj/structure/cable{
@@ -10980,11 +10971,11 @@
 /turf/open/floor/monotile/light,
 /area/medical/medbay)
 "jCd" = (
-/obj/machinery/telecomms/server/presets/medical,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/machinery/camera/autoname{
 	dir = 8
 	},
+/obj/machinery/telecomms/relay/preset,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "jCT" = (
@@ -11263,10 +11254,7 @@
 /turf/open/floor/carpet/ship,
 /area/nsv/hanger)
 "jNN" = (
-/obj/machinery/telecomms/server/presets/supply,
-/obj/machinery/atmospherics/pipe/simple/general/visible{
-	dir = 9
-	},
+/obj/machinery/telecomms/receiver/preset_right,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "jOW" = (
@@ -11735,10 +11723,11 @@
 /turf/open/floor/engine,
 /area/engine/shield_generator)
 "kiz" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/telecomms/processor/preset_two,
-/turf/open/floor/circuit/telecomms,
-/area/tcommsat/server)
+/obj/effect/turf_decal/stripes/line,
+/obj/structure/railing,
+/obj/effect/turf_decal/caution/stand_clear,
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "kiA" = (
 /obj/effect/turf_decal/tile/yellow/flat_side{
 	dir = 6
@@ -11987,15 +11976,14 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 10
 	},
-/obj/machinery/telecomms/processor/preset_one,
-/turf/open/floor/engine/light,
+/obj/machinery/ntnet_relay,
+/turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "kqX" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 8
 	},
-/obj/machinery/telecomms/broadcaster/preset_left,
-/turf/open/floor/circuit/telecomms/server,
+/turf/open/floor/engine/light,
 /area/tcommsat/server)
 "kry" = (
 /turf/open/floor/carpet/ship,
@@ -12353,7 +12341,6 @@
 /obj/effect/turf_decal/tile/brown/tile_side{
 	dir = 4
 	},
-/obj/machinery/computer/cargo/request/console,
 /obj/structure/sign/poster/contraband/bountyhunters{
 	pixel_y = 31
 	},
@@ -12361,6 +12348,7 @@
 	default_raw_text = "WARNING! Do not order more than 6 crates at once. We had to cut a lot of corners to get a supply shuttle dock onto this thing and the crates will not fit if you order more than 6. Good luck, RSWJ.";
 	name = "Note from Speedwagon"
 	},
+/obj/machinery/computer/cargo,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "kIv" = (
@@ -12801,8 +12789,16 @@
 /turf/open/floor/carpet/ship,
 /area/ai_monitored/storage/eva)
 "lgN" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/light_switch/west,
+/obj/docking_port/stationary{
+	dir = 2;
+	dwidth = 3;
+	height = 6;
+	id = "supply_home";
+	name = "Von Neumann Cargo";
+	width = 6
+	},
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "lgZ" = (
@@ -12827,7 +12823,6 @@
 /turf/open/floor/circuit,
 /area/hallway/nsv/deck1/frame1/central)
 "lia" = (
-/obj/machinery/telecomms/bus/preset_one,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 6
 	},
@@ -12837,6 +12832,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/telecomms/hub/preset,
 /turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "lir" = (
@@ -13594,7 +13590,7 @@
 /area/maintenance/port/aft)
 "lTT" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/telecomms/bus/preset_two,
+/obj/machinery/telecomms/server/presets/science,
 /turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "lUD" = (
@@ -13777,6 +13773,15 @@
 /obj/machinery/status_display/evac/south,
 /turf/open/floor/carpet/ship,
 /area/hallway/primary/starboard)
+"maD" = (
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/structure/railing/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "maI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 6
@@ -15048,8 +15053,8 @@
 /turf/open/space/basic,
 /area/ai_monitored/security/armory)
 "nov" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/light,
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "noD" = (
@@ -15515,7 +15520,8 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/engine/light,
+/obj/machinery/telecomms/processor/preset_two,
+/turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "nLC" = (
 /obj/machinery/atmospherics/components/binary/valve/on{
@@ -15783,7 +15789,8 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction{
 	dir = 1
 	},
-/turf/open/floor/engine/light,
+/obj/machinery/telecomms/processor/preset_one,
+/turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "nZh" = (
 /obj/machinery/door/airlock/ship/maintenance,
@@ -16090,11 +16097,11 @@
 /turf/closed/wall/r_wall/ship,
 /area/maintenance/central)
 "ops" = (
-/obj/machinery/telecomms/server/presets/munitions,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/machinery/telecomms/message_server,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "oqd" = (
@@ -16330,8 +16337,8 @@
 /turf/open/floor/carpet/ship/orange_carpet,
 /area/engine/engineering/reactor_control)
 "oDf" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
 /obj/structure/extinguisher_cabinet/west,
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "oDM" = (
@@ -16411,9 +16418,6 @@
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
 "oKx" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/caution/stand_clear/red,
-/obj/structure/railing,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
@@ -16450,7 +16454,8 @@
 /obj/machinery/camera/autoname{
 	dir = 5
 	},
-/turf/open/floor/engine/light,
+/obj/machinery/telecomms/server/presets/supply,
+/turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "oLI" = (
 /turf/open/floor/engine/airless,
@@ -17840,12 +17845,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
-/obj/structure/railing/corner{
-	dir = 8
-	},
 /obj/item/beacon{
 	enabled = 0;
 	name = "Transporter Beacon"
@@ -17877,10 +17876,10 @@
 /turf/open/floor/circuit,
 /area/bridge/cic)
 "qdY" = (
-/obj/machinery/telecomms/server/presets/science,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 5
 	},
+/obj/machinery/telecomms/server/presets/medical,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "qeb" = (
@@ -19195,12 +19194,6 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/railing{
-	dir = 8
-	},
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "rtH" = (
@@ -19451,7 +19444,6 @@
 /area/crew_quarters/heads/hor)
 "rHg" = (
 /obj/machinery/holopad,
-/obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -19646,8 +19638,8 @@
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
 "rTj" = (
-/obj/machinery/telecomms/server/presets/exploration,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/telecomms/server/presets/exploration,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "rTD" = (
@@ -19869,8 +19861,8 @@
 /turf/open/floor/plasteel,
 /area/science/lobby)
 "sgM" = (
-/obj/machinery/telecomms/hub/preset,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/telecomms/server/presets/command,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/tcommsat/server)
 "shp" = (
@@ -20233,13 +20225,13 @@
 /turf/open/floor/carpet/ship/red_carpet,
 /area/crew_quarters/heads/hos)
 "sxl" = (
-/obj/machinery/telecomms/server/presets/command,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 6
 	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/telecomms/bus/preset_one,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "sxE" = (
@@ -20734,7 +20726,7 @@
 /area/ai_monitored/turret_protected/ai_upload)
 "sTk" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/telecomms/processor/preset_four,
+/obj/machinery/telecomms/server/presets/security,
 /turf/open/floor/circuit/telecomms,
 /area/tcommsat/server)
 "sTp" = (
@@ -21031,10 +21023,14 @@
 /turf/open/floor/engine,
 /area/storage/tech)
 "tdU" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/machinery/telecomms/broadcaster/preset_right,
-/turf/open/floor/circuit/telecomms,
-/area/tcommsat/server)
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/cargo/lobby)
 "teu" = (
 /turf/closed/wall/ship,
 /area/maintenance/nsv/bunker)
@@ -22047,6 +22043,10 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 5
 	},
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+	name = "Coolant Input"
+	},
+/obj/machinery/portable_atmospherics/canister/nitrogen,
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
 "udS" = (
@@ -22273,10 +22273,10 @@
 /turf/open/floor/monotile/steel,
 /area/maintenance/port/aft)
 "upE" = (
-/obj/machinery/telecomms/server/presets/common,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple{
 	dir = 10
 	},
+/obj/machinery/telecomms/bus/preset_two,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "upK" = (
@@ -22550,8 +22550,8 @@
 /turf/open/floor/carpet/ship/beige_carpet,
 /area/nsv/weapons/port)
 "uBx" = (
-/obj/machinery/telecomms/message_server/preset,
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
+/obj/machinery/telecomms/server/presets/engineering,
 /turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "uBy" = (
@@ -22980,12 +22980,6 @@
 	dir = 8
 	},
 /obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/structure/railing{
-	dir = 8
-	},
 /obj/effect/landmark/trader_drop_point,
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -23108,12 +23102,8 @@
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
 "vhr" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	name = "Coolant Input";
-	dir = 4
-	},
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/turf/open/floor/engine/light,
+/obj/machinery/telecomms/broadcaster/preset_right,
+/turf/open/floor/circuit/telecomms/server,
 /area/tcommsat/server)
 "vhD" = (
 /obj/structure/lattice/catwalk,
@@ -24596,9 +24586,6 @@
 /obj/effect/turf_decal/tile/brown/tile_side{
 	dir = 1
 	},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/caution,
-/obj/structure/railing,
 /turf/open/floor/plasteel,
 /area/cargo/lobby)
 "wuv" = (
@@ -24667,10 +24654,10 @@
 /turf/open/floor/engine,
 /area/engine/atmos/port_atmos)
 "wwl" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "wwu" = (
@@ -25668,7 +25655,6 @@
 /turf/open/floor/durasteel/techfloor_grid,
 /area/science/xenobiology)
 "xFF" = (
-/obj/effect/turf_decal/stripes/line,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -25791,6 +25777,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/general/visible{
+	dir = 5
+	},
 /turf/open/floor/engine/light,
 /area/tcommsat/server)
 "xLa" = (
@@ -25985,11 +25974,11 @@
 /turf/open/floor/monotile/dark/airless,
 /area/space/nearstation)
 "xSS" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
 /obj/machinery/status_display/supply/west,
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "xTI" = (
@@ -26036,11 +26025,11 @@
 /turf/open/floor/circuit,
 /area/bridge/cic)
 "xVp" = (
-/obj/effect/turf_decal/ship/delivery/yellow,
+/obj/machinery/status_display/ai/west,
 /obj/machinery/status_display/evac{
 	pixel_y = -31
 	},
-/obj/machinery/status_display/ai/west,
+/obj/effect/turf_decal/stripes/red/full,
 /turf/open/floor/engine,
 /area/cargo/lobby)
 "xVt" = (
@@ -37345,8 +37334,8 @@ bjO
 lia
 quw
 lTT
-vsB
-iCf
+sTk
+isp
 oLo
 qdY
 quF
@@ -37747,10 +37736,10 @@ mRc
 txA
 txA
 sxl
-kiz
+vsB
 sgM
 uBx
-sTk
+wNl
 dSE
 kov
 vhr
@@ -37949,7 +37938,7 @@ veh
 mwM
 mHC
 upE
-wNl
+iCf
 hOG
 rTj
 fAW
@@ -38154,7 +38143,7 @@ iSQ
 cki
 cki
 kBW
-tdU
+quw
 iJz
 cFK
 jNN
@@ -47033,7 +47022,7 @@ wTE
 xeL
 tPN
 wut
-fAX
+kiz
 lgN
 xSS
 abl
@@ -47235,7 +47224,7 @@ bxX
 iKQ
 hFA
 oKx
-fAX
+fVq
 fAX
 fAX
 fAX
@@ -47437,8 +47426,8 @@ nbR
 iKQ
 fob
 xFF
-fAX
-fAX
+hDS
+jgX
 fAX
 fAX
 fAX
@@ -47640,7 +47629,7 @@ iKQ
 pIY
 xFF
 hDS
-fAX
+jgX
 fAX
 fAX
 fAX
@@ -47841,7 +47830,7 @@ wTE
 xeL
 kIj
 rHg
-fAX
+fVq
 fAX
 fAX
 fAX
@@ -48042,8 +48031,8 @@ ivV
 wTE
 xeL
 ixa
-fVq
-fAX
+xFF
+kiz
 fAX
 fAX
 fAX
@@ -48244,14 +48233,14 @@ tkZ
 wTE
 xeL
 vOq
-jgX
-fAX
-fAX
-fAX
-fAX
-fAX
-fAX
-fAX
+xFF
+maD
+tdU
+tdU
+tdU
+tdU
+tdU
+tdU
 fDy
 rkn
 ipo
diff --git a/_maps/shuttles/cargo/cargo_vn.dmm b/_maps/shuttles/cargo/cargo_vn.dmm
new file mode 100644
index 00000000000..5a1188dd971
--- /dev/null
+++ b/_maps/shuttles/cargo/cargo_vn.dmm
@@ -0,0 +1,156 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"k" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"o" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 1;
+	name = "reaction control engine"
+	},
+/obj/docking_port/mobile/supply{
+	dir = 2;
+	dwidth = 6;
+	height = 6;
+	width = 6
+	},
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"q" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 1
+	},
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"u" = (
+/turf/open/floor/plasteel/yellowsiding/corner,
+/area/shuttle/supply)
+"x" = (
+/obj/machinery/button/door{
+	id = "QMLoaddoor2";
+	name = "Loading Doors"
+	},
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"A" = (
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 6
+	},
+/area/shuttle/supply)
+"B" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 1;
+	name = "reaction control engine"
+	},
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"F" = (
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 10
+	},
+/area/shuttle/supply)
+"G" = (
+/turf/template_noop,
+/area/shuttle/supply)
+"I" = (
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 8
+	},
+/area/shuttle/supply)
+"J" = (
+/obj/machinery/door/poddoor{
+	id = "QMLoaddoor2";
+	name = "supply dock loading door"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"M" = (
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 1
+	},
+/area/shuttle/supply)
+"N" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 9
+	},
+/area/shuttle/supply)
+"O" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 5
+	},
+/area/shuttle/supply)
+"S" = (
+/turf/open/floor/plasteel,
+/area/shuttle/supply)
+"V" = (
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 4
+	},
+/area/shuttle/supply)
+"X" = (
+/turf/closed/wall/mineral/titanium/interior,
+/area/shuttle/supply)
+"Z" = (
+/turf/open/floor/plasteel/yellowsiding/corner{
+	dir = 8
+	},
+/area/shuttle/supply)
+
+(1,1,1) = {"
+o
+q
+a
+a
+k
+G
+"}
+(2,1,1) = {"
+x
+N
+I
+F
+X
+k
+"}
+(3,1,1) = {"
+J
+M
+S
+Z
+F
+a
+"}
+(4,1,1) = {"
+J
+M
+S
+u
+A
+a
+"}
+(5,1,1) = {"
+k
+O
+V
+A
+X
+k
+"}
+(6,1,1) = {"
+B
+q
+a
+a
+k
+G
+"}
diff --git a/_maps/vonneumann.json b/_maps/vonneumann.json
index 6e8267a725d..52ce61eac4a 100644
--- a/_maps/vonneumann.json
+++ b/_maps/vonneumann.json
@@ -7,8 +7,9 @@
 	"space_ruin_levels": -1,
 	"space_empty_levels": 0,
 	"shuttles": {
-		"cargo": "cargo_serendipity",
-		"ferry": "ferry_fancy"},
+		"cargo": "cargo_vn",
+		"ferry": "ferry_fancy",
+                "emergency": "emergency_void"},
 	"mine_disable": 1,
 	"ship_type": "/obj/structure/overmap/nanotrasen/solgov/vnc/starter",
 	"faction": "solgov",
diff --git a/nsv13/code/datums/shuttles.dm b/nsv13/code/datums/shuttles.dm
index e8e1fc6b175..af11b979788 100644
--- a/nsv13/code/datums/shuttles.dm
+++ b/nsv13/code/datums/shuttles.dm
@@ -28,6 +28,10 @@
 	suffix = "serendipity"
 	name = "\[NSV\] cargo ferry (Serendipity)"
 
+/datum/map_template/shuttle/cargo/vn
+	suffix = "vn"
+	name = "\[NSV\] cargo ferry (Von Neumann)"
+
 //Arrivals
 
 /datum/map_template/shuttle/arrival/aetherwhisp