From: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Date: Fri, 2 Aug 2024 06:14:50 +0000 (+0200)
Subject: Remove duplicate cartridge rsi (#30498)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=448f3804e60cf51fc966477909034bcfc90559d3;p=space-station-14.git

Remove duplicate cartridge rsi (#30498)

remove duplicate cartridge rsi
---

diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
similarity index 100%
rename from Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png
rename to Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png b/Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
similarity index 100%
rename from Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png
rename to Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png
diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
index c7eb96d964..f3b02a2b2e 100644
--- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
+++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d , cart-log made by Skarletto (github)",
+  "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -49,12 +49,18 @@
     {
       "name": "cart-lib"
     },
+    {
+      "name": "cart-log"
+    },
     {
       "name": "cart-m"
     },
     {
       "name": "cart-mi"
     },
+    {
+      "name": "cart-ord"
+    },
     {
       "name": "cart-q"
     },
@@ -74,7 +80,7 @@
       "name": "cart-y"
     },
     {
-      "name": "cart-log"
+      "name": "insert_overlay"
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png
deleted file mode 100644
index 567490fdea..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png
deleted file mode 100644
index 90a75aecca..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png
deleted file mode 100644
index e2fa89e9d5..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png
deleted file mode 100644
index 3eb6762a5a..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png
deleted file mode 100644
index 945092b63d..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png
deleted file mode 100644
index 384d2fbd09..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png
deleted file mode 100644
index 794eeb32a2..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png
deleted file mode 100644
index 81573340a3..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png
deleted file mode 100644
index 52be2688c4..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png
deleted file mode 100644
index 2cdc132635..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png
deleted file mode 100644
index 5d3419fc63..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png
deleted file mode 100644
index f676b14b84..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png
deleted file mode 100644
index 6fbffc5962..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png
deleted file mode 100644
index 3956c626a4..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png
deleted file mode 100644
index ad50f4cd30..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png
deleted file mode 100644
index 5f0e415ca8..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png
deleted file mode 100644
index 3544bf21df..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png
deleted file mode 100644
index 732722a2cf..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png
deleted file mode 100644
index a4fc0a1747..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png
deleted file mode 100644
index a5347224d7..0000000000
Binary files a/Resources/Textures/Objects/Devices/cartridges.rsi/cart.png and /dev/null differ
diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json
deleted file mode 100644
index b0f5cd02a7..0000000000
--- a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "insert_overlay"
-    },
-    {
-      "name": "cart"
-    },
-    {
-      "name": "cart-e"
-    },
-    {
-      "name": "cart-m"
-    },
-    {
-      "name": "cart-chem"
-    },
-    {
-      "name": "cart-c"
-    },
-    {
-      "name": "cart-h"
-    },
-    {
-      "name": "cart-s"
-    },
-    {
-      "name": "cart-clown"
-    },
-    {
-      "name": "cart-a"
-    },
-    {
-      "name": "cart-j"
-    },
-    {
-      "name": "cart-q"
-    },
-    {
-      "name": "cart-ord"
-    },
-    {
-      "name": "cart-tear"
-    },
-    {
-      "name": "cart-b"
-    },
-    {
-      "name": "cart-lib"
-    },
-    {
-      "name": "cart-eye"
-    },
-    {
-      "name": "cart-mi"
-    },
-    {
-      "name": "cart-hos"
-    },
-    {
-      "name": "cart-ce"
-    },
-    {
-      "name": "cart-cmo"
-    },
-    {
-      "name": "cart-rd"
-    }
-  ]
-}
\ No newline at end of file