diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 91ed73c89a..7caae65e66 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -102,13 +102,8 @@ public sealed class ClientClothingSystem : ClothingSystem // if that returned nothing, attempt to find generic data if (layers == null && !item.ClothingVisuals.TryGetValue(args.Slot, out layers)) { - if (!TryComp(args.Equipee, out HumanoidAppearanceComponent? humanoid)) - { - return; - } - // No generic data either. Attempt to generate defaults from the item's RSI & item-prefixes - if (!TryGetDefaultVisuals(uid, item, args.Slot, inventory.SpeciesId, humanoid, out layers)) + if (!TryGetDefaultVisuals(uid, item, args.Slot, inventory.SpeciesId, args.Equipee, out layers)) return; } @@ -139,7 +134,7 @@ public sealed class ClientClothingSystem : ClothingSystem ClothingComponent clothing, string slot, string? speciesId, - HumanoidAppearanceComponent humanoid, + EntityUid? target, [NotNullWhen(true)] out List? layers) { layers = null; @@ -166,10 +161,13 @@ public sealed class ClientClothingSystem : ClothingSystem state = $"{clothing.EquippedState}"; // body type specific - var bodyTypeProto = _prototypeManager.Index(humanoid.BodyType); - if (rsi.TryGetState($"{state}-{bodyTypeProto.Name}", out _)) + if (TryComp(target, out HumanoidAppearanceComponent? humanoid)) { - state = $"{state}-{bodyTypeProto.Name}"; + var bodyTypeProto = _prototypeManager.Index(humanoid.BodyType); + if (rsi.TryGetState($"{state}-{bodyTypeProto.Name}", out _)) + { + state = $"{state}-{bodyTypeProto.Name}"; + } } // species specific @@ -389,4 +387,4 @@ public sealed class ClientClothingSystem : ClothingSystem sprite.LayerSetVisible(layer, true); } -} +} \ No newline at end of file diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs index 818bc6a67d..10adb001ac 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs @@ -434,7 +434,7 @@ public sealed partial class GunSystem })); } - public void Update(int currentIndex, bool?[] bullets) + public void Update(bool?[] bullets) { _bulletsList.RemoveAllChildren(); var capacity = bullets.Length; @@ -456,10 +456,10 @@ public sealed partial class GunSystem var texture = StaticIoC.ResC.GetTexture(texturePath); var spentTexture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/empty.png"); - FillBulletRow(currentIndex, bullets, _bulletsList, texture, spentTexture); + FillBulletRow(bullets, _bulletsList, texture, spentTexture); } - private void FillBulletRow(int currentIndex, bool?[] bullets, Control container, Texture texture, Texture emptyTexture) + private void FillBulletRow(bool?[] bullets, Control container, Texture texture, Texture emptyTexture) { var capacity = bullets.Length; var colorA = Color.FromHex("#b68f0e"); @@ -467,7 +467,6 @@ public sealed partial class GunSystem var colorSpentA = Color.FromHex("#b50e25"); var colorSpentB = Color.FromHex("#d3745f"); var colorGoneA = Color.FromHex("#000000"); - var colorGoneB = Color.FromHex("#222222"); var altColor = false; var scale = 1.3f; @@ -480,15 +479,6 @@ public sealed partial class GunSystem { MinSize = texture.Size * scale, }; - if (i == currentIndex) - { - box.AddChild(new TextureRect - { - Texture = texture, - TextureScale = new Vector2(scale, scale), - ModulateSelfOverride = Color.LimeGreen, - }); - } Color color; Texture bulletTexture = texture; @@ -506,7 +496,7 @@ public sealed partial class GunSystem } else { - color = altColor ? colorGoneA : colorGoneB; + color = colorGoneA; } box.AddChild(new TextureRect diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs index 33a4042daf..7f0114d861 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs @@ -29,7 +29,7 @@ public sealed partial class GunSystem private void OnRevolverAmmoUpdate(EntityUid uid, RevolverAmmoProviderComponent component, UpdateAmmoCounterEvent args) { if (args.Control is not RevolverStatusControl control) return; - control.Update(component.CurrentIndex, component.Chambers); + control.Update(component.Chambers); } private void OnRevolverCounter(EntityUid uid, RevolverAmmoProviderComponent component, AmmoCounterControlEvent args) diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs index aef6e11d71..fbdf56f0ec 100644 --- a/Content.Server/MagicMirror/MagicMirrorSystem.cs +++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs @@ -39,6 +39,7 @@ public sealed class MagicMirrorSystem : EntitySystem subs.Event(OnTryMagicMirrorRemoveSlot); }); + SubscribeLocalEvent(OnMagicMirrorInWorldInteract); SubscribeLocalEvent(OnMagicMirrorInteract); SubscribeLocalEvent(OnSelectSlotDoAfter); @@ -49,9 +50,19 @@ public sealed class MagicMirrorSystem : EntitySystem SubscribeLocalEvent(OnMirrorRangeCheck); } - private void OnMirrorRangeCheck(EntityUid uid, MagicMirrorComponent component, ref BoundUserInterfaceCheckRangeEvent args) + private void OnMagicMirrorInWorldInteract(Entity mirror, ref InteractHandEvent args) { - if (!Exists(component.Target) || !_interaction.InRangeUnobstructed(uid, component.Target.Value)) + UpdateInterface(mirror.Owner, args.User, mirror.Comp); + } + + private void OnMirrorRangeCheck( + EntityUid uid, + MagicMirrorComponent component, + ref BoundUserInterfaceCheckRangeEvent args) + { + component.Target ??= args.Player.AttachedEntity; + + if (!component.Target.HasValue || !_interaction.InRangeUnobstructed(uid, component.Target!.Value)) { args.Result = BoundUserInterfaceRangeResult.Fail; } @@ -92,16 +103,17 @@ public sealed class MagicMirrorSystem : EntitySystem Marking = message.Marking, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.SelectSlotTime, doAfter, uid, target: target, used: uid) - { - DistanceThreshold = SharedInteractionSystem.InteractionRange, - BreakOnTargetMove = true, - BreakOnDamage = true, - BreakOnHandChange = false, - BreakOnUserMove = true, - BreakOnWeightlessMove = false, - NeedHand = true - }, out var doAfterId); + _doAfterSystem.TryStartDoAfter( + new DoAfterArgs(EntityManager, user, component.SelectSlotTime, doAfter, uid, target: target, used: uid) + { + DistanceThreshold = SharedInteractionSystem.InteractionRange, + BreakOnTargetMove = true, + BreakOnDamage = true, + BreakOnHandChange = false, + BreakOnUserMove = true, + BreakOnWeightlessMove = false, + NeedHand = true + }, out var doAfterId); component.DoAfter = doAfterId; _audio.PlayPvs(component.ChangeHairSound, uid); @@ -134,7 +146,10 @@ public sealed class MagicMirrorSystem : EntitySystem UpdateInterface(uid, component.Target.Value, component); } - private void OnTryMagicMirrorChangeColor(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorMessage message) + private void OnTryMagicMirrorChangeColor( + EntityUid uid, + MagicMirrorComponent component, + MagicMirrorChangeColorMessage message) { if (component.Target is not { } target || message.Session.AttachedEntity is not { } user) return; @@ -149,19 +164,24 @@ public sealed class MagicMirrorSystem : EntitySystem Colors = message.Colors, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.ChangeSlotTime, doAfter, uid, target: target, used: uid) - { - BreakOnTargetMove = true, - BreakOnDamage = true, - BreakOnHandChange = false, - BreakOnUserMove = true, - BreakOnWeightlessMove = false, - NeedHand = true - }, out var doAfterId); + _doAfterSystem.TryStartDoAfter( + new DoAfterArgs(EntityManager, user, component.ChangeSlotTime, doAfter, uid, target: target, used: uid) + { + BreakOnTargetMove = true, + BreakOnDamage = true, + BreakOnHandChange = false, + BreakOnUserMove = true, + BreakOnWeightlessMove = false, + NeedHand = true + }, out var doAfterId); component.DoAfter = doAfterId; } - private void OnChangeColorDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorDoAfterEvent args) + + private void OnChangeColorDoAfter( + EntityUid uid, + MagicMirrorComponent component, + MagicMirrorChangeColorDoAfterEvent args) { if (args.Handled || args.Target == null || args.Cancelled) return; @@ -189,7 +209,10 @@ public sealed class MagicMirrorSystem : EntitySystem // UpdateInterface(uid, component.Target, message.Session); } - private void OnTryMagicMirrorRemoveSlot(EntityUid uid, MagicMirrorComponent component, MagicMirrorRemoveSlotMessage message) + private void OnTryMagicMirrorRemoveSlot( + EntityUid uid, + MagicMirrorComponent component, + MagicMirrorRemoveSlotMessage message) { if (component.Target is not { } target || message.Session.AttachedEntity is not { } user) return; @@ -203,22 +226,26 @@ public sealed class MagicMirrorSystem : EntitySystem Slot = message.Slot, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, component.RemoveSlotTime, doAfter, uid, target: target, used: uid) - { - DistanceThreshold = SharedInteractionSystem.InteractionRange, - BreakOnTargetMove = true, - BreakOnDamage = true, - BreakOnHandChange = false, - BreakOnUserMove = true, - BreakOnWeightlessMove = false, - NeedHand = true - }, out var doAfterId); + _doAfterSystem.TryStartDoAfter( + new DoAfterArgs(EntityManager, user, component.RemoveSlotTime, doAfter, uid, target: target, used: uid) + { + DistanceThreshold = SharedInteractionSystem.InteractionRange, + BreakOnTargetMove = true, + BreakOnDamage = true, + BreakOnHandChange = false, + BreakOnUserMove = true, + BreakOnWeightlessMove = false, + NeedHand = true + }, out var doAfterId); component.DoAfter = doAfterId; _audio.PlayPvs(component.ChangeHairSound, uid); } - private void OnRemoveSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorRemoveSlotDoAfterEvent args) + private void OnRemoveSlotDoAfter( + EntityUid uid, + MagicMirrorComponent component, + MagicMirrorRemoveSlotDoAfterEvent args) { if (args.Handled || args.Target == null || args.Cancelled) return; @@ -245,7 +272,10 @@ public sealed class MagicMirrorSystem : EntitySystem UpdateInterface(uid, component.Target.Value, component); } - private void OnTryMagicMirrorAddSlot(EntityUid uid, MagicMirrorComponent component, MagicMirrorAddSlotMessage message) + private void OnTryMagicMirrorAddSlot( + EntityUid uid, + MagicMirrorComponent component, + MagicMirrorAddSlotMessage message) { if (component.Target == null) return; @@ -261,7 +291,8 @@ public sealed class MagicMirrorSystem : EntitySystem Category = message.Category, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Session.AttachedEntity.Value, component.AddSlotTime, doAfter, uid, target: component.Target.Value, used: uid) + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Session.AttachedEntity.Value, + component.AddSlotTime, doAfter, uid, target: component.Target.Value, used: uid) { BreakOnTargetMove = true, BreakOnDamage = true, @@ -274,9 +305,11 @@ public sealed class MagicMirrorSystem : EntitySystem component.DoAfter = doAfterId; _audio.PlayPvs(component.ChangeHairSound, uid); } + private void OnAddSlotDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorAddSlotDoAfterEvent args) { - if (args.Handled || args.Target == null || args.Cancelled || !TryComp(component.Target, out HumanoidAppearanceComponent? humanoid)) + if (args.Handled || args.Target == null || args.Cancelled || + !TryComp(component.Target, out HumanoidAppearanceComponent? humanoid)) return; MarkingCategories category; @@ -301,7 +334,6 @@ public sealed class MagicMirrorSystem : EntitySystem _humanoid.AddMarking(component.Target.Value, marking, Color.Black); UpdateInterface(uid, component.Target.Value, component); - } private void UpdateInterface(EntityUid mirrorUid, EntityUid targetUid, MagicMirrorComponent component) @@ -332,4 +364,4 @@ public sealed class MagicMirrorSystem : EntitySystem { ent.Comp.Target = null; } -} +} \ No newline at end of file diff --git a/Resources/Locale/en-US/_white/tiles.ftl b/Resources/Locale/en-US/_white/tiles.ftl new file mode 100644 index 0000000000..55d061390d --- /dev/null +++ b/Resources/Locale/en-US/_white/tiles.ftl @@ -0,0 +1,11 @@ +tiles-dark-floor-pavement-alt = тёмное стальное покрытие (альтернативное) +tiles-dark-floor-pavement-vertical-alt = тёмное стальное вертикальное покрытие (альтернативное) +tiles-dark-floor-herringbone-alt = тёмное стальное покрытие мозаикой (альтернативное) + +tiles-steel-floor-pavement-alt = стальное покрытие (альтернативное) +tiles-steel-floor-pavement-vertical-alt = стальное вертикальное покрытие (альтернативное) +tiles-steel-floor-herringbone-alt = стальное покрытие мозаикой (альтернативное) + +tiles-white-floor-pavement-alt = белое стальное покрытие (альтернативное) +tiles-white-floor-pavement-vertical-alt = белое стальное вертикальное покрытие (альтернативное) +tiles-white-floor-herringbone-alt = белое стальное покрытие мозаикой (альтернативное) \ No newline at end of file diff --git a/Resources/Locale/ru-RU/weapons/ranged/gun.ftl b/Resources/Locale/ru-RU/weapons/ranged/gun.ftl index 5327e8c7e7..32376ea599 100644 --- a/Resources/Locale/ru-RU/weapons/ranged/gun.ftl +++ b/Resources/Locale/ru-RU/weapons/ranged/gun.ftl @@ -35,8 +35,8 @@ gun-chamber-bolt-closed = Затвор закрыт gun-chamber-bolt-opened = Затвор открыт gun-chamber-bolt-close = Закрыть завтор gun-chamber-bolt-open = Открыть затвор -gun-chamber-bolt-closed-state = закрыт -gun-chamber-bolt-open-state = открыт +gun-chamber-bolt-closed-state = открыт +gun-chamber-bolt-open-state = закрыт gun-chamber-rack = Разрядить # MagazineAmmoProvider diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml index b524f099bf..4ab44e0837 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml @@ -3,18 +3,19 @@ name: mirror description: 'Mirror mirror on the wall , who''s the most robust of them all?' components: - - type: WallMount - - type: Sprite - sprite: Structures/Wallmounts/mirror.rsi - state: mirror - - type: InteractionOutline - - type: Clickable - - type: Transform - anchored: true - - type: MagicMirror - - type: ActivatableUI - key: enum.MagicMirrorUiKey.Key - - type: UserInterface - interfaces: - - key: enum.MagicMirrorUiKey.Key - type: MagicMirrorBoundUserInterface + - type: WallMount + - type: Sprite + sprite: Structures/Wallmounts/mirror.rsi + state: mirror + - type: InteractionOutline + - type: Clickable + - type: Transform + anchored: true + - type: MagicMirror + - type: ActivatableUI + key: enum.MagicMirrorUiKey.Key + singleUser: true + - type: UserInterface + interfaces: + - key: enum.MagicMirrorUiKey.Key + type: MagicMirrorBoundUserInterface diff --git a/Resources/Prototypes/White/Tiles/floors.yml b/Resources/Prototypes/White/Tiles/floors.yml new file mode 100644 index 0000000000..1f8233470f --- /dev/null +++ b/Resources/Prototypes/White/Tiles/floors.yml @@ -0,0 +1,162 @@ +- type: tile + id: FloorDarkPavementAlt + name: tiles-dark-floor-pavement-alt + sprite: /Textures/White/Tiles/dark_pavement.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemDark + heatCapacity: 10000 + +- type: tile + id: FloorDarkPavementVerticalAlt + name: tiles-dark-floor-pavement-vertical-alt + sprite: /Textures/White/Tiles/dark_pavement_vertical.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemDark + heatCapacity: 10000 + + +- type: tile + id: FloorDarkHerringboneAlt + name: tiles-dark-floor-herringbone-alt + sprite: /Textures/White/Tiles/dark_herringbone.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemDark + heatCapacity: 10000 + +- type: tile + id: FloorSteelHerringboneAlt + name: tiles-steel-floor-herringbone-alt + sprite: /Textures/White/Tiles/steel_herringbone.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemSteel + heatCapacity: 10000 + +- type: tile + id: FloorSteelPavementAlt + name: tiles-steel-floor-pavement-alt + sprite: /Textures/White/Tiles/steel_pavement.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepFloor + itemDrop: FloorTileItemSteel + heatCapacity: 10000 + +- type: tile + id: FloorSteelPavementVerticalAlt + name: tiles-steel-floor-pavement-vertical-alt + sprite: /Textures/White/Tiles/steel_pavement_vertical.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemSteel + heatCapacity: 10000 + +- type: tile + id: FloorWhiteHerringboneAlt + name: tiles-white-floor-herringbone-alt + sprite: /Textures/White/Tiles/white_herringbone.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemWhite + heatCapacity: 10000 + +- type: tile + id: FloorWhitePavementAlt + name: tiles-white-floor-pavement-alt + sprite: /Textures/White/Tiles/white_pavement.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemWhite + heatCapacity: 10000 + +- type: tile + id: FloorWhitePavementVerticalAlt + name: tiles-white-floor-pavement-vertical-alt + sprite: /Textures/White/Tiles/white_pavement_vertical.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: Plating + isSubfloor: false + deconstructTools: [ Prying ] + footstepSounds: + collection: FootstepTile + itemDrop: FloorTileItemWhite + heatCapacity: 10000 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml index c28c71133b..a5ff612833 100644 --- a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml +++ b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml @@ -1,6 +1,6 @@ - type: entity id: AirlockGlassCult - parent: BaseStructure + parent: BaseMaterialDoor name: runic airlock description: Strange glass airlock with a rune. components: @@ -8,65 +8,32 @@ soundGroups: Brute: collection: GlassSmash - - type: InteractionOutline - type: Sprite sprite: /Textures/White/Cult/Structures/cult_airlock.rsi layers: - state: closed map: ["enum.DoorVisualLayers.Base"] - - state: closed_unlit - shader: unshaded - map: ["enum.DoorVisualLayers.BaseUnlit"] - - state: welded - map: ["enum.WeldableLayers.BaseWelded"] - visible: false - - state: bolted_unlit - shader: unshaded - map: ["enum.DoorVisualLayers.BaseBolted"] - - state: emergency_unlit - map: ["enum.DoorVisualLayers.BaseEmergencyAccess"] - shader: unshaded - - state: panel_closed - map: ["enum.WiresVisualLayers.MaintenancePanel"] - visible: false - - type: AnimationPlayer - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close - density: 100 - mask: - - FullTileMask - layer: - - GlassAirlockLayer + bodyType: Static + - type: Occluder + enabled: false - type: Door occludes: false + bumpOpen: true crushDamage: types: Blunt: 15 openSound: - path: /Audio/Machines/airlock_open.ogg + path: /Audio/Effects/stonedoor_openclose.ogg closeSound: - path: /Audio/Machines/airlock_close.ogg + path: /Audio/Effects/stonedoor_openclose.ogg denySound: path: /Audio/Machines/airlock_deny.ogg - - type: Airlock - openUnlitVisible: true - - type: DoorBolt - - type: Appearance - type: Airtight fixVacuum: true noAirWhenFullyAirBlocked: false - type: RadiationBlocker resistance: 2 - - type: Occluder - enabled: false - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - type: Destructible thresholds: - trigger: @@ -76,8 +43,6 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: RunicDoor - - type: ApcPowerReceiver - needsPower: false - type: Construction graph: AirlockGlassCult node: airlock diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/assembly.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/assembly.png index 7777aaa31e..7856083945 100644 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/assembly.png and b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/assembly.png differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/bolted_open_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/bolted_open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/bolted_open_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/bolted_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/bolted_unlit.png deleted file mode 100644 index da1ae6172a..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/bolted_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closed.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closed.png index e9626ba15f..bbd196ff14 100644 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closed.png and b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closed.png differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closed_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closed_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closed_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closing.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closing.png index 3054d5f6a9..263a6b01de 100644 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closing.png and b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closing.png differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closing_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closing_unlit.png deleted file mode 100644 index 1da0bc0e54..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/closing_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/deny_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/deny_unlit.png deleted file mode 100644 index 23c6522a47..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/deny_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/emergency_open_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/emergency_open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/emergency_open_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/emergency_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/emergency_unlit.png deleted file mode 100644 index e4cc5b0212..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/emergency_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/meta.json b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/meta.json index c48f5e427e..6f47311d80 100644 --- a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/meta.json +++ b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/meta.json @@ -41,157 +41,6 @@ }, { "name": "assembly" - }, - { - "name": "bolted_unlit" - }, - { - "name": "welded" - }, - { - "name": "closing_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "deny_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "emergency_unlit", - "delays": [ - [ - 1.2, - 1.2 - ] - ] - }, - { - "name": "opening_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "panel_closed" - }, - { - "name": "panel_open" - }, - { - "name": "panel_opening", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "panel_closing", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sparks", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sparks_damaged", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1.7 - ] - ] - }, - { - "name": "sparks_open", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "sparks_broken", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "bolted_open_unlit" - }, - { - "name": "closed_unlit" - }, - { - "name": "emergency_open_unlit" - }, - { - "name": "open_unlit" } ] } \ No newline at end of file diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/open_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/open_unlit.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/open_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/opening.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/opening.png index 8b792e6bcd..997689cdd5 100644 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/opening.png and b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/opening.png differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/opening_unlit.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/opening_unlit.png deleted file mode 100644 index 18d485b999..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/opening_unlit.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_closed.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_closed.png deleted file mode 100644 index 3191156971..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_closed.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_closing.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_closing.png deleted file mode 100644 index 9ff520d4e1..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_closing.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_open.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_open.png deleted file mode 100644 index 4c59d3a28c..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_open.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_opening.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_opening.png deleted file mode 100644 index 7f24d5bf2a..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/panel_opening.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks.png deleted file mode 100644 index e95f427277..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_broken.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_broken.png deleted file mode 100644 index 96424a7689..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_broken.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_damaged.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_damaged.png deleted file mode 100644 index c577e9d436..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_damaged.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_open.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_open.png deleted file mode 100644 index c79c5a7710..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/sparks_open.png and /dev/null differ diff --git a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/welded.png b/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/welded.png deleted file mode 100644 index 274ad20898..0000000000 Binary files a/Resources/Textures/White/Cult/Structures/cult_airlock.rsi/welded.png and /dev/null differ diff --git a/Resources/Textures/White/Tiles/dark_herringbone.png b/Resources/Textures/White/Tiles/dark_herringbone.png new file mode 100644 index 0000000000..9067c99da8 Binary files /dev/null and b/Resources/Textures/White/Tiles/dark_herringbone.png differ diff --git a/Resources/Textures/White/Tiles/dark_pavement.png b/Resources/Textures/White/Tiles/dark_pavement.png new file mode 100644 index 0000000000..6cda4dd8ca Binary files /dev/null and b/Resources/Textures/White/Tiles/dark_pavement.png differ diff --git a/Resources/Textures/White/Tiles/dark_pavement_vertical.png b/Resources/Textures/White/Tiles/dark_pavement_vertical.png new file mode 100644 index 0000000000..c05bf49f77 Binary files /dev/null and b/Resources/Textures/White/Tiles/dark_pavement_vertical.png differ diff --git a/Resources/Textures/White/Tiles/steel_herringbone.png b/Resources/Textures/White/Tiles/steel_herringbone.png new file mode 100644 index 0000000000..48e704ae14 Binary files /dev/null and b/Resources/Textures/White/Tiles/steel_herringbone.png differ diff --git a/Resources/Textures/White/Tiles/steel_pavement.png b/Resources/Textures/White/Tiles/steel_pavement.png new file mode 100644 index 0000000000..9dc7cbed58 Binary files /dev/null and b/Resources/Textures/White/Tiles/steel_pavement.png differ diff --git a/Resources/Textures/White/Tiles/steel_pavement_vertical.png b/Resources/Textures/White/Tiles/steel_pavement_vertical.png new file mode 100644 index 0000000000..ad8f8155f0 Binary files /dev/null and b/Resources/Textures/White/Tiles/steel_pavement_vertical.png differ diff --git a/Resources/Textures/White/Tiles/white_herringbone.png b/Resources/Textures/White/Tiles/white_herringbone.png new file mode 100644 index 0000000000..d370242bd7 Binary files /dev/null and b/Resources/Textures/White/Tiles/white_herringbone.png differ diff --git a/Resources/Textures/White/Tiles/white_pavement.png b/Resources/Textures/White/Tiles/white_pavement.png new file mode 100644 index 0000000000..ba211ac9eb Binary files /dev/null and b/Resources/Textures/White/Tiles/white_pavement.png differ diff --git a/Resources/Textures/White/Tiles/white_pavement_vertical.png b/Resources/Textures/White/Tiles/white_pavement_vertical.png new file mode 100644 index 0000000000..e452d7edef Binary files /dev/null and b/Resources/Textures/White/Tiles/white_pavement_vertical.png differ