Glowy lights - light fixtures now actually glow (#23428)

* glowy lights - makes light fixtures actually physically glow when active

* serviced the lights

* ya sure
This commit is contained in:
deathride58
2024-01-03 03:46:11 -05:00
committed by GitHub
parent 970fa54f0c
commit 1a531342c5
17 changed files with 40 additions and 32 deletions

View File

@@ -30,6 +30,9 @@ public sealed class PoweredLightVisualizerSystem : VisualizerSystem<PoweredLight
if (comp.SpriteStateMap.TryGetValue(state, out var spriteState))
args.Sprite.LayerSetState(PoweredLightLayers.Base, spriteState);
if (args.Sprite.LayerExists(PoweredLightLayers.Glow))
args.Sprite.LayerSetVisible(PoweredLightLayers.Glow, state == PoweredLightState.On);
SetBlinkingAnimation(
uid,
state == PoweredLightState.On

View File

@@ -21,6 +21,7 @@ namespace Content.Shared.Light
public enum PoweredLightLayers : byte
{
Base
Base,
Glow
}
}

View File

@@ -26,9 +26,12 @@
sprite: Structures/Wallmounts/Lighting/light_tube.rsi
drawdepth: WallMountedItems
layers:
- state: on
map: ["enum.PoweredLightLayers.Base"]
state: on
- map: ["enum.PoweredLightLayers.Base"]
state: base
- map: ["enum.PoweredLightLayers.Glow"]
state: glow
shader: unshaded
state: base
- type: PointLight
radius: 10
energy: 0.8
@@ -98,6 +101,12 @@
- type: PoweredLightVisuals
blinkingSound:
path: "/Audio/Machines/light_tube_on.ogg"
spriteStateMap:
empty: empty
off: base
on: base
broken: broken
burned: burned
- type: entity
id: Poweredlight
@@ -106,7 +115,7 @@
parent: PoweredlightEmpty
components:
- type: Sprite
state: off
state: base
- type: PointLight
enabled: true
- type: PoweredLight
@@ -208,7 +217,7 @@
path: /Audio/Ambience/Objects/light_hum.ogg
- type: Sprite
sprite: Structures/Wallmounts/Lighting/light_small.rsi
state: on
state: base
- type: PointLight
energy: 1.0
radius: 6
@@ -272,6 +281,12 @@
range: 200
- type: Appearance
- type: PoweredLightVisuals
spriteStateMap:
empty: empty
off: base
on: base
broken: broken
burned: burned
- type: DeviceLinkSink
ports:
- On
@@ -284,7 +299,7 @@
parent: PoweredSmallLightEmpty
components:
- type: Sprite
state: off
state: base
- type: PointLight
enabled: true
- type: PoweredLight

View File

@@ -8,9 +8,12 @@
sprite: Structures/Wallmounts/service_light.rsi
drawdepth: WallMountedItems
layers:
- state: off
map: ["enum.PoweredLightLayers.Base"]
state: off
- map: ["enum.PoweredLightLayers.Base"]
state: base
- map: ["enum.PoweredLightLayers.Glow"]
state: glow
shader: unshaded
state: base
- type: PointLight
radius: 1
energy: 1

View File

@@ -1045,7 +1045,7 @@
description: A wall light fixture. Use light tubes.
icon:
sprite: Structures/Wallmounts/Lighting/light_tube.rsi
state: off
state: base
objectType: Structure
placementMode: SnapgridCenter
canRotate: true
@@ -1065,7 +1065,7 @@
description: A wall light fixture. Use light bulbs.
icon:
sprite: Structures/Wallmounts/Lighting/light_small.rsi
state: off
state: base
objectType: Structure
placementMode: SnapgridCenter
canRotate: true

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -1 +1 @@
{"version": 1, "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}, {"name": "burned", "directions": 4}, {"name": "empty", "directions": 4}, {"name": "off", "directions": 4}, {"name": "on", "directions": 4}]}
{"version": 1, "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}, {"name": "burned", "directions": 4}, {"name": "empty", "directions": 4}, {"name": "base", "directions": 4}, {"name": "glow", "directions": 4}]}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

View File

@@ -62,7 +62,7 @@
]
},
{
"name": "off",
"name": "base",
"directions": 4,
"delays": [
[
@@ -80,22 +80,8 @@
]
},
{
"name": "on",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
"name": "glow",
"directions": 4
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 864 B

View File

Before

Width:  |  Height:  |  Size: 765 B

After

Width:  |  Height:  |  Size: 765 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -20,11 +20,11 @@
"directions": 4
},
{
"name": "off",
"name": "base",
"directions": 4
},
{
"name": "on",
"name": "glow",
"directions": 4,
"delays": [
[

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB