]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Makes lights use the "old" light fixture sprites (#23898)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Thu, 11 Jan 2024 00:07:14 +0000 (18:07 -0600)
committerGitHub <noreply@github.com>
Thu, 11 Jan 2024 00:07:14 +0000 (17:07 -0700)
returns the ss13 light fixture sprites

14 files changed:
Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/broken.png [deleted file]
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/burned.png [deleted file]
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/emergency.png [deleted file]
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/empty.png [deleted file]
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/meta.json [deleted file]
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/off.png [deleted file]
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on.png [deleted file]
Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png [deleted file]

index 0a2e1ae76b9ef30600059120fe34b9dbfe8138eb..940be1b50897201d15944c0729a3941fea5808cc 100644 (file)
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
index 1565cdc86d73362efe0282324ae470af14e6c518..43ec5d64c0479282ddc9732b550836824d0ff620 100644 (file)
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
index 7e14e2c2b3931202496f130c6edceb37faccd595..e3922a9d351792fa69b0e08119c201f629f2d384 100644 (file)
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
index 5ead53beb0e101a47377e4201bc200f52919e60e..68a683d3e7f85eb9c218dc1fc0f8d54162e7bacf 100644 (file)
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
index edffdfe50c2e4937e1f74eafa1e1b591ce6568e4..764586a5d78603e9a0f706c1e102dad5e02d0a3a 100644 (file)
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
index 2f3dc61b2329d801fade1c216fafa97bd63df9d4..4b8aa5fa2f0d942d336397770ae2e2bc9b539d53 100644 (file)
@@ -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 (file)
index 43ec5d6..0000000
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 (file)
index 70c53f1..0000000
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 (file)
index e12e07f..0000000
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 (file)
index e37c866..0000000
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 (file)
index 37d22e6..0000000
+++ /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 (file)
index 253d3b4..0000000
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 (file)
index af01507..0000000
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 (file)
index 1ef9dd1..0000000
Binary files a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube_old.rsi/on_unlit.png and /dev/null differ