diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs index be08f468c0..2b530c70b8 100644 --- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs +++ b/Content.Client/GameObjects/Components/Doors/AirlockVisualizer2D.cs @@ -97,7 +97,7 @@ namespace Content.Client.GameObjects.Components.Doors { if (component.Owner.Deleted) return; - + var sprite = component.Owner.GetComponent(); var animPlayer = component.Owner.GetComponent(); if (!component.TryGetData(DoorVisuals.VisualState, out DoorVisualState state)) @@ -106,11 +106,13 @@ namespace Content.Client.GameObjects.Components.Doors } var unlitVisible = true; + var boltedVisible = false; switch (state) { case DoorVisualState.Closed: sprite.LayerSetState(DoorVisualLayers.Base, "closed"); sprite.LayerSetState(DoorVisualLayers.BaseUnlit, "closed_unlit"); + sprite.LayerSetState(DoorVisualLayers.BaseBolted, "bolted"); sprite.LayerSetState(WiresVisualizer2D.WiresVisualLayers.MaintenancePanel, "panel_open"); break; case DoorVisualState.Closing: @@ -143,14 +145,20 @@ namespace Content.Client.GameObjects.Components.Doors { unlitVisible = false; } + if (component.TryGetData(DoorVisuals.BoltLights, out bool lights) && lights) + { + boltedVisible = true; + } sprite.LayerSetVisible(DoorVisualLayers.BaseUnlit, unlitVisible); + sprite.LayerSetVisible(DoorVisualLayers.BaseBolted, unlitVisible && boltedVisible); } } public enum DoorVisualLayers { Base, - BaseUnlit + BaseUnlit, + BaseBolted } } diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs index 2f2543c113..e5755e3c5b 100644 --- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs +++ b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs @@ -2,15 +2,16 @@ using System.Threading; using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Power.ApcNetComponents; -using Content.Server.GameObjects.Components.Power.PowerNetComponents; using Content.Server.GameObjects.Components.VendingMachines; using Content.Server.GameObjects.EntitySystems; using Content.Server.Interfaces; using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Interactable; using Robust.Server.GameObjects; +using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; using Robust.Shared.IoC; using Robust.Shared.Localization; using Robust.Shared.Maths; @@ -53,6 +54,32 @@ namespace Content.Server.GameObjects.Components.Doors } } + private bool _boltsDown; + + private bool BoltsDown + { + get => _boltsDown; + set + { + _boltsDown = value; + UpdateWiresStatus(); + UpdateBoltLightStatus(); + } + } + + private bool _boltLightsWirePulsed = true; + + private bool BoltLightsVisible + { + get => _boltLightsWirePulsed && BoltsDown && IsPowered() && State == DoorState.Closed; + set + { + _boltLightsWirePulsed = value; + UpdateWiresStatus(); + UpdateBoltLightStatus(); + } + } + private void UpdateWiresStatus() { var powerLight = new StatusLightData(Color.Yellow, StatusLightState.On, "POWR"); @@ -66,9 +93,14 @@ namespace Content.Server.GameObjects.Components.Doors powerLight = new StatusLightData(Color.Red, StatusLightState.On, "POWR"); } + var boltStatus = + new StatusLightData(Color.Red, BoltsDown ? StatusLightState.On : StatusLightState.Off, "BOLT"); + var boltLightsStatus = new StatusLightData(Color.Lime, + _boltLightsWirePulsed ? StatusLightState.On : StatusLightState.Off, "BLTL"); + _wires.SetStatus(AirlockWireStatus.PowerIndicator, powerLight); - _wires.SetStatus(1, new StatusLightData(Color.Red, StatusLightState.Off, "BOLT")); - _wires.SetStatus(2, new StatusLightData(Color.Lime, StatusLightState.On, "BLTL")); + _wires.SetStatus(AirlockWireStatus.BoltIndicator, boltStatus); + _wires.SetStatus(AirlockWireStatus.BoltLightIndicator, boltLightsStatus); _wires.SetStatus(3, new StatusLightData(Color.Purple, StatusLightState.BlinkingSlow, "AICT")); _wires.SetStatus(4, new StatusLightData(Color.Orange, StatusLightState.Off, "TIME")); _wires.SetStatus(5, new StatusLightData(Color.Red, StatusLightState.Off, "SAFE")); @@ -84,8 +116,16 @@ namespace Content.Server.GameObjects.Components.Doors private void UpdatePowerCutStatus() { _powerReceiver.PowerDisabled = PowerWiresPulsed || - _wires.IsWireCut(Wires.MainPower) || - _wires.IsWireCut(Wires.BackupPower); + _wires.IsWireCut(Wires.MainPower) || + _wires.IsWireCut(Wires.BackupPower); + } + + private void UpdateBoltLightStatus() + { + if (Owner.TryGetComponent(out AppearanceComponent appearance)) + { + appearance.SetData(DoorVisuals.BoltLights, BoltLightsVisible); + } } protected override DoorState State @@ -95,6 +135,8 @@ namespace Content.Server.GameObjects.Components.Doors base.State = value; // Only show the maintenance panel if the airlock is closed _wires.IsPanelVisible = value != DoorState.Open; + // If the door is closed, we should look if the bolt was locked while closing + UpdateBoltLightStatus(); } } @@ -123,6 +165,9 @@ namespace Content.Server.GameObjects.Components.Doors { appearance.SetData(DoorVisuals.Powered, e.Powered); } + + // BoltLights also got out + UpdateBoltLightStatus(); } protected override void ActivateImpl(ActivateEventArgs args) @@ -151,17 +196,31 @@ namespace Content.Server.GameObjects.Components.Doors /// BackupPower, + + /// + /// Pulsing causes for bolts to toggle (but only raise if power is on) + /// Cutting causes Bolts to drop + /// Mending does nothing + /// + Bolts, + + /// + /// Pulsing causes light to toggle + /// Cutting causes light to go out + /// Mending causes them to go on again + /// + BoltLight, } public void RegisterWires(WiresComponent.WiresBuilder builder) { builder.CreateWire(Wires.MainPower); builder.CreateWire(Wires.BackupPower); - builder.CreateWire(1); - builder.CreateWire(2); - builder.CreateWire(3); + builder.CreateWire(Wires.Bolts); + builder.CreateWire(Wires.BoltLight); builder.CreateWire(4); - /*builder.CreateWire(5); + builder.CreateWire(5); + /* builder.CreateWire(6); builder.CreateWire(7); builder.CreateWire(8); @@ -186,6 +245,24 @@ namespace Content.Server.GameObjects.Components.Doors () => PowerWiresPulsed = false, _powerWiresPulsedTimerCancel.Token); break; + case Wires.Bolts: + if (!BoltsDown) + { + SetBoltsWithAudio(true); + } + else + { + if (IsPowered()) // only raise again if powered + { + SetBoltsWithAudio(false); + } + } + + break; + case Wires.BoltLight: + // we need to change the property here to set the appearance again + BoltLightsVisible = !_boltLightsWirePulsed; + break; } } @@ -199,6 +276,22 @@ namespace Content.Server.GameObjects.Components.Doors _powerWiresPulsedTimerCancel?.Cancel(); PowerWiresPulsed = false; break; + case Wires.BoltLight: + BoltLightsVisible = true; + break; + } + } + + if (args.Action == Cut) + { + switch (args.Identifier) + { + case Wires.Bolts: + SetBoltsWithAudio(true); + break; + case Wires.BoltLight: + BoltLightsVisible = false; + break; } } @@ -208,17 +301,17 @@ namespace Content.Server.GameObjects.Components.Doors public override bool CanOpen() { - return IsPowered(); + return IsPowered() && !IsBolted(); } public override bool CanClose() { - return IsPowered(); + return IsPowered() && !IsBolted(); } public override void Deny() { - if (!IsPowered()) + if (!IsPowered() || IsBolted()) { return; } @@ -226,6 +319,11 @@ namespace Content.Server.GameObjects.Components.Doors base.Deny(); } + private bool IsBolted() + { + return _boltsDown; + } + private bool IsPowered() { return _powerReceiver.Powered; @@ -251,10 +349,18 @@ namespace Content.Server.GameObjects.Components.Doors if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Prying)) return false; + if (IsBolted()) + { + var notify = IoCManager.Resolve(); + notify.PopupMessage(Owner, eventArgs.User, + Loc.GetString("The airlock's bolts prevent it from being forced!")); + return true; + } + if (IsPowered()) { var notify = IoCManager.Resolve(); - notify.PopupMessage(Owner, eventArgs.User, "The powered motors block your efforts!"); + notify.PopupMessage(Owner, eventArgs.User, Loc.GetString("The powered motors block your efforts!")); return true; } @@ -265,5 +371,18 @@ namespace Content.Server.GameObjects.Components.Doors return true; } + + public void SetBoltsWithAudio(bool newBolts) + { + if (newBolts == BoltsDown) + { + return; + } + + BoltsDown = newBolts; + + EntitySystem.Get() + .PlayFromEntity(newBolts ? "/Audio/machines/boltsdown.ogg" : "/Audio/machines/boltsup.ogg", Owner); + } } } diff --git a/Content.Shared/GameObjects/Components/Doors/AirlockWireStatus.cs b/Content.Shared/GameObjects/Components/Doors/AirlockWireStatus.cs index f09d67beca..b2833d6abf 100644 --- a/Content.Shared/GameObjects/Components/Doors/AirlockWireStatus.cs +++ b/Content.Shared/GameObjects/Components/Doors/AirlockWireStatus.cs @@ -1,4 +1,4 @@ -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Doors @@ -7,5 +7,7 @@ namespace Content.Shared.GameObjects.Components.Doors public enum AirlockWireStatus { PowerIndicator, + BoltIndicator, + BoltLightIndicator, } } diff --git a/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs b/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs index 12c95c1a7d..37f34ac70d 100644 --- a/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs +++ b/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using Robust.Shared.Serialization; namespace Content.Shared.GameObjects.Components.Doors @@ -8,7 +8,8 @@ namespace Content.Shared.GameObjects.Components.Doors public enum DoorVisuals { VisualState, - Powered + Powered, + BoltLights } [NetSerializable] diff --git a/Resources/Audio/machines/boltsdown.ogg b/Resources/Audio/machines/boltsdown.ogg new file mode 100644 index 0000000000..61fde63e95 Binary files /dev/null and b/Resources/Audio/machines/boltsdown.ogg differ diff --git a/Resources/Audio/machines/boltsup.ogg b/Resources/Audio/machines/boltsup.ogg new file mode 100644 index 0000000000..108ee74b17 Binary files /dev/null and b/Resources/Audio/machines/boltsup.ogg differ diff --git a/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml index f90f1cf703..9e149d472d 100644 --- a/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Buildings/Doors/airlock_base.yml @@ -15,6 +15,9 @@ - state: closed_unlit shader: unshaded map: ["enum.DoorVisualLayers.BaseUnlit"] + - state: bolted + shader: unshaded + map: ["enum.DoorVisualLayers.BaseBolted"] - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Icon diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_basic.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_basic.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_basic.rsi/locked.png deleted file mode 100644 index fb22d2c3f5..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_basic.rsi/meta.json index e4dbb54abc..2668c9917b 100644 --- a/Resources/Textures/Buildings/Doors/airlock_basic.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_basic.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/locked.png deleted file mode 100644 index 14632928d3..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/meta.json index a1f6273c4c..466fa17a1e 100644 --- a/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_cargo.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormining.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.5, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.5]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormining.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.5, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.5]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/locked.png deleted file mode 100644 index 8f44e70188..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/meta.json index 2774ac8e48..8021143df2 100644 --- a/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_cargo_glass.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doorminingglass.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.5, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.5]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doorminingglass.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.5, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.5]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_command.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_command.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_command.rsi/locked.png deleted file mode 100644 index b41df31aa6..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_command.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_command.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_command.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_command.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_command.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/locked.png deleted file mode 100644 index 8bf04ab3ec..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_command_glass.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/locked.png deleted file mode 100644 index 1bda1f14c7..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_engineering.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/locked.png deleted file mode 100644 index 1b5b19d26a..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_engineering_glass.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_external.rsi/bolted.png new file mode 100644 index 0000000000..313ddd31aa Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_external.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_external.rsi/locked.png deleted file mode 100644 index 4e65d38d3e..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_external.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_external.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_external.rsi/meta.json index bf6745c6f8..c33c2259d7 100644 --- a/Resources/Textures/Buildings/Doors/airlock_external.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_external.rsi/meta.json @@ -59,7 +59,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/locked.png deleted file mode 100644 index 82e703c1e9..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/meta.json index 338bd1a375..634016e505 100644 --- a/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_freezer.rsi/meta.json @@ -1 +1 @@ -{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/doorint.dmi","states":[{"name":"closed","directions":1,"delays":[[1.0]]},{"name":"closed_unlit","directions":1},{"name":"closing","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"closing_unlit","directions":1,"delays":[[0.25,0.07,0.07,0.07,0.07,0.15]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"locked","directions":1,"delays":[[1.0]]},{"name":"panel_closing","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"panel_opening","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"open","directions":1,"delays":[[1.0]]},{"name":"opening","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"opening_unlit","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.25]]},{"name":"panel_open","directions":1,"delays":[[1.0]]},{"name":"spark","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"sparks_broken","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"sparks_damaged","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,1.7]]},{"name":"sparks_open","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"welded","directions":1,"delays":[[1.0]]}]} \ No newline at end of file +{"version":1,"size":{"x":32,"y":32},"license":"CC-BY-SA-3.0","copyright":"Taken from https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/doors/doorint.dmi","states":[{"name":"closed","directions":1,"delays":[[1.0]]},{"name":"closed_unlit","directions":1},{"name":"closing","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"closing_unlit","directions":1,"delays":[[0.25,0.07,0.07,0.07,0.07,0.15]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"bolted","directions":1,"delays":[[1.0]]},{"name":"panel_closing","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"panel_opening","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"open","directions":1,"delays":[[1.0]]},{"name":"opening","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.07,0.07,0.2]]},{"name":"opening_unlit","directions":1,"delays":[[0.1,0.1,0.07,0.07,0.07,0.25]]},{"name":"panel_open","directions":1,"delays":[[1.0]]},{"name":"spark","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"sparks_broken","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"sparks_damaged","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,1.7]]},{"name":"sparks_open","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"welded","directions":1,"delays":[[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/locked.png deleted file mode 100644 index 095929aa72..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_glass.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint.rsi/locked.png deleted file mode 100644 index 0d8d458cac..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint.rsi/meta.json index 7c1e658921..6e56b44ab4 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.5, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.5]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.5, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.5]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.4]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 0.3]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/bolted.png new file mode 100644 index 0000000000..2731f1dcd1 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/locked.png deleted file mode 100644 index d2f326b3d9..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/meta.json index cacf06450b..deadee8576 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_cargo.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_cargo.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_cargo.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/bolted.png new file mode 100644 index 0000000000..833f084cce Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/locked.png deleted file mode 100644 index 4007c1fcb5..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/meta.json index 13d78df265..09f72b8a8f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_command.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_command.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_command.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/bolted.png new file mode 100644 index 0000000000..3905e7d7a9 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/locked.png deleted file mode 100644 index 9f5ca58e79..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/meta.json index 6369f2c26f..4570a23c10 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_common.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_common.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_common.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/bolted.png new file mode 100644 index 0000000000..8b57134f4f Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/locked.png deleted file mode 100644 index 2549c32d68..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/meta.json index 7f57dd6295..9a24024e2a 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_engi.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_engi.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_engi.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/bolted.png new file mode 100644 index 0000000000..bed08f8adc Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/locked.png deleted file mode 100644 index 2ffa980742..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/meta.json index b53d37ae7c..a8eebb4850 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_int.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_int.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_int.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/bolted.png new file mode 100644 index 0000000000..7602b8bf8f Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/locked.png deleted file mode 100644 index 8113a1efda..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/meta.json index 6bccf81324..557d634f81 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_med.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_med.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_med.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/bolted.png new file mode 100644 index 0000000000..44c03b1951 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/locked.png deleted file mode 100644 index 2d488b7b97..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/meta.json index 139a8e9e54..0f7d0aff60 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_rnd.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_rnd.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_rnd.dmi", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/bolted.png new file mode 100644 index 0000000000..d926d3a862 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/locked.png deleted file mode 100644 index b45cea4073..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/meta.json index bd2e7002fa..908263053c 100644 --- a/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_maint_sec.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_sec.dmi, modified by ", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "locked", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/d86e175508b8553ca8396f39f2af7ecec4595375/icons/obj/doors/Doormaint_sec.dmi, modified by ", "states": [{"name": "closed", "directions": 1, "delays": [[1.0]]}, {"name": "closed_unlit", "directions": 1, "delays": [[1]]}, {"name": "closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "closing_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1]]}, {"name": "bolted", "directions": 1, "delays": [[1.0]]}, {"name": "open", "directions": 1, "delays": [[1.0]]}, {"name": "opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "opening_unlit", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_closing", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "panel_open", "directions": 1, "delays": [[1.0]]}, {"name": "panel_opening", "directions": 1, "delays": [[0.2, 0.1, 0.1, 0.1, 0.1, 0.6]]}, {"name": "spark", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_broken", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "sparks_damaged", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 1.7]]}, {"name": "sparks_open", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "welded", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_medical.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_medical.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_medical.rsi/locked.png deleted file mode 100644 index ce9079111d..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_medical.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_medical.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_medical.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/locked.png deleted file mode 100644 index 54597e6a42..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_medical_glass.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_science.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_science.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_science.rsi/locked.png deleted file mode 100644 index 94372b5a5f..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_science.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_science.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_science.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_science.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_science.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/locked.png deleted file mode 100644 index 8554ceb6ed..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_science_glass.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_security.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_security.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_security.rsi/locked.png deleted file mode 100644 index cf6e017161..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_security.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_security.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_security.rsi/meta.json index a612d01048..1ed5c96751 100644 --- a/Resources/Textures/Buildings/Doors/airlock_security.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_security.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [ diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/bolted.png b/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/bolted.png new file mode 100644 index 0000000000..ad16f97658 Binary files /dev/null and b/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/bolted.png differ diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/locked.png b/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/locked.png deleted file mode 100644 index 9fdd2c42f0..0000000000 Binary files a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/locked.png and /dev/null differ diff --git a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/meta.json b/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/meta.json index 8834b517fd..8b13e5790f 100644 --- a/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/meta.json +++ b/Resources/Textures/Buildings/Doors/airlock_security_glass.rsi/meta.json @@ -62,7 +62,7 @@ ] }, { - "name": "locked", + "name": "bolted", "directions": 1, "delays": [ [