Fixes Holodeck Being Unshielded from Radiation (#13924)

code/modules/holodeck/HolodeckControl.dm

@@ -379,4 +379,4 @@
 
 /obj/machinery/computer/HolodeckControl/Horizon
 	density = 0
-	linkedholodeck_area = /area/holodeck/alphadeck
+	linkedholodeck_area = /area/horizon/holodeck/alphadeck

code/unit_tests/map_tests.dm

@@ -293,7 +293,8 @@
 /datum/unit_test/map_test/all_station_areas_shall_be_on_station_zlevels
 	name = "MAP: Station areas shall be on station z-levels"
 	var/list/exclude = list(
-		/area/holodeck // These are necessarily mapped on a non-station z-level so they can be copied over to the holodeck on the station z-levels
+		/area/holodeck, // These are necessarily mapped on a non-station z-level so they can be copied over to the holodeck on the station z-levels
+		/area/horizon/holodeck
 		)
 
 /datum/unit_test/map_test/all_station_areas_shall_be_on_station_zlevels/start_test()

html/changelogs/holodeck_bugfix.yml

@@ -0,0 +1,7 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes the holodeck not being radiation shielded."
+  - backend: "Makes the Horizon's holodeck and its templates' areas relative to the Horizon map."

maps/sccv_horizon/code/sccv_horizon_areas.dm

@@ -351,6 +351,7 @@
 	icon_state = "stairwell"
 	sound_env = SMALL_ENCLOSED
 
+/********** Crew Quarters Start **********/
 // Crew Quarters
 /area/horizon/crew_quarters
 	name = "Horizon - Crew Quarters (PARENT AREA - DON'T USE)"
@@ -409,7 +410,104 @@
 	name = "Horizon - Fitness Center - Lounge"
 	icon_state = "fitness_lounge"
 	sound_env = SMALL_SOFTFLOOR
+/********** Crew Quarters End **********/
 
+/********** Holodeck Start **********/
+// Holodeck
+/area/horizon/holodeck
+	name = "Horizon - Holodeck (PARENT AREA - DON'T USE)"
+	icon_state = "Holodeck"
+	sound_env = LARGE_ENCLOSED
+	no_light_control = TRUE
+	dynamic_lighting = FALSE
+	flags = RAD_SHIELDED | NO_GHOST_TELEPORT_ACCESS
+
+/area/horizon/holodeck/alphadeck
+	name = "Horizon - Holodeck Alpha"
+	dynamic_lighting = TRUE
+
+/area/horizon/holodeck/source_plating
+	name = "Horizon - Holodeck - Off"
+
+/area/horizon/holodeck/source_chapel
+	name = "Horizon - Holodeck - Chapel"
+
+/area/horizon/holodeck/source_gym
+	name = "Horizon - Holodeck - Gym"
+	sound_env = ARENA
+
+/area/horizon/holodeck/source_range
+	name = "Horizon - Holodeck - Range"
+	sound_env = ARENA
+
+/area/horizon/holodeck/source_emptycourt
+	name = "Horizon - Holodeck - Empty Court"
+	sound_env = ARENA
+
+/area/horizon/holodeck/source_boxingcourt
+	name = "Horizon - Holodeck - Boxing Court"
+	sound_env = ARENA
+
+/area/horizon/holodeck/source_basketball
+	name = "Horizon - Holodeck - Basketball Court"
+	sound_env = ARENA
+
+/area/horizon/holodeck/source_thunderdomecourt
+	name = "Horizon - Holodeck - Thunderdome Court"
+	sound_env = ARENA
+
+/area/horizon/holodeck/source_courtroom
+	name = "Horizon - Holodeck - Courtroom"
+	sound_env = AUDITORIUM
+
+/area/horizon/holodeck/source_beach
+	name = "Horizon - Holodeck - Beach"
+	sound_env = PLAIN
+
+/area/horizon/holodeck/source_burntest
+	name = "Horizon - Holodeck - Atmospheric Burn Test"
+
+/area/horizon/holodeck/source_wildlife
+	name = "Horizon - Holodeck - Wildlife Simulation"
+
+/area/horizon/holodeck/source_meetinghall
+	name = "Horizon - Holodeck - Meeting Hall"
+	sound_env = AUDITORIUM
+
+/area/horizon/holodeck/source_theatre
+	name = "Horizon - Holodeck - Theatre"
+	sound_env = CONCERT_HALL
+
+/area/horizon/holodeck/source_picnicarea
+	name = "Horizon - Holodeck - Picnic Area"
+	sound_env = PLAIN
+
+/area/horizon/holodeck/source_dininghall
+	name = "Horizon - Holodeck - Dining Hall"
+	sound_env = PLAIN
+
+/area/horizon/holodeck/source_snowfield
+	name = "Horizon - Holodeck - Snow Field"
+	sound_env = FOREST
+
+/area/horizon/holodeck/source_desert
+	name = "Horizon - Holodeck - Desert"
+	sound_env = PLAIN
+
+/area/horizon/holodeck/source_space
+	name = "Horizon - Holodeck - Space"
+	has_gravity = 0
+	sound_env = SPACE
+
+/area/horizon/holodeck/source_battlemonsters
+	name = "Horizon - Holodeck - Battlemonsters Arena"
+	sound_env = ARENA
+
+/area/horizon/holodeck/source_chessboard
+	name = "Horizon - Holodeck - Chessboard"
+/********** Holodeck End **********/
+
+/********** Decks Start **********/
 // Cafeteria
 /area/horizon/deck_three/cafeteria
 	name = "Horizon - Deck 3 - Cafeteria"
@@ -419,4 +517,5 @@
 /area/horizon/deck_three/nature_showcase
 	name = "Horizon - Deck 3 - Nature Showcase"
 	icon_state = "nature_showcase"
-	sound_env = SMALL_ENCLOSED
+	sound_env = SMALL_ENCLOSED
+/********** Decks End **********/

maps/sccv_horizon/code/sccv_horizon_holodeck.dm

@@ -1,19 +1,19 @@
 /datum/map/sccv_horizon
 	holodeck_programs = list(
-		"emptycourt" = new /datum/holodeck_program(/area/holodeck/source_emptycourt,
+		"emptycourt" = new /datum/holodeck_program(/area/horizon/holodeck/source_emptycourt,
 			list('sound/music/THUNDERDOME.ogg')
 		),
-		"boxingcourt" = new /datum/holodeck_program(/area/holodeck/source_boxingcourt,
+		"boxingcourt" = new /datum/holodeck_program(/area/horizon/holodeck/source_boxingcourt,
 			list('sound/music/THUNDERDOME.ogg')
 		),
-		"basketball" = new /datum/holodeck_program(/area/holodeck/source_basketball,
+		"basketball" = new /datum/holodeck_program(/area/horizon/holodeck/source_basketball,
 			list('sound/music/THUNDERDOME.ogg')
 		),
-		"thunderdomecourt" = new /datum/holodeck_program(/area/holodeck/source_thunderdomecourt,
+		"thunderdomecourt" = new /datum/holodeck_program(/area/horizon/holodeck/source_thunderdomecourt,
 			list('sound/music/THUNDERDOME.ogg')
 		),
-		"beach" = new /datum/holodeck_program(/area/holodeck/source_beach),
-		"desert" = new /datum/holodeck_program(/area/holodeck/source_desert,
+		"beach" = new /datum/holodeck_program(/area/horizon/holodeck/source_beach),
+		"desert" = new /datum/holodeck_program(/area/horizon/holodeck/source_desert,
 			list(
 				'sound/effects/wind/wind_2_1.ogg',
 				'sound/effects/wind/wind_2_2.ogg',
@@ -23,7 +23,7 @@
 				'sound/effects/wind/wind_5_1.ogg'
 			)
 		),
-		"snowfield" = new /datum/holodeck_program(/area/holodeck/source_snowfield,
+		"snowfield" = new /datum/holodeck_program(/area/horizon/holodeck/source_snowfield,
 			list(
 				'sound/effects/wind/wind_2_1.ogg',
 				'sound/effects/wind/wind_2_2.ogg',
@@ -33,7 +33,7 @@
 				'sound/effects/wind/wind_5_1.ogg'
 			)
 		),
-		"space" = new /datum/holodeck_program(/area/holodeck/source_space,
+		"space" = new /datum/holodeck_program(/area/horizon/holodeck/source_space,
 			list(
 				'sound/ambience/ambispace.ogg',
 				'sound/music/main.ogg',
@@ -41,29 +41,29 @@
 				'sound/music/traitor.ogg'
 			)
 		),
-		"picnicarea" = new /datum/holodeck_program(/area/holodeck/source_picnicarea,
+		"picnicarea" = new /datum/holodeck_program(/area/horizon/holodeck/source_picnicarea,
 			list('sound/music/title2.ogg')
 		),
-		"dininghall" = new /datum/holodeck_program(/area/holodeck/source_dininghall,
+		"dininghall" = new /datum/holodeck_program(/area/horizon/holodeck/source_dininghall,
 			list('sound/music/title2.ogg')
 		),
-		"theatre" = new /datum/holodeck_program(/area/holodeck/source_theatre),
-		"meetinghall" = new /datum/holodeck_program(/area/holodeck/source_meetinghall),
-		"courtroom" = new /datum/holodeck_program(/area/holodeck/source_courtroom,
+		"theatre" = new /datum/holodeck_program(/area/horizon/holodeck/source_theatre),
+		"meetinghall" = new /datum/holodeck_program(/area/horizon/holodeck/source_meetinghall),
+		"courtroom" = new /datum/holodeck_program(/area/horizon/holodeck/source_courtroom,
 			list('sound/music/traitor.ogg')
 		),
-		"burntest" = new /datum/holodeck_program(/area/holodeck/source_burntest, list()),
-		"wildlifecarp" = new /datum/holodeck_program(/area/holodeck/source_wildlife, list()),
-		"chapel" = new /datum/holodeck_program(/area/holodeck/source_chapel, list()),
-		"gym" = new /datum/holodeck_program(/area/holodeck/source_gym),
-		"battlemonsters" = new /datum/holodeck_program(/area/holodeck/source_battlemonsters,
+		"burntest" = new /datum/holodeck_program(/area/horizon/holodeck/source_burntest, list()),
+		"wildlifecarp" = new /datum/holodeck_program(/area/horizon/holodeck/source_wildlife, list()),
+		"chapel" = new /datum/holodeck_program(/area/horizon/holodeck/source_chapel, list()),
+		"gym" = new /datum/holodeck_program(/area/horizon/holodeck/source_gym),
+		"battlemonsters" = new /datum/holodeck_program(/area/horizon/holodeck/source_battlemonsters,
 			list(
 				'sound/music/battlemonsters_theme.ogg'
 			),
 			FALSE
 		),
-		"chessboard" = new /datum/holodeck_program(/area/holodeck/source_chessboard),
-		"turnoff" = new /datum/holodeck_program(/area/holodeck/source_plating)
+		"chessboard" = new /datum/holodeck_program(/area/horizon/holodeck/source_chessboard),
+		"turnoff" = new /datum/holodeck_program(/area/horizon/holodeck/source_plating)
 	)
 
 	holodeck_supported_programs = list(

maps/sccv_horizon/code/sccv_horizon_unittest.dm

@@ -6,7 +6,7 @@
 	ut_environ_exempt_areas = list(/area/space
 		,/area/solar
 		,/area/shuttle
-		,/area/holodeck
+		,/area/horizon/holodeck
 		,/area/supply/station
 		,/area/tdome
 		,/area/centcom

maps/sccv_horizon/sccv_horizon-3_deck_3.dmm

@@ -11713,7 +11713,7 @@
 	name = "RevenantRift"
 	},
 /turf/simulated/floor/holofloor/reinforced,
-/area/holodeck/alphadeck)
+/area/horizon/holodeck/alphadeck)
 "vF" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -27129,7 +27129,7 @@
 /area/maintenance/engineering_ladder)
 "Ye" = (
 /turf/simulated/floor/holofloor/reinforced,
-/area/holodeck/alphadeck)
+/area/horizon/holodeck/alphadeck)
 "Yf" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1