Merge pull request #12695 from Very-Soft/gbtweaks

Some final tweaks

code/modules/holodeck/HolodeckControl.dm

@@ -67,13 +67,13 @@
 	"Gym"				= new/datum/holodeck_program(/area/holodeck/source_gym), //VOREStation add
 	"Game Room"			= new/datum/holodeck_program(/area/holodeck/source_game_room), //VOREStation add
 	"Patient Ward"		= new/datum/holodeck_program(/area/holodeck/source_patient_ward), //VOREStation add
+	"Inside"			= new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add
 	"Turn Off" 			= new/datum/holodeck_program(/area/holodeck/source_plating, list())
 	)
 
 	var/list/restricted_programs = list(
 	"Burnoff Test Simulation"	= new/datum/holodeck_program(/area/holodeck/source_burntest, list()),
-	"Wildlife Simulation" 		= new/datum/holodeck_program(/area/holodeck/source_wildlife, list()),
-	"Inside"					= new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add
+	"Wildlife Simulation" 		= new/datum/holodeck_program(/area/holodeck/source_wildlife, list())
 	)
 
 /obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob)

maps/groundbase/gb-z1.dmm

@@ -241,7 +241,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/level1/se)
+/area/groundbase/level1/centsquare)
 "aE" = (
 /obj/machinery/shieldgen,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -1991,12 +1991,6 @@
 	},
 /turf/simulated/floor/tiled/steel_ridged,
 /area/groundbase/command/ai/hall)
-"fa" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/civilian/mensrestroom)
 "fb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
@@ -2545,9 +2539,6 @@
 /obj/structure/railing/grey,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
 /area/groundbase/level1/northspur)
-"gu" = (
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/level1/se)
 "gv" = (
 /turf/simulated/wall/r_wall,
 /area/groundbase/security/hos)
@@ -2827,7 +2818,8 @@
 	id = "PubPrep";
 	name = "Public Access Shutter";
 	pixel_x = -26;
-	req_access = list(62)
+	req_access = null;
+	req_one_access = list(18)
 	},
 /turf/simulated/floor/outdoors/grass/virgo3c,
 /area/groundbase/level1/centsquare)
@@ -5514,7 +5506,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
-/area/groundbase/level1/se)
+/area/groundbase/level1/centsquare)
 "nO" = (
 /obj/machinery/suit_cycler,
 /turf/simulated/floor/tiled,
@@ -6918,13 +6910,13 @@
 	dir = 4
 	},
 /obj/machinery/door/airlock/glass{
-	name = "Gateway"
+	name = "EVA Access"
 	},
 /obj/machinery/door/blast/shutters{
 	dir = 4;
 	id = "PubPrep";
 	layer = 3.3;
-	name = "Gateway Access Shutters"
+	name = "EVA Access Shutters"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -7270,9 +7262,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/medical/equipment)
-"si" = (
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/civilian/womensrestroom)
 "sj" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
@@ -8543,18 +8532,6 @@
 "vq" = (
 /turf/simulated/floor/tiled,
 /area/groundbase/engineering/ce)
-"vr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
-/area/groundbase/civilian/mensrestroom)
 "vs" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -8746,6 +8723,10 @@
 /obj/machinery/alarm{
 	pixel_y = 28
 	},
+/obj/machinery/light_switch{
+	pixel_x = 15;
+	pixel_y = 30
+	},
 /turf/simulated/floor/tiled/asteroid_steel,
 /area/groundbase/civilian/mensrestroom)
 "vJ" = (
@@ -10115,7 +10096,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
-/area/groundbase/civilian/womensrestroom)
+/area/groundbase/level1/centsquare)
 "yV" = (
 /obj/machinery/station_map{
 	pixel_y = 32
@@ -11179,7 +11160,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/outdoors/sidewalk/virgo3c,
-/area/groundbase/level1/se)
+/area/groundbase/level1/centsquare)
 "Bw" = (
 /obj/item/weapon/stool/padded{
 	dir = 4
@@ -14144,7 +14125,7 @@
 "IS" = (
 /obj/structure/stairs/spawner/east,
 /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
-/area/groundbase/level1/se)
+/area/groundbase/level1/centsquare)
 "IU" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -14890,18 +14871,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/gateway)
-"KH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/simulated/floor/outdoors/sidewalk/side/virgo3c,
-/area/groundbase/level1/se)
 "KI" = (
 /obj/random/vendorall,
 /turf/simulated/floor/tiled,
@@ -17721,13 +17690,13 @@
 "RU" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass{
-	name = "Gateway"
+	name = "EVA Access"
 	},
 /obj/machinery/door/blast/shutters{
 	dir = 4;
 	id = "PubPrep";
 	layer = 3.3;
-	name = "Gateway Access Shutters"
+	name = "EVA Access Shutters"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -18672,6 +18641,10 @@
 	},
 /obj/effect/floor_decal/corner/pink/full,
 /obj/structure/flora/pottedplant/orientaltree,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -30
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/civilian/womensrestroom)
 "Ui" = (
@@ -19492,12 +19465,6 @@
 	outdoors = 0
 	},
 /area/groundbase/level1/nw)
-"Wy" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/turf/simulated/floor/outdoors/grass/virgo3c,
-/area/groundbase/civilian/womensrestroom)
 "Wz" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 8
@@ -32722,17 +32689,17 @@ pc
 pc
 pc
 eR
-gu
-KH
-gu
-gu
+Eb
+TK
+Eb
+Eb
 aD
 GQ
 Mj
 Eb
-si
+Eb
 yU
-Wy
+Yt
 Eb
 Lt
 Lt
@@ -32864,8 +32831,8 @@ eR
 eR
 eR
 eR
-fa
-vr
+Yt
+TK
 Lt
 Lt
 ua

maps/groundbase/gb-z2.dmm

@@ -3262,10 +3262,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/door/window/southleft{
+/obj/machinery/door/window/southright{
 	dir = 1;
-	name = "shower door";
-	req_access = null
+	name = "shower door"
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/room2)
@@ -4866,6 +4865,7 @@
 /area/groundbase/cargo/office)
 "op" = (
 /obj/machinery/light,
+/obj/machinery/suspension_gen,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/hall)
 "oq" = (
@@ -5364,6 +5364,10 @@
 /obj/machinery/transhuman/synthprinter,
 /turf/simulated/floor/tiled,
 /area/groundbase/science/robotics)
+"pT" = (
+/obj/machinery/suspension_gen,
+/turf/simulated/floor/tiled,
+/area/groundbase/science/hall)
 "pU" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock{
@@ -6087,10 +6091,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/door/window/southleft{
+/obj/machinery/door/window/southright{
 	dir = 1;
-	name = "shower door";
-	req_access = null
+	name = "shower door"
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/room6)
@@ -7207,9 +7210,19 @@
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/dorms)
 "vw" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
 /obj/machinery/alarm{
 	dir = 8
 	},
+/obj/machinery/door/window/southright{
+	dir = 1;
+	name = "shower door"
+	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/room8)
 "vy" = (
@@ -11278,6 +11291,12 @@
 "Ho" = (
 /obj/structure/table/woodentable,
 /obj/random/donkpocketbox,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc{
+	dir = 8
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room3)
 "Hp" = (
@@ -11633,6 +11652,9 @@
 /obj/machinery/power/apc{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/wood,
 /area/groundbase/dorms/room5)
 "Ip" = (
@@ -11897,10 +11919,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/door/window/southleft{
+/obj/machinery/door/window/southright{
 	dir = 1;
-	name = "shower door";
-	req_access = null
+	name = "shower door"
 	},
 /turf/simulated/floor/tiled/white,
 /area/groundbase/dorms/room4)
@@ -13963,7 +13984,7 @@
 /turf/simulated/floor/virgo3c{
 	edge_blending_priority = -1
 	},
-/area/groundbase/level2/nw)
+/area/groundbase/level2/northspur)
 "OJ" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -23292,7 +23313,7 @@ Ov
 PR
 lw
 Vr
-Vr
+pT
 XX
 XX
 aa

maps/groundbase/gb-z3.dmm

@@ -4517,8 +4517,8 @@ Zo
 Zo
 Zo
 Zo
-Kr
-Kr
+QD
+QD
 Zo
 Zo
 Zo
@@ -8436,7 +8436,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -8578,7 +8578,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -8720,7 +8720,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -8862,7 +8862,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -9004,7 +9004,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -9146,7 +9146,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf
@@ -9288,7 +9288,7 @@ kU
 kU
 kU
 kU
-pf
+kU
 pf
 pf
 pf

maps/groundbase/groundbase_areas.dm

@@ -373,9 +373,11 @@
 /area/groundbase/civilian/mensrestroom
 	name = "Men's Restroom"
 	sound_env = SOUND_ENVIRONMENT_BATHROOM
+	lightswitch = 1
 /area/groundbase/civilian/womensrestroom
 	name = "Women's Restroom"
 	sound_env = SOUND_ENVIRONMENT_BATHROOM
+	lightswitch = 1
 
 /area/groundbase/exploration
 	name = "Exploration"

maps/groundbase/pois/outdoors4.dmm

@@ -31,7 +31,7 @@
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "l" = (
-/obj/structure/bed/chair/sofa/right{
+/obj/structure/bed/chair/sofa/right/black{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -54,7 +54,7 @@
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "K" = (
-/obj/structure/bed/chair/sofa/left,
+/obj/structure/bed/chair/sofa/left/black,
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "O" = (
@@ -75,7 +75,7 @@
 /turf/simulated/wall/wood,
 /area/groundbase/poi/outdoor/cabin1)
 "Z" = (
-/obj/structure/bed/chair/sofa/corner{
+/obj/structure/bed/chair/sofa/corner/black{
 	dir = 1
 	},
 /turf/simulated/floor/wood,

maps/groundbase/pois/outdoors5.dmm

@@ -50,11 +50,11 @@
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin2)
 "L" = (
-/obj/structure/bed/chair/sofa/right,
+/obj/structure/bed/chair/sofa/right/black,
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin2)
 "O" = (
-/obj/structure/bed/chair/sofa/left,
+/obj/structure/bed/chair/sofa/left/black,
 /turf/simulated/floor/wood,
 /area/groundbase/poi/outdoor/cabin2)
 "T" = (

maps/stellardelight/ship_centcom.dmm

@@ -5148,13 +5148,13 @@
 /turf/unsimulated/floor/techfloor_grid,
 /area/centcom/evac)
 "uC" = (
-/obj/machinery/computer/shuttle_control/emergency{
-	dir = 8
-	},
 /obj/machinery/light/floortube{
 	dir = 4;
 	pixel_x = 6
 	},
+/obj/machinery/computer{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/centcom/terminal)
 "uD" = (
@@ -5209,8 +5209,8 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "uT" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
+/obj/machinery/ion_engine{
+	dir = 4
 	},
 /turf/simulated/shuttle/plating,
 /area/centcom/terminal)
@@ -6662,6 +6662,16 @@
 	},
 /turf/simulated/floor/tiled/steel_grid,
 /area/centcom/terminal)
+"CP" = (
+/obj/machinery/door/airlock/angled_bay/external/glass{
+	dir = 4;
+	door_color = "#822a1e";
+	frequency = null;
+	id_tag = null;
+	locked = 1
+	},
+/turf/simulated/shuttle/floor/yellow,
+/area/centcom/terminal)
 "CR" = (
 /obj/machinery/porta_turret/crescent{
 	density = 1
@@ -20347,7 +20357,7 @@ dm
 dm
 wb
 wb
-dm
+CP
 wb
 wb
 dm

maps/stellardelight/ship_misc.dmm

@@ -2971,9 +2971,9 @@
 	},
 /area/holodeck/source_gym)
 "PL" = (
-/turf/simulated/floor/holofloor/reinforced,
-/turf/simulated/floor/flesh,
-/area/holodeck/the_uwu_zone)
+/turf/space,
+/turf/space,
+/area/space)
 "PM" = (
 /turf/simulated/floor/smole/megablocks,
 /area/holodeck/source_smoleworld)
@@ -10567,16 +10567,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -10709,16 +10709,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -10851,16 +10851,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -10993,16 +10993,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11135,16 +11135,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11277,16 +11277,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11419,16 +11419,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11561,16 +11561,16 @@ PM
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11703,16 +11703,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -11845,16 +11845,16 @@ Me
 Me
 Me
 dB
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
-fZ
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
+Ly
 xp
 ap
 ap
@@ -16815,16 +16815,16 @@ fz
 fz
 fS
 dB
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
 PL
-Ly
-Ly
-Ly
+ap
+ap
+ap
 PL
-Ly
+ap
 xp
 ap
 ap
@@ -16957,16 +16957,16 @@ ei
 ei
 fJ
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17099,16 +17099,16 @@ fJ
 fz
 fS
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17241,16 +17241,16 @@ fJ
 ei
 fT
 dB
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
 PL
-Ly
-Ly
-Ly
+ap
+ap
+ap
 PL
-Ly
+ap
 xp
 ap
 ap
@@ -17383,16 +17383,16 @@ fJ
 fA
 fU
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17525,16 +17525,16 @@ ei
 ei
 fJ
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17667,16 +17667,16 @@ fA
 fA
 fU
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17809,16 +17809,16 @@ bh
 aG
 aG
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -17951,16 +17951,16 @@ dJ
 dK
 dK
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap
@@ -18093,16 +18093,16 @@ dJ
 dJ
 dJ
 dB
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
-Ly
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
 xp
 ap
 ap

maps/tether/submaps/tether_centcom.dmm

@@ -4652,8 +4652,8 @@
 /turf/simulated/floor/tiled,
 /area/centcom/main_hall)
 "qV" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
+/obj/machinery/ion_engine{
+	dir = 4
 	},
 /turf/simulated/shuttle/plating,
 /area/centcom/terminal)
@@ -5769,7 +5769,7 @@
 /turf/simulated/floor/tiled/white,
 /area/centcom/bathroom)
 "xj" = (
-/obj/machinery/computer/shuttle_control/emergency{
+/obj/machinery/computer{
 	dir = 8
 	},
 /obj/machinery/light/floortube{
@@ -5955,6 +5955,16 @@
 /area/centcom/security{
 	name = "\improper CentCom Security Arrivals"
 	})
+"ya" = (
+/obj/machinery/door/airlock/angled_bay/external/glass{
+	dir = 4;
+	door_color = "#822a1e";
+	frequency = null;
+	id_tag = null;
+	locked = 1
+	},
+/turf/simulated/shuttle/floor/yellow,
+/area/centcom/terminal)
 "yb" = (
 /obj/machinery/conveyor{
 	dir = 4;
@@ -20369,7 +20379,7 @@ XL
 XL
 Cg
 Cg
-XL
+ya
 Cg
 Cg
 XL

maps/tether/submaps/tether_misc.dmm

@@ -2619,9 +2619,6 @@
 "Az" = (
 /turf/unsimulated/beach/coastline,
 /area/beach)
-"Ba" = (
-/turf/simulated/floor/holofloor/reinforced,
-/area/holodeck/the_uwu_zone)
 "Bi" = (
 /obj/structure/table/woodentable/holotable,
 /obj/effect/landmark/costume/madscientist,
@@ -14254,11 +14251,11 @@ bN
 bN
 bN
 bN
-Ba
 bN
 bN
 bN
-Ba
+bN
+bN
 bN
 fZ
 ap
@@ -14680,11 +14677,11 @@ bN
 bN
 bN
 bN
-Ba
 bN
 bN
 bN
-Ba
+bN
+bN
 bN
 fZ
 ap