diff --git a/.github/labeler.yml b/.github/labeler.yml index 9d9fe3a08d..97b402eda9 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -12,6 +12,10 @@ - changed-files: - any-glob-to-any-file: '**/*.xaml*' +"Changes: Shaders": +- changed-files: + - any-glob-to-any-file: '**/*.swsl' + "No C#": - changed-files: # Equiv to any-glob-to-all as long as this has one matcher. If ALL changed files are not C# files, then apply label. diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs index 4a579fc4bf..ad360c5439 100644 --- a/Content.Client/Arcade/BlockGameMenu.cs +++ b/Content.Client/Arcade/BlockGameMenu.cs @@ -380,7 +380,7 @@ namespace Content.Client.Arcade { PanelOverride = back, HorizontalExpand = true, - SizeFlagsStretchRatio = 60 + SizeFlagsStretchRatio = 34.25f }; var backgroundPanel = new PanelContainer { diff --git a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs index 8fa8035afd..4f08e6bd0a 100644 --- a/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs @@ -17,6 +17,7 @@ public sealed class BlockGameBoundUserInterface : BoundUserInterface base.Open(); _menu = this.CreateWindow(); + _menu.OnAction += SendAction; } protected override void ReceiveMessage(BoundUserInterfaceMessage message) diff --git a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs index c0704530de..8fff406e86 100644 --- a/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs +++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs @@ -25,6 +25,7 @@ public sealed class SpaceVillainArcadeBoundUserInterface : BoundUserInterface base.Open(); _menu = this.CreateWindow(); + _menu.OnPlayerAction += SendAction; } protected override void ReceiveMessage(BoundUserInterfaceMessage message) diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs index 6f39bc386e..7ce863b7cd 100644 --- a/Content.Client/Mech/Ui/MechMenu.xaml.cs +++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs @@ -12,7 +12,7 @@ public sealed partial class MechMenu : FancyWindow { [Dependency] private readonly IEntityManager _ent = default!; - private readonly EntityUid _mech; + private EntityUid _mech; public event Action? OnRemoveButtonPressed; @@ -25,6 +25,7 @@ public sealed partial class MechMenu : FancyWindow public void SetEntity(EntityUid uid) { MechView.SetEntity(uid); + _mech = uid; } public void UpdateMechStats() diff --git a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs index 801a3f8fdf..71561703d6 100644 --- a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs +++ b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.Position.cs @@ -170,11 +170,12 @@ public sealed partial class ReplaySpectatorSystem { var size = grid.LocalAABB.Size.LengthSquared(); - if (maxSize is not null && size < maxSize) - continue; - var station = HasComp(uid); + //We want the first station grid to overwrite any previous non-station grids no matter the size, in case the vgroid was found first + if (maxSize is not null && size < maxSize && !(!stationFound && station)) + continue; + if (!station && stationFound) continue; @@ -183,7 +184,6 @@ public sealed partial class ReplaySpectatorSystem if (station) stationFound = true; - } coords = new EntityCoordinates(maxUid ?? default, default); diff --git a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs index 518166ed86..3109df890a 100644 --- a/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/FailAndStartPresetTest.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using Content.Server.GameTicking; using Content.Server.GameTicking.Presets; using Content.Shared.CCVar; @@ -36,7 +36,7 @@ public sealed class FailAndStartPresetTest - type: entity id: TestRule parent: BaseGameRule - noSpawn: true + categories: [ GameRules ] components: - type: GameRule minPlayers: 0 @@ -45,7 +45,7 @@ public sealed class FailAndStartPresetTest - type: entity id: TestRuleTenPlayers parent: BaseGameRule - noSpawn: true + categories: [ GameRules ] components: - type: GameRule minPlayers: 10 diff --git a/Content.Server/Administration/Commands/JobWhitelistCommands.cs b/Content.Server/Administration/Commands/JobWhitelistCommands.cs index a84a11ef84..e604417f92 100644 --- a/Content.Server/Administration/Commands/JobWhitelistCommands.cs +++ b/Content.Server/Administration/Commands/JobWhitelistCommands.cs @@ -47,7 +47,7 @@ public sealed class JobWhitelistAddCommand : LocalizedCommands var isWhitelisted = await _db.IsJobWhitelisted(guid, job); if (isWhitelisted) { - shell.WriteLine(Loc.GetString("cmd-jobwhitelist-already-whitelisted", + shell.WriteLine(Loc.GetString("cmd-jobwhitelistadd-already-whitelisted", ("player", player), ("jobId", job.Id), ("jobName", jobPrototype.LocalizedName))); diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index eb21662719..1f5abf6726 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -285,18 +285,18 @@ public sealed partial class AdminVerbSystem { Text = "admin-smite-remove-hands-name", Category = VerbCategory.Smite, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"), + Icon = new SpriteSpecifier.Rsi(new("/Textures/Fluids/vomit_toxin.rsi"), "vomit_toxin-1"), Act = () => { _vomitSystem.Vomit(args.Target, -1000, -1000); // You feel hollow! - var organs = _bodySystem.GetBodyOrganComponents(args.Target, body); + var organs = _bodySystem.GetBodyOrganEntityComps((args.Target, body)); var baseXform = Transform(args.Target); - foreach (var (xform, organ) in organs) + foreach (var organ in organs) { - if (HasComp(xform.Owner) || HasComp(xform.Owner)) + if (HasComp(organ.Owner) || HasComp(organ.Owner)) continue; - _transformSystem.AttachToGridOrMap(organ.Owner); + _transformSystem.PlaceNextTo((organ.Owner, organ.Comp1), (args.Target, baseXform)); } _popupSystem.PopupEntity(Loc.GetString("admin-smite-vomit-organs-self"), args.Target, @@ -361,9 +361,9 @@ public sealed partial class AdminVerbSystem Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "stomach"), Act = () => { - foreach (var (component, _) in _bodySystem.GetBodyOrganComponents(args.Target, body)) + foreach (var entity in _bodySystem.GetBodyOrganEntityComps((args.Target, body))) { - QueueDel(component.Owner); + QueueDel(entity.Owner); } _popupSystem.PopupEntity(Loc.GetString("admin-smite-stomach-removal-self"), args.Target, @@ -381,9 +381,9 @@ public sealed partial class AdminVerbSystem Icon = new SpriteSpecifier.Rsi(new ("/Textures/Mobs/Species/Human/organs.rsi"), "lung-r"), Act = () => { - foreach (var (component, _) in _bodySystem.GetBodyOrganComponents(args.Target, body)) + foreach (var entity in _bodySystem.GetBodyOrganEntityComps((args.Target, body))) { - QueueDel(component.Owner); + QueueDel(entity.Owner); } _popupSystem.PopupEntity(Loc.GetString("admin-smite-lung-removal-self"), args.Target, diff --git a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs index 434a3fef66..9f18a41292 100644 --- a/Content.Server/Anomaly/AnomalySynchronizerSystem.cs +++ b/Content.Server/Anomaly/AnomalySynchronizerSystem.cs @@ -122,7 +122,7 @@ public sealed partial class AnomalySynchronizerSystem : EntitySystem _audio.PlayPvs(ent.Comp.ConnectedSound, ent); } - //TO DO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer. + //TODO: disconnection from the anomaly should also be triggered if the anomaly is far away from the synchronizer. //Currently only bluespace anomaly can do this, but for some reason it is the only one that cannot be connected to the synchronizer. private void DisconneсtFromAnomaly(Entity ent, AnomalyComponent anomaly) { diff --git a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs index 0e49c5ee56..d289fdabff 100644 --- a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs @@ -76,7 +76,7 @@ public sealed class ReagentProducerAnomalySystem : EntitySystem if (anomaly.Severity >= 0.97) reagentProducingAmount *= component.SupercriticalReagentProducingModifier; newSol.AddReagent(component.ProducingReagent, reagentProducingAmount); - _solutionContainer.TryAddSolution(component.Solution.Value, newSol); //TO DO - the container is not fully filled. + _solutionContainer.TryAddSolution(component.Solution.Value, newSol); // TODO - the container is not fully filled. component.AccumulatedFrametime = 0; diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index d2bc26f20d..c9ef237474 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -336,7 +336,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystemThe message to broadcase to all players/spectators. private void SendMessage(BoundUserInterfaceMessage message) { - _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message); + _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message); } /// @@ -167,7 +167,7 @@ public sealed partial class BlockGame /// The target recipient. private void SendMessage(BoundUserInterfaceMessage message, EntityUid actor) { - _uiSystem.ServerSendUiMessage(_entityManager.GetEntity(message.Entity), BlockGameUiKey.Key, message, actor); + _uiSystem.ServerSendUiMessage(_owner, BlockGameUiKey.Key, message, actor); } /// diff --git a/Content.Server/CharacterInfo/CharacterInfoSystem.cs b/Content.Server/CharacterInfo/CharacterInfoSystem.cs index 3099b2f90f..3d83a66705 100644 --- a/Content.Server/CharacterInfo/CharacterInfoSystem.cs +++ b/Content.Server/CharacterInfo/CharacterInfoSystem.cs @@ -31,7 +31,7 @@ public sealed class CharacterInfoSystem : EntitySystem var entity = args.SenderSession.AttachedEntity.Value; var objectives = new Dictionary>(); - var jobTitle = "No Profession"; + var jobTitle = Loc.GetString("character-info-no-profession"); string? briefing = null; if (_minds.TryGetMind(entity, out var mindId, out var mind)) { diff --git a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs index d2d8f9fccc..96d8ca86b5 100644 --- a/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/InjectorSystem.cs @@ -206,9 +206,9 @@ public sealed class InjectorSystem : SharedInjectorSystem BreakOnMove = true, BreakOnWeightlessMove = false, BreakOnDamage = true, - NeedHand = true, - BreakOnHandChange = true, - MovementThreshold = 0.1f, + NeedHand = injector.Comp.NeedHand, + BreakOnHandChange = injector.Comp.BreakOnHandChange, + MovementThreshold = injector.Comp.MovementThreshold, }); } diff --git a/Content.Server/Flash/DamagedByFlashingSystem.cs b/Content.Server/Flash/DamagedByFlashingSystem.cs index cf0368ca42..5b4c19b8e5 100644 --- a/Content.Server/Flash/DamagedByFlashingSystem.cs +++ b/Content.Server/Flash/DamagedByFlashingSystem.cs @@ -16,7 +16,7 @@ public sealed class DamagedByFlashingSystem : EntitySystem { _damageable.TryChangeDamage(ent, ent.Comp.FlashDamage); - //To Do: It would be more logical if different flashes had different power, + //TODO: It would be more logical if different flashes had different power, //and the damage would be inflicted depending on the strength of the flash. } } diff --git a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs index 8354a24f90..64e46bb608 100644 --- a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs @@ -96,7 +96,7 @@ public sealed class ToggleableGhostRoleSystem : EntitySystem private void AddWipeVerb(EntityUid uid, ToggleableGhostRoleComponent component, GetVerbsEvent args) { - if (!args.CanAccess || !args.CanInteract) + if (args.Hands == null || !args.CanAccess || !args.CanInteract) return; if (TryComp(uid, out var mind) && mind.HasMind) diff --git a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs index 81001f0932..b4023bbdb9 100644 --- a/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -157,7 +157,7 @@ namespace Content.Server.Kitchen.EntitySystems var outputContainer = _itemSlotsSystem.GetItemOrNull(uid, SharedReagentGrinder.BeakerSlotId); _appearanceSystem.SetData(uid, ReagentGrinderVisualState.BeakerAttached, outputContainer.HasValue); - if (reagentGrinder.AutoMode != GrinderAutoMode.Off && !HasComp(uid)) + if (reagentGrinder.AutoMode != GrinderAutoMode.Off && !HasComp(uid) && this.IsPowered(uid, EntityManager)) { var program = reagentGrinder.AutoMode == GrinderAutoMode.Grind ? GrinderProgram.Grind : GrinderProgram.Juice; DoWork(uid, reagentGrinder, program); diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs index 2147ac80f2..94f3ab8802 100644 --- a/Content.Server/Lightning/LightningSystem.cs +++ b/Content.Server/Lightning/LightningSystem.cs @@ -71,9 +71,9 @@ public sealed class LightningSystem : SharedLightningSystem /// if the lightnings being fired should trigger lightning events. public void ShootRandomLightnings(EntityUid user, float range, int boltCount, string lightningPrototype = "Lightning", int arcDepth = 0, bool triggerLightningEvents = true) { - //To Do: add support to different priority target tablem for different lightning types - //To Do: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent) - //To Do: This is still pretty bad for perf but better than before and at least it doesn't re-allocate + //TODO: add support to different priority target tablem for different lightning types + //TODO: Remove Hardcode LightningTargetComponent (this should be a parameter of the SharedLightningComponent) + //TODO: This is still pretty bad for perf but better than before and at least it doesn't re-allocate // several hashsets every time var targets = _lookup.GetComponentsInRange(_transform.GetMapCoordinates(user), range).ToList(); diff --git a/Content.Server/Shuttles/Components/GridSpawnComponent.cs b/Content.Server/Shuttles/Components/GridSpawnComponent.cs index d8144354b8..430c9c8df2 100644 --- a/Content.Server/Shuttles/Components/GridSpawnComponent.cs +++ b/Content.Server/Shuttles/Components/GridSpawnComponent.cs @@ -26,6 +26,11 @@ public interface IGridSpawnGroup /// public float MinimumDistance { get; } + /// + /// Maximum distance to spawn away from the station. + /// + public float MaximumDistance { get; } + /// public ProtoId? NameDataset { get; } @@ -67,6 +72,8 @@ public sealed class DungeonSpawnGroup : IGridSpawnGroup /// public float MinimumDistance { get; } + public float MaximumDistance { get; } + /// public ProtoId? NameDataset { get; } @@ -94,7 +101,11 @@ public sealed class GridSpawnGroup : IGridSpawnGroup { public List Paths = new(); + /// public float MinimumDistance { get; } + + /// + public float MaximumDistance { get; } public ProtoId? NameDataset { get; } public int MinCount { get; set; } = 1; public int MaxCount { get; set; } = 1; diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs index 59a030e83c..f46c3980e5 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.cs @@ -281,24 +281,24 @@ namespace Content.Server.Shuttles.Systems { if (_doorSystem.TryOpen(dockAUid, doorA)) { - doorA.ChangeAirtight = false; if (TryComp(dockAUid, out var airlockA)) { _doorSystem.SetBoltsDown((dockAUid, airlockA), true); } } + doorA.ChangeAirtight = false; } if (TryComp(dockBUid, out DoorComponent? doorB)) { if (_doorSystem.TryOpen(dockBUid, doorB)) { - doorB.ChangeAirtight = false; if (TryComp(dockBUid, out var airlockB)) { _doorSystem.SetBoltsDown((dockBUid, airlockB), true); } } + doorB.ChangeAirtight = false; } if (_pathfinding.TryCreatePortal(dockAXform.Coordinates, dockBXform.Coordinates, out var handle)) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs index 0976bc5de1..a31fda074f 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs @@ -10,6 +10,7 @@ using Content.Shared.Shuttles.Components; using Content.Shared.Station.Components; using Robust.Shared.Collections; using Robust.Shared.Map; +using Robust.Shared.Map.Components; using Robust.Shared.Random; using Robust.Shared.Utility; @@ -86,9 +87,15 @@ public sealed partial class ShuttleSystem _mapManager.DeleteMap(mapId); } - private bool TryDungeonSpawn(EntityUid targetGrid, EntityUid stationUid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned) + private bool TryDungeonSpawn(Entity targetGrid, EntityUid stationUid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned) { spawned = EntityUid.Invalid; + + if (!_gridQuery.Resolve(targetGrid.Owner, ref targetGrid.Comp)) + { + return false; + } + var dungeonProtoId = _random.Pick(group.Protos); if (!_protoManager.TryIndex(dungeonProtoId, out var dungeonProto)) @@ -96,11 +103,13 @@ public sealed partial class ShuttleSystem return false; } - var spawnCoords = new EntityCoordinates(targetGrid, Vector2.Zero); + var targetPhysics = _physicsQuery.Comp(targetGrid); + var spawnCoords = new EntityCoordinates(targetGrid, targetPhysics.LocalCenter); if (group.MinimumDistance > 0f) { - spawnCoords = spawnCoords.Offset(_random.NextVector2(group.MinimumDistance, group.MinimumDistance * 1.5f)); + var distancePadding = MathF.Max(targetGrid.Comp.LocalAABB.Width, targetGrid.Comp.LocalAABB.Height); + spawnCoords = spawnCoords.Offset(_random.NextVector2(distancePadding + group.MinimumDistance, distancePadding + group.MaximumDistance)); } var spawnMapCoords = _transform.ToMapCoordinates(spawnCoords); diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs index ed5d109e85..5e746fd495 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.IFF.cs @@ -1,4 +1,5 @@ using Content.Server.Shuttles.Components; +using Content.Shared.CCVar; using Content.Shared.Shuttles.BUIStates; using Content.Shared.Shuttles.Components; using Content.Shared.Shuttles.Events; @@ -12,6 +13,26 @@ public sealed partial class ShuttleSystem SubscribeLocalEvent(OnIFFConsoleAnchor); SubscribeLocalEvent(OnIFFShow); SubscribeLocalEvent(OnIFFShowVessel); + SubscribeLocalEvent(OnGridSplit); + } + + private void OnGridSplit(ref GridSplitEvent ev) + { + var splitMass = _cfg.GetCVar(CCVars.HideSplitGridsUnder); + + if (splitMass < 0) + return; + + foreach (var grid in ev.NewGrids) + { + if (!_physicsQuery.TryGetComponent(grid, out var physics) || + physics.Mass > splitMass) + { + continue; + } + + AddIFFFlag(grid, IFFFlags.HideLabel); + } } private void OnIFFShow(EntityUid uid, IFFConsoleComponent component, IFFShowIFFMessage args) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs index 6a7718531d..91e7067bd4 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs @@ -60,12 +60,16 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly AtmosphereSystem _atmos = default!; //CP14 FTL atmos + private EntityQuery _gridQuery; + public const float TileMassMultiplier = 0.5f; public override void Initialize() { base.Initialize(); + _gridQuery = GetEntityQuery(); + InitializeFTL(); InitializeGridFills(); InitializeIFF(); diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs index efabebfc85..30fed573b8 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs @@ -183,6 +183,30 @@ public partial class SharedBodySystem return list; } + /// + /// Returns a list of Entity<, > + /// for each organ of the body + /// + /// The component that we want to return + /// The body to check the organs of + public List> GetBodyOrganEntityComps( + Entity entity) + where T : IComponent + { + if (!Resolve(entity, ref entity.Comp)) + return new List>(); + + var query = GetEntityQuery(); + var list = new List>(3); + foreach (var organ in GetBodyOrgans(entity.Owner, entity.Comp)) + { + if (query.TryGetComponent(organ.Id, out var comp)) + list.Add((organ.Id, comp, organ.Component)); + } + + return list; + } + /// /// Tries to get a list of ValueTuples of and OrganComponent on each organs /// in the given body. diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index f6abbe4247..e4d3121ba0 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1505,6 +1505,13 @@ namespace Content.Shared.CCVar public static readonly CVarDef GodmodeArrivals = CVarDef.Create("shuttle.godmode_arrivals", false, CVar.SERVERONLY); + /// + /// If a grid is split then hide any smaller ones under this mass (kg) from the map. + /// This is useful to avoid split grids spamming out labels. + /// + public static readonly CVarDef HideSplitGridsUnder = + CVarDef.Create("shuttle.hide_split_grids_under", 30, CVar.SERVERONLY); + /// /// Whether to automatically spawn escape shuttles. /// diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs index aec6834063..1f2716356c 100644 --- a/Content.Shared/Chemistry/Components/InjectorComponent.cs +++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs @@ -87,6 +87,22 @@ public sealed partial class InjectorComponent : Component [AutoNetworkedField] [DataField] public InjectorToggleMode ToggleState = InjectorToggleMode.Draw; + + #region Arguments for injection doafter + + /// + [DataField] + public bool NeedHand = true; + + /// + [DataField] + public bool BreakOnHandChange = true; + + /// + [DataField] + public float MovementThreshold = 0.1f; + + #endregion } /// diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index b9f287f1ce..3bf6066f33 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -58,7 +58,7 @@ namespace Content.Shared.Cuffs { base.Initialize(); - SubscribeLocalEvent(OnHandCountChanged); + SubscribeLocalEvent(OnHandCountChanged); SubscribeLocalEvent(OnUncuffAttempt); SubscribeLocalEvent(OnCuffsRemovedFromContainer); @@ -380,33 +380,24 @@ namespace Content.Shared.Cuffs /// /// Check the current amount of hands the owner has, and if there's less hands than active cuffs we remove some cuffs. /// - private void OnHandCountChanged(HandCountChangedEvent message) + private void OnHandCountChanged(Entity ent, ref HandCountChangedEvent message) { - var owner = message.Sender; - - if (!TryComp(owner, out CuffableComponent? cuffable) || - !cuffable.Initialized) - { - return; - } - var dirty = false; - var handCount = CompOrNull(owner)?.Count ?? 0; + var handCount = CompOrNull(ent.Owner)?.Count ?? 0; - while (cuffable.CuffedHandCount > handCount && cuffable.CuffedHandCount > 0) + while (ent.Comp.CuffedHandCount > handCount && ent.Comp.CuffedHandCount > 0) { dirty = true; - var container = cuffable.Container; - var entity = container.ContainedEntities[^1]; + var handcuffContainer = ent.Comp.Container; + var handcuffEntity = handcuffContainer.ContainedEntities[^1]; - _container.Remove(entity, container); - _transform.SetWorldPosition(entity, _transform.GetWorldPosition(owner)); + _transform.PlaceNextTo(handcuffEntity, ent.Owner); } if (dirty) { - UpdateCuffState(owner, cuffable); + UpdateCuffState(ent.Owner, ent.Comp); } } diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs index ab2df72568..2319d5e916 100644 --- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs +++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs @@ -21,6 +21,7 @@ using Robust.Shared.Physics.Systems; using Robust.Shared.Timing; using Robust.Shared.Audio.Systems; using Robust.Shared.Network; +using Robust.Shared.Map.Components; namespace Content.Shared.Doors.Systems; @@ -40,6 +41,8 @@ public abstract partial class SharedDoorSystem : EntitySystem [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; [Dependency] private readonly PryingSystem _pryingSystem = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [ValidatePrototypeId] public const string DoorBumpTag = "DoorBumpOpener"; @@ -546,29 +549,37 @@ public abstract partial class SharedDoorSystem : EntitySystem if (!Resolve(uid, ref physics)) yield break; + var xform = Transform(uid); + // Getting the world bounds from the gridUid allows us to use the version of + // GetCollidingEntities that returns Entity + if (!TryComp(xform.GridUid, out var mapGridComp)) + yield break; + var tileRef = _mapSystem.GetTileRef(xform.GridUid.Value, mapGridComp, xform.Coordinates); + var doorWorldBounds = _entityLookup.GetWorldBounds(tileRef); + // TODO SLOTH fix electro's code. // ReSharper disable once InconsistentNaming var doorAABB = _entityLookup.GetWorldAABB(uid); - foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorAABB)) + foreach (var otherPhysics in PhysicsSystem.GetCollidingEntities(Transform(uid).MapID, doorWorldBounds)) { - if (otherPhysics == physics) + if (otherPhysics.Comp == physics) continue; //TODO: Make only shutters ignore these objects upon colliding instead of all airlocks // Excludes Glasslayer for windows, GlassAirlockLayer for windoors, TableLayer for tables - if (!otherPhysics.CanCollide || otherPhysics.CollisionLayer == (int)CollisionGroup.GlassLayer || otherPhysics.CollisionLayer == (int)CollisionGroup.GlassAirlockLayer || otherPhysics.CollisionLayer == (int)CollisionGroup.TableLayer) + if (!otherPhysics.Comp.CanCollide || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.GlassLayer || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.GlassAirlockLayer || otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.TableLayer) continue; //If the colliding entity is a slippable item ignore it by the airlock - if (otherPhysics.CollisionLayer == (int)CollisionGroup.SlipLayer && otherPhysics.CollisionMask == (int)CollisionGroup.ItemMask) + if (otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.SlipLayer && otherPhysics.Comp.CollisionMask == (int) CollisionGroup.ItemMask) continue; //For when doors need to close over conveyor belts - if (otherPhysics.CollisionLayer == (int) CollisionGroup.ConveyorMask) + if (otherPhysics.Comp.CollisionLayer == (int) CollisionGroup.ConveyorMask) continue; - if ((physics.CollisionMask & otherPhysics.CollisionLayer) == 0 && (otherPhysics.CollisionMask & physics.CollisionLayer) == 0) + if ((physics.CollisionMask & otherPhysics.Comp.CollisionLayer) == 0 && (otherPhysics.Comp.CollisionMask & physics.CollisionLayer) == 0) continue; if (_entityLookup.GetWorldAABB(otherPhysics.Owner).IntersectPercentage(doorAABB) < IntersectPercentage) diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 4100b07483..682018949a 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -18,6 +18,7 @@ namespace Content.Shared.Examine { public abstract partial class ExamineSystemShared : EntitySystem { + [Dependency] private readonly OccluderSystem _occluder = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; @@ -182,12 +183,9 @@ namespace Content.Shared.Examine length = MaxRaycastRange; } - var occluderSystem = Get(); - IoCManager.Resolve(ref entMan); - var ray = new Ray(origin.Position, dir.Normalized()); - var rayResults = occluderSystem - .IntersectRayWithPredicate(origin.MapId, ray, length, state, predicate, false).ToList(); + var rayResults = _occluder + .IntersectRayWithPredicate(origin.MapId, ray, length, state, predicate, false); if (rayResults.Count == 0) return true; @@ -195,13 +193,13 @@ namespace Content.Shared.Examine foreach (var result in rayResults) { - if (!entMan.TryGetComponent(result.HitEntity, out OccluderComponent? o)) + if (!TryComp(result.HitEntity, out OccluderComponent? o)) { continue; } var bBox = o.BoundingBox; - bBox = bBox.Translated(entMan.GetComponent(result.HitEntity).WorldPosition); + bBox = bBox.Translated(_transform.GetWorldPosition(result.HitEntity)); if (bBox.Contains(origin.Position) || bBox.Contains(other.Position)) { @@ -216,7 +214,6 @@ namespace Content.Shared.Examine public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { - var entMan = IoCManager.Resolve(); var originPos = _transform.GetMapCoordinates(origin); var otherPos = _transform.GetMapCoordinates(other); @@ -225,16 +222,14 @@ namespace Content.Shared.Examine public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { - var entMan = IoCManager.Resolve(); var originPos = _transform.GetMapCoordinates(origin); - var otherPos = other.ToMap(entMan, _transform); + var otherPos = _transform.ToMapCoordinates(other); return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { - var entMan = IoCManager.Resolve(); var originPos = _transform.GetMapCoordinates(origin); return InRangeUnOccluded(originPos, other, range, predicate, ignoreInsideBlocker); @@ -250,11 +245,12 @@ namespace Content.Shared.Examine } var hasDescription = false; + var metadata = MetaData(entity); //Add an entity description if one is declared - if (!string.IsNullOrEmpty(EntityManager.GetComponent(entity).EntityDescription)) + if (!string.IsNullOrEmpty(metadata.EntityDescription)) { - message.AddText(EntityManager.GetComponent(entity).EntityDescription); + message.AddText(metadata.EntityDescription); hasDescription = true; } diff --git a/Content.Shared/Lock/LockComponent.cs b/Content.Shared/Lock/LockComponent.cs index b792402420..7b320f8570 100644 --- a/Content.Shared/Lock/LockComponent.cs +++ b/Content.Shared/Lock/LockComponent.cs @@ -92,6 +92,13 @@ public sealed partial class LockComponent : Component [ByRefEvent] public record struct LockToggleAttemptEvent(EntityUid User, bool Silent = false, bool Cancelled = false); +/// +/// Event raised on the user when a toggle is attempted. +/// Can be cancelled to prevent it. +/// +[ByRefEvent] +public record struct UserLockToggleAttemptEvent(EntityUid Target, bool Silent = false, bool Cancelled = false); + /// /// Event raised on a lock after it has been toggled. /// diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs index 9a15fc24d6..a2efffea98 100644 --- a/Content.Shared/Lock/LockSystem.cs +++ b/Content.Shared/Lock/LockSystem.cs @@ -259,7 +259,12 @@ public sealed class LockSystem : EntitySystem var ev = new LockToggleAttemptEvent(user, quiet); RaiseLocalEvent(uid, ref ev, true); - return !ev.Cancelled; + if (ev.Cancelled) + return false; + + var userEv = new UserLockToggleAttemptEvent(uid, quiet); + RaiseLocalEvent(user, ref userEv, true); + return !userEv.Cancelled; } // TODO: this should be a helper on AccessReaderSystem since so many systems copy paste it @@ -408,4 +413,3 @@ public sealed class LockSystem : EntitySystem _activatableUI.CloseAll(uid); } } - diff --git a/Content.Shared/Lock/LockingWhitelistComponent.cs b/Content.Shared/Lock/LockingWhitelistComponent.cs new file mode 100644 index 0000000000..4ac832e438 --- /dev/null +++ b/Content.Shared/Lock/LockingWhitelistComponent.cs @@ -0,0 +1,18 @@ +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; + +namespace Content.Shared.Lock; + +/// +/// Adds whitelist and blacklist for this mob to lock things. +/// The whitelist and blacklist are checked against the object being locked, not the mob. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(LockingWhitelistSystem))] +public sealed partial class LockingWhitelistComponent : Component +{ + [DataField] + public EntityWhitelist? Whitelist; + + [DataField] + public EntityWhitelist? Blacklist; +} diff --git a/Content.Shared/Lock/LockingWhitelistSystem.cs b/Content.Shared/Lock/LockingWhitelistSystem.cs new file mode 100644 index 0000000000..ba495fba90 --- /dev/null +++ b/Content.Shared/Lock/LockingWhitelistSystem.cs @@ -0,0 +1,28 @@ +using Content.Shared.Popups; +using Content.Shared.Whitelist; + +namespace Content.Shared.Lock; + +public sealed class LockingWhitelistSystem : EntitySystem +{ + [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnUserLockToggleAttempt); + } + + private void OnUserLockToggleAttempt(Entity ent, ref UserLockToggleAttemptEvent args) + { + if (_whitelistSystem.CheckBoth(args.Target, ent.Comp.Blacklist, ent.Comp.Whitelist)) + return; + + if (!args.Silent) + _popupSystem.PopupClient(Loc.GetString("locking-whitelist-component-lock-toggle-deny"), ent.Owner); + + args.Cancelled = true; + } +} diff --git a/Content.Shared/Slippery/NoSlipComponent.cs b/Content.Shared/Slippery/NoSlipComponent.cs index 186861a5a9..d9c3fe3f76 100644 --- a/Content.Shared/Slippery/NoSlipComponent.cs +++ b/Content.Shared/Slippery/NoSlipComponent.cs @@ -1,7 +1,9 @@ -namespace Content.Shared.Slippery +using Robust.Shared.GameStates; + +namespace Content.Shared.Slippery; + +[RegisterComponent, NetworkedComponent] +public sealed partial class NoSlipComponent : Component { - [RegisterComponent] - public sealed partial class NoSlipComponent : Component - { - } + } diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs index 15807794c3..3852f260f7 100644 --- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs +++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs @@ -45,7 +45,7 @@ public sealed class SwapTeleporterSystem : EntitySystem private void OnInteract(Entity ent, ref AfterInteractEvent args) { var (uid, comp) = ent; - if (args.Target == null) + if (args.Target == null || !args.CanReach) return; var target = args.Target.Value; diff --git a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs index fa3732209f..2016459b9d 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunRequiresWieldComponent.cs @@ -15,4 +15,7 @@ public sealed partial class GunRequiresWieldComponent : Component [DataField, AutoNetworkedField] public TimeSpan PopupCooldown = TimeSpan.FromSeconds(1); + + [DataField] + public LocId? WieldRequiresExamineMessage = "gunrequireswield-component-examine"; } diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs index f311946cf9..57fdb523dd 100644 --- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs +++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs @@ -23,6 +23,23 @@ public sealed class EntityWhitelistSystem : EntitySystem return uid != null && IsValid(list, uid.Value); } + /// + /// Checks whether a given entity is allowed by a whitelist and not blocked by a blacklist. + /// If a blacklist is provided and it matches then this returns false. + /// If a whitelist is provided and it does not match then this returns false. + /// If either list is null it does not get checked. + /// + public bool CheckBoth([NotNullWhen(true)] EntityUid? uid, EntityWhitelist? blacklist = null, EntityWhitelist? whitelist = null) + { + if (uid == null) + return false; + + if (blacklist != null && IsValid(blacklist, uid)) + return false; + + return whitelist == null || IsValid(whitelist, uid); + } + /// /// Checks whether a given entity satisfies a whitelist. /// diff --git a/Content.Shared/Wieldable/WieldableSystem.cs b/Content.Shared/Wieldable/WieldableSystem.cs index a0c9d04ff7..d76876c0cf 100644 --- a/Content.Shared/Wieldable/WieldableSystem.cs +++ b/Content.Shared/Wieldable/WieldableSystem.cs @@ -47,6 +47,7 @@ public sealed class WieldableSystem : EntitySystem SubscribeLocalEvent(OnDeselectWieldable); SubscribeLocalEvent(OnMeleeAttempt); + SubscribeLocalEvent(OnExamineRequires); SubscribeLocalEvent(OnShootAttempt); SubscribeLocalEvent(OnGunWielded); SubscribeLocalEvent(OnGunUnwielded); @@ -116,8 +117,17 @@ public sealed class WieldableSystem : EntitySystem } } + private void OnExamineRequires(Entity entity, ref ExaminedEvent args) + { + if(entity.Comp.WieldRequiresExamineMessage != null) + args.PushText(Loc.GetString(entity.Comp.WieldRequiresExamineMessage)); + } + private void OnExamine(EntityUid uid, GunWieldBonusComponent component, ref ExaminedEvent args) { + if (HasComp(uid)) + return; + if (component.WieldBonusExamineMessage != null) args.PushText(Loc.GetString(component.WieldBonusExamineMessage)); } diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b88f244f78..49a49dfc7b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,177 +1,4 @@ Entries: -- author: EmoGarbage404 - changes: - - message: Lockers can now be deconstructed again. - type: Fix - id: 6474 - time: '2024-04-28T05:26:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27431 -- author: SlamBamActionman - changes: - - message: "Removed Exterminators pending redesign. \U0001F525\U0001F44D\U0001F525" - type: Remove - id: 6475 - time: '2024-04-28T05:45:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26978 -- author: Boaz1111 - changes: - - message: Circuit imprinter recipes now cost less glass - type: Tweak - id: 6476 - time: '2024-04-28T05:46:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27310 -- author: Piksqu & Boaz1111 - changes: - - message: Added the hyperconvection circuit imprinter - type: Add - id: 6477 - time: '2024-04-28T05:49:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27283 -- author: exincore - changes: - - message: Fax machines now copy the labels attached to papers. - type: Add - - message: Fax machine "Print File" functionality now applies the first line of - the file as a label when it begins with `#`. - type: Add - id: 6478 - time: '2024-04-28T06:12:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25979 -- author: Plykiya - changes: - - message: Hardsuits, EVA suits, firesuits and other things now protect your feet - from dangerous glass shards. - type: Tweak - id: 6479 - time: '2024-04-28T07:11:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26764 -- author: FungiFellow - changes: - - message: Bows now fit in Exosuit slot. - type: Tweak - id: 6480 - time: '2024-04-28T08:23:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27433 -- author: osjarw - changes: - - message: Fixed some anomaly behaviours pulsing at wrong rates. - type: Fix - id: 6481 - time: '2024-04-28T09:28:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27435 -- author: Ubaser - changes: - - message: Pyrotton can now be mutated from cotton. - type: Add - id: 6482 - time: '2024-04-28T11:07:37.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27200 -- author: Plykiya - changes: - - message: You can now pick up Smile and put them in your bag. - type: Add - id: 6483 - time: '2024-04-29T02:44:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27458 -- author: Beck Thompson, CoffeePoweredPHD - changes: - - message: Fixed infinite reagent duplication glitch with toilets and drains. - type: Fix - - message: Dirty water toilets now function correctly as toilets. - type: Fix - id: 6484 - time: '2024-04-29T03:08:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27446 -- author: Nopey - changes: - - message: Many more items can now be recycled, including mops, medkits, and stun - batons. - type: Tweak - id: 6485 - time: '2024-04-29T03:36:11.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/24435 -- author: Hanzdegloker - changes: - - message: '"Denied" and "Approved" stamps are now guaranteed to appear in the lockers - of the HoP and QM.' - type: Tweak - id: 6486 - time: '2024-04-29T03:38:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25604 -- author: Potato1234_x - changes: - - message: Added rainbow weed. It is obtained by mutating regular weed. - type: Add - id: 6487 - time: '2024-04-29T04:06:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25759 -- author: Gotimanga - changes: - - message: Chemists can now create opporozidone, which reverses the effects of rotting - in deceased patients while in cryo. - type: Add - id: 6488 - time: '2024-04-29T04:13:14.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/24074 -- author: Mangohydra - changes: - - message: Added a new syndicate cyborg module that contains a very dangerous explosive - as a 4tc purchase. - type: Add - id: 6489 - time: '2024-04-29T04:16:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25815 -- author: Morb0 - changes: - - message: Added emote panel (by default Y) - type: Add - id: 6490 - time: '2024-04-29T04:38:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26702 -- author: MilenVolf - changes: - - message: Borgs now have brand new voice and walking sounds. - type: Add - - message: Syndicate assault borgs now have new feature to scare - manic laugher. - type: Add - id: 6491 - time: '2024-04-29T04:38:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27205 -- author: KrasnoshchekovPavel - changes: - - message: Fixed formatting of floating point numbers during localization - type: Fix - id: 6492 - time: '2024-04-29T04:52:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27441 -- author: mirrorcult - changes: - - message: Random events should now occur much more frequently - type: Tweak - id: 6493 - time: '2024-04-29T06:38:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27469 -- author: Plykiya - changes: - - message: Latejoin players now have a chance to roll thief. - type: Add - id: 6494 - time: '2024-04-29T06:38:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27466 -- author: ElectroJr - changes: - - message: Fixed actions sometimes disappearing from the hotbar when double clicking - type: Fix - id: 6495 - time: '2024-04-29T08:36:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27468 -- author: DrSmugleaf - changes: - - message: Fixed bullets not going exactly where you click when moving. - type: Fix - id: 6496 - time: '2024-04-29T13:12:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27484 - author: FungiFellow changes: - message: Syndi-Cats now have a Wideswing, 80% Explosion Resist, 6/6/15 Pierce/Slash/Structural @@ -3780,3 +3607,177 @@ id: 6973 time: '2024-07-23T08:13:18.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30229 +- author: Scribbles0 + changes: + - message: Handless mobs can no longer wipe devices like positronic brains or pAIs. + type: Fix + id: 6974 + time: '2024-07-23T17:47:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30149 +- author: Quantus + changes: + - message: Reagent grinders can no longer auto-grind when unpowered. + type: Fix + id: 6975 + time: '2024-07-23T21:02:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30267 +- author: BombasterDS + changes: + - message: Fixed items disappearing after shelfs and mannequin disassembling + type: Fix + id: 6976 + time: '2024-07-24T08:57:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30313 +- author: Cojoke-dot + changes: + - message: Fix infinite QSI linking range + type: Fix + id: 6977 + time: '2024-07-24T20:57:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30332 +- author: deltanedas + changes: + - message: Borgs can no longer unlock the robotics console or other borgs. + type: Tweak + id: 6978 + time: '2024-07-25T03:54:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/27888 +- author: themias + changes: + - message: Fixed the ripley control panel not loading + type: Fix + id: 6979 + time: '2024-07-25T05:23:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30325 +- author: Timur2011 + changes: + - message: Space adders are now butcherable. + type: Add + - message: Snakes now drop snake meat when butchered. + type: Fix + - message: Snakes now appear lying when in critical state. + type: Tweak + id: 6980 + time: '2024-07-25T10:52:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29629 +- author: Plykiya + changes: + - message: You can now build atmos gas pipes through things like walls. + type: Tweak + id: 6981 + time: '2024-07-25T23:26:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28707 +- author: Ilya246 + changes: + - message: Nuclear operative reinforcements now come with full nuclear operative + gear (and a toy carp) at no additional cost. + type: Tweak + - message: Nuclear operative reinforcements now get nuclear operative names. + type: Tweak + id: 6982 + time: '2024-07-25T23:37:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30173 +- author: Cojoke-dot + changes: + - message: Engineering goggles and other similar-looking eyewear now help block + identity. + type: Tweak + - message: Radiation suit's hood now blocks identity. + type: Fix + id: 6983 + time: '2024-07-26T05:26:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30305 +- author: Moomoobeef + changes: + - message: Some radio channel colors have been tweaked in order to be more easily + distinguishable. + type: Tweak + id: 6984 + time: '2024-07-26T06:47:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30133 +- author: Errant + changes: + - message: Replay ghosts now actually spawn on the proper station, take two. + type: Fix + id: 6985 + time: '2024-07-26T12:59:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30273 +- author: themias + changes: + - message: Arcade machines are functional again + type: Fix + id: 6986 + time: '2024-07-26T17:30:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30376 +- author: themias + changes: + - message: Zombies now get uncuffed upon transformation + type: Fix + id: 6987 + time: '2024-07-26T18:48:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30321 +- author: metalgearsloth + changes: + - message: Fix grid labels getting spammed from VGRoid. + type: Fix + id: 6988 + time: '2024-07-27T01:54:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29946 +- author: GoldenCan + changes: + - message: Added a Security Clown Mask which is obtainable by hacking a SecDrobe. + type: Add + id: 6989 + time: '2024-07-27T04:09:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30249 +- author: Plykiya + changes: + - message: Thief game rule now properly selects more than one thief. + type: Fix + id: 6990 + time: '2024-07-27T07:27:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30393 +- author: BombasterDS + changes: + - message: Added new plant mutations for apple, sugarcane and galaxythistle + type: Add + id: 6991 + time: '2024-07-27T15:08:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28993 +- author: Spessmann + changes: + - message: Thief objectives for figurines and stamps now require less items + type: Tweak + id: 6992 + time: '2024-07-27T23:11:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30390 +- author: metalgearsloth + changes: + - message: Moved VGRoid from 1,000m away to ~500m. + type: Tweak + id: 6993 + time: '2024-07-28T03:14:18.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29943 +- author: lzk228 + changes: + - message: Fixed pancakes stacks. Before it, splitting not default pancakes stacks + would give you default pancakes. + type: Fix + id: 6994 + time: '2024-07-28T03:49:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30270 +- author: Plykiya + changes: + - message: Fixed the client mispredicting people slipping with their magboots turned + on + type: Fix + id: 6995 + time: '2024-07-28T06:17:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30425 +- author: Katzenminer + changes: + - message: Pun and similar pets are no longer firemune + type: Fix + id: 6996 + time: '2024-07-28T08:32:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30424 diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml index b0f955bdde..84288b8b85 100644 --- a/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml +++ b/Resources/ConfigPresets/WizardsDen/wizardsDenGateway.toml @@ -15,7 +15,7 @@ baby_jail.enabled = true baby_jail.show_reason = true baby_jail.max_account_age = 5256000 # 10 years. Disabling this check specifically isn't currently supported baby_jail.max_overall_minutes = 3000 # 50 hours -baby_jail.custom_reason = "Sorry! Only new players can join the servers, try joining another one instead!" +baby_jail.custom_reason = "Sorry! Only new and whitelisted players can join this server. Apply to be whitelisted in our Discord server (discord.ss14.io) or try joining another server instead!" baby_jail.whitelisted_can_bypass = true [hub] diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 47b90c9a16..6f5e023184 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem diff --git a/Resources/Locale/en-US/actions/actions/polymorph.ftl b/Resources/Locale/en-US/actions/actions/polymorph.ftl new file mode 100644 index 0000000000..4a65a60ecf --- /dev/null +++ b/Resources/Locale/en-US/actions/actions/polymorph.ftl @@ -0,0 +1 @@ +gera-transformation-popup = This action will transform you. Use it again to confirm. diff --git a/Resources/Locale/en-US/character-info/components/character-info-component.ftl b/Resources/Locale/en-US/character-info/components/character-info-component.ftl index 07a0dd696a..b515c36c5a 100644 --- a/Resources/Locale/en-US/character-info/components/character-info-component.ftl +++ b/Resources/Locale/en-US/character-info/components/character-info-component.ftl @@ -1,3 +1,4 @@ character-info-title = Character character-info-roles-antagonist-text = Antagonist Roles character-info-objectives-label = Objectives +character-info-no-profession = No Profession diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index b2082f7728..6dc214fc10 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -206,6 +206,9 @@ ghost-role-information-syndicate-reinforcement-spy-description = Someone needs r ghost-role-information-syndicate-reinforcement-thief-name = Syndicate Thief ghost-role-information-syndicate-reinforcement-thief-description = Someone needs reinforcements. Your job is to break in and retrieve something valuable for your agent. +ghost-role-information-nukeop-reinforcement-name = Nuclear Operative +ghost-role-information-nukeop-reinforcement-description = The nuclear operatives need reinforcements. You, a reserve agent, will help them. +ghost-role-information-nukeop-reinforcement-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with the nuclear operatives who summoned you. ghost-role-information-syndicate-monkey-reinforcement-name = Syndicate Monkey Agent ghost-role-information-syndicate-monkey-reinforcement-description = Someone needs reinforcements. You, a trained monkey, will help them. diff --git a/Resources/Locale/en-US/lock/locking-whitelist-component.ftl b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl new file mode 100644 index 0000000000..182814c2c5 --- /dev/null +++ b/Resources/Locale/en-US/lock/locking-whitelist-component.ftl @@ -0,0 +1 @@ +locking-whitelist-component-lock-toggle-deny = You can't toggle the lock. diff --git a/Resources/Locale/en-US/mass-media/news-ui.ftl b/Resources/Locale/en-US/mass-media/news-ui.ftl index 1553a24b4a..678f20a81a 100644 --- a/Resources/Locale/en-US/mass-media/news-ui.ftl +++ b/Resources/Locale/en-US/mass-media/news-ui.ftl @@ -34,4 +34,4 @@ news-write-ui-richtext-tooltip = News articles support rich text {"[bullet/]bullet[/color]"} news-pda-notification-header = New news article -news-publish-admin-announcement = {$actor} published news article {$title} by {$author}" +news-publish-admin-announcement = {$actor} published news article {$title} by {$author} diff --git a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl index bfdbeb2f14..f75a21c5ff 100644 --- a/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl +++ b/Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl @@ -58,4 +58,5 @@ humanoid-profile-editor-no-traits = No traits available humanoid-profile-editor-trait-count-hint = Points available: [{$current}/{$max}] trait-category-disabilities = Disabilities -trait-category-speech = Speech traits \ No newline at end of file +trait-category-speech = Speech traits +trait-category-quirks = Quirks diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 2dc0b88c74..f98118c23e 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -32,6 +32,8 @@ seeds-potato-name = potato seeds-potato-display-name = potatoes seeds-sugarcane-name = sugarcane seeds-sugarcane-display-name = sugarcanes +seeds-papercane-name = papercane +seeds-papercane-display-name = papercanes seeds-towercap-name = tower cap seeds-towercap-display-name = tower caps seeds-steelcap-name = steel cap @@ -48,6 +50,8 @@ seeds-eggplant-name = eggplant seeds-eggplant-display-name = eggplants seeds-apple-name = apple seeds-apple-display-name = apple tree +seeds-goldenapple-name = golden apple +seeds-goldenapple-display-name = golden apple tree seeds-corn-name = corn seeds-corn-display-name = ears of corn seeds-onion-name = onion @@ -88,6 +92,8 @@ seeds-ambrosiadeus-name = ambrosia deus seeds-ambrosiadeus-display-name = ambrosia deus seeds-galaxythistle-name = galaxythistle seeds-galaxythistle-display-name = galaxythistle +seeds-glasstle-name = glasstle +seeds-glasstle-display-name = glasstle seeds-flyamanita-name = fly amanita seeds-flyamanita-display-name = fly amanita seeds-gatfruit-name = gatfruit diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 85a64c71ae..07edd8f007 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -124,10 +124,11 @@ uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in spac uplink-reinforcement-radio-ancestor-name = Genetic Ancestor Reinforcement Teleporter uplink-reinforcement-radio-ancestor-desc = Call in a trained ancestor of your choosing to assist you. Comes with a single syndicate cigarette. - uplink-reinforcement-radio-name = Reinforcement Teleporter uplink-reinforcement-radio-traitor-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. Call in a medic or spy or thief to help you out. Good luck. -uplink-reinforcement-radio-nukeops-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it. + +uplink-reinforcement-radio-nukeops-name = Nuclear Operative Teleporter +uplink-reinforcement-radio-nukeops-desc = Radio in a nuclear operative of extremely questionable quality. No off button, buy this if you're ready to party. They have basic nuclear operative gear. uplink-reinforcement-radio-cyborg-assault-name = Syndicate Assault Cyborg Teleporter uplink-reinforcement-radio-cyborg-assault-desc = A lean, mean killing machine with access to an Energy Sword, LMG, Cryptographic Sequencer, and a Pinpointer. diff --git a/Resources/Locale/en-US/wieldable/wieldable-component.ftl b/Resources/Locale/en-US/wieldable/wieldable-component.ftl index 84b58224a7..585d611016 100644 --- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl +++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl @@ -18,3 +18,5 @@ wieldable-component-not-in-hands = { CAPITALIZE(THE($item)) } isn't in your hand wieldable-component-requires = { CAPITALIZE(THE($item))} must be wielded! gunwieldbonus-component-examine = This weapon has improved accuracy when wielded. + +gunrequireswield-component-examine = This weapon can only be fired when wielded. diff --git a/Resources/Maps/Shuttles/emergency_accordia.yml b/Resources/Maps/Shuttles/emergency_accordia.yml index 8b5dac4d92..65959a909d 100644 --- a/Resources/Maps/Shuttles/emergency_accordia.yml +++ b/Resources/Maps/Shuttles/emergency_accordia.yml @@ -27,11 +27,11 @@ entities: chunks: 0,0: ind: 0,0 - tiles: PAAAAAAAgQAAAAAAgQAAAAAAcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAIAAAAAADIAAAAAABgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAACIAAAAAACIAAAAAABgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: PAAAAAAAgQAAAAAAPAAAAAAAcwAAAAADcwAAAAAAcwAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAIAAAAAADIAAAAAABgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAADIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAACIAAAAAACIAAAAAABgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAACIAAAAAABIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: PAAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAABfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAIAAAAAAAIAAAAAACIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACgQAAAAAAIAAAAAABIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABcwAAAAACcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: PAAAAAAAgQAAAAAAPAAAAAAAfQAAAAABfQAAAAABfQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAgQAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAgQAAAAAAPAAAAAAAIAAAAAAAIAAAAAACIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAgQAAAAAAIAAAAAABIAAAAAABIAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAABIAAAAAADIAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAACIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAACgQAAAAAAIAAAAAABIAAAAAACIAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAADgQAAAAAAgQAAAAAAIAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAABIAAAAAAAgQAAAAAAcwAAAAABcwAAAAAAcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABcwAAAAACcwAAAAABcwAAAAADcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAADIAAAAAAAcwAAAAADcwAAAAABcwAAAAABcwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAIAAAAAABgQAAAAAAcwAAAAABcwAAAAAAcwAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-2: ind: 0,-2 @@ -39,11 +39,11 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADPAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAPAAAAAAAPAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAACIAAAAAACIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAIAAAAAAAIAAAAAABIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAABYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAACYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAADYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAIAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIAAAAAACIAAAAAAAIAAAAAAD version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACIAAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAhwAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhwAAAAAAgQAAAAAAgQAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAPAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADYAAAAAACYAAAAAAAIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAABYAAAAAABIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAADIAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAACYAAAAAACYAAAAAAAIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAACYAAAAAABYAAAAAACIAAAAAAB version: 6 -1,-2: ind: -1,-2 @@ -81,403 +81,403 @@ entities: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: - 40: 5,12 - 41: 4,13 - 43: 3,15 + 3: 5,12 + 4: 4,13 + 5: 3,15 - node: color: '#52B4E996' id: BrickTileWhiteCornerNe decals: - 116: 5,0 + 44: 5,0 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe decals: - 119: 5,-6 + 47: 5,-6 - node: color: '#52B4E996' id: BrickTileWhiteCornerNw decals: - 115: 3,0 + 43: 3,0 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw decals: - 120: 3,-6 + 48: 3,-6 - node: color: '#52B4E996' id: BrickTileWhiteCornerSe decals: - 117: 5,-4 + 45: 5,-4 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSe decals: - 118: 5,-10 + 46: 5,-10 - node: color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 206: -3,-25 + 111: -3,-25 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSw decals: - 46: -2,14 - 47: -1,13 - 48: 0,12 - 89: 3,9 + 6: -2,14 + 7: -1,13 + 8: 0,12 + 28: 3,9 - node: color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 114: 3,-4 + 42: 3,-4 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: - 132: 3,-10 + 60: 3,-10 - node: color: '#334E6DC8' id: BrickTileWhiteEndS decals: - 82: 1,9 + 25: 1,9 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNe decals: - 70: 2,15 - 72: 4,12 - 97: 3,13 - 148: 1,7 + 21: 2,15 + 22: 4,12 + 30: 3,13 + 74: 1,7 - node: color: '#52B4E996' id: BrickTileWhiteInnerNe decals: - 137: 1,-4 + 65: 1,-4 - node: color: '#D4D4D496' id: BrickTileWhiteInnerNe decals: - 152: -3,7 - 177: 1,-19 + 77: -3,7 + 92: 1,-19 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerNe decals: - 145: 1,-9 + 71: 1,-9 - node: color: '#EFB34196' id: BrickTileWhiteInnerNe decals: - 183: 1,-22 + 98: 1,-22 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNw decals: - 57: -2,15 - 149: 3,7 + 14: -2,15 + 75: 3,7 - node: color: '#D4D4D496' id: BrickTileWhiteInnerNw decals: - 151: -1,7 - 243: -5,-3 + 76: -1,7 + 143: -5,-3 - node: color: '#EFB34196' id: BrickTileWhiteInnerNw decals: - 184: -1,-23 + 99: -1,-23 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe decals: - 104: 1,11 + 34: 1,11 - node: color: '#52B4E996' id: BrickTileWhiteInnerSe decals: - 138: 1,-1 + 66: 1,-1 - node: color: '#D4D4D496' id: BrickTileWhiteInnerSe decals: - 175: 1,-17 - 176: 1,-23 + 90: 1,-17 + 91: 1,-23 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerSe decals: - 146: 1,-6 + 72: 1,-6 - node: color: '#EFB34196' id: BrickTileWhiteInnerSe decals: - 181: 1,-20 + 96: 1,-20 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSw decals: - 58: -2,15 - 79: 0,13 - 92: -1,14 - 102: 1,12 - 103: 3,11 + 15: -2,15 + 24: 0,13 + 29: -1,14 + 32: 1,12 + 33: 3,11 - node: color: '#D4D4D496' id: BrickTileWhiteInnerSw decals: - 242: -5,-7 + 142: -5,-7 - node: color: '#EFB34196' id: BrickTileWhiteInnerSw decals: - 182: -1,-20 + 97: -1,-20 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 36: 5,10 - 38: 5,11 - 53: 2,16 - 54: 3,14 - 83: 1,10 + 1: 5,10 + 2: 5,11 + 11: 2,16 + 12: 3,14 + 26: 1,10 - node: color: '#52B4E996' id: BrickTileWhiteLineE decals: - 110: 5,-3 - 111: 5,-2 - 112: 5,-1 - 135: 1,-3 - 136: 1,-2 + 38: 5,-3 + 39: 5,-2 + 40: 5,-1 + 63: 1,-3 + 64: 1,-2 - node: color: '#D4D4D496' id: BrickTileWhiteLineE decals: - 173: 1,-24 - 174: 1,-18 + 88: 1,-24 + 89: 1,-18 - node: color: '#DE3A3A96' id: BrickTileWhiteLineE decals: - 127: 5,-9 - 128: 5,-8 - 129: 5,-7 - 133: 1,-8 - 134: 1,-7 + 55: 5,-9 + 56: 5,-8 + 57: 5,-7 + 61: 1,-8 + 62: 1,-7 - node: color: '#EFB34196' id: BrickTileWhiteLineE decals: - 180: 1,-21 - 190: -3,-17 - 191: -3,-18 - 192: -3,-19 - 193: -3,-20 - 197: -3,-23 - 205: -3,-24 + 95: 1,-21 + 104: -3,-17 + 105: -3,-18 + 106: -3,-19 + 107: -3,-20 + 109: -3,-23 + 110: -3,-24 - node: color: '#334E6DC8' id: BrickTileWhiteLineN decals: - 147: 2,7 + 73: 2,7 - node: color: '#52B4E996' id: BrickTileWhiteLineN decals: - 113: 4,0 + 41: 4,0 - node: color: '#D4D4D496' id: BrickTileWhiteLineN decals: - 153: -2,7 + 78: -2,7 - node: color: '#DE3A3A96' id: BrickTileWhiteLineN decals: - 131: 4,-6 + 59: 4,-6 - node: color: '#334E6DC8' id: BrickTileWhiteLineS decals: - 35: 4,9 + 0: 4,9 - node: color: '#52B4E996' id: BrickTileWhiteLineS decals: - 106: 4,-4 + 36: 4,-4 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS decals: - 130: 4,-10 + 58: 4,-10 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 207: -4,-25 + 112: -4,-25 - node: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 50: 1,10 - 52: -2,16 - 86: 3,10 - 100: 1,11 + 9: 1,10 + 10: -2,16 + 27: 3,10 + 31: 1,11 - node: color: '#52B4E996' id: BrickTileWhiteLineW decals: - 109: 3,-1 - 141: 3,-3 - 142: 3,-2 + 37: 3,-1 + 67: 3,-3 + 68: 3,-2 - node: color: '#D4D4D428' id: BrickTileWhiteLineW decals: - 164: -1,-1 - 165: -1,-2 - 166: -1,-3 - 167: -1,-4 - 168: -1,-5 - 169: -1,-6 - 170: -1,-7 - 171: -1,-8 - 172: -1,-9 + 79: -1,-1 + 80: -1,-2 + 81: -1,-3 + 82: -1,-4 + 83: -1,-5 + 84: -1,-6 + 85: -1,-7 + 86: -1,-8 + 87: -1,-9 - node: color: '#D4D4D496' id: BrickTileWhiteLineW decals: - 236: -5,-8 - 237: -5,-10 - 238: -5,-2 - 239: -5,-1 - 240: -5,0 - 241: -5,-9 + 136: -5,-8 + 137: -5,-10 + 138: -5,-2 + 139: -5,-1 + 140: -5,0 + 141: -5,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteLineW decals: - 124: 3,-7 - 125: 3,-8 - 126: 3,-9 + 52: 3,-7 + 53: 3,-8 + 54: 3,-9 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 178: -1,-22 - 179: -1,-21 - 186: -5,-17 - 187: -5,-18 + 93: -1,-22 + 94: -1,-21 + 100: -5,-17 + 101: -5,-18 - node: color: '#334E6DC8' id: FullTileOverlayGreyscale decals: - 55: -3,15 - 62: 2,17 - 63: 1,17 - 64: 0,17 - 65: -1,17 - 66: -2,17 - 74: 2,10 - 245: 2,8 + 13: -3,15 + 16: 2,17 + 17: 1,17 + 18: 0,17 + 19: -1,17 + 20: -2,17 + 23: 2,10 + 144: 2,8 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 143: 2,-3 - 144: 2,-2 + 69: 2,-3 + 70: 2,-2 - node: color: '#DE3A3A96' id: FullTileOverlayGreyscale decals: - 121: 4,-5 - 122: 2,-7 - 123: 2,-8 + 49: 4,-5 + 50: 2,-7 + 51: 2,-8 - node: color: '#EFB34196' id: FullTileOverlayGreyscale decals: - 212: -5,-25 - 213: -5,-24 - 217: -2,-22 - 218: -2,-21 + 113: -5,-25 + 114: -5,-24 + 118: -2,-22 + 119: -2,-21 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale decals: - 188: -5,-17 - 189: -4,-17 - 194: -3,-17 + 102: -5,-17 + 103: -4,-17 + 108: -3,-17 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale180 decals: - 105: 2,11 + 35: 2,11 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale270 decals: - 214: -4,-25 - 215: -4,-24 + 115: -4,-25 + 116: -4,-24 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale90 decals: - 219: -3,-22 - 220: -3,-21 + 120: -3,-22 + 121: -3,-21 - node: color: '#EFB34196' id: MiniTileWhiteInnerSw decals: - 216: -4,-23 + 117: -4,-23 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 221: 5,-24 - 222: 5,-16 + 122: 5,-24 + 123: 5,-16 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 223: 3,-16 - 224: 3,-24 + 124: 3,-16 + 125: 3,-24 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 227: 5,-25 - 228: 5,-18 + 128: 5,-25 + 129: 5,-18 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 225: 3,-25 - 226: 3,-18 + 126: 3,-25 + 127: 3,-18 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 229: 5,-17 + 130: 5,-17 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 233: 4,-16 - 234: 4,-24 + 134: 4,-16 + 135: 4,-24 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 231: 4,-25 - 232: 4,-18 + 132: 4,-25 + 133: 4,-18 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 230: 3,-17 + 131: 3,-17 - type: GridAtmosphere version: 2 data: @@ -634,6 +634,145 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance +- proto: AirAlarm + entities: + - uid: 145 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 1 + - type: DeviceList + devices: + - 955 + - 573 + - 521 + - 967 + - 966 + - 965 + - uid: 269 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-21.5 + parent: 1 + - type: DeviceList + devices: + - 952 + - 538 + - 533 + - 970 + - 971 + - 968 + - 969 + - uid: 886 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-9.5 + parent: 1 + - type: DeviceList + devices: + - 953 + - 572 + - 575 + - 519 + - 520 + - 965 + - 966 + - 963 + - 964 + - uid: 947 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-3.5 + parent: 1 + - type: DeviceList + devices: + - 522 + - 574 + - 954 + - 967 + - 963 + - 964 + - uid: 950 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-19.5 + parent: 1 + - type: DeviceList + devices: + - 949 + - 537 + - 460 + - 971 + - 970 + - uid: 959 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,14.5 + parent: 1 + - type: DeviceList + devices: + - 957 + - 483 + - 487 + - 488 + - 476 + - 961 + - uid: 960 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,12.5 + parent: 1 + - type: DeviceList + devices: + - 486 + - 958 + - 475 + - 962 + - uid: 972 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,7.5 + parent: 1 + - type: DeviceList + devices: + - 961 + - 962 + - 956 + - 490 + - 452 + - 454 + - 489 + - uid: 973 + components: + - type: Transform + pos: 5.5,-22.5 + parent: 1 + - type: DeviceList + devices: + - 951 + - 463 + - 661 + - 969 + - uid: 974 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-18.5 + parent: 1 + - type: DeviceList + devices: + - 461 + - 536 + - 948 + - 968 - proto: Airlock entities: - uid: 377 @@ -769,6 +908,98 @@ entities: - type: Transform pos: 4.5,-4.5 parent: 1 +- proto: AirSensor + entities: + - uid: 948 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-17.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 974 + - uid: 949 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-19.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 950 + - uid: 951 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-23.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 973 + - uid: 952 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-21.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 269 + - uid: 953 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 + - uid: 954 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 947 + - uid: 955 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-8.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 145 + - uid: 956 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 972 + - uid: 957 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,13.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 959 + - uid: 958 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,10.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 960 - proto: AltarNanotrasen entities: - uid: 253 @@ -797,61 +1028,60 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,11.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 269 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-12.5 - parent: 1 - uid: 270 components: - type: Transform rot: 1.5707963267948966 rad - pos: 2.5,-12.5 + pos: 1.5,3.5 parent: 1 - uid: 271 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,3.5 + rot: -1.5707963267948966 rad + pos: -0.5,3.5 parent: 1 - uid: 272 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,3.5 + rot: -1.5707963267948966 rad + pos: -5.5,0.5 parent: 1 - uid: 273 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,0.5 + rot: -1.5707963267948966 rad + pos: -5.5,-1.5 parent: 1 - uid: 274 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-1.5 + rot: -1.5707963267948966 rad + pos: -5.5,-7.5 parent: 1 - uid: 275 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-7.5 + rot: -1.5707963267948966 rad + pos: -5.5,-9.5 parent: 1 - uid: 276 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-9.5 + pos: 0.5,-24.5 parent: 1 - - uid: 389 + - uid: 945 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-12.5 + parent: 1 + - uid: 946 components: - type: Transform rot: 1.5707963267948966 rad - pos: 0.5,-24.5 + pos: 1.5,-12.5 parent: 1 - proto: BaseComputer entities: @@ -956,6 +1186,11 @@ entities: - type: InsideEntityStorage - proto: CableApcExtension entities: + - uid: 389 + components: + - type: Transform + pos: -0.5,6.5 + parent: 1 - uid: 534 components: - type: Transform @@ -1414,17 +1649,17 @@ entities: - uid: 746 components: - type: Transform - pos: 0.5,7.5 + pos: -2.5,7.5 parent: 1 - uid: 747 components: - type: Transform - pos: 1.5,7.5 + pos: -1.5,6.5 parent: 1 - uid: 748 components: - type: Transform - pos: 2.5,7.5 + pos: 1.5,6.5 parent: 1 - uid: 749 components: @@ -1459,7 +1694,7 @@ entities: - uid: 755 components: - type: Transform - pos: -0.5,7.5 + pos: 4.5,11.5 parent: 1 - uid: 756 components: @@ -1571,11 +1806,6 @@ entities: - type: Transform pos: 5.5,12.5 parent: 1 - - uid: 778 - components: - - type: Transform - pos: 5.5,11.5 - parent: 1 - uid: 779 components: - type: Transform @@ -1591,6 +1821,136 @@ entities: - type: Transform pos: 3.5,10.5 parent: 1 + - uid: 985 + components: + - type: Transform + pos: 0.5,17.5 + parent: 1 + - uid: 986 + components: + - type: Transform + pos: -2.5,18.5 + parent: 1 + - uid: 987 + components: + - type: Transform + pos: -1.5,18.5 + parent: 1 + - uid: 988 + components: + - type: Transform + pos: -0.5,18.5 + parent: 1 + - uid: 989 + components: + - type: Transform + pos: 0.5,18.5 + parent: 1 + - uid: 990 + components: + - type: Transform + pos: 1.5,18.5 + parent: 1 + - uid: 991 + components: + - type: Transform + pos: 2.5,18.5 + parent: 1 + - uid: 992 + components: + - type: Transform + pos: 3.5,18.5 + parent: 1 + - uid: 993 + components: + - type: Transform + pos: 3.5,17.5 + parent: 1 + - uid: 994 + components: + - type: Transform + pos: -2.5,17.5 + parent: 1 + - uid: 995 + components: + - type: Transform + pos: -1.5,15.5 + parent: 1 + - uid: 996 + components: + - type: Transform + pos: -2.5,15.5 + parent: 1 + - uid: 997 + components: + - type: Transform + pos: -3.5,15.5 + parent: 1 + - uid: 998 + components: + - type: Transform + pos: 6.5,12.5 + parent: 1 + - uid: 999 + components: + - type: Transform + pos: 6.5,11.5 + parent: 1 + - uid: 1000 + components: + - type: Transform + pos: 6.5,10.5 + parent: 1 + - uid: 1001 + components: + - type: Transform + pos: 6.5,10.5 + parent: 1 + - uid: 1002 + components: + - type: Transform + pos: 3.5,8.5 + parent: 1 + - uid: 1003 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 1004 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 1005 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 1006 + components: + - type: Transform + pos: 3.5,7.5 + parent: 1 + - uid: 1007 + components: + - type: Transform + pos: -4.5,11.5 + parent: 1 + - uid: 1008 + components: + - type: Transform + pos: -5.5,11.5 + parent: 1 + - uid: 1009 + components: + - type: Transform + pos: -5.5,12.5 + parent: 1 + - uid: 1010 + components: + - type: Transform + pos: -5.5,10.5 + parent: 1 - proto: CableHV entities: - uid: 376 @@ -2459,17 +2819,241 @@ entities: parent: 1 - proto: ExtinguisherCabinetFilled entities: - - uid: 886 + - uid: 983 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 984 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-10.5 + parent: 1 +- proto: FireAlarm + entities: + - uid: 778 components: - type: Transform pos: -1.5,0.5 parent: 1 - - uid: 887 + - type: DeviceList + devices: + - 963 + - 964 + - 966 + - 965 + - uid: 975 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-18.5 + parent: 1 + - type: DeviceList + devices: + - 969 + - 968 + - 971 + - 970 + - uid: 976 components: - type: Transform rot: 3.141592653589793 rad - pos: -1.5,-9.5 + pos: 3.5,-18.5 parent: 1 + - type: DeviceList + devices: + - 968 + - uid: 977 + components: + - type: Transform + pos: 3.5,-22.5 + parent: 1 + - type: DeviceList + devices: + - 969 + - uid: 978 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-10.5 + parent: 1 + - type: DeviceList + devices: + - 965 + - 966 + - 967 + - uid: 979 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,0.5 + parent: 1 + - type: DeviceList + devices: + - 963 + - 964 + - 967 + - uid: 980 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,5.5 + parent: 1 + - type: DeviceList + devices: + - 961 + - 962 + - uid: 981 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,10.5 + parent: 1 + - type: DeviceList + devices: + - 961 + - uid: 982 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,9.5 + parent: 1 + - type: DeviceList + devices: + - 962 +- proto: FirelockGlass + entities: + - uid: 961 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,8.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 959 + - 972 + - 980 + - 981 + - uid: 962 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,8.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 972 + - 960 + - 980 + - 982 + - uid: 963 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-2.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 + - 947 + - 979 + - 778 + - uid: 964 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 + - 947 + - 979 + - 778 + - uid: 965 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 + - 145 + - 978 + - 778 + - uid: 966 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-6.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 + - 145 + - 978 + - 778 + - uid: 967 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 145 + - 947 + - 979 + - 978 + - uid: 968 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-17.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 269 + - 974 + - 975 + - 976 + - uid: 969 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-23.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 269 + - 973 + - 977 + - 975 + - uid: 970 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-21.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 269 + - 950 + - 975 + - uid: 971 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-20.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 269 + - 950 + - 975 - proto: FloorDrain entities: - uid: 806 @@ -3688,6 +4272,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 972 - type: AtmosPipeColor color: '#0335FCFF' - uid: 454 @@ -3696,6 +4283,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 972 - type: AtmosPipeColor color: '#0335FCFF' - uid: 460 @@ -3704,6 +4294,9 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-20.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 950 - type: AtmosPipeColor color: '#0335FCFF' - uid: 461 @@ -3711,6 +4304,9 @@ entities: - type: Transform pos: 4.5,-16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 974 - type: AtmosPipeColor color: '#0335FCFF' - uid: 462 @@ -3727,6 +4323,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-23.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 973 - type: AtmosPipeColor color: '#0335FCFF' - uid: 475 @@ -3734,6 +4333,9 @@ entities: - type: Transform pos: -1.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 960 - type: AtmosPipeColor color: '#0335FCFF' - uid: 476 @@ -3742,6 +4344,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,11.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 959 - type: AtmosPipeColor color: '#0335FCFF' - uid: 483 @@ -3750,6 +4355,9 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,14.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 959 - type: AtmosPipeColor color: '#0335FCFF' - uid: 519 @@ -3758,6 +4366,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 - type: AtmosPipeColor color: '#0335FCFF' - uid: 520 @@ -3766,6 +4377,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 - type: AtmosPipeColor color: '#0335FCFF' - uid: 521 @@ -3774,6 +4388,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 145 - type: AtmosPipeColor color: '#0335FCFF' - uid: 522 @@ -3782,6 +4399,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 947 - type: AtmosPipeColor color: '#0335FCFF' - uid: 533 @@ -3790,6 +4410,9 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-20.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 269 - type: AtmosPipeColor color: '#0335FCFF' - proto: GasVentScrubber @@ -3799,6 +4422,9 @@ entities: - type: Transform pos: -2.5,11.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 960 - type: AtmosPipeColor color: '#FF1212FF' - uid: 487 @@ -3806,6 +4432,9 @@ entities: - type: Transform pos: 0.5,14.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 959 - type: AtmosPipeColor color: '#FF1212FF' - uid: 488 @@ -3814,6 +4443,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 959 - type: AtmosPipeColor color: '#FF1212FF' - uid: 489 @@ -3822,6 +4454,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 972 - type: AtmosPipeColor color: '#FF1212FF' - uid: 490 @@ -3830,6 +4465,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 972 - type: AtmosPipeColor color: '#FF1212FF' - uid: 535 @@ -3845,6 +4483,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 974 - type: AtmosPipeColor color: '#FF1212FF' - uid: 537 @@ -3853,6 +4494,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-21.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 950 - type: AtmosPipeColor color: '#FF1212FF' - uid: 538 @@ -3860,6 +4504,9 @@ entities: - type: Transform pos: 1.5,-20.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 269 - type: AtmosPipeColor color: '#FF1212FF' - uid: 572 @@ -3868,6 +4515,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 - type: AtmosPipeColor color: '#FF1212FF' - uid: 573 @@ -3876,6 +4526,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 145 - type: AtmosPipeColor color: '#FF1212FF' - uid: 574 @@ -3884,6 +4537,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 947 - type: AtmosPipeColor color: '#FF1212FF' - uid: 575 @@ -3892,6 +4548,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 886 - type: AtmosPipeColor color: '#FF1212FF' - uid: 661 @@ -3900,6 +4559,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-24.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 973 - type: AtmosPipeColor color: '#FF1212FF' - proto: GeneratorBasic15kW @@ -6172,6 +6834,11 @@ entities: - type: Transform pos: 2.5,-15.5 parent: 1 + - uid: 887 + components: + - type: Transform + pos: 5.5,-22.5 + parent: 1 - proto: WallShuttleDiagonal entities: - uid: 6 @@ -6263,12 +6930,6 @@ entities: parent: 1 - proto: WallShuttleInterior entities: - - uid: 145 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-22.5 - parent: 1 - uid: 202 components: - type: Transform diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index e376a1a91e..7bb91cde06 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -2921,6 +2921,9 @@ entities: - type: DeviceList devices: - 5914 + - 1087 + - 6891 + - 6173 - uid: 1948 components: - type: Transform @@ -2930,6 +2933,7 @@ entities: - type: DeviceList devices: - 6719 + - 7056 - uid: 1949 components: - type: Transform @@ -3031,6 +3035,9 @@ entities: devices: - 6799 - 7235 + - 7798 + - 8673 + - 8508 - uid: 6648 components: - type: Transform @@ -3045,6 +3052,7 @@ entities: - 3817 - 3815 - 7599 + - 929 - uid: 7372 components: - type: Transform @@ -3060,6 +3068,11 @@ entities: - 3771 - 2164 - 2131 + - 4537 + - 8468 + - 2085 + - 819 + - 820 - uid: 7532 components: - type: Transform @@ -3342,6 +3355,15 @@ entities: - type: DeviceList devices: - 8623 + - uid: 8680 + components: + - type: Transform + pos: 1.5,8.5 + parent: 30 + - type: DeviceList + devices: + - 8668 + - 8669 - proto: AirCanister entities: - uid: 5877 @@ -4717,6 +4739,11 @@ entities: rot: 3.141592653589793 rad pos: 22.5,34.5 parent: 30 + - uid: 2442 + components: + - type: Transform + pos: -15.5,4.5 + parent: 30 - uid: 6874 components: - type: Transform @@ -4767,13 +4794,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,30.5 parent: 30 -- proto: AtmosDeviceFanTiny - entities: - - uid: 2442 - components: - - type: Transform - pos: -15.5,4.5 - parent: 30 - proto: AtmosFixBlockerMarker entities: - uid: 4894 @@ -24027,12 +24047,18 @@ entities: rot: 3.141592653589793 rad pos: -40.5,-0.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1947 - uid: 6891 components: - type: Transform rot: 3.141592653589793 rad pos: -40.5,0.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1947 - uid: 7205 components: - type: Transform @@ -34907,6 +34933,9 @@ entities: rot: -1.5707963267948966 rad pos: 15.5,5.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1087 @@ -34915,6 +34944,9 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,5.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1947 - type: AtmosPipeColor color: '#0055CCFF' - uid: 1146 @@ -35236,6 +35268,9 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,17.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#0055CCFF' - uid: 4548 @@ -35511,6 +35546,9 @@ entities: rot: 3.141592653589793 rad pos: -61.5,-1.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 6101 - type: AtmosPipeColor color: '#0055CCFF' - uid: 8226 @@ -35536,11 +35574,23 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 8508 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -62.5,1.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 6101 - uid: 8669 components: - type: Transform pos: 2.5,6.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 8680 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -35636,6 +35686,9 @@ entities: rot: 1.5707963267948966 rad pos: 14.5,7.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#990000FF' - uid: 845 @@ -35650,6 +35703,9 @@ entities: - type: Transform pos: 1.5,10.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 6648 - type: AtmosPipeColor color: '#990000FF' - uid: 1099 @@ -35715,6 +35771,9 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,11.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#990000FF' - uid: 2127 @@ -36074,6 +36133,9 @@ entities: - type: Transform pos: -36.5,9.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 1948 - type: AtmosPipeColor color: '#990000FF' - uid: 7235 @@ -36197,6 +36259,9 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,18.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 7372 - type: AtmosPipeColor color: '#990000FF' - uid: 8629 @@ -36213,8 +36278,20 @@ entities: rot: 3.141592653589793 rad pos: 2.5,7.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 8680 - type: AtmosPipeColor color: '#990000FF' + - uid: 8673 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -62.5,2.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 6101 - proto: GasVolumePump entities: - uid: 7730 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index ed153964bd..90d0061f77 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -14327,6 +14327,17 @@ entities: rot: 3.141592653589793 rad pos: 46.5,31.5 parent: 60 + - uid: 898 + components: + - type: Transform + pos: 23.5,-29.5 + parent: 60 + - uid: 902 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,-25.5 + parent: 60 - uid: 3189 components: - type: Transform @@ -14339,6 +14350,18 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,14.5 parent: 60 + - uid: 6129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,29.5 + parent: 60 + - uid: 6130 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-0.5 + parent: 7536 - uid: 6768 components: - type: Transform @@ -14363,6 +14386,17 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-70.5 parent: 60 + - uid: 9110 + components: + - type: Transform + pos: -11.5,-4.5 + parent: 7536 + - uid: 9214 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 7536 - uid: 12269 components: - type: Transform @@ -14410,38 +14444,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-70.5 parent: 60 -- proto: AtmosDeviceFanTiny - entities: - - uid: 6129 - components: - - type: Transform - pos: -11.5,-0.5 - parent: 7536 - - uid: 6130 - components: - - type: Transform - pos: -11.5,-4.5 - parent: 7536 - - uid: 9110 - components: - - type: Transform - pos: 0.5,-0.5 - parent: 7536 - - uid: 9214 - components: - - type: Transform - pos: 23.5,-29.5 - parent: 60 - - uid: 13825 - components: - - type: Transform - pos: 25.5,-25.5 - parent: 60 - - uid: 19808 - components: - - type: Transform - pos: 20.5,28.5 - parent: 60 - proto: AtmosFixBlockerMarker entities: - uid: 6252 @@ -74858,18 +74860,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 898 - components: - - type: Transform - anchored: False - rot: 1.5707963267948966 rad - pos: -10.5,-22.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 899 components: - type: Transform @@ -74894,18 +74884,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 902 - components: - - type: Transform - anchored: False - rot: 1.5707963267948966 rad - pos: -13.5,-22.5 - parent: 60 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 903 components: - type: Transform diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index ea4dd61dd9..2ba6b203e5 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -28,6 +28,7 @@ tilemap: 62: FloorLino 64: FloorMetalDiamond 65: FloorMime + 2: FloorMono 77: FloorReinforced 78: FloorReinforcedHardened 79: FloorRockVault @@ -382,7 +383,7 @@ entities: version: 6 0,-6: ind: 0,-6 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAaAAAAAAAaAAAAAAATQAAAAAATQAAAAAATQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -1,-6: ind: -1,-6 @@ -390,7 +391,7 @@ entities: version: 6 1,-6: ind: 1,-6 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAEQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABeQAAAAAAHQAAAAABeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAACAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAACeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABeQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAADHQAAAAABTQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABHQAAAAADTQAAAAAATQAAAAAATQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAEQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABeQAAAAAAHQAAAAABeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAACHQAAAAACHQAAAAACAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAADeQAAAAAAHQAAAAABHQAAAAABHQAAAAAAeQAAAAAAHQAAAAACAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAADHQAAAAACeQAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAAgAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAA version: 6 2,-6: ind: 2,-6 @@ -512,17 +513,17 @@ entities: decals: 1116: -24,-18 1117: -24,-16 - 2954: 2,-67 - 2955: 2,-66 - 3031: 66,-52 - 3032: 66,-51 - 3263: -23,-25 - 3264: -25,-25 - 3468: 2,-64 - 3469: 2,-63 - 3470: 2,-62 - 3471: 2,-61 - 3472: 2,-60 + 2941: 2,-67 + 2942: 2,-66 + 3018: 66,-52 + 3019: 66,-51 + 3246: -23,-25 + 3247: -25,-25 + 3451: 2,-64 + 3452: 2,-63 + 3453: 2,-62 + 3454: 2,-61 + 3455: 2,-60 - node: color: '#FFFFFFFF' id: Arrows @@ -532,54 +533,42 @@ entities: 2556: 6,-49 2557: 7,-49 2595: 3,-45 - 2631: -6,-76 - 2696: 4,-76 - 3027: 80,-54 - 3028: 79,-54 - 3029: 74,-54 - 3030: 72,-54 + 2625: -6,-76 + 2690: 4,-76 + 3014: 80,-54 + 3015: 79,-54 + 3016: 74,-54 + 3017: 72,-54 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 2620: 9,-75 - 3265: -25,-27 - 3266: -23,-27 - 3473: 8,-64 - 3474: 8,-63 + 2614: 9,-75 + 3248: -25,-27 + 3249: -23,-27 + 3456: 8,-64 + 3457: 8,-63 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 3660: 60,-52 + 3643: 60,-52 - node: color: '#FFFFFFFF' id: ArrowsGreyscale decals: 386: -25,-66 - - node: - color: '#529CFF93' - id: Bot - decals: - 2598: 16,-79 - 2599: 16,-79 - - node: - color: '#DE3A3A96' - id: Bot - decals: - 2596: 13,-79 - 2597: 14,-79 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: Bot decals: - 2956: 1,-72 - 2957: 9,-68 - 2958: 9,-67 - 2959: 5,-66 + 2943: 1,-72 + 2944: 9,-68 + 2945: 9,-67 + 2946: 5,-66 - node: color: '#FFFFFFFF' id: Bot @@ -656,75 +645,66 @@ entities: 2459: 14,-43 2593: 6,-41 2594: 7,-41 - 2617: 5,-73 - 2618: 6,-73 - 2619: 7,-73 - 2864: -1,-63 - 2865: -1,-64 - 2952: 1,-67 - 2953: 1,-66 - 3021: 65,-52 - 3022: 65,-51 - 3023: 72,-55 - 3024: 74,-55 - 3025: 79,-55 - 3026: 80,-55 - 3034: 74,-44 - 3035: 73,-44 - 3089: 34,-47 - 3090: 34,-46 - 3091: 34,-50 - 3092: 34,-49 - 3093: 37,-50 - 3094: 37,-49 - 3095: 18,-84 - 3096: 14,-85 - 3097: 14,-86 - 3098: 14,-87 - 3146: 34,-44 - 3147: 35,-44 - 3148: 34,-39 - 3230: -35,-19 - 3231: -36,-19 - 3232: -37,-19 - 3233: -38,-19 - 3234: -37,-27 - 3235: -38,-27 - 3236: -39,-27 - 3237: -37,-25 - 3238: -38,-25 - 3239: -39,-25 - 3240: -37,-23 - 3241: -38,-23 - 3242: -39,-23 - 3252: -26,-32 - 3253: -27,-32 - 3254: -27,-34 - 3255: -27,-33 - 3256: -26,-33 - 3257: -26,-34 - 3258: -26,-35 - 3259: -27,-35 - 3460: 3,-55 - 3461: 1,-64 - 3462: 1,-63 - 3463: 1,-62 - 3464: 1,-61 - 3465: 1,-60 - 3466: 9,-64 - 3467: 9,-63 - 3536: -10,31 - 3537: -7,31 - 3564: -10,29 - 3656: 60,-51 - 3657: 59,-51 - 3659: 57,-51 - - node: - color: '#529CFF93' - id: BotGreyscale - decals: - 2600: 16,-79 - 2601: 17,-79 + 2611: 5,-73 + 2612: 6,-73 + 2613: 7,-73 + 2851: -1,-63 + 2852: -1,-64 + 2939: 1,-67 + 2940: 1,-66 + 3008: 65,-52 + 3009: 65,-51 + 3010: 72,-55 + 3011: 74,-55 + 3012: 79,-55 + 3013: 80,-55 + 3021: 74,-44 + 3022: 73,-44 + 3076: 34,-47 + 3077: 34,-46 + 3078: 34,-50 + 3079: 34,-49 + 3080: 37,-50 + 3081: 37,-49 + 3082: 18,-84 + 3129: 34,-44 + 3130: 35,-44 + 3131: 34,-39 + 3213: -35,-19 + 3214: -36,-19 + 3215: -37,-19 + 3216: -38,-19 + 3217: -37,-27 + 3218: -38,-27 + 3219: -39,-27 + 3220: -37,-25 + 3221: -38,-25 + 3222: -39,-25 + 3223: -37,-23 + 3224: -38,-23 + 3225: -39,-23 + 3235: -26,-32 + 3236: -27,-32 + 3237: -27,-34 + 3238: -27,-33 + 3239: -26,-33 + 3240: -26,-34 + 3241: -26,-35 + 3242: -27,-35 + 3443: 3,-55 + 3444: 1,-64 + 3445: 1,-63 + 3446: 1,-62 + 3447: 1,-61 + 3448: 1,-60 + 3449: 9,-64 + 3450: 9,-63 + 3519: -10,31 + 3520: -7,31 + 3547: -10,29 + 3639: 60,-51 + 3640: 59,-51 + 3642: 57,-51 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -738,27 +718,27 @@ entities: 1063: 0,-21 1079: -2,-14 1080: 0,-14 - 3587: -16,36 - 3588: -15,36 - 3589: -14,36 - 3590: -13,36 - 3591: -12,36 + 3570: -16,36 + 3571: -15,36 + 3572: -14,36 + 3573: -13,36 + 3574: -12,36 - node: color: '#FFFFFFFF' id: BotLeft decals: 1688: 55,-32 - 3111: 18,-71 - 3112: 17,-71 - 3113: 16,-71 - 3114: 15,-71 - 3249: -40,-28 - 3250: -39,-28 - 3251: -38,-28 - 3606: -1,37 - 3607: 0,37 - 3608: 1,37 - 3609: 2,37 + 3095: 18,-71 + 3096: 17,-71 + 3097: 16,-71 + 3098: 15,-71 + 3232: -40,-28 + 3233: -39,-28 + 3234: -38,-28 + 3589: -1,37 + 3590: 0,37 + 3591: 1,37 + 3592: 2,37 - node: color: '#FFFFFFFF' id: BotLeftGreyscale @@ -790,14 +770,13 @@ entities: color: '#FFFFFFFF' id: Box decals: - 3563: -7,32 + 3546: -7,32 - node: color: '#FFFFFFFF' id: BoxGreyscale decals: 2460: 14,-42 2461: 14,-41 - 3115: 15,-81 - node: color: '#FFFFFFFF' id: BrickTileDarkBox @@ -809,80 +788,80 @@ entities: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 2976: 11,-35 + 2963: 11,-35 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNe decals: - 3604: -2,36 + 3587: -2,36 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: - 3605: 3,36 + 3588: 3,36 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 3603: -2,38 + 3586: -2,38 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw decals: - 3602: 3,38 + 3585: 3,38 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 2977: 11,-34 - 3593: -2,37 + 2964: 11,-34 + 3576: -2,37 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 2941: -6,-66 - 2942: -7,-66 - 2943: -8,-66 - 2969: 13,-36 - 2970: 11,-36 - 2973: 12,-36 - 2974: 10,-36 - 2975: 9,-36 - 3598: -1,36 - 3599: 0,36 - 3600: 1,36 - 3601: 2,36 + 2928: -6,-66 + 2929: -7,-66 + 2930: -8,-66 + 2956: 13,-36 + 2957: 11,-36 + 2960: 12,-36 + 2961: 10,-36 + 2962: 9,-36 + 3581: -1,36 + 3582: 0,36 + 3583: 1,36 + 3584: 2,36 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 2944: -8,-62 - 2945: -7,-62 - 2946: -6,-62 - 2947: -4,-62 - 2948: -3,-62 - 2949: -2,-62 - 2950: -1,-62 - 2967: 10,-35 - 2968: 9,-35 - 3594: -1,38 - 3595: 0,38 - 3596: 1,38 - 3597: 2,38 + 2931: -8,-62 + 2932: -7,-62 + 2933: -6,-62 + 2934: -4,-62 + 2935: -3,-62 + 2936: -2,-62 + 2937: -1,-62 + 2954: 10,-35 + 2955: 9,-35 + 3577: -1,38 + 3578: 0,38 + 3579: 1,38 + 3580: 2,38 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 3555: -6,29 - 3556: -6,30 - 3557: -6,31 - 3558: -6,32 - 3592: 3,37 + 3538: -6,29 + 3539: -6,30 + 3540: -6,31 + 3541: -6,32 + 3575: 3,37 - node: color: '#9FED584D' id: BrickTileSteelCornerNe decals: - 3063: 35,-46 + 3050: 35,-46 - node: color: '#D381C996' id: BrickTileSteelCornerNe @@ -892,12 +871,12 @@ entities: color: '#EFB34196' id: BrickTileSteelCornerNe decals: - 3069: 35,-49 + 3056: 35,-49 - node: color: '#9FED584D' id: BrickTileSteelCornerNw decals: - 3064: 34,-46 + 3051: 34,-46 - node: color: '#D381C996' id: BrickTileSteelCornerNw @@ -908,37 +887,37 @@ entities: color: '#EFB34196' id: BrickTileSteelCornerNw decals: - 3070: 34,-49 + 3057: 34,-49 - node: color: '#52B4E996' id: BrickTileSteelCornerSe decals: - 2981: 19,-34 + 2968: 19,-34 - node: color: '#9FED584D' id: BrickTileSteelCornerSe decals: - 3065: 35,-47 + 3052: 35,-47 - node: color: '#EFB34196' id: BrickTileSteelCornerSe decals: - 3068: 35,-50 + 3055: 35,-50 - node: color: '#52B4E996' id: BrickTileSteelCornerSw decals: - 2980: 21,-34 + 2967: 21,-34 - node: color: '#9FED584D' id: BrickTileSteelCornerSw decals: - 3066: 34,-47 + 3053: 34,-47 - node: color: '#EFB34196' id: BrickTileSteelCornerSw decals: - 3067: 34,-50 + 3054: 34,-50 - node: color: '#D381C996' id: BrickTileSteelInnerNe @@ -968,11 +947,11 @@ entities: color: '#52B4E996' id: BrickTileSteelLineE decals: - 2983: 19,-33 - 3071: 37,-50 - 3072: 37,-49 - 3073: 37,-47 - 3074: 37,-46 + 2970: 19,-33 + 3058: 37,-50 + 3059: 37,-49 + 3060: 37,-47 + 3061: 37,-46 - node: color: '#D381C996' id: BrickTileSteelLineE @@ -1029,8 +1008,8 @@ entities: color: '#52B4E996' id: BrickTileSteelLineS decals: - 2978: 22,-34 - 2979: 18,-34 + 2965: 22,-34 + 2966: 18,-34 - node: color: '#D381C996' id: BrickTileSteelLineS @@ -1074,7 +1053,7 @@ entities: color: '#52B4E996' id: BrickTileSteelLineW decals: - 2982: 21,-33 + 2969: 21,-33 - node: color: '#D381C996' id: BrickTileSteelLineW @@ -1088,8 +1067,8 @@ entities: decals: 2430: 34,-35 2438: 46,-54 - 3393: 45,-1 - 3394: 45,0 + 3376: 45,-1 + 3377: 45,0 - node: color: '#D4D4D428' id: BrickTileWhiteBox @@ -1107,7 +1086,7 @@ entities: color: '#5299B43A' id: BrickTileWhiteCornerNe decals: - 3053: 37,-40 + 3040: 37,-40 - node: color: '#52B4E996' id: BrickTileWhiteCornerNe @@ -1141,8 +1120,8 @@ entities: 1498: -4,9 2252: -12,-50 2573: 7,-41 - 2641: -10,-73 - 2866: 9,-66 + 2635: -10,-73 + 2853: 9,-66 - node: color: '#FFEBAE96' id: BrickTileWhiteCornerNe @@ -1159,7 +1138,7 @@ entities: color: '#5299B43A' id: BrickTileWhiteCornerNw decals: - 3054: 34,-40 + 3041: 34,-40 - node: color: '#52B4E996' id: BrickTileWhiteCornerNw @@ -1181,7 +1160,7 @@ entities: id: BrickTileWhiteCornerNw decals: 2255: -16,-57 - 3545: -15,27 + 3528: -15,27 - node: color: '#EFB34196' id: BrickTileWhiteCornerNw @@ -1189,10 +1168,10 @@ entities: 1497: -7,9 2251: -13,-50 2572: 3,-41 - 2642: -18,-73 - 2872: 1,-66 - 2877: -4,-67 - 2878: -8,-68 + 2636: -18,-73 + 2859: 1,-66 + 2864: -4,-67 + 2865: -8,-68 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSe @@ -1204,7 +1183,7 @@ entities: color: '#5299B43A' id: BrickTileWhiteCornerSe decals: - 3056: 37,-43 + 3043: 37,-43 - node: color: '#9FED5896' id: BrickTileWhiteCornerSe @@ -1226,8 +1205,8 @@ entities: decals: 2267: -6,-58 2580: 7,-45 - 2623: -5,-76 - 2656: -10,-77 + 2617: -5,-76 + 2650: -10,-77 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSw @@ -1239,7 +1218,7 @@ entities: color: '#5299B43A' id: BrickTileWhiteCornerSw decals: - 3055: 34,-43 + 3042: 34,-43 - node: color: '#9FED5896' id: BrickTileWhiteCornerSw @@ -1259,7 +1238,7 @@ entities: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: - 3546: -15,26 + 3529: -15,26 - node: color: '#EFB34196' id: BrickTileWhiteCornerSw @@ -1267,8 +1246,8 @@ entities: 1500: -7,6 2265: -8,-58 2569: 3,-45 - 2622: -8,-76 - 2655: -18,-77 + 2616: -8,-76 + 2649: -18,-77 - node: color: '#EFB34196' id: BrickTileWhiteInnerNe @@ -1283,12 +1262,12 @@ entities: color: '#DE3A3A96' id: BrickTileWhiteInnerNw decals: - 3553: -6,27 + 3536: -6,27 - node: color: '#EFB34196' id: BrickTileWhiteInnerNw decals: - 2901: -4,-68 + 2888: -4,-68 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe @@ -1320,8 +1299,8 @@ entities: color: '#5299B43A' id: BrickTileWhiteLineE decals: - 3059: 37,-42 - 3060: 37,-41 + 3046: 37,-42 + 3047: 37,-41 - node: color: '#52B4E996' id: BrickTileWhiteLineE @@ -1356,10 +1335,10 @@ entities: id: BrickTileWhiteLineE decals: 1533: -11,4 - 3549: -5,30 - 3550: -5,31 - 3551: -5,32 - 3552: -5,29 + 3532: -5,30 + 3533: -5,31 + 3534: -5,32 + 3535: -5,29 - node: color: '#EFB34196' id: BrickTileWhiteLineE @@ -1372,14 +1351,14 @@ entities: 2577: 7,-42 2578: 7,-43 2579: 7,-44 - 2624: -5,-73 - 2628: -5,-72 - 2650: -10,-74 - 2651: -10,-76 - 2889: 9,-70 - 2890: 9,-69 - 2891: 9,-68 - 2892: 9,-67 + 2618: -5,-73 + 2622: -5,-72 + 2644: -10,-74 + 2645: -10,-76 + 2876: 9,-70 + 2877: 9,-69 + 2878: 9,-68 + 2879: 9,-67 - node: color: '#334E6DC8' id: BrickTileWhiteLineN @@ -1401,8 +1380,8 @@ entities: color: '#5299B43A' id: BrickTileWhiteLineN decals: - 3051: 36,-40 - 3052: 35,-40 + 3038: 36,-40 + 3039: 35,-40 - node: color: '#52B4E996' id: BrickTileWhiteLineN @@ -1451,16 +1430,16 @@ entities: color: '#DE3A3A96' id: BrickTileWhiteLineN decals: - 3540: -7,27 - 3541: -10,27 - 3542: -11,27 - 3543: -13,27 - 3544: -14,27 - 3574: -12,36 - 3575: -13,36 - 3576: -14,36 - 3577: -15,36 - 3578: -16,36 + 3523: -7,27 + 3524: -10,27 + 3525: -11,27 + 3526: -13,27 + 3527: -14,27 + 3557: -12,36 + 3558: -13,36 + 3559: -14,36 + 3560: -15,36 + 3561: -16,36 - node: color: '#EFB34196' id: BrickTileWhiteLineN @@ -1470,29 +1449,29 @@ entities: 2574: 6,-41 2575: 5,-41 2576: 4,-41 - 2611: 7,-73 - 2612: 6,-73 - 2613: 5,-73 - 2637: -20,-69 - 2638: -21,-69 - 2643: -17,-73 - 2644: -16,-73 - 2645: -15,-73 - 2646: -14,-73 - 2647: -13,-73 - 2648: -12,-73 - 2649: -11,-73 - 2867: 7,-66 - 2868: 6,-66 - 2869: 5,-66 - 2870: 4,-66 - 2871: 2,-66 - 2873: 0,-67 - 2874: -1,-67 - 2875: -2,-67 - 2876: -3,-67 - 2899: -6,-68 - 2900: -5,-68 + 2605: 7,-73 + 2606: 6,-73 + 2607: 5,-73 + 2631: -20,-69 + 2632: -21,-69 + 2637: -17,-73 + 2638: -16,-73 + 2639: -15,-73 + 2640: -14,-73 + 2641: -13,-73 + 2642: -12,-73 + 2643: -11,-73 + 2854: 7,-66 + 2855: 6,-66 + 2856: 5,-66 + 2857: 4,-66 + 2858: 2,-66 + 2860: 0,-67 + 2861: -1,-67 + 2862: -2,-67 + 2863: -3,-67 + 2886: -6,-68 + 2887: -5,-68 - node: color: '#FFEBAE96' id: BrickTileWhiteLineN @@ -1515,8 +1494,8 @@ entities: color: '#5299B43A' id: BrickTileWhiteLineS decals: - 3057: 36,-43 - 3058: 35,-43 + 3044: 36,-43 + 3045: 35,-43 - node: color: '#52B4E996' id: BrickTileWhiteLineS @@ -1566,10 +1545,10 @@ entities: 2089: 10,26 2090: 8,26 2091: 7,26 - 3579: -12,34 - 3580: -13,34 - 3581: -14,34 - 3582: -16,34 + 3562: -12,34 + 3563: -13,34 + 3564: -14,34 + 3565: -16,34 - node: color: '#EFB34196' id: BrickTileWhiteLineS @@ -1582,30 +1561,30 @@ entities: 2581: 6,-45 2582: 5,-45 2583: 4,-45 - 2614: 8,-76 - 2615: 6,-76 - 2616: 7,-76 - 2629: -6,-76 - 2630: -7,-76 - 2639: -20,-71 - 2640: -21,-71 - 2657: -11,-77 - 2658: -12,-77 - 2659: -13,-77 - 2660: -14,-77 - 2661: -15,-77 - 2662: -16,-77 - 2663: -17,-77 - 2879: -4,-71 - 2880: -3,-71 - 2881: -2,-71 - 2882: -1,-71 - 2883: 0,-71 - 2884: 1,-71 - 2885: 2,-71 - 2886: 5,-71 - 2887: 6,-71 - 2888: 7,-71 + 2608: 8,-76 + 2609: 6,-76 + 2610: 7,-76 + 2623: -6,-76 + 2624: -7,-76 + 2633: -20,-71 + 2634: -21,-71 + 2651: -11,-77 + 2652: -12,-77 + 2653: -13,-77 + 2654: -14,-77 + 2655: -15,-77 + 2656: -16,-77 + 2657: -17,-77 + 2866: -4,-71 + 2867: -3,-71 + 2868: -2,-71 + 2869: -1,-71 + 2870: 0,-71 + 2871: 1,-71 + 2872: 2,-71 + 2873: 5,-71 + 2874: 6,-71 + 2875: 7,-71 - node: color: '#334E6DC8' id: BrickTileWhiteLineW @@ -1631,8 +1610,8 @@ entities: color: '#5299B43A' id: BrickTileWhiteLineW decals: - 3061: 34,-42 - 3062: 34,-41 + 3048: 34,-42 + 3049: 34,-41 - node: color: '#52B4E996' id: BrickTileWhiteLineW @@ -1657,11 +1636,11 @@ entities: color: '#DE3A3A96' id: BrickTileWhiteLineW decals: - 3554: -6,28 - 3559: -6,29 - 3560: -6,30 - 3561: -6,31 - 3562: -6,32 + 3537: -6,28 + 3542: -6,29 + 3543: -6,30 + 3544: -6,31 + 3545: -6,32 - node: color: '#EFB34196' id: BrickTileWhiteLineW @@ -1672,12 +1651,12 @@ entities: 2264: -8,-57 2570: 3,-44 2571: 3,-42 - 2625: -8,-74 - 2626: -8,-73 - 2627: -8,-72 - 2652: -18,-74 - 2653: -18,-75 - 2654: -18,-76 + 2619: -8,-74 + 2620: -8,-73 + 2621: -8,-72 + 2646: -18,-74 + 2647: -18,-75 + 2648: -18,-76 - node: color: '#FFFFFFFF' id: Bushb1 @@ -1741,7 +1720,7 @@ entities: decals: 1680: 66,-22 2436: 31,-34 - 2621: 9,-74 + 2615: 9,-74 - node: color: '#3B393B85' id: CheckerNESW @@ -1776,14 +1755,14 @@ entities: 1584: 44,-45 1585: 43,-45 1586: 42,-46 - 3138: 34,-44 - 3139: 35,-44 - 3140: 36,-44 - 3141: 37,-44 - 3142: 37,-39 - 3143: 36,-39 - 3144: 35,-39 - 3145: 34,-39 + 3121: 34,-44 + 3122: 35,-44 + 3123: 36,-44 + 3124: 37,-44 + 3125: 37,-39 + 3126: 36,-39 + 3127: 35,-39 + 3128: 34,-39 - node: color: '#92929B96' id: CheckerNESW @@ -1818,18 +1797,18 @@ entities: color: '#9FED5896' id: CheckerNESW decals: - 3381: 45,-1 - 3382: 45,0 - 3383: 46,-1 - 3384: 46,0 - 3385: 47,-1 - 3386: 47,0 - 3387: 48,-1 - 3388: 48,0 - 3389: 48,1 - 3390: 49,1 - 3391: 49,0 - 3392: 49,-1 + 3364: 45,-1 + 3365: 45,0 + 3366: 46,-1 + 3367: 46,0 + 3368: 47,-1 + 3369: 47,0 + 3370: 48,-1 + 3371: 48,0 + 3372: 48,1 + 3373: 49,1 + 3374: 49,0 + 3375: 49,-1 - node: color: '#D381C996' id: CheckerNESW @@ -1869,30 +1848,30 @@ entities: color: '#EFCC4163' id: CheckerNESW decals: - 2840: -1,-65 - 2841: -2,-65 - 2842: -2,-64 - 2843: -1,-64 - 2844: -1,-63 - 2845: -2,-63 - 2846: -4,-63 - 2847: -3,-63 - 2848: -3,-64 - 2849: -4,-64 - 2850: -5,-64 - 2851: -5,-63 - 2852: -3,-65 - 2853: -4,-65 - 2854: -5,-65 - 2855: -6,-65 - 2856: -8,-65 - 2857: -7,-65 - 2858: -6,-64 - 2859: -7,-64 - 2860: -8,-64 - 2861: -8,-63 - 2862: -7,-63 - 2863: -6,-63 + 2827: -1,-65 + 2828: -2,-65 + 2829: -2,-64 + 2830: -1,-64 + 2831: -1,-63 + 2832: -2,-63 + 2833: -4,-63 + 2834: -3,-63 + 2835: -3,-64 + 2836: -4,-64 + 2837: -5,-64 + 2838: -5,-63 + 2839: -3,-65 + 2840: -4,-65 + 2841: -5,-65 + 2842: -6,-65 + 2843: -8,-65 + 2844: -7,-65 + 2845: -6,-64 + 2846: -7,-64 + 2847: -8,-64 + 2848: -8,-63 + 2849: -7,-63 + 2850: -6,-63 - node: color: '#FFEBAE96' id: CheckerNESW @@ -1917,18 +1896,18 @@ entities: color: '#FFFFFFFF' id: CheckerNESW decals: - 3369: 45,-1 - 3370: 45,0 - 3371: 46,0 - 3372: 46,-1 - 3373: 47,-1 - 3374: 47,0 - 3375: 48,-1 - 3376: 48,0 - 3377: 49,-1 - 3378: 49,0 - 3379: 49,1 - 3380: 48,1 + 3352: 45,-1 + 3353: 45,0 + 3354: 46,0 + 3355: 46,-1 + 3356: 47,-1 + 3357: 47,0 + 3358: 48,-1 + 3359: 48,0 + 3360: 49,-1 + 3361: 49,0 + 3362: 49,1 + 3363: 48,1 - node: color: '#334E6DC8' id: CheckerNWSE @@ -1991,32 +1970,32 @@ entities: 1647: 49,-36 1648: 49,-35 1649: 49,-34 - 2988: 38,-30 - 2989: 38,-29 - 2990: 38,-28 - 2991: 38,-27 - 2992: 39,-27 - 2993: 40,-27 - 2994: 41,-27 - 2995: 41,-28 - 2996: 40,-28 - 2997: 39,-28 - 2998: 39,-29 - 2999: 39,-30 - 3000: 40,-30 - 3001: 40,-29 - 3002: 41,-29 - 3003: 41,-30 - 3079: 40,-49 - 3080: 40,-48 - 3081: 40,-47 - 3082: 40,-46 - 3083: 40,-45 - 3084: 40,-44 - 3085: 40,-43 - 3086: 40,-42 - 3087: 40,-41 - 3088: 40,-40 + 2975: 38,-30 + 2976: 38,-29 + 2977: 38,-28 + 2978: 38,-27 + 2979: 39,-27 + 2980: 40,-27 + 2981: 41,-27 + 2982: 41,-28 + 2983: 40,-28 + 2984: 39,-28 + 2985: 39,-29 + 2986: 39,-30 + 2987: 40,-30 + 2988: 40,-29 + 2989: 41,-29 + 2990: 41,-30 + 3066: 40,-49 + 3067: 40,-48 + 3068: 40,-47 + 3069: 40,-46 + 3070: 40,-45 + 3071: 40,-44 + 3072: 40,-43 + 3073: 40,-42 + 3074: 40,-41 + 3075: 40,-40 - node: color: '#9FED5896' id: CheckerNWSE @@ -2033,22 +2012,22 @@ entities: 744: 47,-59 745: 47,-60 746: 47,-61 - 3172: 3,-36 - 3173: 3,-35 - 3174: 4,-35 - 3175: 4,-36 - 3176: 5,-36 - 3177: 5,-35 - 3178: 6,-35 - 3179: 6,-36 + 3155: 3,-36 + 3156: 3,-35 + 3157: 4,-35 + 3158: 4,-36 + 3159: 5,-36 + 3160: 5,-35 + 3161: 6,-35 + 3162: 6,-36 - node: color: '#A4610696' id: CheckerNWSE decals: - 3190: -33,-31 - 3191: -33,-30 - 3192: -32,-30 - 3193: -32,-31 + 3173: -33,-31 + 3174: -33,-30 + 3175: -32,-30 + 3176: -32,-31 - node: color: '#D381C996' id: CheckerNWSE @@ -2170,57 +2149,57 @@ entities: 2562: 3,-46 2563: 4,-49 2564: 4,-48 - 2602: -9,-71 - 2603: -9,-70 - 2604: -9,-69 - 2605: -19,-70 - 2632: -9,-75 - 2633: -8,-72 - 2634: -7,-72 - 2635: -6,-72 - 2636: -5,-72 - 2684: 8,-72 - 2685: 9,-72 - 2686: 4,-72 - 2687: 3,-72 - 2951: -1,-62 - 3033: 67,-54 - 3036: 70,-44 - 3037: 78,-42 - 3038: 78,-40 - 3226: -38,-20 - 3227: -37,-20 - 3228: -36,-20 - 3229: -35,-20 - 3243: -40,-27 - 3244: -40,-25 - 3245: -40,-23 - 3246: -38,-31 - 3247: -39,-31 - 3248: -40,-31 - 3260: -26,-39 - 3261: -27,-39 - 3262: -28,-39 - 3395: 87,-6 - 3396: 87,-4 - 3397: 87,-12 - 3398: 87,-14 - 3399: 83,-14 - 3400: 83,-12 - 3401: 83,-6 - 3402: 83,-4 - 3406: 9,-32 - 3407: 9,-31 - 3408: 9,-30 - 3475: 3,-65 - 3476: 8,-65 - 3477: 8,-59 - 3478: 4,-59 - 3651: 57,-44 - 3652: 58,-44 - 3653: 59,-44 - 3654: 60,-44 - 3658: 58,-51 + 2596: -9,-71 + 2597: -9,-70 + 2598: -9,-69 + 2599: -19,-70 + 2626: -9,-75 + 2627: -8,-72 + 2628: -7,-72 + 2629: -6,-72 + 2630: -5,-72 + 2678: 8,-72 + 2679: 9,-72 + 2680: 4,-72 + 2681: 3,-72 + 2938: -1,-62 + 3020: 67,-54 + 3023: 70,-44 + 3024: 78,-42 + 3025: 78,-40 + 3209: -38,-20 + 3210: -37,-20 + 3211: -36,-20 + 3212: -35,-20 + 3226: -40,-27 + 3227: -40,-25 + 3228: -40,-23 + 3229: -38,-31 + 3230: -39,-31 + 3231: -40,-31 + 3243: -26,-39 + 3244: -27,-39 + 3245: -28,-39 + 3378: 87,-6 + 3379: 87,-4 + 3380: 87,-12 + 3381: 87,-14 + 3382: 83,-14 + 3383: 83,-12 + 3384: 83,-6 + 3385: 83,-4 + 3389: 9,-32 + 3390: 9,-31 + 3391: 9,-30 + 3458: 3,-65 + 3459: 8,-65 + 3460: 8,-59 + 3461: 4,-59 + 3634: 57,-44 + 3635: 58,-44 + 3636: 59,-44 + 3637: 60,-44 + 3641: 58,-51 - node: cleanable: True color: '#474F52FF' @@ -2292,41 +2271,41 @@ entities: color: '#FFFFFFFF' id: Dirt decals: - 3479: 3,-63 - 3480: 3,-62 - 3481: 4,-61 - 3482: 7,-61 - 3483: 8,-61 - 3484: 8,-60 - 3485: 8,-56 - 3486: 8,-55 - 3487: 6,-54 - 3488: 4,-53 - 3624: 55,-53 - 3625: 53,-55 - 3626: 60,-55 - 3627: 61,-56 - 3628: 65,-56 - 3629: 51,-56 - 3630: 50,-55 - 3631: 44,-50 - 3632: 43,-50 - 3633: 51,-49 - 3634: 50,-48 - 3635: 47,-42 - 3636: 48,-43 - 3637: 44,-43 - 3638: 51,-46 - 3639: 57,-51 - 3640: 57,-52 - 3641: 61,-53 - 3642: 63,-52 - 3643: 60,-51 - 3646: 60,-48 - 3647: 53,-50 - 3648: 55,-49 - 3649: 57,-45 - 3650: 58,-46 + 3462: 3,-63 + 3463: 3,-62 + 3464: 4,-61 + 3465: 7,-61 + 3466: 8,-61 + 3467: 8,-60 + 3468: 8,-56 + 3469: 8,-55 + 3470: 6,-54 + 3471: 4,-53 + 3607: 55,-53 + 3608: 53,-55 + 3609: 60,-55 + 3610: 61,-56 + 3611: 65,-56 + 3612: 51,-56 + 3613: 50,-55 + 3614: 44,-50 + 3615: 43,-50 + 3616: 51,-49 + 3617: 50,-48 + 3618: 47,-42 + 3619: 48,-43 + 3620: 44,-43 + 3621: 51,-46 + 3622: 57,-51 + 3623: 57,-52 + 3624: 61,-53 + 3625: 63,-52 + 3626: 60,-51 + 3629: 60,-48 + 3630: 53,-50 + 3631: 55,-49 + 3632: 57,-45 + 3633: 58,-46 - node: color: '#FFFFFFFF' id: DirtHeavy @@ -2338,42 +2317,42 @@ entities: id: DirtHeavy decals: 2529: -1,-55 - 2755: 5,-69 - 2756: 6,-69 - 2757: 0,-70 - 2914: -7,-71 - 2915: -8,-71 - 2916: -7,-72 - 2917: -7,-73 - 2918: -6,-73 - 2919: -1,-72 - 2920: 0,-72 - 3283: -32,-22 - 3284: -36,-22 - 3285: -38,-24 - 3286: -36,-26 - 3287: -36,-29 - 3318: -27,-38 - 3319: -28,-36 - 3320: -28,-35 - 3321: -28,-34 - 3322: -25,-33 - 3489: 3,-61 - 3490: 8,-62 - 3491: 8,-57 - 3616: 63,-56 - 3617: 58,-56 + 2749: 5,-69 + 2750: 6,-69 + 2751: 0,-70 + 2901: -7,-71 + 2902: -8,-71 + 2903: -7,-72 + 2904: -7,-73 + 2905: -6,-73 + 2906: -1,-72 + 2907: 0,-72 + 3266: -32,-22 + 3267: -36,-22 + 3268: -38,-24 + 3269: -36,-26 + 3270: -36,-29 + 3301: -27,-38 + 3302: -28,-36 + 3303: -28,-35 + 3304: -28,-34 + 3305: -25,-33 + 3472: 3,-61 + 3473: 8,-62 + 3474: 8,-57 + 3599: 63,-56 + 3600: 58,-56 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 2921: 1,-72 - 2922: 1,-71 - 2923: 4,-71 - 2924: 3,-66 - 3611: 51,-56 - 3612: 51,-48 + 2908: 1,-72 + 2909: 1,-71 + 2910: 4,-71 + 2911: 3,-66 + 3594: 51,-56 + 3595: 51,-48 - node: cleanable: True color: '#474F52FF' @@ -2520,129 +2499,129 @@ entities: 2523: 0,-56 2524: 1,-57 2525: 2,-57 - 2725: 4,-68 - 2726: 8,-68 - 2727: 8,-73 - 2728: 8,-75 - 2729: 9,-73 - 2730: 11,-74 - 2731: 11,-73 - 2732: 4,-74 - 2733: 3,-73 - 2734: 1,-74 - 2735: 0,-74 - 2736: -1,-73 - 2737: -3,-75 - 2738: -4,-74 - 2739: -4,-75 - 2740: -5,-74 - 2741: -6,-73 - 2742: -5,-69 - 2743: -4,-68 - 2744: -10,-70 - 2745: -11,-69 - 2746: -13,-70 - 2747: -15,-70 - 2748: -17,-69 - 2749: -10,-75 - 2750: -11,-76 - 2751: -13,-77 - 2752: 0,-70 - 2753: 1,-69 - 2754: 7,-68 - 2765: 7,-70 - 2766: 0,-69 - 2767: -1,-69 - 2768: -2,-70 - 2769: -7,-69 - 2770: -6,-68 - 2771: -5,-68 - 2772: -4,-69 - 2773: -4,-70 - 2925: 2,-67 - 2926: 3,-67 - 2927: 2,-66 - 2928: 5,-67 - 2929: 5,-67 - 2930: 4,-67 - 2931: 9,-70 - 2932: 9,-71 - 2933: 8,-71 - 2934: -4,-71 - 2935: -6,-71 - 2936: -8,-70 - 2937: -8,-69 - 2938: -7,-70 - 2939: -10,-71 - 2940: -12,-71 - 3267: -40,-30 - 3268: -41,-31 - 3269: -38,-30 - 3270: -38,-31 - 3271: -36,-31 - 3272: -38,-28 - 3273: -41,-27 - 3274: -38,-25 - 3275: -36,-26 - 3276: -39,-24 - 3277: -37,-22 - 3278: -35,-21 - 3279: -33,-21 - 3280: -33,-21 - 3281: -31,-22 - 3282: -29,-23 - 3328: -26,-35 - 3329: -26,-35 - 3330: -25,-35 - 3331: -27,-35 - 3332: -26,-33 - 3333: -27,-33 - 3334: -27,-31 - 3335: -28,-31 - 3336: -28,-32 - 3337: -29,-32 - 3338: -31,-31 - 3339: -30,-31 - 3340: -35,-31 - 3341: -26,-29 - 3342: -25,-30 - 3343: -25,-28 - 3344: -26,-28 - 3345: -28,-28 - 3346: -28,-27 - 3347: -28,-26 - 3348: -26,-25 - 3349: -25,-27 - 3350: -25,-27 - 3351: -23,-27 - 3352: -22,-27 - 3353: -21,-25 - 3492: 8,-58 - 3493: 7,-57 - 3494: 8,-54 - 3495: 7,-54 - 3496: 4,-54 - 3497: 5,-53 - 3498: 3,-53 - 3499: 3,-64 - 3500: 2,-63 - 3501: 5,-61 - 3502: 6,-61 - 3503: 4,-60 - 3504: 8,-64 - 3505: 6,-57 - 3506: 5,-57 - 3507: 5,-57 - 3508: 3,-57 - 3509: 4,-58 - 3510: 4,-56 - 3610: 53,-55 - 3618: 62,-56 - 3619: 58,-55 - 3620: 57,-56 - 3621: 59,-56 - 3622: 60,-56 - 3623: 54,-55 + 2719: 4,-68 + 2720: 8,-68 + 2721: 8,-73 + 2722: 8,-75 + 2723: 9,-73 + 2724: 11,-74 + 2725: 11,-73 + 2726: 4,-74 + 2727: 3,-73 + 2728: 1,-74 + 2729: 0,-74 + 2730: -1,-73 + 2731: -3,-75 + 2732: -4,-74 + 2733: -4,-75 + 2734: -5,-74 + 2735: -6,-73 + 2736: -5,-69 + 2737: -4,-68 + 2738: -10,-70 + 2739: -11,-69 + 2740: -13,-70 + 2741: -15,-70 + 2742: -17,-69 + 2743: -10,-75 + 2744: -11,-76 + 2745: -13,-77 + 2746: 0,-70 + 2747: 1,-69 + 2748: 7,-68 + 2759: 7,-70 + 2760: 0,-69 + 2761: -1,-69 + 2762: -2,-70 + 2763: -7,-69 + 2764: -6,-68 + 2765: -5,-68 + 2766: -4,-69 + 2767: -4,-70 + 2912: 2,-67 + 2913: 3,-67 + 2914: 2,-66 + 2915: 5,-67 + 2916: 5,-67 + 2917: 4,-67 + 2918: 9,-70 + 2919: 9,-71 + 2920: 8,-71 + 2921: -4,-71 + 2922: -6,-71 + 2923: -8,-70 + 2924: -8,-69 + 2925: -7,-70 + 2926: -10,-71 + 2927: -12,-71 + 3250: -40,-30 + 3251: -41,-31 + 3252: -38,-30 + 3253: -38,-31 + 3254: -36,-31 + 3255: -38,-28 + 3256: -41,-27 + 3257: -38,-25 + 3258: -36,-26 + 3259: -39,-24 + 3260: -37,-22 + 3261: -35,-21 + 3262: -33,-21 + 3263: -33,-21 + 3264: -31,-22 + 3265: -29,-23 + 3311: -26,-35 + 3312: -26,-35 + 3313: -25,-35 + 3314: -27,-35 + 3315: -26,-33 + 3316: -27,-33 + 3317: -27,-31 + 3318: -28,-31 + 3319: -28,-32 + 3320: -29,-32 + 3321: -31,-31 + 3322: -30,-31 + 3323: -35,-31 + 3324: -26,-29 + 3325: -25,-30 + 3326: -25,-28 + 3327: -26,-28 + 3328: -28,-28 + 3329: -28,-27 + 3330: -28,-26 + 3331: -26,-25 + 3332: -25,-27 + 3333: -25,-27 + 3334: -23,-27 + 3335: -22,-27 + 3336: -21,-25 + 3475: 8,-58 + 3476: 7,-57 + 3477: 8,-54 + 3478: 7,-54 + 3479: 4,-54 + 3480: 5,-53 + 3481: 3,-53 + 3482: 3,-64 + 3483: 2,-63 + 3484: 5,-61 + 3485: 6,-61 + 3486: 4,-60 + 3487: 8,-64 + 3488: 6,-57 + 3489: 5,-57 + 3490: 5,-57 + 3491: 3,-57 + 3492: 4,-58 + 3493: 4,-56 + 3593: 53,-55 + 3601: 62,-56 + 3602: 58,-55 + 3603: 57,-56 + 3604: 59,-56 + 3605: 60,-56 + 3606: 54,-55 - node: cleanable: True zIndex: 1 @@ -2674,51 +2653,51 @@ entities: 2526: 0,-58 2527: -1,-58 2528: -1,-56 - 2758: -5,-70 - 2759: -6,-69 - 2760: -7,-68 - 2761: -1,-70 - 2762: 6,-70 - 2763: 6,-68 - 2764: 7,-69 - 3288: -37,-29 - 3289: -36,-28 - 3290: -36,-30 - 3291: -36,-27 - 3292: -37,-26 - 3293: -36,-25 - 3294: -36,-24 - 3295: -37,-24 - 3296: -36,-23 - 3297: -39,-22 - 3298: -41,-24 - 3299: -40,-24 - 3300: -41,-25 - 3301: -41,-26 - 3302: -32,-20 - 3303: -32,-19 - 3304: -34,-20 - 3305: -33,-20 - 3306: -28,-21 - 3307: -27,-23 - 3308: -26,-24 - 3309: -26,-26 - 3310: -27,-26 - 3311: -27,-27 - 3312: -27,-28 - 3313: -29,-37 - 3314: -29,-38 - 3315: -28,-38 - 3316: -26,-38 - 3317: -25,-36 - 3323: -28,-33 - 3324: -26,-36 - 3325: -27,-36 - 3326: -27,-33 - 3327: -28,-32 - 3613: 55,-53 - 3614: 64,-56 - 3615: 62,-55 + 2752: -5,-70 + 2753: -6,-69 + 2754: -7,-68 + 2755: -1,-70 + 2756: 6,-70 + 2757: 6,-68 + 2758: 7,-69 + 3271: -37,-29 + 3272: -36,-28 + 3273: -36,-30 + 3274: -36,-27 + 3275: -37,-26 + 3276: -36,-25 + 3277: -36,-24 + 3278: -37,-24 + 3279: -36,-23 + 3280: -39,-22 + 3281: -41,-24 + 3282: -40,-24 + 3283: -41,-25 + 3284: -41,-26 + 3285: -32,-20 + 3286: -32,-19 + 3287: -34,-20 + 3288: -33,-20 + 3289: -28,-21 + 3290: -27,-23 + 3291: -26,-24 + 3292: -26,-26 + 3293: -27,-26 + 3294: -27,-27 + 3295: -27,-28 + 3296: -29,-37 + 3297: -29,-38 + 3298: -28,-38 + 3299: -26,-38 + 3300: -25,-36 + 3306: -28,-33 + 3307: -26,-36 + 3308: -27,-36 + 3309: -27,-33 + 3310: -28,-32 + 3596: 55,-53 + 3597: 64,-56 + 3598: 62,-55 - node: color: '#FFFFFFFF' id: Flowersbr3 @@ -2760,22 +2739,22 @@ entities: color: '#52B4E937' id: FullTileOverlayGreyscale decals: - 3004: 42,-29 - 3005: 42,-28 - 3006: 43,-29 - 3007: 43,-28 - 3008: 44,-29 - 3009: 44,-28 - 3010: 45,-29 - 3011: 45,-28 - 3012: 46,-29 - 3013: 46,-28 - 3014: 45,-27 - 3015: 45,-26 - 3016: 45,-25 - 3017: 45,-24 - 3018: 44,-24 - 3019: 46,-24 + 2991: 42,-29 + 2992: 42,-28 + 2993: 43,-29 + 2994: 43,-28 + 2995: 44,-29 + 2996: 44,-28 + 2997: 45,-29 + 2998: 45,-28 + 2999: 46,-29 + 3000: 46,-28 + 3001: 45,-27 + 3002: 45,-26 + 3003: 45,-25 + 3004: 45,-24 + 3005: 44,-24 + 3006: 46,-24 - node: color: '#52B4E996' id: FullTileOverlayGreyscale @@ -2825,7 +2804,7 @@ entities: 1727: 57,-41 1728: 55,-41 1729: 53,-41 - 3171: 5,-33 + 3154: 5,-33 - node: color: '#DE3A3A2B' id: FullTileOverlayGreyscale @@ -2850,11 +2829,11 @@ entities: id: FullTileOverlayGreyscale decals: 2068: -2,25 - 2893: 1,-72 - 2894: 0,-72 - 2895: -1,-72 - 2896: -2,-72 - 2897: -3,-72 + 2880: 1,-72 + 2881: 0,-72 + 2882: -1,-72 + 2883: -2,-72 + 2884: -3,-72 - node: color: '#EFCF412B' id: FullTileOverlayGreyscale @@ -2907,20 +2886,20 @@ entities: id: Grassd1 decals: 1138: 46.57632,-52.483627 - 3361: 42,0 + 3344: 42,0 - node: color: '#FFFFFFFF' id: Grassd2 decals: 1137: 44.04507,-52.733627 - 3360: 44,0 + 3343: 44,0 - node: color: '#FFFFFFFF' id: Grassd3 decals: 491: -14.979541,-25.083757 1438: 2,48 - 3362: 43,0 + 3345: 43,0 - node: color: '#FFFFFFFF' id: Grasse1 @@ -2930,7 +2909,7 @@ entities: 1136: 43.29507,-52.358627 1437: 2,47 1439: -3,48 - 3358: 43,-1 + 3341: 43,-1 - node: color: '#FFFFFFFF' id: Grasse2 @@ -2942,7 +2921,7 @@ entities: 1434: 4,47 1435: -1,48 1451: -1,47 - 3359: 42,-1 + 3342: 42,-1 - node: color: '#FFFFFFFF' id: Grasse3 @@ -2952,7 +2931,7 @@ entities: 1338: 6.3967857,-23.96697 1433: 4,48 1436: -3,47 - 3357: 44,-1 + 3340: 44,-1 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale @@ -2981,10 +2960,10 @@ entities: 1564: 40,-23 2065: -4,28 2428: 34,-35 - 2984: 22,-35 - 2985: 21,-35 - 2986: 18,-35 - 2987: 19,-35 + 2971: 22,-35 + 2972: 21,-35 + 2973: 18,-35 + 2974: 19,-35 - node: color: '#9D9D97FF' id: HalfTileOverlayGreyscale @@ -3015,8 +2994,8 @@ entities: 2318: 5,28 2319: 28,-24 2320: 69,-18 - 3186: -32,-29 - 3187: -33,-29 + 3169: -32,-29 + 3170: -33,-29 - node: color: '#D381C996' id: HalfTileOverlayGreyscale @@ -3035,10 +3014,10 @@ entities: 1710: 53,-40 1711: 52,-40 1712: 51,-40 - 3157: 6,-34 - 3158: 5,-34 - 3159: 4,-34 - 3160: 3,-34 + 3140: 6,-34 + 3141: 5,-34 + 3142: 4,-34 + 3143: 3,-34 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale @@ -3075,11 +3054,11 @@ entities: 1103: 61,-18 1104: 62,-18 2096: 14,32 - 3565: -5,36 - 3566: -7,36 - 3567: -8,36 - 3568: -9,36 - 3569: -10,36 + 3548: -5,36 + 3549: -7,36 + 3550: -8,36 + 3551: -9,36 + 3552: -10,36 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale @@ -3161,8 +3140,8 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale180 decals: - 3188: -33,-32 - 3189: -32,-32 + 3171: -33,-32 + 3172: -32,-32 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 @@ -3188,13 +3167,13 @@ entities: 1721: 62,-42 1722: 63,-42 1723: 61,-42 - 3149: 5,-32 - 3163: 3,-37 - 3164: 4,-37 - 3165: 6,-37 - 3166: 5,-37 - 3644: 56,-42 - 3645: 58,-42 + 3132: 5,-32 + 3146: 3,-37 + 3147: 4,-37 + 3148: 6,-37 + 3149: 5,-37 + 3627: 56,-42 + 3628: 58,-42 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 @@ -3224,16 +3203,16 @@ entities: 1000: 81,-4 2094: 14,34 2099: 14,31 - 3572: -10,34 + 3555: -10,34 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale180 decals: 347: -2,23 - 2700: -2,-68 - 2701: -2,-69 - 2712: 2,-68 - 2713: 2,-70 + 2694: -2,-68 + 2695: -2,-69 + 2706: 2,-68 + 2707: 2,-70 - node: color: '#334E6D5A' id: HalfTileOverlayGreyscale270 @@ -3278,9 +3257,9 @@ entities: 2425: 35,-32 2426: 35,-33 2427: 35,-34 - 3076: 39,-49 - 3077: 39,-47 - 3078: 39,-46 + 3063: 39,-49 + 3064: 39,-47 + 3065: 39,-46 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale270 @@ -3310,7 +3289,7 @@ entities: 443: -42,-25 444: -42,-26 445: -42,-27 - 3180: -34,-30 + 3163: -34,-30 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 @@ -3319,8 +3298,8 @@ entities: 264: 65,-19 265: 65,-20 1731: 63,-41 - 3161: 2,-35 - 3162: 2,-36 + 3144: 2,-35 + 3145: 2,-36 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -3337,7 +3316,7 @@ entities: 1400: -12,39 1401: -12,40 1402: -12,41 - 3573: -11,35 + 3556: -11,35 - node: color: '#EFB34131' id: HalfTileOverlayGreyscale270 @@ -3414,15 +3393,15 @@ entities: 1112: -20,-18 1113: -20,-19 1114: -20,-20 - 3181: -31,-30 - 3208: -36,-32 - 3209: -36,-30 - 3210: -36,-29 - 3211: -36,-28 - 3212: -36,-27 - 3213: -36,-26 - 3214: -36,-25 - 3215: -36,-24 + 3164: -31,-30 + 3191: -36,-32 + 3192: -36,-30 + 3193: -36,-29 + 3194: -36,-28 + 3195: -36,-27 + 3196: -36,-26 + 3197: -36,-25 + 3198: -36,-24 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 @@ -3434,8 +3413,8 @@ entities: 268: 63,-21 269: 63,-22 1730: 51,-41 - 3155: 7,-36 - 3156: 7,-35 + 3138: 7,-36 + 3139: 7,-35 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 @@ -3467,17 +3446,17 @@ entities: 1068: 0,-27 2584: 4,-43 2585: 4,-42 - 2697: -3,-70 - 2698: -3,-69 - 2702: -1,-69 - 2703: -1,-70 - 2704: 0,-70 - 2705: 0,-69 - 2709: 1,-70 - 2710: 1,-69 - 2714: 3,-70 - 2715: 3,-69 - 2724: 5,-69 + 2691: -3,-70 + 2692: -3,-69 + 2696: -1,-69 + 2697: -1,-70 + 2698: 0,-70 + 2699: 0,-69 + 2703: 1,-70 + 2704: 1,-69 + 2708: 3,-70 + 2709: 3,-69 + 2718: 5,-69 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -3490,7 +3469,7 @@ entities: color: '#FFFFFFFF' id: LoadingArea decals: - 3655: 57,-52 + 3638: 57,-52 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -3523,8 +3502,8 @@ entities: color: '#5299B43A' id: QuarterTileOverlayGreyscale decals: - 3043: 36,-43 - 3044: 37,-42 + 3030: 36,-43 + 3031: 37,-42 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale @@ -3693,37 +3672,37 @@ entities: 2183: -18,-6 2184: -18,-5 2185: -18,-4 - 2774: 19,12 - 2775: 19,13 - 2776: 19,14 - 2777: 19,15 - 2778: 20,15 - 2779: 21,15 - 2780: 22,15 - 2781: 23,15 - 2808: 8,17 - 2809: 8,16 - 2810: 8,15 - 2811: 8,14 - 2812: 8,13 - 2813: 8,12 - 2814: 8,10 - 2815: 8,11 - 2816: 8,9 - 2817: 8,8 - 2818: 8,7 - 2819: 8,6 - 2820: 8,5 - 2821: 8,4 - 2822: 8,3 - 3116: -47,-9 - 3117: -47,-8 - 3118: -47,-7 - 3119: -47,-6 - 3120: -46,-6 - 3121: -45,-6 - 3122: -44,-6 - 3123: -43,-6 + 2768: 19,12 + 2769: 19,13 + 2770: 19,14 + 2771: 19,15 + 2772: 20,15 + 2773: 21,15 + 2774: 22,15 + 2775: 23,15 + 2802: 8,17 + 2803: 8,16 + 2804: 8,15 + 2805: 8,14 + 2806: 8,13 + 2807: 8,12 + 2808: 8,10 + 2809: 8,11 + 2810: 8,9 + 2811: 8,8 + 2812: 8,7 + 2813: 8,6 + 2814: 8,5 + 2815: 8,4 + 2816: 8,3 + 3099: -47,-9 + 3100: -47,-8 + 3101: -47,-7 + 3102: -47,-6 + 3103: -46,-6 + 3104: -45,-6 + 3105: -44,-6 + 3106: -43,-6 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale @@ -3811,27 +3790,27 @@ entities: 2590: 6,-44 2591: 6,-42 2592: 6,-43 - 2666: -18,-69 - 2667: -17,-69 - 2668: -16,-69 - 2669: -15,-69 - 2670: -14,-69 - 2671: -13,-69 - 2672: -12,-69 - 2673: -11,-69 - 2674: -10,-69 - 3431: 1,-64 - 3432: 1,-63 - 3433: 1,-62 - 3434: 1,-61 - 3435: 1,-60 - 3436: 2,-60 - 3437: 3,-60 - 3455: 2,-52 - 3456: 2,-53 - 3457: 2,-54 - 3458: 3,-56 - 3459: 3,-55 + 2660: -18,-69 + 2661: -17,-69 + 2662: -16,-69 + 2663: -15,-69 + 2664: -14,-69 + 2665: -13,-69 + 2666: -12,-69 + 2667: -11,-69 + 2668: -10,-69 + 3414: 1,-64 + 3415: 1,-63 + 3416: 1,-62 + 3417: 1,-61 + 3418: 1,-60 + 3419: 2,-60 + 3420: 3,-60 + 3438: 2,-52 + 3439: 2,-53 + 3440: 2,-54 + 3441: 3,-56 + 3442: 3,-55 - node: color: '#F5DB9E96' id: QuarterTileOverlayGreyscale @@ -3888,8 +3867,8 @@ entities: color: '#5299B43A' id: QuarterTileOverlayGreyscale180 decals: - 3045: 34,-41 - 3046: 35,-40 + 3032: 34,-41 + 3033: 35,-40 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 @@ -3913,7 +3892,7 @@ entities: 919: 41,-15 1555: 36,-25 1637: 39,-15 - 2960: 38,-15 + 2947: 38,-15 - node: color: '#9D9D97FF' id: QuarterTileOverlayGreyscale180 @@ -3953,20 +3932,20 @@ entities: color: '#9FED5896' id: QuarterTileOverlayGreyscale180 decals: - 3153: 3,-32 - 3154: 2,-32 + 3136: 3,-32 + 3137: 2,-32 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 decals: 188: -31,-17 428: -27,-28 - 3216: -36,-23 - 3217: -35,-23 - 3218: -34,-23 - 3219: -32,-23 - 3220: -31,-23 - 3221: -33,-23 + 3199: -36,-23 + 3200: -35,-23 + 3201: -34,-23 + 3202: -32,-23 + 3203: -31,-23 + 3204: -33,-23 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale180 @@ -3984,7 +3963,7 @@ entities: 2381: -27,-39 2382: -28,-39 2383: -29,-39 - 3150: 4,-32 + 3133: 4,-32 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 @@ -4017,8 +3996,8 @@ entities: 2176: 0,-32 2177: 1,-32 2179: 7,-32 - 2786: 27,8 - 2787: 27,9 + 2780: 27,8 + 2781: 27,9 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale180 @@ -4074,29 +4053,29 @@ entities: 933: 0,-40 2504: 0,-58 2505: 1,-58 - 2675: -10,-71 - 2676: -11,-71 - 2677: -12,-71 - 2678: -13,-71 - 2679: -14,-71 - 2680: -15,-71 - 2681: -16,-71 - 2682: -17,-71 - 2683: -18,-71 - 2699: -3,-68 - 2706: -1,-68 - 2707: 0,-68 - 2711: 1,-68 - 2716: 3,-68 - 2720: 4,-70 - 2721: 4,-68 - 2722: 5,-70 - 2723: 5,-68 - 3438: 9,-64 - 3439: 9,-63 - 3440: 9,-62 - 3441: 9,-61 - 3442: 9,-60 + 2669: -10,-71 + 2670: -11,-71 + 2671: -12,-71 + 2672: -13,-71 + 2673: -14,-71 + 2674: -15,-71 + 2675: -16,-71 + 2676: -17,-71 + 2677: -18,-71 + 2693: -3,-68 + 2700: -1,-68 + 2701: 0,-68 + 2705: 1,-68 + 2710: 3,-68 + 2714: 4,-70 + 2715: 4,-68 + 2716: 5,-70 + 2717: 5,-68 + 3421: 9,-64 + 3422: 9,-63 + 3423: 9,-62 + 3424: 9,-61 + 3425: 9,-60 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 @@ -4129,8 +4108,8 @@ entities: color: '#5299B43A' id: QuarterTileOverlayGreyscale270 decals: - 3047: 36,-40 - 3048: 37,-41 + 3034: 36,-40 + 3035: 37,-41 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale270 @@ -4166,9 +4145,9 @@ entities: 1853: -66,-6 2278: -78,-6 2279: -79,-6 - 3354: 12,-32 - 3355: 11,-32 - 3356: 10,-32 + 3337: 12,-32 + 3338: 11,-32 + 3339: 10,-32 - node: color: '#79150096' id: QuarterTileOverlayGreyscale270 @@ -4217,8 +4196,8 @@ entities: 732: 38,-59 733: 38,-58 734: 38,-57 - 3152: 7,-32 - 3410: 8,-32 + 3135: 7,-32 + 3393: 8,-32 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale270 @@ -4260,7 +4239,7 @@ entities: 1550: 50,-27 1671: 56,-15 1674: 59,-15 - 3151: 6,-32 + 3134: 6,-32 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale270 @@ -4318,15 +4297,15 @@ entities: 2339: 51,-10 2340: 51,-9 2344: 46,-12 - 2788: 23,8 - 2789: 22,8 - 2790: 21,8 - 2791: 20,8 - 2792: 20,9 - 2793: 19,9 - 3403: 14,-27 - 3404: 14,-26 - 3405: 14,-25 + 2782: 23,8 + 2783: 22,8 + 2784: 21,8 + 2785: 20,8 + 2786: 20,9 + 2787: 19,9 + 3386: 14,-27 + 3387: 14,-26 + 3388: 14,-25 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale270 @@ -4399,8 +4378,8 @@ entities: 2501: -4,-58 2502: -3,-58 2503: -2,-58 - 2708: 0,-70 - 2717: 4,-69 + 2702: 0,-70 + 2711: 4,-69 - node: color: '#F5DB9E96' id: QuarterTileOverlayGreyscale270 @@ -4428,8 +4407,8 @@ entities: color: '#5299B43A' id: QuarterTileOverlayGreyscale90 decals: - 3049: 35,-43 - 3050: 34,-42 + 3036: 35,-43 + 3037: 34,-42 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale90 @@ -4466,10 +4445,10 @@ entities: 2369: -24,-37 2370: -24,-38 2371: -24,-39 - 3222: -31,-19 - 3223: -32,-19 - 3224: -33,-19 - 3225: -34,-19 + 3205: -31,-19 + 3206: -32,-19 + 3207: -33,-19 + 3208: -34,-19 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 @@ -4580,39 +4559,39 @@ entities: 2346: 44,-13 2347: 43,-13 2348: 42,-13 - 2782: 25,15 - 2783: 26,15 - 2784: 27,15 - 2785: 27,14 - 2794: 17,12 - 2795: 16,12 - 2796: 15,12 - 2797: 14,12 - 2798: 13,12 - 2799: 12,12 - 2800: 11,12 - 2801: 10,12 - 2802: 9,12 - 2803: 9,13 - 2804: 9,14 - 2805: 9,15 - 2806: 9,16 - 2807: 9,17 - 3124: -42,-6 - 3125: -41,-6 - 3126: -40,-6 - 3127: -40,-6 - 3128: -39,-6 - 3129: -38,-6 - 3130: -38,-7 - 3131: -38,-8 - 3132: -38,-9 - 3133: -38,-10 - 3134: -38,-11 - 3135: -38,-12 - 3136: -38,-13 - 3137: -38,-14 - 3409: 8,-30 + 2776: 25,15 + 2777: 26,15 + 2778: 27,15 + 2779: 27,14 + 2788: 17,12 + 2789: 16,12 + 2790: 15,12 + 2791: 14,12 + 2792: 13,12 + 2793: 12,12 + 2794: 11,12 + 2795: 10,12 + 2796: 9,12 + 2797: 9,13 + 2798: 9,14 + 2799: 9,15 + 2800: 9,16 + 2801: 9,17 + 3107: -42,-6 + 3108: -41,-6 + 3109: -40,-6 + 3110: -40,-6 + 3111: -39,-6 + 3112: -38,-6 + 3113: -38,-7 + 3114: -38,-8 + 3115: -38,-9 + 3116: -38,-10 + 3117: -38,-11 + 3118: -38,-12 + 3119: -38,-13 + 3120: -38,-14 + 3392: 8,-30 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale90 @@ -4704,20 +4683,20 @@ entities: 2510: 0,-53 2511: 0,-52 2589: 4,-44 - 2718: 4,-69 - 2719: 4,-70 - 3443: 9,-58 - 3444: 9,-57 - 3445: 9,-56 - 3446: 9,-55 - 3447: 9,-54 - 3448: 9,-53 - 3449: 9,-52 - 3450: 8,-52 - 3451: 7,-52 - 3452: 6,-52 - 3453: 5,-52 - 3454: 4,-52 + 2712: 4,-69 + 2713: 4,-70 + 3426: 9,-58 + 3427: 9,-57 + 3428: 9,-56 + 3429: 9,-55 + 3430: 9,-54 + 3431: 9,-53 + 3432: 9,-52 + 3433: 8,-52 + 3434: 7,-52 + 3435: 6,-52 + 3436: 5,-52 + 3437: 4,-52 - node: color: '#F9FFFEFF' id: Remains @@ -4773,7 +4752,7 @@ entities: color: '#5299B43A' id: ThreeQuarterTileOverlayGreyscale decals: - 3042: 36,-42 + 3029: 36,-42 - node: color: '#52B4E931' id: ThreeQuarterTileOverlayGreyscale @@ -4799,7 +4778,7 @@ entities: id: ThreeQuarterTileOverlayGreyscale decals: 430: -30,-36 - 3183: -34,-29 + 3166: -34,-29 - node: color: '#D381C934' id: ThreeQuarterTileOverlayGreyscale @@ -4809,7 +4788,7 @@ entities: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale decals: - 3170: 2,-34 + 3153: 2,-34 - node: color: '#DE3A3A2B' id: ThreeQuarterTileOverlayGreyscale @@ -4822,7 +4801,7 @@ entities: 396: -62,5 985: 76,-2 1096: 57,-17 - 3570: -11,36 + 3553: -11,36 - node: color: '#EFB34131' id: ThreeQuarterTileOverlayGreyscale @@ -4838,7 +4817,7 @@ entities: color: '#5299B43A' id: ThreeQuarterTileOverlayGreyscale180 decals: - 3041: 35,-41 + 3028: 35,-41 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 @@ -4861,7 +4840,7 @@ entities: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale180 decals: - 3185: -31,-32 + 3168: -31,-32 - node: color: '#D381C934' id: ThreeQuarterTileOverlayGreyscale180 @@ -4872,7 +4851,7 @@ entities: id: ThreeQuarterTileOverlayGreyscale180 decals: 883: 71,-16 - 3169: 7,-37 + 3152: 7,-37 - node: color: '#DE3A3A2B' id: ThreeQuarterTileOverlayGreyscale180 @@ -4890,12 +4869,12 @@ entities: decals: 343: -1,23 1065: 0,-28 - 3429: 1,-26 + 3412: 1,-26 - node: color: '#5299B43A' id: ThreeQuarterTileOverlayGreyscale270 decals: - 3039: 36,-41 + 3026: 36,-41 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 @@ -4903,7 +4882,7 @@ entities: 335: -11,23 1543: 48,-29 2411: 28,-37 - 3075: 39,-50 + 3062: 39,-50 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale270 @@ -4915,7 +4894,7 @@ entities: id: ThreeQuarterTileOverlayGreyscale270 decals: 429: -30,-39 - 3184: -34,-32 + 3167: -34,-32 - node: color: '#D381C934' id: ThreeQuarterTileOverlayGreyscale270 @@ -4926,7 +4905,7 @@ entities: id: ThreeQuarterTileOverlayGreyscale270 decals: 882: 61,-16 - 3168: 2,-37 + 3151: 2,-37 - node: color: '#DE3A3A2B' id: ThreeQuarterTileOverlayGreyscale270 @@ -4938,14 +4917,14 @@ entities: decals: 393: -62,3 988: 76,-4 - 3571: -11,34 + 3554: -11,34 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale270 decals: 344: -3,23 1066: -2,-28 - 3430: -3,-26 + 3413: -3,-26 - node: color: '#334E6D5A' id: ThreeQuarterTileOverlayGreyscale90 @@ -4956,7 +4935,7 @@ entities: color: '#5299B43A' id: ThreeQuarterTileOverlayGreyscale90 decals: - 3040: 35,-42 + 3027: 35,-42 - node: color: '#52B4E931' id: ThreeQuarterTileOverlayGreyscale90 @@ -4984,7 +4963,7 @@ entities: id: ThreeQuarterTileOverlayGreyscale90 decals: 1110: -20,-16 - 3182: -31,-29 + 3165: -31,-29 - node: color: '#D381C934' id: ThreeQuarterTileOverlayGreyscale90 @@ -4994,7 +4973,7 @@ entities: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 3167: 7,-34 + 3150: 7,-34 - node: color: '#DE3A3A2B' id: ThreeQuarterTileOverlayGreyscale90 @@ -5060,46 +5039,46 @@ entities: color: '#FFFFFFFF' id: WarnCornerGreyscaleNE decals: - 2964: 42,-18 + 2951: 42,-18 - node: color: '#FFFFFFFF' id: WarnCornerGreyscaleSE decals: - 2907: 9,-71 + 2894: 9,-71 - node: color: '#FFFFFFFF' id: WarnCornerGreyscaleSW decals: - 2908: -8,-71 + 2895: -8,-71 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 3532: 23,19 + 3515: 23,19 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 3533: 25,19 + 3516: 25,19 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: 1608: 19,-19 - 3530: 23,17 + 3513: 23,17 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: 1615: 21,-21 - 3534: 25,17 + 3517: 25,17 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleNE decals: 1282: 44,-21 1283: 46,-21 - 2966: 42,-21 + 2953: 42,-21 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleNW @@ -5113,8 +5092,8 @@ entities: 1073: -3,-30 1665: 51,-21 2314: -73,-4 - 3109: 13,-77 - 3529: -13,-63 + 3093: 13,-77 + 3512: -13,-63 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW @@ -5127,8 +5106,8 @@ entities: 2291: -79,-6 2312: -69,-4 2313: -76,-4 - 3108: 17,-77 - 3528: -11,-63 + 3092: 17,-77 + 3511: -11,-63 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE @@ -5138,7 +5117,7 @@ entities: 1663: 51,-17 2041: 22,-90 2317: -73,8 - 3107: 13,-75 + 3091: 13,-75 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW @@ -5154,12 +5133,12 @@ entities: 2290: -79,-4 2315: -69,8 2316: -76,8 - 3110: 17,-75 + 3094: 17,-75 - node: color: '#FFFFFFFF' id: WarnEndGreyscaleN decals: - 3363: 46,-17 + 3346: 46,-17 - node: color: '#DE3A3A96' id: WarnFullGreyscale @@ -5204,9 +5183,9 @@ entities: 2040: 22,-91 2476: 8,-49 2477: 8,-48 - 3105: 13,-76 - 3527: -13,-62 - 3531: 23,18 + 3089: 13,-76 + 3510: -13,-62 + 3514: 23,18 - node: color: '#334E6DC8' id: WarnLineGreyscaleE @@ -5217,7 +5196,7 @@ entities: color: '#52B4E996' id: WarnLineGreyscaleE decals: - 3020: 42,-24 + 3007: 42,-24 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleE @@ -5229,9 +5208,9 @@ entities: 1275: 44,-19 1276: 44,-18 1277: 44,-17 - 2665: -10,-75 - 2962: 42,-20 - 2963: 42,-19 + 2659: -10,-75 + 2949: 42,-20 + 2950: 42,-19 - node: color: '#334E6DC8' id: WarnLineGreyscaleN @@ -5242,7 +5221,7 @@ entities: id: WarnLineGreyscaleN decals: 1563: 41,-23 - 2961: 38,-22 + 2948: 38,-22 - node: color: '#A4610696' id: WarnLineGreyscaleN @@ -5266,12 +5245,12 @@ entities: 1398: -24,45 2243: -8,27 2244: -9,27 - 3548: -12,27 + 3531: -12,27 - node: color: '#EFB34196' id: WarnLineGreyscaleN decals: - 2898: -7,-68 + 2885: -7,-68 - node: color: '#F5DB9E96' id: WarnLineGreyscaleN @@ -5290,15 +5269,15 @@ entities: 2487: -2,-35 2512: 0,-52 2513: -2,-52 - 2692: 9,-73 - 2693: 8,-73 - 2694: 3,-73 - 2695: 4,-73 - 2823: 8,16 - 2824: 9,16 - 2902: 3,-66 - 2903: 8,-66 - 2965: 41,-18 + 2686: 9,-73 + 2687: 8,-73 + 2688: 3,-73 + 2689: 4,-73 + 2817: 8,16 + 2818: 9,16 + 2889: 3,-66 + 2890: 8,-66 + 2952: 41,-18 - node: color: '#334E6DC8' id: WarnLineGreyscaleS @@ -5338,10 +5317,10 @@ entities: 1393: -6,43 2092: 6,26 2093: 4,26 - 3538: -9,34 - 3539: -8,34 - 3547: -14,26 - 3583: -15,34 + 3521: -9,34 + 3522: -8,34 + 3530: -14,26 + 3566: -15,34 - node: color: '#EFB34196' id: WarnLineGreyscaleS @@ -5358,21 +5337,21 @@ entities: 2488: 0,-33 2489: -1,-33 2490: -2,-33 - 2688: 9,-76 - 2689: 5,-76 - 2690: 4,-76 - 2691: 3,-76 - 2904: 3,-71 - 2905: 4,-71 - 2906: 8,-71 - 2911: -7,-71 - 2912: -6,-71 - 2913: -5,-71 - 3364: 46,-21 - 3365: 45,-21 - 3366: 44,-21 - 3367: 43,-21 - 3368: 42,-21 + 2682: 9,-76 + 2683: 5,-76 + 2684: 4,-76 + 2685: 3,-76 + 2891: 3,-71 + 2892: 4,-71 + 2893: 8,-71 + 2898: -7,-71 + 2899: -6,-71 + 2900: -5,-71 + 3347: 46,-21 + 3348: 45,-21 + 3349: 44,-21 + 3350: 43,-21 + 3351: 42,-21 - node: color: '#EFB34196' id: WarnLineGreyscaleW @@ -5392,9 +5371,9 @@ entities: 2395: 75,-15 2396: 75,-14 2397: 75,-13 - 2664: -8,-75 - 2909: -8,-69 - 2910: -8,-70 + 2658: -8,-75 + 2896: -8,-69 + 2897: -8,-70 - node: color: '#FFFFFFFF' id: WarnLineN @@ -5462,21 +5441,14 @@ entities: 2465: 11,-46 2466: 10,-46 2467: 9,-46 - 2606: 1,-79 - 2607: 0,-79 - 2608: -1,-79 - 2609: -2,-79 - 2610: -3,-79 - 2825: 18,-87 - 2826: 17,-87 - 2827: 16,-87 - 2828: 15,-87 - 2829: 14,-87 - 2830: 13,-87 - 2831: 12,-87 - 3102: 14,-75 - 3103: 15,-75 - 3104: 16,-75 + 2600: 1,-79 + 2601: 0,-79 + 2602: -1,-79 + 2603: -2,-79 + 2604: -3,-79 + 3086: 14,-75 + 3087: 15,-75 + 3088: 16,-75 - node: color: '#FFFFFFFF' id: WarnLineS @@ -5537,12 +5509,12 @@ entities: 2393: -30,-39 2474: 8,-49 2475: 8,-48 - 3106: 17,-76 - 3526: -11,-62 - 3535: 25,18 - 3584: -11,34 - 3585: -11,35 - 3586: -11,36 + 3090: 17,-76 + 3509: -11,-62 + 3518: 25,18 + 3567: -11,34 + 3568: -11,35 + 3569: -11,36 - node: color: '#FFFFFFFF' id: WarnLineW @@ -5618,70 +5590,70 @@ entities: 2471: 11,-46 2472: 10,-46 2473: 9,-46 - 2832: 13,-84 - 2833: 14,-84 - 2834: 15,-84 - 2835: 16,-84 - 2836: 17,-84 - 2837: 18,-84 - 3099: 14,-77 - 3100: 15,-77 - 3101: 16,-77 - 3525: -12,-63 + 2819: 13,-84 + 2820: 14,-84 + 2821: 15,-84 + 2822: 16,-84 + 2823: 17,-84 + 2824: 18,-84 + 3083: 14,-77 + 3084: 15,-77 + 3085: 16,-77 + 3508: -12,-63 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 3201: -31,-25 - 3415: 12,-26 + 3184: -31,-25 + 3398: 12,-26 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 3204: -34,-25 - 3422: 6,-26 + 3187: -34,-25 + 3405: 6,-26 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: 2443: 12,-37 - 3416: 12,-27 + 3399: 12,-27 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: 2444: 10,-37 - 3421: 6,-27 + 3404: 6,-27 - node: color: '#FFFFFFFF' id: WoodTrimThinEndN decals: - 3412: 9,-25 + 3395: 9,-25 - node: color: '#FFFFFFFF' id: WoodTrimThinEndS decals: - 3411: 9,-28 + 3394: 9,-28 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNe decals: - 3428: 9,-26 + 3411: 9,-26 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw decals: - 3427: 9,-26 + 3410: 9,-26 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSe decals: - 3426: 9,-27 + 3409: 9,-27 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 3425: 9,-27 + 3408: 9,-27 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE @@ -5694,17 +5666,17 @@ entities: 1233: 11,-15 1234: 11,-14 1235: 11,-13 - 2971: 12,-36 - 3198: -31,-28 - 3199: -31,-27 - 3200: -31,-26 - 3518: -12,-28 - 3519: -12,-27 - 3520: -12,-26 - 3521: -12,-25 - 3522: -12,-24 - 3523: -12,-23 - 3524: -12,-22 + 2958: 12,-36 + 3181: -31,-28 + 3182: -31,-27 + 3183: -31,-26 + 3501: -12,-28 + 3502: -12,-27 + 3503: -12,-26 + 3504: -12,-25 + 3505: -12,-24 + 3506: -12,-23 + 3507: -12,-22 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -5728,16 +5700,16 @@ entities: 1642: 55,-38 1643: 56,-38 1644: 57,-38 - 3194: -34,-29 - 3195: -33,-29 - 3196: -32,-29 - 3197: -31,-29 - 3202: -32,-25 - 3203: -33,-25 - 3413: 10,-26 - 3414: 11,-26 - 3423: 7,-26 - 3424: 8,-26 + 3177: -34,-29 + 3178: -33,-29 + 3179: -32,-29 + 3180: -31,-29 + 3185: -32,-25 + 3186: -33,-25 + 3396: 10,-26 + 3397: 11,-26 + 3406: 7,-26 + 3407: 8,-26 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS @@ -5752,27 +5724,27 @@ entities: 1351: -15,53 1352: -16,53 2445: 11,-37 - 3417: 11,-27 - 3418: 10,-27 - 3419: 8,-27 - 3420: 7,-27 + 3400: 11,-27 + 3401: 10,-27 + 3402: 8,-27 + 3403: 7,-27 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 2838: 32,-1 - 2839: 32,0 - 2972: 10,-36 - 3205: -34,-28 - 3206: -34,-27 - 3207: -34,-26 - 3511: -8,-28 - 3512: -8,-27 - 3513: -8,-26 - 3514: -8,-25 - 3515: -8,-24 - 3516: -8,-23 - 3517: -8,-22 + 2825: 32,-1 + 2826: 32,0 + 2959: 10,-36 + 3188: -34,-28 + 3189: -34,-27 + 3190: -34,-26 + 3494: -8,-28 + 3495: -8,-27 + 3496: -8,-26 + 3497: -8,-25 + 3498: -8,-24 + 3499: -8,-23 + 3500: -8,-22 - node: color: '#FFFFFFFF' id: bushsnowa2 @@ -5797,9 +5769,9 @@ entities: color: '#FFFFFFFF' id: thinline decals: - 3661: 32.88275,8.297449 - 3662: 32.88275,9.188074 - 3663: 32.88275,10.078699 + 3644: 32.88275,8.297449 + 3645: 32.88275,9.188074 + 3646: 32.88275,10.078699 - type: GridAtmosphere version: 2 data: @@ -6453,7 +6425,8 @@ entities: 0,8: 0: 65535 0,9: - 0: 65535 + 0: 32767 + 3: 32768 0,10: 0: 65535 0,11: @@ -6461,7 +6434,8 @@ entities: 1,8: 0: 65535 1,9: - 0: 65535 + 0: 61439 + 3: 4096 1,10: 0: 65535 1,11: @@ -6540,7 +6514,7 @@ entities: 0: 52462 8,0: 0: 65527 - 3: 8 + 4: 8 8,1: 0: 65295 8,2: @@ -6548,7 +6522,7 @@ entities: 8,3: 0: 65535 9,0: - 3: 15 + 4: 15 0: 65520 9,1: 0: 65487 @@ -6557,7 +6531,7 @@ entities: 9,3: 0: 32767 10,0: - 3: 1 + 4: 1 0: 65534 10,1: 0: 65535 @@ -6901,7 +6875,7 @@ entities: 0: 65535 8,-1: 0: 30591 - 3: 34944 + 4: 34944 9,-4: 0: 65535 9,-3: @@ -6910,7 +6884,7 @@ entities: 0: 65535 9,-1: 0: 15 - 3: 65520 + 4: 65520 10,-4: 0: 65535 10,-3: @@ -6919,7 +6893,7 @@ entities: 0: 65535 10,-1: 0: 61167 - 3: 4368 + 4: 4368 11,-4: 0: 65535 11,-3: @@ -7746,7 +7720,7 @@ entities: 0: 65535 4,-17: 0: 34959 - 4: 30576 + 5: 30576 5,-20: 0: 62813 5,-19: @@ -7946,14 +7920,15 @@ entities: 2,-17: 0: 65535 3,-20: - 0: 65535 + 0: 64511 + 6: 1024 3,-19: 0: 65535 3,-18: 0: 65535 3,-17: 0: 34959 - 5: 30576 + 7: 30576 0,-24: 0: 65416 0,-23: @@ -7981,7 +7956,8 @@ entities: 3,-23: 0: 61440 3,-22: - 0: 65535 + 0: 63487 + 8: 2048 -4,-24: 0: 310 -4,-23: @@ -8309,7 +8285,8 @@ entities: -10,-9: 0: 63624 4,-20: - 0: 65535 + 0: 65279 + 6: 256 5,-18: 0: 4607 -16,5: @@ -8425,11 +8402,14 @@ entities: 2,-24: 0: 12544 3,-21: - 0: 65535 + 0: 64511 + 9: 1024 4,-22: 0: 65535 4,-21: - 0: 65535 + 6: 1 + 0: 65278 + 9: 256 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -8476,6 +8456,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 235 moles: @@ -8506,6 +8501,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14987 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -8521,6 +8531,36 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.14993 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: Joint joints: @@ -11408,7 +11448,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -1003.90155 + secondsUntilStateChange: -3331.5208 state: Opening - type: DeviceLinkSource lastSignals: @@ -14671,6 +14711,17 @@ entities: rot: 1.5707963267948966 rad pos: 87.5,-3.5 parent: 8364 + - uid: 7209 + components: + - type: Transform + pos: 36.5,-3.5 + parent: 8364 + - uid: 9934 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 41.5,-0.5 + parent: 8364 - uid: 12475 components: - type: Transform @@ -14689,6 +14740,12 @@ entities: rot: 3.141592653589793 rad pos: -70.5,-2.5 parent: 8364 + - uid: 13399 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 36.5,1.5 + parent: 8364 - uid: 13779 components: - type: Transform @@ -14740,23 +14797,6 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 11906 -- proto: AtmosDeviceFanTiny - entities: - - uid: 7209 - components: - - type: Transform - pos: 36.5,-3.5 - parent: 8364 - - uid: 9934 - components: - - type: Transform - pos: 36.5,1.5 - parent: 8364 - - uid: 13399 - components: - - type: Transform - pos: 41.5,-0.5 - parent: 8364 - proto: AtmosFixBlockerMarker entities: - uid: 110 @@ -17003,6 +17043,11 @@ entities: - type: Transform pos: 9.5,-77.5 parent: 8364 + - uid: 144 + components: + - type: Transform + pos: 14.5,-77.5 + parent: 8364 - uid: 346 components: - type: Transform @@ -17608,6 +17653,11 @@ entities: - type: Transform pos: 34.5,-64.5 parent: 8364 + - uid: 3681 + components: + - type: Transform + pos: 11.5,-74.5 + parent: 8364 - uid: 3699 components: - type: Transform @@ -17666,12 +17716,12 @@ entities: - uid: 3735 components: - type: Transform - pos: 18.5,-84.5 + pos: 11.5,-72.5 parent: 8364 - uid: 3736 components: - type: Transform - pos: 18.5,-85.5 + pos: 11.5,-71.5 parent: 8364 - uid: 3745 components: @@ -17698,16 +17748,46 @@ entities: - type: Transform pos: 4.5,-70.5 parent: 8364 + - uid: 3820 + components: + - type: Transform + pos: 11.5,-79.5 + parent: 8364 + - uid: 3822 + components: + - type: Transform + pos: 11.5,-73.5 + parent: 8364 + - uid: 3823 + components: + - type: Transform + pos: 11.5,-77.5 + parent: 8364 + - uid: 3826 + components: + - type: Transform + pos: 12.5,-77.5 + parent: 8364 - uid: 3827 components: - type: Transform pos: 5.5,-70.5 parent: 8364 + - uid: 3828 + components: + - type: Transform + pos: 12.5,-71.5 + parent: 8364 - uid: 3839 components: - type: Transform pos: -13.5,-68.5 parent: 8364 + - uid: 3864 + components: + - type: Transform + pos: 11.5,-80.5 + parent: 8364 - uid: 3879 components: - type: Transform @@ -17778,20 +17858,35 @@ entities: - type: Transform pos: 2.5,-63.5 parent: 8364 + - uid: 4005 + components: + - type: Transform + pos: 13.5,-77.5 + parent: 8364 - uid: 4031 components: - type: Transform pos: -19.5,-72.5 parent: 8364 + - uid: 4032 + components: + - type: Transform + pos: 11.5,-78.5 + parent: 8364 - uid: 4040 components: - type: Transform pos: 26.5,-71.5 parent: 8364 + - uid: 4042 + components: + - type: Transform + pos: 11.5,-76.5 + parent: 8364 - uid: 4048 components: - type: Transform - pos: 12.5,-81.5 + pos: 11.5,-75.5 parent: 8364 - uid: 4058 components: @@ -17836,7 +17931,7 @@ entities: - uid: 4699 components: - type: Transform - pos: 12.5,-79.5 + pos: 18.5,-77.5 parent: 8364 - uid: 4710 components: @@ -27578,11 +27673,6 @@ entities: - type: Transform pos: -2.5,11.5 parent: 8364 - - uid: 13665 - components: - - type: Transform - pos: 12.5,-80.5 - parent: 8364 - uid: 13693 components: - type: Transform @@ -32238,11 +32328,6 @@ entities: - type: Transform pos: 13.5,-71.5 parent: 8364 - - uid: 16825 - components: - - type: Transform - pos: 18.5,-86.5 - parent: 8364 - uid: 16833 components: - type: Transform @@ -32313,16 +32398,6 @@ entities: - type: Transform pos: 6.5,-53.5 parent: 8364 - - uid: 16914 - components: - - type: Transform - pos: 19.5,-78.5 - parent: 8364 - - uid: 16915 - components: - - type: Transform - pos: 19.5,-75.5 - parent: 8364 - uid: 16917 components: - type: Transform @@ -32398,11 +32473,6 @@ entities: - type: Transform pos: 10.5,-46.5 parent: 8364 - - uid: 17002 - components: - - type: Transform - pos: 19.5,-79.5 - parent: 8364 - uid: 17016 components: - type: Transform @@ -32448,11 +32518,6 @@ entities: - type: Transform pos: 7.5,-45.5 parent: 8364 - - uid: 17088 - components: - - type: Transform - pos: 18.5,-81.5 - parent: 8364 - uid: 17096 components: - type: Transform @@ -32703,11 +32768,6 @@ entities: - type: Transform pos: 7.5,-50.5 parent: 8364 - - uid: 17383 - components: - - type: Transform - pos: 12.5,-74.5 - parent: 8364 - uid: 17392 components: - type: Transform @@ -33003,16 +33063,6 @@ entities: - type: Transform pos: 5.5,-49.5 parent: 8364 - - uid: 17570 - components: - - type: Transform - pos: 19.5,-81.5 - parent: 8364 - - uid: 17571 - components: - - type: Transform - pos: 19.5,-80.5 - parent: 8364 - uid: 17596 components: - type: Transform @@ -33038,11 +33088,6 @@ entities: - type: Transform pos: -16.5,-71.5 parent: 8364 - - uid: 17781 - components: - - type: Transform - pos: 19.5,-74.5 - parent: 8364 - uid: 17782 components: - type: Transform @@ -35158,11 +35203,6 @@ entities: - type: Transform pos: 41.5,-24.5 parent: 8364 - - uid: 18758 - components: - - type: Transform - pos: 12.5,-72.5 - parent: 8364 - uid: 18760 components: - type: Transform @@ -36493,11 +36533,6 @@ entities: - type: Transform pos: 77.5,-57.5 parent: 8364 - - uid: 20006 - components: - - type: Transform - pos: 18.5,-82.5 - parent: 8364 - uid: 20014 components: - type: Transform @@ -38328,21 +38363,6 @@ entities: - type: Transform pos: 17.5,31.5 parent: 8364 - - uid: 22758 - components: - - type: Transform - pos: 12.5,-77.5 - parent: 8364 - - uid: 22764 - components: - - type: Transform - pos: 12.5,-76.5 - parent: 8364 - - uid: 22770 - components: - - type: Transform - pos: 12.5,-75.5 - parent: 8364 - uid: 22818 components: - type: Transform @@ -38368,11 +38388,6 @@ entities: - type: Transform pos: 25.5,-71.5 parent: 8364 - - uid: 22858 - components: - - type: Transform - pos: 18.5,-77.5 - parent: 8364 - uid: 22931 components: - type: Transform @@ -38398,21 +38413,6 @@ entities: - type: Transform pos: 18.5,-71.5 parent: 8364 - - uid: 22975 - components: - - type: Transform - pos: 12.5,-78.5 - parent: 8364 - - uid: 22976 - components: - - type: Transform - pos: 12.5,-73.5 - parent: 8364 - - uid: 22977 - components: - - type: Transform - pos: 12.5,-71.5 - parent: 8364 - uid: 22986 components: - type: Transform @@ -38643,16 +38643,6 @@ entities: - type: Transform pos: -11.5,-77.5 parent: 8364 - - uid: 26627 - components: - - type: Transform - pos: 19.5,-77.5 - parent: 8364 - - uid: 26628 - components: - - type: Transform - pos: 19.5,-76.5 - parent: 8364 - uid: 26629 components: - type: Transform @@ -68529,6 +68519,22 @@ entities: - type: Transform pos: 66.509186,-76.72045 parent: 8364 +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 20856 + components: + - type: Transform + parent: 11965 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 20857 + components: + - type: Transform + parent: 17151 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingOuterHoodieGrey entities: - uid: 21633 @@ -85301,14 +85307,6 @@ entities: - type: Transform pos: 15.5,-52.5 parent: 8364 - - uid: 3823 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-85.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 12676 components: - type: Transform @@ -85327,6 +85325,14 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-64.5 parent: 8364 + - uid: 16540 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-84.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 16760 components: - type: Transform @@ -85351,6 +85357,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 17031 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-84.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' - uid: 17222 components: - type: Transform @@ -85383,22 +85397,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#B3A234FF' - - uid: 17673 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-84.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 17675 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-86.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 20140 components: - type: Transform @@ -85464,14 +85462,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 3822 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 28.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 4140 components: - type: Transform @@ -85480,6 +85470,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4508 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,-79.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' - uid: 4512 components: - type: Transform @@ -85534,14 +85532,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 4560 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,-86.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 4561 components: - type: Transform @@ -85558,6 +85548,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 4563 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-80.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 4572 components: - type: Transform @@ -85565,6 +85563,36 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 4610 + components: + - type: Transform + pos: 14.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 4652 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 4657 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 4678 + components: + - type: Transform + pos: 14.5,-80.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' - uid: 5202 components: - type: Transform @@ -85939,30 +85967,38 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 15876 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-72.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 15877 + - uid: 15880 components: - type: Transform rot: 3.141592653589793 rad - pos: 16.5,-76.5 + pos: 14.5,-79.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 15881 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-72.5 parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 15879 + - uid: 15890 components: - type: Transform rot: -1.5707963267948966 rad - pos: 14.5,-76.5 + pos: 18.5,-78.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#03FCD3FF' + - uid: 15892 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-78.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' - uid: 15898 components: - type: Transform @@ -86010,14 +86046,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 16880 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-86.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 16882 components: - type: Transform @@ -86033,14 +86061,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 16936 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-80.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 16988 components: - type: Transform @@ -86072,28 +86092,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 17028 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-72.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 17029 - components: - - type: Transform - pos: 14.5,-72.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 17057 - components: - - type: Transform - pos: 17.5,-84.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 17095 components: - type: Transform @@ -86154,13 +86152,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 17156 - components: - - type: Transform - pos: 17.5,-72.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 17203 components: - type: Transform @@ -86238,14 +86229,6 @@ entities: rot: 3.141592653589793 rad pos: -44.5,15.5 parent: 8364 - - uid: 17365 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,-77.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 17384 components: - type: Transform @@ -86254,21 +86237,30 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 17564 + - uid: 17565 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-74.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 17675 components: - type: Transform rot: 3.141592653589793 rad - pos: 14.5,-82.5 + pos: 14.5,-85.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 17607 + color: '#947507FF' + - uid: 17704 components: - type: Transform - pos: 15.5,-82.5 + rot: -1.5707963267948966 rad + pos: 16.5,-85.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#947507FF' - uid: 18600 components: - type: Transform @@ -86285,14 +86277,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 19073 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,-80.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 19247 components: - type: Transform @@ -86307,22 +86291,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 20124 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,-86.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 20136 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-83.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 20202 components: - type: Transform @@ -86356,14 +86324,6 @@ entities: rot: 1.5707963267948966 rad pos: 29.5,-33.5 parent: 8364 - - uid: 22736 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 22744 components: - type: Transform @@ -87209,13 +87169,6 @@ entities: parent: 8364 - proto: GasPipeFourway entities: - - uid: 5240 - components: - - type: Transform - pos: 14.5,-80.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 5316 components: - type: Transform @@ -87574,14 +87527,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 144 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-79.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 750 components: - type: Transform @@ -87634,14 +87579,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 3681 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-78.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 3682 components: - type: Transform @@ -87714,30 +87651,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 3820 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 28.5,-72.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 3826 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 27.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 3828 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 3837 components: - type: Transform @@ -87754,6 +87667,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 3865 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 3878 components: - type: Transform @@ -87911,6 +87832,13 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 4136 + components: + - type: Transform + pos: 17.5,-83.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 4147 components: - type: Transform @@ -87982,6 +87910,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 4228 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 4498 components: - type: Transform @@ -87995,14 +87931,14 @@ entities: pos: 17.5,-82.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#03FCD3FF' - uid: 4502 components: - type: Transform pos: 13.5,-82.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#990000FF' - uid: 4509 components: - type: Transform @@ -88080,11 +88016,10 @@ entities: - uid: 4538 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-73.5 + pos: 15.5,-83.5 parent: 8364 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#947507FF' - uid: 4539 components: - type: Transform @@ -88099,14 +88034,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 4541 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 26.5,-74.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 4559 components: - type: Transform @@ -88115,6 +88042,27 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' + - uid: 4560 + components: + - type: Transform + pos: 16.5,-84.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 4564 + components: + - type: Transform + pos: 15.5,-82.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 4565 + components: + - type: Transform + pos: 14.5,-82.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' - uid: 4566 components: - type: Transform @@ -88139,6 +88087,28 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 4612 + components: + - type: Transform + pos: 17.5,-79.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 4648 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 4650 + components: + - type: Transform + pos: 16.5,-83.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' - uid: 4680 components: - type: Transform @@ -88150,10 +88120,11 @@ entities: - uid: 4684 components: - type: Transform - pos: 14.5,-74.5 + rot: -1.5707963267948966 rad + pos: 26.5,-72.5 parent: 8364 - type: AtmosPipeColor - color: '#EB2828FF' + color: '#03FCD3FF' - uid: 5068 components: - type: Transform @@ -89381,11 +89352,26 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 13665 + components: + - type: Transform + pos: 13.5,-83.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 14079 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 23.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 14087 components: - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-76.5 + rot: -1.5707963267948966 rad + pos: 19.5,-72.5 parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' @@ -89437,60 +89423,77 @@ entities: - uid: 15543 components: - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,-75.5 + rot: -1.5707963267948966 rad + pos: 18.5,-72.5 parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 15544 components: - type: Transform - pos: 13.5,-73.5 + rot: 3.141592653589793 rad + pos: 14.5,-76.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 15546 + color: '#03FCD3FF' + - uid: 15876 + components: + - type: Transform + pos: 14.5,-84.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 15877 + components: + - type: Transform + pos: 14.5,-74.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 15878 components: - type: Transform pos: 13.5,-74.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 15881 + color: '#990000FF' + - uid: 15879 components: - type: Transform - pos: 17.5,-75.5 + pos: 13.5,-79.5 parent: 8364 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#990000FF' - uid: 15882 components: - type: Transform - pos: 17.5,-74.5 + pos: 16.5,-74.5 parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 15883 components: - type: Transform - pos: 17.5,-73.5 + pos: 13.5,-73.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 15889 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-72.5 parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 15890 - components: - - type: Transform - pos: 12.5,-79.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 15891 components: - type: Transform - pos: 12.5,-78.5 + rot: -1.5707963267948966 rad + pos: 21.5,-72.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#03FCD3FF' - uid: 16511 components: - type: Transform @@ -89607,6 +89610,22 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#3AB334FF' + - uid: 16825 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 16880 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-72.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 16888 components: - type: Transform @@ -89639,6 +89658,29 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 16914 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-77.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 16915 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-76.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 16936 + components: + - type: Transform + pos: 17.5,-77.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 16984 components: - type: Transform @@ -89663,6 +89705,13 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 17002 + components: + - type: Transform + pos: 13.5,-76.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' - uid: 17003 components: - type: Transform @@ -89718,13 +89767,28 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 17028 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-77.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 17029 + components: + - type: Transform + pos: 17.5,-76.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 17030 components: - type: Transform - pos: 16.5,-74.5 + pos: 13.5,-77.5 parent: 8364 - type: AtmosPipeColor - color: '#28EBD7FF' + color: '#990000FF' - uid: 17047 components: - type: Transform @@ -89764,6 +89828,13 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 17057 + components: + - type: Transform + pos: 14.5,-83.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' - uid: 17083 components: - type: Transform @@ -90017,6 +90088,13 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 17212 + components: + - type: Transform + pos: 16.5,-82.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' - uid: 17213 components: - type: Transform @@ -90304,6 +90382,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 17383 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-74.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 17466 components: - type: Transform @@ -90344,14 +90430,13 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 17565 + - uid: 17564 components: - type: Transform - rot: 3.141592653589793 rad - pos: 14.5,-81.5 + pos: 15.5,-80.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#947507FF' - uid: 17569 components: - type: Transform @@ -90423,37 +90508,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 17704 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 17707 - components: - - type: Transform - pos: 15.5,-83.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 17719 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 17766 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 25.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 17794 components: - type: Transform @@ -90594,13 +90648,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 19953 - components: - - type: Transform - pos: 13.5,-75.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 19957 components: - type: Transform @@ -90609,22 +90656,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 20068 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-83.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 20069 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-83.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 20125 components: - type: Transform @@ -90641,14 +90672,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 20135 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-83.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 20153 components: - type: Transform @@ -90739,14 +90762,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 22747 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 22749 components: - type: Transform @@ -90755,14 +90770,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 22750 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 22760 components: - type: Transform @@ -91138,14 +91145,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 22921 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,-73.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 22922 components: - type: Transform @@ -106072,22 +106071,6 @@ entities: - type: Transform pos: 22.5,-92.5 parent: 8364 - - uid: 27425 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-84.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 27426 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-86.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 27548 components: - type: Transform @@ -106178,42 +106161,26 @@ entities: components: - type: Transform rot: 1.5707963267948966 rad - pos: 13.5,-83.5 + pos: 13.5,-80.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 4565 + color: '#990000FF' + - uid: 4541 components: - type: Transform rot: 1.5707963267948966 rad - pos: 17.5,-77.5 + pos: 17.5,-78.5 parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 4577 + - uid: 5240 components: - type: Transform rot: -1.5707963267948966 rad - pos: 13.5,-77.5 + pos: 13.5,-78.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 4652 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-85.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 4657 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-84.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#990000FF' - uid: 5261 components: - type: Transform @@ -106373,6 +106340,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 15546 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-80.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 15549 components: - type: Transform @@ -106381,37 +106356,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 15878 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-76.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 15880 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-76.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 15889 - components: - - type: Transform - pos: 13.5,-80.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 15892 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-77.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 16338 components: - type: Transform @@ -106428,14 +106372,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 16540 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-74.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 16604 components: - type: Transform @@ -106501,11 +106437,10 @@ entities: - uid: 17063 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,-84.5 + pos: 15.5,-79.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#947507FF' - uid: 17064 components: - type: Transform @@ -106552,6 +106487,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 17221 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-75.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 17261 components: - type: Transform @@ -106597,6 +106540,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' + - uid: 17570 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-75.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' - uid: 17590 components: - type: Transform @@ -106611,13 +106562,14 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 17775 + - uid: 17673 components: - type: Transform - pos: 17.5,-80.5 + rot: 3.141592653589793 rad + pos: 15.5,-85.5 parent: 8364 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#947507FF' - uid: 17870 components: - type: Transform @@ -106649,22 +106601,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 20066 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-85.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 20070 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-80.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 20185 components: - type: Transform @@ -108735,14 +108671,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 27418 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-85.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - proto: GasPort entities: - uid: 409 @@ -108779,22 +108707,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-47.5 parent: 8364 - - uid: 4563 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,-78.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 4564 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,-78.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 5596 components: - type: Transform @@ -108872,15 +108784,11 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#947507FF' - - uid: 17207 + - uid: 17571 components: - type: Transform - pos: 14.5,-78.5 - parent: 8364 - - uid: 17208 - components: - - type: Transform - pos: 16.5,-78.5 + rot: 1.5707963267948966 rad + pos: 21.5,-73.5 parent: 8364 - uid: 18298 components: @@ -108911,6 +108819,38 @@ entities: rot: -1.5707963267948966 rad pos: 86.5,-48.5 parent: 8364 + - uid: 20069 + components: + - type: Transform + pos: 18.5,-76.5 + parent: 8364 + - uid: 20070 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,-75.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20124 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-75.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 20135 + components: + - type: Transform + pos: 12.5,-76.5 + parent: 8364 + - uid: 20136 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-73.5 + parent: 8364 - uid: 20802 components: - type: Transform @@ -108988,24 +108928,12 @@ entities: - type: Transform pos: 22.5,-91.5 parent: 8364 - - uid: 27550 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-72.5 - parent: 8364 - uid: 27551 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-72.5 parent: 8364 - - uid: 27552 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,-72.5 - parent: 8364 - uid: 27553 components: - type: Transform @@ -109119,13 +109047,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 17212 - components: - - type: Transform - pos: 14.5,-79.5 - parent: 8364 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 17218 components: - type: MetaData @@ -109156,13 +109077,6 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 17221 - components: - - type: Transform - pos: 16.5,-79.5 - parent: 8364 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 17568 components: - type: Transform @@ -109177,6 +109091,20 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' + - uid: 20066 + components: + - type: Transform + pos: 12.5,-77.5 + parent: 8364 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 20068 + components: + - type: Transform + pos: 18.5,-77.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 22840 components: - type: Transform @@ -109237,6 +109165,12 @@ entities: - type: Transform pos: 38.5,0.5 parent: 8364 + - uid: 20859 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-73.5 + parent: 8364 - uid: 21274 components: - type: Transform @@ -109257,12 +109191,6 @@ entities: - type: Transform pos: 18.5,-50.5 parent: 8364 - - uid: 27380 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,-72.5 - parent: 8364 - proto: GasThermoMachineHeater entities: - uid: 3803 @@ -109281,45 +109209,19 @@ entities: - type: Transform pos: 12.5,-51.5 parent: 8364 + - uid: 20858 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-73.5 + parent: 8364 - uid: 21405 components: - type: Transform pos: 74.5,-47.5 parent: 8364 - - uid: 27549 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,-72.5 - parent: 8364 - proto: GasValve entities: - - uid: 4136 - components: - - type: Transform - pos: 13.5,-81.5 - parent: 8364 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 4228 - components: - - type: Transform - pos: 17.5,-81.5 - parent: 8364 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 14079 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,-80.5 - parent: 8364 - - type: GasValve - open: False - uid: 17062 components: - type: Transform @@ -109338,6 +109240,66 @@ entities: parent: 8364 - type: GasValve open: False + - uid: 17707 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-78.5 + parent: 8364 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#947507FF' + - uid: 17719 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-78.5 + parent: 8364 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#947507FF' + - uid: 17766 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-81.5 + parent: 8364 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 17775 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-81.5 + parent: 8364 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 17781 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-81.5 + parent: 8364 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#990000FF' + - uid: 18758 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-81.5 + parent: 8364 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#990000FF' - uid: 22843 components: - type: MetaData @@ -112182,21 +112144,37 @@ entities: color: '#FF1212FF' - proto: GasVolumePump entities: - - uid: 17031 + - uid: 4577 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,-74.5 + parent: 8364 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 19073 components: - type: Transform pos: 16.5,-73.5 parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 17159 + - uid: 19953 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-73.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#990000FF' + - uid: 20006 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-81.5 + parent: 8364 + - type: AtmosPipeColor + color: '#947507FF' - proto: GeigerCounter entities: - uid: 26819 @@ -115238,11 +115216,6 @@ entities: - type: Transform pos: 26.5,-80.5 parent: 8364 - - uid: 4508 - components: - - type: Transform - pos: 15.5,-82.5 - parent: 8364 - uid: 4511 components: - type: Transform @@ -115388,16 +115361,6 @@ entities: - type: Transform pos: -11.5,-88.5 parent: 8364 - - uid: 4610 - components: - - type: Transform - pos: 16.5,-82.5 - parent: 8364 - - uid: 4612 - components: - - type: Transform - pos: 17.5,-82.5 - parent: 8364 - uid: 4613 components: - type: Transform @@ -115523,21 +115486,6 @@ entities: - type: Transform pos: -20.5,-76.5 parent: 8364 - - uid: 4648 - components: - - type: Transform - pos: 14.5,-82.5 - parent: 8364 - - uid: 4650 - components: - - type: Transform - pos: 18.5,-82.5 - parent: 8364 - - uid: 4678 - components: - - type: Transform - pos: 13.5,-82.5 - parent: 8364 - uid: 4685 components: - type: Transform @@ -120145,14 +120093,13 @@ entities: parent: 8364 - type: AtmosPipeColor color: '#03FCD3FF' - - uid: 27427 + - uid: 17607 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,-85.5 + pos: 15.5,-84.5 parent: 8364 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#947507FF' - proto: Hemostat entities: - uid: 13776 @@ -130389,6 +130336,7 @@ entities: - uid: 26104 components: - type: Transform + anchored: False rot: 3.141592653589793 rad pos: 18.5,-86.5 parent: 8364 @@ -132753,36 +132701,6 @@ entities: - type: Transform pos: 44.5,-54.5 parent: 8364 - - uid: 3864 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-82.5 - parent: 8364 - - uid: 3865 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,-82.5 - parent: 8364 - - uid: 4005 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,-82.5 - parent: 8364 - - uid: 4032 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-82.5 - parent: 8364 - - uid: 4042 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,-82.5 - parent: 8364 - uid: 5799 components: - type: Transform @@ -132833,11 +132751,6 @@ entities: - type: Transform pos: 17.5,-50.5 parent: 8364 - - uid: 22737 - components: - - type: Transform - pos: 13.5,-82.5 - parent: 8364 - uid: 22830 components: - type: Transform @@ -137038,6 +136951,11 @@ entities: - type: Transform pos: 2.5,-41.5 parent: 8364 + - uid: 17088 + components: + - type: Transform + pos: 14.5,-82.5 + parent: 8364 - uid: 17093 components: - type: Transform @@ -137048,6 +136966,16 @@ entities: - type: Transform pos: 7.5,-45.5 parent: 8364 + - uid: 17156 + components: + - type: Transform + pos: 15.5,-82.5 + parent: 8364 + - uid: 17159 + components: + - type: Transform + pos: 16.5,-82.5 + parent: 8364 - uid: 17205 components: - type: Transform @@ -137060,6 +136988,21 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-43.5 parent: 8364 + - uid: 17207 + components: + - type: Transform + pos: 13.5,-82.5 + parent: 8364 + - uid: 17208 + components: + - type: Transform + pos: 17.5,-82.5 + parent: 8364 + - uid: 17365 + components: + - type: Transform + pos: 18.5,-82.5 + parent: 8364 - uid: 17455 components: - type: Transform @@ -143864,6 +143807,31 @@ entities: - type: Transform pos: 3.5,39.5 parent: 8364 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20856 - uid: 16531 components: - type: Transform @@ -143874,6 +143842,31 @@ entities: - type: Transform pos: 4.5,39.5 parent: 8364 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20857 - proto: SuitStorageWarden entities: - uid: 11999 diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml index a8c3becaf3..32f860cae6 100644 --- a/Resources/Maps/cluster.yml +++ b/Resources/Maps/cluster.yml @@ -7605,6 +7605,18 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,3.5 parent: 1 + - uid: 3147 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 + - uid: 3148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,2.5 + parent: 1 - uid: 4816 components: - type: Transform @@ -7647,18 +7659,6 @@ entities: rot: 3.141592653589793 rad pos: 23.5,38.5 parent: 1 -- proto: AtmosDeviceFanTiny - entities: - - uid: 3147 - components: - - type: Transform - pos: -0.5,2.5 - parent: 1 - - uid: 3148 - components: - - type: Transform - pos: -3.5,2.5 - parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 7260 diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 58ff9247b8..80bce4b922 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -18042,6 +18042,12 @@ entities: - type: Transform pos: 91.5,71.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 31366: + - DoorStatus: Close - uid: 16663 components: - type: Transform @@ -18492,12 +18498,24 @@ entities: rot: -1.5707963267948966 rad pos: -42.5,-55.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12402: + - DoorStatus: DoorBolt - uid: 12402 components: - type: Transform rot: -1.5707963267948966 rad pos: -45.5,-55.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12401: + - DoorStatus: DoorBolt - uid: 23029 components: - type: Transform @@ -18512,6 +18530,12 @@ entities: - type: Transform pos: 99.5,0.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 23457: + - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - uid: 2870 @@ -18586,11 +18610,23 @@ entities: - type: Transform pos: 25.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15609: + - DoorStatus: Close - uid: 15612 components: - type: Transform pos: 27.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15610: + - DoorStatus: Close - uid: 33581 components: - type: Transform @@ -18618,11 +18654,23 @@ entities: - type: Transform pos: 16.5,-36.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10120: + - DoorStatus: DoorBolt - uid: 10120 components: - type: Transform pos: 16.5,-33.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10119: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassEngineeringLocked entities: - uid: 3715 @@ -18649,36 +18697,72 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12421: + - DoorStatus: DoorBolt - uid: 12404 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-47.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12395: + - DoorStatus: Close - uid: 12420 components: - type: Transform rot: -1.5707963267948966 rad pos: -37.5,-62.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12400: + - DoorStatus: Close - uid: 12421 components: - type: Transform rot: -1.5707963267948966 rad pos: -45.5,-62.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12403: + - DoorStatus: DoorBolt - uid: 12503 components: - type: Transform rot: -1.5707963267948966 rad pos: -31.5,-59.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12397: + - DoorStatus: Close - uid: 12504 components: - type: Transform rot: -1.5707963267948966 rad pos: -32.5,-62.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12399: + - DoorStatus: Close - uid: 20640 components: - type: Transform @@ -18713,6 +18797,12 @@ entities: - type: Transform pos: 96.5,0.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 23458: + - DoorStatus: DoorBolt - uid: 24737 components: - type: Transform @@ -18792,6 +18882,8 @@ entities: - type: Transform pos: -41.5,-1.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: 3000: @@ -18837,21 +18929,53 @@ entities: - type: Transform pos: 22.5,-50.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 19166: + - DoorStatus: DoorBolt + 19165: + - DoorStatus: DoorBolt - uid: 19164 components: - type: Transform pos: 22.5,-49.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 19166: + - DoorStatus: DoorBolt + 19165: + - DoorStatus: DoorBolt - uid: 19165 components: - type: Transform pos: 20.5,-50.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 19164: + - DoorStatus: DoorBolt + 19163: + - DoorStatus: DoorBolt - uid: 19166 components: - type: Transform pos: 20.5,-49.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 19164: + - DoorStatus: DoorBolt + 19163: + - DoorStatus: DoorBolt - uid: 26786 components: - type: Transform @@ -18938,6 +19062,8 @@ entities: rot: -1.5707963267948966 rad pos: -41.5,32.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockExternalGlassShuttleEscape entities: - uid: 6767 @@ -19008,38 +19134,80 @@ entities: - type: Transform pos: -29.5,-48.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12404: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12397 components: - type: Transform rot: 3.141592653589793 rad pos: -29.5,-58.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12503: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12399 components: - type: Transform pos: -32.5,-64.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12504: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12400 components: - type: Transform pos: -37.5,-64.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 12420: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 15609 components: - type: Transform pos: 25.5,-61.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 15611: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 15610 components: - type: Transform pos: 27.5,-61.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 15612: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 31366 components: - type: Transform rot: 3.141592653589793 rad pos: 91.5,74.5 parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 16079: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockExternalLocked entities: - uid: 3833 @@ -19047,6 +19215,8 @@ entities: - type: Transform pos: -38.5,16.5 parent: 13329 + - type: DeviceLinkSink + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: 3834: @@ -27381,17 +27551,18 @@ entities: - type: Transform pos: 63.5,-57.5 parent: 13329 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 1203 components: - type: Transform - pos: -6.5,25.5 + rot: -1.5707963267948966 rad + pos: -7.5,28.5 parent: 13329 - uid: 1204 components: - type: Transform - pos: -7.5,28.5 + pos: -6.5,25.5 parent: 13329 - uid: 3030 components: @@ -27401,52 +27572,62 @@ entities: - uid: 3758 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,32.5 parent: 13329 - uid: 3759 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,34.5 parent: 13329 - uid: 3760 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,40.5 parent: 13329 - uid: 3761 components: - type: Transform + rot: -1.5707963267948966 rad pos: -41.5,42.5 parent: 13329 - uid: 6764 components: - type: Transform + rot: 3.141592653589793 rad pos: -4.5,76.5 parent: 13329 - uid: 10112 components: - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,-37.5 parent: 13329 - uid: 10113 components: - type: Transform + rot: -1.5707963267948966 rad pos: 1.5,-35.5 parent: 13329 - uid: 12422 components: - type: Transform + rot: -1.5707963267948966 rad pos: -43.5,-32.5 parent: 13329 - uid: 12423 components: - type: Transform + rot: -1.5707963267948966 rad pos: -43.5,-39.5 parent: 13329 - uid: 13166 components: - type: Transform - pos: -30.5,-20.5 + rot: 3.141592653589793 rad + pos: -37.5,-20.5 parent: 13329 - uid: 13167 components: @@ -27456,27 +27637,30 @@ entities: - uid: 13252 components: - type: Transform - pos: -37.5,-20.5 + rot: 3.141592653589793 rad + pos: -30.5,-20.5 parent: 13329 - uid: 13282 components: - type: Transform - pos: -28.5,-30.5 + pos: -33.5,-30.5 parent: 13329 - uid: 13283 components: - type: Transform - pos: -33.5,-30.5 + rot: 1.5707963267948966 rad + pos: 95.5,61.5 parent: 13329 - uid: 13284 components: - type: Transform - pos: 95.5,61.5 + rot: 1.5707963267948966 rad + pos: 95.5,66.5 parent: 13329 - uid: 13285 components: - type: Transform - pos: 95.5,66.5 + pos: -28.5,-30.5 parent: 13329 - proto: AtmosFixBlockerMarker entities: @@ -164811,6 +164995,11 @@ entities: - type: Transform pos: 106.5,-45.5 parent: 13329 + - uid: 34593 + components: + - type: Transform + pos: 17.5,-35.5 + parent: 13329 - uid: 35403 components: - type: Transform @@ -165044,6 +165233,11 @@ entities: - type: Transform pos: 36.5,56.5 parent: 13329 + - uid: 34228 + components: + - type: Transform + pos: 17.5,-34.5 + parent: 13329 - uid: 34456 components: - type: Transform @@ -182222,13 +182416,6 @@ entities: pos: 22.5,15.5 parent: 13329 - proto: SignAtmos - entities: - - uid: 26471 - components: - - type: Transform - pos: 78.5,-21.5 - parent: 13329 -- proto: SignAtmosMinsky entities: - uid: 26468 components: @@ -182245,6 +182432,11 @@ entities: - type: Transform pos: 90.5,-19.5 parent: 13329 + - uid: 26471 + components: + - type: Transform + pos: 78.5,-21.5 + parent: 13329 - proto: SignBar entities: - uid: 1188 @@ -182333,8 +182525,6 @@ entities: - type: Transform pos: 16.5,39.5 parent: 13329 -- proto: SignChemistry1 - entities: - uid: 18455 components: - type: Transform @@ -182775,13 +182965,6 @@ entities: - type: Transform pos: 70.5,42.5 parent: 13329 -- proto: SignDrones - entities: - - uid: 26692 - components: - - type: Transform - pos: 82.5,-21.5 - parent: 13329 - proto: SignElectricalMed entities: - uid: 4728 @@ -182975,21 +183158,17 @@ entities: pos: 66.5,46.5 parent: 13329 - proto: SignHydro1 - entities: - - uid: 20091 - components: - - type: Transform - pos: -11.5,33.5 - parent: 13329 -- proto: SignHydro2 entities: - uid: 20090 components: - type: Transform pos: -2.5,37.5 parent: 13329 -- proto: SignHydro3 - entities: + - uid: 20091 + components: + - type: Transform + pos: -11.5,33.5 + parent: 13329 - uid: 20092 components: - type: Transform @@ -183068,6 +183247,13 @@ entities: - type: Transform pos: 14.5,-14.5 parent: 13329 +- proto: SignMaterials + entities: + - uid: 26692 + components: + - type: Transform + pos: 82.5,-21.5 + parent: 13329 - proto: SignMedical entities: - uid: 10600 @@ -183303,21 +183489,17 @@ entities: - type: Transform pos: 39.5,-12.5 parent: 13329 -- proto: SignScience1 - entities: - - uid: 20084 - components: - - type: Transform - pos: 26.5,-48.5 - parent: 13329 -- proto: SignScience2 - entities: - uid: 19938 components: - type: Transform rot: 1.5707963267948966 rad pos: 40.5,-40.5 parent: 13329 + - uid: 20084 + components: + - type: Transform + pos: 26.5,-48.5 + parent: 13329 - proto: SignSecurearea entities: - uid: 15808 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 0a5da0bd31..58136160e2 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -140,7 +140,7 @@ entities: version: 6 -4,2: ind: -4,2 - tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD + tiles: AAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAegAAAAADegAAAAADegAAAAABegAAAAAAegAAAAACegAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAD version: 6 -4,3: ind: -4,3 @@ -4400,6 +4400,12 @@ entities: 1037: 5,41 1386: 22,25 1387: 22,23 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 3190: -53,36 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale @@ -9735,6 +9741,12 @@ entities: - type: Transform pos: -82.5,-60.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6606: + - DoorStatus: Close - uid: 17373 components: - type: Transform @@ -9763,11 +9775,23 @@ entities: - type: Transform pos: 15.5,30.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1826: + - DoorStatus: DoorBolt - uid: 1826 components: - type: Transform pos: 17.5,30.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1695: + - DoorStatus: DoorBolt - uid: 22631 components: - type: Transform @@ -9884,18 +9908,42 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-58.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 6272: + - DoorStatus: DoorBolt + 7207: + - DoorStatus: DoorBolt - uid: 6272 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-56.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3531: + - DoorStatus: DoorBolt + 7207: + - DoorStatus: DoorBolt - uid: 7207 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-58.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 6272: + - DoorStatus: DoorBolt + 3531: + - DoorStatus: DoorBolt - uid: 10135 components: - type: Transform @@ -9939,6 +9987,12 @@ entities: - type: Transform pos: -63.5,-18.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 17342: + - DoorStatus: DoorBolt - uid: 5391 components: - type: Transform @@ -9971,6 +10025,12 @@ entities: - type: Transform pos: -63.5,-20.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 386: + - DoorStatus: DoorBolt - uid: 18018 components: - type: Transform @@ -10065,6 +10125,12 @@ entities: rot: 3.141592653589793 rad pos: 25.5,43.5 parent: 30 + - uid: 11449 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,36.5 + parent: 30 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 11864 @@ -10087,6 +10153,12 @@ entities: rot: 3.141592653589793 rad pos: -18.5,46.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1696: + - DoorStatus: DoorBolt - uid: 5390 components: - type: Transform @@ -10101,11 +10173,23 @@ entities: - type: Transform pos: 45.5,16.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15830: + - DoorStatus: DoorBolt - uid: 15830 components: - type: Transform pos: 48.5,16.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 15829: + - DoorStatus: DoorBolt - uid: 16278 components: - type: Transform @@ -10132,6 +10216,12 @@ entities: rot: -1.5707963267948966 rad pos: -85.5,-60.5 parent: 30 + - type: DeviceLinkSource + linkedPorts: + 841: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockFreezerKitchenHydroLocked entities: - uid: 460 @@ -10516,6 +10606,18 @@ entities: - type: Transform pos: -69.5,-54.5 parent: 30 +- proto: AirlockGlassShuttle + entities: + - uid: 9121 + components: + - type: Transform + pos: -52.5,-10.5 + parent: 30 + - uid: 11452 + components: + - type: Transform + pos: -59.5,-10.5 + parent: 30 - proto: AirlockHatchMaintenance entities: - uid: 9957 @@ -11089,7 +11191,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -537.51984 + secondsUntilStateChange: -1046.2256 state: Opening - type: DeviceLinkSource lastSignals: @@ -11276,6 +11378,12 @@ entities: rot: 3.141592653589793 rad pos: -21.5,46.5 parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 5070: + - DoorStatus: DoorBolt - uid: 1756 components: - type: Transform @@ -12136,8 +12244,6 @@ entities: parent: 30 - type: Apc hasAccess: True - lastExternalState: Good - lastChargeState: Full - uid: 7079 components: - type: MetaData @@ -12163,8 +12269,6 @@ entities: parent: 30 - type: Apc hasAccess: True - lastExternalState: Good - lastChargeState: Full - uid: 7433 components: - type: MetaData @@ -12183,8 +12287,6 @@ entities: parent: 30 - type: Apc hasAccess: True - lastExternalState: Good - lastChargeState: Full - uid: 7610 components: - type: MetaData @@ -13115,28 +13217,68 @@ entities: - type: Transform pos: -73.5,-38.5 parent: 30 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 380 components: - type: Transform - pos: -59.5,-7.5 + pos: -52.5,-10.5 + parent: 30 + - uid: 868 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,43.5 + parent: 30 + - uid: 1083 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-3.5 + parent: 30 + - uid: 1475 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 38.5,-5.5 + parent: 30 + - uid: 1490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,23.5 + parent: 30 + - uid: 1493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,15.5 parent: 30 - uid: 3707 components: - type: Transform - pos: 25.5,43.5 + rot: -1.5707963267948966 rad + pos: -65.5,13.5 parent: 30 - - uid: 9121 + - uid: 11451 components: - type: Transform - pos: 38.5,-5.5 + pos: -59.5,-10.5 parent: 30 - - uid: 9122 + - uid: 11453 components: - type: Transform - pos: 38.5,-3.5 + rot: -1.5707963267948966 rad + pos: -53.5,36.5 parent: 30 + - uid: 11454 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -65.5,21.5 + parent: 30 +- proto: AtmosDeviceFanTiny + entities: - uid: 9123 components: - type: Transform @@ -13147,41 +13289,6 @@ entities: - type: Transform pos: -19.5,17.5 parent: 30 - - uid: 9798 - components: - - type: Transform - pos: -52.5,-7.5 - parent: 30 - - uid: 16402 - components: - - type: Transform - pos: -65.5,23.5 - parent: 30 - - uid: 16403 - components: - - type: Transform - pos: -65.5,21.5 - parent: 30 - - uid: 16404 - components: - - type: Transform - pos: -65.5,15.5 - parent: 30 - - uid: 16405 - components: - - type: Transform - pos: -65.5,13.5 - parent: 30 - - uid: 20590 - components: - - type: Transform - pos: -52.5,2.5 - parent: 30 - - uid: 20591 - components: - - type: Transform - pos: -59.5,2.5 - parent: 30 - proto: AtmosFixBlockerMarker entities: - uid: 16997 @@ -14242,7 +14349,7 @@ entities: - type: Transform pos: -60.353844,-63.575558 parent: 30 -- proto: BookChefGaming +- proto: BookHowToCookForFortySpaceman entities: - uid: 9948 components: @@ -49781,6 +49888,11 @@ entities: - 0 - 0 - 0 + - uid: 11456 + components: + - type: Transform + pos: -52.5,37.5 + parent: 30 - uid: 11750 components: - type: Transform @@ -54510,6 +54622,13 @@ entities: - type: Transform pos: 1.5,-33.5 parent: 30 +- proto: DefaultStationBeaconEscapePod + entities: + - uid: 11455 + components: + - type: Transform + pos: -52.5,36.5 + parent: 30 - proto: DefaultStationBeaconEVAStorage entities: - uid: 20552 @@ -89848,10 +89967,11 @@ entities: - type: Transform pos: -42.5,34.5 parent: 30 - - uid: 1493 + - uid: 1476 components: - type: Transform - pos: -53.5,34.5 + rot: -1.5707963267948966 rad + pos: -53.5,37.5 parent: 30 - uid: 1494 components: @@ -91782,6 +91902,12 @@ entities: - type: Transform pos: 24.5,-34.5 parent: 30 + - uid: 9122 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -53.5,35.5 + parent: 30 - uid: 9129 components: - type: Transform @@ -93351,11 +93477,6 @@ entities: - type: Transform pos: -58.5,36.5 parent: 30 - - uid: 16951 - components: - - type: Transform - pos: -51.5,36.5 - parent: 30 - uid: 17032 components: - type: Transform @@ -108641,21 +108762,11 @@ entities: - type: Transform pos: -42.5,34.5 parent: 30 - - uid: 1476 - components: - - type: Transform - pos: -51.5,36.5 - parent: 30 - uid: 1489 components: - type: Transform pos: -52.5,34.5 parent: 30 - - uid: 1490 - components: - - type: Transform - pos: -53.5,34.5 - parent: 30 - uid: 1491 components: - type: Transform @@ -110473,6 +110584,18 @@ entities: - type: Transform pos: -64.5,16.5 parent: 30 + - uid: 11448 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,37.5 + parent: 30 + - uid: 11450 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,35.5 + parent: 30 - uid: 11602 components: - type: Transform @@ -113375,6 +113498,11 @@ entities: parent: 30 - proto: SignAtmos entities: + - uid: 7012 + components: + - type: Transform + pos: 8.5,-21.5 + parent: 30 - uid: 9082 components: - type: Transform @@ -113385,13 +113513,6 @@ entities: - type: Transform pos: 4.5,-32.5 parent: 30 -- proto: SignAtmosMinsky - entities: - - uid: 7012 - components: - - type: Transform - pos: 8.5,-21.5 - parent: 30 - proto: SignBar entities: - uid: 1384 @@ -113447,8 +113568,6 @@ entities: - type: Transform pos: -10.5,-11.5 parent: 30 -- proto: SignChemistry1 - entities: - uid: 9032 components: - type: Transform @@ -113909,13 +114028,6 @@ entities: - type: Transform pos: 47.5,20.5 parent: 30 -- proto: SignDrones - entities: - - uid: 12263 - components: - - type: Transform - pos: -37.5,26.5 - parent: 30 - proto: SignElectricalMed entities: - uid: 3194 @@ -114041,20 +114153,16 @@ entities: - type: Transform pos: -20.5,13.5 parent: 30 -- proto: SignHydro2 - entities: - - uid: 1386 - components: - - type: Transform - pos: -29.5,4.5 - parent: 30 -- proto: SignHydro3 - entities: - uid: 1385 components: - type: Transform pos: -22.5,8.5 parent: 30 + - uid: 1386 + components: + - type: Transform + pos: -29.5,4.5 + parent: 30 - proto: SignInterrogation entities: - uid: 1774 @@ -114090,6 +114198,13 @@ entities: - type: Transform pos: 18.5,-0.5 parent: 30 +- proto: SignMaterials + entities: + - uid: 12263 + components: + - type: Transform + pos: -37.5,26.5 + parent: 30 - proto: SignMedical entities: - uid: 6763 @@ -114102,13 +114217,6 @@ entities: - type: Transform pos: -12.5,0.5 parent: 30 -- proto: SignMinerDock - entities: - - uid: 8445 - components: - - type: Transform - pos: 15.5,-9.5 - parent: 30 - proto: SignMorgue entities: - uid: 6903 @@ -114245,26 +114353,22 @@ entities: pos: 16.5,24.5 parent: 30 - proto: SignScience - entities: - - uid: 13389 - components: - - type: Transform - pos: 16.5,16.5 - parent: 30 -- proto: SignScience1 entities: - uid: 6576 components: - type: Transform pos: 11.5,19.5 parent: 30 -- proto: SignScience2 - entities: - uid: 13388 components: - type: Transform pos: 11.5,13.5 parent: 30 + - uid: 13389 + components: + - type: Transform + pos: 16.5,16.5 + parent: 30 - proto: SignSecurearea entities: - uid: 11895 @@ -114355,6 +114459,13 @@ entities: - type: Transform pos: -37.5,38.5 parent: 30 +- proto: SignShipDock + entities: + - uid: 8445 + components: + - type: Transform + pos: 15.5,-9.5 + parent: 30 - proto: SignSmoking entities: - uid: 9125 @@ -123118,11 +123229,6 @@ entities: - type: Transform pos: -50.5,11.5 parent: 30 - - uid: 868 - components: - - type: Transform - pos: -59.5,-10.5 - parent: 30 - uid: 882 components: - type: Transform @@ -123223,11 +123329,6 @@ entities: - type: Transform pos: -61.5,-10.5 parent: 30 - - uid: 1083 - components: - - type: Transform - pos: -52.5,-10.5 - parent: 30 - uid: 1140 components: - type: Transform @@ -123424,12 +123525,6 @@ entities: rot: -1.5707963267948966 rad pos: -51.5,34.5 parent: 30 - - uid: 1475 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -51.5,35.5 - parent: 30 - uid: 1477 components: - type: Transform @@ -127408,6 +127503,12 @@ entities: - type: Transform pos: -39.5,-22.5 parent: 30 + - uid: 9798 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,34.5 + parent: 30 - uid: 9855 components: - type: Transform diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 8dd8e3a8a4..473cbbb3a8 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -54,6 +54,7 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids @@ -358,11 +359,11 @@ entities: version: 6 -3,-5: ind: -3,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -2,-5: ind: -2,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAACeQAAAAAAHQAAAAADHQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAACeQAAAAAAHQAAAAADHQAAAAADeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAABHQAAAAACHQAAAAADHQAAAAADHQAAAAACeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAADHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAADHQAAAAACHQAAAAADHQAAAAACeQAAAAAAHQAAAAADHQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAACeQAAAAAAHQAAAAADHQAAAAADeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAABHQAAAAAAHQAAAAACHQAAAAABeQAAAAAAHQAAAAACHQAAAAACeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAABHQAAAAAA version: 6 -4,-5: ind: -4,-5 @@ -6442,7 +6443,8 @@ entities: -2,8: 0: 65535 -2,9: - 0: 65535 + 0: 65263 + 2: 272 -2,10: 0: 65535 -2,11: @@ -6875,18 +6877,18 @@ entities: 0: 65535 12,-8: 0: 30591 - 2: 34944 + 3: 34944 13,-8: 0: 17487 - 2: 13104 - 3: 34944 + 3: 13104 + 4: 34944 13,-7: 0: 65535 13,-6: 0: 65535 14,-8: 0: 52431 - 3: 13104 + 4: 13104 14,-7: 0: 65535 14,-6: @@ -6907,44 +6909,44 @@ entities: 0: 65535 16,-4: 0: 32631 - 4: 136 - 5: 32768 + 5: 136 + 6: 32768 16,-3: 0: 32631 - 5: 32904 + 6: 32904 16,-2: 0: 65399 - 5: 136 + 6: 136 16,-1: 0: 13299 17,-4: - 4: 51 + 5: 51 0: 53196 - 5: 12288 + 6: 12288 17,-3: - 5: 12339 + 6: 12339 0: 53196 17,-2: - 5: 51 + 6: 51 0: 65484 16,-7: 0: 65522 16,-6: 0: 32767 - 5: 32768 + 6: 32768 16,-5: 0: 32631 - 5: 136 - 4: 32768 + 6: 136 + 5: 32768 17,-7: 0: 65527 17,-6: 0: 53247 - 5: 12288 + 6: 12288 17,-5: - 5: 51 + 6: 51 0: 53196 - 4: 12288 + 5: 12288 12,-9: 0: 61941 13,-9: @@ -7077,12 +7079,12 @@ entities: 0: 8930 16,-8: 0: 60395 - 5: 4 + 6: 4 17,-8: 0: 65535 18,-8: 0: 12914 - 5: 137 + 6: 137 18,-7: 0: 47858 18,-6: @@ -7107,19 +7109,19 @@ entities: 0: 3983 16,-9: 0: 59951 - 5: 1216 + 6: 1216 17,-9: 0: 65375 - 5: 160 + 6: 160 17,-10: 0: 40960 - 5: 24560 + 6: 24560 18,-10: 0: 4096 - 5: 8976 + 6: 8976 18,-9: 0: 12896 - 5: 35227 + 6: 35227 10,-10: 0: 63249 10,-9: @@ -7588,7 +7590,7 @@ entities: 0: 65535 3,-14: 0: 61713 - 5: 3822 + 6: 3822 3,-13: 0: 65535 -2,-16: @@ -8098,11 +8100,11 @@ entities: 20,7: 0: 4369 19,-8: - 5: 51 + 6: 51 16,-10: - 5: 60608 + 6: 60608 19,-9: - 5: 13107 + 6: 13107 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -8134,6 +8136,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -10278,11 +10295,23 @@ entities: - type: Transform pos: 68.5,8.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12540: + - DoorStatus: DoorBolt - uid: 12560 components: - type: Transform pos: 65.5,8.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12540: + - DoorStatus: DoorBolt - proto: AirlockEngineeringLocked entities: - uid: 1109 @@ -10446,6 +10475,14 @@ entities: - type: Transform pos: 66.5,6.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 12560: + - DoorStatus: DoorBolt + 12559: + - DoorStatus: DoorBolt - uid: 23561 components: - type: Transform @@ -10558,21 +10595,58 @@ entities: - type: Transform pos: -44.5,33.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 3442: + - DoorStatus: DoorBolt + 3582: + - DoorStatus: DoorBolt - uid: 3442 components: - type: Transform pos: -43.5,29.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3445: + - DoorStatus: DoorBolt + 3441: + - DoorStatus: DoorBolt - uid: 3445 components: - type: Transform pos: -44.5,32.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 3442: + - DoorStatus: DoorBolt + 3582: + - DoorStatus: DoorBolt - uid: 3582 components: - type: Transform pos: -42.5,29.5 parent: 5350 + - type: Door + secondsUntilStateChange: -99.68158 + state: Opening + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 3445: + - DoorStatus: DoorBolt + 3441: + - DoorStatus: DoorBolt + lastSignals: + DoorStatus: True - uid: 3884 components: - type: Transform @@ -10590,11 +10664,23 @@ entities: - type: Transform pos: 63.5,38.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13927: + - DoorStatus: DoorBolt - uid: 13927 components: - type: Transform pos: 63.5,40.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13926: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassLocked entities: - uid: 5442 @@ -10602,21 +10688,49 @@ entities: - type: Transform pos: -76.5,8.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 5443: + - DoorStatus: Close - uid: 5712 components: - type: Transform pos: -74.5,-17.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 5711: + - DoorStatus: Close - uid: 5713 components: - type: Transform pos: -72.5,-19.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 5716: + - DoorStatus: Close + 5715: + - DoorStatus: Close - uid: 5714 components: - type: Transform pos: -73.5,-19.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 5715: + - DoorStatus: Close + 5716: + - DoorStatus: Close - uid: 5742 components: - type: Transform @@ -10627,21 +10741,45 @@ entities: - type: Transform pos: -41.5,35.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9492: + - DoorStatus: DoorBolt - uid: 9494 components: - type: Transform pos: -32.5,45.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9495: + - DoorStatus: DoorBolt - uid: 9495 components: - type: Transform pos: -32.5,47.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9494: + - DoorStatus: DoorBolt - uid: 13922 components: - type: Transform pos: 48.5,38.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13921: + - DoorStatus: DoorBolt - uid: 14536 components: - type: Transform @@ -10658,36 +10796,78 @@ entities: - type: Transform pos: -50.5,-40.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 16715: + - DoorStatus: DoorBolt - uid: 17204 components: - type: Transform pos: -42.5,-63.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 17205: + - DoorStatus: DoorBolt - uid: 17205 components: - type: Transform pos: -39.5,-63.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 17204: + - DoorStatus: DoorBolt - uid: 20027 components: - type: Transform pos: 5.5,-65.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20026: + - DoorStatus: DoorBolt - uid: 20029 components: - type: Transform pos: 38.5,-64.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 20030: + - DoorStatus: DoorBolt - uid: 20030 components: - type: Transform pos: 38.5,-61.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20029: + - DoorStatus: DoorBolt - uid: 20038 components: - type: Transform pos: 39.5,-54.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20037: + - DoorStatus: DoorBolt - uid: 25050 components: - type: Transform @@ -10794,22 +10974,50 @@ entities: rot: -1.5707963267948966 rad pos: -78.5,8.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5442: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 5711 components: - type: Transform rot: -1.5707963267948966 rad pos: -76.5,-17.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5712: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 5715 components: - type: Transform pos: -73.5,-22.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5713: + - DoorStatus: Close + 5714: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 2 - uid: 5716 components: - type: Transform pos: -72.5,-22.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 5713: + - DoorStatus: Close + 5714: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 2 - proto: AirlockExternalLocked entities: - uid: 9492 @@ -10817,11 +11025,23 @@ entities: - type: Transform pos: -44.5,35.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 9493: + - DoorStatus: DoorBolt - uid: 13921 components: - type: Transform pos: 49.5,39.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13922: + - DoorStatus: DoorBolt - uid: 13923 components: - type: Transform @@ -10831,8 +11051,6 @@ entities: linkedPorts: 14536: - DoorStatus: DoorBolt - 13924: - - DoorStatus: DoorBolt - uid: 13924 components: - type: Transform @@ -10842,23 +11060,39 @@ entities: linkedPorts: 14536: - DoorStatus: DoorBolt - 13923: - - DoorStatus: DoorBolt - uid: 16715 components: - type: Transform pos: -52.5,-40.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 16716: + - DoorStatus: DoorBolt - uid: 20026 components: - type: Transform pos: 5.5,-67.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20027: + - DoorStatus: DoorBolt - uid: 20037 components: - type: Transform pos: 41.5,-54.5 parent: 5350 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 20038: + - DoorStatus: DoorBolt - proto: AirlockFreezerKitchenHydroLocked entities: - uid: 2433 @@ -13597,12 +13831,12 @@ entities: - type: Transform pos: -1.8845375,-5.58767 parent: 5350 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 491 components: - type: Transform - pos: 34.5,-12.5 + pos: 34.5,-17.5 parent: 5350 - uid: 5086 components: @@ -13612,32 +13846,38 @@ entities: - uid: 5326 components: - type: Transform + rot: 1.5707963267948966 rad pos: 41.5,47.5 parent: 5350 - uid: 5330 components: - type: Transform - pos: -63.5,-13.5 + rot: -1.5707963267948966 rad + pos: -64.5,-13.5 parent: 5350 - uid: 6473 components: - type: Transform + rot: -1.5707963267948966 rad pos: -45.5,16.5 parent: 5350 - uid: 6502 components: - type: Transform + rot: -1.5707963267948966 rad pos: -45.5,18.5 parent: 5350 - uid: 8480 components: - type: Transform - pos: -70.5,-5.5 + rot: 3.141592653589793 rad + pos: -63.5,-5.5 parent: 5350 - uid: 8604 components: - type: Transform - pos: -63.5,-5.5 + rot: 3.141592653589793 rad + pos: -70.5,-5.5 parent: 5350 - uid: 9158 components: @@ -13647,12 +13887,14 @@ entities: - uid: 10294 components: - type: Transform - pos: 39.5,-15.5 + rot: 3.141592653589793 rad + pos: 34.5,-12.5 parent: 5350 - uid: 11035 components: - type: Transform - pos: 34.5,-17.5 + rot: 1.5707963267948966 rad + pos: 39.5,-15.5 parent: 5350 - uid: 11212 components: @@ -13662,48 +13904,34 @@ entities: - uid: 14164 components: - type: Transform - pos: -63.5,-7.5 + pos: -11.5,-74.5 parent: 5350 - uid: 14682 components: - type: Transform - pos: -70.5,-7.5 + pos: -9.5,-74.5 parent: 5350 - uid: 14683 components: - type: Transform - pos: -63.5,6.5 + pos: -3.5,-74.5 parent: 5350 - uid: 14684 - components: - - type: Transform - pos: -70.5,6.5 - parent: 5350 - - uid: 20063 - components: - - type: Transform - pos: -11.5,-74.5 - parent: 5350 - - uid: 20064 - components: - - type: Transform - pos: -9.5,-74.5 - parent: 5350 - - uid: 20065 - components: - - type: Transform - pos: -3.5,-74.5 - parent: 5350 - - uid: 20066 components: - type: Transform pos: -1.5,-74.5 parent: 5350 - - uid: 20167 + - uid: 14913 components: - type: Transform pos: -70.5,4.5 parent: 5350 + - uid: 24792 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,4.5 + parent: 5350 - proto: AtmosFixBlockerMarker entities: - uid: 11609 @@ -60938,6 +61166,22 @@ entities: - type: Transform pos: -16.428204,45.62322 parent: 5350 +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 20063 + components: + - type: Transform + parent: 9140 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 20064 + components: + - type: Transform + parent: 10335 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingOuterHoodieBlack entities: - uid: 22120 @@ -73877,18 +74121,20 @@ entities: - type: Transform pos: 68.5,-19.5 parent: 5350 -- proto: GasMinerNitrogen +- proto: GasMinerNitrogenStationLarge entities: - uid: 11574 components: - type: Transform + rot: -1.5707963267948966 rad pos: 52.5,-29.5 parent: 5350 -- proto: GasMinerOxygen +- proto: GasMinerOxygenStationLarge entities: - - uid: 11585 + - uid: 3116 components: - type: Transform + rot: -1.5707963267948966 rad pos: 56.5,-29.5 parent: 5350 - proto: GasMixer @@ -112750,6 +112996,16 @@ entities: - type: Transform pos: 9.5,-62.5 parent: 5350 + - uid: 20065 + components: + - type: Transform + pos: -34.5,-75.5 + parent: 5350 + - uid: 20066 + components: + - type: Transform + pos: -34.5,-74.5 + parent: 5350 - uid: 20067 components: - type: Transform @@ -112935,6 +113191,11 @@ entities: - type: Transform pos: -0.5,-68.5 parent: 5350 + - uid: 20167 + components: + - type: Transform + pos: -34.5,-77.5 + parent: 5350 - uid: 21454 components: - type: Transform @@ -113195,6 +113456,56 @@ entities: rot: 1.5707963267948966 rad pos: 94.5,19.5 parent: 5350 + - uid: 24782 + components: + - type: Transform + pos: -33.5,-77.5 + parent: 5350 + - uid: 24783 + components: + - type: Transform + pos: -32.5,-77.5 + parent: 5350 + - uid: 24784 + components: + - type: Transform + pos: -31.5,-77.5 + parent: 5350 + - uid: 24785 + components: + - type: Transform + pos: -30.5,-77.5 + parent: 5350 + - uid: 24786 + components: + - type: Transform + pos: -28.5,-77.5 + parent: 5350 + - uid: 24787 + components: + - type: Transform + pos: -27.5,-77.5 + parent: 5350 + - uid: 24788 + components: + - type: Transform + pos: -26.5,-77.5 + parent: 5350 + - uid: 24789 + components: + - type: Transform + pos: -25.5,-77.5 + parent: 5350 + - uid: 24790 + components: + - type: Transform + pos: -36.5,-74.5 + parent: 5350 + - uid: 24791 + components: + - type: Transform + pos: -37.5,-74.5 + parent: 5350 - uid: 24922 components: - type: Transform @@ -116098,12 +116409,24 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-28.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 23500: + - Pressed: Open + 24195: + - Pressed: Open - uid: 24780 components: - type: Transform rot: -1.5707963267948966 rad pos: -17.5,-31.5 parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 24820: + - Pressed: Open + 26601: + - Pressed: Open - proto: LockableButtonSecurity entities: - uid: 6261 @@ -132903,23 +133226,6 @@ entities: linkedPorts: 10293: - Pressed: Toggle - - uid: 14913 - components: - - type: Transform - pos: -12.5,-38.5 - parent: 5350 - - type: DeviceLinkSource - linkedPorts: - 14916: - - Pressed: Toggle - 14915: - - Pressed: Toggle - 14914: - - Pressed: Toggle - 14918: - - Pressed: Toggle - 14917: - - Pressed: Toggle - uid: 15183 components: - type: Transform @@ -133156,6 +133462,24 @@ entities: - Pressed: Toggle 23565: - Pressed: Toggle + - uid: 11585 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-38.5 + parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 14917: + - Pressed: Toggle + 14918: + - Pressed: Toggle + 14914: + - Pressed: Toggle + 14915: + - Pressed: Toggle + 14916: + - Pressed: Toggle - uid: 12454 components: - type: Transform @@ -133246,8 +133570,6 @@ entities: - type: Transform pos: 44.5,-4.5 parent: 5350 -- proto: SignAtmosMinsky - entities: - uid: 11495 components: - type: Transform @@ -133292,26 +133614,22 @@ entities: pos: -13.5,-64.5 parent: 5350 - proto: SignChem - entities: - - uid: 15672 - components: - - type: Transform - pos: -17.5,-28.5 - parent: 5350 -- proto: SignChemistry1 entities: - uid: 14204 components: - type: Transform pos: -19.5,-21.5 parent: 5350 -- proto: SignChemistry2 - entities: - uid: 15671 components: - type: Transform pos: -13.5,-23.5 parent: 5350 + - uid: 15672 + components: + - type: Transform + pos: -17.5,-28.5 + parent: 5350 - proto: SignCloning entities: - uid: 15048 @@ -133735,13 +134053,6 @@ entities: rot: 1.5707963267948966 rad pos: -44.5,-5.5 parent: 5350 -- proto: SignDrones - entities: - - uid: 8902 - components: - - type: Transform - pos: 44.5,-0.5 - parent: 5350 - proto: SignElectricalMed entities: - uid: 1672 @@ -133919,19 +134230,17 @@ entities: pos: -11.5,-6.5 parent: 5350 - proto: SignHydro1 - entities: - - uid: 2335 - components: - - type: Transform - pos: 20.5,-21.5 - parent: 5350 -- proto: SignHydro2 entities: - uid: 2326 components: - type: Transform pos: 20.5,-15.5 parent: 5350 + - uid: 2335 + components: + - type: Transform + pos: 20.5,-21.5 + parent: 5350 - proto: SignInterrogation entities: - uid: 10009 @@ -133992,6 +134301,13 @@ entities: - type: Transform pos: -35.5,6.5 parent: 5350 +- proto: SignMaterials + entities: + - uid: 8902 + components: + - type: Transform + pos: 44.5,-0.5 + parent: 5350 - proto: SignMedical entities: - uid: 7333 @@ -134024,13 +134340,6 @@ entities: - type: Transform pos: 36.5,-30.5 parent: 5350 -- proto: SignMinerDock - entities: - - uid: 4097 - components: - - type: Transform - pos: -39.5,22.5 - parent: 5350 - proto: SignMorgue entities: - uid: 15028 @@ -134125,7 +134434,7 @@ entities: - type: Transform pos: -0.5,-33.5 parent: 5350 -- proto: SignScience1 +- proto: SignScience entities: - uid: 9789 components: @@ -134327,6 +134636,13 @@ entities: - type: Transform pos: -0.5,22.5 parent: 5350 +- proto: SignShipDock + entities: + - uid: 4097 + components: + - type: Transform + pos: -39.5,22.5 + parent: 5350 - proto: SignSmoking entities: - uid: 11369 @@ -134483,7 +134799,7 @@ entities: - type: Transform pos: 23.5,5.5 parent: 5350 -- proto: SignToxins2 +- proto: SignToxins entities: - uid: 22182 components: @@ -137950,11 +138266,61 @@ entities: - type: Transform pos: -7.5,37.5 parent: 5350 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20063 - uid: 10335 components: - type: Transform pos: -7.5,38.5 parent: 5350 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 20064 - proto: SuitStorageWarden entities: - uid: 10358 diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index 7353864af1..ae213b3dd1 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -315,11 +315,11 @@ entities: version: 6 0,4: ind: 0,4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,4: ind: 1,4 - tiles: gAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,0: ind: -4,0 @@ -11860,6 +11860,8 @@ entities: - type: Transform pos: -32.5,34.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 - type: DeviceLinkSource linkedPorts: 28923: @@ -12445,55 +12447,6 @@ entities: - type: Transform pos: 45.5,2.5 parent: 2 -- proto: AirlockExternalEngineeringLocked - entities: - - uid: 19542 - components: - - type: Transform - pos: -50.5,-49.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 19543: - - DoorStatus: DoorBolt - - uid: 19543 - components: - - type: Transform - pos: -49.5,-51.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 19542: - - DoorStatus: DoorBolt - - uid: 19544 - components: - - type: Transform - pos: -47.5,-54.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 19545: - - DoorStatus: DoorBolt - 19546: - - DoorStatus: DoorBolt - - uid: 19545 - components: - - type: Transform - pos: -48.5,-55.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 19544: - - DoorStatus: DoorBolt - - uid: 19546 - components: - - type: Transform - pos: -46.5,-55.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 19544: - - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: - uid: 13141 @@ -12560,6 +12513,8 @@ entities: - DoorStatus: DoorBolt 8505: - DoorStatus: DoorBolt + 8504: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 826 @@ -12599,8 +12554,67 @@ entities: - type: Transform pos: -58.5,-17.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 - proto: AirlockExternalGlassEngineeringLocked entities: + - uid: 234 + components: + - type: Transform + pos: -48.5,-55.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3673: + - DoorStatus: DoorBolt + - uid: 437 + components: + - type: Transform + pos: -46.5,-55.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3673: + - DoorStatus: DoorBolt + - uid: 3673 + components: + - type: Transform + pos: -47.5,-54.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 234: + - DoorStatus: DoorBolt + 437: + - DoorStatus: DoorBolt + - uid: 3888 + components: + - type: Transform + pos: -49.5,-51.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3902: + - DoorStatus: DoorBolt + - uid: 3902 + components: + - type: Transform + pos: -50.5,-49.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3888: + - DoorStatus: DoorBolt - uid: 6828 components: - type: Transform @@ -14467,7 +14481,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -4821.3525 + secondsUntilStateChange: -9254.769 state: Opening - uid: 6934 components: @@ -14479,7 +14493,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -4823.986 + secondsUntilStateChange: -9257.402 state: Opening - uid: 6935 components: @@ -14491,7 +14505,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -4822.836 + secondsUntilStateChange: -9256.252 state: Opening - uid: 6936 components: @@ -14502,7 +14516,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -4822.0522 + secondsUntilStateChange: -9255.469 state: Opening - proto: AirlockTheatreLocked entities: @@ -24789,11 +24803,6 @@ entities: - type: Transform pos: 60.5,30.5 parent: 21002 - - uid: 26395 - components: - - type: Transform - pos: 60.5,29.5 - parent: 21002 - uid: 26396 components: - type: Transform @@ -27124,11 +27133,6 @@ entities: - type: Transform pos: 57.5,-2.5 parent: 21002 - - uid: 27221 - components: - - type: Transform - pos: 57.5,-1.5 - parent: 21002 - uid: 27222 components: - type: Transform @@ -31754,11 +31758,6 @@ entities: - type: Transform pos: 25.5,-28.5 parent: 21002 - - uid: 25401 - components: - - type: Transform - pos: 41.5,-25.5 - parent: 21002 - uid: 25402 components: - type: Transform @@ -31839,11 +31838,6 @@ entities: - type: Transform pos: 39.5,-27.5 parent: 21002 - - uid: 25420 - components: - - type: Transform - pos: 38.5,-27.5 - parent: 21002 - uid: 25421 components: - type: Transform @@ -33044,11 +33038,6 @@ entities: - type: Transform pos: 90.5,-2.5 parent: 21002 - - uid: 27690 - components: - - type: Transform - pos: 90.5,-3.5 - parent: 21002 - uid: 27691 components: - type: Transform @@ -33109,11 +33098,6 @@ entities: - type: Transform pos: 88.5,-8.5 parent: 21002 - - uid: 27712 - components: - - type: Transform - pos: 88.5,-7.5 - parent: 21002 - uid: 27713 components: - type: Transform @@ -34932,54 +34916,153 @@ entities: - type: Transform pos: 67.5,52.5 parent: 21002 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 234 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,55.5 - parent: 2 - - uid: 437 + - uid: 6810 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,55.5 parent: 2 - - uid: 3673 + - uid: 6852 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 66.5,-3.5 + rot: 3.141592653589793 rad + pos: -4.5,55.5 parent: 2 - - uid: 3888 + - uid: 10392 components: - type: Transform rot: 1.5707963267948966 rad pos: 66.5,-5.5 parent: 2 - - uid: 3902 + - uid: 10676 components: - type: Transform + rot: 1.5707963267948966 rad + pos: 66.5,-3.5 + parent: 2 + - uid: 10677 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: 43.5,-26.5 parent: 2 - - uid: 6810 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,54.5 - parent: 2 - - uid: 6852 + - uid: 10690 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,54.5 parent: 2 - - uid: 10392 + - uid: 10848 components: - type: Transform + rot: 3.141592653589793 rad + pos: 30.5,54.5 + parent: 2 + - uid: 11333 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: -7.5,-68.5 parent: 2 + - uid: 11334 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-75.5 + parent: 2 + - uid: 12849 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-75.5 + parent: 2 + - uid: 13187 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-68.5 + parent: 2 + - uid: 13210 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-80.5 + parent: 2 + - uid: 13262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,-4.5 + parent: 2 + - uid: 13345 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,-2.5 + parent: 2 + - uid: 13747 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-82.5 + parent: 2 + - uid: 13773 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,-17.5 + parent: 2 + - uid: 16803 + components: + - type: Transform + pos: -13.5,-58.5 + parent: 2 + - uid: 18705 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-80.5 + parent: 2 + - uid: 19542 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-82.5 + parent: 2 + - uid: 19543 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 66.5,2.5 + parent: 2 + - uid: 19544 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 66.5,4.5 + parent: 2 + - uid: 25960 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,-1.5 + parent: 2 + - uid: 26097 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.5,-5.5 + parent: 2 + - uid: 26114 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-80.5 + parent: 2 +- proto: AtmosDeviceFanTiny + entities: - uid: 10578 components: - type: Transform @@ -34992,65 +35075,6 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,21.5 parent: 2 - - uid: 10676 - components: - - type: Transform - pos: -7.5,-75.5 - parent: 2 - - uid: 10677 - components: - - type: Transform - pos: 2.5,-75.5 - parent: 2 - - uid: 10690 - components: - - type: Transform - pos: 2.5,-68.5 - parent: 2 - - uid: 10848 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-82.5 - parent: 2 - - uid: 11333 - components: - - type: Transform - pos: -61.5,-4.5 - parent: 2 - - uid: 11334 - components: - - type: Transform - pos: -61.5,-2.5 - parent: 2 - - uid: 12849 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-80.5 - parent: 2 - - uid: 16803 - components: - - type: Transform - pos: -61.5,-17.5 - parent: 2 - - uid: 18705 - components: - - type: Transform - pos: -13.5,-58.5 - parent: 2 - - uid: 19960 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-82.5 - parent: 2 - - uid: 19965 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-80.5 - parent: 2 - uid: 21017 components: - type: Transform @@ -35063,16 +35087,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,0.5 parent: 21002 - - uid: 24241 - components: - - type: Transform - pos: 66.5,4.5 - parent: 2 - - uid: 24242 - components: - - type: Transform - pos: 66.5,2.5 - parent: 2 - proto: AtmosFixBlockerMarker entities: - uid: 9290 @@ -37079,11 +37093,6 @@ entities: enabled: False - proto: Bola entities: - - uid: 22398 - components: - - type: Transform - pos: 30.540497,21.53258 - parent: 21002 - uid: 23396 components: - type: Transform @@ -37415,20 +37424,6 @@ entities: rot: -1.5707963267948966 rad pos: -46.350143,-26.356361 parent: 2 - - uid: 22198 - components: - - type: Transform - parent: 22197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 22200 - components: - - type: Transform - parent: 22197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: BoxFolderBlack entities: - uid: 818 @@ -75802,34 +75797,6 @@ entities: - type: Transform pos: -36.5,-49.5 parent: 2 - - uid: 22064 - components: - - type: Transform - pos: 26.5,17.5 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 22206 - components: - - type: Transform - pos: 67.5,30.5 - parent: 21002 - uid: 23747 components: - type: Transform @@ -75840,21 +75807,6 @@ entities: - type: Transform pos: 25.5,-30.5 parent: 2 - - uid: 25556 - components: - - type: Transform - pos: 66.5,22.5 - parent: 21002 - - uid: 25559 - components: - - type: Transform - pos: 42.5,-1.5 - parent: 21002 - - uid: 25571 - components: - - type: Transform - pos: 58.5,2.5 - parent: 21002 - proto: ClosetRadiationSuitFilled entities: - uid: 9793 @@ -75913,15 +75865,6 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,54.5 parent: 2 -- proto: ClothingBeltMercWebbing - entities: - - uid: 21681 - components: - - type: Transform - parent: 21678 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingBeltStorageWaistbag entities: - uid: 26598 @@ -76066,15 +76009,6 @@ entities: - type: Transform pos: -11.381896,-50.376205 parent: 2 -- proto: ClothingHeadBandMerc - entities: - - uid: 21680 - components: - - type: Transform - parent: 21678 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingHeadHatAnimalCat entities: - uid: 19173 @@ -76295,22 +76229,6 @@ entities: - type: Transform pos: 44.357983,36.68563 parent: 2 -- proto: ClothingHeadHelmetEVALarge - entities: - - uid: 22362 - components: - - type: Transform - parent: 22361 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 22364 - components: - - type: Transform - parent: 22361 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingHeadHelmetFire entities: - uid: 23802 @@ -76353,20 +76271,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingHeadsetGrey - entities: - - uid: 21600 - components: - - type: Transform - pos: 49.503967,15.507565 - parent: 21002 -- proto: ClothingHeadsetMining - entities: - - uid: 26968 - components: - - type: Transform - pos: 19.579208,14.445946 - parent: 21002 - proto: ClothingMaskBreath entities: - uid: 2071 @@ -76549,22 +76453,6 @@ entities: - type: Transform pos: -36.5237,-64.52039 parent: 2 -- proto: ClothingOuterHardsuitEVAPrisoner - entities: - - uid: 22363 - components: - - type: Transform - parent: 22361 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 22365 - components: - - type: Transform - parent: 22361 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingOuterRobesJudge entities: - uid: 3517 @@ -76631,15 +76519,6 @@ entities: - type: Transform pos: 48.609123,6.4890294 parent: 2 -- proto: ClothingShoesBootsMerc - entities: - - uid: 21679 - components: - - type: Transform - parent: 21678 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingShoesBootsWork entities: - uid: 5865 @@ -78211,13 +78090,6 @@ entities: - type: Transform pos: 8.5,30.5 parent: 2 -- proto: CrateEngineeringMiniJetpack - entities: - - uid: 26711 - components: - - type: Transform - pos: 67.5,54.5 - parent: 21002 - proto: CrateEngineeringSecure entities: - uid: 23789 @@ -78413,420 +78285,6 @@ entities: showEnts: False occludes: True ent: null - - uid: 21559 - components: - - type: Transform - pos: 46.47821,25.633486 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 21560 - - 21561 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 21647 - components: - - type: Transform - pos: 76.5417,-19.306087 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 21648 - - 21649 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 21678 - components: - - type: Transform - pos: 54.584427,32.651142 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 21679 - - 21680 - - 21681 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 21845 - components: - - type: Transform - pos: 57.52028,-18.43192 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 21847 - - 21846 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 21982 - components: - - type: Transform - pos: 90.51018,-6.3049965 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 21983 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 22143 - components: - - type: Transform - pos: 40.5,20.5 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 22145 - - 22144 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 22197 - components: - - type: Transform - pos: 43.5,-3.5 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 22198 - - 22199 - - 22200 - - 22201 - - 22202 - - 22203 - - 22204 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 22361 - components: - - type: Transform - pos: 2.5,31.5 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 22365 - - 22364 - - 22363 - - 22362 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 22574 - components: - - type: Transform - pos: 26.5,41.5 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 22247 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 25364 - components: - - type: Transform - pos: 19.5,-31.5 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 25365 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 25516 - components: - - type: Transform - pos: 26.5,-15.5 - parent: 21002 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14673 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 27840 - - 25520 - - 25517 - - 25518 - - 25519 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 26770 - components: - - type: Transform - pos: 37.5,-17.5 - parent: 21002 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 26771 - - 26772 - - 26773 - - 26774 - - 26775 - - 26776 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateInternals entities: - uid: 11961 @@ -78897,6 +78355,293 @@ entities: - type: Transform pos: 22.5,4.5 parent: 2 +- proto: CratePermaEscapeSpawner + entities: + - uid: 26395 + components: + - type: Transform + pos: 60.5,29.5 + parent: 21002 + - uid: 26407 + components: + - type: Transform + pos: 57.5,-1.5 + parent: 21002 + - uid: 26523 + components: + - type: Transform + pos: 41.5,-25.5 + parent: 21002 + - uid: 26711 + components: + - type: Transform + pos: 38.5,-27.5 + parent: 21002 + - uid: 26770 + components: + - type: Transform + pos: 90.5,-3.5 + parent: 21002 + - uid: 26771 + components: + - type: Transform + pos: 88.5,-7.5 + parent: 21002 + - uid: 26772 + components: + - type: Transform + pos: 30.5,21.5 + parent: 21002 + - uid: 26773 + components: + - type: Transform + pos: 43.5,-3.5 + parent: 21002 + - uid: 26774 + components: + - type: Transform + pos: 26.5,17.5 + parent: 21002 + - uid: 26775 + components: + - type: Transform + pos: 66.5,22.5 + parent: 21002 + - uid: 26776 + components: + - type: Transform + pos: 67.5,30.5 + parent: 21002 + - uid: 26825 + components: + - type: Transform + pos: 42.5,-1.5 + parent: 21002 + - uid: 26841 + components: + - type: Transform + pos: 58.5,2.5 + parent: 21002 + - uid: 26968 + components: + - type: Transform + pos: 54.5,32.5 + parent: 21002 + - uid: 27221 + components: + - type: Transform + pos: 2.5,31.5 + parent: 21002 + - uid: 27391 + components: + - type: Transform + pos: 49.5,15.5 + parent: 21002 + - uid: 27690 + components: + - type: Transform + pos: 26.5,12.5 + parent: 21002 + - uid: 27705 + components: + - type: Transform + pos: 67.5,54.5 + parent: 21002 + - uid: 27712 + components: + - type: Transform + pos: 46.5,25.5 + parent: 21002 + - uid: 27840 + components: + - type: Transform + pos: 72.5,-12.5 + parent: 21002 + - uid: 27907 + components: + - type: Transform + pos: 51.5,-18.5 + parent: 21002 + - uid: 28925 + components: + - type: Transform + pos: 90.5,-6.5 + parent: 21002 + - uid: 28926 + components: + - type: Transform + pos: 40.5,20.5 + parent: 21002 + - uid: 28927 + components: + - type: Transform + pos: 21.5,36.5 + parent: 21002 + - uid: 28928 + components: + - type: Transform + pos: 21.5,-29.5 + parent: 21002 + - uid: 28929 + components: + - type: Transform + pos: 26.5,-15.5 + parent: 21002 + - uid: 28930 + components: + - type: Transform + pos: 37.5,-17.5 + parent: 21002 + - uid: 28931 + components: + - type: Transform + pos: 75.5,-1.5 + parent: 21002 + - uid: 28932 + components: + - type: Transform + pos: 51.5,-9.5 + parent: 21002 + - uid: 28933 + components: + - type: Transform + pos: 50.5,2.5 + parent: 21002 + - uid: 28934 + components: + - type: Transform + pos: 59.5,23.5 + parent: 21002 + - uid: 28935 + components: + - type: Transform + pos: 22.5,21.5 + parent: 21002 + - uid: 28936 + components: + - type: Transform + pos: 49.5,12.5 + parent: 21002 + - uid: 28937 + components: + - type: Transform + pos: 4.5,25.5 + parent: 21002 + - uid: 28938 + components: + - type: Transform + pos: 19.5,14.5 + parent: 21002 + - uid: 28939 + components: + - type: Transform + pos: 26.5,41.5 + parent: 21002 + - uid: 28940 + components: + - type: Transform + pos: 19.5,-31.5 + parent: 21002 + - uid: 28941 + components: + - type: Transform + pos: 5.5,28.5 + parent: 21002 + - uid: 28942 + components: + - type: Transform + pos: 24.5,37.5 + parent: 21002 + - uid: 28943 + components: + - type: Transform + pos: 45.5,1.5 + parent: 21002 + - uid: 28944 + components: + - type: Transform + pos: 46.5,18.5 + parent: 21002 + - uid: 28945 + components: + - type: Transform + pos: 60.5,15.5 + parent: 21002 + - uid: 28946 + components: + - type: Transform + pos: 45.5,29.5 + parent: 21002 + - uid: 28947 + components: + - type: Transform + pos: 14.5,25.5 + parent: 21002 + - uid: 28948 + components: + - type: Transform + pos: 56.5,3.5 + parent: 21002 + - uid: 28949 + components: + - type: Transform + pos: 54.5,40.5 + parent: 21002 + - uid: 28950 + components: + - type: Transform + pos: 68.5,43.5 + parent: 21002 + - uid: 28951 + components: + - type: Transform + pos: 70.5,52.5 + parent: 21002 + - uid: 28952 + components: + - type: Transform + pos: 69.5,50.5 + parent: 21002 + - uid: 28953 + components: + - type: Transform + pos: 33.5,-11.5 + parent: 21002 + - uid: 28954 + components: + - type: Transform + pos: 85.5,6.5 + parent: 21002 + - uid: 28955 + components: + - type: Transform + pos: 29.5,-12.5 + parent: 21002 + - uid: 28956 + components: + - type: Transform + pos: 31.5,-17.5 + parent: 21002 + - uid: 28957 + components: + - type: Transform + pos: 66.5,-3.5 + parent: 21002 + - uid: 28958 + components: + - type: Transform + pos: 76.5,-19.5 + parent: 21002 + - uid: 28959 + components: + - type: Transform + pos: 57.5,-18.5 + parent: 21002 + - uid: 28960 + components: + - type: Transform + pos: 32.5,-33.5 + parent: 21002 - proto: CratePrivateSecure entities: - uid: 15009 @@ -92437,6 +92182,9 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-1.5 parent: 2 + - type: Door + secondsUntilStateChange: -578.74854 + state: Closing - type: DeviceNetwork deviceLists: - 18275 @@ -96759,14 +96507,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13747 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-4.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13748 components: - type: Transform @@ -96849,14 +96589,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13773 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-9.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13774 components: - type: Transform @@ -98247,6 +97979,22 @@ entities: - type: Physics canCollide: True bodyType: Dynamic + - uid: 22199 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22201 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-9.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 22274 components: - type: Transform @@ -98308,6 +98056,21 @@ entities: - type: Transform pos: -32.5,27.5 parent: 2 + - uid: 23528 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 23532 + components: + - type: Transform + pos: -10.5,-13.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 23541 components: - type: Transform @@ -98410,6 +98173,29 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 25516 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25559 + components: + - type: Transform + pos: -10.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25560 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 26448 components: - type: Transform @@ -101297,14 +101083,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13187 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,-0.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13188 components: - type: Transform @@ -101433,14 +101211,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13210 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,1.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13211 components: - type: Transform @@ -101707,13 +101477,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13262 - components: - - type: Transform - pos: -0.5,-15.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 13263 components: - type: Transform @@ -102178,13 +101941,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13345 - components: - - type: Transform - pos: 1.5,-15.5 - parent: 2 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 13346 components: - type: Transform @@ -118239,6 +117995,21 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 19960 + components: + - type: Transform + pos: -15.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 19965 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 21142 components: - type: Transform @@ -118519,11 +118290,42 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 21532 + components: + - type: Transform + pos: -15.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 21654 components: - type: Transform pos: -34.5,24.5 parent: 2 + - uid: 22203 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 22206 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22247 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 22320 components: - type: Transform @@ -118540,6 +118342,54 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 22361 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22362 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22363 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22364 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22365 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22398 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 22450 components: - type: Transform @@ -118671,6 +118521,14 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 22574 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 22661 components: - type: Transform @@ -119323,6 +119181,21 @@ entities: - type: Transform pos: -32.5,25.5 parent: 2 + - uid: 23533 + components: + - type: Transform + pos: -10.5,-14.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 23534 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 23538 components: - type: Transform @@ -119643,6 +119516,20 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 24241 + components: + - type: Transform + pos: -15.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 24242 + components: + - type: Transform + pos: -15.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 25219 components: - type: Transform @@ -119945,6 +119832,105 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 25362 + components: + - type: Transform + pos: -15.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25364 + components: + - type: Transform + pos: -15.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25365 + components: + - type: Transform + pos: -15.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25401 + components: + - type: Transform + pos: -15.5,-8.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25420 + components: + - type: Transform + pos: -15.5,-9.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25518 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 25555 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25556 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25557 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25558 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-9.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25561 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 25562 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 26460 components: - type: Transform @@ -123070,6 +123056,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 19545 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 19546 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-9.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 21166 components: - type: Transform @@ -123085,12 +123087,27 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 21344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 21742 components: - type: Transform rot: 3.141592653589793 rad pos: -33.5,23.5 parent: 2 + - uid: 22204 + components: + - type: Transform + pos: -15.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 22671 components: - type: Transform @@ -123199,6 +123216,22 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 25517 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25520 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 27898 components: - type: Transform @@ -125727,6 +125760,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 23535 + components: + - type: Transform + pos: -11.5,-8.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 23704 components: - type: Transform @@ -125765,6 +125805,22 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-44.5 parent: 21002 + - uid: 25563 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 25571 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 27894 components: - type: Transform @@ -127507,6 +127563,22 @@ entities: parent: 21002 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 22200 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 22202 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 22490 components: - type: Transform @@ -127643,6 +127715,14 @@ entities: - 21371 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 25649 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-13.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 26474 components: - type: Transform @@ -127707,50 +127787,6 @@ entities: - type: Transform pos: 39.5,11.5 parent: 2 -- proto: GlowstickYellow - entities: - - uid: 26771 - components: - - type: Transform - parent: 26770 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 26772 - components: - - type: Transform - parent: 26770 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 26773 - components: - - type: Transform - parent: 26770 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 26774 - components: - - type: Transform - parent: 26770 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 26775 - components: - - type: Transform - parent: 26770 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 26776 - components: - - type: Transform - parent: 26770 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: GrassBattlemap entities: - uid: 9690 @@ -136175,7 +136211,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -32977.18 + secondsUntilStateChange: -37410.598 state: Opening - uid: 5211 components: @@ -136821,13 +136857,6 @@ entities: rot: 3.141592653589793 rad pos: 47.40576,3.310136 parent: 2 - - uid: 25365 - components: - - type: Transform - parent: 25364 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: JugWeldingFuel entities: - uid: 21351 @@ -138606,15 +138635,6 @@ entities: rot: 3.141592653589793 rad pos: -28.405407,4.838667 parent: 2 -- proto: MindShieldImplanter - entities: - - uid: 27840 - components: - - type: Transform - parent: 25516 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: MiningWindow entities: - uid: 548 @@ -139760,20 +139780,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 21846 - components: - - type: Transform - parent: 21845 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 21847 - components: - - type: Transform - parent: 21845 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: Pen entities: - uid: 1052 @@ -139866,27 +139872,6 @@ entities: rot: -1.5707963267948966 rad pos: 24.686314,-51.342354 parent: 2 - - uid: 22199 - components: - - type: Transform - parent: 22197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 22201 - components: - - type: Transform - parent: 22197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 22203 - components: - - type: Transform - parent: 22197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22775 components: - type: Transform @@ -144271,7 +144256,7 @@ entities: pos: -26.5,32.5 parent: 2 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#0335FCFF' - uid: 9020 components: - type: Transform @@ -144279,7 +144264,7 @@ entities: pos: -24.5,30.5 parent: 2 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#0335FCFF' - proto: Protolathe entities: - uid: 7789 @@ -151232,13 +151217,6 @@ entities: parent: 2 - proto: RubberStampApproved entities: - - uid: 22202 - components: - - type: Transform - parent: 22197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 23360 components: - type: Transform @@ -151251,13 +151229,6 @@ entities: parent: 2 - proto: RubberStampDenied entities: - - uid: 22204 - components: - - type: Transform - parent: 22197 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 23361 components: - type: Transform @@ -151653,20 +151624,6 @@ entities: - type: Transform pos: -27.53622,43.555347 parent: 2 - - uid: 21560 - components: - - type: Transform - parent: 21559 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 21561 - components: - - type: Transform - parent: 21559 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 28346 components: - type: Transform @@ -152899,6 +152856,8 @@ entities: - Pressed: Toggle 9965: - Pressed: Toggle + 10308: + - Pressed: DoorBolt - uid: 10588 components: - type: MetaData @@ -156659,183 +156618,6 @@ entities: - type: Transform pos: -17.5,28.5 parent: 2 -- proto: SpaceTickCube - entities: - - uid: 25517 - components: - - type: Transform - parent: 25516 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 25518 - components: - - type: Transform - parent: 25516 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 25519 - components: - - type: Transform - parent: 25516 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 25520 - components: - - type: Transform - parent: 25516 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: SpaceTickSpawner - entities: - - uid: 21344 - components: - - type: Transform - pos: 75.5,-1.5 - parent: 21002 - - uid: 21532 - components: - - type: Transform - pos: 51.5,-9.5 - parent: 21002 - - uid: 21773 - components: - - type: Transform - pos: 50.5,2.5 - parent: 21002 - - uid: 22147 - components: - - type: Transform - pos: 59.5,23.5 - parent: 21002 - - uid: 23528 - components: - - type: Transform - pos: 22.5,21.5 - parent: 21002 - - uid: 23532 - components: - - type: Transform - pos: 49.5,12.5 - parent: 21002 - - uid: 23533 - components: - - type: Transform - pos: 4.5,25.5 - parent: 21002 - - uid: 23534 - components: - - type: Transform - pos: 26.5,12.5 - parent: 21002 - - uid: 23535 - components: - - type: Transform - pos: 21.5,36.5 - parent: 21002 - - uid: 25362 - components: - - type: Transform - pos: 21.5,-29.5 - parent: 21002 - - uid: 25555 - components: - - type: Transform - pos: 5.5,28.5 - parent: 21002 - - uid: 25557 - components: - - type: Transform - pos: 24.5,37.5 - parent: 21002 - - uid: 25558 - components: - - type: Transform - pos: 45.5,1.5 - parent: 21002 - - uid: 25560 - components: - - type: Transform - pos: 46.5,18.5 - parent: 21002 - - uid: 25561 - components: - - type: Transform - pos: 60.5,15.5 - parent: 21002 - - uid: 25562 - components: - - type: Transform - pos: 45.5,29.5 - parent: 21002 - - uid: 25563 - components: - - type: Transform - pos: 14.5,25.5 - parent: 21002 - - uid: 25649 - components: - - type: Transform - pos: 56.5,3.5 - parent: 21002 - - uid: 25960 - components: - - type: Transform - pos: 54.5,40.5 - parent: 21002 - - uid: 26097 - components: - - type: Transform - pos: 68.5,43.5 - parent: 21002 - - uid: 26114 - components: - - type: Transform - pos: 70.5,52.5 - parent: 21002 - - uid: 26172 - components: - - type: Transform - pos: 69.5,50.5 - parent: 21002 - - uid: 26407 - components: - - type: Transform - pos: 33.5,-11.5 - parent: 21002 - - uid: 26523 - components: - - type: Transform - pos: 85.5,6.5 - parent: 21002 - - uid: 26825 - components: - - type: Transform - pos: 29.5,-12.5 - parent: 21002 - - uid: 26841 - components: - - type: Transform - pos: 31.5,-17.5 - parent: 21002 - - uid: 27391 - components: - - type: Transform - pos: 66.5,-3.5 - parent: 21002 - - uid: 27705 - components: - - type: Transform - pos: 72.5,-12.5 - parent: 21002 - - uid: 27907 - components: - - type: Transform - pos: 51.5,-18.5 - parent: 21002 - proto: SpaceVillainArcadeComputerCircuitboard entities: - uid: 5813 @@ -158358,22 +158140,6 @@ entities: - type: Transform pos: 44.5,-11.5 parent: 2 -- proto: StimpackMini - entities: - - uid: 22144 - components: - - type: Transform - parent: 22143 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 22145 - components: - - type: Transform - parent: 22143 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: Stool entities: - uid: 930 @@ -162943,22 +162709,6 @@ entities: - type: Transform pos: 16.02112,29.37049 parent: 2 -- proto: TowercapSeeds - entities: - - uid: 21648 - components: - - type: Transform - parent: 21647 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 21649 - components: - - type: Transform - parent: 21647 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ToyAi entities: - uid: 12731 @@ -174990,12 +174740,133 @@ entities: - type: Transform pos: 23.5,-9.5 parent: 21002 + - uid: 21559 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,77.5 + parent: 2 + - uid: 21560 + components: + - type: Transform + pos: 5.5,72.5 + parent: 2 + - uid: 21561 + components: + - type: Transform + pos: 4.5,72.5 + parent: 2 + - uid: 21600 + components: + - type: Transform + pos: 3.5,72.5 + parent: 2 + - uid: 21647 + components: + - type: Transform + pos: 3.5,71.5 + parent: 2 + - uid: 21648 + components: + - type: Transform + pos: 3.5,70.5 + parent: 2 + - uid: 21649 + components: + - type: Transform + pos: 21.5,72.5 + parent: 2 + - uid: 21678 + components: + - type: Transform + pos: 22.5,72.5 + parent: 2 + - uid: 21679 + components: + - type: Transform + pos: 23.5,72.5 + parent: 2 + - uid: 21680 + components: + - type: Transform + pos: 23.5,71.5 + parent: 2 + - uid: 21681 + components: + - type: Transform + pos: 23.5,70.5 + parent: 2 + - uid: 21773 + components: + - type: Transform + pos: 19.5,77.5 + parent: 2 + - uid: 21845 + components: + - type: Transform + pos: 18.5,77.5 + parent: 2 + - uid: 21846 + components: + - type: Transform + pos: 17.5,77.5 + parent: 2 + - uid: 21847 + components: + - type: Transform + pos: 16.5,77.5 + parent: 2 + - uid: 21982 + components: + - type: Transform + pos: 15.5,77.5 + parent: 2 + - uid: 21983 + components: + - type: Transform + pos: 14.5,77.5 + parent: 2 + - uid: 22064 + components: + - type: Transform + pos: 13.5,77.5 + parent: 2 + - uid: 22143 + components: + - type: Transform + pos: 12.5,77.5 + parent: 2 + - uid: 22144 + components: + - type: Transform + pos: 11.5,77.5 + parent: 2 + - uid: 22145 + components: + - type: Transform + pos: 10.5,77.5 + parent: 2 + - uid: 22147 + components: + - type: Transform + pos: 9.5,77.5 + parent: 2 - uid: 22168 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,24.5 parent: 21002 + - uid: 22197 + components: + - type: Transform + pos: 8.5,77.5 + parent: 2 + - uid: 22198 + components: + - type: Transform + pos: 7.5,77.5 + parent: 2 - uid: 22210 components: - type: Transform @@ -176548,6 +176419,12 @@ entities: - type: Transform pos: 25.5,-9.5 parent: 21002 + - uid: 26172 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,77.5 + parent: 2 - uid: 26691 components: - type: Transform @@ -182134,15 +182011,6 @@ entities: - type: Transform pos: 45.517193,-35.503773 parent: 2 -- proto: WeaponPistolMk58 - entities: - - uid: 22247 - components: - - type: Transform - parent: 22574 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: WeaponPistolN1984 entities: - uid: 4204 @@ -182150,15 +182018,6 @@ entities: - type: Transform pos: 32.46886,-20.362041 parent: 2 -- proto: WeaponProtoKineticAccelerator - entities: - - uid: 21983 - components: - - type: Transform - parent: 21982 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: WeaponRifleFoam entities: - uid: 15416 @@ -183950,7 +183809,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -378181.78 + secondsUntilStateChange: -382615.2 state: Opening - uid: 28863 components: diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index 3cbcd40652..ae09e9e5fd 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -78,7 +78,7 @@ entities: version: 6 -2,1: ind: -2,1 - tiles: WQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAABdgAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAADeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAHQAAAAABdgAAAAABdgAAAAADUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAAAWQAAAAADHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACHQAAAAABeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAA + tiles: WQAAAAACWQAAAAADWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAWQAAAAACWQAAAAABdgAAAAADdgAAAAAAdgAAAAABdgAAAAABdgAAAAADdgAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAADeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAWQAAAAADWQAAAAAAeQAAAAAAdgAAAAABdgAAAAABdgAAAAACdgAAAAACdgAAAAACWQAAAAADWQAAAAACWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAWQAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAACWQAAAAADWQAAAAACWQAAAAACeQAAAAAAWQAAAAAAWQAAAAADeQAAAAAAWQAAAAACWQAAAAAAWQAAAAACWQAAAAACWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABeQAAAAAAHQAAAAACHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAABHQAAAAADHQAAAAADeQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAACdgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAWQAAAAABeQAAAAAAWQAAAAAAWQAAAAADWQAAAAABeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABWQAAAAACeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAAHQAAAAABdgAAAAABdgAAAAADUAAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAACdgAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAAAWQAAAAADHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAADHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACHQAAAAABeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -2,0: ind: -2,0 @@ -90,7 +90,7 @@ entities: version: 6 -1,2: ind: -1,2 - tiles: BwAAAAAABwAAAAAABwAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADBwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAADHQAAAAABHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: BwAAAAAABwAAAAAABwAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADBwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABHQAAAAAAHQAAAAABBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAADHQAAAAACHQAAAAADHQAAAAADHQAAAAABHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,2: ind: 0,2 @@ -118,7 +118,7 @@ entities: version: 6 -2,2: ind: -2,2 - tiles: WQAAAAACWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAAAHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAABwAAAAAAeQAAAAAAeAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WQAAAAACWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAAAHQAAAAACeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,0: ind: 2,0 @@ -142,7 +142,7 @@ entities: version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAeAAAAAAALwAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAADLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAACLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAADHQAAAAAAeQAAAAAAWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADPgAAAAAAPgAAAAAAHQAAAAAAHQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAD + tiles: AAAAAAAAeAAAAAAALwAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAADLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAAAWQAAAAADWQAAAAAAWQAAAAABLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAALwAAAAAAWQAAAAACWQAAAAACWQAAAAADWQAAAAACLwAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAADeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAHQAAAAAAWQAAAAABWQAAAAABeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAACeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHQAAAAACHQAAAAADHQAAAAAAeQAAAAAAWQAAAAACWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAACeQAAAAAAWQAAAAAAWQAAAAAAWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAADPgAAAAAAPgAAAAAAHQAAAAAAHQAAAAAAWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAADWQAAAAADWQAAAAAAWQAAAAABWQAAAAABHQAAAAADHQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAADHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAABWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAD version: 6 0,-3: ind: 0,-3 @@ -174,7 +174,7 @@ entities: version: 6 -3,-2: ind: -3,-2 - tiles: AAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAABwAAAAAABwAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAACeQAAAAAAdgAAAAACdgAAAAABdgAAAAADdgAAAAABeQAAAAAABwAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAdgAAAAADdgAAAAACdgAAAAAABwAAAAAABwAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACdgAAAAADdgAAAAACeQAAAAAAeQAAAAAABwAAAAAABwAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAABwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAABBwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAA + tiles: AAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABdgAAAAACeQAAAAAAdgAAAAACdgAAAAABdgAAAAADdgAAAAABAAAAAAAAAAAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAdgAAAAADdgAAAAACdgAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAACdgAAAAADdgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAADdgAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAADeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAAAWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAABwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAABBwAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAeQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAHQAAAAAA version: 6 -2,-2: ind: -2,-2 @@ -210,7 +210,7 @@ entities: version: 6 -4,-2: ind: -4,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAABwAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAA version: 6 -5,-2: ind: -5,-2 @@ -361,6 +361,11 @@ entities: 867: -55,-9 868: -53,-11 1369: -19,-19 + - node: + color: '#FFFFFFFF' + id: Box + decals: + 1607: -13,-39 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -938,6 +943,12 @@ entities: 1396: -22,-13 1397: -22,-12 1606: 5,-4 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: Delivery + decals: + 1609: -49,-26 - node: cleanable: True color: '#FFFFFFFF' @@ -2306,6 +2317,12 @@ entities: id: SpaceStationSign7 decals: 953: 0,-13 + - node: + angle: 1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 1608: -13,-40 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale @@ -4280,6 +4297,21 @@ entities: - 12226 - 1853 - 1852 + - uid: 9593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-38.5 + parent: 4812 + - type: DeviceList + devices: + - 12321 + - 5071 + - 5072 + - 5224 + - 5223 + - 5225 + - 5222 - uid: 12171 components: - type: Transform @@ -4956,21 +4988,6 @@ entities: - 8591 - 8758 - 8770 - - uid: 12322 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-39.5 - parent: 4812 - - type: DeviceList - devices: - - 12321 - - 5072 - - 5071 - - 5223 - - 5222 - - 5224 - - 5225 - uid: 12325 components: - type: Transform @@ -5561,16 +5578,34 @@ entities: - type: Transform pos: 32.5,2.5 parent: 4812 + - uid: 8476 + components: + - type: Transform + pos: -47.5,-24.5 + parent: 4812 - uid: 9614 components: - type: Transform pos: -41.5,-27.5 parent: 4812 + - uid: 9637 + components: + - type: Transform + pos: -17.5,30.5 + parent: 4812 - uid: 9651 components: - type: Transform pos: -11.5,-56.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 12107: + - DoorStatus: Close + 9656: + - DoorStatus: Close - proto: AirlockExternalGlassAtmosphericsLocked entities: - uid: 6362 @@ -5578,11 +5613,23 @@ entities: - type: Transform pos: -47.5,-3.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6363: + - DoorStatus: DoorBolt - uid: 6363 components: - type: Transform pos: -50.5,-4.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6362: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 2919 @@ -5590,11 +5637,23 @@ entities: - type: Transform pos: 25.5,14.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2920: + - DoorStatus: DoorBolt - uid: 2920 components: - type: Transform pos: 28.5,14.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2919: + - DoorStatus: DoorBolt - uid: 3040 components: - type: Transform @@ -5612,16 +5671,34 @@ entities: - type: Transform pos: -56.5,-22.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10405: + - DoorStatus: DoorBolt - uid: 11139 components: - type: Transform pos: 38.5,-36.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11141: + - DoorStatus: DoorBolt - uid: 11141 components: - type: Transform pos: 35.5,-36.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11139: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - uid: 3760 @@ -5636,6 +5713,25 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-43.5 parent: 4812 +- proto: AirlockExternalGlassShuttleEscape + entities: + - uid: 3769 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-39.5 + parent: 4812 + - uid: 8492 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,32.5 + parent: 4812 + - uid: 10917 + components: + - type: Transform + pos: -47.5,-26.5 + parent: 4812 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 3190 @@ -5691,11 +5787,23 @@ entities: - type: Transform pos: -10.5,-59.5 parent: 4812 + - type: DeviceLinkSource + linkedPorts: + 9651: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - uid: 12107 components: - type: Transform pos: -11.5,-59.5 parent: 4812 + - type: DeviceLinkSource + linkedPorts: + 9651: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockExternalLocked entities: - uid: 2737 @@ -5703,36 +5811,78 @@ entities: - type: Transform pos: 12.5,31.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2814: + - DoorStatus: DoorBolt - uid: 2814 components: - type: Transform pos: 12.5,33.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2737: + - DoorStatus: DoorBolt - uid: 3349 components: - type: Transform pos: 21.5,10.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3350: + - DoorStatus: DoorBolt - uid: 3350 components: - type: Transform pos: 19.5,10.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3349: + - DoorStatus: DoorBolt - uid: 3686 components: - type: Transform pos: 3.5,44.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3687: + - DoorStatus: DoorBolt - uid: 3687 components: - type: Transform pos: 4.5,45.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 3686: + - DoorStatus: DoorBolt - uid: 10405 components: - type: Transform pos: -54.5,-22.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10406: + - DoorStatus: DoorBolt - proto: AirlockFreezer entities: - uid: 3119 @@ -6237,6 +6387,12 @@ entities: - type: Transform pos: 25.5,-34.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11676: + - DoorStatus: DoorBolt - uid: 11350 components: - type: Transform @@ -6252,6 +6408,12 @@ entities: - type: Transform pos: 25.5,-37.5 parent: 4812 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 11326: + - DoorStatus: DoorBolt - uid: 11802 components: - type: Transform @@ -6845,6 +7007,9 @@ entities: - type: Transform pos: -10.5,-40.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - uid: 12326 components: - type: Transform @@ -8016,16 +8181,6 @@ entities: - type: Transform pos: 37.5,-21.5 parent: 4812 - - uid: 8458 - components: - - type: Transform - pos: -19.5,36.5 - parent: 4812 - - uid: 8459 - components: - - type: Transform - pos: -19.5,35.5 - parent: 4812 - uid: 8460 components: - type: Transform @@ -8056,31 +8211,6 @@ entities: - type: Transform pos: -20.5,31.5 parent: 4812 - - uid: 8466 - components: - - type: Transform - pos: -19.5,31.5 - parent: 4812 - - uid: 8467 - components: - - type: Transform - pos: -18.5,31.5 - parent: 4812 - - uid: 8468 - components: - - type: Transform - pos: -17.5,31.5 - parent: 4812 - - uid: 8469 - components: - - type: Transform - pos: -16.5,31.5 - parent: 4812 - - uid: 8470 - components: - - type: Transform - pos: -15.5,31.5 - parent: 4812 - uid: 8471 components: - type: Transform @@ -8101,101 +8231,11 @@ entities: - type: Transform pos: -14.5,32.5 parent: 4812 - - uid: 8475 - components: - - type: Transform - pos: -15.5,32.5 - parent: 4812 - - uid: 8476 - components: - - type: Transform - pos: -18.5,32.5 - parent: 4812 - - uid: 8479 - components: - - type: Transform - pos: -19.5,32.5 - parent: 4812 - - uid: 8480 - components: - - type: Transform - pos: -19.5,33.5 - parent: 4812 - - uid: 8483 - components: - - type: Transform - pos: -16.5,33.5 - parent: 4812 - uid: 8484 components: - type: Transform pos: -15.5,33.5 parent: 4812 - - uid: 8485 - components: - - type: Transform - pos: -15.5,34.5 - parent: 4812 - - uid: 8486 - components: - - type: Transform - pos: -16.5,34.5 - parent: 4812 - - uid: 8487 - components: - - type: Transform - pos: -17.5,34.5 - parent: 4812 - - uid: 8488 - components: - - type: Transform - pos: -18.5,34.5 - parent: 4812 - - uid: 8489 - components: - - type: Transform - pos: -19.5,34.5 - parent: 4812 - - uid: 8490 - components: - - type: Transform - pos: -18.5,35.5 - parent: 4812 - - uid: 8491 - components: - - type: Transform - pos: -17.5,35.5 - parent: 4812 - - uid: 8492 - components: - - type: Transform - pos: -16.5,35.5 - parent: 4812 - - uid: 8493 - components: - - type: Transform - pos: -17.5,36.5 - parent: 4812 - - uid: 8494 - components: - - type: Transform - pos: -18.5,36.5 - parent: 4812 - - uid: 8495 - components: - - type: Transform - pos: -18.5,37.5 - parent: 4812 - - uid: 8496 - components: - - type: Transform - pos: -18.5,38.5 - parent: 4812 - - uid: 8497 - components: - - type: Transform - pos: -17.5,38.5 - parent: 4812 - uid: 8498 components: - type: Transform @@ -8356,31 +8396,6 @@ entities: - type: Transform pos: -43.5,-32.5 parent: 4812 - - uid: 9630 - components: - - type: Transform - pos: -46.5,-29.5 - parent: 4812 - - uid: 9631 - components: - - type: Transform - pos: -46.5,-30.5 - parent: 4812 - - uid: 9632 - components: - - type: Transform - pos: -47.5,-29.5 - parent: 4812 - - uid: 9633 - components: - - type: Transform - pos: -46.5,-28.5 - parent: 4812 - - uid: 9637 - components: - - type: Transform - pos: -46.5,-26.5 - parent: 4812 - uid: 9638 components: - type: Transform @@ -9411,11 +9426,6 @@ entities: - type: Transform pos: 35.5,-41.5 parent: 4812 - - uid: 12144 - components: - - type: Transform - pos: -48.5,-25.5 - parent: 4812 - proto: AsteroidRockMining entities: - uid: 12146 @@ -9423,67 +9433,96 @@ entities: - type: Transform pos: -52.5,-3.5 parent: 4812 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 2781 components: - type: Transform - pos: 23.5,25.5 + rot: -1.5707963267948966 rad + pos: -13.5,-39.5 parent: 4812 - - uid: 2845 + - uid: 8478 components: - type: Transform + rot: 1.5707963267948966 rad pos: 23.5,27.5 parent: 4812 - - uid: 3260 + - uid: 8479 components: - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,25.5 + parent: 4812 + - uid: 8480 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: 34.5,-7.5 parent: 4812 - - uid: 3263 - components: - - type: Transform - pos: 34.5,0.5 - parent: 4812 - - uid: 3423 - components: - - type: Transform - pos: 34.5,-5.5 - parent: 4812 - - uid: 3424 + - uid: 8481 components: - type: Transform + rot: 1.5707963267948966 rad pos: 34.5,2.5 parent: 4812 - - uid: 3455 + - uid: 8483 components: - type: Transform - pos: 8.5,-6.5 + rot: 1.5707963267948966 rad + pos: 34.5,-5.5 parent: 4812 - - uid: 3456 + - uid: 8485 components: - type: Transform + rot: 1.5707963267948966 rad + pos: 34.5,0.5 + parent: 4812 + - uid: 8486 + components: + - type: Transform + rot: 3.141592653589793 rad pos: 4.5,-4.5 parent: 4812 - - uid: 3766 + - uid: 8487 components: - type: Transform - pos: -13.5,-50.5 + rot: 1.5707963267948966 rad + pos: 8.5,-6.5 parent: 4812 - - uid: 3767 + - uid: 8488 components: - type: Transform - pos: -8.5,-50.5 + rot: -1.5707963267948966 rad + pos: -14.5,-50.5 parent: 4812 - - uid: 3768 + - uid: 8489 components: - type: Transform - pos: -8.5,-43.5 + rot: 1.5707963267948966 rad + pos: -7.5,-50.5 parent: 4812 - - uid: 3769 + - uid: 8490 components: - type: Transform - pos: -13.5,-43.5 + rot: 1.5707963267948966 rad + pos: -7.5,-43.5 + parent: 4812 + - uid: 8491 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-43.5 + parent: 4812 + - uid: 8494 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,32.5 + parent: 4812 + - uid: 9630 + components: + - type: Transform + pos: -47.5,-26.5 parent: 4812 - proto: AtmosFixBlockerMarker entities: @@ -16869,6 +16908,21 @@ entities: - type: Transform pos: -17.5,28.5 parent: 4812 + - uid: 8458 + components: + - type: Transform + pos: -17.5,31.5 + parent: 4812 + - uid: 8459 + components: + - type: Transform + pos: -17.5,30.5 + parent: 4812 + - uid: 8466 + components: + - type: Transform + pos: -17.5,29.5 + parent: 4812 - uid: 8908 components: - type: Transform @@ -28442,6 +28496,13 @@ entities: - Steel - Glass - Gold +- proto: CleanerDispenser + entities: + - uid: 8493 + components: + - type: Transform + pos: -20.5,-5.5 + parent: 4812 - proto: ClosetBombFilled entities: - uid: 6331 @@ -28633,6 +28694,11 @@ entities: showEnts: False occludes: True ent: null + - uid: 2845 + components: + - type: Transform + pos: -18.5,31.5 + parent: 4812 - uid: 3786 components: - type: Transform @@ -28915,6 +28981,11 @@ entities: showEnts: False occludes: True ent: null + - uid: 9632 + components: + - type: Transform + pos: -48.5,-25.5 + parent: 4812 - uid: 10407 components: - type: Transform @@ -29063,6 +29134,13 @@ entities: showEnts: False occludes: True ent: null +- proto: ClosetEmergencyN2FilledRandom + entities: + - uid: 9631 + components: + - type: Transform + pos: -12.5,-38.5 + parent: 4812 - proto: ClosetFireFilled entities: - uid: 1514 @@ -29236,43 +29314,11 @@ entities: showEnts: False occludes: True ent: null - - uid: 8328 + - uid: 8456 components: - type: Transform - pos: -17.5,29.5 + pos: -16.5,31.5 parent: 4812 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.6033952 - - 6.031821 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9688 components: - type: Transform @@ -30292,16 +30338,16 @@ entities: parent: 4812 - proto: ClothingEyesEyepatch entities: - - uid: 8481 - components: - - type: Transform - pos: -16.839548,32.557995 - parent: 4812 - uid: 9657 components: - type: Transform pos: 25.533524,-9.424093 parent: 4812 + - uid: 12144 + components: + - type: Transform + pos: -14.245123,35.0185 + parent: 473 - proto: ClothingEyesGlasses entities: - uid: 6205 @@ -30522,10 +30568,10 @@ entities: parent: 4812 - proto: ClothingHeadHatPirate entities: - - uid: 11675 + - uid: 11933 components: - type: Transform - pos: -17.677834,32.905758 + pos: -21.445757,35.638134 parent: 4812 - proto: ClothingHeadHatPumpkin entities: @@ -30881,10 +30927,10 @@ entities: parent: 4812 - proto: ClothingOuterCoatPirate entities: - - uid: 8478 + - uid: 11934 components: - type: Transform - pos: -17.511423,32.47987 + pos: -23.764275,32.548626 parent: 4812 - proto: ClothingOuterGhostSheet entities: @@ -32771,6 +32817,23 @@ entities: - type: Transform pos: -31.5,-6.5 parent: 4812 +- proto: DefaultStationBeaconEscapePod + entities: + - uid: 3980 + components: + - type: Transform + pos: -17.5,31.5 + parent: 4812 + - uid: 8475 + components: + - type: Transform + pos: -47.5,-25.5 + parent: 4812 + - uid: 9633 + components: + - type: Transform + pos: -12.5,-39.5 + parent: 4812 - proto: DefaultStationBeaconEvac entities: - uid: 12480 @@ -35718,15 +35781,15 @@ entities: parent: 4812 - proto: DrinkLithiumFlask entities: - - uid: 3611 + - uid: 3423 components: - type: Transform - pos: -18.350801,33.411205 + pos: -21.4602,33.34266 parent: 4812 - - uid: 12466 + - uid: 11675 components: - type: Transform - pos: -18.56759,33.562008 + pos: -21.301329,33.55921 parent: 4812 - proto: DrinkMugBlack entities: @@ -37253,11 +37316,17 @@ entities: - type: Transform pos: -11.5,-36.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - uid: 5072 components: - type: Transform pos: -10.5,-36.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - uid: 5308 components: - type: Transform @@ -51284,6 +51353,9 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-52.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5225 @@ -51292,6 +51364,9 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-41.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#0335FCFF' - uid: 5697 @@ -52035,6 +52110,9 @@ entities: rot: 3.141592653589793 rad pos: -11.5,-51.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5224 @@ -52043,6 +52121,9 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-42.5 parent: 4812 + - type: DeviceNetwork + deviceLists: + - 9593 - type: AtmosPipeColor color: '#FF1212FF' - uid: 5699 @@ -53122,11 +53203,28 @@ entities: - type: Transform pos: 22.5,29.5 parent: 4812 + - uid: 3611 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,38.5 + parent: 4812 - uid: 3701 components: - type: Transform pos: 10.5,54.5 parent: 4812 + - uid: 3767 + components: + - type: Transform + pos: -19.5,37.5 + parent: 4812 + - uid: 3768 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,39.5 + parent: 4812 - uid: 4385 components: - type: Transform @@ -53412,6 +53510,17 @@ entities: - type: Transform pos: 32.5,-12.5 parent: 4812 + - uid: 4693 + components: + - type: Transform + pos: -15.5,35.5 + parent: 4812 + - uid: 4695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,38.5 + parent: 4812 - uid: 4722 components: - type: Transform @@ -53595,7 +53704,8 @@ entities: - uid: 4768 components: - type: Transform - pos: -12.5,-38.5 + rot: 3.141592653589793 rad + pos: -19.5,39.5 parent: 4812 - uid: 4769 components: @@ -54235,6 +54345,12 @@ entities: - type: Transform pos: -7.5,-27.5 parent: 4812 + - uid: 7635 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,32.5 + parent: 4812 - uid: 7915 components: - type: Transform @@ -54388,6 +54504,30 @@ entities: - type: Transform pos: -23.5,26.5 parent: 4812 + - uid: 8328 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,32.5 + parent: 4812 + - uid: 8467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -49.5,-29.5 + parent: 4812 + - uid: 8470 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -49.5,-30.5 + parent: 4812 + - uid: 8496 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,-26.5 + parent: 4812 - uid: 8526 components: - type: Transform @@ -55118,11 +55258,6 @@ entities: - type: Transform pos: -14.5,-59.5 parent: 4812 - - uid: 10609 - components: - - type: Transform - pos: -47.5,-24.5 - parent: 4812 - uid: 10632 components: - type: Transform @@ -55158,6 +55293,11 @@ entities: - type: Transform pos: 11.5,-42.5 parent: 4812 + - uid: 11337 + components: + - type: Transform + pos: -20.5,37.5 + parent: 4812 - uid: 11354 components: - type: Transform @@ -55318,6 +55458,11 @@ entities: - type: Transform pos: 20.5,-39.5 parent: 4812 + - uid: 11935 + components: + - type: Transform + pos: -19.5,33.5 + parent: 4812 - uid: 12108 components: - type: Transform @@ -58288,6 +58433,11 @@ entities: - type: Transform pos: 26.5,-22.5 parent: 4812 + - uid: 8495 + components: + - type: Transform + pos: -46.5,-23.5 + parent: 4812 - uid: 8849 components: - type: Transform @@ -58318,11 +58468,6 @@ entities: - type: Transform pos: -34.5,8.5 parent: 4812 - - uid: 10917 - components: - - type: Transform - pos: -47.5,-23.5 - parent: 4812 - uid: 11787 components: - type: Transform @@ -61322,6 +61467,12 @@ entities: parent: 4812 - type: ApcPowerReceiver powerLoad: 0 + - uid: 3260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,31.5 + parent: 4812 - uid: 3280 components: - type: Transform @@ -63655,11 +63806,6 @@ entities: - type: Transform pos: -9.5,-54.5 parent: 4812 - - uid: 4695 - components: - - type: Transform - pos: -12.5,-38.5 - parent: 4812 - uid: 4697 components: - type: Transform @@ -64365,6 +64511,12 @@ entities: - type: Transform pos: -21.5,26.5 parent: 4812 + - uid: 8468 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -48.5,-26.5 + parent: 4812 - uid: 8627 components: - type: Transform @@ -64570,11 +64722,6 @@ entities: - type: Transform pos: -43.5,-25.5 parent: 4812 - - uid: 9593 - components: - - type: Transform - pos: -47.5,-24.5 - parent: 4812 - uid: 9599 components: - type: Transform @@ -65636,8 +65783,6 @@ entities: - type: Transform pos: -34.5,0.5 parent: 4812 -- proto: SignAtmosMinsky - entities: - uid: 8721 components: - type: Transform @@ -65690,8 +65835,6 @@ entities: - type: Transform pos: -10.5,-19.5 parent: 4812 -- proto: SignChemistry1 - entities: - uid: 6642 components: - type: Transform @@ -65946,13 +66089,6 @@ entities: - type: Transform pos: -12.5,-41.5 parent: 4812 -- proto: SignDrones - entities: - - uid: 11937 - components: - - type: Transform - pos: -12.5,18.5 - parent: 4812 - proto: SignElectricalMed entities: - uid: 3978 @@ -66043,21 +66179,17 @@ entities: pos: -51.5,-10.5 parent: 4812 - proto: SignHydro1 - entities: - - uid: 1076 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 4812 -- proto: SignHydro2 entities: - uid: 1075 components: - type: Transform pos: -6.5,-4.5 parent: 4812 -- proto: SignHydro3 - entities: + - uid: 1076 + components: + - type: Transform + pos: -7.5,-10.5 + parent: 4812 - uid: 6685 components: - type: Transform @@ -66082,6 +66214,13 @@ entities: - type: Transform pos: -22.5,-13.5 parent: 4812 +- proto: SignMaterials + entities: + - uid: 11937 + components: + - type: Transform + pos: -12.5,18.5 + parent: 4812 - proto: SignMedical entities: - uid: 7299 @@ -66089,13 +66228,6 @@ entities: - type: Transform pos: -7.5,-23.5 parent: 4812 -- proto: SignMinerDock - entities: - - uid: 3344 - components: - - type: Transform - pos: 21.5,16.5 - parent: 4812 - proto: SignMorgue entities: - uid: 5046 @@ -66183,21 +66315,17 @@ entities: pos: 2.5,-24.5 parent: 4812 - proto: SignScience - entities: - - uid: 6176 - components: - - type: Transform - pos: 2.5,-19.5 - parent: 4812 -- proto: SignScience1 entities: - uid: 6175 components: - type: Transform pos: 8.5,-13.5 parent: 4812 -- proto: SignScience2 - entities: + - uid: 6176 + components: + - type: Transform + pos: 2.5,-19.5 + parent: 4812 - uid: 6177 components: - type: Transform @@ -66286,6 +66414,13 @@ entities: - type: Transform pos: -1.5,-30.5 parent: 4812 +- proto: SignShipDock + entities: + - uid: 3344 + components: + - type: Transform + pos: 21.5,16.5 + parent: 4812 - proto: SignSmoking entities: - uid: 8607 @@ -66372,7 +66507,7 @@ entities: - type: Transform pos: -21.5,12.5 parent: 4812 -- proto: SignToxins2 +- proto: SignToxins entities: - uid: 6645 components: @@ -66386,7 +66521,7 @@ entities: - type: Transform pos: -32.5,-32.5 parent: 4812 -- proto: SignXenolab +- proto: SignXenobio entities: - uid: 11143 components: @@ -72263,6 +72398,11 @@ entities: - type: Transform pos: 20.5,9.5 parent: 4812 + - uid: 3263 + components: + - type: Transform + pos: -19.5,31.5 + parent: 4812 - uid: 3288 components: - type: Transform @@ -72293,6 +72433,11 @@ entities: - type: Transform pos: 23.5,6.5 parent: 4812 + - uid: 3424 + components: + - type: Transform + pos: -15.5,31.5 + parent: 4812 - uid: 3428 components: - type: Transform @@ -72328,6 +72473,16 @@ entities: - type: Transform pos: 13.5,31.5 parent: 4812 + - uid: 3455 + components: + - type: Transform + pos: -15.5,32.5 + parent: 4812 + - uid: 3456 + components: + - type: Transform + pos: -19.5,32.5 + parent: 4812 - uid: 3486 components: - type: Transform @@ -72888,6 +73043,11 @@ entities: - type: Transform pos: 22.5,2.5 parent: 4812 + - uid: 3766 + components: + - type: Transform + pos: -13.5,-40.5 + parent: 4812 - uid: 3990 components: - type: Transform @@ -73128,11 +73288,6 @@ entities: - type: Transform pos: -12.5,-53.5 parent: 4812 - - uid: 4693 - components: - - type: Transform - pos: -12.5,-39.5 - parent: 4812 - uid: 4694 components: - type: Transform @@ -74076,11 +74231,6 @@ entities: - type: Transform pos: -23.5,-24.5 parent: 4812 - - uid: 7635 - components: - - type: Transform - pos: -17.5,30.5 - parent: 4812 - uid: 7636 components: - type: Transform @@ -74711,6 +74861,17 @@ entities: - type: Transform pos: -35.5,8.5 parent: 4812 + - uid: 8469 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -46.5,-26.5 + parent: 4812 + - uid: 8497 + components: + - type: Transform + pos: -13.5,-38.5 + parent: 4812 - uid: 8621 components: - type: Transform @@ -77643,11 +77804,6 @@ entities: - type: Transform pos: 10.5,40.5 parent: 4812 - - uid: 3980 - components: - - type: Transform - pos: -17.5,37.5 - parent: 4812 - uid: 3981 components: - type: Transform @@ -78853,11 +79009,6 @@ entities: - type: Transform pos: -20.5,28.5 parent: 4812 - - uid: 8456 - components: - - type: Transform - pos: -19.5,37.5 - parent: 4812 - uid: 8457 components: - type: Transform @@ -79003,11 +79154,6 @@ entities: - type: Transform pos: -42.5,-22.5 parent: 4812 - - uid: 10404 - components: - - type: Transform - pos: -47.5,-28.5 - parent: 4812 - uid: 10613 components: - type: Transform @@ -80438,6 +80584,18 @@ entities: - type: Transform pos: -28.5,-26.5 parent: 4812 + - uid: 10404 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,32.5 + parent: 4812 + - uid: 10609 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,32.5 + parent: 4812 - proto: WindowDirectional entities: - uid: 890 diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 6954fe7892..2691ed2a78 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -7294,11 +7294,27 @@ entities: - type: Transform pos: 37.5,-39.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 4391: + - DoorStatus: DoorBolt - uid: 4391 components: - type: Transform pos: 35.5,-37.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 4385: + - DoorStatus: DoorBolt + 4392: + - DoorStatus: DoorBolt + 4390: + - DoorStatus: DoorBolt - proto: AirlockExternalEngineeringLocked entities: - uid: 69 @@ -7306,21 +7322,45 @@ entities: - type: Transform pos: 11.5,37.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 70: + - DoorStatus: DoorBolt - uid: 70 components: - type: Transform pos: 11.5,35.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 69: + - DoorStatus: DoorBolt - uid: 171 components: - type: Transform pos: 15.5,-41.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 173: + - DoorStatus: DoorBolt - uid: 173 components: - type: Transform pos: 13.5,-43.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 171: + - DoorStatus: DoorBolt - uid: 225 components: - type: Transform @@ -7336,31 +7376,67 @@ entities: - type: Transform pos: 74.5,45.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2128: + - DoorStatus: DoorBolt - uid: 2128 components: - type: Transform pos: 72.5,45.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1902: + - DoorStatus: DoorBolt - uid: 4385 components: - type: Transform pos: 33.5,-39.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 4391: + - DoorStatus: DoorBolt - uid: 4392 components: - type: Transform pos: 35.5,-41.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 4391: + - DoorStatus: DoorBolt - uid: 12931 components: - type: Transform pos: 33.5,-47.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12932: + - DoorStatus: DoorBolt - uid: 12932 components: - type: Transform pos: 32.5,-49.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12931: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 258 @@ -7378,21 +7454,53 @@ entities: - type: Transform pos: 6.5,16.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 7886: + - DoorStatus: DoorBolt + 7881: + - DoorStatus: DoorBolt - uid: 7674 components: - type: Transform pos: 6.5,17.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 3 + - type: DeviceLinkSource + linkedPorts: + 7886: + - DoorStatus: DoorBolt + 7881: + - DoorStatus: DoorBolt - uid: 7881 components: - type: Transform pos: 4.5,17.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 6863: + - DoorStatus: DoorBolt + 7674: + - DoorStatus: DoorBolt - uid: 7886 components: - type: Transform pos: 4.5,16.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 7674: + - DoorStatus: DoorBolt + 6863: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassLocked entities: - uid: 2734 @@ -7400,11 +7508,23 @@ entities: - type: Transform pos: -5.5,-18.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 6839: + - DoorStatus: DoorBolt - uid: 6839 components: - type: Transform pos: -5.5,-15.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2734: + - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - uid: 1332 @@ -7448,26 +7568,56 @@ entities: - type: Transform pos: 1.5,-35.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1370: + - DoorStatus: DoorBolt - uid: 1370 components: - type: Transform pos: -0.5,-35.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 1369: + - DoorStatus: DoorBolt - uid: 3202 components: - type: Transform pos: 56.5,49.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2167: + - DoorStatus: Close - uid: 8728 components: - type: Transform pos: 87.5,-20.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 10751: + - DoorStatus: DoorBolt - uid: 10751 components: - type: Transform pos: 84.5,-20.5 parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 8728: + - DoorStatus: DoorBolt - proto: AirlockExternalShuttleLocked entities: - uid: 2167 @@ -7476,6 +7626,12 @@ entities: rot: 3.141592653589793 rad pos: 56.5,51.5 parent: 2 + - type: DeviceLinkSource + linkedPorts: + 3202: + - DoorStatus: Close + - type: DeviceLinkSink + invokeCounter: 1 - proto: AirlockFreezer entities: - uid: 10 @@ -9272,47 +9428,61 @@ entities: - type: Transform pos: 36.5,-21.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 136 components: - type: Transform - pos: -2.5,2.5 + rot: 3.141592653589793 rad + pos: -4.5,2.5 parent: 2 - uid: 373 components: - type: Transform + rot: 3.141592653589793 rad pos: -12.5,-10.5 parent: 2 - uid: 608 components: - type: Transform + rot: 3.141592653589793 rad pos: -19.5,-10.5 parent: 2 - uid: 2027 components: - type: Transform - pos: -4.5,2.5 + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 2 + - uid: 5262 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 28.5,-10.5 parent: 2 - uid: 6591 components: - type: Transform + rot: 1.5707963267948966 rad pos: 32.5,-10.5 parent: 2 - uid: 6592 components: - type: Transform - pos: 28.5,-10.5 + rot: -1.5707963267948966 rad + pos: 4.5,26.5 parent: 2 - - uid: 12295 + - uid: 6874 components: - type: Transform + rot: -1.5707963267948966 rad pos: 4.5,24.5 parent: 2 - - uid: 12296 + - uid: 6876 components: - type: Transform - pos: 4.5,26.5 + rot: 1.5707963267948966 rad + pos: 87.5,4.5 parent: 2 - proto: AtmosFixBlockerMarker entities: @@ -10063,7 +10233,7 @@ entities: - type: Transform pos: 114.5,-17.5 parent: 2 -- proto: BookChefGaming +- proto: BookHowToCookForFortySpaceman entities: - uid: 297 components: @@ -21935,6 +22105,16 @@ entities: - type: Transform pos: 16.5,-12.5 parent: 2 + - uid: 6938 + components: + - type: Transform + pos: 116.5,-15.5 + parent: 2 + - uid: 6939 + components: + - type: Transform + pos: 116.5,-17.5 + parent: 2 - uid: 7148 components: - type: Transform @@ -31765,6 +31945,14 @@ entities: - Steel - Glass - Gold +- proto: CleanerDispenser + entities: + - uid: 6875 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-4.5 + parent: 2 - proto: ClosetBombFilled entities: - uid: 12854 @@ -65770,19 +65958,17 @@ entities: pos: 42.47835,25.502422 parent: 2 - proto: SignAtmos - entities: - - uid: 4575 - components: - - type: Transform - pos: 28.5,-26.5 - parent: 2 -- proto: SignAtmosMinsky entities: - uid: 4574 components: - type: Transform pos: 37.5,-38.5 parent: 2 + - uid: 4575 + components: + - type: Transform + pos: 28.5,-26.5 + parent: 2 - proto: SignBar entities: - uid: 11198 @@ -65826,7 +66012,7 @@ entities: - type: Transform pos: 39.519363,4.4919653 parent: 2 -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 6817 components: @@ -65840,13 +66026,6 @@ entities: - type: Transform pos: 25.484035,39.437214 parent: 2 -- proto: SignCourt - entities: - - uid: 13166 - components: - - type: Transform - pos: 24.5,28.5 - parent: 2 - proto: SignCryogenicsMed entities: - uid: 11804 @@ -66195,20 +66374,18 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-2.5 parent: 2 -- proto: SignHydro2 - entities: - - uid: 6651 - components: - - type: Transform - pos: 41.5,-2.5 - parent: 2 -- proto: SignHydro3 +- proto: SignHydro1 entities: - uid: 6648 components: - type: Transform pos: 47.5,-2.5 parent: 2 + - uid: 6651 + components: + - type: Transform + pos: 41.5,-2.5 + parent: 2 - proto: SignInterrogation entities: - uid: 11209 @@ -66246,6 +66423,11 @@ entities: - type: Transform pos: -4.5,-6.5 parent: 2 + - uid: 13166 + components: + - type: Transform + pos: 24.5,28.5 + parent: 2 - proto: SignLibrary entities: - uid: 11201 @@ -66268,13 +66450,6 @@ entities: - type: Transform pos: 53.5,1.5 parent: 2 -- proto: SignMinerDock - entities: - - uid: 7784 - components: - - type: Transform - pos: 6.5,18.5 - parent: 2 - proto: SignMorgue entities: - uid: 11196 @@ -66379,6 +66554,11 @@ entities: parent: 2 - proto: SignShipDock entities: + - uid: 7784 + components: + - type: Transform + pos: 6.5,18.5 + parent: 2 - uid: 9306 components: - type: Transform @@ -66493,7 +66673,7 @@ entities: rot: 1.5707963267948966 rad pos: 28.5,-13.5 parent: 2 -- proto: SignToxins2 +- proto: SignToxins entities: - uid: 12304 components: diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index e232aa3272..b407f2a9a5 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -4519,6 +4519,12 @@ entities: - type: Transform pos: -8.5,-42.5 parent: 31 + - uid: 10766 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-16.5 + parent: 31 - proto: AirlockExternalGlassShuttleLocked entities: - uid: 6995 @@ -5740,63 +5746,76 @@ entities: - type: Transform pos: 5.5,-32.5 parent: 31 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: + - uid: 950 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-4.5 + parent: 31 - uid: 5157 components: - type: Transform - pos: -14.5,-4.5 + rot: -1.5707963267948966 rad + pos: -44.5,0.5 parent: 31 - uid: 6694 components: - type: Transform - pos: -44.5,0.5 + rot: -1.5707963267948966 rad + pos: -44.5,2.5 parent: 31 - uid: 7138 components: - type: Transform - pos: -44.5,2.5 + rot: -1.5707963267948966 rad + pos: -44.5,8.5 parent: 31 - uid: 7346 components: - type: Transform - pos: -44.5,8.5 + rot: -1.5707963267948966 rad + pos: -44.5,10.5 parent: 31 - uid: 7566 components: - type: Transform - pos: -44.5,10.5 + rot: 3.141592653589793 rad + pos: 20.5,28.5 parent: 31 - uid: 7567 components: - type: Transform + rot: 3.141592653589793 rad pos: 22.5,28.5 parent: 31 - uid: 7943 components: - type: Transform - pos: 20.5,28.5 + rot: 3.141592653589793 rad + pos: -12.5,-2.5 parent: 31 - uid: 9923 components: - type: Transform - pos: -12.5,-2.5 + pos: -8.5,-42.5 parent: 31 - uid: 10583 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-42.5 + pos: -51.5,-12.5 parent: 31 - uid: 10765 components: - type: Transform pos: -44.5,-12.5 parent: 31 - - uid: 10766 + - uid: 11466 components: - type: Transform - pos: -51.5,-12.5 + rot: 3.141592653589793 rad + pos: 31.5,-16.5 parent: 31 - proto: AtmosFixBlockerMarker entities: @@ -28720,6 +28739,20 @@ entities: parent: 31 - type: NavMapBeacon text: Tesla Storage +- proto: DefaultStationBeaconEscapePod + entities: + - uid: 11467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-17.5 + parent: 31 + - uid: 11468 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-41.5 + parent: 31 - proto: DefaultStationBeaconEVAStorage entities: - uid: 7640 @@ -56347,8 +56380,6 @@ entities: - type: Transform pos: 18.5,-3.5 parent: 31 -- proto: SignChemistry2 - entities: - uid: 7291 components: - type: Transform @@ -56586,13 +56617,6 @@ entities: rot: 1.5707963267948966 rad pos: -26.497889,6.2645836 parent: 31 -- proto: SignDrones - entities: - - uid: 7224 - components: - - type: Transform - pos: 26.5,2.5 - parent: 31 - proto: SignElectrical entities: - uid: 11377 @@ -56642,7 +56666,7 @@ entities: - type: Transform pos: 50.5,-1.5 parent: 31 -- proto: SignHydro2 +- proto: SignHydro1 entities: - uid: 10545 components: @@ -56685,6 +56709,13 @@ entities: - type: Transform pos: 32.5,23.5 parent: 31 +- proto: SignMaterials + entities: + - uid: 7224 + components: + - type: Transform + pos: 26.5,2.5 + parent: 31 - proto: SignMedical entities: - uid: 4151 @@ -56692,14 +56723,6 @@ entities: - type: Transform pos: 5.5,2.5 parent: 31 -- proto: SignMinerDock - entities: - - uid: 9941 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 34.5,38.5 - parent: 31 - proto: SignMorgue entities: - uid: 4230 @@ -56792,6 +56815,14 @@ entities: - type: Transform pos: 54.5,-10.5 parent: 31 +- proto: SignShipDock + entities: + - uid: 9941 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 34.5,38.5 + parent: 31 - proto: SignSomethingOld2 entities: - uid: 1469 @@ -61591,11 +61622,6 @@ entities: - type: Transform pos: 53.5,-12.5 parent: 31 - - uid: 950 - components: - - type: Transform - pos: 31.5,-16.5 - parent: 31 - uid: 951 components: - type: Transform diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml index 8bcbf97b86..60f562e5c7 100644 --- a/Resources/Maps/train.yml +++ b/Resources/Maps/train.yml @@ -74144,7 +74144,7 @@ entities: pos: 8.5,-176.5 parent: 2 - type: Door - secondsUntilStateChange: -141100.73 + secondsUntilStateChange: -141260.94 state: Closing - uid: 11227 components: @@ -81637,6 +81637,11 @@ entities: - type: Transform pos: -8.5,-314.5 parent: 2 + - uid: 16962 + components: + - type: Transform + pos: -5.5,-382.5 + parent: 2 - proto: RandomArtifactSpawner20 entities: - uid: 12481 @@ -84582,7 +84587,7 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-338.5 parent: 2 -- proto: SignAtmosMinsky +- proto: SignAtmos entities: - uid: 12994 components: @@ -90882,11 +90887,8 @@ entities: - uid: 13995 components: - type: Transform - anchored: False - pos: -5.4964814,-84.54825 + pos: -5.5,-84.5 parent: 2 - - type: Physics - bodyType: Dynamic - proto: VendingMachineSeedsUnlocked entities: - uid: 13996 diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 07d1a622ad..af1333e14c 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -166,6 +166,8 @@ name: Morph into Geras description: Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory. components: + - type: ConfirmableAction + popup: gera-transformation-popup - type: InstantAction itemIconStyle: BigAction useDelay: 10 # prevent spam diff --git a/Resources/Prototypes/Body/Organs/Animal/animal.yml b/Resources/Prototypes/Body/Organs/Animal/animal.yml index 2f50821df3..8384e006df 100644 --- a/Resources/Prototypes/Body/Organs/Animal/animal.yml +++ b/Resources/Prototypes/Body/Organs/Animal/animal.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseAnimalOrganUnGibbable parent: BaseItem abstract: true @@ -34,7 +34,7 @@ id: OrganAnimalLungs parent: BaseAnimalOrgan name: lungs - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -65,7 +65,7 @@ id: OrganAnimalStomach parent: BaseAnimalOrgan name: stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: stomach @@ -91,7 +91,7 @@ id: OrganMouseStomach parent: OrganAnimalStomach name: stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SolutionContainerManager solutions: @@ -102,7 +102,7 @@ id: OrganAnimalLiver parent: BaseAnimalOrgan name: liver - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: liver @@ -118,7 +118,7 @@ id: OrganAnimalHeart parent: BaseAnimalOrgan name: heart - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: heart-on @@ -135,7 +135,7 @@ id: OrganAnimalKidneys parent: BaseAnimalOrgan name: kidneys - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml index 8a1afc37bb..e360f362d8 100644 --- a/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml +++ b/Resources/Prototypes/Body/Organs/Animal/bloodsucker.yml @@ -1,8 +1,8 @@ -- type: entity +- type: entity id: OrganBloodsuckerStomach parent: OrganAnimalStomach name: stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Metabolizer metabolizerTypes: [ Bloodsucker ] @@ -11,7 +11,7 @@ id: OrganBloodsuckerLiver parent: OrganAnimalLiver name: liver - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Metabolizer metabolizerTypes: [ Bloodsucker ] @@ -20,7 +20,7 @@ id: OrganBloodsuckerHeart parent: OrganAnimalHeart name: heart - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Metabolizer metabolizerTypes: [ Bloodsucker ] diff --git a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml index 3c3062ddec..3b00e1a223 100644 --- a/Resources/Prototypes/Body/Organs/Animal/ruminant.yml +++ b/Resources/Prototypes/Body/Organs/Animal/ruminant.yml @@ -1,8 +1,8 @@ -- type: entity +- type: entity id: OrganAnimalRuminantStomach parent: OrganAnimalStomach name: ruminant stomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Body/Organs/arachnid.yml b/Resources/Prototypes/Body/Organs/arachnid.yml index c1e199e112..29ca393d13 100644 --- a/Resources/Prototypes/Body/Organs/arachnid.yml +++ b/Resources/Prototypes/Body/Organs/arachnid.yml @@ -105,7 +105,7 @@ parent: BaseHumanOrgan name: liver description: "Pairing suggestion: chianti and fava beans." - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: liver @@ -122,7 +122,7 @@ parent: BaseHumanOrgan name: kidneys description: "Filters toxins from the bloodstream." - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index 69fc630b9e..e248355df2 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/Resources/Prototypes/Body/Organs/diona.yml @@ -126,7 +126,7 @@ - type: entity id: OrganDionaBrainNymph parent: OrganDionaBrain - noSpawn: true + categories: [ HideSpawnMenu ] name: brain description: "The source of incredible, unending intelligence. Honk." components: @@ -138,7 +138,7 @@ - type: entity id: OrganDionaStomachNymph parent: OrganDionaStomach - noSpawn: true + categories: [ HideSpawnMenu ] name: stomach description: "Gross. This is hard to stomach." components: @@ -148,7 +148,7 @@ - type: entity id: OrganDionaLungsNymph parent: OrganDionaLungs - noSpawn: true + categories: [ HideSpawnMenu ] name: lungs description: "Filters oxygen from an atmosphere, which is then sent into the bloodstream to be used as an electron carrier." components: @@ -159,7 +159,7 @@ - type: entity id: OrganDionaNymphBrain parent: MobDionaNymph - noSpawn: true + categories: [ HideSpawnMenu ] name: diona nymph suffix: Brain description: Contains the brain of a formerly fully-formed Diona. Killing this would kill the Diona forever. You monster. @@ -171,7 +171,7 @@ - type: entity id: OrganDionaNymphStomach parent: MobDionaNymphAccent - noSpawn: true + categories: [ HideSpawnMenu ] name: diona nymph suffix: Stomach description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. @@ -183,7 +183,7 @@ - type: entity id: OrganDionaNymphLungs parent: MobDionaNymphAccent - noSpawn: true + categories: [ HideSpawnMenu ] name: diona nymph suffix: Lungs description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. diff --git a/Resources/Prototypes/Body/Organs/moth.yml b/Resources/Prototypes/Body/Organs/moth.yml index aef5576048..535c25c9d3 100644 --- a/Resources/Prototypes/Body/Organs/moth.yml +++ b/Resources/Prototypes/Body/Organs/moth.yml @@ -1,7 +1,7 @@ -- type: entity +- type: entity id: OrganMothStomach parent: [OrganAnimalStomach, OrganHumanStomach] - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Stomach specialDigestible: diff --git a/Resources/Prototypes/Body/Organs/reptilian.yml b/Resources/Prototypes/Body/Organs/reptilian.yml index f8423582cc..34c736aec8 100644 --- a/Resources/Prototypes/Body/Organs/reptilian.yml +++ b/Resources/Prototypes/Body/Organs/reptilian.yml @@ -1,7 +1,7 @@ - type: entity id: OrganReptilianStomach parent: OrganAnimalStomach - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Stomach specialDigestible: diff --git a/Resources/Prototypes/Body/Parts/animal.yml b/Resources/Prototypes/Body/Parts/animal.yml index 4db026b40f..347b052c8b 100644 --- a/Resources/Prototypes/Body/Parts/animal.yml +++ b/Resources/Prototypes/Body/Parts/animal.yml @@ -36,7 +36,7 @@ id: HandsAnimal name: animal hands parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -50,7 +50,7 @@ id: LegsAnimal name: animal legs parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -64,7 +64,7 @@ id: FeetAnimal name: animal feet parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -77,7 +77,7 @@ id: TorsoAnimal name: animal torso parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Body/Parts/rat.yml b/Resources/Prototypes/Body/Parts/rat.yml index 6a66eecc48..bd51e006f7 100644 --- a/Resources/Prototypes/Body/Parts/rat.yml +++ b/Resources/Prototypes/Body/Parts/rat.yml @@ -4,7 +4,7 @@ id: TorsoRat name: "animal torso" parent: PartAnimal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: BodyPart partType: Torso diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index f656eb1962..2099d0e2a8 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -502,6 +502,9 @@ - TemperatureProtection tags: - Scarf + blacklist: + components: + - ToggleableClothing - type: cargoBounty id: BountyBattery diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml new file mode 100644 index 0000000000..4505a8cc7b --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml @@ -0,0 +1,372 @@ +- type: entity + name: Perma Escape Crate Spawner + id: CratePermaEscapeSpawner + parent: CrateEmptySpawner + components: + - type: RandomSpawner + prototypes: + # Please note any duplicates & alphabetize <3 + - CrateEngineeringMiniJetpack + - CratePermaEscapeBureaucracy + - CratePermaEscapeEVA + - CratePermaEscapeGiftsFromSyndicate + - CratePermaEscapeGun + - CratePermaEscapeLights + - CratePermaEscapeMerc + - CrateServiceCustomSmokable + - CrateTrashCartFilled + - CratePermaEscapeComs # x2 + - CratePermaEscapeComs + - CratePermaEscapeDigging # x2 + - CratePermaEscapeDigging + - CratePermaEscapeMats #x2 + - CratePermaEscapeMats + - CratePermaEscapeTowercap # x2 + - CratePermaEscapeTowercap + - ClosetMaintenanceFilledRandom # x3 + - ClosetMaintenanceFilledRandom + - ClosetMaintenanceFilledRandom + rarePrototypes: + - MobTick # These need to be killable by one dude with a shovel. + rareChance: .30 + chance: 1 + offset: 0.0 + +- type: entity + id: CratePermaEscapeDigging + parent: CrateGenericSteel + suffix: Digging + components: + - type: StorageFill + contents: + - id: Shovel + - id: Pickaxe + prob: 0.90 + - id: Pickaxe + prob: 0.40 + - id: Pickaxe + prob: 0.10 + - id: Shovel + prob: 0.50 + - id: Shovel + prob: 0.20 + - id: HydroponicsToolSpade + prob: 0.10 + - id: HydroponicsToolHatchet + prob: 0.05 + +- type: entity + id: CratePermaEscapeEVA + parent: CrateGenericSteel + suffix: EVAs + components: + - type: StorageFill + contents: + - id: ClothingHeadHelmetEVALarge + - id: ClothingOuterHardsuitEVAPrisoner + - id: ClothingHeadHelmetEVALarge + prob: 0.80 + - id: ClothingOuterHardsuitEVAPrisoner + prob: 0.80 + - id: ClothingOuterHardsuitVoidParamed + prob: 0.10 + - id: ClothingOuterRedRacoon + prob: 0.10 + - id: ClothingOuterSanta + prob: 0.10 + - id: ClothingOuterHardsuitSyndicate + prob: 0.20 + - id: EmergencyOxygenTankFilled + prob: 0.25 + - id: EmergencyOxygenTank + prob: 0.25 + - id: OxygenTankFilled + prob: 0.05 + +- type: entity + id: CratePermaEscapeGun + parent: CrateGenericSteel + suffix: Gun + components: + - type: StorageFill + contents: + - id: WeaponPistolMk58 + prob: 0.15 + orGroup: gun + - id: FoamCrossbow + prob: 0.10 + orGroup: gun + - id: WeaponRifleFoam + prob: 0.05 + orGroup: gun + - id: WeaponPistolFlintlock + prob: 0.20 + orGroup: gun + - id: WeaponShotgunBlunderbuss + prob: 0.10 + orGroup: gun + - id: WeaponShotgunBlunderbuss + prob: 0.15 + orGroup: gun + - id: WeaponRevolverPirate + prob: 0.15 + orGroup: gun + - id: WeaponProtoKineticAccelerator + prob: 0.20 + orGroup: gun + +- type: entity + id: CratePermaEscapeBureaucracy + parent: CrateGenericSteel + suffix: Writing + components: + - type: StorageFill + contents: + - id: RubberStampApproved + - id: RubberStampDenied + - id: Pen + - id: Pen + - id: Pen + - id: BoxFolderBase + orGroup: folderA + - id: BoxFolderBlack + orGroup: folderA + - id: BoxFolderBlue + orGroup: folderA + - id: BoxFolderGreen + orGroup: folderA + - id: BoxFolderGrey + orGroup: folderA + - id: BoxFolderRed + orGroup: folderA + - id: BoxFolderWhite + orGroup: folderA + - id: BoxFolderYellow + orGroup: folderA + - id: BoxFolderBase + orGroup: folderB + - id: BoxFolderBlack + orGroup: folderB + - id: BoxFolderBlue + orGroup: folderB + - id: BoxFolderGreen + orGroup: folderB + - id: BoxFolderGrey + orGroup: folderB + - id: BoxFolderRed + orGroup: folderB + - id: BoxFolderWhite + orGroup: folderB + - id: BoxFolderYellow + orGroup: folderB + - id: CrayonBox + prob: 0.50 + - id: CrayonBox + prob: 0.10 + - id: ClearPDA # change to visitor one day. + prob: 0.10 + - id: PersonalAI + +- type: entity + id: CratePermaEscapeLights + parent: CrateGenericSteel + suffix: Glowsticks + components: + - type: StorageFill + contents: + - id: GlowstickBlue + prob: 0.50 + - id: GlowstickBlue + prob: 0.20 + - id: GlowstickBlue + prob: 0.05 + - id: GlowstickBase + prob: 0.50 + - id: GlowstickBase + prob: 0.20 + - id: GlowstickBase + prob: 0.05 + - id: GlowstickPurple + prob: 0.50 + - id: GlowstickPurple + prob: 0.20 + - id: GlowstickPurple + prob: 0.05 + - id: GlowstickRed + prob: 0.50 + - id: GlowstickRed + prob: 0.20 + - id: GlowstickRed + prob: 0.05 + - id: GlowstickYellow + prob: 0.50 + - id: GlowstickYellow + prob: 0.20 + - id: GlowstickYellow + prob: 0.05 + +- type: entity + id: CratePermaEscapeMats + parent: CrateGenericSteel + suffix: Mats + components: + - type: StorageFill + contents: + - id: SheetSteel + orGroup: matA + - id: PartRodMetal + orGroup: matA + - id: SheetSteel + orGroup: matB + - id: PartRodMetal + orGroup: matB + +- type: entity + id: CratePermaEscapeGiftsFromSyndicate + parent: CrateGenericSteel + suffix: Syndi Gifts + components: + - type: StorageFill + contents: + - id: ClothingEyesGlassesOutlawGlasses + - id: ClothingHeadHatOutlawHat + - id: HappyHonkNukieSnacks + # - id: BaseUplinkRadio # too spicy I think. + # prob: 0.50 + # - id: Telecrystal + # prob: 0.80 + # - id: Telecrystal + # prob: 0.80 + # - id: Telecrystal + # prob: 0.70 + # - id: Telecrystal + # prob: 0.50 + # - id: Telecrystal + # prob: 0.20 + # - id: Telecrystal + # prob: 0.10 + # - id: Telecrystal + # prob: 0.05 + # - id: Telecrystal + # prob: 0.01 + # - id: Telecrystal5 + # prob: 0.01 + - id: CyberPen + prob: 0.10 + - id: CockroachCube + orGroup: cube + - id: AbominationCube + prob: 0.20 + orGroup: cube + - id: SpaceCarpCube + prob: 0.20 + orGroup: cube + - id: SyndicateSponge + prob: 0.20 + orGroup: cube + - id: MindShieldImplanter + prob: 0.20 + - id: ClothingHandsGlovesConducting # funny + prob: 0.30 + - id: CigPackSyndicate + prob: 0.80 + - id: StimpackMini + prob: 0.20 + - id: StimpackMini + prob: 0.10 + - id: CombatMedipen + prob: 0.05 + - id: MedkitCombatFilled + prob: 0.01 + - id: SoapSyndie + prob: 0.15 + - id: DnaScramblerImplanter + prob: 0.005 + + +- type: entity + id: CratePermaEscapeMerc + parent: CrateGenericSteel + suffix: Merc + components: + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitMercenary + - id: ClothingHeadBandMerc + prob: 0.50 + - id: ClothingHeadHatBeretMerc + prob: 0.20 + - id: ClothingHeadHelmetMerc + prob: 0.05 + - id: ClothingEyesGlassesMercenary + prob: 0.20 + - id: ClothingMaskGasMerc + prob: 0.10 + - id: ClothingHandsGlovesMercFingerless + prob: 0.20 + - id: ClothingHandsMercGlovesCombat + prob: 0.05 + - id: ClothingBackpackMerc + prob: 0.50 + - id: ClothingShoesBootsMerc + prob: 0.50 + - id: ClothingOuterVestWebMerc + prob: 0.25 + - id: ClothingBeltMercWebbing + prob: 0.05 + +- type: entity + id: CratePermaEscapeComs + parent: CrateGenericSteel + suffix: Coms + components: + - type: StorageFill + contents: + - id: ClothingHeadsetMining + orGroup: coms + - id: ClothingHeadsetMining + orGroup: coms + - id: ClothingHeadsetMining + orGroup: coms + - id: ClothingHeadsetGrey + orGroup: coms + - id: ClothingHeadsetScience + orGroup: coms + - id: ClothingHeadsetService + orGroup: coms + - id: ClothingHeadsetEngineering + orGroup: coms + - id: ClothingHeadsetMedical + orGroup: coms + - id: EncryptionKeyCargo + prob: 0.05 + - id: EncryptionKeyScience + prob: 0.05 + - id: EncryptionKeyService + prob: 0.05 + - id: EncryptionKeyMedical + prob: 0.05 + - id: EncryptionKeyEngineering + prob: 0.05 + - id: EncryptionKeySecurity + prob: 0.01 + +- type: entity + id: CratePermaEscapeTowercap + parent: CrateGenericSteel + suffix: Towercap + components: + - type: StorageFill + contents: + - id: TowercapSeeds + - id: TowercapSeeds + prob: 0.80 + - id: TowercapSeeds + prob: 0.50 + - id: TowercapSeeds + prob: 0.20 + - id: SteelcapSeeds + prob: 0.10 + - id: SteelLog + - id: HydroponicsToolHatchet + prob: 0.75 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 84526d46d1..7bae4ecd77 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -26,7 +26,7 @@ - type: entity id: CrateSalvageAssortedGoodies suffix: Filled, Salvage Random - noSpawn: true # You should use SalvageMaterialCrateSpawner instead + categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead parent: CrateGenericSteel components: - type: StorageFill diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml index 7617186dd9..821c916353 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml @@ -9,6 +9,6 @@ ClothingHeadHatVioletwizard: 3 ClothingOuterWizardViolet: 3 ClothingShoesWizard: 9 - #TO DO: + #TODO: #only missing staff #and if wizarditis reagent when hacked if we want this. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 5b733f0d35..ff1ee4e4da 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -23,3 +23,5 @@ ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 ClothingShoesBootsWinterSec: 2 + contrabandInventory: + ClothingMaskClownSecurity: 1 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index fe8b038dd9..5a92bc77f8 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -122,7 +122,7 @@ name: uplink-sniper-bundle-name description: uplink-sniper-bundle-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } - productEntity: BriefcaseSyndieSniperBundleFilled + productEntity: BriefcaseSyndieSniperBundleFilled cost: Telecrystal: 12 categories: @@ -916,11 +916,11 @@ - NukeOpsUplink - type: listing - id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component. - name: uplink-reinforcement-radio-name + id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns another nuclear operative without the uplink. + name: uplink-reinforcement-radio-nukeops-name description: uplink-reinforcement-radio-nukeops-desc productEntity: ReinforcementRadioSyndicateNukeops - icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-urist } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-nukeop } cost: Telecrystal: 35 categories: @@ -1004,7 +1004,7 @@ Telecrystal: 6 categories: - UplinkAllies - + - type: listing id: UplinkSyndicatePersonalAI name: uplink-syndicate-pai-name diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 7ad21ba93a..d520074744 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -63,6 +63,8 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/meson.rsi - type: EyeProtection + - type: IdentityBlocker + coverage: EYES - type: entity parent: ClothingEyesBase @@ -194,6 +196,8 @@ - type: FlashImmunity - type: EyeProtection protectionTime: 5 + - type: IdentityBlocker + coverage: EYES #Make a scanner category when these actually function and we get the trayson - type: entity @@ -211,6 +215,8 @@ coefficients: Heat: 0.95 - type: GroupExamine + - type: IdentityBlocker + coverage: EYES - type: entity parent: ClothingEyesBase @@ -223,6 +229,8 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/science.rsi - type: SolutionScanner + - type: IdentityBlocker + coverage: EYES - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 0c7fc5b2a1..b22320a82f 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -1,7 +1,7 @@ - type: entity id: ShowSecurityIcons abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ShowJobIcons - type: ShowMindShieldIcons @@ -10,7 +10,7 @@ - type: entity id: ShowMedicalIcons abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ShowHealthBars damageContainers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 462032547b..66356afacf 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -59,7 +59,7 @@ parent: ClothingHeadBase id: ClothingHeadLightBase name: base helmet with light - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -151,7 +151,7 @@ # No parent since we aren't actually an item. id: ClothingHeadHardsuitBase name: base hardsuit helmet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: BreathMask - type: Sprite @@ -195,7 +195,7 @@ parent: ClothingHeadHardsuitBase id: ClothingHeadHardsuitWithLightBase name: base hardsuit helmet with light - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -247,7 +247,7 @@ id: ClothingHeadHatHoodWinterBase name: base winter coat hood description: A hood, made to keep your head warm. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: icon diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index ffa5747e87..a9785ef928 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -138,7 +138,7 @@ - type: entity parent: ClothingHeadHardsuitBase id: ClothingHeadHelmetHardsuitMaxim - noSpawn: true + categories: [ HideSpawnMenu ] name: salvager maxim helmet description: A predication of decay washes over your mind. components: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 4dec89e75a..180b738e40 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -89,7 +89,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodChaplainHood - noSpawn: true + categories: [ HideSpawnMenu ] name: chaplain's hood description: Maximum piety in this star system. components: @@ -155,6 +155,7 @@ coefficients: Heat: 0.95 Radiation: 0.65 + - type: IdentityBlocker - type: BreathMask - type: HideLayerClothing slots: @@ -183,7 +184,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodIan - noSpawn: true + categories: [ HideSpawnMenu ] name: ian hood description: A hood to complete the 'Good boy' look. components: @@ -198,7 +199,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHoodCarp - noSpawn: true + categories: [ HideSpawnMenu ] name: carp hood description: A gnarly hood adorned with plastic space carp teeth. components: @@ -213,7 +214,7 @@ - type: entity parent: ClothingHeadHatHoodCarp id: ClothingHeadHelmetHardsuitCarp - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PressureProtection highPressureMultiplier: 0.6 @@ -251,7 +252,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterDefault - noSpawn: true + categories: [ HideSpawnMenu ] name: default winter coat hood components: - type: Sprite @@ -262,7 +263,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterBartender - noSpawn: true + categories: [ HideSpawnMenu ] name: bartender winter coat hood components: - type: Sprite @@ -273,7 +274,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCaptain - noSpawn: true + categories: [ HideSpawnMenu ] name: captain's winter coat hood description: An expensive hood, to keep the captain's head warm. components: @@ -285,7 +286,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCargo - noSpawn: true + categories: [ HideSpawnMenu ] name: cargo winter coat hood components: - type: Sprite @@ -296,7 +297,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCE - noSpawn: true + categories: [ HideSpawnMenu ] name: chief engineer's winter coat hood components: - type: Sprite @@ -307,7 +308,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCentcom - noSpawn: true + categories: [ HideSpawnMenu ] name: Centcom winter coat hood description: A hood for keeping the central comander's head warm. components: @@ -319,7 +320,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterChem - noSpawn: true + categories: [ HideSpawnMenu ] name: chemist winter coat hood components: - type: Sprite @@ -330,7 +331,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCMO - noSpawn: true + categories: [ HideSpawnMenu ] name: chief medical officer's winter coat hood components: - type: Sprite @@ -341,7 +342,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterEngineer - noSpawn: true + categories: [ HideSpawnMenu ] name: engineer winter coat hood components: - type: Sprite @@ -352,7 +353,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOP - noSpawn: true + categories: [ HideSpawnMenu ] name: head of personel's winter coat hood components: - type: Sprite @@ -363,7 +364,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOS - noSpawn: true + categories: [ HideSpawnMenu ] name: head of security's winter coat hood components: - type: Sprite @@ -374,7 +375,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHydro - noSpawn: true + categories: [ HideSpawnMenu ] name: hydroponics coat hood components: - type: Sprite @@ -385,7 +386,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterJani - noSpawn: true + categories: [ HideSpawnMenu ] name: janitor coat hood components: - type: Sprite @@ -396,7 +397,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMed - noSpawn: true + categories: [ HideSpawnMenu ] name: medic coat hood components: - type: Sprite @@ -407,7 +408,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMime - noSpawn: true + categories: [ HideSpawnMenu ] name: mime coat hood components: - type: Sprite @@ -418,7 +419,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterMiner - noSpawn: true + categories: [ HideSpawnMenu ] name: miner coat hood components: - type: Sprite @@ -429,7 +430,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterPara - noSpawn: true + categories: [ HideSpawnMenu ] name: paramedic coat hood components: - type: Sprite @@ -440,7 +441,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterQM - noSpawn: true + categories: [ HideSpawnMenu ] name: quartermaster's coat hood components: - type: Sprite @@ -451,7 +452,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRD - noSpawn: true + categories: [ HideSpawnMenu ] name: research director's coat hood components: - type: Sprite @@ -462,7 +463,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterRobo - noSpawn: true + categories: [ HideSpawnMenu ] name: robotics coat hood components: - type: Sprite @@ -473,7 +474,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSci - noSpawn: true + categories: [ HideSpawnMenu ] name: scientist coat hood components: - type: Sprite @@ -484,7 +485,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSec - noSpawn: true + categories: [ HideSpawnMenu ] name: security coat hood components: - type: Sprite @@ -495,7 +496,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterSyndie - noSpawn: true + categories: [ HideSpawnMenu ] name: syndicate coat hood components: - type: Sprite @@ -506,7 +507,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterWarden - noSpawn: true + categories: [ HideSpawnMenu ] name: warden's coat hood components: - type: Sprite @@ -517,7 +518,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterWeb - noSpawn: true + categories: [ HideSpawnMenu ] name: web coat hood components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index c32f485f9c..651f80a3a9 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -205,7 +205,7 @@ accent: OwOAccent - type: entity - noSpawn: true + categories: [ Actions, HideSpawnMenu ] id: ActionBecomeValid name: Become Valid description: "*notices your killsign* owo whats this" diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 1f2ed875a6..b3a76c5855 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -230,6 +230,24 @@ graph: BananaClownMask node: mask +- type: entity + parent: ClothingMaskClown + id: ClothingMaskClownSecurity + name: security clown wig and mask + description: A debatably oxymoronic but protective mask and wig. + components: + - type: Sprite + sprite: Clothing/Mask/clown_security.rsi + - type: Clothing + sprite: Clothing/Mask/clown_security.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + - type: entity parent: ClothingMaskBase id: ClothingMaskJoy diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index bacdd0046f..1d5fbb0119 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -113,7 +113,7 @@ modifiers: coefficients: Heat: 0.90 - Radiation: 0.001 + Radiation: 0.01 - type: Clothing sprite: Clothing/OuterClothing/Suits/rad.rsi - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 207532c5dd..9b943de36a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -38,7 +38,7 @@ parent: ClothingOuterWinterCoat id: ClothingOuterWinterCoatToggleable name: winter coat with hood - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterDefault diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 9795c42b8f..196df817b0 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -213,6 +213,7 @@ - type: Tag tags: - ClownSuit + - WhitelistChameleon - type: entity parent: ClothingUniformJumpsuitClown diff --git a/Resources/Prototypes/Entities/Debugging/clicktest.yml b/Resources/Prototypes/Entities/Debugging/clicktest.yml index 4e9caaa14d..7eb0a06330 100644 --- a/Resources/Prototypes/Entities/Debugging/clicktest.yml +++ b/Resources/Prototypes/Entities/Debugging/clicktest.yml @@ -1,11 +1,11 @@ -# Entities specifically for testing click detection with ClickableComponent. +# Entities specifically for testing click detection with ClickableComponent. # # Each entity has a bounding box AND texture equivalent. # Note that bounding box versions still have dots on the outside or center to make it possible to... see them. # These dots' texture detection should not interfere with the actual bounding box being tested. - type: entity - noSpawn: true + categories: [ Debug, HideSpawnMenu ] id: ClickTestBase suffix: DEBUG components: diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml index e3289569a2..9ba7c85e1e 100644 --- a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml +++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml @@ -60,7 +60,7 @@ id: BulletDebug name: bang, ded bullet parent: BaseBullet - noSpawn: true + categories: [ Debug, HideSpawnMenu ] suffix: DEBUG components: - type: Tag diff --git a/Resources/Prototypes/Entities/Debugging/tippy.yml b/Resources/Prototypes/Entities/Debugging/tippy.yml index 292cbed0f1..7f149c3b5d 100644 --- a/Resources/Prototypes/Entities/Debugging/tippy.yml +++ b/Resources/Prototypes/Entities/Debugging/tippy.yml @@ -1,6 +1,6 @@ - type: entity id: Tippy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite netsync: false diff --git a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml index f686779b3e..81f7bbfc8a 100644 --- a/Resources/Prototypes/Entities/Effects/ambient_sounds.yml +++ b/Resources/Prototypes/Entities/Effects/ambient_sounds.yml @@ -1,6 +1,6 @@ - type: entity id: AmbientSoundSourceFlies - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AmbientSound volume: -5 diff --git a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml index 3421f0d9a6..42cdfbd297 100644 --- a/Resources/Prototypes/Entities/Effects/bluespace_flash.yml +++ b/Resources/Prototypes/Entities/Effects/bluespace_flash.yml @@ -1,6 +1,6 @@ - type: entity id: EffectFlashBluespace - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight radius: 10.5 diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 4f925ed311..28e5a239ef 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -36,7 +36,7 @@ parent: BaseFoam id: Smoke name: smoke - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Occluder - type: Sprite @@ -52,7 +52,7 @@ parent: BaseFoam id: Foam name: foam - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite color: "#ffffffcc" @@ -83,7 +83,7 @@ - type: entity id: MetalFoam name: metal foam - noSpawn: true + categories: [ HideSpawnMenu ] parent: Foam components: - type: Sprite @@ -109,7 +109,7 @@ - type: entity id: IronMetalFoam name: iron metal foam - noSpawn: true + categories: [ HideSpawnMenu ] parent: MetalFoam components: - type: SpawnOnDespawn @@ -118,7 +118,7 @@ - type: entity id: AluminiumMetalFoam name: aluminium metal foam - noSpawn: true + categories: [ HideSpawnMenu ] parent: MetalFoam components: - type: SpawnOnDespawn diff --git a/Resources/Prototypes/Entities/Effects/emp_effects.yml b/Resources/Prototypes/Entities/Effects/emp_effects.yml index 890dd24d43..d1096b85f5 100644 --- a/Resources/Prototypes/Entities/Effects/emp_effects.yml +++ b/Resources/Prototypes/Entities/Effects/emp_effects.yml @@ -1,6 +1,6 @@ - type: entity id: EffectEmpPulse - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.8 @@ -23,7 +23,7 @@ - type: entity id: EffectEmpDisabled - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Effects/exclamation.yml b/Resources/Prototypes/Entities/Effects/exclamation.yml index cfe1cbc7f2..d1f3e3ad06 100644 --- a/Resources/Prototypes/Entities/Effects/exclamation.yml +++ b/Resources/Prototypes/Entities/Effects/exclamation.yml @@ -1,7 +1,7 @@ - type: entity id: Exclamation name: exclamation - noSpawn: true + categories: [ HideSpawnMenu ] save: false components: - type: Transform @@ -22,7 +22,7 @@ - type: entity id: WhistleExclamation name: exclamation - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Structures/Storage/closet.rsi diff --git a/Resources/Prototypes/Entities/Effects/explosion_light.yml b/Resources/Prototypes/Entities/Effects/explosion_light.yml index b4b980dd1a..d5e7452a79 100644 --- a/Resources/Prototypes/Entities/Effects/explosion_light.yml +++ b/Resources/Prototypes/Entities/Effects/explosion_light.yml @@ -1,5 +1,5 @@ - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: ExplosionLight name: explosion light components: diff --git a/Resources/Prototypes/Entities/Effects/hearts.yml b/Resources/Prototypes/Entities/Effects/hearts.yml index 042fdb5e8a..18f72c95d4 100644 --- a/Resources/Prototypes/Entities/Effects/hearts.yml +++ b/Resources/Prototypes/Entities/Effects/hearts.yml @@ -1,6 +1,6 @@ - type: entity id: EffectHearts - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.85 diff --git a/Resources/Prototypes/Entities/Effects/lightning.yml b/Resources/Prototypes/Entities/Effects/lightning.yml index 7afd1c07a0..f85f28d3b8 100644 --- a/Resources/Prototypes/Entities/Effects/lightning.yml +++ b/Resources/Prototypes/Entities/Effects/lightning.yml @@ -33,7 +33,7 @@ name: lightning id: Lightning parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Lightning canArc: true @@ -42,7 +42,7 @@ name: spooky lightning id: LightningRevenant parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -66,7 +66,7 @@ name: charged lightning id: ChargedLightning parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -85,7 +85,7 @@ name: lightning id: Spark parent: BaseLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -112,7 +112,7 @@ name: supercharged lightning id: SuperchargedLightning parent: ChargedLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi @@ -138,7 +138,7 @@ name: hypercharged lightning id: HyperchargedLightning parent: ChargedLightning - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: /Textures/Effects/lightning.rsi diff --git a/Resources/Prototypes/Entities/Effects/mobspawn.yml b/Resources/Prototypes/Entities/Effects/mobspawn.yml index 2fad68d7f2..c4396a775d 100644 --- a/Resources/Prototypes/Entities/Effects/mobspawn.yml +++ b/Resources/Prototypes/Entities/Effects/mobspawn.yml @@ -1,7 +1,7 @@ -- type: entity +- type: entity id: MobSpawnCrabQuartz name: mobspawner quartzcrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Transform anchored: True @@ -31,7 +31,7 @@ id: MobSpawnCrabIron parent: MobSpawnCrabQuartz name: mobspawner ironcrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Sprite sprite: /Textures/Effects/mobspawn.rsi @@ -43,7 +43,7 @@ id: MobSpawnCrabSilver parent: MobSpawnCrabQuartz name: mobspawner silvercrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Sprite sprite: /Textures/Effects/mobspawn.rsi @@ -55,7 +55,7 @@ id: MobSpawnCrabUranium parent: MobSpawnCrabQuartz name: mobspawner uraniumcrab - noSpawn: True + categories: [ HideSpawnMenu, Spawner ] components: - type: Sprite sprite: /Textures/Effects/mobspawn.rsi @@ -65,7 +65,7 @@ - type: entity id: EffectAnomalyFloraBulb - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.4 diff --git a/Resources/Prototypes/Entities/Effects/radiation.yml b/Resources/Prototypes/Entities/Effects/radiation.yml index 143ffa8559..82828582cf 100644 --- a/Resources/Prototypes/Entities/Effects/radiation.yml +++ b/Resources/Prototypes/Entities/Effects/radiation.yml @@ -1,7 +1,7 @@ - type: entity name: shimmering anomaly id: RadiationPulse - noSpawn: true + categories: [ HideSpawnMenu ] description: Looking at this anomaly makes you feel strange, like something is pushing at your eyes. components: - type: RadiationSource diff --git a/Resources/Prototypes/Entities/Effects/rcd.yml b/Resources/Prototypes/Entities/Effects/rcd.yml index 902429818e..a663add9ca 100644 --- a/Resources/Prototypes/Entities/Effects/rcd.yml +++ b/Resources/Prototypes/Entities/Effects/rcd.yml @@ -1,7 +1,7 @@ - type: entity id: EffectRCDBase abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform anchored: True @@ -19,7 +19,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstructPreview - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstructPreview @@ -27,7 +27,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct0 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct0 @@ -37,7 +37,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct1 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct1 @@ -47,7 +47,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct2 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct2 @@ -57,7 +57,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct3 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct3 @@ -67,7 +67,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDConstruct4 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: construct4 @@ -77,7 +77,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct2 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct2 @@ -87,7 +87,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct4 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct4 @@ -97,7 +97,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct6 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct6 @@ -107,7 +107,7 @@ - type: entity parent: EffectRCDBase id: EffectRCDDeconstruct8 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: deconstruct8 diff --git a/Resources/Prototypes/Entities/Effects/shuttle.yml b/Resources/Prototypes/Entities/Effects/shuttle.yml index d4538116ac..72cc04cba1 100644 --- a/Resources/Prototypes/Entities/Effects/shuttle.yml +++ b/Resources/Prototypes/Entities/Effects/shuttle.yml @@ -1,6 +1,6 @@ - type: entity id: FtlVisualizerEntity - noSpawn: true + categories: [ HideSpawnMenu ] description: Visualizer for shuttles arriving. You shouldn't see this! components: - type: FtlVisualizer diff --git a/Resources/Prototypes/Entities/Effects/sparks.yml b/Resources/Prototypes/Entities/Effects/sparks.yml index d86522a971..c12e3b0eca 100644 --- a/Resources/Prototypes/Entities/Effects/sparks.yml +++ b/Resources/Prototypes/Entities/Effects/sparks.yml @@ -1,6 +1,6 @@ - type: entity id: EffectSparks - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.5 @@ -20,7 +20,7 @@ - type: entity id: EffectTeslaSparks - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.5 diff --git a/Resources/Prototypes/Entities/Effects/wallspawn.yml b/Resources/Prototypes/Entities/Effects/wallspawn.yml index 7213763c46..44afe80e97 100644 --- a/Resources/Prototypes/Entities/Effects/wallspawn.yml +++ b/Resources/Prototypes/Entities/Effects/wallspawn.yml @@ -1,6 +1,6 @@ - type: entity id: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: Transform anchored: True @@ -29,7 +29,7 @@ - type: entity id: WallSpawnAsteroidUraniumCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockUraniumCrab @@ -37,7 +37,7 @@ - type: entity id: WallSpawnAsteroidUranium parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockUranium @@ -45,7 +45,7 @@ - type: entity id: WallSpawnAsteroidQuartzCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockQuartzCrab @@ -53,7 +53,7 @@ - type: entity id: WallSpawnAsteroidQuartz parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockQuartz @@ -61,7 +61,7 @@ - type: entity id: WallSpawnAsteroidSilverCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockSilverCrab @@ -69,7 +69,7 @@ - type: entity id: WallSpawnAsteroidSilver parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockSilver @@ -77,7 +77,7 @@ - type: entity id: WallSpawnAsteroidIronCrab parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockTinCrab @@ -85,7 +85,7 @@ - type: entity id: WallSpawnAsteroidIron parent: WallSpawnAsteroid - noSpawn: True + categories: [ HideSpawnMenu ] components: - type: SpawnOnDespawn prototype: AsteroidRockTin \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml index 25cd6e84ff..0f3fab0e87 100644 --- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml +++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml @@ -1,7 +1,7 @@ - type: entity # Just fades out with no movement animation id: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 2.0 @@ -18,7 +18,7 @@ - type: entity # Plays the state animation then disappears with no fade or swing id: WeaponArcAnimated - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Effects/arcs.rsi @@ -34,7 +34,7 @@ - type: entity id: WeaponArcThrust parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals animation: Thrust @@ -42,7 +42,7 @@ - type: entity id: WeaponArcSlash parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals animation: Slash @@ -51,7 +51,7 @@ - type: entity id: WeaponArcBite parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -63,7 +63,7 @@ - type: entity id: WeaponArcClaw parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -75,7 +75,7 @@ - type: entity id: WeaponArcDisarm parent: WeaponArcAnimated - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -87,7 +87,7 @@ - type: entity id: WeaponArcFist parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: fist @@ -95,7 +95,7 @@ - type: entity id: WeaponArcPunch parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -107,7 +107,7 @@ - type: entity id: WeaponArcKick parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false @@ -119,7 +119,7 @@ - type: entity id: WeaponArcSmash parent: WeaponArcStatic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WeaponArcVisuals fadeOut: false diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml index 5cfe78c6d5..f325c084de 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml @@ -78,5 +78,6 @@ - FoodMeatRatdoubleKebab - FoodMeatSnakeKebab - FoodPizzaArnoldSlice + - FoodPizzaUraniumSlice - FoodTacoRat rareChance: 0.05 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index b8cf755d0f..573ddf0398 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -73,7 +73,7 @@ state: narsian - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] id: SpawnPointGhostNukeOperative name: ghost role spawn point suffix: nukeops @@ -93,7 +93,7 @@ state: radiation - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: BaseAntagSpawner id: SpawnPointLoneNukeOperative components: @@ -109,7 +109,7 @@ state: radiation - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: SpawnPointLoneNukeOperative id: SpawnPointNukeopsCommander components: @@ -118,7 +118,7 @@ description: roles-antag-nuclear-operative-commander-objective - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: SpawnPointLoneNukeOperative id: SpawnPointNukeopsMedic components: @@ -127,7 +127,7 @@ description: roles-antag-nuclear-operative-agent-objective - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: SpawnPointLoneNukeOperative id: SpawnPointNukeopsOperative components: @@ -136,7 +136,7 @@ description: roles-antag-nuclear-operative-objective - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: BaseAntagSpawner id: SpawnPointGhostDragon components: @@ -151,7 +151,7 @@ state: alive - type: entity - noSpawn: true + categories: [ HideSpawnMenu, Spawner ] parent: BaseAntagSpawner id: SpawnPointGhostSpaceNinja components: diff --git a/Resources/Prototypes/Entities/Markers/clientsideclone.yml b/Resources/Prototypes/Entities/Markers/clientsideclone.yml index 56875c4414..39b9ee48fd 100644 --- a/Resources/Prototypes/Entities/Markers/clientsideclone.yml +++ b/Resources/Prototypes/Entities/Markers/clientsideclone.yml @@ -1,7 +1,7 @@ - type: entity name: clientsideclone id: clientsideclone - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite - type: AnimationPlayer diff --git a/Resources/Prototypes/Entities/Markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml index be9cc915d9..04a8a09502 100644 --- a/Resources/Prototypes/Entities/Markers/construction_ghost.yml +++ b/Resources/Prototypes/Entities/Markers/construction_ghost.yml @@ -1,7 +1,7 @@ - type: entity name: construction ghost id: constructionghost - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite color: '#3F38' diff --git a/Resources/Prototypes/Entities/Markers/drag_shadow.yml b/Resources/Prototypes/Entities/Markers/drag_shadow.yml index a1badb60bc..19ffb6c36a 100644 --- a/Resources/Prototypes/Entities/Markers/drag_shadow.yml +++ b/Resources/Prototypes/Entities/Markers/drag_shadow.yml @@ -1,7 +1,7 @@ - type: entity name: drag shadow id: dragshadow - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Markers/hover_entity.yml b/Resources/Prototypes/Entities/Markers/hover_entity.yml index 8421a9d8c9..2e8e1edb29 100644 --- a/Resources/Prototypes/Entities/Markers/hover_entity.yml +++ b/Resources/Prototypes/Entities/Markers/hover_entity.yml @@ -1,7 +1,7 @@ - type: entity name: hover entity id: hoverentity - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 2618207b7a..1110b3869b 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -99,6 +99,11 @@ doAfterDelay: 10 allowSelfRepair: false - type: BorgChassis + - type: LockingWhitelist + blacklist: + components: + - BorgChassis + - RoboticsConsole - type: WiresPanel - type: ActivatableUIRequiresPanel - type: NameIdentifier @@ -113,7 +118,9 @@ cellSlotId: cell_slot fitsInCharger: true - type: ItemToggle + activated: false # gets activated when a mind is added onUse: false # no item-borg toggling sorry + toggleLight: false - type: AccessToggle # TODO: refactor movement to just be based on toggle like speedboots but for the boots themselves # TODO: or just have sentient speedboots be fast idk diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 3a17869dc8..215cb4c188 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -265,6 +265,7 @@ access: [["Medical"], ["Command"], ["Research"]] - type: Inventory templateId: borgDutch + - type: SolutionScanner - type: FootstepModifier footstepSoundCollection: collection: FootstepHoverBorg @@ -363,7 +364,7 @@ - type: entity id: BorgChassisSyndicateMedical - parent: BaseBorgChassisSyndicate + parent: [BaseBorgChassisSyndicate, ShowMedicalIcons] name: syndicate medical cyborg description: A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. components: @@ -397,6 +398,12 @@ interactFailureString: petting-failure-syndicate-cyborg interactSuccessSound: path: /Audio/Ambience/Objects/periodic_beep.ogg + - type: SolutionScanner + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepHoverBorg + params: + volume: -6 - type: entity id: BorgChassisSyndicateSaboteur diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index a79fbfbf24..70c65dcb8a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1250,6 +1250,17 @@ tags: - VimPilot - DoorBumpOpener + - type: Reactive + groups: + Flammable: [ Touch ] + Extinguish: [ Touch ] + reactions: + - reagents: [ Water, SpaceCleaner ] + methods: [ Touch ] + effects: + - !type:WashCreamPieReaction + + - type: entity name: monkey @@ -1283,6 +1294,7 @@ clumsySound: path: /Audio/Animals/monkey_scream.ogg + - type: entity name: monkey id: MobBaseSyndicateMonkey @@ -1492,7 +1504,7 @@ - type: entity name: guidebook monkey parent: MobMonkey - noSpawn: true + categories: [ HideSpawnMenu ] id: MobGuidebookMonkey description: A hopefully helpful monkey whose only purpose in life is for you to click on. Does this count as having a monkey give you a tutorial? components: @@ -2143,11 +2155,13 @@ states: Alive: Base: snake + Critical: + Base: dead Dead: Base: dead - type: Butcherable spawned: - - id: FoodMeat + - id: FoodMeatSnake amount: 1 - type: InteractionPopup successChance: 0.6 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 004e091c15..e478a9492f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -162,7 +162,7 @@ id: MobRatServant parent: [ SimpleMobBase, MobCombat ] description: He's da mini rat. He don't make da roolz. - noSpawn: true #Must be configured to a King or the AI breaks. + categories: [ HideSpawnMenu ] #Must be configured to a King or the AI breaks. components: - type: CombatMode - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index d68415992a..b5929620ee 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -148,7 +148,7 @@ description: A geras of a slime - the name is ironic, isn't it? id: MobSlimesGeras parent: BaseMobAdultSlimes - noSpawn: true + categories: [ HideSpawnMenu ] components: # they portable... - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index 4bcee8beb4..23d3e838e2 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -378,6 +378,10 @@ Base: dead_purple_snake Dead: Base: dead_purple_snake + - type: Butcherable + spawned: + - id: FoodMeatSnake + amount: 4 - type: Grammar attributes: proper: true @@ -444,5 +448,9 @@ Base: dead_small_purple_snake Dead: Base: dead_small_purple_snake + - type: Butcherable + spawned: + - id: FoodMeatSnake + amount: 2 - type: SolutionTransfer maxTransferAmount: 1 diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 0c814e08f7..d213cf5f46 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -2,7 +2,7 @@ parent: [MobObserver, InventoryBase] id: AdminObserver name: admin observer - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ContentEye maxZoom: 8.916104, 8.916104 diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml index 4153250bbf..bcb602bbd6 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml @@ -15,7 +15,7 @@ # Reformed Diona - type: entity parent: MobDiona - noSpawn: true + categories: [ HideSpawnMenu ] id: MobDionaReformed name: Reformed Diona components: diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 8bf9bfab41..0b21f0d735 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -154,7 +154,7 @@ - MinorAntagonists - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: DragonsBreathGun name: dragon's lung description: For dragon's breathing diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 0b718746e1..e07ce9c5b4 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -62,13 +62,17 @@ id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink suffix: Human, NukeOps components: - - type: Loadout - prototypes: [SyndicateOperativeGearReinforcementNukeOps] - type: NukeOperative + - type: RandomMetadata + nameSegments: + - nukeops-role-operator + - SyndicateNamesNormal + - type: Loadout + prototypes: [SyndicateOperativeGearFullNoUplink] # Nuclear Operative - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] name: Nuclear Operative parent: MobHuman id: MobHumanNukeOp @@ -77,7 +81,7 @@ - type: RandomHumanoidAppearance - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: MobHuman id: MobHumanLoneNuclearOperative name: Lone Operative diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 85be42cc02..cf3cf10436 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -3,7 +3,7 @@ id: MobObserver name: observer description: Boo! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: CargoSellBlacklist - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml index ad9b37f63e..ffbc46e94c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/replay_observer.yml @@ -1,7 +1,7 @@ - type: entity parent: MobObserver id: ReplayObserver - noSpawn: true + categories: [ HideSpawnMenu ] save: false components: - type: MovementSpeedModifier diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index fa0f5356a6..2682d38715 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -117,7 +117,7 @@ - type: entity parent: BaseSpeciesDummy id: MobArachnidDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Arachnid diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index d6597ce65d..5bda66d635 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -111,7 +111,7 @@ - type: entity parent: BaseSpeciesDummy id: MobDionaDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Diona diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml index 932eda879e..6ce9c80a25 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml @@ -67,7 +67,7 @@ - type: entity parent: BaseSpeciesDummy id: MobDwarfDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite scale: 1, 0.8 diff --git a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml index d0b065bc21..406aa920c1 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/gingerbread.yml @@ -52,7 +52,7 @@ - type: entity parent: BaseSpeciesDummy id: MobGingerbreadDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Gingerbread diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 392185ef77..bf357e1f10 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -32,7 +32,7 @@ - type: entity parent: BaseSpeciesDummy id: MobHumanDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Inventory femaleDisplacements: @@ -40,5 +40,4 @@ sizeMaps: 32: sprite: Mobs/Species/Human/displacement.rsi - state: jumpsuit-female - + state: jumpsuit-female \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index f3eaeb32c7..153d5cccd3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -120,7 +120,7 @@ - type: entity parent: BaseSpeciesDummy id: MobMothDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Moth diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 6f0705635a..1c9eaa2ec6 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -73,7 +73,7 @@ - type: entity parent: BaseSpeciesDummy id: MobReptilianDummy - noSpawn: true + categories: [ HideSpawnMenu ] description: A dummy reptilian meant to be used in character setup. components: - type: HumanoidAppearance diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index 659bf7467e..229c2da027 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -113,7 +113,7 @@ - type: entity parent: BaseSpeciesDummy id: MobSkeletonPersonDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Skeleton diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 0420452ce9..c423a42688 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -120,7 +120,7 @@ - type: entity parent: MobHumanDummy id: MobSlimePersonDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: SlimePerson diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 5f4d471939..4bcd068d9d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -127,7 +127,7 @@ - type: entity parent: BaseSpeciesDummy id: MobVoxDummy - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: HumanoidAppearance species: Vox diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index fde181d8b9..784bfe2cd5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -257,14 +257,12 @@ - type: entity name: blueberry pancake - parent: FoodBakedBase + parent: FoodBakedPancake id: FoodBakedPancakeBb description: A fluffy and delicious blueberry pancake. components: - type: Stack - stackType: Pancake - count: 1 - composite: true + stackType: PancakeBb layerStates: - pancakesbb1 - pancakesbb2 @@ -281,7 +279,6 @@ - state: pancakesbb3 map: ["pancakesbb3"] visible: false - - type: Appearance - type: Tag tags: - Pancake @@ -289,14 +286,12 @@ - type: entity name: chocolate chip pancake - parent: FoodBakedBase + parent: FoodBakedPancake id: FoodBakedPancakeCc description: A fluffy and delicious chocolate chip pancake. components: - type: Stack - stackType: Pancake - count: 1 - composite: true + stackType: PancakeCc layerStates: - pancakescc1 - pancakescc2 @@ -313,7 +308,6 @@ - state: pancakescc3 map: ["pancakescc3"] visible: false - - type: Appearance - type: SolutionContainerManager solutions: food: @@ -323,9 +317,6 @@ Quantity: 5 - ReagentId: Theobromine Quantity: 1 - - type: Tag - tags: - - Pancake - type: entity name: waffles diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index f822fb7c2d..55bf7f994a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -547,3 +547,76 @@ - ReagentId: Vitamin Quantity: 1 # Tastes like stale crust, rancid cheese, mushroom. + +- type: entity + name: spicy rock pizza + parent: FoodPizzaBase + id: FoodPizzaUranium + description: Spicy pizza covered in peppers and uranium. + components: + - type: FlavorProfile + flavors: + - spicy + - cheesy + - oily + - bread + - type: Sprite + layers: + - state: uranium-pizza + - type: SliceableFood + slice: FoodPizzaUraniumSlice + - type: Tag + tags: + - Meat + - Pizza + - type: PointLight + enabled: true + radius: 2 + - type: SolutionContainerManager + solutions: + food: + maxVol: 40 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Radium + Quantity: 4 + - ReagentId: Uranium + Quantity: 16 + +- type: entity + name: slice of spicy rock pizza + parent: FoodPizzaSliceBase + id: FoodPizzaUraniumSlice + description: A glowing slice of spicy rock pizza. + components: + - type: FlavorProfile + flavors: + - spicy + - cheesy + - oily + - bread + - type: Sprite + layers: + - state: uranium-slice + - type: Tag + tags: + - Meat + - Pizza + - Slice + - type: PointLight + enabled: true + radius: 2 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2.5 + - ReagentId: Radium + Quantity: 0.5 + - ReagentId: Uranium + Quantity: 2 + +# Tastes like crust, tomato, cheese, radiation. diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 5d9ddca94d..bb80079d2e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -669,7 +669,7 @@ id: FoodMealHappyHonkClown parent: HappyHonk suffix: random food spawner meal - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index b2375a2dbf..75ed63a4ce 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -95,6 +95,21 @@ - type: Produce seedId: sugarcane +- type: entity + name: papercane roll + description: Why do we even need to grow paper? + id: Papercane + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/papercane.rsi + - type: SolutionContainerManager + - type: Produce + seedId: papercane + - type: Log + spawnedPrototype: SheetPaper1 + spawnCount: 2 + - type: entity parent: FoodProduceBase id: FoodLaughinPeaPod @@ -869,6 +884,42 @@ tags: - Fruit +- type: entity + name: golden apple + parent: FoodProduceBase + id: FoodGoldenApple + description: It should be shaped like a cube, shouldn't it? + components: + - type: FlavorProfile + flavors: + - apple + - metallic + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 + - ReagentId: DoctorsDelight + Quantity: 13 + - type: Sprite + sprite: Objects/Specific/Hydroponics/golden_apple.rsi + - type: Produce + seedId: goldenApple + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceApple + Quantity: 10 + - ReagentId: Gold + Quantity: 10 + - type: Tag + tags: + - Fruit + - type: entity name: cocoa pod parent: FoodProduceBase @@ -1411,6 +1462,71 @@ - Galaxythistle - Fruit # Probably? +- type: entity + name: glasstle + parent: FoodProduceBase + id: FoodGlasstle + description: A fragile crystal plant with lot of spiky thorns. + components: + - type: Item + size: Small + sprite: Objects/Specific/Hydroponics/glasstle.rsi + heldPrefix: produce + - type: FlavorProfile + flavors: + - sharp + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Razorium + Quantity: 15 + - type: Sprite + sprite: Objects/Specific/Hydroponics/glasstle.rsi + - type: Produce + seedId: glasstle + - type: Extractable + grindableSolutionName: food + - type: Damageable + damageContainer: Inorganic + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + ShardGlass: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnHit + damage: + types: + Blunt: 10 + - type: MeleeWeapon + wideAnimationRotation: 60 + damage: + types: + Slash: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Tag + tags: + - Galaxythistle + + - type: entity name: fly amanita parent: FoodProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index d620dbda6f..e8a646e8c9 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -483,7 +483,7 @@ # Trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseItem id: FoodPacketTrash description: This is rubbish. @@ -506,7 +506,7 @@ price: 0 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketBoritosTrash name: boritos bag @@ -515,7 +515,7 @@ state: boritos-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketCnDsTrash name: C&Ds bag @@ -524,7 +524,7 @@ state: cnds-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketCheesieTrash name: cheesie honkers @@ -533,7 +533,7 @@ state: cheesiehonkers-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketChipsTrash name: chips @@ -542,7 +542,7 @@ state: chips-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketChocolateTrash name: chocolate wrapper @@ -551,7 +551,7 @@ state: chocolatebar-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketEnergyTrash name: energybar wrapper @@ -560,7 +560,7 @@ state: energybar-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketPistachioTrash name: pistachios packet @@ -569,7 +569,7 @@ state: pistachio-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketPopcornTrash name: popcorn box @@ -578,7 +578,7 @@ state: popcorn-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketRaisinsTrash name: 4no raisins @@ -587,7 +587,7 @@ state: raisins-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketSemkiTrash name: semki packet @@ -596,7 +596,7 @@ state: semki-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketSusTrash name: sus jerky @@ -605,7 +605,7 @@ state: susjerky-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketSyndiTrash name: syndi-cakes box @@ -614,7 +614,7 @@ state: syndicakes-trash - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketCupRamenTrash name: empty cup ramen @@ -623,7 +623,7 @@ state: ramen - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketChowMeinTrash name: empty chow mein box @@ -632,7 +632,7 @@ state: chinese1 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketDanDanTrash name: empty dan dan box @@ -641,7 +641,7 @@ state: chinese2 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodCookieFortune name: cookie fortune @@ -654,7 +654,7 @@ descriptionSegments: [CookieFortuneDescriptions] - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: FoodPacketTrash id: FoodPacketMRETrash name: MRE wrapper diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 8a4c33d1c4..1240fa3d8f 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -423,7 +423,7 @@ - type: entity id: PresentTrash - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseItem name: wrapping paper description: Carefully folded, taped, and tied with a bow. Then ceremoniously ripped apart and tossed on the floor. diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 6aa2686fa6..e4bca77069 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -35,12 +35,16 @@ - type: entity parent: ReinforcementRadio id: ReinforcementRadioSyndicateNukeops # Reinforcement radio exclusive to nukeops uplink + name: nuclear operative radio + description: Call in a nuclear operative of questionable quality, instantly! Basic nukeop equipment provided. suffix: NukeOps components: - type: GhostRole - name: ghost-role-information-syndicate-reinforcement-name - description: ghost-role-information-syndicate-reinforcement-description - rules: ghost-role-information-syndicate-reinforcement-rules + name: ghost-role-information-nukeop-reinforcement-name + description: ghost-role-information-nukeop-reinforcement-description + rules: ghost-role-information-nukeop-reinforcement-rules + raffle: + settings: default - type: GhostRoleMobSpawner prototype: MobHumanSyndicateAgentNukeops diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml index 20e138f81a..bc17ed455a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml @@ -22,7 +22,7 @@ entity: ChameleonDisguise - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseMob id: ChameleonDisguise name: Urist McKleiner diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml index ab404b88a3..965b25dbc0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/backgammon.yml @@ -18,7 +18,7 @@ id: BackgammonBoardTabletop name: backgammon parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/backgammon_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml index 64e7d7ace9..f7d9e0973a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/base.yml @@ -31,7 +31,7 @@ id: BaseBoardTabletop name: baseboard abstract: true - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml index 69302548d1..6c206ca26f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/checkers.yml @@ -24,7 +24,7 @@ id: *checkerboard name: checkerboard parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml index b31b7803ba..aeba3918c4 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/chess.yml @@ -20,7 +20,7 @@ id: ChessBoardTabletop name: chessboard parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/chessboard_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml index 51f17d55b9..9b00ef5e01 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/dnd.yml @@ -86,7 +86,7 @@ parent: BaseBoardTabletop id: GrassBoardTabletop name: grass battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/grassbm_tabletop.rsi @@ -98,7 +98,7 @@ parent: BaseBoardTabletop id: MoonBoardTabletop name: grass battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/moonbm_tabletop.rsi @@ -108,7 +108,7 @@ parent: BaseBoardTabletop id: SandBoardTabletop name: sand battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/sandbm_tabletop.rsi @@ -118,7 +118,7 @@ parent: BaseBoardTabletop id: SnowBoardTabletop name: snow battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/snowbm_tabletop.rsi @@ -128,7 +128,7 @@ parent: BaseBoardTabletop id: ShipBoardTabletop name: ship battlemap - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/Battlemaps/shipbm_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml index bb5fdf1f0b..b608f4e787 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Tabletop/parchis.yml @@ -20,7 +20,7 @@ id: ParchisBoardTabletop name: parchís parent: BaseBoardTabletop - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/Tabletop/parchis_tabletop.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml index dbd3534459..c97ffe89ed 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/buffering.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/buffering.yml @@ -1,6 +1,6 @@ - type: entity id: BufferingIcon - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/buffering.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml index 89b421c97d..0389db27ea 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml @@ -76,7 +76,7 @@ name: extinguisher spray id: ExtinguisherSpray parent: Vapor - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Effects/extinguisherSpray.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 5dbafa6416..42b850f2b2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -252,7 +252,7 @@ - type: entity parent: Paper id: PaperWritten - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 9690d0bdfe..2368df7381 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -17,7 +17,7 @@ id: SadTromboneImplant name: sad trombone implant description: This implant plays a sad tune when the user dies. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant whitelist: @@ -37,7 +37,7 @@ id: LightImplant name: light implant description: This implant emits light from the user's skin on activation. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionToggleLight @@ -59,7 +59,7 @@ id: BikeHornImplant name: bike horn implant description: This implant lets the user honk anywhere at any time. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateHonkImplant @@ -80,7 +80,7 @@ id: TrackingImplant name: tracking implant description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant whitelist: @@ -110,7 +110,7 @@ id: StorageImplant name: storage implant description: This implant grants hidden storage within a person's body using bluespace technology. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionOpenStorageImplant @@ -134,7 +134,7 @@ id: FreedomImplant name: freedom implant description: This implant lets the user break out of hand restraints up to three times before ceasing to function anymore. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateFreedomImplant @@ -147,7 +147,7 @@ id: UplinkImplant name: uplink implant description: This implant lets the user access a hidden Syndicate uplink at will. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionOpenUplinkImplant @@ -167,7 +167,7 @@ id: EmpImplant name: EMP implant description: This implant creates an electromagnetic pulse when activated. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateEmpImplant @@ -182,7 +182,7 @@ id: ScramImplant name: scram implant description: This implant randomly teleports the user within a large radius when activated. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateScramImplant @@ -194,7 +194,7 @@ id: DnaScramblerImplant name: DNA scrambler implant description: This implant lets the user randomly change their appearance and name once. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant implantAction: ActionActivateDnaScramblerImplant @@ -209,7 +209,7 @@ id: MicroBombImplant name: micro-bomb implant description: This implant detonates the user upon activation or upon death. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -239,7 +239,7 @@ id: MacroBombImplant name: macro-bomb implant description: This implant creates a large explosion on death after a preprogrammed countdown. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -274,7 +274,7 @@ id: DeathAcidifierImplant name: death-acidifier implant description: This implant melts the user and their equipment upon death. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -298,7 +298,7 @@ id: DeathRattleImplant name: death rattle implant description: This implant will inform the Syndicate radio channel should the user fall into critical condition or die. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true @@ -318,7 +318,7 @@ id: MindShieldImplant name: mindshield implant description: This implant will ensure loyalty to Nanotrasen and prevent mind control devices. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SubdermalImplant permanent: true diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index abde52d406..5f6cf903aa 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -163,6 +163,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/sugarcane.rsi +- type: entity + parent: SeedBase + name: packet of papercane seeds + id: PapercaneSeeds + components: + - type: Seed + seedId: papercane + - type: Sprite + sprite: Objects/Specific/Hydroponics/papercane.rsi + - type: entity parent: SeedBase name: packet of tower cap spores @@ -243,6 +253,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/apple.rsi +- type: entity + parent: SeedBase + name: packet of golden apple seeds + id: GoldenAppleSeeds + components: + - type: Seed + seedId: goldenApple + - type: Sprite + sprite: Objects/Specific/Hydroponics/golden_apple.rsi + - type: entity parent: SeedBase name: packet of corn seeds @@ -427,6 +447,17 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/galaxythistle.rsi +- type: entity + parent: SeedBase + name: packet of glasstle seeds + description: "Scars of gloomy nights." + id: GlasstleSeeds + components: + - type: Seed + seedId: glasstle + - type: Sprite + sprite: Objects/Specific/Hydroponics/glasstle.rsi + - type: entity parent: SeedBase name: packet of fly amanita spores diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index efb93a8868..8056d1e909 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -144,7 +144,7 @@ - type: entity name: soaplet id: SoapletSyndie - noSpawn: true + categories: [ HideSpawnMenu ] parent: Soap description: A tiny piece of syndicate soap. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml index cddf7f6075..998d3ecf03 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -104,7 +104,7 @@ - type: entity id: Vapor name: "vapor" - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: SolutionContainerManager solutions: @@ -136,7 +136,7 @@ - type: entity id: BigVapor parent: Vapor - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Effects/chempuff.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index d318c606ad..fd931a05c7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -88,7 +88,7 @@ name: jug suffix: carbon id: JugCarbon - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-carbon @@ -104,7 +104,7 @@ name: jug suffix: iodine id: JugIodine - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-iodine @@ -120,7 +120,7 @@ name: jug suffix: fluorine id: JugFluorine - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-fluorine @@ -136,7 +136,7 @@ name: jug suffix: chlorine id: JugChlorine - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-chlorine @@ -152,7 +152,7 @@ name: jug suffix: aluminium id: JugAluminium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-aluminium @@ -168,7 +168,7 @@ name: jug suffix: phosphorus id: JugPhosphorus - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-phosphorus @@ -184,7 +184,7 @@ name: jug suffix: sulfur id: JugSulfur - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-sulfur @@ -200,7 +200,7 @@ name: jug suffix: silicon id: JugSilicon - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-silicon @@ -216,7 +216,7 @@ name: jug suffix: hydrogen id: JugHydrogen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-hydrogen @@ -232,7 +232,7 @@ name: jug suffix: lithium id: JugLithium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-lithium @@ -248,7 +248,7 @@ name: jug suffix: sodium id: JugSodium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-sodium @@ -264,7 +264,7 @@ name: jug suffix: potassium id: JugPotassium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-potassium @@ -280,7 +280,7 @@ name: jug suffix: radium id: JugRadium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-radium @@ -296,7 +296,7 @@ name: jug suffix: iron id: JugIron - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-iron @@ -312,7 +312,7 @@ name: jug suffix: copper id: JugCopper - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-copper @@ -328,7 +328,7 @@ name: jug suffix: gold id: JugGold - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-gold @@ -344,7 +344,7 @@ name: jug suffix: mercury id: JugMercury - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-mercury @@ -360,7 +360,7 @@ name: jug suffix: silver id: JugSilver - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-silver @@ -376,7 +376,7 @@ name: jug suffix: ethanol id: JugEthanol - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-ethanol @@ -392,7 +392,7 @@ name: jug suffix: sugar id: JugSugar - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-sugar @@ -408,7 +408,7 @@ name: jug suffix: nitrogen id: JugNitrogen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-nitrogen @@ -424,7 +424,7 @@ name: jug suffix: oxygen id: JugOxygen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-oxygen @@ -440,7 +440,7 @@ name: jug suffix: Plant-B-Gone id: JugPlantBGone - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-plant-b-gone @@ -456,7 +456,7 @@ name: jug suffix: welding fuel id: JugWeldingFuel - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Label currentLabel: reagent-name-welding-fuel diff --git a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml index cfd0b8f770..3a6d8ffc22 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/fulton.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/fulton.yml @@ -87,7 +87,7 @@ - type: entity id: FultonEffect - noSpawn: true + categories: [ HideSpawnMenu ] name: fulton effect components: - type: TimedDespawn diff --git a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml index 2320764d9f..3081f60989 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/glowstick.yml @@ -115,7 +115,7 @@ name: light pulse test parent: BaseItem id: LightBehaviourTest1 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -146,7 +146,7 @@ name: color cycle test parent: BaseItem id: LightBehaviourTest2 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -178,7 +178,7 @@ name: multi-behaviour light test parent: BaseItem id: LightBehaviourTest3 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -218,7 +218,7 @@ name: light fade in test parent: BaseItem id: LightBehaviourTest4 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -249,7 +249,7 @@ name: light pulse radius test parent: BaseItem id: LightBehaviourTest5 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi @@ -280,7 +280,7 @@ name: light randomize radius test parent: BaseItem id: LightBehaviourTest6 - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Misc/glowstick.rsi diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index ac0e3b41bf..2c2fc795f2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -1,6 +1,6 @@ - type: entity id: JetpackEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 2 diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 0a0c702324..db31911857 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -155,10 +155,10 @@ state: icon - type: ThiefUndeterminedBackpack possibleSets: - # - TO DO Thief pinpointer needed + # TODO Thief pinpointer needed - ChemistrySet - ToolsSet - - ChameleonSet # - TO DO Chameleon stump PR needed + - ChameleonSet # TODO Chameleon stump PR needed - SyndieSet - SleeperSet - CommunicatorSet diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml index 630354f23d..1aac442414 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml @@ -52,7 +52,7 @@ - type: entity id: HotPotatoEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.6 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index 31d7b65fe8..65b7dbc165 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -1,5 +1,5 @@ - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet id: BulletAntiMateriel name: bullet (.60 anti-materiel) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 741f0a4e1a..83392d07ef 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -2,7 +2,7 @@ id: BulletCaselessRifle name: bullet (.25 caseless) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletCaselessRiflePractice name: bullet (.25 caseless practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml index 6646e268d2..873d970214 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/grenade.yml @@ -1,7 +1,7 @@ - type: entity id: PelletClusterRubber name: pellet (ball, rubber) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -20,7 +20,7 @@ - type: entity id: PelletClusterLethal name: pellet (ball, lethal) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -37,7 +37,7 @@ - type: entity id: PelletClusterIncendiary name: pellet (ball, incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletIncendiary components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index be6a07e486..d37555c344 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -2,7 +2,7 @@ id: BulletHeavyRifle name: bullet (.20 rifle) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletMinigun name: minigun bullet (.10 rifle) parent: BulletHeavyRifle - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index c6a4808b77..7eac4b53d0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -2,7 +2,7 @@ id: BulletLightRifle name: bullet (.20 rifle) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletLightRiflePractice name: bullet (.20 rifle practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletLightRifleIncendiary parent: BaseBulletIncendiary name: bullet (.20 rifle incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletLightRifleUranium parent: BaseBulletUranium name: bullet (.20 rifle uranium) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index 798de9fa85..b4017fd550 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -2,7 +2,7 @@ id: BulletMagnum name: bullet (.45 magnum) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletMagnumPractice name: bullet (.45 magnum practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletMagnumIncendiary parent: BaseBulletIncendiary name: bullet (.45 magnum incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletMagnumAP name: bullet (.45 magnum armor-piercing) parent: BaseBulletAP - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -48,7 +48,7 @@ id: BulletMagnumUranium name: bullet (.45 magnum uranium) parent: BaseBulletUranium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 3cfcc0cf20..8d146939b7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -2,7 +2,7 @@ id: BulletPistol name: bullet (.35 auto) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletPistolPractice name: bullet (.35 auto practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletPistolIncendiary parent: BaseBulletIncendiary name: bullet (.35 auto incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletPistolUranium parent: BaseBulletUranium name: bullet (.35 auto uranium) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 6f6fa0f907..e3e26bf9f3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -2,7 +2,7 @@ id: BulletRifle name: bullet (0.20 rifle) parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -13,7 +13,7 @@ id: BulletRiflePractice name: bullet (0.20 rifle practice) parent: BaseBulletPractice - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -24,7 +24,7 @@ id: BulletRifleIncendiary parent: BaseBulletIncendiary name: bullet (0.20 rifle incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -36,7 +36,7 @@ id: BulletRifleUranium parent: BaseBulletUranium name: bullet (0.20 rifle uranium) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index e119a846c9..6e4570e1a1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -1,7 +1,7 @@ - type: entity id: PelletShotgunSlug name: pellet (.50 slug) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -15,7 +15,7 @@ - type: entity id: PelletShotgunBeanbag name: beanbag (.50) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -31,7 +31,7 @@ - type: entity id: PelletShotgun name: pellet (.50) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -45,7 +45,7 @@ - type: entity id: PelletShotgunIncendiary name: pellet (.50 incendiary) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletIncendiary components: - type: Sprite @@ -62,7 +62,7 @@ - type: entity id: PelletShotgunPractice name: pellet (.50 practice) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletPractice components: - type: Sprite @@ -76,7 +76,7 @@ - type: entity id: PelletShotgunImprovised name: improvised pellet - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -92,7 +92,7 @@ - type: entity id: PelletShotgunTranquilizer name: pellet (.50 tranquilizer) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletPractice components: - type: Sprite @@ -119,7 +119,7 @@ - type: entity id: PelletShotgunFlare name: pellet (.50 flare) - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Physics bodyType: Dynamic @@ -166,7 +166,7 @@ - type: entity id: PelletShotgunUranium name: pellet (.50 uranium) - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -181,7 +181,7 @@ - type: entity id: PelletGrapeshot #tally fucking ho name: grapeshot pellet - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBullet components: - type: Sprite @@ -200,7 +200,7 @@ id: PelletGlass name: glass shard parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite noRot: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml index 3f37d308db..89db3240be 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/hitscan.yml @@ -1,7 +1,7 @@ # Used to animate the hitscan effects because effectsystem doesn't support it - type: entity id: HitscanEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 2.0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml index d70b05bf61..9be9e43e94 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -1,6 +1,6 @@ - type: entity id: BulletImpactEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.25 @@ -18,7 +18,7 @@ - type: entity id: BulletImpactEffectDisabler - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.2 @@ -36,7 +36,7 @@ - type: entity id: BulletImpactEffectOrangeDisabler - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.2 @@ -55,7 +55,7 @@ - type: entity id: BulletImpactEffectKinetic - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index d0ce0808ac..2f1edfe697 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -3,7 +3,7 @@ name: fireball description: You better GITTAH WEIGH. parent: BulletRocket - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight color: "#E25822" @@ -31,7 +31,7 @@ fireStacks: 0.35 - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: BaseBulletTrigger id: ProjectileDragonsBreath name: dragon's breath @@ -68,7 +68,7 @@ name: fireball description: Hovering blob of flame. parent: ProjectileFireball - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 30 @@ -82,7 +82,7 @@ - type: entity id: ProjectilePolyboltBase parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/magic.rsi @@ -99,7 +99,7 @@ parent: ProjectilePolyboltBase name: carp polybolt description: Nooo, I don't wanna be fish! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: WizardForcedCarp @@ -112,7 +112,7 @@ parent: ProjectilePolyboltBase name: monkey polybolt description: Nooo, I don't wanna be monkey! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: WizardForcedMonkey @@ -125,7 +125,7 @@ parent: ProjectilePolyboltBase name: door polybolt description: Nooo, I don't wanna be door! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/magic.rsi @@ -146,7 +146,7 @@ name: healing bolt description: I COMMAND YOU TO LIVE! parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/magic.rsi @@ -166,7 +166,7 @@ id: BulletInstakillMagic name: magical lead cylinder parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] description: This looks familiar. components: - type: Projectile @@ -180,7 +180,7 @@ parent: ProjectilePolyboltBase name: cluwne polybolt description: knoH KnoH! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: WizardForcedCluwne @@ -193,7 +193,7 @@ parent: BaseBullet name: icicle description: Brrrrr. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Structures/Specific/Anomalies/ice_anom.rsi @@ -209,7 +209,7 @@ id: ProjectilePolyboltBread name: bread polybolt description: Nooo, I don't wanna be bread! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide polymorph: BreadMorph diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5601116009..d2c6497831 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1,6 +1,6 @@ - type: entity id: MuzzleFlashEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 0.4 @@ -69,7 +69,7 @@ - type: entity id: BaseBulletTrigger # Trigger-on-collide bullets parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TriggerOnCollide fixtureID: projectile @@ -93,7 +93,7 @@ id: BaseBulletPractice name: base bullet practice parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -108,7 +108,7 @@ id: BaseBulletIncendiary name: base bullet incendiary parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -126,7 +126,7 @@ id: BaseBulletAP name: base bullet armor-piercing parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -142,7 +142,7 @@ id: BaseBulletUranium name: base bullet uranium parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -158,7 +158,7 @@ name: taser bolt id: BulletTaser parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: FlyBySound sound: @@ -200,7 +200,7 @@ name : disabler bolt id: BulletDisabler parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Reflective reflective: @@ -243,7 +243,7 @@ name : disabler bolt practice id: BulletDisablerPractice parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: FlyBySound sound: @@ -283,7 +283,7 @@ name: emitter bolt id: EmitterBolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Structures/Power/Generation/Singularity/emitter.rsi @@ -320,7 +320,7 @@ name: watcher bolt id: WatcherBolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: FlyBySound sound: @@ -360,7 +360,7 @@ name: magmawing watcher bolt id: WatcherBoltMagmawing parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi @@ -379,7 +379,7 @@ id: BulletKinetic name: kinetic bolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] description: Not too bad, but you still don't want to get hit by it. components: - type: Reflective @@ -405,7 +405,7 @@ - type: entity id: BulletKineticShuttle parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite noRot: false @@ -433,7 +433,7 @@ id: BulletCharge name: charge bolt parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] description: Marks a target for additional damage. components: - type: Reflective @@ -467,7 +467,7 @@ parent: BaseBullet id: AnomalousParticleDelta name: delta particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -508,7 +508,7 @@ - type: entity parent: AnomalousParticleDelta id: AnomalousParticleDeltaStrong - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Delta @@ -521,7 +521,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleEpsilon name: epsilon particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -538,7 +538,7 @@ - type: entity parent: AnomalousParticleEpsilon id: AnomalousParticleEpsilonStrong - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Epsilon @@ -551,7 +551,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleZeta name: zeta particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -568,7 +568,7 @@ - type: entity parent: AnomalousParticleZeta id: AnomalousParticleZetaStrong - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Zeta @@ -581,7 +581,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleOmegaStrong name: omega particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -610,7 +610,7 @@ parent: AnomalousParticleDelta id: AnomalousParticleSigma name: sigma particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -628,7 +628,7 @@ parent: AnomalousParticleSigma id: AnomalousParticleSigmaStrong name: sigma particles - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: AnomalousParticle particleType: Sigma @@ -638,7 +638,7 @@ id: BulletRocket name: rocket parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -660,7 +660,7 @@ id: BulletWeakRocket name: weak rocket parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -682,7 +682,7 @@ id: BulletGrenadeBaton name: baton grenade parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -702,7 +702,7 @@ id: BulletGrenadeBlast name: blast grenade parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -719,7 +719,7 @@ id: BulletGrenadeFlash name: flash grenade parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -738,7 +738,7 @@ id: BulletGrenadeFrag name: frag grenade parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -755,7 +755,7 @@ id: BulletGrenadeEMP name: EMP rocket parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -776,7 +776,7 @@ id: BulletCap name: cap bullet parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Fun/toys.rsi @@ -792,7 +792,7 @@ id: BulletAcid name: acid spit parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Projectile damage: @@ -808,7 +808,7 @@ - type: entity id: BulletWaterShot name: water - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Clickable - type: Physics @@ -851,7 +851,7 @@ id: BulletCannonBall name: cannonball parent: BaseBulletTrigger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi @@ -872,7 +872,7 @@ - type: entity id: GrapplingHook name: grappling hook - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: EmbeddableProjectile deleteOnRemove: true @@ -908,7 +908,7 @@ name : disabler bolt smg id: BulletDisablerSmg parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Reflective reflective: @@ -951,7 +951,7 @@ name: tesla gun lightning id: TeslaGunBullet parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: TimedDespawn lifetime: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 79abbd9bc2..1e0125fd49 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -83,7 +83,7 @@ - type: entity id: GrenadeFlashEffect - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: PointLight enabled: true @@ -125,7 +125,7 @@ description: Go out on your own terms! parent: GrenadeBase id: SelfDestructSeq - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ExplodeOnTrigger - type: Explosive diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml index c7b54f4571..de191277ae 100644 --- a/Resources/Prototypes/Entities/Stations/base.yml +++ b/Resources/Prototypes/Entities/Stations/base.yml @@ -73,7 +73,8 @@ - /Maps/Ruins/whiteship_ancient.yml - /Maps/Ruins/whiteship_bluespacejumper.yml vgroid: !type:DungeonSpawnGroup - minimumDistance: 1000 + minimumDistance: 400 + maximumDistance: 450 nameDataset: names_borer stationGrid: false addComponents: diff --git a/Resources/Prototypes/Entities/Stations/nanotrasen.yml b/Resources/Prototypes/Entities/Stations/nanotrasen.yml index ab885b03e5..613bb1b1f4 100644 --- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml +++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml @@ -25,7 +25,7 @@ - BaseStationSiliconLawCrewsimov - BaseStationAllEventsEligible - BaseStationNanotrasen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform @@ -35,7 +35,7 @@ - BaseStation - BaseStationAlertLevels - BaseStationNanotrasen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform @@ -46,6 +46,6 @@ - BaseStationJobsSpawning - BaseStationRecords - BaseStationNanotrasen - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform diff --git a/Resources/Prototypes/Entities/Stations/syndicate.yml b/Resources/Prototypes/Entities/Stations/syndicate.yml index a649416914..c863ef7352 100644 --- a/Resources/Prototypes/Entities/Stations/syndicate.yml +++ b/Resources/Prototypes/Entities/Stations/syndicate.yml @@ -11,6 +11,6 @@ parent: - BaseStation - BaseStationSyndicate - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform diff --git a/Resources/Prototypes/Entities/Stations/test.yml b/Resources/Prototypes/Entities/Stations/test.yml index 0f2e40537a..9eec6979e7 100644 --- a/Resources/Prototypes/Entities/Stations/test.yml +++ b/Resources/Prototypes/Entities/Stations/test.yml @@ -6,6 +6,6 @@ - BaseStationJobsSpawning - BaseStationRecords - BaseStationAlertLevels - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Transform diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml index 681f0a390c..cf51ca9b1f 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/chem.yml @@ -37,6 +37,17 @@ - Chemist - type: StealTarget stealGroup: ChemDispenser + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25, -0.4, 0.25, 0.4" + density: 190 + mask: + - MachineMask + layer: + - MachineLayer - type: entity id: ChemDispenserEmpty diff --git a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml index 1cf9ceaeab..5384d7e9d0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/nuke.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/nuke.yml @@ -128,6 +128,8 @@ suffix: keg description: You probably shouldn't stick around to see if this is armed. It has a tap on the side. components: + - type: Transform + anchored: false - type: NukeLabel - type: Sprite sprite: Objects/Devices/nuke.rsi @@ -161,11 +163,11 @@ shape: !type:PhysShapeCircle radius: 0.45 - density: 80 + density: 255 mask: - - TabletopMachineMask + - MachineMask layer: - - TabletopMachineLayer + - WallLayer - type: SolutionContainerManager solutions: tank: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index 7aee589647..3c1334169d 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -61,7 +61,7 @@ - type: entity id: DisposalHolder - noSpawn: true + categories: [ HideSpawnMenu ] name: disposal holder components: - type: DisposalHolder diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml index 8d889ee5cb..9d3ce9c931 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/particles.yml @@ -3,7 +3,7 @@ description: Accelerated particles. id: ParticlesProjectile parent: BaseBullet - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -54,7 +54,7 @@ description: Accelerated negative particles. id: AntiParticlesProjectile parent: ParticlesProjectile - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml index b63f131a7f..dc2ad1687a 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml @@ -101,7 +101,7 @@ SheetSteel1: min: 2 max: 4 - #- type: GuideHelp # To Do - add Tesla Guide + #- type: GuideHelp # TODO - add Tesla Guide - type: entity id: TeslaGroundingRod @@ -184,5 +184,5 @@ SheetSteel1: min: 2 max: 4 - #- type: GuideHelp # To Do - add Tesla Guide + #- type: GuideHelp # TODO - add Tesla Guide diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml index a8c61634df..d45e6c58ea 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/generator.yml @@ -8,7 +8,7 @@ noRot: true sprite: Structures/Power/Generation/Tesla/generator.rsi state: icon - - type: SingularityGenerator #To do: rename the generator + - type: SingularityGenerator # TODO: rename the generator spawnId: TeslaEnergyBall - type: InteractionOutline - type: Fixtures @@ -25,5 +25,5 @@ layer: - Opaque - type: Anchorable - #- type: GuideHelp # To Do - add Tesla Guide + #- type: GuideHelp # TODO - add Tesla Guide diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index 4e4ef8bdbc..b7d6b5a128 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -108,7 +108,7 @@ mediumVoltageNode: ame - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] parent: AmeController id: AmeControllerUnanchored suffix: Unanchored diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml index ed70b31091..1faee965d4 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml @@ -144,7 +144,7 @@ # Construction Frames - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: BaseGeneratorWallmountFrame name: wallmount generator frame description: A construction frame for a wallmount generator. diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index c512266e97..a997dbbf9d 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml @@ -1,6 +1,6 @@ - type: entity id: SolarPanelBasePhysSprite - noSpawn: true + categories: [ HideSpawnMenu ] name: solar panel placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml index 78d979ab8e..b7f43614db 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml @@ -184,7 +184,7 @@ - # Spawned by the client-side circulator examine code to indicate the inlet/outlet direction. type: entity id: TegCirculatorArrow - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite sprite: Markers/teg_arrow.rsi diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index 0948cdb4cc..d8f32922c8 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -1,5 +1,5 @@ - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: BaseAPC name: APC description: A control terminal for the area's electrical systems. @@ -146,7 +146,7 @@ # APC under construction - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: APCFrame name: APC frame description: A control terminal for the area's electrical systems, lacking the electronics. diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 692f027386..8f8f752e38 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -112,7 +112,7 @@ # Compact Wall Substation Base - type: entity id: BaseSubstationWall - noSpawn: true + categories: [ HideSpawnMenu ] name: wallmount substation description: A substation designed for compact shuttles and spaces. placement: @@ -256,7 +256,7 @@ # Construction Frame - type: entity id: BaseSubstationWallFrame - noSpawn: true + categories: [ HideSpawnMenu ] name: wallmount substation frame description: A substation frame for construction placement: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index b38ef61791..147e9e5b37 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -697,7 +697,7 @@ - type: entity parent: GasCanisterBrokenBase id: StorageCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: yellow-1 @@ -705,7 +705,7 @@ - type: entity parent: GasCanisterBrokenBase id: AirCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: grey-1 @@ -713,7 +713,7 @@ - type: entity parent: GasCanisterBrokenBase id: OxygenCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: blue-1 @@ -721,7 +721,7 @@ - type: entity parent: GasCanisterBrokenBase id: NitrogenCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: red-1 @@ -729,7 +729,7 @@ - type: entity parent: GasCanisterBrokenBase id: CarbonDioxideCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: black-1 @@ -737,7 +737,7 @@ - type: entity parent: GasCanisterBrokenBase id: PlasmaCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: orange-1 @@ -745,7 +745,7 @@ - type: entity parent: GasCanisterBrokenBase id: TritiumCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: green-1 @@ -754,7 +754,7 @@ parent: GasCanisterBrokenBase id: WaterVaporCanisterBroken name: broken water vapor canister - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: water_vapor-1 @@ -762,7 +762,7 @@ - type: entity parent: GasCanisterBrokenBase id: AmmoniaCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: greenys-1 @@ -770,7 +770,7 @@ - type: entity parent: GasCanisterBrokenBase id: NitrousOxideCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: redws-1 @@ -778,7 +778,7 @@ - type: entity parent: GasCanisterBrokenBase id: FrezonCanisterBroken - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite state: frezon-1 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 2666e8261d..73871cbe9b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml @@ -1,7 +1,7 @@ - type: entity parent: BaseStructureDynamic id: CrateGeneric - noSpawn: true + categories: [ HideSpawnMenu ] name: crate description: A large container for items. components: @@ -94,7 +94,7 @@ - type: entity parent: CrateGeneric id: CrateBaseWeldable - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Weldable - type: ResistLocker diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml index 1be9f202f0..3f6dd3723d 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/atmos_plaque.yml @@ -14,6 +14,7 @@ layer: - MidImpassable - type: Sprite + drawdepth: WallMountedItems layers: - state: atmosplaque map: ["plaque"] diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml index b2a0ffe592..f749bc599b 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml @@ -11,7 +11,7 @@ - type: WallMount arc: 360 - type: Sprite - drawdepth: Objects + drawdepth: WallMountedItems sprite: Structures/Wallmounts/barsign.rsi state: empty - type: ApcPowerReceiver @@ -48,7 +48,7 @@ #- type: entity # id: LargeBarSign # name: large bar sign -# noSpawn: true +# categories: [ HideSpawnMenu ] # components: # - type: Clickable # - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml index e7d938a3c9..35281d0383 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml @@ -30,7 +30,7 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: Sprite - drawdepth: WallTops + drawdepth: WallMountedItems sprite: Structures/Wallmounts/signs.rsi snapCardinals: true - type: StaticPrice diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml index 57b07aa3dd..a4ab12df74 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml @@ -6,7 +6,7 @@ - type: WallMount arc: 360 - type: Sprite - drawdepth: WallTops + drawdepth: WallMountedItems sprite: Structures/Wallmounts/flags.rsi - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml index 5402d443e2..4f26432c60 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/paintings.yml @@ -6,7 +6,7 @@ - type: WallMount arc: 360 - type: Sprite - drawdepth: WallTops + drawdepth: WallMountedItems sprite: Structures/Wallmounts/paintings.rsi - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index cd4850d488..ae8ed5f74f 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -6,7 +6,7 @@ - type: WallMount arc: 360 - type: Sprite - drawdepth: WallTops + drawdepth: WallMountedItems sprite: Structures/Wallmounts/posters.rsi snapCardinals: true - type: Destructible diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml index 7e6a1632a7..9f36f47920 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml @@ -30,7 +30,7 @@ ejectOnInteract: true whitelist: components: - - FireExtinguisher + - SpraySafety - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index ecf2b0525e..01e3757a2c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -236,7 +236,7 @@ id: LockableButton name: lockable button parent: SignalButtonDirectional - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Appearance - type: Lock @@ -496,7 +496,7 @@ - type: entity id: ButtonFrame name: button frame - noSpawn: true + categories: [ HideSpawnMenu ] description: It's a frame to help distinguish switches visually. placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml index 271a9a65cd..ff935055ff 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml @@ -101,7 +101,7 @@ # Construction Frame - type: entity - noSpawn: true + categories: [ HideSpawnMenu ] id: TimerFrame name: timer frame description: A construction frame for a timer. diff --git a/Resources/Prototypes/Entities/Virtual/beam.yml b/Resources/Prototypes/Entities/Virtual/beam.yml index 7ded09c3ff..fa249f0dd3 100644 --- a/Resources/Prototypes/Entities/Virtual/beam.yml +++ b/Resources/Prototypes/Entities/Virtual/beam.yml @@ -2,7 +2,7 @@ - type: entity id: VirtualBeamEntityController name: BEAM ENTITY YOU SHOULD NOT SEE THIS - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Beam - type: TimedDespawn diff --git a/Resources/Prototypes/Entities/Virtual/electrocution.yml b/Resources/Prototypes/Entities/Virtual/electrocution.yml index ac65245191..c45e0b3ca9 100644 --- a/Resources/Prototypes/Entities/Virtual/electrocution.yml +++ b/Resources/Prototypes/Entities/Virtual/electrocution.yml @@ -12,7 +12,7 @@ - type: entity id: VirtualElectrocutionLoadHVPower parent: VirtualElectrocutionLoadBase - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: NodeContainer nodes: @@ -26,7 +26,7 @@ - type: entity id: VirtualElectrocutionLoadMVPower parent: VirtualElectrocutionLoadBase - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: NodeContainer nodes: @@ -40,7 +40,7 @@ - type: entity id: VirtualElectrocutionLoadApc parent: VirtualElectrocutionLoadBase - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: NodeContainer nodes: diff --git a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml index 6eb734c1d3..81e8e9866c 100644 --- a/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml +++ b/Resources/Prototypes/Entities/Virtual/stripping_hidden.yml @@ -5,7 +5,7 @@ id: StrippingHiddenEntity name: hidden entity description: There is something in this pocket. #Or maybe they ar... nah... too obvious a joke. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Sprite texture: Interface/VerbIcons/information.svg.192dpi.png diff --git a/Resources/Prototypes/Entities/Virtual/tether.yml b/Resources/Prototypes/Entities/Virtual/tether.yml index ce953854d6..9459fd2088 100644 --- a/Resources/Prototypes/Entities/Virtual/tether.yml +++ b/Resources/Prototypes/Entities/Virtual/tether.yml @@ -1,6 +1,6 @@ - type: entity id: TetherEntity - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Physics bodyType: Dynamic diff --git a/Resources/Prototypes/Entities/Virtual/virtual_item.yml b/Resources/Prototypes/Entities/Virtual/virtual_item.yml index 088de6a6da..21391dbb34 100644 --- a/Resources/Prototypes/Entities/Virtual/virtual_item.yml +++ b/Resources/Prototypes/Entities/Virtual/virtual_item.yml @@ -2,7 +2,7 @@ - type: entity id: VirtualItem name: VIRTUAL ITEM YOU SHOULD NOT SEE THIS - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Item size: Ginormous # no storage insertion visuals diff --git a/Resources/Prototypes/Entities/World/Debris/asteroids.yml b/Resources/Prototypes/Entities/World/Debris/asteroids.yml index ba0539ac89..bb33801e2d 100644 --- a/Resources/Prototypes/Entities/World/Debris/asteroids.yml +++ b/Resources/Prototypes/Entities/World/Debris/asteroids.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseAsteroidDebris parent: BaseDebris name: asteroid debris @@ -58,7 +58,7 @@ id: AsteroidDebrisSmall parent: BaseAsteroidDebris name: asteroid debris small - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -68,7 +68,7 @@ id: AsteroidDebrisMedium parent: BaseAsteroidDebris name: asteroid debris medium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -78,7 +78,7 @@ id: AsteroidDebrisLarge parent: BaseAsteroidDebris name: asteroid debris large - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -88,7 +88,7 @@ id: AsteroidDebrisLarger parent: BaseAsteroidDebris name: asteroid debris larger - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -99,7 +99,7 @@ id: AsteroidSalvageSmall parent: BaseAsteroidDebris name: salvage asteroid small - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -111,7 +111,7 @@ id: AsteroidSalvageMedium parent: BaseAsteroidDebris name: salvage asteroid medium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -123,7 +123,7 @@ id: AsteroidSalvageLarge parent: BaseAsteroidDebris name: salvage asteroid large - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -135,7 +135,7 @@ id: AsteroidSalvageHuge parent: BaseAsteroidDebris name: salvage asteroid huge - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder diff --git a/Resources/Prototypes/Entities/World/Debris/wrecks.yml b/Resources/Prototypes/Entities/World/Debris/wrecks.yml index 4512ca7917..7bbeadeb5b 100644 --- a/Resources/Prototypes/Entities/World/Debris/wrecks.yml +++ b/Resources/Prototypes/Entities/World/Debris/wrecks.yml @@ -53,7 +53,7 @@ id: ScrapDebrisSmall parent: BaseScrapDebris name: scrap debris small - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -63,7 +63,7 @@ id: ScrapDebrisMedium parent: BaseScrapDebris name: scrap debris medium - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder @@ -73,7 +73,7 @@ id: ScrapDebrisLarge parent: BaseScrapDebris name: scrap debris large - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: MapGrid - type: BlobFloorPlanBuilder diff --git a/Resources/Prototypes/Entities/World/chunk.yml b/Resources/Prototypes/Entities/World/chunk.yml index 8f5f91557b..c7cb09c2a4 100644 --- a/Resources/Prototypes/Entities/World/chunk.yml +++ b/Resources/Prototypes/Entities/World/chunk.yml @@ -5,7 +5,7 @@ description: | It's rude to stare. It's also a bit odd you're looking at the abstract representation of the grid of reality. - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: WorldChunk - type: Sprite diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 7784b72556..73b2920ca7 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -145,7 +145,7 @@ components: - type: StationEvent weight: 6 - duration: 1 + duration: null earliestStart: 30 reoccurrenceDelay: 20 minimumPlayers: 30 diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml index 43cdca3bc3..7446995f26 100644 --- a/Resources/Prototypes/GameRules/midround.yml +++ b/Resources/Prototypes/GameRules/midround.yml @@ -18,10 +18,8 @@ agentName: thief-round-end-agent-name definitions: - prefRoles: [ Thief ] - maxRange: - min: 1 - max: 3 - playerRatio: 1 + max: 3 + playerRatio: 15 lateJoinAdditional: true allowNonHumans: true multiAntagSetting: NotExclusive diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 5aef050fec..65fbf0b91d 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -341,6 +341,8 @@ packetPrototype: SugarcaneSeeds productPrototypes: - Sugarcane + mutationPrototypes: + - papercane harvestRepeat: Repeat lifespan: 60 maturation: 6 @@ -355,6 +357,24 @@ Max: 5 PotencyDivisor: 5 +- type: seed + id: papercane + name: seeds-papercane-name + noun: seeds-noun-seeds + displayName: seeds-papercane-display-name + plantRsi: Objects/Specific/Hydroponics/papercane.rsi + packetPrototype: PapercaneSeeds + productPrototypes: + - Papercane + harvestRepeat: Repeat + lifespan: 60 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + growthStages: 3 + idealHeat: 298 + - type: seed id: towercap name: seeds-towercap-name @@ -625,6 +645,8 @@ packetPrototype: AppleSeeds productPrototypes: - FoodApple + mutationPrototypes: + - goldenApple harvestRepeat: Repeat lifespan: 55 maturation: 6 @@ -642,6 +664,38 @@ Max: 4 PotencyDivisor: 25 +- type: seed + id: goldenApple + name: seeds-goldenapple-name + noun: seeds-noun-seeds + displayName: seeds-goldenapple-display-name + plantRsi: Objects/Specific/Hydroponics/golden_apple.rsi + packetPrototype: GoldenAppleSeeds + productPrototypes: + - FoodGoldenApple + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + waterConsumption: 0.75 + nutrientConsumption: 0.75 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + DoctorsDelight: + Min: 3 + Max: 13 + PotencyDivisor: 10 + - type: seed id: corn name: seeds-corn-name @@ -1192,6 +1246,8 @@ packetPrototype: GalaxythistleSeeds productPrototypes: - FoodGalaxythistle + mutationPrototypes: + - glasstle lifespan: 25 maturation: 10 production: 3 @@ -1205,6 +1261,28 @@ Max: 25 PotencyDivisor: 4 +- type: seed + id: glasstle + name: seeds-glasstle-name + noun: seeds-noun-seeds + displayName: seeds-glasstle-display-name + plantRsi: Objects/Specific/Hydroponics/glasstle.rsi + packetPrototype: GlasstleSeeds + productPrototypes: + - FoodGlasstle + lifespan: 25 + maturation: 10 + production: 3 + yield: 3 + potency: 10 + growthStages: 3 + waterConsumption: 0.5 + chemicals: + Razorium: + Min: 1 + Max: 25 + PotencyDivisor: 4 + - type: seed id: flyAmanita name: seeds-flyamanita-name diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 6a7720833a..950984c719 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -1 +1,65 @@ -# Not used in CP14 +- type: gameMap + id: Core + mapName: 'Core' + mapPath: /Maps/core.yml + minPlayers: 30 + maxPlayers: 60 + stations: + Core: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: '{0} Core {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml + - type: StationCargoShuttle + path: /Maps/Shuttles/cargo_core.yml + - type: StationJobs + availableJobs: + #service + Bartender: [ 2, 2 ] + Botanist: [ 2, 2] + Chef: [ 1, 1 ] + Janitor: [ 2, 2 ] + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 3, 3 ] + #engineering + ChiefEngineer: [ 1, 1 ] + StationEngineer: [ 4, 4 ] + AtmosphericTechnician: [ 2, 2 ] + TechnicalAssistant: [ 2, 2 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + MedicalDoctor: [ 3, 4 ] + Chemist: [ 2, 2 ] + MedicalIntern: [ 2, 2 ] + Paramedic: [ 1, 2 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 3, 3 ] + ResearchAssistant: [ 1, 1 ] + Borg: [ 1, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + SecurityOfficer: [ 4, 4 ] + Warden: [ 1, 1 ] + Lawyer: [ 1, 1 ] + SecurityCadet: [ 1, 1 ] + Detective: [ 1, 1 ] + #supply + CargoTechnician: [ 3, 3 ] + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Boxer: [ 2, 2 ] + Reporter: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 6a7720833a..0925b5ead1 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -1 +1,62 @@ -# Not used in CP14 +- type: gameMap + id: Train + mapName: 'Train' + mapPath: /Maps/train.yml + maxRandomOffset: 0 + randomRotation: false + minPlayers: 10 + maxPlayers: 50 + stations: + Train: + stationProto: StandardNanotrasenStation + components: + - type: StationNameSetup + mapNameTemplate: 'Train "Sentipode" {0}-{1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'ED' + - type: StationEmergencyShuttle + emergencyShuttlePath: /Maps/Shuttles/emergency_omega.yml # TODO - add railway station + - type: StationJobs + availableJobs: + #service + Captain: [ 1, 1 ] + HeadOfPersonnel: [ 1, 1 ] + Bartender: [ 1, 1 ] + Botanist: [ 2, 2 ] + Chef: [ 1, 1 ] + Janitor: [ 1, 2 ] + Chaplain: [ 1, 1 ] + Librarian: [ 1, 1 ] + ServiceWorker: [ 2, 3 ] + Detective: [ 1, 1 ] + #engineering + ChiefEngineer: [ 1, 1 ] + AtmosphericTechnician: [ 3, 3 ] + StationEngineer: [ 5, 5 ] + TechnicalAssistant: [ 3, 3 ] + #medical + ChiefMedicalOfficer: [ 1, 1 ] + Chemist: [ 2, 2 ] + MedicalDoctor: [ 3, 3 ] + MedicalIntern: [ 2, 2 ] + #science + ResearchDirector: [ 1, 1 ] + Scientist: [ 4, 4 ] + ResearchAssistant: [ 2, 2 ] + #security + HeadOfSecurity: [ 1, 1 ] + Warden: [ 1, 1 ] + SecurityOfficer: [ 6, 6 ] + SecurityCadet: [ 3, 3 ] + Lawyer: [ 1, 2 ] + #supply + Quartermaster: [ 1, 1 ] + SalvageSpecialist: [ 2, 2 ] + CargoTechnician: [ 2, 2 ] + #civilian + Passenger: [ -1, -1 ] + Clown: [ 1, 1 ] + Mime: [ 1, 1 ] + Musician: [ 1, 1 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index cc94ab02b3..89334f990b 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -61,7 +61,7 @@ - type: StealCondition stealGroup: Figurines minCollectionSize: 10 - maxCollectionSize: 50 #will be limited to the number of figures on the station anyway. + maxCollectionSize: 18 #will be limited to the number of figures on the station anyway. - type: Objective difficulty: 0.25 @@ -94,7 +94,7 @@ - type: StealCondition stealGroup: Stamp minCollectionSize: 5 - maxCollectionSize: 15 + maxCollectionSize: 8 - type: Objective difficulty: 1.0 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml index f83a3b1e95..45ac8cc702 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/mannequin.yml @@ -20,6 +20,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: MaterialWoodPlank amount: 5 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml index 61a903f7a0..1a6492fd92 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml @@ -117,6 +117,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: MaterialWoodPlank1 amount: 4 @@ -129,6 +130,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: SheetSteel1 amount: 5 @@ -141,6 +143,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: SheetGlass1 amount: 4 @@ -153,6 +156,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: MaterialWoodPlank1 amount: 8 @@ -170,6 +174,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: SheetPlasteel1 amount: 5 @@ -190,6 +195,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: SheetPlastic1 amount: 5 @@ -211,6 +217,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: MaterialWoodPlank1 amount: 6 @@ -223,6 +230,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: PartRodMetal amount: 2 @@ -245,6 +253,7 @@ edges: - to: start completed: + - !type:EmptyAllContainers - !type:SpawnPrototype prototype: SheetPlasteel1 amount: 2 diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml index 930768b3ea..d07201bf7b 100644 --- a/Resources/Prototypes/Recipes/Construction/utilities.yml +++ b/Resources/Prototypes/Recipes/Construction/utilities.yml @@ -394,7 +394,7 @@ targetNode: half category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeHalf @@ -408,7 +408,7 @@ targetNode: straight category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeStraight @@ -422,7 +422,7 @@ targetNode: bend category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeBend @@ -436,7 +436,7 @@ targetNode: tjunction category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeTJunction @@ -450,7 +450,7 @@ targetNode: fourway category: construction-category-utilities placementMode: SnapgridCenter - canBuildInImpassable: false + canBuildInImpassable: true icon: sprite: Structures/Piping/Atmospherics/pipe.rsi state: pipeFourway diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 0a8ff18aad..b092005599 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -591,6 +591,17 @@ FoodCheeseSlice: 1 FoodTomato: 1 +- type: microwaveMealRecipe + id: RecipeUraniumPizza + name: spicy rock pizza recipe + result: FoodPizzaUranium + time: 30 + solids: + FoodDoughFlat: 1 + FoodChiliPepper: 2 + FoodTomato: 2 + SheetUranium1: 2 + #Italian - type: microwaveMealRecipe id: RecipeBoiledSpaghetti diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 7cfed348f1..8dec692ee5 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -38,9 +38,8 @@ # should be changed to nukie playtime when thats tracked (wyci) guides: [ NuclearOperatives ] -#Nuclear Operative Gear - type: startingGear - id: SyndicateOperativeGearFull + id: SyndicateOperativeGearFullNoUplink equipment: jumpsuit: ClothingUniformJumpsuitOperative back: ClothingBackpackDuffelSyndicate @@ -52,7 +51,7 @@ shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled - pocket2: BaseUplinkRadio40TC + pocket2: PlushieCarp belt: ClothingBeltMilitaryWebbing storage: back: @@ -61,6 +60,13 @@ - PinpointerSyndicateNuclear - DeathAcidifierImplanter +#Nuclear Operative Gear +- type: startingGear + id: SyndicateOperativeGearFull + parent: SyndicateOperativeGearFullNoUplink + equipment: + pocket2: BaseUplinkRadio40TC + #Nuclear Operative Commander Gear - type: startingGear id: SyndicateCommanderGearFull diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index feb8109739..e40466d57f 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -78,14 +78,6 @@ - BoxSurvivalSyndicate - SyndicateJawsOfLife -# Syndicate Reinforcement NukeOps -- type: startingGear - id: SyndicateOperativeGearReinforcementNukeOps - parent: SyndicateOperativeGearExtremelyBasic - equipment: - id: SyndiPDA #Do not give a PDA to the normal Reinforcement - it will spawn with a 20TC uplink - - #Syndicate Operative Outfit - Basic - type: startingGear id: SyndicateOperativeGearBasic diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml index e7feab7b52..e2abbcbf08 100644 --- a/Resources/Prototypes/Stacks/consumable_stacks.yml +++ b/Resources/Prototypes/Stacks/consumable_stacks.yml @@ -4,6 +4,18 @@ id: Pancake name: pancake spawn: FoodBakedPancake + maxCount: 9 + +- type: stack + id: PancakeBb + name: blueberry pancake + spawn: FoodBakedPancakeBb + maxCount: 3 + +- type: stack + id: PancakeCc + name: chocolate chip pancake + spawn: FoodBakedPancakeCc maxCount: 3 # Food Containers diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml index 0da545b8a2..c22a13a600 100644 --- a/Resources/Prototypes/StatusIcon/antag.yml +++ b/Resources/Prototypes/StatusIcon/antag.yml @@ -23,6 +23,7 @@ - type: statusIcon id: RevolutionaryFaction + isShaded: true priority: 11 showTo: components: @@ -34,6 +35,7 @@ - type: statusIcon id: HeadRevolutionaryFaction + isShaded: true priority: 11 showTo: components: diff --git a/Resources/Prototypes/Traits/categories.yml b/Resources/Prototypes/Traits/categories.yml index f7196dcd9d..194db0a388 100644 --- a/Resources/Prototypes/Traits/categories.yml +++ b/Resources/Prototypes/Traits/categories.yml @@ -6,3 +6,8 @@ # id: SpeechTraits # name: trait-category-speech # maxTraitPoints: 2 +# +#- type: traitCategory +# id: Quirks +# name: trait-category-quirks +# diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml index bb3df493fa..6fab826403 100644 --- a/Resources/Prototypes/Traits/disabilities.yml +++ b/Resources/Prototypes/Traits/disabilities.yml @@ -34,14 +34,6 @@ # durationOfIncident: 10, 30 # #- type: trait -# id: Pacifist -# name: trait-pacifist-name -# description: trait-pacifist-desc -# category: Disabilities -# components: -# - type: Pacified -# -#- type: trait # id: Unrevivable # name: trait-unrevivable-name # description: trait-unrevivable-desc @@ -61,15 +53,6 @@ # - type: Muted # #- type: trait -# id: LightweightDrunk -# name: trait-lightweight-name -# description: trait-lightweight-desc -# category: Disabilities -# components: -# - type: LightweightDrunk -# boozeStrengthMultiplier: 2 -# -#- type: trait # id: Paracusia # name: trait-paracusia-name # description: trait-paracusia-desc @@ -82,11 +65,3 @@ # sounds: # collection: Paracusia # -#- type: trait -# id: Snoring -# name: trait-snoring-name -# description: trait-snoring-desc -# category: Disabilities -# components: -# - type: Snoring -# \ No newline at end of file diff --git a/Resources/Prototypes/Traits/quirks.yml b/Resources/Prototypes/Traits/quirks.yml new file mode 100644 index 0000000000..d01bf6218a --- /dev/null +++ b/Resources/Prototypes/Traits/quirks.yml @@ -0,0 +1,24 @@ +- type: trait + id: Pacifist + name: trait-pacifist-name + description: trait-pacifist-desc + category: Quirks + components: + - type: Pacified + +- type: trait + id: LightweightDrunk + name: trait-lightweight-name + description: trait-lightweight-desc + category: Quirks + components: + - type: LightweightDrunk + boozeStrengthMultiplier: 2 + +- type: trait + id: Snoring + name: trait-snoring-name + description: trait-snoring-desc + category: Quirks + components: + - type: Snoring diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 48cc0872a1..1c69bbe7e6 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -3,7 +3,7 @@ name: chat-radio-common keycode: ";" frequency: 1459 - color: "#32cd32" + color: "#2cdb2c" - type: radioChannel id: CentCom @@ -25,7 +25,7 @@ name: chat-radio-engineering keycode: 'e' frequency: 1357 - color: "#f37746" + color: "#ff733c" - type: radioChannel id: Medical @@ -39,28 +39,28 @@ name: chat-radio-science keycode: 'n' frequency: 1351 - color: "#c68cfa" + color: "#b05efa" - type: radioChannel id: Security name: chat-radio-security keycode: 's' frequency: 1359 - color: "#dd3535" + color: "#ff4242" - type: radioChannel id: Service name: chat-radio-service keycode: 'v' frequency: 1349 - color: "#6ca729" + color: "#539c00" - type: radioChannel id: Supply name: chat-radio-supply keycode: 'u' frequency: 1347 - color: "#b88646" + color: "#b48b57" - type: radioChannel id: Syndicate @@ -74,7 +74,7 @@ id: Handheld name: chat-radio-handheld frequency: 1330 - color: "#d39f01" + color: "#967101" # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms longRange: true diff --git a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml index 6c01f9de23..97880466d4 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/CoreRules/RuleC13CharacterNames.xml @@ -52,6 +52,14 @@ - [color=#449944]Acceptable:[/color] Loxosceles Domesticus - [color=#994444]Bad:[/color] Spider-Man + Vox typically use a single name made of random syllables, often with repeating patterns. + Names should not be excessively long or be so repetitive/convoluted as to be unreadable. + + - [color=#449944]Acceptable:[/color] Hirixashahre + - [color=#449944]Acceptable:[/color] Xapikrikrik + - [color=#994444]Bad:[/color] Chipikirchitchitchitbecretretrer + - [color=#994444]Bad:[/color] Trololol + Usernames, objects, random characters, very "low effort" names, "meta" names, or otherwise implausible names are not permitted. - [color=#994444]Bad:[/color] XxRobustxX - [color=#994444]Bad:[/color] SDpksSodjdfk diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png index 8f503d6237..b6d156e44f 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png index fc1ad2e939..8ebba8d620 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png index 6f489ec36b..a1a09dc480 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png index e15f148f01..9adc2e29ad 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png index 74bcd6a723..9f11c064f1 100644 Binary files a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json index ade65863af..28bbc3125c 100644 --- a/Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/beret_security.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png new file mode 100644 index 0000000000..27efed7a1c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png new file mode 100644 index 0000000000..f41daaa15a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000..924520c2a8 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png new file mode 100644 index 0000000000..01013b3e5a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png new file mode 100644 index 0000000000..90e9e2e1f0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png new file mode 100644 index 0000000000..60f46602d7 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png new file mode 100644 index 0000000000..bb3c306586 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown_security.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json new file mode 100644 index 0000000000..6f5cb2dc1e --- /dev/null +++ b/Resources/Textures/Clothing/Mask/clown_security.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified version of clown mask by GoldenCan(github) (Copyright for clown mask: Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png index 3b01d4176c..56983936f4 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png index 2426c2aa25..109a8b733b 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png index 2a06209b62..455a92bc01 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png index 62d25c958b..b4cd26fd59 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png index 581ba4b951..9d7d68d0ab 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index b4f8cacea5..0000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json index ade0905fb8..590a8d849f 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json @@ -14,10 +14,6 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, - { - "name": "equipped-OUTERCLOTHING-vox", - "directions": 4 - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..f6e8747d4a Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png index 28cf03f49c..890563ab43 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png index eaf984f437..b12879adfd 100644 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json index c9f0d90ea1..1ffb8fc6bd 100644 --- a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd", + "copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-OUTERCLOTHING", "directions": 4 }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png index 54c35ef455..d4251e8571 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png index 50d752aa66..77744fa9ba 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png index bede369f67..360927b0ef 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png index 619ad40626..177fdb9db4 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png index d2380bdf73..8940efc629 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png index d44522dcca..047eb062db 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png index bf0b30d17a..7b2f6442de 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png index b0e364c825..78ee734ecf 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png index bd0af34098..fb2f53fb5e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png index be5b2406d2..0443f68c6f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png index 67ba63f7cd..1858a55988 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png index e7ae72ca07..ce2424ce8d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json index f42362b254..cb676a06ef 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, Spicy Rock Pizza modified from margherita pizza by mkanke", "size": { "x": 32, "y": 32 @@ -137,6 +137,12 @@ { "name": "box-inhand-left", "directions": 4 + }, + { + "name": "uranium-pizza" + }, + { + "name": "uranium-slice" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png new file mode 100644 index 0000000000..6fdb66c2dc Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-pizza.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png new file mode 100644 index 0000000000..de619c3a13 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi/uranium-slice.png differ diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index 328747df09..784e509c1d 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -86,6 +86,9 @@ { "name": "old-radio-urist" }, + { + "name": "old-radio-nukeop" + }, { "name": "old-radio-ancestor" }, diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png new file mode 100644 index 0000000000..b5befcf26d Binary files /dev/null and b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-nukeop.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png new file mode 100644 index 0000000000..fb10912e69 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png new file mode 100644 index 0000000000..924aedcea7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json new file mode 100644 index 0000000000..1359fd7f8c --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..0527f86b93 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..cd3cc3216e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png new file mode 100644 index 0000000000..11c43d8d13 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png new file mode 100644 index 0000000000..f3e99168dd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png new file mode 100644 index 0000000000..d4204913b5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png new file mode 100644 index 0000000000..804aa02012 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png new file mode 100644 index 0000000000..1e6923c9e2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png new file mode 100644 index 0000000000..817c0f4bff Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png new file mode 100644 index 0000000000..5a49c3f5c5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json new file mode 100644 index 0000000000..775f8df408 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png new file mode 100644 index 0000000000..4c36982960 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png new file mode 100644 index 0000000000..9fc96ba7c2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png new file mode 100644 index 0000000000..e65be188b1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png new file mode 100644 index 0000000000..165e17b57c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png new file mode 100644 index 0000000000..9b193a59e3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png new file mode 100644 index 0000000000..e66ff1ddc9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png new file mode 100644 index 0000000000..fc1807e089 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png new file mode 100644 index 0000000000..e2790c179a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png new file mode 100644 index 0000000000..6c7185bb1e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png new file mode 100644 index 0000000000..d1f2111b25 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json new file mode 100644 index 0000000000..3f97a14afa --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png new file mode 100644 index 0000000000..fe787f35f5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png new file mode 100644 index 0000000000..3ba27fa5b7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png new file mode 100644 index 0000000000..5b26285f7c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png new file mode 100644 index 0000000000..df5aff42b0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png new file mode 100644 index 0000000000..1c926be364 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png differ