From 11046c52676adb0fe84efecb57809eaa79764dac Mon Sep 17 00:00:00 2001
From: MadoFrog <44807268+MadoFrog@users.noreply.github.com>
Date: Thu, 18 Jul 2019 16:09:24 +0100
Subject: [PATCH] Fixes custom title screens and adds custom directories to
 .gitignore (#45181)

* Updated .gitignore

Now git doesn't look at custom music or images

* Custom titles now work again
---
 .gitignore                          | 8 ++++++++
 code/controllers/subsystem/title.dm | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e264c278a1a..7ddf0bb5954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -209,3 +209,11 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
 #extra map stuff
 /_maps/**/backup/
 /_maps/templates.dm
+
+# Ignore custom music and title screens (amend as appropriate)
+/config/jukebox_music/sounds/*
+!/config/jukebox_music/sounds/exclude
+/config/title_music/sounds/*
+!/config/title_music/sounds/exclude
+/config/title_screens/images/*
+!/config/title_screens/images/exclude
diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm
index 3757b963d37..e2b7f87bea8 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -25,12 +25,12 @@ SUBSYSTEM_DEF(title)
 	SSmapping.HACK_LoadMapConfig()
 	for(var/S in provisional_title_screens)
 		var/list/L = splittext(S,"+")
-		if((L.len > 1 && ((use_rare_screens && lowertext(L[1]) == "rare") || (lowertext(L[1]) == lowertext(SSmapping.config.map_name)))))
+		if((L.len == 1 && (L[1] != "exclude" && L[1] != "blank.png"))|| (L.len > 1 && ((use_rare_screens && lowertext(L[1]) == "rare") || (lowertext(L[1]) == lowertext(SSmapping.config.map_name)))))
 			title_screens += S
 
 	if(length(title_screens))
 		file_path = "[global.config.directory]/title_screens/images/[pick(title_screens)]"
-	
+
 	if(!file_path)
 		file_path = "icons/default_title.dmi"