From 0bdcf03793d6f1304d02e008f4cfdaecd5e9119f Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Wed, 10 Jun 2020 21:42:42 -0500
Subject: Remove extraneous files; update themes submodule

- A preconfigured config.ini is probably not useful these days. There's
  an options menu now.
- Removed gs4 background - already in vanilla pack.
- Themes submodule should probably be configured to track master. Meh.
  Submodules can be so finicky. It probably doesn't belong in this repo
  anyway - it should be in the vanilla repo (currently invisible).
---
 .gitlab-ci.yml                          |   1 -
 base/background/gs4/defensedesk.png     | Bin 6880 -> 0 bytes
 base/background/gs4/prosecutiondesk.png | Bin 6551 -> 0 bytes
 base/background/gs4/stand.png           | Bin 2657 -> 0 bytes
 base/config.ini                         |  10 ----------
 base/themes                             |   2 +-
 6 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 base/background/gs4/defensedesk.png
 delete mode 100644 base/background/gs4/prosecutiondesk.png
 delete mode 100644 base/background/gs4/stand.png
 delete mode 100644 base/config.ini

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9685de0..4c7f0799 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -123,7 +123,6 @@ build windows i686:
     mkdir base
     mkdir base/themes
     cp -a ../base/themes/default base/themes/
-    cp -a ../base/config.ini base/config.sample.ini
     cp -a ../base/serverlist.txt base/serverlist.sample.txt
 
 # Miscellaneous files
diff --git a/base/background/gs4/defensedesk.png b/base/background/gs4/defensedesk.png
deleted file mode 100644
index 00a3ffb6..00000000
Binary files a/base/background/gs4/defensedesk.png and /dev/null differ
diff --git a/base/background/gs4/prosecutiondesk.png b/base/background/gs4/prosecutiondesk.png
deleted file mode 100644
index 9f626733..00000000
Binary files a/base/background/gs4/prosecutiondesk.png and /dev/null differ
diff --git a/base/background/gs4/stand.png b/base/background/gs4/stand.png
deleted file mode 100644
index 3719e36a..00000000
Binary files a/base/background/gs4/stand.png and /dev/null differ
diff --git a/base/config.ini b/base/config.ini
deleted file mode 100644
index 1e8705fa..00000000
--- a/base/config.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-theme = default
-blip_rate = 1
-blank_blip = false
-default_music = 50
-default_sfx = 50
-default_blip = 50
-discord = true
-ic_scroll_down = false
-; master = master.aceattorneyonline.com
-; ooc_name = Phoenix
\ No newline at end of file
diff --git a/base/themes b/base/themes
index 49cc1265..4b8496e7 160000
--- a/base/themes
+++ b/base/themes
@@ -1 +1 @@
-Subproject commit 49cc1265f55e2939248bc1eeb6be93a8a03b9853
+Subproject commit 4b8496e7b6b0926fb9f4f6f13d86cd1da31b047a
-- 
cgit