From a4665bc7cd263c202b86676b7eb8ad99ab65067f Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sat, 4 Nov 2017 00:34:20 -0400
Subject: [PATCH 1/3] Fixed required images being in the config folder

---
 code/_onclick/hud/screen_objects.dm |   4 ++++
 code/game/turfs/closed.dm           |   4 ++++
 icons/blank_title.png               | Bin 0 -> 123 bytes
 3 files changed, 8 insertions(+)
 create mode 100644 icons/blank_title.png

diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 79271d1d6d..56466ce78e 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -539,7 +539,11 @@
 	screen_loc = ui_healthdoll
 
 /obj/screen/splash
+<<<<<<< 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 = ""
 	screen_loc = "1,1"
 	layer = SPLASHSCREEN_LAYER
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 9f52c3e035..9d1d33d115 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -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
 
diff --git a/icons/blank_title.png b/icons/blank_title.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3167a923bf8987b6b448ef8c3b23c23bf8f5382
GIT binary patch
literal 123
zcmeAS@N?(olHy`uVBq!ia0y~yV0-|=jLbk0cPX7~K#DoQC&U#<FR!w_1*D8UT^vIy
s=Da;<$Oz;eTJY6Bmq&g9kcksiNEIb8Fjn$yi~uR|boFyt=akR{0LLX4g#Z8m

literal 0
HcmV?d00001


From 6a1c0f668368247f224442a636043e29bc87ac5a Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 7 Nov 2017 03:24:40 -0600
Subject: [PATCH 2/3] Update screen_objects.dm

---
 code/_onclick/hud/screen_objects.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index 56466ce78e..45bfbeb4fa 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -539,11 +539,7 @@
 	screen_loc = ui_healthdoll
 
 /obj/screen/splash
-<<<<<<< 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 = ""
 	screen_loc = "1,1"
 	layer = SPLASHSCREEN_LAYER

From 83c6690721dcc0f82e948b7812f864bfb85f069f Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 7 Nov 2017 03:24:50 -0600
Subject: [PATCH 3/3] Update closed.dm

---
 code/game/turfs/closed.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index 9d1d33d115..322a337117 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -36,11 +36,7 @@
 
 /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