From 266457c27483b08c984ccf18dc892e56a13f7091 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 7 Jan 2018 23:17:11 -0500 Subject: [PATCH] Update title.dm --- code/controllers/subsystem/title.dm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 5fcdb4bd00..4cdde58d33 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -26,20 +26,6 @@ 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) - var/list/L = splittext(S,".") - if(L.len != 2 || L[1] != "default") - continue - title_screens -= S - break - - 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) @@ -56,7 +42,6 @@ SUBSYSTEM_DEF(title) ASSERT(fexists(file_path)) icon = new(fcopy_rsc(file_path)) ->>>>>>> 2d34f37... Removes standard resources from config tree (#34067) if(splash_turf) splash_turf.icon = icon