diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs index a707cb71ff..2ee295c116 100644 --- a/Content.Client/Doors/AirlockSystem.cs +++ b/Content.Client/Doors/AirlockSystem.cs @@ -1,4 +1,5 @@ using Content.Client.Wires.Visualizers; +using Content.Shared.Doors; using Content.Shared.Doors.Components; using Content.Shared.Doors.Systems; using Content.Shared.Prying.Components; @@ -25,6 +26,16 @@ public sealed class AirlockSystem : SharedAirlockSystem args.Cancelled = true; } + protected override void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args) + { + base.OnBeforeDoorClosed(uid, airlock, args); + + if (_appearanceSystem.TryGetData(uid, DoorVisuals.BoltLights, out var boltLights) && boltLights) + { + args.Cancel(); + } + } + private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args) { // Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash. @@ -34,9 +45,11 @@ public sealed class AirlockSystem : SharedAirlockSystem if (comp.OpenUnlitVisible) // Otherwise there are flashes of the fallback sprite between clicking on the door and the door closing animation starting. { door.OpenSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.OpenSpriteState)); - door.OpenSpriteStates.Add((DoorVisualLayers.BaseBolted, "bolted_open_unlit")); + door.OpenSpriteStates.Add((DoorVisualLayers.BaseBolted, comp.OpenBoltedSpriteState)); + door.OpenSpriteStates.Add((DoorVisualLayers.BaseEmergencyAccess, comp.OpenEmergencySpriteState)); door.ClosedSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.ClosedSpriteState)); - door.ClosedSpriteStates.Add((DoorVisualLayers.BaseBolted, "bolted_unlit")); + door.ClosedSpriteStates.Add((DoorVisualLayers.BaseBolted, comp.ClosedBoltedSpriteState)); + door.ClosedSpriteStates.Add((DoorVisualLayers.BaseEmergencyAccess, comp.ClosedEmergencySpriteState)); } ((Animation) door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick @@ -98,7 +111,7 @@ public sealed class AirlockSystem : SharedAirlockSystem { boltedVisible = _appearanceSystem.TryGetData(uid, DoorVisuals.BoltLights, out var lights, args.Component) - && lights && state is DoorState.Closed or DoorState.Welded; + && lights && state is DoorState.Closed or DoorState.Welded or DoorState.Open; emergencyLightsVisible = _appearanceSystem.TryGetData(uid, DoorVisuals.EmergencyLights, out var eaLights, @@ -123,7 +136,6 @@ public sealed class AirlockSystem : SharedAirlockSystem args.Sprite.LayerSetVisible( DoorVisualLayers.BaseEmergencyAccess, emergencyLightsVisible - && state != DoorState.Open && state != DoorState.Opening && state != DoorState.Closing && !boltedVisible diff --git a/Content.Shared/Doors/Components/AirlockComponent.cs b/Content.Shared/Doors/Components/AirlockComponent.cs index beae0dd493..2860cf7237 100644 --- a/Content.Shared/Doors/Components/AirlockComponent.cs +++ b/Content.Shared/Doors/Components/AirlockComponent.cs @@ -117,12 +117,36 @@ public sealed partial class AirlockComponent : Component [DataField] public string OpenSpriteState = "open_unlit"; + /// + /// The sprite state used for the open bolted airlock lights. + /// + [DataField] + public string OpenBoltedSpriteState = "bolted_open_unlit"; + + /// + /// The sprite state used for the open emergency access airlock lights. + /// + [DataField] + public string OpenEmergencySpriteState = "emergency_open_unlit"; + /// /// The sprite state used for the closed airlock lights. /// [DataField] public string ClosedSpriteState = "closed_unlit"; + /// + /// The sprite state used for the closed bolted airlock lights. + /// + [DataField] + public string ClosedBoltedSpriteState = "bolted_unlit"; + + /// + /// The sprite state used for the closed bolted airlock lights. + /// + [DataField] + public string ClosedEmergencySpriteState = "emergency_unlit"; + /// /// The sprite state used for the 'access denied' lights animation. /// diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs index 7f4d03825f..ff89fe28b2 100644 --- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs +++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs @@ -460,7 +460,7 @@ public abstract class SharedDoorSystem : EntitySystem //If the colliding entity is a slippable item ignore it by the airlock if (otherPhysics.CollisionLayer == (int)CollisionGroup.SlipLayer && otherPhysics.CollisionMask == (int)CollisionGroup.ItemMask) continue; - + //For when doors need to close over conveyor belts if (otherPhysics.CollisionLayer == (int) CollisionGroup.ConveyorMask) continue; diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index dbed2d0162..33a7e99f6b 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -501,7 +501,7 @@ components: - type: AccessReader access: [["Salvage"]] - + - type: entity parent: AirlockChemistryGlass id: AirlockChemistryGlassLocked @@ -1004,16 +1004,6 @@ - type: PriorityDock tag: DockArrivals -- type: entity - parent: AirlockGlassShuttle - id: AirlockExternalGlassShuttleCargo - suffix: Cargo - components: - - type: PriorityDock - tag: DockCargo - - type: AccessReader - access: [ [ "Cargo" ] ] - - type: entity parent: AirlockGlassShuttle id: AirlockExternalGlassShuttleEscape @@ -1021,6 +1011,16 @@ components: - type: GridFill +- type: entity + parent: AirlockGlassShuttle + id: AirlockExternalGlassShuttleCargo + suffix: Cargo + components: + - type: PriorityDock + tag: DockCargo + - type: AccessReader + access: [ [ "Cargo" ] ] + #HighSecDoors - type: entity parent: HighSecDoor diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index 3f199d2628..ce2b326129 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -13,9 +13,11 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/engineering.rsi + - type: PaintableAirlock + department: Engineering - type: entity - parent: Airlock + parent: AirlockEngineering id: AirlockAtmospherics suffix: Atmospherics components: @@ -29,6 +31,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/cargo.rsi + - type: PaintableAirlock + department: Cargo - type: entity parent: Airlock @@ -37,9 +41,11 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/medical.rsi + - type: PaintableAirlock + department: Medical - type: entity - parent: Airlock + parent: AirlockMedical id: AirlockVirology suffix: Virology components: @@ -47,12 +53,9 @@ sprite: Structures/Doors/Airlocks/Standard/virology.rsi - type: entity - parent: Airlock + parent: AirlockMedical id: AirlockChemistry suffix: Chemistry - components: - - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/medical.rsi - type: entity parent: Airlock @@ -61,6 +64,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/science.rsi + - type: PaintableAirlock + department: Science - type: entity parent: Airlock @@ -71,6 +76,8 @@ sprite: Structures/Doors/Airlocks/Standard/command.rsi - type: WiresPanelSecurity securityLevel: medSecurity + - type: PaintableAirlock + department: Command - type: entity parent: Airlock @@ -79,6 +86,8 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/security.rsi + - type: PaintableAirlock + department: Security - type: entity parent: Airlock @@ -89,36 +98,28 @@ sprite: Structures/Doors/Airlocks/Standard/maint.rsi - type: entity - parent: Airlock + parent: AirlockSecurity # if you get syndie door somehow it counts as sec id: AirlockSyndicate suffix: Syndicate components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi - - type: Airlock - openUnlitVisible: false - type: entity - parent: Airlock + parent: AirlockCargo id: AirlockMining suffix: Mining(Salvage) components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/mining.rsi - - type: Airlock - openUnlitVisible: false - type: entity - parent: Airlock + parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel id: AirlockCentralCommand suffix: Central Command components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi - - type: WiresPanelSecurity - securityLevel: medSecurity - - type: Airlock - openUnlitVisible: false - type: entity parent: Airlock @@ -127,8 +128,6 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/hatch.rsi - - type: Airlock - openUnlitVisible: false - type: entity parent: Airlock @@ -137,8 +136,6 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi - - type: Airlock - openUnlitVisible: false # Glass @@ -191,7 +188,7 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/engineering.rsi - type: PaintableAirlock - group: Glass + department: Engineering - type: entity parent: AirlockGlass @@ -200,18 +197,14 @@ components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/maint.rsi - - type: PaintableAirlock - group: Glass - type: entity - parent: AirlockGlass + parent: AirlockEngineeringGlass id: AirlockAtmosphericsGlass suffix: Atmospherics components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi - - type: PaintableAirlock - group: Glass - type: entity parent: AirlockGlass @@ -221,17 +214,7 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/cargo.rsi - type: PaintableAirlock - group: Glass - -- type: entity - parent: AirlockGlass - id: AirlockChemistryGlass - suffix: Chemistry - components: - - type: Sprite - sprite: Structures/Doors/Airlocks/Glass/medical.rsi - - type: PaintableAirlock - group: Glass + department: Cargo - type: entity parent: AirlockGlass @@ -241,17 +224,20 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/medical.rsi - type: PaintableAirlock - group: Glass + department: Medical - type: entity - parent: AirlockGlass + parent: AirlockMedicalGlass + id: AirlockChemistryGlass + suffix: Chemistry + +- type: entity + parent: AirlockMedicalGlass id: AirlockVirologyGlass suffix: Virology components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/virology.rsi - - type: PaintableAirlock - group: Glass - type: entity parent: AirlockGlass @@ -261,7 +247,7 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/science.rsi - type: PaintableAirlock - group: Glass + department: Science - type: entity parent: AirlockGlass @@ -271,7 +257,7 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/command.rsi - type: PaintableAirlock - group: Glass + department: Command - type: WiresPanelSecurity securityLevel: medSecurity @@ -283,32 +269,26 @@ - type: Sprite sprite: Structures/Doors/Airlocks/Glass/security.rsi - type: PaintableAirlock - group: Glass + department: Security - type: entity - parent: AirlockGlass + parent: AirlockSecurityGlass # see standard id: AirlockSyndicateGlass suffix: Syndicate components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi - - type: PaintableAirlock - group: Glass - - type: Airlock - openUnlitVisible: false - type: entity - parent: AirlockGlass + parent: AirlockCargoGlass id: AirlockMiningGlass suffix: Mining(Salvage) components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/mining.rsi - - type: Airlock - openUnlitVisible: false - type: entity - parent: AirlockGlass + parent: AirlockCommandGlass # see standard id: AirlockCentralCommandGlass suffix: Central Command components: @@ -316,6 +296,3 @@ sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi - type: WiresPanelSecurity securityLevel: medSecurity - - type: Airlock - openUnlitVisible: false - diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml index f69768cf85..2fc5817287 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml @@ -1,44 +1,347 @@ +#Atmospherics - type: entity - id: AirlockAssembly + parent: AirlockAssembly + id: AirlockAssemblyAtmospherics name: airlock assembly - description: It opens, it closes, and maybe crushes you. + suffix: Atmospherics components: - - type: Clickable - - type: InteractionOutline - type: Sprite - sprite: Structures/Doors/Airlocks/Standard/basic.rsi + sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi state: "assembly" - - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.45,-0.45,0.45,0.45" - density: 110 - mask: - - FullTileMask - layer: - - HumanoidBlockLayer - - type: Anchorable - delay: 2 - - type: Pullable - - type: Transform - anchored: true - noRot: true - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - type: Construction - graph: Airlock - node: assembly - placement: - mode: SnapgridCenter + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyAtmosphericsGlass + name: airlock assembly + suffix: Atmospherics, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi + state: "assembly" + +#Cargo +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyCargo + name: airlock assembly + suffix: Cargo + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/cargo.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyCargoGlass + name: airlock assembly + suffix: Cargo, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/cargo.rsi + state: "assembly" + +#Command +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyCommand + name: airlock assembly + suffix: Command + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/command.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyCommandGlass + name: airlock assembly + suffix: Command, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/command.rsi + state: "assembly" + +#Engineering +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyEngineering + name: airlock assembly + suffix: Engineering + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/engineering.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyEngineeringGlass + name: airlock assembly + suffix: Engineering, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/engineering.rsi + state: "assembly" + +#External +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyExternal + name: airlock assembly + suffix: External + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/external.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyExternalGlass + name: airlock assembly + suffix: External, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/external.rsi + state: "assembly" + +#Public (Glass Airlock) +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyGlass + name: airlock assembly + suffix: Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/glass.rsi + state: "assembly" + +#Freezer +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyFreezer + name: airlock assembly + suffix: Freezer + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/freezer.rsi + state: "assembly" + +#Maintenance +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyMaintenance + name: airlock assembly + suffix: Maintenance + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/maint.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyMaintenanceGlass + name: airlock assembly + suffix: Maintenance, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/maint.rsi + state: "assembly" + +#Medical +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyMedical + name: airlock assembly + suffix: Medical + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/medical.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyMedicalGlass + name: airlock assembly + suffix: Medical, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/medical.rsi + state: "assembly" + +#Science +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyScience + name: airlock assembly + suffix: Science + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/science.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyScienceGlass + name: airlock assembly + suffix: Science, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/science.rsi + state: "assembly" + +#Security +- type: entity + parent: AirlockAssembly + id: AirlockAssemblySecurity + name: airlock assembly + suffix: Security + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/security.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblySecurityGlass + name: airlock assembly + suffix: Security, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/security.rsi + state: "assembly" + +#Shuttle +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyShuttle + name: airlock assembly + suffix: Shuttle + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyShuttleGlass + name: airlock assembly + suffix: Shuttle, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi + state: "assembly" + +#Virology +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyVirology + name: airlock assembly + suffix: Virology + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/virology.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyVirologyGlass + name: airlock assembly + suffix: Virology, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/virology.rsi + state: "assembly" + +#CentralCommand +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyCentralCommand + name: airlock assembly + suffix: CentralCommand + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyCentralCommandGlass + name: airlock assembly + suffix: CentralCommand, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi + state: "assembly" + +#Mining +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyMining + name: airlock assembly + suffix: Mining + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/mining.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyMiningGlass + name: airlock assembly + suffix: Mining, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/mining.rsi + state: "assembly" + +#Syndicate +- type: entity + parent: AirlockAssembly + id: AirlockAssemblySyndicate + name: airlock assembly + suffix: Syndicate + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblySyndicateGlass + name: airlock assembly + suffix: Syndicate, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi + state: "assembly" + +#ShuttleSyndicate +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyShuttleSyndicate + name: airlock assembly + suffix: ShuttleSyndicate + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi + state: "assembly" + +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyShuttleSyndicateGlass + name: airlock assembly + suffix: ShuttleSyndicate, Glass + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi + state: "assembly" + +#High Security +- type: entity + parent: AirlockAssembly + id: AirlockAssemblyHighSec + name: airlock assembly + suffix: HighSec + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/highsec/highsec.rsi + state: "assembly" \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml new file mode 100644 index 0000000000..fcdb0d2dea --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml @@ -0,0 +1,45 @@ +#Base +- type: entity + id: AirlockAssembly + name: airlock assembly + description: It opens, it closes, and maybe crushes you. + components: + - type: Clickable + - type: InteractionOutline + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/basic.rsi + state: "assembly" + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.45" + density: 110 + mask: + - FullTileMask + layer: + - HumanoidBlockLayer + - type: Anchorable + delay: 2 + - type: Pullable + - type: Transform + anchored: true + noRot: true + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: Construction + graph: Airlock + node: assembly + placement: + mode: SnapgridCenter \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 7069b8e58d..9930e6631d 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: Airlock parent: BaseStructure name: airlock @@ -27,7 +27,7 @@ - state: emergency_unlit map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] shader: unshaded - - state: panel_closed + - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AnimationPlayer - type: Physics @@ -64,7 +64,6 @@ - type: Weldable time: 3 - type: Airlock - openUnlitVisible: true - type: NavMapDoor - type: DoorBolt - type: Appearance @@ -130,8 +129,12 @@ - board - type: PlacementReplacement key: walls + - type: IconSmooth + key: walls + mode: NoSprite - type: PaintableAirlock group: Standard + department: Civilian - type: AccessReader - type: StaticPrice price: 150 @@ -142,7 +145,6 @@ - Airlock # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor - type: PryUnpowered - - type: ReflectAspectMark placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml index 5e2eb5689f..75b23f7071 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml @@ -18,6 +18,7 @@ sprite: Structures/Doors/Airlocks/Standard/external.rsi - type: PaintableAirlock group: External + department: null - type: entity parent: AirlockExternal diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml index 0e150206f9..d799558df7 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml @@ -23,7 +23,7 @@ - state: emergency_unlit map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] shader: unshaded - - state: panel_closed + - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: AnimationPlayer - type: Physics @@ -103,4 +103,3 @@ tags: - HighSecDoor # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor - - type: ReflectAspectMark diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml index 8c5aa49b8e..21d485be0c 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml @@ -64,6 +64,7 @@ - ForceNoFixRotations - type: PaintableAirlock group: Shuttle + department: null - type: Construction graph: AirlockShuttle node: airlock diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index 1e3eda81c3..cead7f3141 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -108,7 +108,7 @@ - type: AccessReader access: [ [ "Engineering" ] ] - type: ReflectAspectMark - + - type: entity id: Firelock parent: BaseFirelock diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index 7c55b68c35..05ca51d5eb 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -228,12 +228,6 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger # WD edit end damage: 50 behaviors: - !type:DoActsBehavior @@ -246,11 +240,6 @@ MaterialWebSilk: min: 3 max: 5 - - type: MeleeSound # WD edit start - soundGroups: - Brute: - path: - "/Audio/Weapons/slash.ogg" # WD edit end - type: Damageable damageModifierSet: Web - type: Door diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index 5298d0394e..7f4988999f 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -97,10 +97,6 @@ messagePerceivedByOthers: comp-window-knock interactSuccessSound: path: /Audio/Effects/glass_knock.ogg - - type: ReflectAspectMark - - type: Tag - tags: - - DeleteWithWindows - type: entity id: ShuttersNormal diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 8dd082d534..4281177b4b 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseWindoor parent: BaseStructure abstract: true @@ -139,7 +139,6 @@ - type: StaticPrice price: 100 - type: PryUnpowered - - type: ReflectAspectMark - type: entity id: BaseSecureWindoor diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png index 890af5aa88..3d018bfbbb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png index db3cc54a45..959b58471a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png index 7aabf34fc7..a2b6ac7e3a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json index 3e8eba1926..d98fc3f459 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png index cdf2505753..61f9bb5c08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png index b414e94800..d0f17a5e61 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png index 6443e909cc..33f6de75d7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png index 6f34cf3d00..904395ea40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png index 0120be8d06..95c4cf190b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png index deaaa0e721..862c9940fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png index 70aa03ef8c..753e1e8a9e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png index eed46ce68c..bf8945b1f2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png index 1d497f6d1c..9aaf1f688f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png index ca43da28bd..e171ad6aea 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png index 2c8ec407ce..5dff6a5e50 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png index a45a6d8d43..bdd0150cf1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png index 814d837908..7db8f8b6e8 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..e6e655feee Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..02eb317440 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json index 0f5b725bac..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/58e5354cdbc304847c9ef20963320d21f418b58e and edited by Nairod(github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,9 +135,6 @@ ] ] }, - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open_unlit.png new file mode 100644 index 0000000000..975aa065fc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png index 75bd7235b0..211a5ec6b2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png index 1d848e4854..36df88f44c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png index cc3266212f..5ec7f63312 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png index 1ea14b70d6..c771279653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png index 7fd272dd1e..f8dfecba63 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png index 76ce3eee3c..c8eb941bd9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png index 5024a18f9b..efddf7ff2e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png index b4b7119676..fe9268a1de 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png index 95e4de0af4..09fec38bfa 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png index b4e532fa3c..d5db1fa7de 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png index f235c2cd6d..85715a9ca0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_open_unlit.png index 8adf26a9b1..c1984c4f00 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png index 8adf26a9b1..c1984c4f00 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png index 1eb40152d0..2d854b6b48 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png index 7eb921a450..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png index 79a84cfe82..54938d9b3b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png index 6eb13de654..351a0f3528 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png index 68e9f7343a..0eaf4064c7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_open_unlit.png index 5df5341c86..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png index 5df5341c86..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json index 4351a68937..5541feed65 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,16 +22,28 @@ { "name": "open_unlit" }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ [ + 0.2, + 0.2, 0.1, 0.1, 0.1, - 0.1, - 0.1, - 0.1 + 0.3 ] ] }, @@ -42,12 +51,7 @@ "name": "closing_unlit", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.6 ] ] }, @@ -55,8 +59,6 @@ "name": "deny_unlit", "delays": [ [ - 0.1, - 0.1, 0.1, 0.1, 0.1 @@ -70,12 +72,12 @@ "name": "opening", "delays": [ [ + 0.2, + 0.2, 0.1, 0.1, 0.1, - 0.1, - 0.1, - 0.1 + 0.3 ] ] }, @@ -83,28 +85,20 @@ "name": "opening_unlit", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2 ] ] }, - { - "name": "panel_closed" - }, { "name": "panel_closing", "delays": [ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -117,10 +111,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -146,8 +140,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -160,7 +153,7 @@ 0.1, 0.1, 0.1, - 0.1 + 1.7 ] ] }, @@ -184,13 +177,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png index dfb2434e85..1868e6ccac 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open_unlit.png index 7eb921a450..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png index 2a76140ef0..ec42792e4b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png index a70d9f4b30..351a0f3528 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closed.png deleted file mode 100644 index 75a82a3332..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png index 01a853b2e9..86838a6000 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png index 4c59d3a28c..33ef420933 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png index 117d908225..bf857f1c12 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png index d948d20b1a..834fc74519 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png index ec63892c09..2dba392369 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png index 41bac6ff98..2dba392369 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png index ff2f5dda80..e5d876f7ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png index cbdbe4e3a4..a0b9e23d40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png new file mode 100644 index 0000000000..0b14b77aec Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png index 4c59d3a28c..c1984c4f00 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png index da0a8e63f8..602b83df5b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png index 1d33d3f366..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png index 92c13304a4..6718ae08e9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png index 93ae9afd31..a2b151c140 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..a40cee44be Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png index 817f2fb3f9..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png index fb740ee62a..5c87415ec1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/locked.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json index 6106957034..3e82aa90e5 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/meta.json @@ -1,12 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185", + "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "assembly" + }, { "name": "bolted_unlit" }, @@ -16,22 +19,31 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, @@ -78,18 +90,12 @@ "name": "opening", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, @@ -143,9 +149,6 @@ { "name": "welded_open" }, - { - "name": "bolted_open_unlit" - }, { "name": "emergency_unlit", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png index 3f19497d1c..6fcb5b059b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png new file mode 100644 index 0000000000..b7a5f9ecca Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png index 9af41abffa..113ddab7b7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/firelock.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png index ef9d1f8130..26d9dc17c2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png index c8dc4abdec..d5243ea857 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png index 32810ee2ea..64d41f1dba 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing-panel.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png index 7a6a213291..f48efb153a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png index 602b8571d7..b835f51158 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png index d5b149f75e..a3a6eb30a5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_open_unlit.png index e821f26d53..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json index e0ec34938b..16af217a8f 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,15 +19,21 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, + { + "name": "open_unlit" + }, { "name": "closed-fill" }, @@ -115,9 +121,6 @@ { "name": "open" }, - { - "name": "open_unlit" - }, { "name": "panel_open" }, @@ -208,8 +211,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -222,7 +224,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -246,13 +249,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png index cc521adb83..de9c757173 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png index 5ff38ebb13..6d3267c174 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening-panel.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png index 9e622d79b8..594f26a450 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png index 88f6d44467..b4ca46e425 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png index 98edbb5352..7fe48cc120 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png index 4c59d3a28c..2603c4a720 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png index f28c439e9b..e76a54328a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png index 3385880ae8..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png index 4265ee1e56..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png index d04ec15555..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png index 062db25299..3f3f14b078 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png index 9faa6567fe..3e2f7aff44 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png index a7edd06ad6..b4468aef4e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png index e2458dd3bc..1ae0abf4c6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png index 0511acc6b2..086bedbc60 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png index f0a7de8d15..296144e387 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png index 53efb2a5d5..50662eb45c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png index fc6a8c621d..821f747fb2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png index 54fa4b2d6e..64683f81db 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png index 4c0bef0b3f..acb4476002 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png index 5f04fd7620..1c15ed06bc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..c777e57655 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png index 9bce6022dc..8936e50021 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png index cd5c6b4700..6a4eae111c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png index adfb0cf39c..fb428de951 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..76e45ca632 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png index c018c3f9fd..2a7eb55f53 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json index 0120511fa8..7ff576874e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ @@ -102,32 +117,36 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 ] ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ 0.1, + 0.05, + 0.05, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1 ] ] }, - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/open_unlit.png new file mode 100644 index 0000000000..bcaae3a9e8 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closing.png index 140be67d32..42b84b72fe 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_open.png index 4c59d3a28c..c76bdb146b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_opening.png index c25bc776c6..09c5f5ca81 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png index 4d9cab3c5c..77283c6284 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/mining.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png index 3461876f46..f7d8aaf354 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png index 2ad679d600..82a36b65b9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png index 8973b1ebfd..ff5532f584 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png index f4ebb5d8e2..8940b5a510 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png index ffa69c1830..3254710d81 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png index 0131731bdb..a59a9fcebb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png index d93cc4df06..789b3537c0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png index ddeb014809..90e3917603 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png index 2e67e55a8b..93c4460f1b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png index 82a7adeae3..0a6a79329e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png new file mode 100644 index 0000000000..499ec46a53 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_open_unlit.png index 4c59d3a28c..844bd201f1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_open_unlit.png index 4c59d3a28c..31f7a5f9f0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json index adf4b58f2c..54fc051558 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json @@ -1,17 +1,17 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git, glass by Peptide90", + "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "bolted_unlit" + "name": "assembly" }, { - "name": "bolted_open_unlit" + "name": "bolted_unlit" }, { "name": "closed" @@ -22,6 +22,18 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ @@ -100,9 +112,6 @@ ] ] }, - { - "name": "panel_closed" - }, { "name": "panel_closing", "delays": [ @@ -147,9 +156,6 @@ 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open_unlit.png index 4c59d3a28c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closed.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/assembly.png new file mode 100644 index 0000000000..587c560434 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/bolted_open_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/emergency_open_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json index 7b8b103ca7..1081b1b57d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/meta.json @@ -7,18 +7,12 @@ "y": 32 }, "states": [ + { + "name": "assembly" + }, { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, - { - "name": "open_unlit" - }, - { - "name": "emergency_open_unlit" - }, { "name": "closed" }, diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi/open_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png index da1739bb27..891e7fd9ee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..e6e655feee Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..02eb317440 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json index 35b3d85c0f..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24; Edited by Doru991", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,9 +135,6 @@ ] ] }, - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open_unlit.png new file mode 100644 index 0000000000..975aa065fc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png index 591ddf47e1..f162a3d707 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png index 76930618ce..35b896703c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png index acb9b01a76..1a98e1e5d6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png index 8cb2e42e10..f334c224c9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png index efd8577e6b..8707d23a76 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png index 32d1246788..0c50656f6b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png index ed9c957c19..97e3a30040 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png index 2ed07f2b1e..0a679afb71 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json index 3e8eba1926..d98fc3f459 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png index 106db14fae..61f9bb5c08 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png index c82ac46c59..bd7937096e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png index c756f0e673..0281682b36 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png index a3533494d9..d61b8f17f0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png index a8d31f11d3..247612bd7e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png index e2f571df41..862c9940fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png index 3068911894..cded9299eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png index f622d538e8..8aac380b7b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png index 11374042f9..01ddc9fef0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png index 1427304bce..9e9e14d1bd 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png index 7d53fa5dfc..d0175d0f86 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png index f3c1116c1d..94b0291a5b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..e6e655feee Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..02eb317440 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json index 0f5b725bac..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/58e5354cdbc304847c9ef20963320d21f418b58e and edited by Nairod(github) for SS14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,9 +135,6 @@ ] ] }, - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open_unlit.png new file mode 100644 index 0000000000..975aa065fc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/centcomm.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png index 1bc0d5f24b..fa6f3e59cf 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png index 5ac29f9e69..96349c2a29 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png index e7e8ef883f..2a861fa8a4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png index 84f8aa0008..c771279653 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png index 4ac41438aa..edcf9d92cc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png index 2d880858cd..a7e102b37e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png index f1c1d7387d..b409f80c52 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png index 2b14e9a44e..c27f6aad6f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png index 01d84b9034..09fec38bfa 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png index 91e647a098..47dee90e59 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png index d637a36427..62b788cbc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_open_unlit.png index 8adf26a9b1..c1984c4f00 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png index 8adf26a9b1..c1984c4f00 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png index 972a78e44d..6699ff8154 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png index 7eb921a450..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png index 7c143b4b4b..f8d6f1e29e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png index 6eb13de654..351a0f3528 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png index 68e9f7343a..0eaf4064c7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png index 5df5341c86..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png index 5df5341c86..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json index 4351a68937..48b8492423 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,16 +22,28 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ [ + 0.2, + 0.2, 0.1, 0.1, 0.1, - 0.1, - 0.1, - 0.1 + 0.3 ] ] }, @@ -42,12 +51,7 @@ "name": "closing_unlit", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.6 ] ] }, @@ -55,8 +59,6 @@ "name": "deny_unlit", "delays": [ [ - 0.1, - 0.1, 0.1, 0.1, 0.1 @@ -70,12 +72,12 @@ "name": "opening", "delays": [ [ + 0.2, + 0.2, 0.1, 0.1, 0.1, - 0.1, - 0.1, - 0.1 + 0.3 ] ] }, @@ -83,28 +85,20 @@ "name": "opening_unlit", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2 ] ] }, - { - "name": "panel_closed" - }, { "name": "panel_closing", "delays": [ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -117,10 +111,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -146,8 +140,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -160,7 +153,7 @@ 0.1, 0.1, 0.1, - 0.1 + 1.7 ] ] }, @@ -184,13 +177,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png index dfb2434e85..1868e6ccac 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open_unlit.png index 7eb921a450..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png index 51611137a2..be4300f51c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png index a70d9f4b30..351a0f3528 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closed.png deleted file mode 100644 index 75a82a3332..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png index 01a853b2e9..86838a6000 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png index 4c59d3a28c..33ef420933 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png index 117d908225..bf857f1c12 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png index d948d20b1a..834fc74519 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png index ec63892c09..2dba392369 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png index 41bac6ff98..2dba392369 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png index ff2f5dda80..e5d876f7ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png index cbdbe4e3a4..a0b9e23d40 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png index eb7f799952..ade0a87386 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png index 4c59d3a28c..c1984c4f00 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png index fbd603be3e..8c90b693a4 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png index 1d33d3f366..b7a5f9ecca 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png index 24f7425853..4347bf8afe 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png index 2eaff3bcae..225d45a82a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/deny.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..a40cee44be Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png index 817f2fb3f9..a40cee44be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png index eb7f799952..458698515f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png index 45623c1fc5..67f782bd89 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame2.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png index eff24a12fb..5421154834 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame3.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png index a250675f19..6252d37d1e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame4.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png index 6a2950255e..12ccff5cb0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/locked.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json index d8cbe42695..016eea47d8 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/f9e3b58ecd64fa061f83420689bd90bfa3a4c185. frame3.png, frame4.png by github:Morb0", + "copyright": "Taken from https://github.com/tgstation/tgstation at 04e43d8c1d5097fdb697addd4395fb849dd341bd", "size": { "x": 32, "y": 32 @@ -19,22 +19,31 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, @@ -93,18 +102,12 @@ "name": "opening", "delays": [ [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 ] ] }, @@ -159,9 +162,6 @@ "name": "welded_open" }, { - "name": "bolted_open_unlit" - }, - { "name": "emergency_unlit", "delays": [ [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png index 3f19497d1c..a89b493a8b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open_unlit.png new file mode 100644 index 0000000000..b7a5f9ecca Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png index 6de08c6f06..79a05996ad 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png index 9050e190d7..4c85a632c5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png index 3b35b12805..10168bf762 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png index 292e14e1c3..8c1c28521d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png index f076d443d2..2523b36382 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png index 4610236cb4..00f2c629b9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..1db075c288 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png index 57f172d54f..cdf10f33eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png index fdf7952dd8..611f458f91 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png index a2f351482b..2f5fdecca2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png index ba26f190cb..14762d6697 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..d46480725c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png index 6a122fbcfd..7780d2478d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json index df26f24d13..afa8c6ae41 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -105,9 +108,6 @@ ] ] }, - { - "name": "panel_closed" - }, { "name": "panel_open", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open_unlit.png new file mode 100644 index 0000000000..fed823dd0e Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png index 051f78f757..a32084fafc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closed.png deleted file mode 100644 index a23424796c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..1db075c288 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png index 57f172d54f..cdf10f33eb 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png index fdf7952dd8..611f458f91 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png index a2f351482b..2f5fdecca2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png index ba26f190cb..14762d6697 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..d46480725c Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png index 6a122fbcfd..7780d2478d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json index df26f24d13..afa8c6ae41 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, { "name": "closing", "delays": [ @@ -105,9 +108,6 @@ ] ] }, - { - "name": "panel_closed" - }, { "name": "panel_open", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open_unlit.png new file mode 100644 index 0000000000..fed823dd0e Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png index 051f78f757..a32084fafc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closed.png deleted file mode 100644 index a23424796c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch_maint.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png index d38df6a7ca..8382b0bb1f 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png index 695665daf7..9035162d43 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png index a972453b51..d207ec7d21 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png index a5cf18c0d0..086bedbc60 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png index 844ac51684..d6d578a3be 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png index c58e4b8a34..0f82d603ae 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png index 9e4031f756..b228a1487c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png index d5f733039c..a124e930d2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png index f4b4369285..acb4476002 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png index 8b08415152..2f25dfe043 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..c777e57655 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png index 9bce6022dc..8936e50021 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png index cd5c6b4700..6a4eae111c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png index adfb0cf39c..fb428de951 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..76e45ca632 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png index c018c3f9fd..2a7eb55f53 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json index 0120511fa8..7ff576874e 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/meta.json @@ -19,6 +19,21 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ @@ -102,32 +117,36 @@ [ 0.1, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.05, + 0.05, + 0.1 ] ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", "delays": [ [ 0.1, + 0.05, + 0.05, 0.1, - 0.07, - 0.07, - 0.07, - 0.2 + 0.1, + 0.1, + 0.1 ] ] }, - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open_unlit.png new file mode 100644 index 0000000000..bcaae3a9e8 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closing.png index 140be67d32..42b84b72fe 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_open.png index 4c59d3a28c..c76bdb146b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_opening.png index c25bc776c6..09c5f5ca81 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png index 4d9cab3c5c..77283c6284 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/mining.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png index 39287ff911..0224acaae5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png index 1188e9cdc1..814fba3422 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png index 1732ed74bd..891dda16ce 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png index 9592c65e88..8940b5a510 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png index 3e0ddbb76e..eeab16dca7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png index 2a28c2629d..02eaa98e7d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png index 8d3c703650..4cfd894f74 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png index 228a900172..56ac2b4ead 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png index bd20910d0d..93c4460f1b 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png index 27b573e8e9..a9f90c4553 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/assembly.png new file mode 100644 index 0000000000..8518b527bc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/bolted_open_unlit.png index 4c59d3a28c..844bd201f1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/emergency_open_unlit.png index 4c59d3a28c..31f7a5f9f0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json index 8eb7a4eb54..54fc051558 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json @@ -8,10 +8,10 @@ }, "states": [ { - "name": "bolted_unlit" + "name": "assembly" }, { - "name": "bolted_open_unlit" + "name": "bolted_unlit" }, { "name": "closed" @@ -22,6 +22,18 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ @@ -100,9 +112,6 @@ ] ] }, - { - "name": "panel_closed" - }, { "name": "panel_closing", "delays": [ @@ -147,9 +156,6 @@ 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open_unlit.png index 4c59d3a28c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/panel_closed.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/assembly.png new file mode 100644 index 0000000000..4102c5df32 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png index 4c59d3a28c..844bd201f1 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png index 7c80bc210c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png index 4c59d3a28c..31f7a5f9f0 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json index a6ef03c1b2..54fc051558 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/meta.json @@ -1,30 +1,39 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by brainfood1183 (github)", + "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git", "size": { "x": 32, "y": 32 }, "states": [ + { + "name": "assembly" + }, { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, - { - "name": "open_unlit" - }, - { - "name": "emergency_open_unlit" - }, { "name": "closed" }, { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, { "name": "closing", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png index 4c59d3a28c..e1346fd80c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png index 9ac8b2ad68..2a4287034a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_open_unlit.png new file mode 100644 index 0000000000..e6e655feee Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png index c78d01c42d..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_open_unlit.png new file mode 100644 index 0000000000..02eb317440 Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json index 17d8b7e412..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24; Edited by @MaloTV on GitHub", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -19,6 +19,15 @@ { "name": "closed_unlit" }, + { + "name": "open_unlit" + }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open_unlit.png new file mode 100644 index 0000000000..975aa065fc Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png index 30a0cb6428..867e15f07c 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_open_unlit.png index f69f2a124e..e6e655feee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png index 9a57e2c1b2..6857f2a241 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png index 0d9721c681..9c33e5217d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png index a1168e1965..6801a45ff3 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png index 74e883e324..42838cc43d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png index 4c6edcfdbe..2a71f76d5d 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png index 741589c696..7c56263f83 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_open_unlit.png index 0b3ace1410..02eb317440 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png index 36daac76c4..817f2fb3f9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json index 885d0ea166..f386d4b06d 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", "size": { "x": 32, "y": 32 @@ -13,9 +13,6 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, @@ -25,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "bolted_open_unlit" + }, + { + "name": "emergency_open_unlit" + }, { "name": "closing", "delays": [ @@ -59,12 +62,18 @@ 0.1, 0.1, 0.1, + 0.1, 0.1 ] ] }, { - "name": "open" + "name": "open", + "delays": [ + [ + 1 + ] + ] }, { "name": "opening", @@ -106,7 +115,12 @@ ] }, { - "name": "panel_closed" + "name": "panel_open", + "delays": [ + [ + 1 + ] + ] }, { "name": "panel_opening", @@ -121,10 +135,6 @@ ] ] }, - - { - "name": "panel_open" - }, { "name": "sparks", "delays": [ @@ -147,8 +157,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -161,7 +170,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -185,13 +195,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png index 3940e82900..f334c224c9 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open_unlit.png index 05a562895e..975aa065fc 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/open_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png index da44eb779b..c68f20d436 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png index 787e869bda..84933bd5ed 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closed.png deleted file mode 100644 index c41e1484ee..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png index 140be67d32..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png index 4c59d3a28c..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png index c25bc776c6..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png index 186d38f0d1..dd67e88a31 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png index 4b58c64673..fb5d774588 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png index 9b919ed404..f16a028dee 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png index deabe407f1..630eabb976 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png index 85f179f2e0..a0040dfdc7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png index 54106fd0e0..8f42abb532 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_open_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png index f9dd25a973..847bfd4024 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/bolted_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png index cb5e6ae3e5..ef026cecb5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png index fb5afb1e93..585557b6b6 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png index 6566fdf9a4..4487612111 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png index a39a09e711..e1baf64ff7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png index 3e4266bdf3..21284ae611 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/deny_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_open_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png index 920fc4b327..539c5523d7 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/emergency_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json index f2d02717eb..80d3cabc01 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9", + "copyright": "Taken from tg station at commit https://github.com/tgstation/tgstation/commit/6f450d93a6bfcc94e9c43ef7938e85bda49f7b6f", "size": { "x": 32, "y": 32 @@ -13,28 +13,24 @@ { "name": "bolted_unlit" }, - { - "name": "bolted_open_unlit" - }, { "name": "closed" }, { "name": "closed_unlit" }, - { - "name": "open_unlit" - }, { "name": "closing", "delays": [ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -44,10 +40,12 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -55,8 +53,6 @@ "name": "deny_unlit", "delays": [ [ - 0.1, - 0.1, 0.1, 0.1, 0.1 @@ -72,10 +68,12 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -85,26 +83,25 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, - { - "name": "panel_closed" - }, { "name": "panel_closing", "delays": [ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -117,10 +114,10 @@ [ 0.1, 0.1, - 0.1, - 0.1, - 0.1, - 0.1 + 0.07, + 0.07, + 0.07, + 0.2 ] ] }, @@ -146,8 +143,7 @@ 0.1, 0.1, 0.1, - 0.1, - 1.7 + 0.1 ] ] }, @@ -160,7 +156,8 @@ 0.1, 0.1, 0.1, - 0.1 + 0.1, + 1.7 ] ] }, @@ -184,13 +181,10 @@ "name": "emergency_unlit", "delays": [ [ - 1.2, - 1.2 + 0.4, + 0.4 ] ] - }, - { - "name": "emergency_open_unlit" } ] } diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png index 8513d10e01..f691a36f78 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/open_unlit.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png index 9b44053cc5..1e69cc0a90 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png index 0d96c805f1..eef8d9c12e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening_unlit.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closed.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closed.png deleted file mode 100644 index 1a6346957d..0000000000 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png index ad5f96fb3b..db7be0bc4a 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png index 22fc4849b3..24eb2aedc2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png index de975a1a4d..fc90acd637 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/panel_opening.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png index 45d4999d3b..465d1a3214 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png index 0be2bb456f..e1ff1cbde2 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_broken.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png index 9721b33049..c45136360e 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_damaged.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png index 4ccda2b946..fc1ad6e5e5 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/sparks_open.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png index 1429284418..b220fab809 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png and b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/welded.png differ