Port light tube, APC, air alarm, fire alarm resprites

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -16,7 +16,7 @@
     graph: LightFixture
     node: tubeLight
   - type: Sprite
-    sprite: Structures/Wallmounts/Lighting/light_tube.rsi
+    sprite: _Funkystation/Structures/Wallmounts/Lighting/light_tube.rsi
     drawdepth: WallMountedItems
     layers:
     - map: ["enum.PoweredLightLayers.Base"]
@@ -84,7 +84,7 @@
   parent: AlwaysPoweredWallLight
   components:
   - type: Sprite
-    sprite: Structures/Wallmounts/Lighting/light_tube.rsi
+    sprite: _Funkystation/Structures/Wallmounts/Lighting/light_tube.rsi
     state: empty
   - type: PointLight
     enabled: false

Resources/Prototypes/Entities/Structures/Power/apc.yml

@@ -24,7 +24,7 @@
     access: [["Engineering"]]
   - type: Sprite
     drawdepth: WallMountedItems
-    sprite: Structures/Power/apc.rsi
+    sprite: _Funkystation/Structures/Power/apc.rsi
     layers:
     - state: base
     - state: panel
@@ -78,7 +78,7 @@
     sourceNode: input
     loadNode: output
     collectionName: apc
-    sprite: Structures/Power/apc.rsi
+    sprite: _Funkystation/Structures/Power/apc.rsi
     state: static
   - type: BatteryCharger
     voltage: Medium
@@ -160,7 +160,7 @@
     mode: SnapgridCenter
   components:
   - type: Sprite
-    sprite: Structures/Power/apc.rsi
+    sprite: _Funkystation/Structures/Power/apc.rsi
     state: frame
   - type: Construction
     graph: APC

Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/air_alarm.yml

@@ -77,12 +77,13 @@
   - type: Appearance
   - type: WiresVisuals
   - type: Sprite
-    sprite: Structures/Wallmounts/air_monitors.rsi
+    sprite: _Funkystation/Structures/Wallmounts/air_monitors.rsi
     layers:
     - state: alarmp
       map: ["airAlarmBase"]
     - state: alarm0
       map: ["airAlarmState"] # TODO: fire alarm enum
+      shader: unshaded # funkystation
     - state: alarmx
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Construction
@@ -117,7 +118,7 @@
   description: An air alarm. Doesn't look like it'll be alarming air any time soon.
   components:
   - type: Sprite
-    sprite: Structures/Wallmounts/air_monitors.rsi
+    sprite: _Funkystation/Structures/Wallmounts/air_monitors.rsi
     layers:
     - state: alarm_b1
       map: [ "enum.ConstructionVisuals.Layer" ]

Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/fire_alarm.yml

@@ -68,12 +68,13 @@
     boardName: wires-board-name-firealarm
     layoutId: FireAlarm
   - type: Sprite
-    sprite: Structures/Wallmounts/air_monitors.rsi
+    sprite: _Funkystation/Structures/Wallmounts/air_monitors.rsi
     layers:
     - state: fire0
       map: ["fireAlarmBase"]
     - state: fire_off
       map: ["fireAlarmState"]
+      shader: unshaded # funkystation
     - state: fire_b2
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Transform
@@ -110,7 +111,7 @@
   description: A fire alarm assembly. Very mild.
   components:
   - type: Sprite
-    sprite: Structures/Wallmounts/air_monitors.rsi
+    sprite: _Funkystation/Structures/Wallmounts/air_monitors.rsi
     layers:
     - state: fire_b1
       map: [ "enum.ConstructionVisuals.Layer" ]

Resources/Textures/_Funkystation/Structures/Power/apc.rsi/meta.json

@@ -0,0 +1,205 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-3.0",
+  "copyright": "Alecksohs (https://github.com/funky-station/funky-station/pull/2451) and vectorassembly (https://github.com/funky-station/funky-station/pull/865)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+	{
+      "name": "static"
+    },
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "frame",
+      "directions": 4
+    },
+    {
+      "name": "panel",
+      "directions": 4
+    },
+    {
+      "name": "lock0-locked",
+      "directions": 4
+    },
+    {
+      "name": "lock1-locked",
+      "directions": 4
+    },
+    {
+      "name": "display-lack",
+      "directions": 4,
+      "delays": [
+        [
+          0.25,
+          0.25,
+          1,
+          3
+        ],
+        [
+          0.25,
+          0.25,
+          1,
+          3
+        ],
+        [
+          0.25,
+          0.25,
+          1,
+          3
+        ],
+        [
+          0.25,
+          0.25,
+          1,
+          3
+        ]
+      ]
+    },
+    {
+      "name": "display-charging",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "display-full",
+      "directions": 4,
+      "delays": [
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ],
+        [
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "display-remote",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "emag-unlit",
+      "directions": 4,
+      "delays": [
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5
+        ]
+      ]
+    },
+    {
+      "name": "sparks-unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/_Funkystation/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Alecksohs (https://github.com/funky-station/funky-station/pull/2451)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "broken",
+      "directions": 4
+    },
+    {
+      "name": "burned",
+      "directions": 4
+    },
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "empty",
+      "directions": 4
+    },
+	{
+      "name": "glow",
+      "directions": 4
+    }
+  ]
+}