From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Thu, 11 Jan 2024 00:07:14 +0000 (-0600) Subject: Makes lights use the "old" light fixture sprites (#23898) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=31cc9babaa4ab699600782a981a10a039430f3b7;p=space-station-14.git Makes lights use the "old" light fixture sprites (#23898) returns the ss13 light fixture sprites --- diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png index 0a2e1ae76b..940be1b508 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png index 1565cdc86d..43ec5d64c0 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png index 7e14e2c2b3..e3922a9d35 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png index 5ead53beb0..68a683d3e7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png index edffdfe50c..764586a5d7 100644 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png and b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json index 2f3dc61b23..4b8aa5fa2f 100644 --- a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json @@ -1,85 +1,29 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi", "states": [ { "name": "broken", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "burned", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] - }, - { - "name": "empty", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "base", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { + "name": "empty", + "directions": 4 + }, + { "name": "glow", "directions": 4 } diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/broken.png deleted file mode 100644 index 43ec5d64c0..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/burned.png deleted file mode 100644 index 70c53f12ca..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/burned.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/emergency.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/emergency.png deleted file mode 100644 index e12e07f1a8..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/emergency.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/empty.png deleted file mode 100644 index e37c866f75..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/empty.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/meta.json deleted file mode 100644 index 37d22e642a..0000000000 --- a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/meta.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "broken", - "directions": 4 - }, - { - "name": "burned", - "directions": 4 - }, - { - "name": "emergency", - "directions": 4 - }, - { - "name": "empty", - "directions": 4 - }, - { - "name": "off", - "directions": 4 - }, - { - "name": "on", - "directions": 4 - }, - { - "name": "on_unlit", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/off.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/off.png deleted file mode 100644 index 253d3b4e3f..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on.png deleted file mode 100644 index af0150728e..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on.png and /dev/null differ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png deleted file mode 100644 index 1ef9dd18c7..0000000000 Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png and /dev/null differ