From: Ubaser <134914314+UbaserB@users.noreply.github.com>
Date: Thu, 29 Feb 2024 05:53:48 +0000 (+1100)
Subject: Remove Eris UI theme (#25673)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=ad7256750c5ccb8a5b1025d287dae1d1c507f78e;p=space-station-14.git

Remove Eris UI theme (#25673)

add
---

diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
index 10ccff1fc4..7d2f098b8c 100644
--- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
+++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -71,7 +71,6 @@ ui-options-hud-theme-slimecore = Slimecore
 ui-options-hud-theme-clockwork = Clockwork
 ui-options-hud-theme-retro = Retro
 ui-options-hud-theme-minimalist = Minimalist
-ui-options-hud-theme-eris = Eris
 ui-options-hud-theme-ashen = Ashen
 ui-options-vp-stretch = Stretch viewport to fit game window
 ui-options-vp-scale = Fixed viewport scale: x{ $scale }
diff --git a/Resources/Prototypes/hud.yml b/Resources/Prototypes/hud.yml
index 25a6eeea74..637fbe2e6f 100644
--- a/Resources/Prototypes/hud.yml
+++ b/Resources/Prototypes/hud.yml
@@ -34,14 +34,8 @@
   path: Minimalist
   order: 1
 
-- type: hudTheme
-  id: SS14ErisTheme
-  name: ui-options-hud-theme-eris
-  path: Eris
-  order: 5
-
 - type: hudTheme
   id: SS14AshenTheme
   name: ui-options-hud-theme-ashen
   path: Ashen
-  order: 7
+  order: 5
diff --git a/Resources/Prototypes/themes.yml b/Resources/Prototypes/themes.yml
index 0d43f61d5b..edd2681a62 100644
--- a/Resources/Prototypes/themes.yml
+++ b/Resources/Prototypes/themes.yml
@@ -82,20 +82,6 @@
     concerningOrangeFore: "#A5762F"
     dangerousRedFore: "#BB3232"
     disabledFore: "#5A5A5A"
-- type: uiTheme
-  id: SS14ErisTheme
-  path: /Textures/Interface/Eris/
-  colors:
-    whiteText: "#FFF5EE"
-    slotSelectedGold: "#e6b812"
-    slotColor: "#0f1215"
-    slotOutline: "#333850"
-    slotText: "#333850"
-    nanoGold: "#A88B5E"
-    goodGreenFore: "#31843E"
-    concerningOrangeFore: "#A5762F"
-    dangerousRedFore: "#BB3232"
-    disabledFore: "#5A5A5A"
 - type: uiTheme
   id: SS14AshenTheme
   path: /Textures/Interface/Ashen/
diff --git a/Resources/Textures/Interface/Eris/Slots/back.png b/Resources/Textures/Interface/Eris/Slots/back.png
deleted file mode 100644
index dc94d77990..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/back.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/belt.png b/Resources/Textures/Interface/Eris/Slots/belt.png
deleted file mode 100644
index 7998bc964e..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/belt.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/block.png b/Resources/Textures/Interface/Eris/Slots/block.png
deleted file mode 100644
index e5d65d49c4..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/block.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/ears.png b/Resources/Textures/Interface/Eris/Slots/ears.png
deleted file mode 100644
index c202346aeb..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/ears.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/glasses.png b/Resources/Textures/Interface/Eris/Slots/glasses.png
deleted file mode 100644
index 30540d14f7..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/glasses.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/gloves.png b/Resources/Textures/Interface/Eris/Slots/gloves.png
deleted file mode 100644
index 6878ddab40..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/gloves.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_l.png b/Resources/Textures/Interface/Eris/Slots/hand_l.png
deleted file mode 100644
index c1871e5443..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_l.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_l_active.png b/Resources/Textures/Interface/Eris/Slots/hand_l_active.png
deleted file mode 100644
index 8cade60fd1..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_l_active.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_r.png b/Resources/Textures/Interface/Eris/Slots/hand_r.png
deleted file mode 100644
index 4e98928bd6..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_r.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/hand_r_active.png b/Resources/Textures/Interface/Eris/Slots/hand_r_active.png
deleted file mode 100644
index 91e68e16cc..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/hand_r_active.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/head.png b/Resources/Textures/Interface/Eris/Slots/head.png
deleted file mode 100644
index f087c05b3c..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/head.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/id.png b/Resources/Textures/Interface/Eris/Slots/id.png
deleted file mode 100644
index 1c57380cae..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/id.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/mask.png b/Resources/Textures/Interface/Eris/Slots/mask.png
deleted file mode 100644
index f72070151e..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/mask.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/meta.json b/Resources/Textures/Interface/Eris/Slots/meta.json
deleted file mode 100644
index 5cc398dd92..0000000000
--- a/Resources/Textures/Interface/Eris/Slots/meta.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "version": 1,
-    "size": {
-        "x": 32,
-        "y": 32
-    },
-    "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Heavily derived from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac.",
-    "states": [
-        {
-            "name": "back",
-        },
-        {
-            "name": "belt"
-        },
-        {
-            "name": "block"
-        },
-        {
-            "name": "ears"
-        },
-        {
-            "name": "glasses"
-        },
-        {
-            "name": "gloves"
-        },
-        {
-            "name": "hand_l"
-        },
-        {
-            "name": "hand_l_active"
-        },
-        {
-            "name": "hand_r"
-        },
-        {
-            "name": "hand_r_active"
-        },
-        {
-            "name": "head"
-        },
-        {
-            "name": "id"
-        },
-        {
-            "name": "invtoggle"
-        },
-        {
-            "name": "mask"
-        },
-		{
-            "name": "neck"
-        },
-        {
-            "name": "pocket"
-        },
-        {
-            "name": "shoes"
-        },
-        {
-            "name": "suit"
-        },
-        {
-            "name": "uniform"
-        }
-    ]
-}
diff --git a/Resources/Textures/Interface/Eris/Slots/neck.png b/Resources/Textures/Interface/Eris/Slots/neck.png
deleted file mode 100644
index 0ab974bec7..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/neck.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/pocket.png b/Resources/Textures/Interface/Eris/Slots/pocket.png
deleted file mode 100644
index 3dc3e95e6a..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/pocket.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/sheet.png b/Resources/Textures/Interface/Eris/Slots/sheet.png
deleted file mode 100644
index 34ac8861c3..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/sheet.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/shoes.png b/Resources/Textures/Interface/Eris/Slots/shoes.png
deleted file mode 100644
index 421580f1c9..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/shoes.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/suit.png b/Resources/Textures/Interface/Eris/Slots/suit.png
deleted file mode 100644
index 44a5c95e55..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/suit.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/suit_storage.png b/Resources/Textures/Interface/Eris/Slots/suit_storage.png
deleted file mode 100644
index 206b034443..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/suit_storage.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/toggle.png b/Resources/Textures/Interface/Eris/Slots/toggle.png
deleted file mode 100644
index 2bad7533ff..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/toggle.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/uniform.png b/Resources/Textures/Interface/Eris/Slots/uniform.png
deleted file mode 100644
index d98ef541ab..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/uniform.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Eris/Slots/web.png b/Resources/Textures/Interface/Eris/Slots/web.png
deleted file mode 100644
index 0e9a67f8be..0000000000
Binary files a/Resources/Textures/Interface/Eris/Slots/web.png and /dev/null differ