diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs index 144ef90367..03f0af16c5 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs @@ -1,4 +1,5 @@ using System; +using Content.Client.GameObjects.Components.Wires; using Content.Shared.GameObjects.Components.Doors; using Robust.Client.Animations; using Robust.Client.GameObjects; @@ -38,6 +39,11 @@ namespace Content.Client.GameObjects.Components.Doors flickUnlit.LayerKey = DoorVisualLayers.BaseUnlit; flickUnlit.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("closing_unlit", 0f)); + var flickMaintenancePanel = new AnimationTrackSpriteFlick(); + CloseAnimation.AnimationTracks.Add(flickMaintenancePanel); + flickMaintenancePanel.LayerKey = WiresVisualizer2D.WiresVisualLayers.MaintenancePanel; + flickMaintenancePanel.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("panel_closing", 0f)); + var sound = new AnimationTrackPlaySound(); CloseAnimation.AnimationTracks.Add(sound); sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(closeSound, 0)); @@ -55,6 +61,11 @@ namespace Content.Client.GameObjects.Components.Doors flickUnlit.LayerKey = DoorVisualLayers.BaseUnlit; flickUnlit.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("opening_unlit", 0f)); + var flickMaintenancePanel = new AnimationTrackSpriteFlick(); + OpenAnimation.AnimationTracks.Add(flickMaintenancePanel); + flickMaintenancePanel.LayerKey = WiresVisualizer2D.WiresVisualLayers.MaintenancePanel; + flickMaintenancePanel.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("panel_opening", 0f)); + var sound = new AnimationTrackPlaySound(); OpenAnimation.AnimationTracks.Add(sound); sound.KeyFrames.Add(new AnimationTrackPlaySound.KeyFrame(openSound, 0)); @@ -96,6 +107,7 @@ namespace Content.Client.GameObjects.Components.Doors case DoorVisualState.Closed: sprite.LayerSetState(DoorVisualLayers.Base, "closed"); sprite.LayerSetState(DoorVisualLayers.BaseUnlit, "closed_unlit"); + sprite.LayerSetState(WiresVisualizer2D.WiresVisualLayers.MaintenancePanel, "panel_open"); break; case DoorVisualState.Closing: if (!animPlayer.HasRunningAnimation(AnimationKey)) diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs index b3c4cede7d..3e064befc4 100644 --- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs @@ -79,7 +79,7 @@ namespace Content.Server.GameObjects.Components.Doors { base.State = value; // Only show the maintenance panel if the airlock is closed - _wires.IsPanelVisible = value == DoorState.Closed; + _wires.IsPanelVisible = value != DoorState.Open; } } diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/meta.json b/Resources/Textures/Buildings/airlock_basic.rsi/meta.json index 7d2879643a..3fc7cd1f31 100644 --- a/Resources/Textures/Buildings/airlock_basic.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_basic.rsi/meta.json @@ -71,7 +71,7 @@ ] }, { - "name": "o_closing", + "name": "panel_closing", "directions": 1, "delays": [ [ @@ -87,7 +87,7 @@ ] }, { - "name": "o_opening", + "name": "panel_opening", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_basic.rsi/o_closing.png deleted file mode 100644 index 56ba00b3e0..0000000000 Binary files a/Resources/Textures/Buildings/airlock_basic.rsi/o_closing.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_basic.rsi/o_opening.png deleted file mode 100644 index 8bdc9f6b5c..0000000000 Binary files a/Resources/Textures/Buildings/airlock_basic.rsi/o_opening.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/panel_closing.png b/Resources/Textures/Buildings/airlock_basic.rsi/panel_closing.png new file mode 100644 index 0000000000..edb14f460c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_basic.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_basic.rsi/panel_opening.png b/Resources/Textures/Buildings/airlock_basic.rsi/panel_opening.png new file mode 100644 index 0000000000..c5970003dc Binary files /dev/null and b/Resources/Textures/Buildings/airlock_basic.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/meta.json b/Resources/Textures/Buildings/airlock_engineering.rsi/meta.json index cc6b01d73b..5d35cc5738 100644 --- a/Resources/Textures/Buildings/airlock_engineering.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_engineering.rsi/meta.json @@ -71,7 +71,7 @@ ] }, { - "name": "o_closing", + "name": "panel_closing", "directions": 1, "delays": [ [ @@ -87,7 +87,7 @@ ] }, { - "name": "o_opening", + "name": "panel_opening", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_engineering.rsi/o_closing.png deleted file mode 100644 index b986d57b98..0000000000 Binary files a/Resources/Textures/Buildings/airlock_engineering.rsi/o_closing.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_engineering.rsi/o_opening.png deleted file mode 100644 index b8c8dd222b..0000000000 Binary files a/Resources/Textures/Buildings/airlock_engineering.rsi/o_opening.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/panel_closing.png b/Resources/Textures/Buildings/airlock_engineering.rsi/panel_closing.png new file mode 100644 index 0000000000..edb14f460c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_engineering.rsi/panel_opening.png b/Resources/Textures/Buildings/airlock_engineering.rsi/panel_opening.png new file mode 100644 index 0000000000..c5970003dc Binary files /dev/null and b/Resources/Textures/Buildings/airlock_engineering.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/closed.png b/Resources/Textures/Buildings/airlock_external.rsi/closed.png index 53c5c29f5a..b7218a851c 100644 Binary files a/Resources/Textures/Buildings/airlock_external.rsi/closed.png and b/Resources/Textures/Buildings/airlock_external.rsi/closed.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/meta.json b/Resources/Textures/Buildings/airlock_external.rsi/meta.json index 7e82245953..bf6745c6f8 100644 --- a/Resources/Textures/Buildings/airlock_external.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_external.rsi/meta.json @@ -68,7 +68,7 @@ ] }, { - "name": "o_closing", + "name": "panel_closing", "directions": 1, "delays": [ [ @@ -83,7 +83,7 @@ ] }, { - "name": "o_opening", + "name": "panel_opening", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_external.rsi/o_closing.png deleted file mode 100644 index 5000ac45ad..0000000000 Binary files a/Resources/Textures/Buildings/airlock_external.rsi/o_closing.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_external.rsi/o_opening.png deleted file mode 100644 index dcd395be25..0000000000 Binary files a/Resources/Textures/Buildings/airlock_external.rsi/o_opening.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/panel_closing.png b/Resources/Textures/Buildings/airlock_external.rsi/panel_closing.png new file mode 100644 index 0000000000..18f3eea53b Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_external.rsi/panel_opening.png b/Resources/Textures/Buildings/airlock_external.rsi/panel_opening.png new file mode 100644 index 0000000000..c0a058e83a Binary files /dev/null and b/Resources/Textures/Buildings/airlock_external.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_medical.rsi/meta.json b/Resources/Textures/Buildings/airlock_medical.rsi/meta.json index cc6b01d73b..5d35cc5738 100644 --- a/Resources/Textures/Buildings/airlock_medical.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_medical.rsi/meta.json @@ -71,7 +71,7 @@ ] }, { - "name": "o_closing", + "name": "panel_closing", "directions": 1, "delays": [ [ @@ -87,7 +87,7 @@ ] }, { - "name": "o_opening", + "name": "panel_opening", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/airlock_medical.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_medical.rsi/o_closing.png deleted file mode 100644 index c9f5bf754c..0000000000 Binary files a/Resources/Textures/Buildings/airlock_medical.rsi/o_closing.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_medical.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_medical.rsi/o_opening.png deleted file mode 100644 index 4c490196ed..0000000000 Binary files a/Resources/Textures/Buildings/airlock_medical.rsi/o_opening.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_medical.rsi/panel_closing.png b/Resources/Textures/Buildings/airlock_medical.rsi/panel_closing.png new file mode 100644 index 0000000000..edb14f460c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_medical.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_medical.rsi/panel_opening.png b/Resources/Textures/Buildings/airlock_medical.rsi/panel_opening.png new file mode 100644 index 0000000000..c5970003dc Binary files /dev/null and b/Resources/Textures/Buildings/airlock_medical.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_medical_glass.rsi/meta.json b/Resources/Textures/Buildings/airlock_medical_glass.rsi/meta.json index cc6b01d73b..5d35cc5738 100644 --- a/Resources/Textures/Buildings/airlock_medical_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_medical_glass.rsi/meta.json @@ -71,7 +71,7 @@ ] }, { - "name": "o_closing", + "name": "panel_closing", "directions": 1, "delays": [ [ @@ -87,7 +87,7 @@ ] }, { - "name": "o_opening", + "name": "panel_opening", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/airlock_medical_glass.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_medical_glass.rsi/o_closing.png deleted file mode 100644 index 30a510a010..0000000000 Binary files a/Resources/Textures/Buildings/airlock_medical_glass.rsi/o_closing.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_medical_glass.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_medical_glass.rsi/o_opening.png deleted file mode 100644 index c7fd82b4f4..0000000000 Binary files a/Resources/Textures/Buildings/airlock_medical_glass.rsi/o_opening.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_medical_glass.rsi/panel_closing.png b/Resources/Textures/Buildings/airlock_medical_glass.rsi/panel_closing.png new file mode 100644 index 0000000000..edb14f460c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_medical_glass.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_medical_glass.rsi/panel_opening.png b/Resources/Textures/Buildings/airlock_medical_glass.rsi/panel_opening.png new file mode 100644 index 0000000000..c5970003dc Binary files /dev/null and b/Resources/Textures/Buildings/airlock_medical_glass.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_science.rsi/meta.json b/Resources/Textures/Buildings/airlock_science.rsi/meta.json index cc6b01d73b..5d35cc5738 100644 --- a/Resources/Textures/Buildings/airlock_science.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_science.rsi/meta.json @@ -71,7 +71,7 @@ ] }, { - "name": "o_closing", + "name": "panel_closing", "directions": 1, "delays": [ [ @@ -87,7 +87,7 @@ ] }, { - "name": "o_opening", + "name": "panel_opening", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/airlock_science.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_science.rsi/o_closing.png deleted file mode 100644 index 32965c64fc..0000000000 Binary files a/Resources/Textures/Buildings/airlock_science.rsi/o_closing.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_science.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_science.rsi/o_opening.png deleted file mode 100644 index 27d2017fc9..0000000000 Binary files a/Resources/Textures/Buildings/airlock_science.rsi/o_opening.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_science.rsi/panel_closing.png b/Resources/Textures/Buildings/airlock_science.rsi/panel_closing.png new file mode 100644 index 0000000000..edb14f460c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_science.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_science.rsi/panel_opening.png b/Resources/Textures/Buildings/airlock_science.rsi/panel_opening.png new file mode 100644 index 0000000000..c5970003dc Binary files /dev/null and b/Resources/Textures/Buildings/airlock_science.rsi/panel_opening.png differ diff --git a/Resources/Textures/Buildings/airlock_science_glass.rsi/meta.json b/Resources/Textures/Buildings/airlock_science_glass.rsi/meta.json index cc6b01d73b..5d35cc5738 100644 --- a/Resources/Textures/Buildings/airlock_science_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/airlock_science_glass.rsi/meta.json @@ -71,7 +71,7 @@ ] }, { - "name": "o_closing", + "name": "panel_closing", "directions": 1, "delays": [ [ @@ -87,7 +87,7 @@ ] }, { - "name": "o_opening", + "name": "panel_opening", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/airlock_science_glass.rsi/o_closing.png b/Resources/Textures/Buildings/airlock_science_glass.rsi/o_closing.png deleted file mode 100644 index e37711ad68..0000000000 Binary files a/Resources/Textures/Buildings/airlock_science_glass.rsi/o_closing.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_science_glass.rsi/o_opening.png b/Resources/Textures/Buildings/airlock_science_glass.rsi/o_opening.png deleted file mode 100644 index 6212201009..0000000000 Binary files a/Resources/Textures/Buildings/airlock_science_glass.rsi/o_opening.png and /dev/null differ diff --git a/Resources/Textures/Buildings/airlock_science_glass.rsi/panel_closing.png b/Resources/Textures/Buildings/airlock_science_glass.rsi/panel_closing.png new file mode 100644 index 0000000000..edb14f460c Binary files /dev/null and b/Resources/Textures/Buildings/airlock_science_glass.rsi/panel_closing.png differ diff --git a/Resources/Textures/Buildings/airlock_science_glass.rsi/panel_opening.png b/Resources/Textures/Buildings/airlock_science_glass.rsi/panel_opening.png new file mode 100644 index 0000000000..c5970003dc Binary files /dev/null and b/Resources/Textures/Buildings/airlock_science_glass.rsi/panel_opening.png differ