Skip to content

Commit

Permalink
Removes standard resources from config tree (tgstation#34067)
Browse files Browse the repository at this point in the history
* Move default.dmi to /icons

* Delete config folder before travis build

* Rename default.dmi to default_title.dmi

Add sanity check

* Remove redundant checks
  • Loading branch information
Cyberboss authored and ShizCalev committed Jan 8, 2018
1 parent c75d0f4 commit 2d34f37
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
30 changes: 17 additions & 13 deletions code/controllers/subsystem/title.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,25 @@ 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

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)]"
for(var/S in title_screens)
var/list/L = splittext(S,".")
if(L.len != 2)
continue
title_screens -= S
break

icon = new(fcopy_rsc(file_path))
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))

icon = new(fcopy_rsc(file_path))

if(splash_turf)
splash_turf.icon = icon
if(splash_turf)
splash_turf.icon = icon

/datum/controller/subsystem/title/vv_edit_var(var_name, var_value)
. = ..()
Expand Down
8 changes: 0 additions & 8 deletions config/title_screens/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.


File renamed without changes.
4 changes: 4 additions & 0 deletions tools/travis/build_byond.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2d34f37

Please sign in to comment.