diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
index a1a1b49a334..41fe7592fe9 100644
--- a/ATTRIBUTIONS.md
+++ b/ATTRIBUTIONS.md
@@ -48,4 +48,9 @@
 **File:** `sound/ambience/space/aurora_caelus.ogg`<br>
 **Title:** Music for Manatees<br>
 **Creator:** Kevin MacLeod (incompetech.com)<br>
+**License:** [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)<br>
+<br>
+**File:** `sound/ambience/startup.ogg` and `sound/ambience/shutdown.ogg`<br>
+**Title:** Spaceship starup and shutdown<br>
+**Creator:** viznoman (https://freesound.org/people/viznoman/sounds/267308/)<br>
 **License:** [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)<br>
\ No newline at end of file
diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm
index 377ae5a2eaa..a98edbf5983 100644
--- a/code/game/objects/random/mapping.dm
+++ b/code/game/objects/random/mapping.dm
@@ -105,10 +105,14 @@
 	icon = 'icons/obj/vending.dmi'
 	icon_state = "Cola_Machine"
 
+//VOREStation Edit Start
 /obj/random/vendordrink/item_to_spawn() //Not including coffee as it's more specific in usage.
 	return pick (/obj/machinery/vending/cola,
+				/obj/machinery/vending/cola/soft,
+				/obj/machinery/vending/bepis,	
 				/obj/machinery/vending/sovietsoda,
 				/obj/machinery/vending/radren)
+//VOREStation Edit End
 
 /obj/random/obstruction //Large objects to block things off in maintenance
 	name = "random obstruction"
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 40ab1280845..ef1584fb573 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -600,6 +600,12 @@
 				prob(2);/obj/item/weapon/coin/platinum,
 				prob(1);/obj/item/weapon/coin/diamond)
 
+//VOREStation Add Start
+/obj/random/coin/sometimes
+	spawn_nothing_percentage = 66
+
+//VOREStation Add End
+
 /obj/random/action_figure
 	name = "random action figure"
 	desc = "This is a random action figure."
diff --git a/code/modules/mob/living/simple_mob/sd_pets.dm b/code/modules/mob/living/simple_mob/sd_pets.dm
index 855b2121d0e..87a0216b8f1 100644
--- a/code/modules/mob/living/simple_mob/sd_pets.dm
+++ b/code/modules/mob/living/simple_mob/sd_pets.dm
@@ -23,6 +23,9 @@
 	name = "Tulidaan"
 	desc = "Watcher of the Seven. Thinker, knower."
 	icon_state = "tulidaan"
+	icon_living = "tulidaan"
+	icon_rest = "tulidaan_rest"
+	icon_dead = "tulidaan_dead"
 	digestable = 0
 	catalogue_data = list(/datum/category_item/catalogue/fauna/catslug/tulidaan)
 	holder_type = /obj/item/weapon/holder/catslug/tulidaan
diff --git a/code/modules/overmap/OM sound.dm b/code/modules/overmap/OM sound.dm
new file mode 100644
index 00000000000..c1fc58cfe26
--- /dev/null
+++ b/code/modules/overmap/OM sound.dm	
@@ -0,0 +1,6 @@
+/obj/effect/overmap/visitable/sector/Crossed(var/obj/effect/overmap/visitable/ship/enterer)
+	. = ..()
+	if(istype(enterer))
+		for(var/mob/potential_mob as anything in player_list)
+			if(potential_mob.z in enterer.map_z)
+				SEND_SOUND(potential_mob, 'sound/ambience/approaching_planet.ogg')
diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm
index e048805738a..e563f4524c9 100644
--- a/code/modules/overmap/ships/ship.dm
+++ b/code/modules/overmap/ships/ship.dm
@@ -40,6 +40,9 @@
 	var/halted = 0        //admin halt or other stop.
 	var/skill_needed = SKILL_ADEPT  //piloting skill needed to steer it without going in random dir
 	var/operator_skill
+	//VOREStation add
+	var/last_sound = 0 //The last time a ship sound was played		//VOREStation add
+	var/sound_cooldown = 10 SECONDS		//VOREStation add
 
 	/// Vis contents overlay holding the ship's vector when in motion	
 	var/obj/effect/overlay/vis/vector
@@ -124,17 +127,37 @@
 	CHANGE_SPEED_BY(speed[2], n_y)
 	update_icon()
 	var/still = is_still()
+	// If nothing changed
 	if(still == old_still)
 		return
+	// If it is now still, stopped moving
 	else if(still)
 		STOP_PROCESSING(SSprocessing, src)
 		for(var/zz in map_z)
 			toggle_move_stars(zz)
+		if(last_sound + sound_cooldown >= world.time)
+			return
+		//VOREStation Add Start
+		for(var/mob/potential_mob as anything in player_list)
+			if(potential_mob.z in map_z)
+				SEND_SOUND(potential_mob, 'sound/ambience/shutdown.ogg')
+				last_sound = world.time
+		//VOREStation Add End
+
+	// If it started moving
 	else
 		START_PROCESSING(SSprocessing, src)
 		glide_size = WORLD_ICON_SIZE/max(DS2TICKS(SSprocessing.wait), 1) //Down to whatever decimal
 		for(var/zz in map_z)
 			toggle_move_stars(zz, fore_dir)
+		if(last_sound + sound_cooldown >= world.time)
+			return
+		//VOREStation Add Start
+		for(var/mob/potential_mob as anything in player_list)
+			if(potential_mob.z in map_z)
+				SEND_SOUND(potential_mob, 'sound/ambience/startup.ogg')
+				last_sound = world.time
+		//VOREStation Add End
 
 /obj/effect/overmap/visitable/ship/proc/get_brake_path()
 	if(!get_acceleration())
diff --git a/icons/misc/title_vr.dmi b/icons/misc/title_vr.dmi
index d04fb979f31..88b593faa4d 100644
Binary files a/icons/misc/title_vr.dmi and b/icons/misc/title_vr.dmi differ
diff --git a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm
index c8e0a36c961..d5017ade26a 100644
--- a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm
+++ b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm
@@ -40,6 +40,22 @@
 	},
 /turf/simulated/floor/plating/virgo2,
 /area/offmap/aerostat/solars)
+"ah" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 28
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 20
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 36
+	},
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/firingrange)
 "aj" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	id_tag = "anomaly_airlock_pump";
@@ -1019,6 +1035,9 @@
 /area/offmap/aerostat/inside/powercontrol)
 "cR" = (
 /obj/structure/bed/chair/sofa/purp/left,
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/offmap/aerostat/inside/lobby)
 "cU" = (
@@ -1602,6 +1621,9 @@
 /area/offmap/aerostat/inside/toxins)
 "eE" = (
 /obj/structure/bed/chair/sofa/purp/right,
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/offmap/aerostat/inside/lobby)
 "eG" = (
@@ -1649,6 +1671,7 @@
 /obj/machinery/camera/network/research_outpost{
 	dir = 4
 	},
+/obj/structure/flora/pottedplant/unusual,
 /turf/simulated/floor/tiled/dark,
 /area/offmap/aerostat/inside/lobby)
 "eR" = (
@@ -1677,6 +1700,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/xenoarch)
+"eV" = (
+/obj/structure/sign/painting/public{
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "eW" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/offmap/aerostat/inside/southchamb)
@@ -2482,6 +2511,7 @@
 /obj/machinery/alarm{
 	pixel_y = 26
 	},
+/obj/structure/flora/pottedplant/unusual,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/telesci)
 "iK" = (
@@ -2649,6 +2679,19 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/toxins)
+"jA" = (
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/offmap/aerostat/inside/easthall)
+"jE" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 8
+	},
+/obj/structure/table/glass,
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "jF" = (
 /turf/simulated/wall,
 /area/offmap/aerostat/inside/xenoarch)
@@ -3160,6 +3203,21 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/offmap/aerostat/inside/zorrenoffice)
+"lz" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/sign/poster{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/offmap/aerostat/inside/westhall)
 "lA" = (
 /obj/machinery/mining/drill,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -3404,12 +3462,10 @@
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/telesci)
 "mL" = (
-/obj/structure/table/standard,
-/obj/item/weapon/folder/white,
-/obj/item/weapon/pen/fountain,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/item/modular_computer/console,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/toxins)
 "mM" = (
@@ -3674,6 +3730,21 @@
 	},
 /turf/simulated/floor/plating/virgo2,
 /area/offmap/aerostat/solars)
+"nR" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/offmap/aerostat/inside/westhall)
 "nS" = (
 /obj/structure/bed/chair/shuttle{
 	dir = 8
@@ -4030,6 +4101,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/structure/flora/pottedplant/overgrown,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/firingrange)
 "py" = (
@@ -4985,6 +5057,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/toxins)
+"tR" = (
+/obj/structure/flora/pottedplant/subterranean,
+/turf/simulated/floor/tiled/techfloor,
+/area/offmap/aerostat/inside/southchamb)
 "tS" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume,
 /obj/machinery/light/small,
@@ -5033,6 +5109,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/toxins)
+"ug" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/table/steel_reinforced,
+/obj/structure/sign/painting/public{
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "uh" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -5807,6 +5891,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/offmap/aerostat/inside/atmos)
+"ye" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/item/modular_computer/console{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/firingrange)
 "yi" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 9
@@ -5928,6 +6019,9 @@
 	dir = 1;
 	pixel_y = 5
 	},
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/offmap/aerostat/inside/easthall)
 "yI" = (
@@ -6011,6 +6105,14 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/offmap/aerostat/inside/xenoarch)
+"zf" = (
+/obj/structure/table/steel_reinforced,
+/obj/random/maintenance/research,
+/obj/structure/sign/painting/public{
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "zg" = (
 /obj/machinery/atmospherics/pipe/simple/insulated,
 /obj/effect/floor_decal/rust,
@@ -6902,6 +7004,13 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/offmap/aerostat/inside/toxins)
+"CI" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 4
+	},
+/obj/structure/table/glass,
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "CJ" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 4
@@ -7116,6 +7225,16 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/firingrange)
+"DH" = (
+/obj/structure/cable/heavyduty{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/sign/poster{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/toxins)
 "DI" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /turf/simulated/floor/tiled/white,
@@ -7357,6 +7476,14 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/offmap/aerostat/inside/easthall)
+"Fa" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 8
+	},
+/obj/structure/table/glass,
+/obj/random/maintenance/research,
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "Ff" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -7604,6 +7731,14 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/xenoarch)
+"Gl" = (
+/obj/effect/floor_decal/industrial/warning/dust{
+	dir = 4
+	},
+/obj/structure/table/glass,
+/obj/random/maintenance/research,
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "Gm" = (
 /obj/machinery/door/airlock/multi_tile/glass,
 /obj/machinery/door/firedoor/glass,
@@ -7619,6 +7754,21 @@
 /obj/machinery/atmospherics/pipe/simple/hidden,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/misclab)
+"Gr" = (
+/obj/structure/cable/heavyduty{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/sign/poster{
+	dir = 1
+	},
+/turf/simulated/floor/tiled/techfloor,
+/area/offmap/aerostat/inside/easthall)
 "Gs" = (
 /obj/structure/cable/heavyduty{
 	icon_state = "4-8"
@@ -8033,6 +8183,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/telesci)
+"HS" = (
+/obj/structure/flora/pottedplant/crystal,
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/firingrange)
 "HT" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -8344,6 +8498,12 @@
 "Jq" = (
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/xenoarch)
+"Jr" = (
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/toxins)
 "Ju" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/black{
 	dir = 4
@@ -8455,6 +8615,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/flora/pottedplant/minitree,
 /turf/simulated/floor/tiled/dark,
 /area/offmap/aerostat/inside/lobby)
 "JR" = (
@@ -8719,6 +8880,9 @@
 /obj/structure/table/steel_reinforced,
 /obj/random/firstaid,
 /obj/random/maintenance/research,
+/obj/structure/sign/painting/public{
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/offmap/aerostat/inside/lobby)
 "Lj" = (
@@ -8811,6 +8975,9 @@
 /area/offmap/aerostat/inside/zorrenoffice)
 "LI" = (
 /obj/structure/closet/firecloset,
+/obj/structure/sign/poster{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/xenoarch)
 "LK" = (
@@ -9420,6 +9587,17 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/toxins)
+"OD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/firingrange)
 "OE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -9640,6 +9818,12 @@
 "PO" = (
 /turf/simulated/shuttle/wall/voidcraft/hard_corner,
 /area/offmap/aerostat/inside/misclab)
+"PP" = (
+/obj/structure/sign/painting/public{
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/toxins)
 "PQ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
@@ -10210,6 +10394,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/sign/poster{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
 /area/offmap/aerostat/inside/xenoarch)
 "RV" = (
@@ -10819,6 +11006,15 @@
 	},
 /turf/simulated/floor/bluegrid,
 /area/offmap/aerostat/inside/powercontrol)
+"UO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/sign/painting/public{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/misclab)
 "US" = (
 /obj/machinery/door/airlock/glass_research{
 	name = "Atmospherics";
@@ -10900,6 +11096,11 @@
 /obj/structure/table/standard,
 /obj/item/device/assembly_holder/timer_igniter,
 /obj/item/weapon/tool/screwdriver,
+/obj/structure/sign/painting/public{
+	pixel_x = -30
+	},
+/obj/item/weapon/folder/white,
+/obj/item/weapon/pen/fountain,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/toxins)
 "Vk" = (
@@ -11108,6 +11309,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/telesci)
+"Wi" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/firingrange)
 "Wk" = (
 /obj/machinery/portable_atmospherics/canister/empty,
 /turf/simulated/floor/tiled/techfloor,
@@ -11207,6 +11413,14 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/tiled/techfloor,
 /area/offmap/aerostat/inside/atmos)
+"WH" = (
+/obj/structure/table/steel_reinforced,
+/obj/random/maintenance/research,
+/obj/structure/sign/painting/public{
+	pixel_x = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/offmap/aerostat/inside/lobby)
 "WJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -11305,6 +11519,16 @@
 /obj/item/modular_computer/console/preset/command,
 /turf/simulated/floor/tiled/techfloor,
 /area/offmap/aerostat/inside/zorrenoffice)
+"Xg" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/flora/pottedplant/subterranean,
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/xenoarch)
 "Xo" = (
 /obj/effect/floor_decal/industrial/danger{
 	dir = 1
@@ -11353,7 +11577,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/structure/table/standard,
+/obj/item/modular_computer/console/preset/research,
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/telesci)
 "XA" = (
@@ -11378,6 +11602,22 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/offmap/aerostat/inside/xenoarch)
+"XH" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 20
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 28
+	},
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 36
+	},
+/turf/simulated/floor/tiled/white,
+/area/offmap/aerostat/inside/firingrange)
 "XJ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/wall,
@@ -18784,7 +19024,7 @@ oW
 nO
 TY
 ZK
-wF
+nR
 Lt
 Kv
 jS
@@ -19210,7 +19450,7 @@ Qd
 Zv
 CQ
 Qd
-wF
+lz
 Lt
 iX
 pu
@@ -20059,19 +20299,19 @@ Qd
 fh
 YJ
 Qd
-qC
+Jr
 HU
 kf
 ck
 Md
 iX
-Nl
+HS
 Nl
 Nl
 at
 Nl
 Nl
-fJ
+OD
 vM
 sp
 Ld
@@ -20210,7 +20450,7 @@ iX
 DG
 Nl
 Nl
-at
+Wi
 Nl
 Nl
 FT
@@ -20338,9 +20578,9 @@ jy
 GR
 xy
 jy
+DH
 jy
-jy
-jy
+DH
 GR
 jy
 TP
@@ -20349,13 +20589,13 @@ nv
 LF
 Sb
 iX
-at
+ah
 Nl
 Nl
 at
 Nl
 Nl
-fJ
+OD
 vM
 sp
 Ld
@@ -20491,7 +20731,7 @@ Wn
 NW
 jo
 iX
-at
+XH
 fx
 Nl
 Nl
@@ -20624,7 +20864,7 @@ zb
 Ca
 qC
 qC
-qC
+PP
 jM
 hs
 qC
@@ -20635,7 +20875,7 @@ ZH
 iX
 Rm
 bx
-bx
+ye
 Ew
 mA
 Ne
@@ -20653,7 +20893,7 @@ ID
 ID
 iX
 PJ
-eW
+tR
 KK
 KK
 aw
@@ -20925,10 +21165,10 @@ vL
 pf
 wo
 eP
-Ym
+eV
 Ym
 qp
-Jn
+zf
 xD
 Bp
 Mk
@@ -21633,9 +21873,9 @@ Oc
 Kh
 cV
 cV
-cV
-cV
-cV
+Gl
+CI
+CI
 cV
 cV
 WZ
@@ -22059,9 +22299,9 @@ Ym
 ZN
 bU
 bU
-bU
-bU
-bU
+Fa
+jE
+Fa
 bU
 bU
 AK
@@ -22644,7 +22884,7 @@ qR
 eW
 eW
 Rj
-eW
+tR
 qc
 Au
 Au
@@ -22766,7 +23006,7 @@ vg
 cR
 hh
 xl
-Jn
+WH
 FX
 IF
 JQ
@@ -22774,7 +23014,7 @@ kC
 ql
 pf
 qP
-BH
+ug
 CT
 Bp
 QQ
@@ -23067,7 +23307,7 @@ Pa
 jV
 aH
 gC
-eW
+tR
 KK
 KK
 aw
@@ -23186,7 +23426,7 @@ gx
 tD
 lG
 jF
-CK
+Gr
 BS
 Uh
 Xz
@@ -23479,7 +23719,7 @@ uj
 Vz
 Vz
 Yn
-gK
+UO
 By
 By
 By
@@ -24033,12 +24273,12 @@ vz
 RP
 Jq
 Jq
-LS
+Xg
 xs
 xs
 xs
 jF
-CK
+Gr
 BS
 Uh
 JZ
@@ -25173,7 +25413,7 @@ jF
 jF
 jF
 ry
-Va
+jA
 XA
 ty
 lA
diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm
index b80ffcec448..546526991ab 100644
--- a/maps/stellardelight/stellar_delight1.dmm
+++ b/maps/stellardelight/stellar_delight1.dmm
@@ -1093,7 +1093,7 @@
 /area/stellardelight/deck1/shuttlebay)
 "co" = (
 /obj/machinery/vending/fitness,
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/starboard)
 "cp" = (
 /obj/machinery/shower{
@@ -1519,7 +1519,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/starboard)
 "dk" = (
 /obj/effect/floor_decal/industrial/warning/full,
@@ -2302,6 +2302,13 @@
 "eV" = (
 /turf/simulated/floor,
 /area/stellardelight/deck1/aft)
+"eW" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/flora/pottedplant/stoutbush,
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/starboard)
 "eX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -4133,6 +4140,7 @@
 /obj/item/weapon/pen{
 	pixel_y = 6
 	},
+/obj/random/coin/sometimes,
 /turf/simulated/floor/wood,
 /area/library)
 "iL" = (
@@ -4240,6 +4248,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/starboard)
 "iY" = (
@@ -5396,6 +5405,7 @@
 /obj/machinery/firealarm/angled,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/effect/floor_decal/milspec/color/red,
+/obj/item/weapon/storage/box/donut,
 /turf/simulated/floor/tiled/dark,
 /area/security/lobby)
 "lC" = (
@@ -6375,6 +6385,18 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck1/exploration)
+"nC" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/closet/emergsuit_wall{
+	dir = 4;
+	pixel_x = 27
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/port)
 "nD" = (
 /turf/simulated/floor/tiled/eris/white/gray_platform,
 /area/gateway)
@@ -6630,6 +6652,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/port)
 "oh" = (
@@ -6852,7 +6875,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck1/starboard)
 "oE" = (
 /turf/simulated/wall/bay/white,
@@ -8004,6 +8027,7 @@
 	pixel_x = -6;
 	pixel_y = -3
 	},
+/obj/item/weapon/storage/box/donut,
 /turf/simulated/floor/tiled/dark,
 /area/security/security_equiptment_storage)
 "ri" = (
@@ -8549,7 +8573,7 @@
 /obj/structure/bed/chair/comfy/black{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/starboard)
 "sn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -8606,6 +8630,7 @@
 	dir = 6
 	},
 /obj/item/weapon/gun/energy/sizegun,
+/obj/item/weapon/storage/box/donut,
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "ss" = (
@@ -9725,6 +9750,13 @@
 	},
 /turf/simulated/floor/tiled/monotile,
 /area/rnd/research)
+"uS" = (
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/structure/flora/pottedplant/stoutbush,
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/port)
 "uT" = (
 /obj/structure/table/glass,
 /obj/machinery/reagentgrinder,
@@ -10577,6 +10609,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/machinery/mining/brace,
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/shuttlebay)
 "wP" = (
@@ -15583,7 +15616,7 @@
 /obj/structure/sign/painting/public{
 	pixel_y = 30
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/starboard)
 "HP" = (
 /obj/structure/disposalpipe/segment,
@@ -15958,11 +15991,11 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/exploshuttle)
 "Iw" = (
-/obj/machinery/vending/snack,
+/obj/random/vendorfood,
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/starboard)
 "Ix" = (
 /obj/structure/cable{
@@ -16309,6 +16342,19 @@
 	},
 /turf/simulated/floor,
 /area/maintenance/stellardelight/substation/exploration)
+"Jh" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/starboard)
 "Jj" = (
 /obj/machinery/power/breakerbox/activated{
 	RCon_tag = "Medical Substation Bypass"
@@ -17695,6 +17741,10 @@
 /obj/machinery/atm{
 	pixel_y = 30
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/fore)
 "Mq" = (
@@ -18714,6 +18764,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/chapel/main)
+"OD" = (
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
+/turf/simulated/floor/tiled/dark,
+/area/security/lobby)
 "OE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -19615,6 +19672,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/flora/pottedplant/decorative,
 /turf/simulated/floor/tiled/eris/white/bluecorner,
 /area/stellardelight/deck1/lowermed)
 "QP" = (
@@ -20757,6 +20815,13 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/maintenance/stellardelight/deck1/starboardaft)
+"Tg" = (
+/obj/structure/closet/emergsuit_wall{
+	dir = 4;
+	pixel_x = 27
+	},
+/turf/simulated/floor/tiled/dark,
+/area/security/lobby)
 "Th" = (
 /obj/structure/cable/pink{
 	icon_state = "1-8"
@@ -20786,7 +20851,7 @@
 	dir = 1;
 	pixel_y = 24
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/starboard)
 "Tl" = (
 /obj/machinery/door/firedoor/glass,
@@ -20878,7 +20943,7 @@
 "Tv" = (
 /obj/machinery/vending/coffee,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck1/starboard)
 "Tx" = (
 /obj/machinery/door/firedoor/glass,
@@ -21280,7 +21345,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/starboard)
 "Uk" = (
 /obj/structure/cable/yellow{
@@ -22265,6 +22330,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/random/coin/sometimes,
 /turf/simulated/floor/carpet/bcarpet,
 /area/stellardelight/deck1/port)
 "Wg" = (
@@ -22557,6 +22623,7 @@
 	dir = 1;
 	pixel_y = 24
 	},
+/obj/machinery/mining/brace,
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/shuttlebay)
 "WR" = (
@@ -23088,7 +23155,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/machinery/vending/radren,
+/obj/random/vendordrink,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/port)
@@ -23106,6 +23173,7 @@
 	dir = 4
 	},
 /obj/machinery/camera/network/mining,
+/obj/machinery/mining/drill,
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/stellardelight/deck1/shuttlebay)
 "XX" = (
@@ -23748,7 +23816,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals3{
 	dir = 10
 	},
-/turf/simulated/floor/tiled/techmaint,
+/turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck1/starboard)
 "Zm" = (
 /obj/structure/closet/walllocker_double/west,
@@ -23884,6 +23952,15 @@
 "ZA" = (
 /turf/simulated/floor/tiled/steel_grid,
 /area/rnd/xenobiology)
+"ZB" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/stellardelight/deck1/aft)
 "ZC" = (
 /obj/machinery/firealarm/angled,
 /turf/simulated/floor/tiled/eris/steel/cargo,
@@ -23981,6 +24058,10 @@
 /obj/structure/cable/white{
 	icon_state = "1-2"
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled/techmaint,
 /area/stellardelight/deck1/aft)
 "ZP" = (
@@ -32542,7 +32623,7 @@ Ov
 bw
 kj
 WK
-WK
+nC
 ut
 WK
 wW
@@ -33113,7 +33194,7 @@ Ae
 Li
 WW
 KF
-kU
+uS
 YT
 YT
 cO
@@ -33224,7 +33305,7 @@ oa
 zD
 iZ
 Xk
-mu
+OD
 ZR
 QG
 XC
@@ -33418,7 +33499,7 @@ vb
 pA
 Ij
 CG
-nT
+ZB
 hg
 dl
 ZC
@@ -34644,7 +34725,7 @@ wT
 QC
 Iq
 HN
-mu
+Tg
 Vr
 Hs
 zb
@@ -34817,7 +34898,7 @@ JH
 hK
 bt
 fr
-AQ
+eW
 ei
 ei
 se
@@ -35382,7 +35463,7 @@ Sj
 pg
 MD
 nX
-nX
+Jh
 AZ
 nX
 dG
@@ -36091,7 +36172,7 @@ gz
 Kl
 Zl
 oD
-ei
+aE
 aD
 Es
 ig
diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm
index 574fe6745ec..c57da5b744c 100644
--- a/maps/stellardelight/stellar_delight2.dmm
+++ b/maps/stellardelight/stellar_delight2.dmm
@@ -1544,6 +1544,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
+"dE" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/flora/pottedplant/minitree,
+/turf/simulated/floor/tiled,
+/area/stellardelight/deck2/starboard)
 "dF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -5325,7 +5330,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/storage)
 "mg" = (
-/obj/machinery/vending/cola/soft,
+/obj/random/vendordrink,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck2/port)
@@ -5912,7 +5917,7 @@
 /turf/simulated/floor,
 /area/stellardelight/deck2/combustionworkshop)
 "nB" = (
-/obj/machinery/vending/sol,
+/obj/random/vendorfood,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftport)
@@ -8352,6 +8357,14 @@
 	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/fore)
+"te" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/flora/pottedplant/minitree,
+/turf/simulated/floor/tiled,
+/area/stellardelight/deck2/port)
 "tf" = (
 /obj/machinery/door/firedoor/glass,
 /obj/machinery/door/window/eastright{
@@ -8997,6 +9010,7 @@
 	dir = 8;
 	pixel_x = -24
 	},
+/obj/structure/flora/pottedplant/decorative,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftstarboard)
 "uA" = (
@@ -13332,6 +13346,16 @@
 	},
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/quartermaster/storage)
+"EI" = (
+/obj/effect/floor_decal/steeldecal/steel_decals5{
+	dir = 8
+	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
+/turf/simulated/floor/tiled,
+/area/stellardelight/deck2/port)
 "EJ" = (
 /obj/machinery/computer/crew{
 	dir = 4
@@ -14222,6 +14246,7 @@
 	dir = 4;
 	pixel_x = 24
 	},
+/obj/structure/flora/pottedplant/decorative,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftport)
 "Gy" = (
@@ -15043,7 +15068,7 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
-/obj/machinery/vending/snack,
+/obj/random/vendordrink,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftstarboard)
@@ -15843,10 +15868,10 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/engineering/atmos/storage)
 "Kj" = (
-/obj/machinery/recharge_station,
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 4
 	},
+/obj/machinery/vending/event,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/locker)
 "Kk" = (
@@ -17603,6 +17628,11 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/wood,
 /area/quartermaster/qm)
+"Ob" = (
+/obj/structure/table/gamblingtable,
+/obj/random/coin/sometimes,
+/turf/simulated/floor/carpet,
+/area/crew_quarters/recreation_area)
 "Od" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -18426,6 +18456,7 @@
 	icon_state = "4-8"
 	},
 /obj/random/snack,
+/obj/random/coin/sometimes,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck2/starboardsolars)
 "PU" = (
@@ -20168,6 +20199,7 @@
 /obj/effect/floor_decal/milspec/color/orange/half{
 	dir = 10
 	},
+/obj/structure/flora/pottedplant/smalltree,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck2/aftport)
 "TX" = (
@@ -22301,7 +22333,7 @@
 /turf/simulated/floor/tiled/eris/steel/cargo,
 /area/quartermaster/storage)
 "YQ" = (
-/obj/machinery/vending/snix,
+/obj/random/vendorfood,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck2/port)
@@ -22336,7 +22368,7 @@
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/crew_quarters/bar)
 "YW" = (
-/obj/machinery/vending/radren,
+/obj/random/vendordrink,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck2/starboard)
@@ -30446,7 +30478,7 @@ ti
 ti
 ti
 Es
-Bx
+te
 eq
 Mu
 xu
@@ -31136,7 +31168,7 @@ VP
 MD
 eL
 pA
-MD
+EI
 MD
 WF
 wF
@@ -32534,7 +32566,7 @@ xA
 DS
 UX
 Bp
-UX
+Ob
 ts
 Ut
 Ut
@@ -34990,7 +35022,7 @@ Co
 Co
 Co
 Gp
-Ka
+dE
 QU
 ns
 rq
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 065e989633f..940a5359b98 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -542,6 +542,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 8
 	},
+/obj/structure/flora/pottedplant/smalltree,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "cw" = (
@@ -565,6 +566,9 @@
 /area/stellardelight/deck3/aft)
 "cy" = (
 /obj/machinery/recharge_station,
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/starboarddock)
 "cA" = (
@@ -637,6 +641,10 @@
 "cQ" = (
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /obj/machinery/atmospherics/portables_connector,
+/obj/structure/closet/emergsuit_wall{
+	dir = 4;
+	pixel_x = 27
+	},
 /turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/sdboat/aft)
 "cS" = (
@@ -941,6 +949,9 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 1
 	},
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck3/transitgateway)
 "ek" = (
@@ -2066,6 +2077,22 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/stellardelight/deck3/commandhall)
+"iI" = (
+/obj/structure/cable/blue{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 4;
+	pixel_x = 27
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_platform,
+/area/stellardelight/deck3/commandhall)
 "iJ" = (
 /obj/machinery/cryopod/robot,
 /obj/machinery/light{
@@ -3274,6 +3301,13 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 5
 	},
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 4;
+	pixel_x = 27
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck3/transitgateway)
 "ns" = (
@@ -3895,6 +3929,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/structure/flora/pottedplant/decorative,
 /turf/simulated/floor/tiled/eris/dark/gray_platform,
 /area/stellardelight/deck3/commandhall)
 "pp" = (
@@ -4372,7 +4407,7 @@
 /turf/simulated/floor/tiled/steel_ridged,
 /area/maintenance/stellardelight/deck3/forestarroomb)
 "qX" = (
-/obj/machinery/vending/nifsoft_shop,
+/obj/random/vendorfood,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "qZ" = (
@@ -5026,6 +5061,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/flora/pottedplant/decorative,
 /turf/simulated/floor/tiled/eris/dark/gray_platform,
 /area/stellardelight/deck3/commandhall)
 "tK" = (
@@ -5826,6 +5862,22 @@
 	},
 /turf/simulated/floor,
 /area/shuttle/sdboat/fore)
+"wV" = (
+/obj/structure/cable/blue{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
+/turf/simulated/floor/tiled/eris/dark/gray_platform,
+/area/stellardelight/deck3/commandhall)
 "wW" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -6260,6 +6312,13 @@
 /obj/effect/floor_decal/techfloor/orange{
 	dir = 9
 	},
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck3/transitgateway)
 "yy" = (
@@ -6660,7 +6719,13 @@
 /obj/effect/landmark{
 	name = "JoinLateCryo"
 	},
-/obj/machinery/alarm/angled,
+/obj/machinery/alarm/angled{
+	pixel_x = -32;
+	pixel_y = 19
+	},
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
 /turf/simulated/floor/tiled/techfloor,
 /area/stellardelight/deck3/cryo)
 "zL" = (
@@ -7449,6 +7514,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals5{
 	dir = 1
 	},
+/obj/random/vendorfood,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "Cw" = (
@@ -8663,6 +8729,9 @@
 	dir = 4;
 	pixel_x = 24
 	},
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "Hk" = (
@@ -9044,6 +9113,7 @@
 	pixel_y = 30
 	},
 /obj/machinery/camera/network/command,
+/obj/structure/flora/pottedplant/stoutbush,
 /turf/simulated/floor/tiled/monotile,
 /area/stellardelight/deck3/commandhall)
 "IK" = (
@@ -9530,6 +9600,10 @@
 /obj/structure/bed/chair{
 	dir = 4
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/starboarddock)
 "Kw" = (
@@ -9695,6 +9769,7 @@
 /area/maintenance/stellardelight/deck3/portaft)
 "Le" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/flora/pottedplant/minitree,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "Lh" = (
@@ -9722,6 +9797,7 @@
 /obj/machinery/camera/network/civilian{
 	dir = 8
 	},
+/obj/random/coin/sometimes,
 /turf/simulated/floor/wood,
 /area/stellardelight/deck3/readingroom)
 "Ln" = (
@@ -9866,6 +9942,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 4;
+	pixel_x = 27
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/starboarddock)
 "LR" = (
@@ -10085,10 +10165,10 @@
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "ME" = (
-/obj/machinery/vending/nifsoft_shop,
 /obj/structure/sign/poster{
 	dir = 1
 	},
+/obj/random/vendordrink,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "MF" = (
@@ -10590,6 +10670,9 @@
 /area/stellardelight/deck3/aft)
 "Og" = (
 /obj/machinery/recharge_station,
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/portdock)
 "Oj" = (
@@ -11178,6 +11261,10 @@
 /obj/structure/bed/chair/shuttle{
 	dir = 4
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/sdboat/aft)
 "Qs" = (
@@ -11369,6 +11456,9 @@
 /area/stellardelight/deck3/starboarddock)
 "Rb" = (
 /obj/structure/bed/chair/shuttle,
+/obj/structure/closet/emergsuit_wall{
+	pixel_y = 29
+	},
 /turf/simulated/floor/tiled/eris/dark/cargo,
 /area/shuttle/sdboat/aft)
 "Rc" = (
@@ -11757,6 +11847,7 @@
 	dir = 1;
 	pixel_y = 24
 	},
+/obj/machinery/vending/nifsoft_shop,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "SJ" = (
@@ -11864,6 +11955,10 @@
 /obj/structure/bed/chair{
 	dir = 8
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 4;
+	pixel_x = 27
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/portdock)
 "Td" = (
@@ -12355,6 +12450,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
+/obj/structure/closet/emergsuit_wall{
+	dir = 8;
+	pixel_x = -27
+	},
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/portdock)
 "UX" = (
@@ -12901,6 +13000,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/flora/pottedplant/smalltree,
 /turf/simulated/floor/tiled,
 /area/stellardelight/deck3/aft)
 "Xa" = (
@@ -13454,6 +13554,7 @@
 /area/stellardelight/deck3/aft)
 "YS" = (
 /obj/structure/table/steel,
+/obj/random/coin/sometimes,
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck3/aftstarroom)
 "YU" = (
@@ -23413,7 +23514,7 @@ BK
 aQ
 jK
 eL
-BK
+wV
 bE
 bE
 bE
@@ -23697,7 +23798,7 @@ BK
 aQ
 SZ
 Kw
-BK
+iI
 bE
 bE
 bE
diff --git a/maps/stellardelight/stellar_delight_defines.dm b/maps/stellardelight/stellar_delight_defines.dm
index b5554f34e4f..5139cf5d326 100644
--- a/maps/stellardelight/stellar_delight_defines.dm
+++ b/maps/stellardelight/stellar_delight_defines.dm
@@ -27,7 +27,8 @@
 		"logo1" = 50,
 		"logo2" = 50,
 		"gateway" = 5,
-		"youcanttaketheskyfromme" = 200
+		"youcanttaketheskyfromme" = 200,
+		"intothedark" = 200
 	))
 	if(choice)
 		lobby_screens = list(choice)
@@ -49,12 +50,6 @@
 	lobby_screens = list("youcanttaketheskyfromme")
 	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
 
-	accessible_z_levels = list(
-		Z_LEVEL_SHIP_LOW = 100,
-		Z_LEVEL_SHIP_MID = 100,
-		Z_LEVEL_SHIP_HIGH = 100
-		)
-
 /*
 	holomap_smoosh = list(list(
 		Z_LEVEL_SURFACE_LOW,
@@ -262,19 +257,19 @@
 	z = Z_LEVEL_SHIP_LOW
 	name = "Deck 1"
 	base_turf = /turf/space
-	transit_chance = 100
+	transit_chance = 33
 
 /datum/map_z_level/stellar_delight/deck_two
 	z = Z_LEVEL_SHIP_MID
 	name = "Deck 2"
 	base_turf = /turf/simulated/open
-	transit_chance = 100
+	transit_chance = 33
 
 /datum/map_z_level/stellar_delight/deck_three
 	z = Z_LEVEL_SHIP_HIGH
 	name = "Deck 3"
 	base_turf = /turf/simulated/open
-	transit_chance = 100
+	transit_chance = 33
 
 /datum/map_template/ship_lateload
 	allow_duplicates = FALSE
@@ -580,6 +575,7 @@
 [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF
 [b]Notice[/b]: NanoTrasen Base, authorized personnel only"}
 	known = TRUE
+	in_space = FALSE
 	
 	icon = 'icons/obj/overmap_vr.dmi'
 	icon_state = "virgo3b"
diff --git a/maps/submaps/admin_use_vr/fun.dm b/maps/submaps/admin_use_vr/fun.dm
index 380f1046680..05df720d4ec 100644
--- a/maps/submaps/admin_use_vr/fun.dm
+++ b/maps/submaps/admin_use_vr/fun.dm
@@ -277,6 +277,13 @@
 	skybox_pixel_x = 0
 	skybox_pixel_y = 0
 
+/obj/effect/overmap/visitable/ship/admin_use/space_dog/Crossed(var/obj/effect/overmap/visitable/ship/enterer)
+	. = ..()
+	if(istype(enterer))
+		for(var/mob/potential_mob as anything in player_list)
+			if(potential_mob.z in enterer.map_z)
+				SEND_SOUND(potential_mob, 'sound/ambience/boy.ogg')
+
 /obj/effect/overmap/visitable/ship/admin_use/space_whale
 	skybox_icon = 'icons/skybox/anomaly.dmi'
 	skybox_icon_state = "space_whale"
diff --git a/sound/ambience/approaching_planet.ogg b/sound/ambience/approaching_planet.ogg
new file mode 100644
index 00000000000..e70b1246f40
Binary files /dev/null and b/sound/ambience/approaching_planet.ogg differ
diff --git a/sound/ambience/boy.ogg b/sound/ambience/boy.ogg
new file mode 100644
index 00000000000..47986853f81
Binary files /dev/null and b/sound/ambience/boy.ogg differ
diff --git a/sound/ambience/shutdown.ogg b/sound/ambience/shutdown.ogg
new file mode 100644
index 00000000000..9f0f6ed4a70
Binary files /dev/null and b/sound/ambience/shutdown.ogg differ
diff --git a/sound/ambience/startup.ogg b/sound/ambience/startup.ogg
new file mode 100644
index 00000000000..37deaeb7324
Binary files /dev/null and b/sound/ambience/startup.ogg differ
diff --git a/vorestation.dme b/vorestation.dme
index e8674fa774b..8d392b0b12c 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3310,6 +3310,7 @@
 #include "code\modules\overmap\bluespace_rift_vr.dm"
 #include "code\modules\overmap\champagne.dm"
 #include "code\modules\overmap\helpers.dm"
+#include "code\modules\overmap\OM sound.dm"
 #include "code\modules\overmap\overmap_object.dm"
 #include "code\modules\overmap\overmap_planet.dm"
 #include "code\modules\overmap\overmap_shuttle.dm"