From 065b616af8c0e0efeb4ee5fb87c3f43820015a8c Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 7 Jan 2018 18:31:30 -0800
Subject: [PATCH] Removes standard resources from config tree

---
 code/controllers/subsystem/title.dm           |  23 ++++++++++++++++--
 config/title_screens/LICENSE.txt              |   8 ------
 .../default.dmi => icons/default_title.dmi    | Bin
 tools/travis/build_byond.sh                   |   4 +++
 4 files changed, 25 insertions(+), 10 deletions(-)
 rename config/title_screens/images/default.dmi => icons/default_title.dmi (100%)

diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm
index 4f1dbc37c7..5fcdb4bd00 100644
--- a/code/controllers/subsystem/title.dm
+++ b/code/controllers/subsystem/title.dm
@@ -26,6 +26,7 @@ SUBSYSTEM_DEF(title)
 		if((L.len == 1 && 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
 
+<<<<<<< HEAD
 	if(!isemptylist(title_screens))
 		if(length(title_screens) > 1)
 			for(var/S in title_screens)
@@ -38,9 +39,27 @@ SUBSYSTEM_DEF(title)
 		file_path = "config/title_screens/images/[pick(title_screens)]"
 
 		icon = new(fcopy_rsc(file_path))
+=======
+	for(var/S in title_screens)
+		var/list/L = splittext(S,".")
+		if(L.len != 2)
+			continue
+		title_screens -= S
+		break
+		
+	if(length(title_screens))
+		file_path = "config/title_screens/images/[pick(title_screens)]"
+	
+	if(!file_path)
+		file_path = "icons/default_title.dmi"
+	
+	ASSERT(fexists(file_path))
 
-		if(splash_turf)
-			splash_turf.icon = icon
+	icon = new(fcopy_rsc(file_path))
+>>>>>>> 2d34f37... Removes standard resources from config tree (#34067)
+
+	if(splash_turf)
+		splash_turf.icon = icon
 
 /datum/controller/subsystem/title/vv_edit_var(var_name, var_value)
 	. = ..()
diff --git a/config/title_screens/LICENSE.txt b/config/title_screens/LICENSE.txt
index 831689b417..f137cde825 100644
--- a/config/title_screens/LICENSE.txt
+++ b/config/title_screens/LICENSE.txt
@@ -28,11 +28,3 @@ Unless otherwise noted all images were created by Cuban Pete on July 26, 2555. T
 
 ---END EXAMPLES (NOT PART OF ANY LICENSE)---
 
-
-
-
----ADD LICENSING INFORMATION BELOW---
-
-blank.png and default.dmi use the default licensing found in README.md in the root directory of the project.
-
-
diff --git a/config/title_screens/images/default.dmi b/icons/default_title.dmi
similarity index 100%
rename from config/title_screens/images/default.dmi
rename to icons/default_title.dmi
diff --git a/tools/travis/build_byond.sh b/tools/travis/build_byond.sh
index a26fb14509..45e4ce7641 100755
--- a/tools/travis/build_byond.sh
+++ b/tools/travis/build_byond.sh
@@ -18,6 +18,10 @@ if [ "$BUILD_TOOLS" = false ]; then
 		grep '^var/' code/*.dm | echo
 		exit 1
 	fi;
+
+	#config folder should not be mandatory
+	rm -rf config
+
     source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
 	if [ "$BUILD_TESTING" = true ]; then
 		tools/travis/dm.sh -DTRAVISBUILDING tgstation.dme