Bar Map Tweaks and Audioconsole Variant (#14051)

code/game/machinery/jukebox.dm

@@ -117,7 +117,7 @@ datum/track/New(var/title_name, var/audio)
 	ui_interact(user)
 
 /obj/machinery/media/jukebox/ui_interact(mob/user, ui_key = "jukebox", var/datum/nanoui/ui = null, var/force_open = 1)
-	var/title = "RetroBox - Space Style"
+	var/title = "Music Player"
 	var/data[0]
 
 	if(!(stat & (NOPOWER|BROKEN)))
@@ -233,7 +233,7 @@ datum/track/New(var/title_name, var/audio)
 
 /obj/machinery/media/jukebox/audioconsole
 	name = "audioconsole"
-	desc = "An Idris-designed jukebox for the 25th century. Unfortunately, someone made a mistake setting this one up - it isn't connected to the extranet - and only plays the demo music it was preprogrammed with."
+	desc = "An Idris-designed jukebox for the 25th century. Unfortunately, someone made a mistake setting this one up. It isn't connected to the extranet and only plays the demo music it was pre-programmed with."
 	icon = 'icons/obj/audioconsole.dmi'
 	icon_state = "audioconsole-nopower"
 	state_base = "audioconsole"
@@ -244,7 +244,7 @@ datum/track/New(var/title_name, var/audio)
 		new/datum/track("Don't Rush", 'sound/music/audioconsole/DontRush.ogg'),
 		new/datum/track("Phoron Will Make Us Rich", 'sound/music/audioconsole/PhoronWillMakeUsRich.ogg'),
 		new/datum/track("Amsterdam", 'sound/music/audioconsole/Amsterdam.ogg'),
-		new/datum/track("when", 'sound/music/audioconsole/When.ogg'),
+		new/datum/track("When", 'sound/music/audioconsole/When.ogg'),
 		new/datum/track("Number 0", 'sound/music/audioconsole/Number0.ogg'),
 		new/datum/track("The Pianist", 'sound/music/audioconsole/ThePianist.ogg'),
 		new/datum/track("Lips", 'sound/music/audioconsole/Lips.ogg'),
@@ -255,4 +255,9 @@ datum/track/New(var/title_name, var/audio)
 	cut_overlays()
 	icon_state = state_base
 	if(playing)
-		add_overlay("[state_base]-running")
+		add_overlay("[state_base]-running")
+
+/obj/machinery/media/jukebox/audioconsole/wall
+	icon = 'icons/obj/audioconsole_wall.dmi'
+	density = FALSE
+	anchored = TRUE

code/game/objects/items/devices/radio/intercom.dm

@@ -2,6 +2,7 @@
 	name = "station intercom (General)"
 	desc = "Talk through this."
 	icon_state = "intercom"
+	layer = 2.99
 	anchored = TRUE
 	appearance_flags = TILE_BOUND // prevents people from viewing the overlay through a wall
 	w_class = ITEMSIZE_LARGE

code/game/objects/structures/barsign.dm

@@ -52,9 +52,10 @@
 /obj/structure/sign/double/barsign
 	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "Off"
-	anchored = 1
+	layer = 2.99
-	var/cult = 0
+	anchored = TRUE
 	req_access = list(access_bar) //Has to initalize at first, this is updated by instance's req_access
+	var/cult = 0
 	var/choice_types = /decl/sign/double/bar
 
 /obj/structure/sign/double/barsign/kitchensign

code/modules/reagents/Chemistry-Machinery.dm

@@ -314,7 +314,7 @@
 	name = "All-In-One Grinder"
 	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "juicer1"
-	layer = 2.9
+	layer = 2.99
 	density = 0
 	anchored = 0
 	use_power = POWER_USE_IDLE

html/changelogs/audioconsole_sprite_tweak.yml

@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - rscadd: "Added a wall-mounted variant of the Audioconsole."

maps/sccv_horizon/code/sccv_horizon_areas.dm

@@ -263,9 +263,6 @@
 	name = "Secondary Crew Lounge"
 	icon_state = "lounge2"
 
-/area/crew_quarters/sleep/cryo/living_quarters_lift
-	name = "Living Quarters Lift"
-
 // Maintenance
 
 /area/maintenance/operations
@@ -323,6 +320,24 @@
 	no_light_control = TRUE
 	allow_nightmode = FALSE
 
+/********** Maintenance Start **********/
+// Maintenance
+/area/horizon/maintenance
+	name = "Horizon - Maintenance (PARENT AREA - DON'T USE)"
+	icon_state = "maintenance"
+	flags = RAD_SHIELDED | HIDE_FROM_HOLOMAP
+	sound_env = TUNNEL_ENCLOSED
+	turf_initializer = new /datum/turf_initializer/maintenance()
+	ambience = AMBIENCE_MAINTENANCE
+
+/area/horizon/maintenance/deck_two/fore/starboard
+	name = "Horizon - Maintenance - Deck Two - Fore Starboard"
+
+/area/horizon/maintenance/deck_two/fore/port
+	name = "Horizon - Maintenance - Deck Two - Fore Port"
+/********** Maintenance End **********/
+
+/********** Hallways Start **********/
 // Hallways
 /area/horizon/hallway
 	name = "Horizon - Hallway (PARENT AREA - DON'T USE)"
@@ -339,6 +354,12 @@
 /area/horizon/hallway/deck_three/primary/starboard/docks
 	name = "Horizon - Deck 3 - Starboard Primary Hallway - Docks"
 
+/area/horizon/hallway/deck_two/fore
+	name = "Horizon - Deck 2 - Fore Hallway"
+	icon_state = "hallF"
+/********** Hallways End **********/
+
+/********** Stairwells Start **********/
 // Stairwells
 /area/horizon/stairwell
 	name = "Horizon - Stairwell (PARENT AREA - DON'T USE)"
@@ -353,6 +374,7 @@
 	name = "Horizon - Bridge Stairwell"
 	icon_state = "bridge_stairs"
 	sound_env = SMALL_ENCLOSED
+/********** Stairwells End **********/
 
 /********** Crew Quarters Start **********/
 // Crew Quarters
@@ -365,6 +387,10 @@
 	name = "Horizon - Cryogenic Storage"
 	icon_state = "Sleep"
 
+/area/horizon/crew_quarters/cryo/living_quarters_lift
+	name = "Horizon - Living Quarters Lift"
+	sound_env = SMALL_ENCLOSED
+
 /area/horizon/crew_quarters/cryo/dormitories
 	name = "Horizon - Cryogenic Storage - Dormitories"
 
@@ -413,6 +439,19 @@
 	name = "Horizon - Fitness Center - Lounge"
 	icon_state = "fitness_lounge"
 	sound_env = SMALL_SOFTFLOOR
+
+// Lounges
+/area/horizon/crew_quarters/lounge/bar
+	name = "Horizon - Bar Lounge"
+	icon_state = "lounge"
+	sound_env = SMALL_SOFTFLOOR
+
+// Miscellanous
+/area/horizon/crew_quarters/washroom/central
+	name = "Horizon - Central Washroom"
+	icon_state = "washroom"
+	sound_env = SMALL_ENCLOSED
+
 /********** Crew Quarters End **********/
 
 /********** Holodeck Start **********/
@@ -538,7 +577,26 @@
 
 // Library
 /area/horizon/library
- 	name = "Horizon - Library"
+	name = "Horizon - Library"
- 	icon_state = "library"
+	icon_state = "library"
- 	sound_env = LARGE_SOFTFLOOR
+	sound_env = LARGE_SOFTFLOOR
+
+// Kitchen
+/area/horizon/kitchen
+	name = "Horizon - Kitchen"
+	icon_state = "kitchen"
+	allow_nightmode = FALSE
+
+/area/horizon/kitchen/hallway
+	name = "Horizon - Kitchen - Hallway"
+
+/area/horizon/kitchen/freezer
+	name = "Horizon - Kitchen - Freezer"
+	sound_env = SMALL_ENCLOSED
+
+// Bar
+/area/horizon/bar
+	name = "Horizon - Bar"
+	icon_state = "bar"
+	allow_nightmode = FALSE
 /********** Unique End **********/

maps/sccv_horizon/code/sccv_horizon_unittest.dm

@@ -1,42 +1,45 @@
 /datum/map/sccv_horizon
-
+	ut_environ_exempt_areas = list(
-	// This is formatted strangely because it fails the indentation test if it's formatted properly.
+		/area/space,
-	// ¯\_(ツ)_/¯
+		/area/solar,
-
+		/area/shuttle,
-	ut_environ_exempt_areas = list(/area/space
+		/area/horizon/holodeck,
-		,/area/solar
+		/area/supply/station,
-		,/area/shuttle
+		/area/tdome,
-		,/area/horizon/holodeck
+		/area/centcom,
-		,/area/supply/station
+		/area/beach,
-		,/area/tdome
+		/area/prison,
-		,/area/centcom
+		/area/supply/dock,
-		,/area/beach
+		/area/turbolift,
-		,/area/prison
+		/area/mine,
-		,/area/supply/dock
+		/area/horizon/exterior,
-		,/area/turbolift
+		/area/construction
-		,/area/mine
-		,/area/horizon/exterior
-		,/area/construction
 	)
+
 	ut_apc_exempt_areas = list()
-	ut_atmos_exempt_areas = list(/area/maintenance
+
-		,/area/engineering/atmos/storage
+	ut_atmos_exempt_areas = list(
-		,/area/server
+		/area/maintenance,
-		,/area/tcommsat/chamber
+		/area/horizon/maintenance,
-		,/area/bridge/aibunker
+		/area/engineering/atmos/storage,
-		,/area/outpost/research/emergency_storage
+		/area/server,
-		,/area/medical/cryo
+		/area/tcommsat/chamber,
-		,/area/medical/surgery
+		/area/bridge/aibunker,
-		,/area/turret_protected/ai
+		/area/outpost/research/emergency_storage,
-		,/area/engineering/smes/tesla
+		/area/medical/cryo,
-		,/area/tcommsat/mainlvl_tcomms__relay
+		/area/medical/surgery,
-		,/area/tcommsat/mainlvl_tcomms__relay/second
+		/area/turret_protected/ai,
-		,/area/rnd/isolation_a
+		/area/engineering/smes/tesla,
-		,/area/rnd/isolation_b
+		/area/tcommsat/mainlvl_tcomms__relay,
-		,/area/rnd/isolation_c
+		/area/tcommsat/mainlvl_tcomms__relay/second,
+		/area/rnd/isolation_a,
+		/area/rnd/isolation_b,
+		/area/rnd/isolation_c
 	)
+
 	ut_fire_exempt_areas = list(
 		/area/maintenance,
+		/area/horizon/maintenance,
 		/area/construction,
 		/area/bridge/aibunker,
 		/area/medical/cryo,
@@ -48,6 +51,7 @@
 
 /datum/unit_test/zas_area_test/sccv_horizon
 	map_path = "sccv_horizon"
+
 /datum/unit_test/zas_area_test/sccv_horizon/storage
 	name = "ZAS: Operations Bay"
-	area_path = /area/operations/storage
+	area_path = /area/operations/storage

maps/sccv_horizon/sccv_horizon-1_deck_1.dmm

@@ -3076,7 +3076,7 @@
 "ctz" = (
 /obj/structure/lattice/catwalk,
 /turf/space,
-/area/template_noop)
+/area/horizon/exterior)
 "ctI" = (
 /obj/effect/map_effect/wingrille_spawn/reinforced,
 /obj/machinery/door/blast/shutters/open{
@@ -6013,7 +6013,7 @@
 /obj/structure/lattice/catwalk,
 /obj/item/hullbeacon/red,
 /turf/space,
-/area/template_noop)
+/area/horizon/exterior)
 "eMK" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -22367,11 +22367,6 @@
 /obj/item/reagent_containers/glass/bucket,
 /turf/simulated/floor/tiled,
 /area/horizon/hydroponics/lower)
-"snD" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/turf/template_noop,
-/area/template_noop)
 "soD" = (
 /obj/machinery/atmospherics/unary/vent_pump/siphon/on/atmos{
 	dir = 8;
@@ -26475,7 +26470,7 @@
 	},
 /obj/item/hullbeacon/red,
 /turf/space/dynamic,
-/area/template_noop)
+/area/horizon/exterior)
 "vHR" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -28271,7 +28266,7 @@
 /obj/structure/lattice/catwalk,
 /obj/item/hullbeacon/red,
 /turf/space/dynamic,
-/area/template_noop)
+/area/horizon/exterior)
 "xjq" = (
 /obj/structure/railing/mapped{
 	dir = 4

maps/sccv_horizon/sccv_horizon-3_deck_3.dmm

@@ -2851,9 +2851,10 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
 "fm" = (
-/obj/structure/ladder{
+/obj/structure/railing/mapped{
-	pixel_y = 8
+	dir = 8
 	},
+/obj/structure/lattice,
 /turf/simulated/open/airless,
 /area/horizon/exterior)
 "fn" = (
@@ -7984,6 +7985,16 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
+"oK" = (
+/obj/structure/ladder{
+	pixel_y = 16
+	},
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/obj/structure/railing/mapped,
+/turf/simulated/open/airless,
+/area/horizon/exterior)
 "oL" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -11983,6 +11994,15 @@
 /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
+"wk" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/obj/item/hullbeacon/red,
+/obj/structure/railing/mapped,
+/turf/simulated/open/airless,
+/area/horizon/exterior)
 "wl" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -13308,6 +13328,11 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/tcommsat/chamber)
+"yI" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/reinforced/airless,
+/area/horizon/exterior)
 "yJ" = (
 /obj/machinery/light{
 	dir = 8
@@ -15873,6 +15898,13 @@
 "DK" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/medical/washroom)
+"DL" = (
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/horizon/exterior)
 "DM" = (
 /obj/effect/floor_decal/corner/grey/diagonal{
 	dir = 8
@@ -19395,6 +19427,10 @@
 /obj/item/hullbeacon/red,
 /turf/simulated/open/airless,
 /area/horizon/exterior)
+"JZ" = (
+/obj/structure/railing/mapped,
+/turf/simulated/floor/reinforced/airless,
+/area/horizon/exterior)
 "Ka" = (
 /obj/effect/floor_decal/spline/fancy/wood/corner{
 	dir = 4
@@ -21069,6 +21105,15 @@
 /obj/item/clothing/accessory/armband/med,
 /turf/simulated/floor/tiled/dark,
 /area/crew_armory)
+"Ne" = (
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/structure/sign/securearea{
+	name = "\improper BRIG COMMUNAL AREA sign";
+	desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'."
+	},
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/reinforced/airless,
+/area/horizon/exterior)
 "Nf" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -21601,6 +21646,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
+"Ob" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/mapped{
+	dir = 8
+	},
+/turf/simulated/open/airless,
+/area/horizon/exterior)
 "Oc" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -23838,6 +23890,13 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_quarters/fitness/hallway)
+"Sa" = (
+/obj/effect/floor_decal/industrial/warning,
+/obj/structure/railing/mapped{
+	dir = 4
+	},
+/turf/simulated/floor/reinforced/airless,
+/area/horizon/exterior)
 "Sb" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
@@ -44826,7 +44885,7 @@ uN
 qB
 at
 fh
-fm
+yF
 yM
 wl
 Uj
@@ -51501,13 +51560,13 @@ uu
 uu
 za
 iF
-Tr
 TC
 at
 at
 at
 at
 at
+at
 fh
 aa
 Wm
@@ -51703,13 +51762,13 @@ yM
 yM
 yM
 yM
-yM
 Sb
 Tr
 Tr
 Tr
 Tr
 Tr
+Tr
 PF
 aa
 Wm
@@ -51897,7 +51956,7 @@ at
 at
 fh
 oy
-oy
+fm
 oy
 oy
 oy
@@ -52099,8 +52158,8 @@ at
 at
 fh
 aa
-Wm
+sP
-Wm
+aa
 Wm
 Wm
 Wm
@@ -52300,6 +52359,8 @@ at
 at
 at
 fh
+Ob
+wk
 aa
 Wm
 Wm
@@ -52370,8 +52431,6 @@ Wm
 Wm
 Wm
 Wm
-Wm
-Wm
 "}
 (121,1,1) = {"
 Wm
@@ -52502,6 +52561,8 @@ at
 at
 at
 fh
+SL
+oK
 aa
 Wm
 Wm
@@ -52572,8 +52633,6 @@ Wm
 Wm
 Wm
 Wm
-Wm
-Wm
 "}
 (122,1,1) = {"
 Wm
@@ -53511,7 +53570,7 @@ at
 at
 at
 at
-fh
+Sa
 aa
 Wm
 Wm
@@ -53712,9 +53771,9 @@ at
 at
 at
 at
-at
+JZ
-VM
+Ne
-Mo
+aa
 Wm
 Wm
 Wm
@@ -53914,9 +53973,9 @@ at
 at
 at
 at
-at
+JZ
-at
+yI
-fh
+aa
 Wm
 Wm
 Wm
@@ -54116,9 +54175,9 @@ at
 at
 at
 at
-at
+JZ
-Rh
+yI
-PF
+aa
 Wm
 Wm
 Wm
@@ -54318,8 +54377,8 @@ at
 at
 at
 at
-at
+JZ
-fh
+Ne
 aa
 Wm
 Wm
@@ -54520,9 +54579,9 @@ at
 at
 at
 at
-at
+JZ
-VM
+yI
-Mo
+aa
 Wm
 Wm
 Wm
@@ -54722,9 +54781,9 @@ at
 at
 at
 at
-at
+JZ
-at
+yI
-fh
+aa
 Wm
 Wm
 Wm
@@ -54924,9 +54983,9 @@ at
 at
 at
 at
-at
+JZ
-Rh
+Ne
-PF
+aa
 Wm
 Wm
 Wm
@@ -55127,7 +55186,7 @@ at
 at
 at
 at
-fh
+DL
 aa
 Wm
 Wm
@@ -55935,9 +55994,9 @@ at
 at
 at
 at
-VM
+fh
-KN
+aa
-Mo
+Wm
 Wm
 Wm
 Wm
@@ -56137,9 +56196,9 @@ at
 at
 at
 at
-at
-at
 fh
+aa
+Wm
 Wm
 Wm
 Wm
@@ -56339,9 +56398,9 @@ at
 at
 at
 at
-Rh
+fh
-Tr
+aa
-PF
+Wm
 Wm
 Wm
 Wm