From f116e887ea66ce515cea5e1c64416f24ed736252 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 13 Aug 2019 12:05:33 +0200
Subject: [PATCH] Make light positioning not look as stupid.

---
 Resources/Maps/stationstation.yml             | 843 +++++++++---------
 .../Buildings/light_small.rsi/broken.png      | Bin 446 -> 246 bytes
 .../Buildings/light_small.rsi/burned.png      | Bin 625 -> 274 bytes
 .../Buildings/light_small.rsi/empty.png       | Bin 319 -> 199 bytes
 .../Buildings/light_small.rsi/off.png         | Bin 478 -> 262 bytes
 .../Textures/Buildings/light_small.rsi/on.png | Bin 556 -> 287 bytes
 .../Buildings/light_tube.rsi/broken.png       | Bin 657 -> 337 bytes
 .../Buildings/light_tube.rsi/burned.png       | Bin 962 -> 584 bytes
 .../Buildings/light_tube.rsi/empty.png        | Bin 406 -> 229 bytes
 .../Textures/Buildings/light_tube.rsi/off.png | Bin 554 -> 280 bytes
 .../Textures/Buildings/light_tube.rsi/on.png  | Bin 703 -> 338 bytes
 11 files changed, 398 insertions(+), 445 deletions(-)

diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml
index d99b3fa1bb..f3e77331f9 100644
--- a/Resources/Maps/stationstation.yml
+++ b/Resources/Maps/stationstation.yml
@@ -259,18 +259,12 @@ entities:
     pos: -1.5,-14.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: LightTube
+- type: poweredsmalllight
   uid: 25
   components:
-  - parent: 26
-    grid: 0
-    type: Transform
-- type: poweredlight
-  uid: 26
-  components:
   - grid: 0
-    pos: 4.5,-9.5
-    rot: 3.14159265358979 rad
+    pos: -4.5,-5
+    rot: 1.5707963267948966 rad
     type: Transform
   - color: '#FFFFFFFF'
     type: PointLight
@@ -279,7 +273,24 @@ entities:
   - containers:
       light_bulb:
         entities:
-        - 25
+        - 29
+        type: Content.Server.GameObjects.ContainerSlot
+    type: ContainerContainer
+- type: poweredlight
+  uid: 26
+  components:
+  - grid: 0
+    pos: -8.5,4
+    rot: -1.5707963267948966 rad
+    type: Transform
+  - color: '#FFFFFFFF'
+    type: PointLight
+  - load: 40
+    type: PowerDevice
+  - containers:
+      light_bulb:
+        entities:
+        - 219
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
 - type: Wire
@@ -289,18 +300,12 @@ entities:
     pos: 8.5,-8.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: LightTube
+- type: poweredsmalllight
   uid: 28
   components:
-  - parent: 29
-    grid: 0
-    type: Transform
-- type: poweredlight
-  uid: 29
-  components:
   - grid: 0
-    pos: -0.5,-13.5
-    rot: 1.5707963267949 rad
+    pos: 0.5,-5
+    rot: 1.5707963267948966 rad
     type: Transform
   - color: '#FFFFFFFF'
     type: PointLight
@@ -309,9 +314,16 @@ entities:
   - containers:
       light_bulb:
         entities:
-        - 28
+        - 171
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
+- type: LightBulb
+  uid: 29
+  components:
+  - parent: 25
+    grid: 0
+    pos: 4.5,5
+    type: Transform
 - type: Wire
   uid: 30
   components:
@@ -1225,11 +1237,12 @@ entities:
     pos: -5.5,-0.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: LightTube
+- type: computerPowerMonitoring
   uid: 155
   components:
-  - parent: 171
-    grid: 0
+  - grid: 0
+    pos: 0.5,-5.5
+    rot: -1.5707963267948966 rad
     type: Transform
 - type: computerAlert
   uid: 156
@@ -1336,34 +1349,26 @@ entities:
     pos: -6.5,-13.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: poweredlight
+- type: LightBulb
   uid: 171
   components:
-  - grid: 0
-    pos: -6.5,-9.5
+  - parent: 28
+    grid: 0
+    pos: -0.5,5
     type: Transform
-  - color: '#FFFFFFFF'
-    type: PointLight
-  - load: 40
-    type: PowerDevice
-  - containers:
-      light_bulb:
-        entities:
-        - 155
-        type: Content.Server.GameObjects.ContainerSlot
-    type: ContainerContainer
 - type: LightBulb
   uid: 172
   components:
   - parent: 173
     grid: 0
+    pos: 10,6.5
     type: Transform
 - type: poweredsmalllight
   uid: 173
   components:
   - grid: 0
-    pos: -4.5,-5.5
-    rot: 1.5707963267949 rad
+    pos: -10,-6.5
+    rot: 3.141592653589793 rad
     type: Transform
   - color: '#FFFFFFFF'
     type: PointLight
@@ -1655,12 +1660,19 @@ entities:
     pos: -9.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
-- type: poweredsmalllight
+- type: LightTube
   uid: 214
   components:
+  - parent: 215
+    grid: 0
+    pos: -0.5,-1
+    type: Transform
+- type: poweredlight
+  uid: 215
+  components:
   - grid: 0
-    pos: -9.5,-6.5
-    rot: 3.14159265358979 rad
+    pos: 0.5,1
+    rot: -1.5707963267948966 rad
     type: Transform
   - color: '#FFFFFFFF'
     type: PointLight
@@ -1669,44 +1681,29 @@ entities:
   - containers:
       light_bulb:
         entities:
-        - 215
+        - 214
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
-- type: LightBulb
-  uid: 215
-  components:
-  - parent: 214
-    grid: 0
-    type: Transform
-- type: poweredlight
+- type: chairOfficeLight
   uid: 216
   components:
   - grid: 0
-    pos: -0.5,0.5
-    rot: -1.5707963267949 rad
+    pos: -3.5,-0.5
+    rot: -1.5707963267948966 rad
     type: Transform
-  - color: '#FFFFFFFF'
-    type: PointLight
-  - load: 40
-    type: PowerDevice
-  - containers:
-      light_bulb:
-        entities:
-        - 217
-        type: Content.Server.GameObjects.ContainerSlot
-    type: ContainerContainer
-- type: LightTube
+- type: chairOfficeDark
   uid: 217
   components:
-  - parent: 216
-    grid: 0
+  - grid: 0
+    pos: 0.5,-6.5
+    rot: 1.5707963267948966 rad
     type: Transform
 - type: poweredlight
   uid: 218
   components:
   - grid: 0
-    pos: -5.5,0.5
-    rot: -1.5707963267949 rad
+    pos: -6.5,1
+    rot: -1.5707963267948966 rad
     type: Transform
   - color: '#FFFFFFFF'
     type: PointLight
@@ -1715,67 +1712,264 @@ entities:
   - containers:
       light_bulb:
         entities:
-        - 219
+        - 320
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
 - type: LightTube
   uid: 219
   components:
-  - parent: 218
+  - parent: 26
     grid: 0
+    pos: 8.5,-4
     type: Transform
-- type: poweredlight
+- type: stool
   uid: 220
   components:
   - grid: 0
-    pos: -6.5,5.5
+    pos: -1.5,-9.5
+    rot: 1.5707963267948966 rad
     type: Transform
-  - color: '#FFFFFFFF'
-    type: PointLight
-  - load: 40
-    type: PowerDevice
-  - containers:
-      light_bulb:
-        entities:
-        - 221
-        type: Content.Server.GameObjects.ContainerSlot
-    type: ContainerContainer
-- type: LightTube
+- type: chairOfficeLight
   uid: 221
   components:
-  - parent: 220
-    grid: 0
+  - grid: 0
+    pos: -3.5,-2.5
+    rot: 1.5707963267948966 rad
     type: Transform
-- type: poweredlight
+- type: chairOfficeLight
   uid: 222
   components:
   - grid: 0
-    pos: 3.5,5.5
-    rot: 3.14159265358979 rad
+    pos: -2.5,-2.5
+    rot: 1.5707963267948966 rad
     type: Transform
-  - color: '#FFFFFFFF'
-    type: PointLight
-  - load: 40
-    type: PowerDevice
-  - containers:
-      light_bulb:
-        entities:
-        - 223
-        type: Content.Server.GameObjects.ContainerSlot
-    type: ContainerContainer
-- type: LightTube
+- type: chairOfficeLight
   uid: 223
   components:
-  - parent: 222
-    grid: 0
+  - grid: 0
+    pos: -2.5,-0.5
+    rot: -1.5707963267948966 rad
     type: Transform
-- type: poweredlight
+- type: stool
   uid: 224
   components:
   - grid: 0
-    pos: -1.5,7.5
+    pos: -2.5,-6.5
+    rot: 1.5707963267948966 rad
+    type: Transform
+- type: LightBulb
+  uid: 225
+  components:
+  - parent: 254
+    grid: 0
+    pos: -5,9.5
+    type: Transform
+- type: APC
+  uid: 226
+  components:
+  - grid: 0
+    pos: -6.5,-7.5
     rot: -1.5707963267949 rad
     type: Transform
+  - load: 80
+    type: PowerProvider
+- type: Wire
+  uid: 227
+  components:
+  - grid: 0
+    pos: -9.5,2.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 228
+  components:
+  - grid: 0
+    pos: -9.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 229
+  components:
+  - grid: 0
+    pos: -8.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 230
+  components:
+  - grid: 0
+    pos: -7.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 231
+  components:
+  - grid: 0
+    pos: -6.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 232
+  components:
+  - grid: 0
+    pos: -5.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 233
+  components:
+  - grid: 0
+    pos: -4.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 234
+  components:
+  - grid: 0
+    pos: -3.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 235
+  components:
+  - grid: 0
+    pos: -2.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 236
+  components:
+  - grid: 0
+    pos: -1.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 237
+  components:
+  - grid: 0
+    pos: -0.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 238
+  components:
+  - grid: 0
+    pos: 0.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: Wire
+  uid: 239
+  components:
+  - grid: 0
+    pos: 1.5,3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 240
+  components:
+  - grid: 0
+    pos: 9.5,-0.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 241
+  components:
+  - grid: 0
+    pos: 9.5,-1.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 242
+  components:
+  - grid: 0
+    pos: 9.5,-2.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 243
+  components:
+  - grid: 0
+    pos: 9.5,-3.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 244
+  components:
+  - grid: 0
+    pos: 9.5,-4.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 245
+  components:
+  - grid: 0
+    pos: 9.5,-5.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 246
+  components:
+  - grid: 0
+    pos: 9.5,-6.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 247
+  components:
+  - grid: 0
+    pos: 9.5,-7.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 248
+  components:
+  - grid: 0
+    pos: 9.5,-8.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 249
+  components:
+  - grid: 0
+    pos: 9.5,-9.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 250
+  components:
+  - grid: 0
+    pos: 9.5,-10.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 251
+  components:
+  - grid: 0
+    pos: 9.5,-11.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: catwalk
+  uid: 252
+  components:
+  - grid: 0
+    pos: 8.5,-8.5
+    rot: -1.5707963267949 rad
+    type: Transform
+- type: APC
+  uid: 253
+  components:
+  - grid: 0
+    pos: 4.5,-9.5
+    rot: -1.5707963267948966 rad
+    type: Transform
+  - load: 380
+    type: PowerProvider
+- type: poweredsmalllight
+  uid: 254
+  components:
+  - grid: 0
+    pos: 5,-9.5
+    type: Transform
   - color: '#FFFFFFFF'
     type: PointLight
   - load: 40
@@ -1786,238 +1980,9 @@ entities:
         - 225
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
-- type: LightTube
-  uid: 225
-  components:
-  - parent: 224
-    grid: 0
-    type: Transform
 - type: APC
-  uid: 226
-  components:
-  - grid: 0
-    pos: 4.5,-10.5
-    rot: -1.5707963267949 rad
-    type: Transform
-  - load: 460
-    type: PowerProvider
-- type: APC
-  uid: 227
-  components:
-  - grid: 0
-    pos: -6.5,-7.5
-    rot: -1.5707963267949 rad
-    type: Transform
-  - load: 120
-    type: PowerProvider
-- type: Wire
-  uid: 228
-  components:
-  - grid: 0
-    pos: -9.5,2.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 229
-  components:
-  - grid: 0
-    pos: -9.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 230
-  components:
-  - grid: 0
-    pos: -8.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 231
-  components:
-  - grid: 0
-    pos: -7.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 232
-  components:
-  - grid: 0
-    pos: -6.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 233
-  components:
-  - grid: 0
-    pos: -5.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 234
-  components:
-  - grid: 0
-    pos: -4.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 235
-  components:
-  - grid: 0
-    pos: -3.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 236
-  components:
-  - grid: 0
-    pos: -2.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 237
-  components:
-  - grid: 0
-    pos: -1.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 238
-  components:
-  - grid: 0
-    pos: -0.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 239
-  components:
-  - grid: 0
-    pos: 0.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: Wire
-  uid: 240
-  components:
-  - grid: 0
-    pos: 1.5,3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 241
-  components:
-  - grid: 0
-    pos: 9.5,-0.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 242
-  components:
-  - grid: 0
-    pos: 9.5,-1.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 243
-  components:
-  - grid: 0
-    pos: 9.5,-2.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 244
-  components:
-  - grid: 0
-    pos: 9.5,-3.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 245
-  components:
-  - grid: 0
-    pos: 9.5,-4.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 246
-  components:
-  - grid: 0
-    pos: 9.5,-5.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 247
-  components:
-  - grid: 0
-    pos: 9.5,-6.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 248
-  components:
-  - grid: 0
-    pos: 9.5,-7.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 249
-  components:
-  - grid: 0
-    pos: 9.5,-8.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 250
-  components:
-  - grid: 0
-    pos: 9.5,-9.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 251
-  components:
-  - grid: 0
-    pos: 9.5,-10.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 252
-  components:
-  - grid: 0
-    pos: 9.5,-11.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: catwalk
-  uid: 253
-  components:
-  - grid: 0
-    pos: 8.5,-8.5
-    rot: -1.5707963267949 rad
-    type: Transform
-- type: poweredsmalllight
-  uid: 254
-  components:
-  - grid: 0
-    pos: 8.5,-7.5
-    rot: 3.14159265358979 rad
-    type: Transform
-  - color: '#FFFFFFFF'
-    type: PointLight
-  - load: 40
-    type: PowerDevice
-  - containers:
-      light_bulb:
-        entities:
-        - 255
-        type: Content.Server.GameObjects.ContainerSlot
-    type: ContainerContainer
-- type: LightBulb
   uid: 255
   components:
-  - parent: 254
-    grid: 0
-    type: Transform
-- type: APC
-  uid: 256
-  components:
   - grid: 0
     pos: -7.5,3.5
     rot: -1.5707963267949 rad
@@ -2025,14 +1990,14 @@ entities:
   - load: 280
     type: PowerProvider
 - type: solid_wall
-  uid: 257
+  uid: 256
   components:
   - grid: 0
     pos: 7.5,-7.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: YellowToolboxItemFilled
-  uid: 258
+  uid: 257
   components:
   - grid: 0
     pos: -0.8099712,-5.21454
@@ -2044,7 +2009,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: YellowToolboxItemFilled
-  uid: 259
+  uid: 258
   components:
   - grid: 0
     pos: -0.5597038,-5.679647
@@ -2056,7 +2021,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: FlashlightLantern
-  uid: 260
+  uid: 259
   components:
   - grid: 0
     pos: -1.934832,-5.154238
@@ -2068,7 +2033,7 @@ entities:
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
 - type: FlashlightLantern
-  uid: 261
+  uid: 260
   components:
   - grid: 0
     pos: -2.017696,-5.71715
@@ -2080,35 +2045,35 @@ entities:
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
 - type: Crowbar
-  uid: 262
+  uid: 261
   components:
   - grid: 0
     pos: -2.861032,-5.524786
     rot: -1.5707963267949 rad
     type: Transform
 - type: UniformEngineering
-  uid: 263
+  uid: 262
   components:
   - grid: 0
     pos: -0.6474335,-10.27245
     rot: -1.5707963267949 rad
     type: Transform
 - type: GasMaskClothing
-  uid: 264
+  uid: 263
   components:
   - grid: 0
     pos: -0.2880585,-10.69432
     rot: -1.5707963267949 rad
     type: Transform
 - type: HazardVestClothing
-  uid: 265
+  uid: 264
   components:
   - grid: 0
     pos: -0.9130585,-10.66307
     rot: -1.5707963267949 rad
     type: Transform
 - type: UtilityBeltClothing
-  uid: 266
+  uid: 265
   components:
   - grid: 0
     pos: -1.895102,-10.33495
@@ -2120,7 +2085,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: UtilityBeltClothing
-  uid: 267
+  uid: 266
   components:
   - grid: 0
     pos: -1.770102,-10.63182
@@ -2132,7 +2097,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: magazine_12mm_filled
-  uid: 268
+  uid: 267
   components:
   - grid: 0
     pos: -6.605512,7.638151
@@ -2144,7 +2109,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: magazine_12mm_filled
-  uid: 269
+  uid: 268
   components:
   - grid: 0
     pos: -6.339887,7.669401
@@ -2156,7 +2121,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: magazine_12mm_filled
-  uid: 270
+  uid: 269
   components:
   - grid: 0
     pos: -6.027387,7.622526
@@ -2168,7 +2133,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: BackpackClothing
-  uid: 271
+  uid: 270
   components:
   - grid: 0
     pos: -5.089887,7.591276
@@ -2180,7 +2145,7 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: BackpackClothing
-  uid: 272
+  uid: 271
   components:
   - grid: 0
     pos: -4.683637,7.606901
@@ -2192,14 +2157,14 @@ entities:
         type: Robust.Server.GameObjects.Components.Container.Container
     type: ContainerContainer
 - type: BlackGloves
-  uid: 273
+  uid: 272
   components:
   - grid: 0
     pos: -3.386762,7.466276
     rot: -1.5707963267949 rad
     type: Transform
 - type: smg_c20r
-  uid: 274
+  uid: 273
   components:
   - grid: 0
     pos: -2.524035,7.579326
@@ -2214,7 +2179,7 @@ entities:
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
 - type: smg_c20r
-  uid: 275
+  uid: 274
   components:
   - grid: 0
     pos: -1.94591,7.485576
@@ -2229,315 +2194,315 @@ entities:
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
 - type: solid_wall
-  uid: 276
+  uid: 275
   components:
   - grid: 0
     pos: -10.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 277
+  uid: 276
   components:
   - grid: 0
     pos: -11.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 278
+  uid: 277
   components:
   - grid: 0
     pos: -10.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 279
+  uid: 278
   components:
   - grid: 0
     pos: -9.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 280
+  uid: 279
   components:
   - grid: 0
     pos: -8.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 281
+  uid: 280
   components:
   - grid: 0
     pos: -7.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 282
+  uid: 281
   components:
   - grid: 0
     pos: -8.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 283
+  uid: 282
   components:
   - grid: 0
     pos: -5.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 284
+  uid: 283
   components:
   - grid: 0
     pos: -6.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 285
+  uid: 284
   components:
   - grid: 0
     pos: -7.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 286
+  uid: 285
   components:
   - grid: 0
     pos: -0.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 287
+  uid: 286
   components:
   - grid: 0
     pos: 0.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 288
+  uid: 287
   components:
   - grid: 0
     pos: 1.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 289
+  uid: 288
   components:
   - grid: 0
     pos: 1.5,0.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 290
+  uid: 289
   components:
   - grid: 0
     pos: 1.5,-3.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 291
+  uid: 290
   components:
   - grid: 0
     pos: 4.5,-3.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 292
+  uid: 291
   components:
   - grid: 0
     pos: 4.5,-2.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 293
+  uid: 292
   components:
   - grid: 0
     pos: 4.5,-1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 294
+  uid: 293
   components:
   - grid: 0
     pos: 4.5,-0.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 295
+  uid: 294
   components:
   - grid: 0
     pos: 4.5,0.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 296
+  uid: 295
   components:
   - grid: 0
     pos: 4.5,1.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 297
+  uid: 296
   components:
   - grid: 0
     pos: 4.5,2.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 298
+  uid: 297
   components:
   - grid: 0
     pos: 4.5,3.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 299
+  uid: 298
   components:
   - grid: 0
     pos: 4.5,4.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 300
+  uid: 299
   components:
   - grid: 0
     pos: 4.5,5.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 301
+  uid: 300
   components:
   - grid: 0
     pos: 4.5,6.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 302
+  uid: 301
   components:
   - grid: 0
     pos: 4.5,7.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 303
+  uid: 302
   components:
   - grid: 0
     pos: 4.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 304
+  uid: 303
   components:
   - grid: 0
     pos: 1.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 305
+  uid: 304
   components:
   - grid: 0
     pos: 0.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 306
+  uid: 305
   components:
   - grid: 0
     pos: -0.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 307
+  uid: 306
   components:
   - grid: 0
     pos: -1.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 308
+  uid: 307
   components:
   - grid: 0
     pos: -2.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 309
+  uid: 308
   components:
   - grid: 0
     pos: -3.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 310
+  uid: 309
   components:
   - grid: 0
     pos: -4.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 311
+  uid: 310
   components:
   - grid: 0
     pos: -5.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 312
+  uid: 311
   components:
   - grid: 0
     pos: -6.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 313
+  uid: 312
   components:
   - grid: 0
     pos: -7.5,8.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 314
+  uid: 313
   components:
   - grid: 0
     pos: -7.5,7.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 315
+  uid: 314
   components:
   - grid: 0
     pos: -7.5,6.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: solid_wall
-  uid: 316
+  uid: 315
   components:
   - grid: 0
     pos: -7.5,5.5
     rot: -1.5707963267949 rad
     type: Transform
 - type: LeatherGloves
-  uid: 317
+  uid: 316
   components:
   - grid: 0
     pos: -4.332221,4.64238
     rot: -1.5707963267949 rad
     type: Transform
 - type: LeatherGloves
-  uid: 318
+  uid: 317
   components:
   - grid: 0
     pos: -3.519721,4.64238
     rot: -1.5707963267949 rad
     type: Transform
 - type: LeatherGloves
-  uid: 319
+  uid: 318
   components:
   - grid: 0
     pos: -2.597846,4.61113
     rot: -1.5707963267949 rad
     type: Transform
 - type: LedLightTube
-  uid: 320
+  uid: 319
   components:
   - grid: 0
     pos: -3.511025,-10.35149
@@ -2545,20 +2510,20 @@ entities:
     type: Transform
   - color: '#EEEEFFFF'
     type: Sprite
-- type: computerPowerMonitoring
+- type: LightTube
+  uid: 320
+  components:
+  - parent: 218
+    grid: 0
+    pos: 6.5,-1
+    type: Transform
+- type: poweredlight
   uid: 321
   components:
   - grid: 0
-    pos: 0.5,-5.5
+    pos: -1.5,8
     rot: -1.5707963267948966 rad
     type: Transform
-- type: poweredsmalllight
-  uid: 322
-  components:
-  - grid: 0
-    pos: 0.5,-5.5
-    rot: 1.5707963267948966 rad
-    type: Transform
   - color: '#FFFFFFFF'
     type: PointLight
   - load: 40
@@ -2566,63 +2531,51 @@ entities:
   - containers:
       light_bulb:
         entities:
-        - 323
+        - 322
         type: Content.Server.GameObjects.ContainerSlot
     type: ContainerContainer
-- type: LightBulb
+- type: LightTube
+  uid: 322
+  components:
+  - parent: 321
+    grid: 0
+    pos: 1.5,-8
+    type: Transform
+- type: poweredlight
   uid: 323
   components:
-  - parent: 322
-    grid: 0
-    pos: -0.5,5.5
+  - grid: 0
+    pos: 4,3.5
+    rot: 3.141592653589793 rad
     type: Transform
-- type: chairOfficeDark
+  - color: '#FFFFFFFF'
+    type: PointLight
+  - load: 40
+    type: PowerDevice
+  - containers:
+      light_bulb:
+        entities:
+        - 324
+        type: Content.Server.GameObjects.ContainerSlot
+    type: ContainerContainer
+- type: LightTube
   uid: 324
   components:
-  - grid: 0
-    pos: 0.5,-6.5
-    rot: 1.5707963267948966 rad
+  - parent: 323
+    grid: 0
+    pos: -4,-3.5
     type: Transform
-- type: chairOfficeLight
+- type: wall_light
   uid: 325
   components:
   - grid: 0
-    pos: -3.5,-0.5
-    rot: -1.5707963267948966 rad
+    pos: -7,-10.5
     type: Transform
-- type: chairOfficeLight
+- type: wall_light
   uid: 326
   components:
   - grid: 0
-    pos: -2.5,-0.5
-    rot: -1.5707963267948966 rad
-    type: Transform
-- type: chairOfficeLight
-  uid: 327
-  components:
-  - grid: 0
-    pos: -2.5,-2.5
-    rot: 1.5707963267948966 rad
-    type: Transform
-- type: chairOfficeLight
-  uid: 328
-  components:
-  - grid: 0
-    pos: -3.5,-2.5
-    rot: 1.5707963267948966 rad
-    type: Transform
-- type: stool
-  uid: 329
-  components:
-  - grid: 0
-    pos: -1.5,-9.5
-    rot: 1.5707963267948966 rad
-    type: Transform
-- type: stool
-  uid: 330
-  components:
-  - grid: 0
-    pos: -2.5,-6.5
+    pos: -0.5,-14
     rot: 1.5707963267948966 rad
     type: Transform
 ...
diff --git a/Resources/Textures/Buildings/light_small.rsi/broken.png b/Resources/Textures/Buildings/light_small.rsi/broken.png
index cb77054e031bf9bc62d15e2ed52e1401d43616e6..e0101a39dd6c55380d34c0840566d8b879bb3233 100644
GIT binary patch
delta 230
zcmdnT{EcyfL_G^L0|P^Zd(K-R#aZAHS<Jw|Ed;`hm+sd60Sbx+_=LCuX-P>*8ylO+
zlP7Q3qI2Si+>@8Rb3P}{07@{H1o;IsI6S+N2IN$Ex;Tb-98XR-z%@g(l}F+OW16V?
zA1;ZQU`dVO143eA4e_oT(u~>>k}LQ)q&!c=2e#~WEj%IEBhz%zn#=8=hQy|ZsRtzv
z8m1K-2$&$Ys^x*k&X%NE6P|TE=xABSw%~MotCF?{_W=XNE37xWE|~DJ>a6JFk?7r~
a$iW~R$=}E;x$h~^84RATelF{r5}E);;!b`5

delta 432
zcmV;h0Z;z+0lou}7=H)`00020X>r~F00D(bL_t(|obB47Zo)tq2k<}3^wI<|nlv?}
zt`C5?N0``4OiU2O5Ih0`1gStE_6ik!go-AcoWqfdA(jwc;G1Z!YsHeSE!VXCfA%PM
z-*+FE@Lhop3W7kCQexY-*tRW7DG7o=s(jZ?(~C1{yBlJ=8-KRFjCO>PFG=i5dR$8q
zyOnky=y(M*p_2&+BVR_=8ICtYy5GR@W~fsIos`6GUi#^AeO<w8SGVg#L_|bHL_|c?
zwm!6^DtCp8!FRbSSt$Ww<O_gOJGu|m@Gni>%(ShO7bC6Hx3gj7OBngJZfDzeTj$~D
zr!N4&cx*MX7JnilA|fIpGG$<LvLtq8q7DNf`%7IMn@*<#AZxTdK71Hkm$8X--!R>8
z008raTN<A)P5^+Bbp`<FL|vNk3UIs`0O0-YHSZ^Ecf&kz{rW3lCJD6~B7dcOhQ;83
zyV7TLV$%J_*zN-cD?lgV^OOa?T3V&?)$#z~ClSv5ODX?;0>uOFw?nXaP!bUl5fKs5
ag?t0#5}zkqyw!pL0000<MNUMnLSTa3x4=*U

diff --git a/Resources/Textures/Buildings/light_small.rsi/burned.png b/Resources/Textures/Buildings/light_small.rsi/burned.png
index 7a65e4e83dbc2f8f5aaba6d913de3158fdbbc5b9..18b937bffb745ff9744974ff2ea3eba42c77cbcc 100644
GIT binary patch
delta 258
zcmey!GKpz|L_G^L0|P^Zd(K-R#aZAHS<Jw|Ed;`hm+sd60Sd|m_=LCuX-P>*D@$b?
z8=K%j!}cDf$v`keXTuhq6G!AO{mg#`RKZvh<QL4~@a#q!kkjkw;uzv_JUQV2*A1Rl
zVTlinX5DFjxFl}bemrfwqwT@;=Nd))2Ub@%xGvqpuwT&k9m|~qfes!GA<CRqT?@8z
zu<;yRpekX>vbbENrzy}N#Zl8)s%i4E3r%|G<KAWVJdoTjV!A+6Lz6Sp<%5b>sL6$H
z$K?entn1#rII7gXi+z)5uz|NLe~5cqzuRpA7KZt^q>5+#6f^|7jKR~@&t;ucLK6Ty
CXI(Y`

delta 612
zcmV-q0-ODk0`UZp7=H)`00020X>r~F00KBkL_t(|obB2%h}uvX2k^h88I+(0E(Y4A
zu2}*OZOw4oEgc#%-4JdF2kqeGSz0=m9zAc$pdb##p>#MJXqIeQ+=MQjZ#V_BI2eLA
zWOyAUQV%*bCeNn#{pJwA&-ZxZ|9e0VS(e3ARb`SSF-ek`s(-4?vMiS5T@TVOj;G$B
zir%2Q(>n?&)xw?a$ZR?TJXb)cy}(oTCQ&cB-2tPafG}L4(Olx<GWjmZ<qn8f|I6oF
zNVPH!k0ONO3h&OY|GJ-tSrnMH(NMtL4>rvMfGC#sToq@wBeUnv>P*)ZX7%MnzW}*s
zJM#T)o)AI^A%BDrLI@%Iajyf3|0R-2lnU#b!tREW0ML5%Gj}O-qPc)!MmRnxV(tg<
zTmb+OhO1Ny<0bKm>6*eC%_RU}GOpn2+mGC>KCr`N$S@;_VhNLR1)cUH&6@sw@pRU9
zWM(_^PSe?a+i5cN`gFbW_4+{?wGcuGA%qY@2;qfWh<{=AW%m1J#=C!?Tdh_BSZ9r+
zp};L*;c`(j4oyX|1YJ{Dr@g@0+pk;C#Enm95$1jX+mYGJ7ujcwnSX%Qmzn1ZI6R8r
zxdIx^B_`tv3^Ur~3B5rT)7d&#{C-t{R4Zfd2YB<oh^)Va%r8qneuPbUI`;zr*h-RP
zakv^M&0SKhjOi@v>NuSNwj;AoA8v7cQiSIUFw6+u^MkEty5~2zxU6!I*|{Bpx~4G0
yj5b^PPlw>g?h_`8rCiP!2qA<JLI@!wH+}&ihU5(zRH+aE0000<MNUMnLSTZcP$07a

diff --git a/Resources/Textures/Buildings/light_small.rsi/empty.png b/Resources/Textures/Buildings/light_small.rsi/empty.png
index 3ca0505a9bc6e10aea5f1be6333892ab9af4acff..781b969a684fcb88fc905499103bbdd6f0e8d908 100644
GIT binary patch
delta 183
zcmdnbbewU5L_G^L0|P^Zd(K-R#aZAHS<Jw|Ed;`hm+sd60Sbx+_=LCuX-P>*8ylO9
z^ytZxC$A_G-rpj6FuH>sD8X0~<QL4~@a#q!kmK#?;uzv_JUQV2SA<BbjKl{<v8^h9
zxFmd<CEXZv85S;3m9S)4TrSen6ll=W$Q@>&#$=$ac*Bb=LS%!Q(v2j>CmISFtd8z|
cO^*BwzGvBW6PpZKfaWrIy85}Sb4q9e03jAL<p2Nx

delta 304
zcmV-00nh%&0lxx}7=H)`00020X>r~F009O`L_t(|obB2%YQr!T#__MFYam<Dlp$k#
z1PvK|gF<tF1cHx{Q#=ak0g^L#%$Nh%boSUSkTswVhCn;2Mk2}oHyR{;0$ZT>EZrb8
z3*P(SoD0sm;JpuK7Gmal9y(k~`}IYVw5j9gcp4~6a;xPc%zsDy&JX8O+t1z2?gan<
z000000000fM7NXfr8QN=3^KFOw4Em7LX&Z!rtK8loz3lE-Qo9-e)w!QNEQG9002NL
z+3xUvug_IgWyz9d(baMhnzsA(?Db`urKpnSZ}Iu4)>~Oz>k0eyMc=0{Z8KzvstDba
zEN{T!T&g*C*C|TUrtUuhX_q|9!ykeG0002+kbVG)kVet-G-MP20000<MNUMnLSTZT
Ct&9Nx

diff --git a/Resources/Textures/Buildings/light_small.rsi/off.png b/Resources/Textures/Buildings/light_small.rsi/off.png
index 884262b5ab6589cbf752b5363ddfca50843af3c5..1de87fbca1f1b337a3b755fe7c22d34ba4cc2adc 100644
GIT binary patch
delta 246
zcmcb|+{QFPqMn7Bfq@~yJ?AZu;w<opEM{Qf76M_$OLy!300l(@d_r7-w4|h@jg8IZ
z$&)v1(K&HM?#avEIiHhe03{epg8YIR9G=}s19G}NT^vIsB;Ou9$k}2b;Bb-Okhg<Z
zLPuc&+oB`8+kLD~e2G7FkLi@r_t={L_jjz^^L6s9m6nBV+}d?A`+US6uVX5rv(Ml0
z72g(Y;JZkC+RB%$FW=la*LO14{m7$hmY=Hj{+l#GLg-L)I46(emq&gf<!!E^JFI8F
t;pzTz>aL2aL5tGNcBdo{k+}WOndAFJlapqDa{xMv!PC{xWt~$(69DkAVs`)l

delta 464
zcmV;>0WbcB0^S3V7=H)`00020X>r~F00E^*L_t(|obB47YQsPn2k?K#bP3cn5MoMP
z<OUOYgo(Yv#Kc62spunAbfQE=RO}TZ@(2-uP0rPoh)xVjU*IOjwU^R~U6KpO{y$S_
z?wY&rl7oKt0TxP<L_|>}T-Oz@>xw9fM3N*z=eMrf9-K+(dVhp;J?eWH{U{4xRG%-R
zEPRpWq1NgHmOlY)urdH;;R`Q_0RUbQW9%HD`xICi09CbFHR?ZTX&lCtg@0V}-F}FN
z`wwg9qOIu$NJK<LL_|bH^k-Qf3N<rhBki1EmWN{O901hQQ?}6xfI4|Eh~WjXwLxf<
z6_%;#e@VXo@_%%u@A2re{#>9J@^m)KLy_fSqtn^GT{r3c{PYC?m`t2D#zI6yL_|bH
zrWh+NlSz}iXgdIY{!**gr_<@+QoF7hxrtiYDGM8CbHCPRx!3|YrP->@%1978zkyuQ
z^Zeoa+v_o(kgi9#xqYl%mx1a!2%V?IcKacK(}b$c>PcdGtNOkClzqEo<P}iU=yFoa
zg;Q%Yo9_VtYC99<uf{e(S<)&e_1h+R-j0Zfh=_=YI`9oJSFT+DLi~aN0000<MNUMn
GLSTZm%HOX5

diff --git a/Resources/Textures/Buildings/light_small.rsi/on.png b/Resources/Textures/Buildings/light_small.rsi/on.png
index 558b9ab5cb548ced090248d8440d3025d40d19b6..adb120e1bb4e518b1ec018d830d73de28869f909 100644
GIT binary patch
delta 272
zcmZ3(GM{OJL_G^L0|P^Zd(K-R#aZAHS<Jw|Ed;`hm+sd60SZb7_=LCu>Hq(CLXf1S
zq>YWu<jIr&|2_y5S+}<56HuC^B*-tALCLvWGi6g1kUz`Q#WBR=cyhu4t{YA<!V(`C
zH-5O}vWIJm_O0FzCykp#I35HZNV!*kF>sB;EG9+QKVcl2(hFAv80m*49Z+vr$Jjlw
zOJw(~BMpiYTUwOc6Tb8{1sZU%u^DJ_K6u!~(lfF3!j1(>ZaeQ-@E-Iv)-!j~Ry%8b
z%31Kvg-?A+u3LnbEnduWu=M>42kk-*ErkqLM|YtwY6lynShuh<m@w$G8hUNt0dyuO
NgQu&X%Q~loCIFbTX#W5J

delta 543
zcmV+)0^t3h0;~j(7=H)`00020X>r~F00Hw!L_t(|ob8%1Zi6rwg&!3IS0F>AcIYX{
z5M@YikQ^c-Tjp+TaEKg%3{{8TB14ce<O~c*?f?Ws63Ipo;_|*FmTe*X+5R0r{eXdl
zVJJM$6RztD*L8*Gc_Iu$(dJukT@S8rggAVZ<;!`G%XxpdO@9@uqj5bAAr1=wD`buj
zJIyOI2e8usKx|pdZ=LTMwF6XESa%l~B>;eTG*=%0>=eixAHb^Uql{?+bdG5PBmiRA
zX@JbBYNZ%Z^ijqr0W52IDvFf|^~uY9l(4%V<P%7cpYvFX1F_Vmg>lzlNfGVKfS2g5
zJRyV-LI@#b+<&xw4E>kKh_(QYiLZ*^>vPmJA=>x>)#P&@4#m4XF4~L|K+6%59M{U2
ztQ(T8y!j!~wZuAiWrxNnPp}Vk1?b$B9U3hGR3f}-w?LaCkVMhZpUrnDZRy#3hbTJw
zFl_aK76QmCJeh7VnQrd35kd$dgb+ernx|xls2Zq47=Nw33ZQDB4r#RZEx@8E$_8ox
zpnN`G*=|1r0BH0pGrzRbUv=nB0BKck^Lhcy=DS+|-=D9%a3}v4J??@&1-MOWmdTu}
zmvA}n@u*MRBxqGeZ;Foo2=taIYFW#Z5Qi$Gvk?T>>vb&%mh}&Ups}~WxUa#ISN<bJ
h2qA<JLKw(M`2(LL`L$&wa}NLj002ovPDHLkV1ld6@R<Mr

diff --git a/Resources/Textures/Buildings/light_tube.rsi/broken.png b/Resources/Textures/Buildings/light_tube.rsi/broken.png
index 2472fbd385c5a1f2329831e5cf47a132fa2c1e57..1ff4dc63798a78794d85bea292fb88924d2d84bb 100644
GIT binary patch
delta 303
zcmV+~0nq-D1<?YK7zqRe00013M{MnpAs2rD8&FJCMF0Q*FETSVI5|T`M^RK&a&mH$
zlarsHpS88MZL2(a00001bW%=J06^y0W&i*H&q+i<R7l5TU|>`dQZ@zyBSj?v228+c
zESj1IVz7k;8e>)9BHq@~!N9=Lkx}S^O#y?FT4{NCIRis^c#;ysC?Fny0uC5#<+y(W
z4jl9i3=AE(f*urk2_QxquE--4{i9$M&;bZyNqdZfNE~G+Oa&@Nq$m&+!c?G$Y=vqW
zrh@b!B#v4;rh<wjB#vn+rh>3wB#s$26OxfQ1_Tu}U{Sz~tbl<G1qGxjV8^0@GzINs
zDBxfw6p{oLB$E<Z1f!c^f+3jXsE`|~31u9b0sx(9E`7S(RAc}E002ovPDHLkV1hT^
BY3Tp}

delta 625
zcmV-%0*?LB0+9uf7zqdl00020X>s0>As2rFLrFwIRCwC$o6kx@K@`SE8C;1gapgw$
z5)?rOJ%Mjf5cmK-jSnCM^#(43BFG>L#M<h{r7LlDH|95TF6WM9(Z<`%_k+ufSLf<E
z^Y6@jW5Fnnj!)L5Qpx3$Br%e&R4V2#ESJljXCXg+e=C@rVEr3n>|(Jn7w2u$Xf%J!
zY&LT#==FL({`h{szm_sc?;jpB&&?Bi9nfmEOs!UPuba)LONYbZ8fmA~*>QxtC!kEZ
zT>d`}K-1hbRc8d6>}s`g_fd;5L^Bu++~>O8Zt4g)Mea)(JOj^~&*$lP7(xgkgb+dq
zA%qY@2qA=!1CTqB;`FSYs!P{bmrj3NnM@{5r2<-r0V2fsNErw-H@A1`{nwXKro7FQ
z@epV0^}5SXr&DJ<q&aAeBGEy9)3Tg6#FyoC83?i>?IoM<(CU=UTMH0HS!z)PR<KW)
z6{kR$MJi<^)z8gs7l=`wC*;u6Ao`uWh^236n=J+h3^KTIIKrPNLj!RJrdodtkhqGm
zcL9rO0q1sb$y5<K2(mI=0H?tuY}|B#ppDnz_0#ic+XW<S^bbOXhz_q^3&7y#hm9el
z!)w@Xr3J{DzR=NUAIBe`+b-~%)1RS|nFjr}cF0Jj7yadA)GZ(ubY({$31%Gd-Tqog
z_~RT~fMonlMGk@iqbu7vKz3bHW56Hhq8$UI(yd+u#kLr74#2ihtcxM+2c#`P{@@fk
z`j22Bvn!0<p%^wru??6Gf-t&Tt)}8(48T^{4BMlR1fv&52#K68iEAKG{Xd0r00000
LNkvXXu0mjf_~arf

diff --git a/Resources/Textures/Buildings/light_tube.rsi/burned.png b/Resources/Textures/Buildings/light_tube.rsi/burned.png
index ede9cc3437c0d202f3cd74d381a1acf130f8408c..1b3b8f7809ec008fbfd02069b6ef3671b1a42cd0 100644
GIT binary patch
delta 551
zcmV+?0@(e+2gn4F83+Ra005o0f$WhX7k>bLP)t-s0000lGBY(eIYLE7Lq<nYQBhG;
zRajV9VPRopWMpk^ZEkLEaBy&Pa&mQbb#``kcXxMrd3kzzdVG9*eSLj?etv&{e}RF4
zf`WpBgM)^KhKGlTh=_=ZiHVAeii?Yjk&%&-l9H2?lbM;BnwpxMo131Vo}ZtepnssC
zs;a8*jneV}0004WQchC<K<3zH0004FNkl<ZSi|kq$!>)(3<Xf^7iPi?VJ2bb|9`NX
zs@)LDsC`l^ao5q2t=KjU!vI7;WQ;NPVxK_-L@;Op#(?LxsIwwT!&vl5;YJ)7BLkKN
zn+i@@iahqC>gXENX~D9nfPsk9!hd%)jKd&%HLsIbPKancdGeb<#HsYAbymF`hH+3k
zU+xSVSQfO7*>p!0`Ef2vc?N2`G3vk=@W?HaUc_OV6j?3o{MNF4ulv`=-&*%4Po6ya
ze*u7>Jw#@aE<IWd-va;u4bZm0+lc~98`rcDIVA;HRDKOG*Yqd=4{UY~6n_n=h5Zy7
zAn8^Lpk%E9`eUX5Lz!s+Q7H;Aib4a#QBSHMPhQtR=t~k1r<w}Vc%T5%53hk&l9PZw
zigj}!M$$J{x;e;7QU&wTYk*pkzH#jm-5i`dX&W2e9M}P;0G{by1DLCY0+ddqxd(is
p9h8>8>!kgKt89=$e)v!F0TiLO7Ac$-7Qg@i002ovPDHLkV1hr$^0)v1

delta 932
zcmV;V16%ya1i}Z983+ad0063Kao&+37k>kENkl<Zc-rloX-gbI5Qb~V@jmgu1M!2P
zC@6u1Kn&!MB#<8$Nd842Aw&ZqfuNu$h=_=?-nZ+q@hMZ|?wT0#A#pNYFErCL!}M;|
zRCmACZ%<B2@ZjO2Vognr)(eG#SiPmCMJiD&7A2R<$z9mn+q=~k^>1Il-2LD`M1Nd)
z!HnJ5*pO#WC#12lQ5F^!WOQ^?q9~Hn(^Ea3ot>!zIC9?5&>(enb+WUwBh}T_vbwq|
z?d|Pyets@*-@PwuH%*9s<^cP%V`F2|)zu|EJw56Gu2)r6X^G=lE-o(AAr=kY-QCjK
z+NzG&+}xCWKCjPLwworDMF63B6@RKl>V)j!;h`GC8>WttL<C2S2DP=da&mGa_4W1Y
zjE;^DJ@4=D*9d58YSOk=R#uYV5QoFza5x+ehr{7;I2;a#!{Kl^9FBWH>O_jiPbP|1
zfBE9MN@-hLTQWR6tRl_j<)sQR$H&KdPF)T8A=YrMxw%=Ur>A9PWJK@3dVl>UY5()5
zsWO}6G#QULi=qS;7Z>H=;6Rp_msM}<?d?@{3Yl(weO>RFB8BpVREKj=s!*?}b01|2
zL3VI(P}?nB{YI%e6{jr%Oi>1=EuuwYj0v))MPe-X5MVjSXr9MmYiny72}?^$x7tl@
z7x)u-z7)Tb>i-9M-r>0KX@8J@XD6ZbjZ&Lq1_#@{!RCm{c`|E&XE4<=KvJU6yFkpe
z0NbM2RFQQ+vdX#uyTKqFu%@dnkZI$g*D%GInHl*oId$Cyppo<Q^Qqgy_BQ}~ght~8
zwVlC_WCQw01Y{j^b8||Wp~~2<xj<iEpC$`%=d5FVd|coD?Ch-MKYvbMJAfp^c6w$V
z`}_OX(_a+bWP@#OZMw_Ta_cOEtdg{vU9KRqi{#xQIDo8?w_g?kM@L7RQZhnj9oWhG
z0foA{!B$T~7z1ogfJmTd1hBo`w!(+N16WVAXpad4N+>kgBHdPyVk$%cYiqyz0wfDy
z5f#E`+x?R<fMOT3-hTxK1_qMxF1Cx%!Vn^Wu?`x%ySsbi0N%c>yN56aU@zT1aR9t{
zdwV+}2U!MLFQ4!5X^%z(ym)A6NRuI?q^yJQn4ta~lO-`ipOG;H9?;p@sX8M}P^oe0
z3MpJ5ghf%9U@|CTG+r_BFa%&LHe-A6tHQwxBMwL4_zuS#wGj%(?e1s*0000<MNUMn
GLSTZ0)xn+s

diff --git a/Resources/Textures/Buildings/light_tube.rsi/empty.png b/Resources/Textures/Buildings/light_tube.rsi/empty.png
index 2c82a81c49b18e6844741d201942654024b243fc..387d657e83a9a9d0be3f71c57ce44157a31d4b06 100644
GIT binary patch
delta 194
zcmbQn{FHHm1SbnK0|P^Zd(PX5isJPQ`~f~8u0R2OBV$twOJ_Itz>rW)j!sjc5MxP@
zUoeBivm0qZPQIs$V~EG`<b;F}p&&ChW@T4ZMmC=V89EKEoof!bGH?q^YG@va@bThV
z+)&}5@qmNP_TdR-k-v)*L@qFLa0v*6lpUIqUKFO_*tkGIjP*pAMndUKCOu9ro()<C
s5}^hvq5<>dIMgh)mSj0ewl4#^@TK7KkazbIfOa!@y85}Sb4q9e08KSGtN;K2

delta 372
zcmaFLIE{IN1Sba@0|UdV%))yU6~*frJv?0;Ln>~)owYIRumexq)Wa2Do?M(9uW%tK
z<9@xz0+kEmAAo#!{k;E&T9tVv52@~5@V=ROVuQ@zYj;^arM++L+q14T_W!NZn<BQ%
zUbZoM#`B;3`Zwc`A3nyl(CWVeo3-!c+IQuVbt_tY|4wt+p>kkt{vWCDpJtmfPnl)E
zvVPa8KF!(8Kc$X;{KCTwbQcW#VDHKf+OxNQ&Bb$9XYGDwJVj(rRY&agnbT&i*g0YS
zi}3Rv`&WCNZnzOxH|72!){d347u(kBCo<0aE9K+ws=xQQ$uqCR+=W%nhXr@OyBBov
z;HuXF?Tf-b>|@o66_kp(bjngJ*yyl9Ov1m}FL;l>tK)7Fa=$LunxxJwz`%%t4lHMw
z_xkCSBX8Ddt(i2VeNo1(avrW-xzVqG-#Z%}zNRa3<7U=9=57pgKJ(s7tKFf;pM4$V
N2TxZ&mvv4FO#o=Oth4|C

diff --git a/Resources/Textures/Buildings/light_tube.rsi/off.png b/Resources/Textures/Buildings/light_tube.rsi/off.png
index ff5f3247854fc1de17bee968eaa81704a87f3375..2ea7f9308d372dde3db57c07160a25866010be74 100644
GIT binary patch
delta 245
zcmV<R01E%A1egMl7zqRe00013M{MnpAs2rD8&FJCMF0Q*FETSVI5|T`M^RK&a&mH$
zlarsHpS88MZL2(a00001bW%=J06^y0W&i*HmPtfGR7l5TU|>`dQZ@zyBSj?v228+c
zESj1I24R85SQWU4w{?I)MxhHf1q@1RrR87{o}|Pu3Wx`U0*+wN6OKGW(LV}C0Ucq0
zAeOYpD2T*ScEVJkVnm7pK_N^9ipW-|mSHML4?^OowPPx%NJ8S6reZ1x3r6CYVKX6l
vRKY+fAQ)K$qnluYA(-T-kg5q~9GU_E<T^gFqnQhU00000NkvXXu0mjf`NCD9

delta 521
zcmV+k0`~ow0;&X%7zqdl00020X>s0>As2rE+(|@1RCwC$n?Xy%Fcil#2|bOTN>9D4
z_aZ2Q6Z|3yemFtDg`fyd5QR~_u9qHn8awqe`;WYmP7u4xvgH4R(zKA2_xh5&=AVv~
z#qr7MCW<0cZkk3(IgVqs3#--YS6e90Ki)^m5%l&AF?P9Js>_S1noK6Dsw#6Hg4BP(
z`Qh=Y*RD(a>42grRGOydI?waLjib(ZJU$!;AT--h-Jpz+U9Z>O+k_!QBLH>K2HL9Y
zx_gEqgb+dqA%qY@2qA<JLI~Ld&WRLf=hKapZ?3P5xKfs-QK^O?bs)^#-raZi-(F`u
zo3%^EL!8aB%#;_4g)tt|95hCe=>C6;T?c}!NPA8D3|pPju0?<-%JLRPU>%Cok+a>d
zvt1xWd7hAcPlM=pauG`3ux-{D95Be>z~+eUdD1tKXJD$u0Ey!$^e&(=Enwdc4w))^
z2T4}13t%^xq>XJC@Y;Agy?%a~{d56I8;5R$Iz;UB+C%^bzwNZqXYBMEwrh2X0NK;$
zJNDkk`R5mB0Xl#VpabXtI)DzK1Ly!cAlUT)`y(i{k0Ij#EDMGDF@*JiE&}8SC*QGu
z1OvTQVXO{?uqcXUz-|zP(Mgi*^k3ki0$X7-Y!7}G2woT=Byhd~JNx88G5=TR00000
LNkvXXu0mjfUETLI

diff --git a/Resources/Textures/Buildings/light_tube.rsi/on.png b/Resources/Textures/Buildings/light_tube.rsi/on.png
index b8011ba8fe379537a401594908edb0fa3bd6c2f8..dd59607b2122e47a676c92965eeed4ce93789d4c 100644
GIT binary patch
delta 304
zcmdnbdWmU*1SbnK0|P^Zd(PX5isJPQS^+*Gu0VnRV4!bgY-(ZY?B*UA5?WMLG<ovm
z`Sa%=I&|pq!-wzQy#p$Vd7Q%uRLxux<QL4qt5SSB&I!of@9E+g;&D7VA)(B$ke9Vt
zAYGi9&F6qj*4A2ci4c9hqpK9o{yG+G@Z#p2Hebf(?(1G1oSUcZFi5Cp^(ttHofjy;
z$0E_jrSK-h>7JTM!GQ(#jGVvX-Z=VOeByBZuOY!|!hXymNN%&?l!vpLVjH75Vi=Xp
zDj9b$B@4UeaJ9@y46As1XkEfrA&t|&Mao#Sw>v~WoO?s`j7ICGMfu6$8_Hj=V5-tq
zkchmueS>zy=GGf5&ITt1eYUX3OtwAP<DAUEz!y;Tctv`bEzmOzp00i_>zopr06<cB
A*Z=?k

delta 672
zcmV;R0$=^o0>1^27zqdl00020X>s0>As2rFaY;l$RCwC$n?Y+DK@`W|$l|5yN$5oq
z)aD#$X=w^x(vp4+zd%VsAo&a_gp%(Qa`4cUgcbyEt%|9af_PAK@v`;*$SkX^fencn
zcK$zDc3j-I`+qw#`)1y(kr<mVUxnFhR?E}rRBX9WD9C*njYj|2Lb>_lyAekS77u?|
zv4g=tPCg$?d3{~JoSw@5?rtK(_MC37C!hBA=j^(~oeqHb(%PDo%Vpgs0p~o+=heod
zU1uGDsyVBwA<C$-czW1!xt#Q`uM-)@IjvSptgU{(A6>&G2Q0mrFbrQj=!J~=B@SYi
zh|fRD#f%vXA%qY@2qA<JLI@#*JRyI^#hY5?q^xoE$*gKx-Z=-ne!CUgGE#G(-EPZ=
z?d?Q%&d$%JTCHmN;P5Cqe)a8QPIKUrcqC^_rIMCAosOo}kX~yxn~76%lgUJCwVGzM
zkdUoZDtdf6yGA@a6}VOdY(^O%Ee9ubyWPa8IeQLlEZTLp3HX?vC*-LEA+&!x`@@&E
z5!W1`b3iA94T~cd-;-$raRy$s=peCWRvC)A7+z=aTEMy;1RjqOg1Q)9Ln|~xyH<%t
zqY?h@^>mLvrL_h?TU;x&Yb0nxPG5+J)d4y`tm(tDHmvMI{G4Vmu)^2^p|VDp?{_|G
zl>oQ<R5yXRR%p-o9thC^bO3)HKnKtPbO0Sd2hah&qNBn1V5nZNr&=&FMo5}qFr;8i
zYzGLw%m)mIL)9G32iWY1FWijBk><HsVN8%-UVPn{75}8|`<~lc{rt_=yPrB0W;;QM
zE*6VX^3c_<yB-3o4O*cY+A~Z3I8LGX|7!9+F+zyv`~`*DYn0(%Ykdp=0000<MNUMn
GLSTZ*CPEqj