diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml index 1f2a5ebeb0d..595915202d8 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,6 - timerOffset: 0,6 + textOffset: 0,8 + timerOffset: 0,8 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 45e0c9755e4..a1b463f7896 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 53b97f4c783..641a4c22153 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 8f905fb9a88..47d410736e7 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 638d7509a0a..e0ddcfe7b7e 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 14b22cf14a4..d30341b1422 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 8223bcca8fa..ce82c248db8 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 03e29607792..c31a743f473 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 62e47be4ba3..a6222e988f7 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, crypt states modified by Flareguy for Space Station 14", + "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", "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 22225d775ee..5e1130fcc1c 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 5af056f2915..63b7d1177c6 100644 --- a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json @@ -1,7 +1,7 @@ { "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", + "copyright": "https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png index 5fb920e7824..417d44fbcc0 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 8a336405382..f79a25da853 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 12c6a212a19..a1da3673bbd 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 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", + "copyright": "Made by brainfood1183 (github) for ss14", "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 a15bffd4487..9c22f5852cf 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 6228597a401..7297442f108 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 1b6241a5754..460c86b896a 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 83dfe28b291..4b6fd1babf7 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 9a160c373d8..91fb91378a1 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 cdcfa49711b..a5dfc0546bd 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 and modified by Flareguy", + "copyright": "Made by brainfood1183 (Github) for Space Station 14", "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 715d3ab5c6c..e1496f2ca8b 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png and b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png differ