Various Vaugely Connected Sprite Updates™: Encryption Keys, Station Map, Brig Timer...

* 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 595915202d86f61f586e3531d60c3fa3408b71f0..1f2a5ebeb0dd35524ab7631e243f8068aa64881f 100644 (file)
--- 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 a1b463f7896d5d6b8c2fc4300c01a8871c3de454..45e0c9755e4f077515ab8cf0b41d4bb1d3c4715d 100644 (file)
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 641a4c22153e4c61e72b9fd9e842a708bdca640e..53b97f4c783c567aae26c9f93716597ed2d440f5 100644 (file)
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 47d410736e70e9c8254247ce1db5374f4db03e73..8f905fb9a88cd0f8feae32d63cf1a5317969637e 100644 (file)
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 e0ddcfe7b7e585d682fcf61134540c0d0731275f..638d7509a0a48b886f00a923ca131d9c21415528 100644 (file)
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 d30341b1422ba957935c3067f3e8b2d494c241fc..14b22cf14a4163d8c3cc7a205a2f9da62e4bb9da 100644 (file)
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 ce82c248db8d03f5ce27802e954258c56294475e..8223bcca8fa87d56495186ceba1cd934457725f1 100644 (file)
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 c31a743f473e0440a89cf06984930634deb7f86b..03e2960779226fb6ab002f96db054f4443615009 100644 (file)
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 a6222e988f72347407bd18779579377a02ec30be..62e47be4ba35cfd97771294b2aee9614124d3449 100644 (file)
--- 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 5e1130fcc1c4917fe17a8a6df0e75647397e19a6..22225d775eed566b577d61079a9497008a36f460 100644 (file)
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 11d1d586eb70edbfee4b9e95c6d8c7e71cccf10a..5af056f2915945cac4eea82f680f3fbde31fc27e 100644 (file)
--- 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 417d44fbcc00fadef9961a926bc30d7b2b4ca088..5fb920e782419a95bbcadb8835c9feff26ec675e 100644 (file)
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 f79a25da853608dab8447876a167e09e2894d2b0..8a33640538207a3ff83103032411093d8df5f217 100644 (file)
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 a1da3673bbd23d857f3cf11d1ddcf9675ab2cd53..12c6a212a19fc9e91896ecbe0d816134c4784aa8 100644 (file)
--- 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 9c22f5852cfed9bd71c08363090b16159202c22c..a15bffd4487353a9d031286226f66f2081439a99 100644 (file)
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 7297442f10813defdc0deaf445505decdb66008c..6228597a401255050e6cd7403deccba77ac7e0d2 100644 (file)
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 460c86b896a6a470270efa82d8a4f4c609bb0359..1b6241a5754a7771d06b4c2fd5d5e6f21d3cee56 100644 (file)
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 4b6fd1babf7739947ea84136e81474ec89f19d00..83dfe28b291ef58fff374c32de3c2afbc0167e99 100644 (file)
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 91fb91378a18d8cdd59c98cb4a05dbf9b78cb7fc..9a160c373d85f6382dd5354352df09294f8d8c9f 100644 (file)
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 a5dfc0546bd1c5f36bd10532902c00a1b253397f..cdcfa49711bf6ddc1c831b00537eb9b936cefdad 100644 (file)
--- 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 e1496f2ca8b053394a1bc1d54e2668e37280e0f7..715d3ab5c6ce36b5353f083cf9fd1e9f1040275f 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png and b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png differ