Merge branch 'master' into Lavaland-Expansion

2025-12-10 03:16:07 +00:00 · 2022-02-26 19:10:34 -08:00
parent e1ede2bf98 b79c841ca4
commit 32cb48ee03
314 changed files with 1066 additions and 102863 deletions
--- a/maps/Generic/turbolifts.dm
+++ b/maps/Generic/turbolifts.dm
@@ -34,6 +34,4 @@


 /datum/turbolift
-	music = list('sound/music/elevator.ogg')  // Woo elevator music!
-
-
+	music = list('sound/music/elevator1.ogg', 'sound/music/elevator2.ogg')  // Woo elevator music!
--- a/maps/nsv_triumph/triumph_things.dm
+++ b/maps/nsv_triumph/triumph_things.dm
@@ -21,7 +21,7 @@
 		)

 /datum/turbolift
-	music = list('sound/music/elevator.ogg')  // Woo elevator music!
+	music = list('sound/music/elevator1.ogg', 'sound/music/elevator2.ogg')  // Woo elevator music!
 */
 /*
 // shuttle departure cryo doors that turn into ordinary airlock doors at round end
@@ -159,4 +159,3 @@ var/global/list/latejoin_shuttle   = list()
 		/mob/living/simple_animal/hostile/dragon = 1
 	)
 */
-
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -26,7 +26,7 @@
 // Elevator areas.
 /area/turbolift
 	delay_time = 2 SECONDS
-	forced_ambience = list('sound/music/elevator.ogg')
+	forced_ambience = list('sound/music/elevator1.ogg', 'sound/music/elevator2.ogg')
 	dynamic_lighting = FALSE //Temporary fix for elevator lighting

 	requires_power = FALSE
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -62,7 +62,7 @@

 	lobby_icon = 'icons/misc/title_vr.dmi'
 	lobby_screens = list("tether2_night")
-	id_hud_icons = 'icons/mob/hud_jobs_vr.dmi'
+	id_hud_icons = 'icons/mob/hud_jobs_cit.dmi'

 	holomap_smoosh = list(list(
 		Z_LEVEL_SURFACE_LOW,
--- a/maps/tether/tether_things.dm
+++ b/maps/tether/tether_things.dm
@@ -22,7 +22,7 @@
 		)

 /datum/turbolift
-	music = list('sound/music/elevator.ogg')  // Woo elevator music!
+	music = list('sound/music/elevator1.ogg', 'sound/music/elevator2.ogg')  // Woo elevator music!
 */
 //////////////////////////////////////////