]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Data Disk Update (#16240)
authorpotato1234_x <79580518+potato1234x@users.noreply.github.com>
Mon, 8 May 2023 12:28:37 +0000 (22:28 +1000)
committerGitHub <noreply@github.com>
Mon, 8 May 2023 12:28:37 +0000 (22:28 +1000)
17 files changed:
Resources/Textures/Objects/Misc/module.rsi/cargodisk.png
Resources/Textures/Objects/Misc/module.rsi/datadisk0.png
Resources/Textures/Objects/Misc/module.rsi/datadisk1.png
Resources/Textures/Objects/Misc/module.rsi/datadisk2.png
Resources/Textures/Objects/Misc/module.rsi/datadisk3.png
Resources/Textures/Objects/Misc/module.rsi/datadisk4.png
Resources/Textures/Objects/Misc/module.rsi/datadisk5.png
Resources/Textures/Objects/Misc/module.rsi/datadisk6.png
Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png
Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png
Resources/Textures/Objects/Misc/module.rsi/datadisk_label.png
Resources/Textures/Objects/Misc/module.rsi/holodisk.png
Resources/Textures/Objects/Misc/module.rsi/meta.json
Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png
Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png
Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png
Resources/Textures/Objects/Misc/nukedisk.rsi/meta.json

index c9a143742225550393bf4a3d3d92a18e0fb537cb..ffdb773aa9f06cb64a7ff42b1e002df0ec9cd23d 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png and b/Resources/Textures/Objects/Misc/module.rsi/cargodisk.png differ
index 17bff72a1a5bca0cca57bfcb001df1b244407f71..4b5e7bf0fde90b466908af4e6afc0c94a172fbbf 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk0.png differ
index d08fe04bce810139ae297e174c91e4d786c10f52..5a7801cd4668e4730b42b9d28606f47040676b4e 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk1.png differ
index 1ae22b7e2cc7561c8746afcf0ebd8143252a4c38..a30a7a7853dcbe747f87328c20f96c03989ed0c9 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk2.png differ
index ed2b16e8eb26adbdb14f33f22c4d035c44befae3..1f01386891d6d517a336ffb24da97a68b2720d32 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk3.png differ
index 0363ce17efdb411bf94a2b5a19f2fa024dd33e29..9fd4781032b54a335f16206e1b2cd2b8000b2f2a 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk4.png differ
index 363b67155743cf882ac0083b0bfdcf05760ffa07..1f0ec86f626bcd62c4ddbb0a0e6829f34d11780f 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk5.png differ
index a8444b79befd608541c591cd40587ad1e7a748dc..e76bf1784c8d8ee169d63e9400b884f8bc09271b 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk6.png differ
index ce19a7236d111e7708ed5a253382bc2febf34dd7..c9e713c3f350177c5c99f6be9137c88d66c53774 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_gene.png differ
index e77f266db33b8a90dead2237365e055dcf570b50..bca27c5edb40303cc27e0e57f2da895d086fb590 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png and b/Resources/Textures/Objects/Misc/module.rsi/datadisk_hydro.png differ
index 1f78f1ad4bf7c9373032d54065f7785c5401528f..9040cd531661ae8716f0336ee786dad7f2127cf0 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
index 79435e8b2ff652ff285447f975b2047998e1ff7d..52faf6b4cc430313b7f7643ff79a8b6e8bfd8b95 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/holodisk.png and b/Resources/Textures/Objects/Misc/module.rsi/holodisk.png differ
index e87fbf1e1e7bda22d8fdff0f9126e26ef0ce8cbd..d7b9e7601e503362afd1a2079e70733a872bc418 100644 (file)
@@ -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
index 059ffc942ea02b82737b6fc529e8aa727ab14f2d..8fb09b3651d86ea8e86c4723782565a65fe0cd3d 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png and b/Resources/Textures/Objects/Misc/module.rsi/nucleardisk.png differ
index 1c7bda07a87d98989b9a561f8dc85820f0f08cdf..12241395d0eeb7c590c27f93923f69ec039c8f34 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png and b/Resources/Textures/Objects/Misc/module.rsi/rndmajordisk.png differ
index 1ef83e9abb0681830b298e14ffded29c54db34bb..8fb09b3651d86ea8e86c4723782565a65fe0cd3d 100644 (file)
Binary files a/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png and b/Resources/Textures/Objects/Misc/nukedisk.rsi/icon.png differ
index ed505f230c17d72849c0bf04f2cdece7ebcb6362..aeda729c568860b1fe66a90099a70963e4e7fb71 100644 (file)
@@ -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