From: potato1234_x <79580518+potato1234x@users.noreply.github.com> Date: Mon, 8 May 2023 12:28:37 +0000 (+1000) Subject: Data Disk Update (#16240) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2aa45f25243cf810108b2578654c5cf1fc0f7d59;p=space-station-14.git Data Disk Update (#16240) --- diff --git a/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png index c9a1437422..ffdb773aa9 100644 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 index 17bff72a1a..4b5e7bf0fd 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png index d08fe04bce..5a7801cd46 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png index 1ae22b7e2c..a30a7a7853 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png index ed2b16e8eb..1f01386891 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png index 0363ce17ef..9fd4781032 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png index 363b671557..1f0ec86f62 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png index a8444b79be..e76bf1784c 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png index ce19a7236d..c9e713c3f3 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png b/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png index e77f266db3..bca27c5edb 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.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 1f78f1ad4b..9040cd5316 100644 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 79435e8b2f..52faf6b4cc 100644 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 e87fbf1e1e..d7b9e7601e 100644 --- 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, 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, 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 diff --git a/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png b/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png index 059ffc942e..8fb09b3651 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png and b/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png differ diff --git a/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png b/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png index 1c7bda07a8..12241395d0 100644 Binary files a/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png and b/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png differ diff --git a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png index 1ef83e9abb..8fb09b3651 100644 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/meta.json b/Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json index ed505f230c..aeda729c56 100644 --- 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/a7215663648f4289d2446a1c82aec1c9a406310c", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/32a2e3e4ceda3ef442c1496cbc6c6a896d684702", "size": { "x": 32, "y": 32