Merge pull request #2523 from Superlagg/time-to-sound-the-resources-w…

…itha--rusty-nail Forcefeeds resources to everyone
ARF-SS13 · Jun 24, 2023 · 3c6b3eb · 3c6b3eb
2 parents 11480bc + 03ad586
commit 3c6b3eb
Show file tree

Hide file tree

Showing 32 changed files with 25 additions and 1 deletion.
diff --git a/code/datums/looping_sounds/ambient_sounds.dm b/code/datums/looping_sounds/ambient_sounds.dm
@@ -419,7 +419,6 @@
 	direct = TRUE
 	loop_delay = 1 MINUTES
 	mid_sounds = list(
-		SOUND_LOOP_ENTRY('sound/music/rocketridersprayer.ogg', 370 SECONDS, 1),
 		SOUND_LOOP_ENTRY('sound/f13/thats_life.ogg', 124 SECONDS, 10),
 		SOUND_LOOP_ENTRY('sound/f13/hanging_me.ogg', 185 SECONDS, 10),
 		SOUND_LOOP_ENTRY('sound/f13/rainmustfall.ogg', 148 SECONDS, 10),

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
@@ -975,6 +975,31 @@ GLOBAL_LIST_INIT(warning_ckeys, list())
 			Export("##action=load_rsc", file)
 			stoplag()
 		#endif
+		preload_every_fucking_sound_file() // ha ha what a great idea
+
+GLOBAL_LIST_EMPTY(every_fucking_sound_file)
+
+/// Okay maybe not every sound file, just the important ones
+/client/proc/populate_every_fucking_sound_file()
+	if(LAZYLEN(GLOB.every_fucking_sound_file))
+		return
+	var/list/fucking_sound_folders = list(
+		"sounds/f13npc/",
+		"sounds/f13weapons/",
+		"sounds/creatures/",
+		"sounds/voice/",
+	)
+	for(var/folder in fucking_sound_folders)
+		GLOB.every_fucking_sound_file |= pathwalk(folder)
+
+/// Goes through every sound file in the universe and forcefeeds them all to the client
+/// Cus this game doesnt have enough loading
+/client/proc/preload_every_fucking_sound_file()
+	if(!LAZYLEN(GLOB.every_fucking_sound_file))
+		populate_every_fucking_sound_file()
+	for (var/file in GLOB.every_fucking_sound_file)
+		Export("##action=load_rsc", file)
+		stoplag()
 
 
 //Hook, override it to run code when dir changes

diff --git a/sound/misc/Paradox.ogg b/sound/misc/Paradox.ogg
diff --git a/sound/misc/deltakalaxon.ogg b/sound/misc/deltakalaxon.ogg
diff --git a/sound/misc/highlander.ogg b/sound/misc/highlander.ogg
diff --git a/sound/misc/highlander_delayed.ogg b/sound/misc/highlander_delayed.ogg
diff --git a/sound/misc/highlander_only_one.ogg b/sound/misc/highlander_only_one.ogg
diff --git a/sound/misc/i_did_not_grief_them.ogg b/sound/misc/i_did_not_grief_them.ogg
diff --git a/sound/music/1.ogg b/sound/music/1.ogg
diff --git a/sound/music/carmenmirandasghost.ogg b/sound/music/carmenmirandasghost.ogg
diff --git a/sound/music/century21march.ogg b/sound/music/century21march.ogg
diff --git a/sound/music/dawsonschristian.ogg b/sound/music/dawsonschristian.ogg
diff --git a/sound/music/flyinghigh.ogg b/sound/music/flyinghigh.ogg
diff --git a/sound/music/flytothemoon_otomatone.ogg b/sound/music/flytothemoon_otomatone.ogg
diff --git a/sound/music/gaytony.ogg b/sound/music/gaytony.ogg
diff --git a/sound/music/gi.ogg b/sound/music/gi.ogg
diff --git a/sound/music/goodbyemoonmen.ogg b/sound/music/goodbyemoonmen.ogg
diff --git a/sound/music/indeep.ogg b/sound/music/indeep.ogg
diff --git a/sound/music/milkyway.ogg b/sound/music/milkyway.ogg
diff --git a/sound/music/moonbaseoddity.ogg b/sound/music/moonbaseoddity.ogg
diff --git a/sound/music/oceanman.ogg b/sound/music/oceanman.ogg
diff --git a/sound/music/rocketridersprayer.ogg b/sound/music/rocketridersprayer.ogg
diff --git a/sound/music/samsara.ogg b/sound/music/samsara.ogg
diff --git a/sound/music/shootingstars.ogg b/sound/music/shootingstars.ogg
diff --git a/sound/music/space_asshole.ogg b/sound/music/space_asshole.ogg
diff --git a/sound/music/space_oddity.ogg b/sound/music/space_oddity.ogg
diff --git a/sound/music/starman.ogg b/sound/music/starman.ogg
diff --git a/sound/music/theend.ogg b/sound/music/theend.ogg
diff --git a/sound/music/torvus.ogg b/sound/music/torvus.ogg
diff --git a/sound/music/twilight.ogg b/sound/music/twilight.ogg
diff --git a/sound/voice/abomtheme.ogg b/sound/voice/abomtheme.ogg
diff --git a/sound/weather/rain.ogg b/sound/weather/rain.ogg