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 10ccff1fc4786b3d2bb62fdcbd8ff733abf88aed..7d2f098b8c3cc6b6265b08cc89aacb5ad3dc60b7 100644 (file)
--- 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 25a6eeea740c4754fdc6549e8526da1b767c16b5..637fbe2e6f63381021ee679c2e11bb380364815f 100644 (file)
--- 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 0d43f61d5bfea7a9b205ea9140147a98c0621d6a..edd2681a624deea38b78bd0375978a6e0540a504 100644 (file)
--- 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 (file)
index dc94d77..0000000
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 (file)
index 7998bc9..0000000
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 (file)
index e5d65d4..0000000
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 (file)
index c202346..0000000
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 (file)
index 30540d1..0000000
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 (file)
index 6878dda..0000000
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 (file)
index c1871e5..0000000
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 (file)
index 8cade60..0000000
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 (file)
index 4e98928..0000000
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 (file)
index 91e68e1..0000000
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 (file)
index f087c05..0000000
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 (file)
index 1c57380..0000000
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 (file)
index f720701..0000000
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 (file)
index 5cc398d..0000000
--- 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 (file)
index 0ab974b..0000000
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 (file)
index 3dc3e95..0000000
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 (file)
index 34ac886..0000000
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 (file)
index 421580f..0000000
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 (file)
index 44a5c95..0000000
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 (file)
index 206b034..0000000
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 (file)
index 2bad753..0000000
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 (file)
index d98ef54..0000000
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 (file)
index 0e9a67f..0000000
Binary files a/Resources/Textures/Interface/Eris/Slots/web.png and /dev/null differ