Fixed required images being in the config folder

2017-11-04 00:34:20 -04:00
parent 910e6b6396
commit a4665bc7cd
3 changed files with 8 additions and 0 deletions
@@ -36,7 +36,11 @@

 /turf/closed/indestructible/splashscreen
 	name = "Space Station 13"
+<<<<<<< HEAD
 	icon = 'config/title_screens/images/title1.dmi'
+=======
+	icon = 'icons/blank_title.png'
+>>>>>>> 96390b7... Fixed required images being in the config folder (#32375)
 	icon_state = ""
 	layer = FLY_LAYER