From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Wed, 30 Oct 2024 03:12:49 +0000 (-0500) Subject: Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer... X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=3d70cdf23c17384d81cdf495c3075f9b02d8ab91;p=space-station-14.git Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer (#32786) * various resprites (encryption keys + signal screens + station map) * brig timer update * fixes n shit --- diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml index 595915202d..1f2a5ebeb0 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml @@ -64,8 +64,8 @@ canEditLabel: true - type: TextScreenVisuals color: FloralWhite - textOffset: 0,8 - timerOffset: 0,8 + textOffset: 0,6 + timerOffset: 0,6 textLength: 5 rows: 1 - type: Sprite diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png index a1b463f789..45e0c9755e 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png index 641a4c2215..53b97f4c78 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png index 47d410736e..8f905fb9a8 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png index e0ddcfe7b7..638d7509a0 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png index d30341b142..14b22cf14a 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png index ce82c248db..8223bcca8f 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png index c31a743f47..03e2960779 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json index a6222e988f..62e47be4ba 100644 --- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba", + "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/generic.png b/Resources/Textures/Objects/Devices/tablets.rsi/generic.png index 5e1130fcc1..22225d775e 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/generic.png and b/Resources/Textures/Objects/Devices/tablets.rsi/generic.png differ diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json index 11d1d586eb..5af056f291 100644 --- a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json @@ -1 +1,26 @@ -{"version":1,"license":"CC-BY-SA-3.0","copyright":"https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077","size":{"x":32,"y":32},"states":[{"name":"tablet"},{"name":"tabletsol"},{"name":"generic","delays":[[0.3,0.3]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077 and heavily modified by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tablet" + }, + { + "name": "tabletsol" + }, + { + "name": "generic", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png index 417d44fbcc..5fb920e782 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png and b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png differ diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png index f79a25da85..8a33640538 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png and b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/meta.json b/Resources/Textures/Structures/Machines/station_map.rsi/meta.json index a1da3673bb..12c6a212a1 100644 --- a/Resources/Textures/Structures/Machines/station_map.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/station_map.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14 and modified by Flareguy for ss14. station_map_broken based on broken state in Cryogenic2.dmi from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/96246eed6e19899971a6d18e849fa6fe0b8ab52a/icons/obj/Cryogenic2.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png index 9c22f5852c..a15bffd448 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png index 7297442f10..6228597a40 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png index 460c86b896..1b6241a575 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png index 4b6fd1babf..83dfe28b29 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png index 91fb91378a..9a160c373d 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json index a5dfc0546b..cdcfa49711 100644 --- a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for Space Station 14", + "copyright": "Made by brainfood1183 (Github) for Space Station 14 and modified by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png index e1496f2ca8..715d3ab5c6 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png and b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png differ