Disk """resprite""" (#29277)

* disk ""resprite""

* fix holodisk

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
index ffdb773aa9f06cb64a7ff42b1e002df0ec9cd23d..5633f0f486c85c061130b3d6aef6abfb82d56282 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png and b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png
deleted file mode 100644 (file)
index 4b5e7bf..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png
deleted file mode 100644 (file)
index 5a7801c..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png
deleted file mode 100644 (file)
index a30a7a7..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png
deleted file mode 100644 (file)
index 1f01386..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png
deleted file mode 100644 (file)
index 9fd4781..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png
deleted file mode 100644 (file)
index 1f0ec86..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png
deleted file mode 100644 (file)
index e76bf17..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png
index 655475caff0b2c34064c095c2b0afa0d5a738596..7ac86185e812e249238ca97ddfc5a2e12abd1b91 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_base.png differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png
index 7eb0695977ecaec0c9ea36d52108c8c3cdb6c950..ce7c2fe134d3f60b9d68937fd0f7d8569734d224 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/holodisk.png b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png
index 52faf6b4cc430313b7f7643ff79a8b6e8bfd8b95..1632fc20d67974a3b4f0d6f5e6cfc2d4658e8089 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/holodisk.png and b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json
index d7b9e7601e503362afd1a2079e70733a872bc418..ba3abaa2dd24597d495b8e9fe6174ad31ec076e1 100644 (file)
--- a/Resources/Textures/Objects/Misc/module.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json
@@ -1 +1 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, disk sprites taken from tgstation at commit https://github.com/tgstation/tgstation/commit/32a2e3e4ceda3ef442c1496cbc6c6a896d684702, additional sprites created by EmoGarbage404", "states": [{"name": "abductor_mod"}, {"name": "airalarm_electronics"}, {"name": "ash_plating"}, {"name": "beaker_holder"}, {"name": "blank_mod"}, {"name": "bluespacearray"}, {"name": "boris"}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini"}, {"name": "card_mod"}, {"name": "cargodisk"}, {"name": "cart_connector"}, {"name": "cddrive"}, {"name": "cell"}, {"name": "cell_con"}, {"name": "cell_con_micro"}, {"name": "cell_micro"}, {"name": "cell_mini"}, {"name": "charger_APC"}, {"name": "charger_lambda"}, {"name": "charger_pda"}, {"name": "charger_wire"}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command"}, {"name": "cpu"}, {"name": "cpu_adv"}, {"name": "cpu_command"}, {"name": "cpu_engineering"}, {"name": "cpu_medical"}, {"name": "cpu_science"}, {"name": "cpu_security"}, {"name": "cpu_service"}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpu_supply"}, {"name": "cpuboard"}, {"name": "cpuboard_adv"}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade"}, {"name": "cyborg_upgrade1"}, {"name": "cyborg_upgrade2"}, {"name": "cyborg_upgrade3"}, {"name": "cyborg_upgrade4"}, {"name": "cyborg_upgrade5"}, {"name": "datadisk_base"}, {"name": "datadisk0"}, {"name": "datadisk1"}, {"name": "datadisk2"}, {"name": "datadisk3"}, {"name": "datadisk4"}, {"name": "datadisk5"}, {"name": "datadisk6"}, {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_label"}, {"name": "depositbox"}, {"name": "door_electronics"}, {"name": "engineering"}, {"name": "flopdrive"}, {"name": "generic"}, {"name": "harddisk"}, {"name": "harddisk_micro"}, {"name": "harddisk_mini"}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod"}, {"name": "mainboard"}, {"name": "mcontroller"}, {"name": "medical"}, {"name": "net_wired"}, {"name": "nucleardisk", "delays": [[0.1, 0.1]]}, {"name": "power_mod"}, {"name": "printer"}, {"name": "printer_mini"}, {"name": "prizevendor"}, {"name": "radio"}, {"name": "radio_micro"}, {"name": "radio_mini"}, {"name": "ram"}, {"name": "rndmajordisk"}, {"name": "science"}, {"name": "secmodschematic"}, {"name": "security"}, {"name": "selfrepair_off"}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service"}, {"name": "servo"}, {"name": "ssd"}, {"name": "ssd_large"}, {"name": "ssd_micro"}, {"name": "ssd_mini"}, {"name": "std_mod"}, {"name": "supply"}]}
\ No newline at end of file
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404", "states": [{"name": "abductor_mod"}, {"name": "airalarm_electronics"}, {"name": "ash_plating"}, {"name": "beaker_holder"}, {"name": "blank_mod"}, {"name": "bluespacearray"}, {"name": "boris"}, {"name": "boris_recharging", "delays": [[1.0, 1.0]]}, {"name": "card_mini"}, {"name": "card_mod"}, {"name": "cargodisk"}, {"name": "cart_connector"}, {"name": "cddrive"}, {"name": "cell"}, {"name": "cell_con"}, {"name": "cell_con_micro"}, {"name": "cell_micro"}, {"name": "cell_mini"}, {"name": "charger_APC"}, {"name": "charger_lambda"}, {"name": "charger_pda"}, {"name": "charger_wire"}, {"name": "clock_mod", "delays": [[0.6, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "command"}, {"name": "cpu"}, {"name": "cpu_adv"}, {"name": "cpu_command"}, {"name": "cpu_engineering"}, {"name": "cpu_medical"}, {"name": "cpu_science"}, {"name": "cpu_security"}, {"name": "cpu_service"}, {"name": "cpu_super", "delays": [[0.1, 0.1]]}, {"name": "cpu_supply"}, {"name": "cpuboard"}, {"name": "cpuboard_adv"}, {"name": "cpuboard_super", "delays": [[0.1, 0.1]]}, {"name": "cyborg_upgrade"}, {"name": "cyborg_upgrade1"}, {"name": "cyborg_upgrade2"}, {"name": "cyborg_upgrade3"}, {"name": "cyborg_upgrade4"}, {"name": "cyborg_upgrade5"}, {"name": "datadisk_base"},  {"name": "datadisk_gene", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_hydro", "delays": [[0.1, 0.1, 0.1]]}, {"name": "datadisk_label"}, {"name": "depositbox"}, {"name": "door_electronics"}, {"name": "engineering"}, {"name": "flopdrive"}, {"name": "generic"}, {"name": "harddisk"}, {"name": "harddisk_micro"}, {"name": "harddisk_mini"}, {"name": "holodisk", "delays": [[0.1, 0.1]]}, {"name": "id_mod"}, {"name": "mainboard"}, {"name": "mcontroller"}, {"name": "medical"}, {"name": "net_wired"}, {"name": "power_mod"}, {"name": "printer"}, {"name": "printer_mini"}, {"name": "prizevendor"}, {"name": "radio"}, {"name": "radio_micro"}, {"name": "radio_mini"}, {"name": "ram"}, {"name": "rndmajordisk"}, {"name": "science"}, {"name": "secmodschematic"}, {"name": "security"}, {"name": "selfrepair_off"}, {"name": "selfrepair_on", "delays": [[0.1, 0.1, 0.1, 0.1]]}, {"name": "service"}, {"name": "servo"}, {"name": "ssd"}, {"name": "ssd_large"}, {"name": "ssd_micro"}, {"name": "ssd_mini"}, {"name": "std_mod"}, {"name": "supply"}]}
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png b/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png
deleted file mode 100644 (file)
index 8fb09b3..0000000
Binary files a/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png
index 8fb09b3651d86ea8e86c4723782565a65fe0cd3d..05155b22f5b2c50c411181ddb0713017847173b5 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png and b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-left.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..f7034df
Binary files /dev/null and b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-right.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..f7034df
Binary files /dev/null and b/Resources/Textures/Objects/Misc/nukedisk.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json
index aeda729c568860b1fe66a90099a70963e4e7fb71..22ea9ffd38b9a15cedd4a31c6f1c243eaa9f7f1f 100644 (file)
--- a/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/32a2e3e4ceda3ef442c1496cbc6c6a896d684702",
+  "copyright": "Taken from vgstation13 at commit 16e3e20a6bb0f335e241c47382eff3871a1787f1",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,50 @@
           0.1
         ]
       ]
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ]
+      ]
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png
deleted file mode 100644 (file)
index 9c48deb..0000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk0.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png
deleted file mode 100644 (file)
index 03079a2..0000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk1.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png
deleted file mode 100644 (file)
index a548083..0000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk2.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png
deleted file mode 100644 (file)
index 089c064..0000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk3.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png
deleted file mode 100644 (file)
index 459c4e9..0000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk4.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png
deleted file mode 100644 (file)
index a0884cc..0000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk5.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png
deleted file mode 100644 (file)
index cd74424..0000000
Binary files a/Resources/Textures/Objects/Misc/stock_parts.rsi/datadisk6.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
index fac730840193a6bf6c29975c8bb02b19dcd1b6c7..a7211231bb8eb567bdccc2adbcaca1d29cbfc313 100644 (file)
--- a/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json
@@ -66,76 +66,6 @@
     {
       "name": "card_reader"
     },
-    {
-      "name": "datadisk0",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk1",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk2",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk3",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk4",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk5",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
-    {
-      "name": "datadisk6",
-      "delays": [
-        [
-          0.1,
-          0.1,
-          0.1
-        ]
-      ]
-    },
     {
       "name": "electrolite",
       "delays": [