From c83f30924e2f65e542e9573168531231d1a023fc Mon Sep 17 00:00:00 2001
From: Casey <a.roaming.shadow@gmail.com>
Date: Mon, 1 Nov 2021 18:02:12 -0400
Subject: [PATCH 1/2] Merge pull request #11746 from Very-Soft/holodeck!!!

Holodeck update and map tweaks
---
 code/game/area/Space Station 13 areas_vr.dm |    9 +-
 code/modules/holodeck/HolodeckControl.dm    |    3 +
 maps/stellardelight/ship_misc.dmm           | 2344 +++++++++++--------
 maps/stellardelight/stellar_delight1.dmm    |    6 +
 4 files changed, 1405 insertions(+), 957 deletions(-)

diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm
index caa81e91e6..dc89132971 100644
--- a/code/game/area/Space Station 13 areas_vr.dm	
+++ b/code/game/area/Space Station 13 areas_vr.dm	
@@ -180,4 +180,11 @@
 /area/holodeck/source_smoleworld
 	name = "\improper Holodeck - Smolworld"
 	
-	
+/area/holodeck/source_gym
+	name = "\improper Holodeck - Gym"
+
+/area/holodeck/source_game_room
+	name = "\improper Holodeck - Game Room"
+
+/area/holodeck/source_patient_ward
+	name = "\improper Holodeck - Patient Ward"
diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm
index 8a9e0c2dda..f48ae1a26a 100644
--- a/code/modules/holodeck/HolodeckControl.dm
+++ b/code/modules/holodeck/HolodeckControl.dm
@@ -64,6 +64,9 @@
 	"Courtroom" 		= new/datum/holodeck_program(/area/holodeck/source_courtroom, list('sound/music/traitor.ogg')),
 	"Chessboard"		= new/datum/holodeck_program(/area/holodeck/source_chess),
 	"Micro Building Area"		= new/datum/holodeck_program(/area/holodeck/source_smoleworld), //VOREStation add
+	"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
 	"Turn Off" 			= new/datum/holodeck_program(/area/holodeck/source_plating, list())
 	)
 
diff --git a/maps/stellardelight/ship_misc.dmm b/maps/stellardelight/ship_misc.dmm
index 0b26656607..b18648d9f1 100644
--- a/maps/stellardelight/ship_misc.dmm
+++ b/maps/stellardelight/ship_misc.dmm
@@ -1284,6 +1284,22 @@
 	},
 /turf/space/transit/west,
 /area/space)
+"fl" = (
+/obj/structure/table/holotable,
+/obj/item/clothing/gloves/boxing/hologlove{
+	icon_state = "boxinggreen";
+	item_state = "boxinggreen"
+	},
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
+"fm" = (
+/obj/item/weapon/bedsheet/medical,
+/obj/structure/bed/padded,
+/obj/structure/curtain/open/privacy,
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "fn" = (
 /obj/effect/floor_decal/carpet{
 	dir = 8
@@ -1403,6 +1419,11 @@
 	icon_state = "beach"
 	},
 /area/holodeck/source_beach)
+"fN" = (
+/obj/structure/table/woodentable/holotable,
+/obj/item/weapon/dice/d8,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "fO" = (
 /obj/effect/floor_decal/carpet{
 	dir = 8
@@ -1491,10 +1512,7 @@
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/holodeck/source_boxingcourt)
 "fZ" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/unsimulated/wall,
+/turf/simulated/floor/holofloor/reinforced,
 /area/space)
 "ga" = (
 /turf/unsimulated/beach/sand{
@@ -1626,6 +1644,19 @@
 "gO" = (
 /turf/unsimulated/beach/water,
 /area/beach)
+"hC" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"hX" = (
+/obj/structure/table/woodentable/holotable,
+/obj/effect/landmark/costume/pirate,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "iv" = (
 /obj/effect/shuttle_landmark/transit{
 	base_area = /area/space;
@@ -1648,10 +1679,19 @@
 	},
 /turf/space/transit/west,
 /area/space)
+"jS" = (
+/obj/structure/table/holotable,
+/obj/item/clothing/gloves/boxing/hologlove,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
 "kw" = (
 /obj/effect/floor_decal/sign/small_5,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"kN" = (
+/obj/structure/table/woodentable/holotable,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "lf" = (
 /obj/effect/landmark/ai_multicam_room,
 /turf/unsimulated/ai_visible,
@@ -1665,6 +1705,27 @@
 	},
 /turf/space/transit/east,
 /area/space)
+"ml" = (
+/obj/structure/table/holotable,
+/obj/item/device/flashlight/lamp/green,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"mY" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 5
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
 "nj" = (
 /obj/item/toy/chess/rook_white,
 /turf/simulated/floor/holofloor/wmarble,
@@ -1676,6 +1737,42 @@
 "nW" = (
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"oq" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 9
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
+"ov" = (
+/obj/structure/table/woodentable/holotable,
+/obj/item/weapon/dice/d12,
+/obj/item/weapon/dice/d10,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
+"oJ" = (
+/obj/effect/floor_decal/carpet{
+	dir = 8
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 1
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 9
+	},
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
+"oR" = (
+/obj/effect/floor_decal/carpet,
+/obj/effect/floor_decal/carpet{
+	dir = 4
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 6
+	},
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
 "oT" = (
 /obj/item/toy/chess/pawn_black,
 /turf/simulated/floor/holofloor/wmarble,
@@ -1687,6 +1784,16 @@
 "pT" = (
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"pU" = (
+/obj/effect/floor_decal/carpet{
+	dir = 8
+	},
+/obj/effect/floor_decal/carpet,
+/obj/effect/floor_decal/carpet{
+	dir = 10
+	},
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
 "qv" = (
 /obj/effect/floor_decal/sign/small_h,
 /turf/simulated/floor/holofloor/wood,
@@ -1699,13 +1806,54 @@
 /obj/item/toy/chess/pawn_black,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"rD" = (
+/obj/item/weapon/bedsheet/medical,
+/obj/structure/bed/padded,
+/obj/structure/curtain/open/privacy,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 6
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"rU" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 1
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
 "sb" = (
 /obj/item/toy/chess/knight_white,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
+"sj" = (
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "tD" = (
 /turf/unsimulated/wall,
 /area/ai_multicam_room)
+"tR" = (
+/obj/item/weapon/bedsheet/medical,
+/obj/structure/bed/padded,
+/obj/structure/curtain/open/privacy,
+/obj/effect/floor_decal/corner/paleblue/full{
+	dir = 8
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"uh" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 6
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
 "ul" = (
 /turf/unsimulated/wall,
 /area/beach)
@@ -1722,6 +1870,11 @@
 /obj/item/toy/chess/knight_black,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
+"vx" = (
+/obj/structure/table/woodentable/holotable,
+/obj/effect/landmark/costume/madscientist,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "vW" = (
 /obj/effect/floor_decal/sign/small_a,
 /turf/simulated/floor/holofloor/wood,
@@ -1730,21 +1883,108 @@
 /obj/effect/floor_decal/sign/small_3,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"wf" = (
+/obj/effect/floor_decal/spline/fancy/wood,
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
 "wh" = (
 /obj/item/toy/chess/knight_black,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"wR" = (
+/obj/machinery/fitness/punching_bag/clown,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
+"xp" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/unsimulated/wall,
+/area/space)
+"xt" = (
+/obj/machinery/fitness/heavy/lifter,
+/obj/effect/floor_decal/industrial/outline/red,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
+"xz" = (
+/obj/effect/floor_decal/carpet{
+	dir = 1
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 4
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 5
+	},
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
+"za" = (
+/obj/structure/table/woodentable/holotable,
+/obj/effect/landmark/costume/elpresidente,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
+"zA" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"zC" = (
+/obj/structure/bed/chair/holochair,
+/obj/effect/floor_decal/carpet{
+	dir = 1
+	},
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
 "Bm" = (
 /obj/item/toy/chess/bishop_black,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"BC" = (
+/obj/structure/bed/chair/holochair{
+	dir = 8
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "BG" = (
 /obj/item/toy/chess/king_black,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
+"BP" = (
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"BR" = (
+/obj/structure/table/woodentable/holotable,
+/obj/item/weapon/dice/d100,
+/obj/item/weapon/dice/d20,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
+"BU" = (
+/obj/structure/bed/chair/holochair{
+	dir = 4
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "BV" = (
-/turf/simulated/floor/holofloor/reinforced,
-/area/space)
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
+"CF" = (
+/obj/structure/table/woodentable/holotable,
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
 "CJ" = (
 /obj/item/toy/chess/pawn_white,
 /turf/simulated/floor/holofloor/bmarble,
@@ -1752,10 +1992,23 @@
 "CK" = (
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
+"Dh" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 8
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
 "Di" = (
 /obj/effect/floor_decal/sign/small_2,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"DB" = (
+/obj/structure/table/woodentable/holotable,
+/obj/effect/landmark/costume/cutewitch,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "DL" = (
 /obj/effect/floor_decal/sign/small_b,
 /turf/simulated/floor/holofloor/wood,
@@ -1767,10 +2020,39 @@
 /obj/effect/floor_decal/sign/small_g,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"Eq" = (
+/obj/item/weapon/bedsheet/medical,
+/obj/structure/bed/padded,
+/obj/structure/curtain/open/privacy,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"ED" = (
+/obj/structure/fitness/weightlifter,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
 "EX" = (
 /obj/item/toy/chess/bishop_black,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
+"FX" = (
+/obj/structure/table/woodentable/holotable,
+/obj/effect/landmark/costume/gladiator,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
+"Gg" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 6
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "Gs" = (
 /obj/effect/step_trigger/teleporter/random{
 	affect_ghosts = 1;
@@ -1785,6 +2067,11 @@
 /turf/space,
 /turf/space/transit/north,
 /area/space)
+"GE" = (
+/obj/structure/table/woodentable/holotable,
+/obj/effect/landmark/costume/fakewizard,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "GW" = (
 /obj/item/toy/chess/king_white,
 /turf/simulated/floor/holofloor/bmarble,
@@ -1809,6 +2096,14 @@
 /obj/item/toy/chess/rook_white,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"JQ" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 10
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
 "Kn" = (
 /obj/effect/floor_decal/sign/small_d,
 /turf/simulated/floor/holofloor/wood,
@@ -1817,6 +2112,25 @@
 /obj/effect/floor_decal/sign/small_f,
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_chess)
+"KR" = (
+/obj/effect/floor_decal/corner/paleblue/full{
+	dir = 4
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"Lt" = (
+/obj/item/weapon/bedsheet/medical,
+/obj/structure/bed/padded,
+/obj/structure/curtain/open/privacy,
+/obj/effect/floor_decal/corner/paleblue/full{
+	dir = 1
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "Me" = (
 /turf/simulated/floor/smole/desert,
 /area/holodeck/source_smoleworld)
@@ -1834,13 +2148,54 @@
 	},
 /turf/space/transit/west,
 /area/space)
+"MT" = (
+/obj/structure/fitness/punchingbag,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
+"Nj" = (
+/obj/structure/table/woodentable/holotable,
+/obj/item/weapon/dice,
+/obj/item/weapon/dice/d4,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
+"NT" = (
+/obj/structure/table/holotable,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "Or" = (
 /obj/item/toy/chess/knight_white,
 /turf/simulated/floor/holofloor/bmarble,
 /area/holodeck/source_chess)
+"OU" = (
+/obj/effect/floor_decal/spline/fancy/wood{
+	dir = 4
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
+"PL" = (
+/turf/space,
+/turf/simulated/floor/holofloor/reinforced,
+/area/space)
 "PM" = (
 /turf/simulated/floor/smole/megablocks,
 /area/holodeck/source_smoleworld)
+"Qh" = (
+/obj/structure/bed/chair/holochair{
+	dir = 1
+	},
+/obj/effect/floor_decal/carpet,
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
 "Qs" = (
 /obj/item/toy/chess/queen_black,
 /turf/simulated/floor/holofloor/bmarble,
@@ -1848,6 +2203,43 @@
 "RV" = (
 /turf/unsimulated/ai_visible,
 /area/ai_multicam_room)
+"Sj" = (
+/obj/structure/bed/chair/holochair{
+	dir = 8
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 4
+	},
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
+"SJ" = (
+/obj/item/weapon/bedsheet/medical,
+/obj/structure/bed/padded,
+/obj/structure/curtain/open/privacy,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"TH" = (
+/obj/structure/table/holotable,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
+"TM" = (
+/obj/structure/table/woodentable/holotable,
+/obj/effect/landmark/costume/chicken,
+/turf/simulated/floor/holofloor/wood,
+/area/holodeck/source_game_room)
 "Ug" = (
 /obj/effect/floor_decal/carpet{
 	dir = 5
@@ -1863,6 +2255,12 @@
 	},
 /turf/simulated/floor/holofloor/carpet,
 /area/holodeck/source_basketball)
+"Uq" = (
+/obj/effect/floor_decal/corner/paleblue/full,
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "UG" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1873,6 +2271,14 @@
 /obj/item/toy/chess/queen_white,
 /turf/simulated/floor/holofloor/wmarble,
 /area/holodeck/source_chess)
+"Wz" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "Xh" = (
 /obj/effect/floor_decal/carpet{
 	dir = 5
@@ -1888,12 +2294,29 @@
 	},
 /turf/simulated/floor/holofloor/carpet,
 /area/holodeck/source_meetinghall)
+"Xq" = (
+/obj/machinery/scale,
+/turf/simulated/floor/holofloor/tiled/dark,
+/area/holodeck/source_gym)
+"XD" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 5
+	},
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "white"
+	},
+/area/holodeck/source_patient_ward)
 "XG" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /turf/space/transit/west,
 /area/space)
+"Yn" = (
+/turf/simulated/floor/holofloor/tiled{
+	icon_state = "monotile"
+	},
+/area/holodeck/source_gym)
 "Yx" = (
 /obj/effect/step_trigger/thrower{
 	affect_ghosts = 1;
@@ -1904,6 +2327,15 @@
 	},
 /turf/space/transit/north,
 /area/space)
+"Yz" = (
+/obj/structure/bed/chair/holochair{
+	dir = 4
+	},
+/obj/effect/floor_decal/carpet{
+	dir = 8
+	},
+/turf/simulated/floor/holofloor/carpet,
+/area/holodeck/source_game_room)
 "YX" = (
 /obj/effect/floor_decal/sign/small_e,
 /turf/simulated/floor/holofloor/wood,
@@ -9205,17 +9637,17 @@ aI
 aI
 aI
 ar
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+aI
+aI
+aI
+aI
+aI
+aI
+aI
+aI
+aI
+aI
+ar
 ap
 ap
 ap
@@ -9346,18 +9778,18 @@ Me
 Me
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -9488,18 +9920,18 @@ Me
 Me
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -9630,18 +10062,18 @@ PM
 PM
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -9772,18 +10204,18 @@ PM
 PM
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -9914,18 +10346,18 @@ PM
 PM
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -10056,18 +10488,18 @@ PM
 PM
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -10198,18 +10630,18 @@ PM
 PM
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -10340,18 +10772,18 @@ PM
 PM
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -10482,18 +10914,18 @@ Me
 Me
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -10624,18 +11056,18 @@ Me
 Me
 Me
 Me
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -10767,17 +11199,17 @@ aL
 aL
 aL
 ar
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
 ap
 ap
 ap
@@ -10908,18 +11340,18 @@ dF
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -11050,18 +11482,18 @@ dF
 dF
 ec
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -11192,18 +11624,18 @@ dF
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -11334,18 +11766,18 @@ ec
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -11476,18 +11908,18 @@ dF
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -11618,18 +12050,18 @@ dF
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -11760,18 +12192,18 @@ dF
 dF
 ec
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -11902,18 +12334,18 @@ dF
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -12044,18 +12476,18 @@ ec
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -12186,18 +12618,18 @@ dF
 dF
 dF
 dF
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -12329,17 +12761,17 @@ aL
 aL
 aL
 ar
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
 ap
 ap
 ap
@@ -12470,18 +12902,18 @@ dG
 fG
 dG
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -12612,18 +13044,18 @@ dG
 dG
 eT
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -12754,18 +13186,18 @@ dG
 dG
 dG
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -12896,18 +13328,18 @@ dG
 dG
 eJ
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -13038,18 +13470,18 @@ ed
 dG
 dG
 fG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -13180,18 +13612,18 @@ dG
 fG
 dG
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -13322,18 +13754,18 @@ eJ
 dG
 eT
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -13464,18 +13896,18 @@ dG
 dG
 dG
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -13606,18 +14038,18 @@ dG
 dG
 eJ
 dG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -13748,18 +14180,18 @@ ed
 dG
 dG
 fG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -13891,17 +14323,17 @@ aL
 aL
 aL
 ar
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
 ap
 ap
 ap
@@ -14032,18 +14464,18 @@ eL
 eL
 eL
 eL
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -14174,18 +14606,18 @@ eK
 eK
 eK
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -14316,18 +14748,18 @@ fn
 fn
 fO
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -14458,18 +14890,18 @@ fo
 fo
 fP
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -14600,18 +15032,18 @@ fo
 fo
 fP
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -14742,18 +15174,18 @@ fo
 fo
 fP
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -14884,18 +15316,18 @@ fo
 fo
 fP
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -15026,18 +15458,18 @@ fo
 fo
 fP
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -15168,18 +15600,18 @@ fp
 fH
 fQ
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -15310,18 +15742,18 @@ eK
 Xh
 Xh
 eK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -15453,17 +15885,17 @@ aL
 aL
 aL
 ar
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
 ap
 ap
 ap
@@ -15594,18 +16026,18 @@ fz
 fz
 fz
 fS
+dB
 fZ
-ap
-ap
-ap
-ap
-dD
-ap
-ap
-ap
-dD
-ap
-ap
+fZ
+fZ
+fZ
+PL
+fZ
+fZ
+fZ
+PL
+fZ
+xp
 ap
 ap
 ap
@@ -15736,18 +16168,18 @@ ei
 ei
 ei
 fJ
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -15878,18 +16310,18 @@ ei
 fJ
 fz
 fS
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -16020,18 +16452,18 @@ ei
 fJ
 ei
 fT
+dB
 fZ
-ap
-ap
-ap
-ap
-dD
-ap
-ap
-ap
-dD
-ap
-ap
+fZ
+fZ
+fZ
+PL
+fZ
+fZ
+fZ
+PL
+fZ
+xp
 ap
 ap
 ap
@@ -16162,18 +16594,18 @@ ei
 fJ
 fA
 fU
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -16304,18 +16736,18 @@ ei
 ei
 ei
 fJ
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -16446,18 +16878,18 @@ fA
 fA
 fA
 fU
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -16588,18 +17020,18 @@ aG
 bh
 aG
 aG
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -16730,18 +17162,18 @@ dK
 dJ
 dK
 dK
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -16872,18 +17304,18 @@ dJ
 dJ
 dJ
 dJ
+dB
 fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+fZ
+xp
 ap
 ap
 ap
@@ -17015,17 +17447,17 @@ aL
 aL
 aL
 ar
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
 ap
 ap
 ap
@@ -17156,18 +17588,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+tR
+hC
+SJ
+hC
+SJ
+hC
+hC
+hC
+hC
+Uq
+xp
 ap
 ap
 ap
@@ -17298,18 +17730,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+XD
+BP
+BP
+BP
+BP
+BP
+BP
+BP
+BP
+Wz
+xp
 ap
 ap
 ap
@@ -17440,18 +17872,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+Eq
+BP
+fm
+BP
+fm
+BP
+BP
+NT
+BP
+Wz
+xp
 ap
 ap
 ap
@@ -17582,18 +18014,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+XD
+BP
+BP
+BP
+BP
+BP
+BP
+NT
+BU
+Wz
+xp
 ap
 ap
 ap
@@ -17724,18 +18156,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+zA
+BP
+BP
+BP
+TH
+BP
+BP
+ml
+NT
+TH
+xp
 ap
 dD
 ap
@@ -17866,18 +18298,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+NT
+BP
+BP
+BP
+TH
+BP
+BP
+BP
+BC
+Wz
+xp
 ap
 dD
 ap
@@ -18008,18 +18440,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+XD
+BP
+BP
+BP
+BP
+BP
+BP
+BP
+BP
+Wz
+xp
 ap
 dD
 ap
@@ -18150,18 +18582,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+Eq
+BP
+fm
+BP
+fm
+BP
+BP
+BP
+BP
+Wz
+xp
 ap
 dD
 ap
@@ -18292,18 +18724,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+XD
+BP
+BP
+BP
+BP
+BP
+BP
+BP
+BP
+Wz
+xp
 ap
 dD
 ap
@@ -18434,18 +18866,18 @@ dQ
 fK
 fR
 fR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+Lt
+Gg
+rD
+Gg
+rD
+Gg
+Gg
+Gg
+Gg
+KR
+xp
 ap
 ap
 ap
@@ -18577,17 +19009,17 @@ aL
 aL
 aL
 ar
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
 ap
 ap
 ap
@@ -18718,18 +19150,18 @@ fB
 fB
 fB
 fV
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+fN
+Nj
+kN
+sj
+kN
+kN
+sj
+GE
+za
+DB
+xp
 ap
 ap
 ap
@@ -18860,18 +19292,18 @@ em
 em
 em
 fW
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+ov
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+TM
+xp
 ap
 ap
 ap
@@ -19002,18 +19434,18 @@ em
 em
 em
 fW
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+BR
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+vx
+xp
 ap
 ap
 ap
@@ -19144,18 +19576,18 @@ em
 em
 em
 fW
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+sj
+sj
+oJ
+Yz
+Yz
+Yz
+Yz
+pU
+sj
+FX
+xp
 ap
 ap
 ap
@@ -19286,18 +19718,18 @@ em
 em
 em
 fW
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+sj
+sj
+zC
+CF
+CF
+CF
+CF
+Qh
+sj
+hX
+xp
 ap
 ap
 ap
@@ -19428,18 +19860,18 @@ em
 em
 em
 fW
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+sj
+sj
+zC
+CF
+CF
+CF
+CF
+Qh
+sj
+sj
+xp
 ap
 ap
 ap
@@ -19570,18 +20002,18 @@ fC
 fC
 fC
 fX
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+sj
+sj
+xz
+Sj
+Sj
+Sj
+Sj
+oR
+sj
+sj
+xp
 ap
 ap
 ap
@@ -19712,18 +20144,18 @@ aH
 br
 aH
 aH
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+xp
 ap
 ap
 ap
@@ -19854,18 +20286,18 @@ dS
 dR
 dS
 dS
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+xp
 ap
 ap
 ap
@@ -19996,18 +20428,18 @@ dR
 dR
 dR
 dR
-fZ
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+dB
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+sj
+xp
 ap
 ap
 ap
@@ -20139,19 +20571,19 @@ aL
 aL
 aL
 ar
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
+ap
 ap
-ar
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-aI
-ar
 ap
 ap
 ap
@@ -20280,8 +20712,6 @@ dY
 dY
 dY
 dY
-fZ
-ap
 dB
 BV
 BV
@@ -20293,7 +20723,9 @@ BV
 BV
 BV
 BV
-fZ
+xp
+ap
+ap
 ap
 ap
 ap
@@ -20422,20 +20854,20 @@ ci
 dY
 dY
 dY
-fZ
-ap
 dB
 BV
+xt
 BV
+ED
 BV
+oq
+Dh
+Dh
+JQ
 BV
-BV
-BV
-BV
-BV
-BV
-BV
-fZ
+xp
+ap
+ap
 ap
 ap
 ap
@@ -20564,20 +20996,20 @@ dY
 dY
 dY
 dY
-fZ
-ap
 dB
 BV
 BV
 BV
 BV
 BV
+rU
+Yn
+Yn
+wf
 BV
-BV
-BV
-BV
-BV
-fZ
+xp
+ap
+ap
 ap
 ap
 ap
@@ -20706,20 +21138,20 @@ bD
 dY
 cM
 dY
-fZ
-ap
 dB
 BV
+xt
 BV
+ED
 BV
+rU
+Yn
+Yn
+wf
 BV
-BV
-BV
-BV
-BV
-BV
-BV
-fZ
+xp
+ap
+ap
 ap
 ap
 ap
@@ -20848,20 +21280,20 @@ bE
 dY
 cM
 dY
-fZ
-ap
 dB
 BV
 BV
 BV
 BV
 BV
+mY
+OU
+OU
+uh
 BV
-BV
-BV
-BV
-BV
-fZ
+xp
+ap
+ap
 ap
 ap
 ap
@@ -20990,8 +21422,6 @@ bE
 dY
 cM
 dY
-fZ
-ap
 dB
 BV
 BV
@@ -21003,7 +21433,9 @@ BV
 BV
 BV
 BV
-fZ
+xp
+ap
+ap
 ap
 ap
 ap
@@ -21132,20 +21564,20 @@ bF
 dY
 dY
 dY
-fZ
-ap
 dB
 BV
+MT
+BV
+wR
 BV
 BV
 BV
 BV
 BV
 BV
-BV
-BV
-BV
-fZ
+xp
+ap
+ap
 ap
 ap
 ap
@@ -21274,8 +21706,6 @@ dY
 dY
 dY
 dY
-fZ
-ap
 dB
 BV
 BV
@@ -21286,8 +21716,10 @@ BV
 BV
 BV
 BV
-BV
-fZ
+Xq
+xp
+ap
+ap
 ap
 ap
 ap
@@ -21416,20 +21848,20 @@ cL
 dY
 dY
 fY
-fZ
-ap
 dB
 BV
+wR
+BV
+MT
 BV
 BV
 BV
 BV
 BV
-BV
-BV
-BV
-BV
-fZ
+jS
+xp
+ap
+ap
 ap
 ap
 ap
@@ -21558,8 +21990,6 @@ dY
 dY
 dY
 fY
-fZ
-ap
 dB
 BV
 BV
@@ -21570,8 +22000,10 @@ BV
 BV
 BV
 BV
-BV
-fZ
+fl
+xp
+ap
+ap
 ap
 ap
 ap
@@ -21701,19 +22133,19 @@ bb
 bb
 bb
 ar
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+aL
+ar
+ap
 ap
-ar
-aL
-aL
-aL
-aL
-aL
-aL
-aL
-aL
-aL
-aL
-ar
 ap
 ap
 ap
diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm
index 546526991a..9e771fc3c9 100644
--- a/maps/stellardelight/stellar_delight1.dmm
+++ b/maps/stellardelight/stellar_delight1.dmm
@@ -183,6 +183,9 @@
 /obj/machinery/shower{
 	dir = 1
 	},
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "ay" = (
@@ -13762,6 +13765,9 @@
 /obj/effect/floor_decal/steeldecal/steel_decals10{
 	dir = 5
 	},
+/obj/machinery/light/small{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/stellardelight/deck1/shower)
 "Dz" = (