diff --git a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs index 8c67505532..59e7717112 100644 --- a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs +++ b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs @@ -45,7 +45,7 @@ public sealed partial class MaterialStorageControl : BoxContainer } var gridStorage = _entityManager.TryGetComponent(_owner, out var transformComponent) && - _entityManager.HasComponent(_owner) && + _entityManager.HasComponent(_owner) && _entityManager.TryGetComponent(transformComponent.GridUid, out var materialStorageComponent) ? materialStorageComponent : null; diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs index 89ec193bcb..5e3b3f2b3b 100644 --- a/Content.Server/Lathe/LatheSystem.cs +++ b/Content.Server/Lathe/LatheSystem.cs @@ -109,6 +109,7 @@ namespace Content.Server.Lathe return; var materialWhitelist = new List>(); var recipes = GetAvailableRecipes(uid, component, true); + foreach (var id in recipes) { if (!_proto.TryIndex(id, out var proto)) @@ -122,6 +123,18 @@ namespace Content.Server.Lathe } } + if (TryComp(args.Storage, out var materialStorageComponent) && + materialStorageComponent.Whitelist?.Entities != null) + { + foreach (var id in materialStorageComponent.Whitelist.Entities) + { + if (!materialWhitelist.Contains(id)) + { + materialWhitelist.Add(id); + } + } + } + var combined = args.Whitelist.Union(materialWhitelist).ToList(); args.Whitelist = combined; } @@ -165,7 +178,7 @@ namespace Content.Server.Lathe ? (int) (-amount * component.MaterialUseMultiplier) : -amount; - var gridUid = HasComp(uid) && + var gridUid = HasComp(uid) && TryComp(uid, out var transformComponent) ? transformComponent.GridUid : null; var gridStorage = diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs index 48f9aa661c..3795773b0b 100644 --- a/Content.Server/Materials/MaterialStorageSystem.cs +++ b/Content.Server/Materials/MaterialStorageSystem.cs @@ -79,7 +79,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem volume = sheetsToExtract * volumePerSheet; } - var gridUid = HasComp(uid) && + var gridUid = HasComp(uid) && TryComp(uid, out var transformComponent) ? transformComponent.GridUid : null; @@ -109,18 +109,23 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem { if (!Resolve(receiver, ref storage) || !Resolve(toInsert, ref material, ref composition, false)) return false; + if (TryComp(receiver, out var power) && !power.Powered) return false; + if (!base.TryInsertMaterialEntity(user, toInsert, receiver, storage, material, composition)) return false; + _audio.PlayPvs(storage.InsertingSound, receiver); _popup.PopupEntity(Loc.GetString("machine-insert-item", ("user", user), ("machine", receiver), ("item", toInsert)), receiver); + QueueDel(toInsert); // Logging TryComp(toInsert, out var stack); var count = stack?.Count ?? 1; + _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user):player} inserted {count} {ToPrettyString(toInsert):inserted} into {ToPrettyString(receiver):receiver}"); return true; diff --git a/Content.Server/_White/Felinid/FelinidComponent.cs b/Content.Server/_White/Felinid/FelinidComponent.cs index 42858a9cb0..fdb55f88c4 100644 --- a/Content.Server/_White/Felinid/FelinidComponent.cs +++ b/Content.Server/_White/Felinid/FelinidComponent.cs @@ -1,3 +1,4 @@ +using Robust.Shared.Audio; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Prototypes; @@ -12,6 +13,9 @@ namespace Content.Server.Abilities.Felinid [DataField("hairballPrototype", customTypeSerializer: typeof(PrototypeIdSerializer))] public string HairballPrototype = "Hairball"; + [DataField] + public SoundSpecifier MouseEatingSound = new SoundCollectionSpecifier("eating"); + public EntityUid? HairballAction; public EntityUid? EatMouseAction; diff --git a/Content.Server/_White/Felinid/FelinidSystem.cs b/Content.Server/_White/Felinid/FelinidSystem.cs index 4caef04bdf..3329d57bf7 100644 --- a/Content.Server/_White/Felinid/FelinidSystem.cs +++ b/Content.Server/_White/Felinid/FelinidSystem.cs @@ -137,7 +137,7 @@ namespace Content.Server.Abilities.Felinid Del(component.PotentialTarget.Value); component.PotentialTarget = null; - _audio.PlayPvs("/Audio/Items/eatfood.ogg", uid, AudioParams.Default.WithVariation(0.15f)); + _audio.PlayPvs(component.MouseEatingSound, uid, AudioParams.Default.WithVariation(0.15f)); _hungerSystem.ModifyHunger(uid, 70f, hunger); diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs index 71b16a9991..c5201be400 100644 --- a/Content.Shared/Lathe/SharedLatheSystem.cs +++ b/Content.Shared/Lathe/SharedLatheSystem.cs @@ -46,7 +46,7 @@ public abstract class SharedLatheSystem : EntitySystem var adjustedAmount = AdjustMaterial(needed, recipe.ApplyMaterialDiscount, component.MaterialUseMultiplier); var gridUid = - HasComp(uid) && + HasComp(uid) && TryComp(uid, out var transformComponent) ? transformComponent.GridUid : null; diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs index e8977a55b8..ed579dc626 100644 --- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs +++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs @@ -296,7 +296,7 @@ public abstract class SharedMaterialStorageSystem : EntitySystem var multiplier = TryComp(toInsert, out var stackComponent) ? stackComponent.Count : 1; var totalVolume = 0; - var gridUid = HasComp(receiver) && + var gridUid = HasComp(receiver) && TryComp(receiver, out var transformComponent) ? transformComponent.GridUid : null; @@ -348,8 +348,10 @@ public abstract class SharedMaterialStorageSystem : EntitySystem { if (!Resolve(uid, ref component, false)) return; + var ev = new GetMaterialWhitelistEvent(uid); RaiseLocalEvent(uid, ref ev); + component.MaterialWhiteList = ev.Whitelist; Dirty(uid, component); } diff --git a/Content.Shared/Whitelist/EntityWhitelist.cs b/Content.Shared/Whitelist/EntityWhitelist.cs index 942de2b0e8..0e5b0177d3 100644 --- a/Content.Shared/Whitelist/EntityWhitelist.cs +++ b/Content.Shared/Whitelist/EntityWhitelist.cs @@ -1,4 +1,5 @@ using Content.Shared.Tag; +using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; @@ -31,6 +32,9 @@ namespace Content.Shared.Whitelist [NonSerialized] private List? _registrations = null; + [DataField(customTypeSerializer:typeof(PrototypeIdListSerializer))] + public List? Entities; + /// /// Tags that are allowed in the whitelist. /// diff --git a/Content.Shared/_White/ShitSilo/BluespaceSiloComponent.cs b/Content.Shared/_White/ShitSilo/BluespaceStorageComponent.cs similarity index 65% rename from Content.Shared/_White/ShitSilo/BluespaceSiloComponent.cs rename to Content.Shared/_White/ShitSilo/BluespaceStorageComponent.cs index 6d7f3446f8..1815410cc4 100644 --- a/Content.Shared/_White/ShitSilo/BluespaceSiloComponent.cs +++ b/Content.Shared/_White/ShitSilo/BluespaceStorageComponent.cs @@ -3,7 +3,7 @@ namespace Content.Shared._White.ShitSilo; [RegisterComponent, NetworkedComponent] -public sealed partial class BluespaceSiloComponent : Component +public sealed partial class BluespaceStorageComponent : Component { } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl index 91d505eda6..b5f8e12909 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/airlocks.ftl @@ -61,3 +61,10 @@ ent-AirlockCommandGlass = { ent-AirlockGlass } ent-AirlockSecurityGlass = { ent-AirlockGlass } .desc = { ent-AirlockGlass.desc } .suffix = СлужбаБезопасности + +ent-AirlockHatch = шлюзовый люк + .desc = { ent-Airlock.desc } + +ent-AirlockHatchMaintenance = { ent-AirlockHatch} + .desc = { ent-AirlockHatch.desc } + .suffix = Технический diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index b483e97dd2..5a81dfe571 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -16500,7 +16500,7 @@ entities: - type: Transform pos: -49.629227,-28.475441 parent: 60 -- proto: BodyBag_Container +- proto: BodyBagContainer entities: - uid: 2049 components: diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 9f04f3c1ca..fdca309e2e 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -16606,7 +16606,7 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,47.5 parent: 8364 -- proto: BodyBag_Folded +- proto: BodyBagFolded entities: - uid: 27686 components: diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml index 7c1c125441..54056562cf 100644 --- a/Resources/Maps/cluster.yml +++ b/Resources/Maps/cluster.yml @@ -8171,7 +8171,7 @@ entities: - type: Transform pos: -26.622076,24.452543 parent: 1 -- proto: BodyBag_Container +- proto: BodyBagContainer entities: - uid: 8242 components: diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index 49f9368d4f..51569ec73f 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -20173,7 +20173,7 @@ entities: - type: Transform pos: 19.5,-51.5 parent: 2 -- proto: BodyBag_Folded +- proto: BodyBagFolded entities: - uid: 161 components: diff --git a/Resources/Maps/europa.yml b/Resources/Maps/europa.yml index 4350cc21b6..8bad31eeaf 100644 --- a/Resources/Maps/europa.yml +++ b/Resources/Maps/europa.yml @@ -15255,7 +15255,7 @@ entities: - type: Transform pos: 30.5,56.5 parent: 1 -- proto: BodyBag_Folded +- proto: BodyBagFolded entities: - uid: 2490 components: diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 416b8112b3..7f0d716657 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -15186,7 +15186,7 @@ entities: - type: Transform pos: -42.538452,-53.54715 parent: 5350 -- proto: BodyBag_Folded +- proto: BodyBagFolded entities: - uid: 23085 components: diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml index f8ddea0e99..085c8d1b6b 100644 --- a/Resources/Maps/train.yml +++ b/Resources/Maps/train.yml @@ -11878,7 +11878,7 @@ entities: - type: Transform pos: 6.380858,-242.27087 parent: 2 -- proto: BodyBag_Folded +- proto: BodyBagFolded entities: - uid: 2706 components: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index aba61ce332..9862399776 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -117,7 +117,7 @@ components: - type: StorageFill contents: - - id: BodyBag_Folded + - id: BodyBagFolded amount: 4 - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index e08c02db85..4519721b19 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -1,5 +1,5 @@ - type: entity - id: BodyBag_Container + id: BodyBagContainer parent: BaseFoldable name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. @@ -42,7 +42,6 @@ mask: - Impassable - type: EntityStorage - capacity: 1 isCollidableWhenOpen: true closeSound: path: /Audio/Misc/zip.ogg @@ -83,10 +82,10 @@ price: 50 - type: entity - id: BodyBag_Folded + id: BodyBagFolded name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. - parent: BodyBag_Container + parent: BodyBagContainer suffix: folded components: - type: Foldable diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index d4d549f26d..1ba3cc0b01 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -18,8 +18,19 @@ layer: - MachineLayer - type: Lathe - - type: BluespaceSilo - type: MaterialStorage + whitelist: + tags: + - Sheet + - RawMaterial + - Ingot + entities: + - Steel + - Glass + - Gold + - Plasma + - Uranium + - Plastic - type: Destructible thresholds: - trigger: @@ -75,12 +86,6 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Machine board: AutolatheMachineCircuitboard - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - type: Lathe idleState: icon runningState: building @@ -226,7 +231,7 @@ - MagazineGrenadeEmpty - GrenadeEMP - GrenadeFlash - - type: BluespaceSilo + - type: BluespaceStorage - type: entity id: AutolatheHyperConvection @@ -239,7 +244,7 @@ - type: Lathe materialUseMultiplier: 0.5 timeMultiplier: 1.5 - - type: BluespaceSilo + - type: BluespaceStorage - type: LatheHeatProducing - type: Machine board: AutolatheHyperConvectionMachineCircuitboard @@ -268,12 +273,6 @@ - type: Wires boardName: wires-board-name-protolathe layoutId: Protolathe - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - type: Lathe idleState: icon runningState: building @@ -352,7 +351,7 @@ - WeaponAdvancedLaser - WeaponLaserCannon - WeaponXrayCannon - - type: BluespaceSilo + - type: BluespaceStorage - type: entity id: ProtolatheHyperConvection @@ -365,7 +364,7 @@ - type: Lathe materialUseMultiplier: 0.5 timeMultiplier: 1.5 - - type: BluespaceSilo + - type: BluespaceStorage - type: LatheHeatProducing - type: Machine board: ProtolatheHyperConvectionMachineCircuitboard @@ -481,7 +480,7 @@ - ArtifactCrusherMachineCircuitboard - TelecomServerCircuitboard - MassMediaCircuitboard - - type: BluespaceSilo + - type: BluespaceStorage - type: MaterialStorage whitelist: tags: @@ -594,7 +593,7 @@ - HamtrLLeg - HamtrRLeg - VimHarness - - type: BluespaceSilo + - type: BluespaceStorage - type: MaterialStorage whitelist: tags: @@ -647,7 +646,6 @@ - AbominationCube - SpaceCarpCube - SpaceTickCube - - type: BluespaceSilo - type: entity id: SecurityTechFab @@ -774,13 +772,7 @@ - MagazineBoxMagnumAP - MagazineBoxAntiMateriel - MagazineBoxCaselessRifle - - type: MaterialStorage - whitelist: - tags: - - Sheet - - RawMaterial - - Ingot - - type: BluespaceSilo + - type: BluespaceStorage - type: entity id: AmmoTechFab @@ -827,12 +819,8 @@ - MagazineBoxMagnumAP - MagazineBoxAntiMateriel - MagazineBoxCaselessRifle - - type: BluespaceSilo - - type: MaterialStorage - whitelist: - tags: - - Sheet - - + - type: BluespaceStorage + - type: entity id: MedicalTechFab parent: BaseLathe @@ -901,7 +889,7 @@ - SyringeBluespace - SyringeCryostasis - ClothingEyesHudMedical - - type: BluespaceSilo + - type: BluespaceStorage - type: Machine board: MedicalTechFabCircuitboard - type: StealTarget @@ -1086,7 +1074,7 @@ - ClothingOuterWinterCentcom - ClothingOuterWinterSyndie - ClothingOuterWinterSyndieCap - - type: BluespaceSilo + - type: BluespaceStorage - type: MaterialStorage whitelist: tags: @@ -1133,7 +1121,6 @@ - IngotGold30 - IngotSilver30 - MaterialBananium10 - - type: BluespaceSilo - type: entity parent: OreProcessor @@ -1162,7 +1149,6 @@ - IngotGold30 - IngotSilver30 - MaterialBananium10 - - type: BluespaceSilo - type: entity parent: BaseLathe @@ -1194,4 +1180,3 @@ staticRecipes: - MaterialSheetMeat - SheetPaper - - type: BluespaceSilo diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml index eda36f355b..25ea39e0e1 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml @@ -36,7 +36,6 @@ - type: EntityStorage isCollidableWhenOpen: true showContents: false - capacity: 1 enteringOffset: 0, -1 closeSound: path: /Audio/Items/deconstruct.ogg diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index 635a54b6ab..2b7840d0b1 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -49,7 +49,7 @@ - type: latheRecipe id: BodyBag - result: BodyBag_Folded + result: BodyBagFolded completetime: 2 materials: Plastic: 300 diff --git a/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml b/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml index 5559938e08..a788af60ba 100644 --- a/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml +++ b/Resources/Prototypes/White/Entities/Structures/Machines/doc_printer.yml @@ -20,7 +20,7 @@ layer: - TabletopMachineLayer - type: Lathe - - type: BluespaceSilo + - type: BluespaceStorage - type: MaterialStorage - type: ActivatableUI key: enum.LatheUiKey.Key diff --git a/Resources/Prototypes/White/Mobs/Player/felinid.yml b/Resources/Prototypes/White/Mobs/Player/felinid.yml index 1741b93e32..813ae49c4f 100644 --- a/Resources/Prototypes/White/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/White/Mobs/Player/felinid.yml @@ -31,7 +31,7 @@ - type: CameraRecoil - type: Examiner - type: CanHostGuardian - - type: Felinid #since this just adds an action... + - type: Felinid - type: InteractionPopup successChance: 1 interactSuccessString: petting-success-cat 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 01ddc9fef0..d92c0ca3df 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/closing.png index 9e9e14d1bd..399f965816 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/opening.png index 94b0291a5b..64f8116f45 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/command.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closed.png index 96349c2a29..c1793a1076 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/closing.png index 2a861fa8a4..7b285ba601 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/opening.png index edcf9d92cc..ff2693c592 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/engineering.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closed.png index b409f80c52..90c3f4cd90 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/closing.png index c27f6aad6f..033682b7e3 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/opening.png index 47dee90e59..38441d5bda 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/external.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed.png index 6699ff8154..296ef6a128 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closing.png index f8d6f1e29e..5ae48c213d 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/opening.png index be4300f51c..b71c4e1e41 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/firelock.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/assembly.png index ade0a87386..ec0074757c 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/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closed.png index 8c90b693a4..419e050645 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/closing.png index 4347bf8afe..9e4b1edb57 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 225d45a82a..98675fc927 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/frame1.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/frame1.png index 458698515f..d722a8a0f7 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 67f782bd89..47b5c0067b 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 5421154834..6a8b30b912 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 6252d37d1e..1717ef5404 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 12ccff5cb0..ec2d03812d 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/firelock.rsi/opening.png index 79a05996ad..39e81737fb 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/hatch.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json index afa8c6ae41..60443e10ef 100644 --- a/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json +++ b/Resources/Textures/Structures/Doors/Airlocks/Standard/hatch.rsi/meta.json @@ -22,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "emergency_open_unlit" + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ 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 afa8c6ae41..60443e10ef 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 @@ -22,6 +22,12 @@ { "name": "open_unlit" }, + { + "name": "emergency_open_unlit" + }, + { + "name": "bolted_open_unlit" + }, { "name": "closing", "delays": [ 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 9035162d43..03664aba10 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/closing.png index d207ec7d21..df67d798ac 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/opening.png index d6d578a3be..39cb944eda 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/medical.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closed.png index b228a1487c..0d20d9f416 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/closing.png index a124e930d2..0c4b9de2d6 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/opening.png index 2f25dfe043..9f857363bc 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/science.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png index 814fba3422..52ab160fc5 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png index 891dda16ce..d2c2320b7e 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png index eeab16dca7..c2e139bd66 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/security.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closed.png index 4cfd894f74..d80c06d5bb 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/closing.png index 56ac2b4ead..42eda07286 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/opening.png index a9f90c4553..eee04d4977 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/syndicate.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png index bc5174213c..f079442300 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png index 5311eca045..9885931064 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png differ diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png index cc155dc10b..c2f3f07d87 100644 Binary files a/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png and b/Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.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 9c33e5217d..94c93fd35c 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/closing.png index 42838cc43d..60b2c12cef 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/opening.png index c68f20d436..bf27e40cf8 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/highsec/highsec.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/assembly.png index 8f42abb532..60f0fb6f95 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/closed.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closed.png index ef026cecb5..cc82dfbd8f 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/closing.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/closing.png index 4487612111..6ada60c527 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/opening.png b/Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/opening.png index 1e69cc0a90..34468d7acd 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/White/ChatFilters/slang.json b/Resources/White/ChatFilters/slang.json index 57d6ceda34..1dd0ab4a1c 100644 --- a/Resources/White/ChatFilters/slang.json +++ b/Resources/White/ChatFilters/slang.json @@ -318,6 +318,11 @@ "чиллит": "отдыхает", "чиллим": "отдыхаем", "жиза": "жизненно", + "анома": "аномалия", + "аному": "аномалию", + "аномы": "аномалии", + "аномов": "аномалий", + "аномах": "аномалиях", "сус": "подозрительно", "сасно": "привлекательно", "сасный": "привлекательный",