diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm
index 3044ac31d6..21ca60771a 100644
--- a/code/game/objects/random/misc_vr.dm
+++ b/code/game/objects/random/misc_vr.dm
@@ -191,3 +191,27 @@
 				prob(1);/obj/item/weapon/flame/lighter/random,
 				prob(1);/obj/item/weapon/storage/wallet/random,
 				prob(1);/obj/random/cutout)
+
+/obj/random/instrument
+	name = "random instrument"
+	desc = "This is a random instrument."
+	icon = 'icons/obj/musician.dmi'
+	icon_state = "violin"
+	spawn_nothing_percentage = 0
+
+/obj/random/instrument/item_to_spawn()
+	return pick(prob(5);/obj/item/instrument/violin,
+				prob(5);/obj/item/instrument/banjo,
+				prob(5);/obj/item/instrument/guitar,
+				prob(5);/obj/item/instrument/eguitar,
+				prob(5);/obj/item/instrument/accordion,
+				prob(5);/obj/item/instrument/trumpet,
+				prob(5);/obj/item/instrument/saxophone,
+				prob(5);/obj/item/instrument/trombone,
+				prob(5);/obj/item/instrument/recorder,
+				prob(5);/obj/item/instrument/harmonica,
+				prob(1);/obj/item/instrument/bikehorn,
+				prob(5);/obj/item/instrument/piano_synth,
+				prob(5);/obj/item/instrument/glockenspiel,
+				prob(1);/obj/item/instrument/musicalmoth
+				)
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 60124acce5..00ee0c63c3 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -48,6 +48,9 @@
 /obj/machinery/computer/arcade/battle{
 	dir = 8
 	},
+/obj/structure/sign/painting/library_secure{
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/civilian/bar)
 "ah" = (
@@ -1137,6 +1140,12 @@
 /obj/effect/landmark/start/medical,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/office)
+"cT" = (
+/obj/structure/sign/painting/library_secure{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "cU" = (
 /obj/item/weapon/stock_parts/manipulator,
 /obj/item/weapon/stock_parts/matter_bin,
@@ -2067,6 +2076,9 @@
 /obj/machinery/firealarm{
 	dir = 4
 	},
+/obj/structure/sign/painting/library_secure{
+	pixel_y = -30
+	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/cafe)
 "fk" = (
@@ -2797,6 +2809,13 @@
 "gW" = (
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/cafe)
+"gX" = (
+/obj/structure/table/bench/padded,
+/obj/structure/sign/painting/library_secure{
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/civilian/bar)
 "gY" = (
 /obj/machinery/telecomms/hub/preset/groundbase,
 /turf/simulated/floor/tiled/dark{
@@ -3067,6 +3086,9 @@
 /turf/simulated/wall,
 /area/groundbase/medical/resleeving)
 "hM" = (
+/obj/structure/sign/painting/library_secure{
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/autoresleeving)
 "hN" = (
@@ -3447,6 +3469,12 @@
 "iH" = (
 /turf/simulated/wall/r_wall,
 /area/maintenance/groundbase/level1/netunnel)
+"iI" = (
+/obj/structure/sign/painting/library_secure{
+	pixel_y = 30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/briefing)
 "iJ" = (
 /obj/structure/table/rack{
 	dir = 8;
@@ -3484,6 +3512,15 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/engine)
+"iO" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 8
+	},
+/obj/structure/sign/painting/library_secure{
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/equipment)
 "iP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -6106,6 +6143,10 @@
 	dir = 4
 	},
 /obj/machinery/light,
+/obj/structure/table/reinforced,
+/obj/machinery/photocopier/faxmachine{
+	department = "Engineering"
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/lobby)
 "pf" = (
@@ -6829,6 +6870,9 @@
 /obj/structure/bed/chair/wood{
 	dir = 4
 	},
+/obj/structure/sign/painting/library_secure{
+	pixel_y = 30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/cafe)
 "qY" = (
@@ -7258,6 +7302,15 @@
 /obj/machinery/portable_atmospherics/powered/pump/filled,
 /turf/simulated/floor/tiled/techmaint,
 /area/groundbase/engineering/atmos)
+"rS" = (
+/obj/structure/closet/walllocker_double{
+	pixel_y = 28
+	},
+/obj/random/instrument,
+/obj/random/instrument,
+/obj/item/instrument/guitar,
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/gameroom)
 "rT" = (
 /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
 	outdoors = 0
@@ -8658,6 +8711,9 @@
 /obj/machinery/alarm{
 	dir = 8
 	},
+/obj/structure/sign/painting/library_secure{
+	pixel_y = 30
+	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/cafe)
 "vp" = (
@@ -8974,6 +9030,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/sign/painting/library_secure{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/halle)
 "vY" = (
@@ -13564,6 +13623,12 @@
 /obj/machinery/chemical_dispenser/bar_alc/full,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/bar)
+"GS" = (
+/obj/structure/sign/painting/library_secure{
+	pixel_x = -30
+	},
+/turf/simulated/floor/tiled/dark,
+/area/groundbase/security/warden)
 "GT" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -13591,6 +13656,12 @@
 	},
 /turf/simulated/floor/carpet/sblucarpet,
 /area/groundbase/security/iaa2)
+"GW" = (
+/obj/structure/sign/painting/public{
+	pixel_x = -30
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/gameroom)
 "GX" = (
 /obj/machinery/light{
 	dir = 8
@@ -13716,6 +13787,9 @@
 	},
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/structure/sign/painting/library_secure{
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/medical/resleeving)
 "Hl" = (
@@ -14531,8 +14605,17 @@
 /obj/item/device/suit_cooling_unit,
 /obj/item/device/suit_cooling_unit,
 /obj/structure/table/reinforced,
+/obj/structure/sign/painting/library_secure{
+	pixel_y = -30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/eva)
+"Jl" = (
+/obj/structure/sign/painting/public{
+	pixel_y = -30
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/gameroom)
 "Jm" = (
 /obj/machinery/camera/network/civilian{
 	dir = 1
@@ -15332,6 +15415,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/item/weapon/hand_labeler,
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/briefing)
 "Le" = (
@@ -15474,6 +15558,9 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
+/obj/structure/sign/painting/library_secure{
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/halle)
 "Lv" = (
@@ -17502,6 +17589,15 @@
 	},
 /turf/simulated/floor/bmarble,
 /area/groundbase/engineering/engine)
+"QF" = (
+/obj/structure/bed/chair/backed_red{
+	dir = 4
+	},
+/obj/structure/sign/painting/public{
+	pixel_x = -30
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/civilian/gameroom)
 "QG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/black{
 	dir = 4
@@ -17517,6 +17613,8 @@
 /obj/structure/table/reinforced,
 /obj/item/device/sleevemate,
 /obj/item/device/denecrotizer/medical,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
 "QI" = (
@@ -18091,6 +18189,12 @@
 	outdoors = 0
 	},
 /area/groundbase/command/ai/foyer)
+"Sd" = (
+/obj/structure/sign/painting/library_secure{
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/lhallway)
 "Se" = (
 /obj/effect/floor_decal/industrial/danger{
 	dir = 8
@@ -18418,6 +18522,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/sign/painting/library_secure{
+	pixel_y = -30
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/cafe)
 "SP" = (
@@ -20383,6 +20490,9 @@
 /area/groundbase/command/tcomms/foyer)
 "XJ" = (
 /obj/structure/closet/secure_closet/engineering_personal,
+/obj/structure/sign/painting/library_secure{
+	pixel_x = 30
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/workshop)
 "XK" = (
@@ -25131,7 +25241,7 @@ AE
 Hq
 tu
 vV
-ut
+gX
 ut
 yA
 pj
@@ -25264,7 +25374,7 @@ Fi
 FF
 MO
 pj
-ht
+cT
 vV
 AA
 ut
@@ -26032,7 +26142,7 @@ eR
 eR
 AZ
 cv
-AN
+iI
 kh
 jx
 az
@@ -26613,7 +26723,7 @@ JA
 Ea
 TC
 iw
-Pl
+GS
 HW
 uZ
 tw
@@ -26968,7 +27078,7 @@ ce
 ce
 ce
 pj
-ht
+cT
 vV
 AA
 ut
@@ -29388,13 +29498,13 @@ MO
 MO
 MO
 hq
-Yl
+GW
 Me
 Hl
 AH
 Yl
 Yl
-cr
+QF
 hq
 lE
 lE
@@ -29820,7 +29930,7 @@ tb
 Fn
 kC
 Yl
-Yl
+Jl
 hq
 lE
 vw
@@ -29956,7 +30066,7 @@ Ym
 oS
 vL
 hq
-Yl
+rS
 uJ
 oI
 kr
@@ -33940,7 +34050,7 @@ Tn
 QC
 Dx
 QC
-qA
+iO
 DQ
 oi
 ze
@@ -34502,7 +34612,7 @@ Ni
 jz
 qC
 ox
-wA
+Sd
 DQ
 KY
 jw
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 223ce835be..a84a1b5dbc 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -670,6 +670,9 @@
 /obj/item/weapon/disk/nuclear{
 	name = "authentication disk"
 	},
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/command/captainq)
 "bQ" = (
@@ -4252,7 +4255,7 @@
 "mo" = (
 /obj/structure/table/woodentable,
 /obj/machinery/photocopier/faxmachine{
-	department = "Library Conference Room"
+	department = "Library"
 	},
 /turf/simulated/floor/wood,
 /area/groundbase/civilian/library)
@@ -4467,6 +4470,12 @@
 /obj/item/weapon/material/minihoe,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/xenobot)
+"mX" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/groundbase/command/captainq)
 "mY" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -10729,6 +10738,13 @@
 /obj/item/weapon/storage/box/monkeycubes/wolpincubes,
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
+"FC" = (
+/obj/machinery/chem_master,
+/obj/structure/sign/painting/library_secure{
+	pixel_y = -30
+	},
+/turf/simulated/floor/tiled/white,
+/area/groundbase/medical/Chemistry)
 "FD" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -12799,6 +12815,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
+/obj/structure/table/standard,
+/obj/machinery/photocopier/faxmachine{
+	department = "Research";
+	pixel_y = 6
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/science/rnd)
 "Lt" = (
@@ -14144,6 +14165,10 @@
 	sortType = "Trash"
 	},
 /obj/structure/table/standard,
+/obj/machinery/photocopier/faxmachine{
+	department = "Cargo";
+	pixel_y = 6
+	},
 /turf/simulated/floor/tiled,
 /area/groundbase/cargo/office)
 "Pc" = (
@@ -14825,7 +14850,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/command/hall)
 "QY" = (
-/obj/machinery/vending/fitness,
+/obj/random/vendorall,
 /obj/machinery/light/small{
 	dir = 1
 	},
@@ -31227,7 +31252,7 @@ tt
 bx
 Yu
 Ur
-nS
+FC
 sW
 TU
 RJ
@@ -32397,7 +32422,7 @@ Bo
 ia
 nz
 no
-XW
+mX
 ow
 ia
 kr
diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm
index fbd9550b5f..d2eb7dbd37 100644
--- a/maps/groundbase/gb-z3.dmm
+++ b/maps/groundbase/gb-z3.dmm
@@ -2015,13 +2015,6 @@
 "IS" = (
 /turf/simulated/open/virgo3c,
 /area/groundbase/level3/ne/open)
-"IV" = (
-/obj/effect/floor_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/vending/fitness,
-/turf/simulated/floor/tiled/virgo3c,
-/area/groundbase/medical/patio)
 "Jf" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/virgo3c,
@@ -14626,7 +14619,7 @@ IS
 IS
 IS
 Hx
-IV
+yZ
 OD
 Hn
 ky
diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm
index 3b8d2b607a..e5eac280c4 100644
--- a/maps/groundbase/groundbase_areas.dm
+++ b/maps/groundbase/groundbase_areas.dm
@@ -443,33 +443,42 @@
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	forbid_events = TRUE
+
 /area/groundbase/dorms/bathroom
 	name = "Dormitory Bathroom"
 	sound_env = SOUND_ENVIRONMENT_BATHROOM
 /area/groundbase/dorms/room1
 	name = "Dorm Room 1"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/dorms/room2
 	name = "Dorm Room 2"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/dorms/room3
 	name = "Dorm Room 3"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/dorms/room4
 	name = "Dorm Room 4"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/dorms/room5
 	name = "Dorm Room 5"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/dorms/room6
 	name = "Dorm Room 6"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/dorms/room7
 	name = "Dorm Room 7"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/dorms/room8
 	name = "Dorm Room 8"
 	lightswitch = 0
+	sound_env = SMALL_SOFTFLOOR
 
 /area/maintenance/groundbase/substation
 	name = "Substation"