diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs index 5416f73e709..81c9a409a3b 100644 --- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs +++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs @@ -43,6 +43,18 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow private const float SilencingDuration = 2.5f; + // Colors + private Color _wallColor = new Color(64, 64, 64); + private Color _tileColor = new Color(28, 28, 28); + private Color _monitorBlipColor = Color.Cyan; + private Color _untrackedEntColor = Color.DimGray; + private Color _regionBaseColor = new Color(154, 154, 154); + private Color _inactiveColor = StyleNano.DisabledFore; + private Color _statusTextColor = StyleNano.GoodGreenFore; + private Color _goodColor = Color.LimeGreen; + private Color _warningColor = new Color(255, 182, 72); + private Color _dangerColor = new Color(255, 67, 67); + public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInterface, EntityUid? owner) { RobustXamlLoader.Load(this); @@ -55,8 +67,8 @@ public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInter NavMap.Owner = _owner; // Set nav map colors - NavMap.WallColor = new Color(64, 64, 64); - NavMap.TileColor = Color.DimGray * NavMap.WallColor; + NavMap.WallColor = _wallColor; + NavMap.TileColor = _tileColor; // Set nav map grid uid var stationName = Loc.GetString("atmos-alerts-window-unknown-location"); @@ -214,7 +226,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[ if (consoleCoords != null && consoleUid != null) { var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); - var blip = new NavMapBlip(consoleCoords.Value, texture, Color.Cyan, true, false); + var blip = new NavMapBlip(consoleCoords.Value, texture, _monitorBlipColor, true, false); NavMap.TrackedEntities[consoleUid.Value] = blip; } @@ -263,7 +275,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[ VerticalAlignment = VAlignment.Center, }; - label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", StyleNano.GoodGreenFore.ToHexNoAlpha()))); + label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", _statusTextColor.ToHexNoAlpha()))); AlertsTable.AddChild(label); } @@ -292,7 +304,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[ if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor)) continue; - regionOverlay.Color = regionColor.Value; + regionOverlay.Color = regionColor; var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState; prioritizedRegionOverlays.Add(regionOverlay, priority); @@ -323,7 +335,7 @@ private void AddTrackedEntityToNavMap(AtmosAlertsDeviceNavMapData metaData, Atmo var coords = _entManager.GetCoordinates(metaData.NetCoordinates); if (_trackedEntity != null && _trackedEntity != metaData.NetEntity) - color *= Color.DimGray; + color *= _untrackedEntColor; var selectable = true; var blip = new NavMapBlip(coords, _spriteSystem.Frame0(texture), color, _trackedEntity == metaData.NetEntity, selectable); @@ -331,23 +343,20 @@ private void AddTrackedEntityToNavMap(AtmosAlertsDeviceNavMapData metaData, Atmo NavMap.TrackedEntities[metaData.NetEntity] = blip; } - private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, [NotNullWhen(true)] out Color? color) + private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, out Color color) { - color = null; + color = Color.White; var blip = GetBlipTexture(alarmState); if (blip == null) return false; - // DeltaV: fix client until upstream does // Color the region based on alarm state and entity tracking - var output = blip.Value.Item2 * new Color(154, 154, 154); + color = blip.Value.Item2 * _regionBaseColor; if (_trackedEntity != null && _trackedEntity != regionOwner) - output *= Color.DimGray; - - color = output; + color *= _untrackedEntColor; return true; } @@ -588,13 +597,13 @@ private AtmosAlarmType GetAlarmState(NetEntity netEntity) switch (alarmState) { case AtmosAlarmType.Invalid: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), StyleNano.DisabledFore); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _inactiveColor); break; case AtmosAlarmType.Normal: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), Color.LimeGreen); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _goodColor); break; case AtmosAlarmType.Warning: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), new Color(255, 182, 72)); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), _warningColor); break; case AtmosAlarmType.Danger: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), new Color(255, 67, 67)); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), _dangerColor); break; } return output; diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml index 19d00a0bbf8..aae8785b1fe 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml @@ -47,8 +47,7 @@ - + diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index d61267d002c..fd3615d59f5 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -110,18 +110,29 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) // Alerts - AlertsDivider.Visible = msg.Bleeding == true; - AlertsContainer.Visible = msg.Bleeding == true; + var showAlerts = msg.Unrevivable == true || msg.Bleeding == true; - if (msg.Bleeding == true) - { + AlertsDivider.Visible = showAlerts; + AlertsContainer.Visible = showAlerts; + + if (showAlerts) AlertsContainer.DisposeAllChildren(); - AlertsContainer.AddChild(new Label + + if (msg.Unrevivable == true) + AlertsContainer.AddChild(new RichTextLabel + { + Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"), + Margin = new Thickness(0, 4), + MaxWidth = 300 + }); + + if (msg.Bleeding == true) + AlertsContainer.AddChild(new RichTextLabel { Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"), - FontColorOverride = Color.Red, + Margin = new Thickness(0, 4), + MaxWidth = 300 }); - } // Damage Groups diff --git a/Content.Client/Mapping/MappingScreen.xaml b/Content.Client/Mapping/MappingScreen.xaml index 9cc3e734f0e..bad492e7e41 100644 --- a/Content.Client/Mapping/MappingScreen.xaml +++ b/Content.Client/Mapping/MappingScreen.xaml @@ -8,7 +8,7 @@ VerticalExpand="False" VerticalAlignment="Bottom" HorizontalAlignment="Center"> - @@ -82,5 +82,5 @@ - + diff --git a/Content.Client/Mapping/MappingScreen.xaml.cs b/Content.Client/Mapping/MappingScreen.xaml.cs index 46c0e51fad6..20e2528a440 100644 --- a/Content.Client/Mapping/MappingScreen.xaml.cs +++ b/Content.Client/Mapping/MappingScreen.xaml.cs @@ -197,7 +197,6 @@ private void RefreshList() public override void SetChatSize(Vector2 size) { - ScreenContainer.DesiredSplitCenter = size.X; ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize; } diff --git a/Content.Client/UserInterface/Controls/RecordedSplitContainer.cs b/Content.Client/UserInterface/Controls/RecordedSplitContainer.cs deleted file mode 100644 index fd217bc7e86..00000000000 --- a/Content.Client/UserInterface/Controls/RecordedSplitContainer.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Numerics; -using Robust.Client.UserInterface.Controls; - -namespace Content.Client.UserInterface.Controls; - -/// -/// A split container that performs an action when the split resizing is finished. -/// -public sealed class RecordedSplitContainer : SplitContainer -{ - public double? DesiredSplitCenter; - - protected override Vector2 ArrangeOverride(Vector2 finalSize) - { - if (ResizeMode == SplitResizeMode.RespectChildrenMinSize - && DesiredSplitCenter != null - && !finalSize.Equals(Vector2.Zero)) - { - SplitFraction = (float) DesiredSplitCenter.Value; - - if (!Size.Equals(Vector2.Zero)) - { - DesiredSplitCenter = null; - } - } - - return base.ArrangeOverride(finalSize); - } -} diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml index 7f1d1bcd5b1..653302fae4c 100644 --- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml +++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml @@ -14,7 +14,7 @@ VerticalExpand="False" VerticalAlignment="Bottom" HorizontalAlignment="Center"> - + @@ -26,7 +26,7 @@ - + @@ -36,5 +36,5 @@ - + diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs index e04d377d321..2892ca44254 100644 --- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs +++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs @@ -40,7 +40,6 @@ private void ResizeActionContainer() public override void SetChatSize(Vector2 size) { - ScreenContainer.DesiredSplitCenter = size.X; ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize; } } diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs index c5746c24d79..b9dd11f7a78 100644 --- a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs +++ b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Numerics; +using Content.Client.Gameplay; using Content.Client.Stylesheets; using Content.Shared.Administration; using Content.Shared.CCVar; @@ -8,6 +9,7 @@ using JetBrains.Annotations; using Robust.Client.AutoGenerated; using Robust.Client.Console; +using Robust.Client.State; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; @@ -28,6 +30,7 @@ public sealed partial class VoteCallMenu : BaseWindow [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IEntityNetworkManager _entNetManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private readonly IStateManager _state = default!; private VotingSystem _votingSystem; @@ -62,7 +65,7 @@ public VoteCallMenu() Stylesheet = IoCManager.Resolve().SheetSpace; CloseButton.OnPressed += _ => Close(); - VoteNotTrustedLabel.Text = Loc.GetString("ui-vote-trusted-users-notice", ("timeReq", _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime) / 60)); + VoteNotTrustedLabel.Text = Loc.GetString("ui-vote-trusted-users-notice", ("timeReq", _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime))); foreach (StandardVoteType voteType in Enum.GetValues()) { @@ -70,6 +73,7 @@ public VoteCallMenu() VoteTypeButton.AddItem(Loc.GetString(option.Name), (int)voteType); } + _state.OnStateChanged += OnStateChanged; VoteTypeButton.OnItemSelected += VoteTypeSelected; CreateButton.OnPressed += CreatePressed; FollowButton.OnPressed += FollowSelected; @@ -101,6 +105,14 @@ protected override void FrameUpdate(FrameEventArgs args) UpdateVoteTimeout(); } + private void OnStateChanged(StateChangedEventArgs obj) + { + if (obj.NewState is not GameplayState) + return; + + Close(); + } + private void CanCallVoteChanged(bool obj) { if (!obj) diff --git a/Content.Client/Voting/VotingSystem.cs b/Content.Client/Voting/VotingSystem.cs index d2049174605..dd74e1ccb18 100644 --- a/Content.Client/Voting/VotingSystem.cs +++ b/Content.Client/Voting/VotingSystem.cs @@ -19,11 +19,6 @@ public override void Initialize() private void OnVotePlayerListResponseEvent(VotePlayerListResponseEvent msg) { - if (!_ghostSystem.IsGhost) - { - return; - } - VotePlayerListResponse?.Invoke(msg); } diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs index 696de8616e7..bc27d1e5950 100644 --- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -168,7 +168,7 @@ await server.WaitAssertion(() => await pair.CleanReturnAsync(); } - /// + /// /// Run the suicide command in the console /// Should only ghost the player but not kill them /// @@ -241,6 +241,7 @@ public async Task TestSuicideByHeldItem() var mindSystem = entManager.System(); var mobStateSystem = entManager.System(); var transformSystem = entManager.System(); + var damageableSystem = entManager.System(); // We need to know the player and whether they can be hurt, killed, and whether they have a mind var player = playerMan.Sessions.First().AttachedEntity!.Value; @@ -276,6 +277,8 @@ await server.WaitPost(() => // and that all the damage is concentrated in the Slash category await server.WaitAssertion(() => { + // Heal all damage first (possible low pressure damage taken) + damageableSystem.SetAllDamage(player, damageableComp, 0); consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); @@ -313,6 +316,7 @@ public async Task TestSuicideByHeldItemSpreadDamage() var mindSystem = entManager.System(); var mobStateSystem = entManager.System(); var transformSystem = entManager.System(); + var damageableSystem = entManager.System(); // We need to know the player and whether they can be hurt, killed, and whether they have a mind var player = playerMan.Sessions.First().AttachedEntity!.Value; @@ -348,6 +352,8 @@ await server.WaitPost(() => // and that slash damage is split in half await server.WaitAssertion(() => { + // Heal all damage first (possible low pressure damage taken) + damageableSystem.SetAllDamage(player, damageableComp, 0); consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index 78362390811..d57898d9d98 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -654,7 +654,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) { Text = "admin-smite-become-mouse-name", Category = VerbCategory.Smite, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "icon"), + Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "supersynth"), Act = () => { _polymorphSystem.PolymorphEntity(args.Target, "AdminInstrumentSmite"); diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index 2ab27e4388e..0640537f57e 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -35,8 +35,10 @@ using Robust.Shared.Utility; using System.Linq; using Content.Server.Silicons.Laws; +using Content.Shared.Movement.Components; using Content.Shared.Silicons.Laws.Components; using Robust.Server.Player; +using Content.Shared.Silicons.StationAi; using Robust.Shared.Physics.Components; using static Content.Shared.Configurable.ConfigurationComponent; @@ -345,7 +347,30 @@ private void AddAdminVerbs(GetVerbsEvent args) Impact = LogImpact.Low }); - if (TryComp(args.Target, out var lawBoundComponent)) + // This logic is needed to be able to modify the AI's laws through its core and eye. + EntityUid? target = null; + SiliconLawBoundComponent? lawBoundComponent = null; + + if (TryComp(args.Target, out lawBoundComponent)) + { + target = args.Target; + } + // When inspecting the core we can find the entity with its laws by looking at the AiHolderComponent. + else if (TryComp(args.Target, out var holder) && holder.Slot.Item != null + && TryComp(holder.Slot.Item, out lawBoundComponent)) + { + target = holder.Slot.Item.Value; + // For the eye we can find the entity with its laws as the source of the movement relay since the eye + // is just a proxy for it to move around and look around the station. + } + else if (TryComp(args.Target, out var relay) + && TryComp(relay.Source, out lawBoundComponent)) + { + target = relay.Source; + + } + + if (lawBoundComponent != null && target != null) { args.Verbs.Add(new Verb() { @@ -359,7 +384,7 @@ private void AddAdminVerbs(GetVerbsEvent args) return; } _euiManager.OpenEui(ui, session); - ui.UpdateLaws(lawBoundComponent, args.Target); + ui.UpdateLaws(lawBoundComponent, target.Value); }, Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/Interface/Actions/actions_borg.rsi"), "state-laws"), }); diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs index 1efc0a9d562..7a47755db9d 100644 --- a/Content.Server/Administration/Systems/BwoinkSystem.cs +++ b/Content.Server/Administration/Systems/BwoinkSystem.cs @@ -47,20 +47,23 @@ public sealed partial class BwoinkSystem : SharedBwoinkSystem [GeneratedRegex(@"^https://discord\.com/api/webhooks/(\d+)/((?!.*/).*)$")] private static partial Regex DiscordRegex(); - private ISawmill _sawmill = default!; - private readonly HttpClient _httpClient = new(); private string _webhookUrl = string.Empty; private WebhookData? _webhookData; + + private string _onCallUrl = string.Empty; + private WebhookData? _onCallData; + + private ISawmill _sawmill = default!; + private readonly HttpClient _httpClient = new(); + private string _footerIconUrl = string.Empty; private string _avatarUrl = string.Empty; private string _serverName = string.Empty; - private readonly - Dictionary _relayMessages = new(); + private readonly Dictionary _relayMessages = new(); private Dictionary _oldMessageIds = new(); - private readonly Dictionary> _messageQueues = new(); + private readonly Dictionary> _messageQueues = new(); private readonly HashSet _processingChannels = new(); private readonly Dictionary _typingUpdateTimestamps = new(); private string _overrideClientName = string.Empty; @@ -82,12 +85,16 @@ private readonly public override void Initialize() { base.Initialize(); + + Subs.CVar(_config, CCVars.DiscordOnCallWebhook, OnCallChanged, true); + Subs.CVar(_config, CCVars.DiscordAHelpWebhook, OnWebhookChanged, true); Subs.CVar(_config, CCVars.DiscordAHelpFooterIcon, OnFooterIconChanged, true); Subs.CVar(_config, CCVars.DiscordAHelpAvatar, OnAvatarChanged, true); Subs.CVar(_config, CVars.GameHostName, OnServerNameChanged, true); Subs.CVar(_config, CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true); _sawmill = IoCManager.Resolve().GetSawmill("AHELP"); + var defaultParams = new AHelpMessageParams( string.Empty, string.Empty, @@ -96,7 +103,7 @@ public override void Initialize() _gameTicker.RunLevel, playedSound: false ); - _maxAdditionalChars = GenerateAHelpMessage(defaultParams).Length; + _maxAdditionalChars = GenerateAHelpMessage(defaultParams).Message.Length; _playerManager.PlayerStatusChanged += OnPlayerStatusChanged; SubscribeLocalEvent(OnGameRunLevelChanged); @@ -111,6 +118,33 @@ public override void Initialize() ); } + private async void OnCallChanged(string url) + { + _onCallUrl = url; + + if (url == string.Empty) + return; + + var match = DiscordRegex().Match(url); + + if (!match.Success) + { + Log.Error("On call URL does not appear to be valid."); + return; + } + + if (match.Groups.Count <= 2) + { + Log.Error("Could not get webhook ID or token for on call URL."); + return; + } + + var webhookId = match.Groups[1].Value; + var webhookToken = match.Groups[2].Value; + + _onCallData = await GetWebhookData(webhookId, webhookToken); + } + private void PlayerRateLimitedAction(ICommonSession obj) { RaiseNetworkEvent( @@ -259,13 +293,13 @@ args.New is not (GameRunLevel.PreRoundLobby or GameRunLevel.InRound)) // Store the Discord message IDs of the previous round _oldMessageIds = new Dictionary(); - foreach (var message in _relayMessages) + foreach (var (user, interaction) in _relayMessages) { - var id = message.Value.id; + var id = interaction.Id; if (id == null) return; - _oldMessageIds[message.Key] = id; + _oldMessageIds[user] = id; } _relayMessages.Clear(); @@ -330,10 +364,10 @@ private async void OnWebhookChanged(string url) var webhookToken = match.Groups[2].Value; // Fire and forget - await SetWebhookData(webhookId, webhookToken); + _webhookData = await GetWebhookData(webhookId, webhookToken); } - private async Task SetWebhookData(string id, string token) + private async Task GetWebhookData(string id, string token) { var response = await _httpClient.GetAsync($"https://discord.com/api/v10/webhooks/{id}/{token}"); @@ -342,10 +376,10 @@ private async Task SetWebhookData(string id, string token) { _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when trying to get webhook data (perhaps the webhook URL is invalid?): {response.StatusCode}\nResponse: {content}"); - return; + return null; } - _webhookData = JsonSerializer.Deserialize(content); + return JsonSerializer.Deserialize(content); } private void OnFooterIconChanged(string url) @@ -358,14 +392,14 @@ private void OnAvatarChanged(string url) _avatarUrl = url; } - private async void ProcessQueue(NetUserId userId, Queue messages) + private async void ProcessQueue(NetUserId userId, Queue messages) { // Whether an embed already exists for this player var exists = _relayMessages.TryGetValue(userId, out var existingEmbed); // Whether the message will become too long after adding these new messages - var tooLong = exists && messages.Sum(msg => Math.Min(msg.Length, MessageLengthCap) + "\n".Length) - + existingEmbed.description.Length > DescriptionMax; + var tooLong = exists && messages.Sum(msg => Math.Min(msg.Message.Length, MessageLengthCap) + "\n".Length) + + existingEmbed?.Description.Length > DescriptionMax; // If there is no existing embed, or it is getting too long, we create a new embed if (!exists || tooLong) @@ -385,10 +419,10 @@ private async void ProcessQueue(NetUserId userId, Queue messages) // If we have all the data required, we can link to the embed of the previous round or embed that was too long if (_webhookData is { GuildId: { } guildId, ChannelId: { } channelId }) { - if (tooLong && existingEmbed.id != null) + if (tooLong && existingEmbed?.Id != null) { linkToPrevious = - $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.id})**\n"; + $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.Id})**\n"; } else if (_oldMessageIds.TryGetValue(userId, out var id) && !string.IsNullOrEmpty(id)) { @@ -398,13 +432,22 @@ private async void ProcessQueue(NetUserId userId, Queue messages) } var characterName = _minds.GetCharacterName(userId); - existingEmbed = (null, lookup.Username, linkToPrevious, characterName, _gameTicker.RunLevel); + existingEmbed = new DiscordRelayInteraction() + { + Id = null, + CharacterName = characterName, + Description = linkToPrevious, + Username = lookup.Username, + LastRunLevel = _gameTicker.RunLevel, + }; + + _relayMessages[userId] = existingEmbed; } // Previous message was in another RunLevel, so show that in the embed - if (existingEmbed.lastRunLevel != _gameTicker.RunLevel) + if (existingEmbed!.LastRunLevel != _gameTicker.RunLevel) { - existingEmbed.description += _gameTicker.RunLevel switch + existingEmbed.Description += _gameTicker.RunLevel switch { GameRunLevel.PreRoundLobby => "\n\n:arrow_forward: _**Pre-round lobby started**_\n", GameRunLevel.InRound => "\n\n:arrow_forward: _**Round started**_\n", @@ -413,26 +456,35 @@ private async void ProcessQueue(NetUserId userId, Queue messages) $"{_gameTicker.RunLevel} was not matched."), }; - existingEmbed.lastRunLevel = _gameTicker.RunLevel; + existingEmbed.LastRunLevel = _gameTicker.RunLevel; } + // If last message of the new batch is SOS then relay it to on-call. + // ... as long as it hasn't been relayed already. + var discordMention = messages.Last(); + var onCallRelay = !discordMention.Receivers && !existingEmbed.OnCall; + // Add available messages to the embed description while (messages.TryDequeue(out var message)) { + string text; + // In case someone thinks they're funny - if (message.Length > MessageLengthCap) - message = message[..(MessageLengthCap - TooLongText.Length)] + TooLongText; + if (message.Message.Length > MessageLengthCap) + text = message.Message[..(MessageLengthCap - TooLongText.Length)] + TooLongText; + else + text = message.Message; - existingEmbed.description += $"\n{message}"; + existingEmbed.Description += $"\n{text}"; } - var payload = GeneratePayload(existingEmbed.description, - existingEmbed.username, - existingEmbed.characterName); + var payload = GeneratePayload(existingEmbed.Description, + existingEmbed.Username, + existingEmbed.CharacterName); // If there is no existing embed, create a new one // Otherwise patch (edit) it - if (existingEmbed.id == null) + if (existingEmbed.Id == null) { var request = await _httpClient.PostAsync($"{_webhookUrl}?wait=true", new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json")); @@ -455,11 +507,11 @@ private async void ProcessQueue(NetUserId userId, Queue messages) return; } - existingEmbed.id = id.ToString(); + existingEmbed.Id = id.ToString(); } else { - var request = await _httpClient.PatchAsync($"{_webhookUrl}/messages/{existingEmbed.id}", + var request = await _httpClient.PatchAsync($"{_webhookUrl}/messages/{existingEmbed.Id}", new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json")); if (!request.IsSuccessStatusCode) @@ -474,6 +526,43 @@ private async void ProcessQueue(NetUserId userId, Queue messages) _relayMessages[userId] = existingEmbed; + // Actually do the on call relay last, we just need to grab it before we dequeue every message above. + if (onCallRelay && + _onCallData != null) + { + existingEmbed.OnCall = true; + var roleMention = _config.GetCVar(CCVars.DiscordAhelpMention); + + if (!string.IsNullOrEmpty(roleMention)) + { + var message = new StringBuilder(); + message.AppendLine($"<@&{roleMention}>"); + message.AppendLine("Unanswered SOS"); + + // Need webhook data to get the correct link for that channel rather than on-call data. + if (_webhookData is { GuildId: { } guildId, ChannelId: { } channelId }) + { + message.AppendLine( + $"**[Go to ahelp](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.Id})**"); + } + + payload = GeneratePayload(message.ToString(), existingEmbed.Username, existingEmbed.CharacterName); + + var request = await _httpClient.PostAsync($"{_onCallUrl}?wait=true", + new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json")); + + var content = await request.Content.ReadAsStringAsync(); + if (!request.IsSuccessStatusCode) + { + _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when posting relay message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}"); + } + } + } + else + { + existingEmbed.OnCall = false; + } + _processingChannels.Remove(userId); } @@ -652,7 +741,7 @@ protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySes if (sendsWebhook) { if (!_messageQueues.ContainsKey(msg.UserId)) - _messageQueues[msg.UserId] = new Queue(); + _messageQueues[msg.UserId] = new Queue(); var str = message.Text; var unameLength = senderSession.Name.Length; @@ -701,7 +790,7 @@ private IList GetTargetAdmins() .ToList(); } - private static string GenerateAHelpMessage(AHelpMessageParams parameters) + private static DiscordRelayedData GenerateAHelpMessage(AHelpMessageParams parameters) { var stringbuilder = new StringBuilder(); @@ -718,13 +807,57 @@ private static string GenerateAHelpMessage(AHelpMessageParams parameters) stringbuilder.Append($" **{parameters.RoundTime}**"); if (!parameters.PlayedSound) stringbuilder.Append(" **(S)**"); - if (parameters.Icon == null) stringbuilder.Append($" **{parameters.Username}:** "); else stringbuilder.Append($" **{parameters.Username}** "); stringbuilder.Append(parameters.Message); - return stringbuilder.ToString(); + + return new DiscordRelayedData() + { + Receivers = !parameters.NoReceivers, + Message = stringbuilder.ToString(), + }; + } + + private record struct DiscordRelayedData + { + /// + /// Was anyone online to receive it. + /// + public bool Receivers; + + /// + /// What's the payload to send to discord. + /// + public string Message; + } + + /// + /// Class specifically for holding information regarding existing Discord embeds + /// + private sealed class DiscordRelayInteraction + { + public string? Id; + + public string Username = String.Empty; + + public string? CharacterName; + + /// + /// Contents for the discord message. + /// + public string Description = string.Empty; + + /// + /// Run level of the last interaction. If different we'll link to the last Id. + /// + public GameRunLevel LastRunLevel; + + /// + /// Did we relay this interaction to OnCall previously. + /// + public bool OnCall; } } diff --git a/Content.Server/Ame/Components/AmeControllerComponent.cs b/Content.Server/Ame/Components/AmeControllerComponent.cs index fae3d86633d..2c5464dd8e0 100644 --- a/Content.Server/Ame/Components/AmeControllerComponent.cs +++ b/Content.Server/Ame/Components/AmeControllerComponent.cs @@ -55,7 +55,7 @@ public sealed partial class AmeControllerComponent : SharedAmeControllerComponen /// [DataField("injectSound")] [ViewVariables(VVAccess.ReadWrite)] - public SoundSpecifier InjectSound = new SoundCollectionSpecifier("MetalThud"); + public SoundSpecifier InjectSound = new SoundPathSpecifier("/Audio/Machines/ame_fuelinjection.ogg"); /// /// The last time this could have injected fuel into the AME. diff --git a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs index dd7c4b12e84..c80e19a53d6 100644 --- a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs +++ b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs @@ -39,7 +39,7 @@ private void OnExamine(EntityUid uid, ExaminableDamageComponent component, Exami var level = GetDamageLevel(uid, component); var msg = Loc.GetString(messages[level]); - args.PushMarkup(msg); + args.PushMarkup(msg,-99); } private int GetDamageLevel(EntityUid uid, ExaminableDamageComponent? component = null, diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs index 292f8ec8e97..754818619ac 100644 --- a/Content.Server/Doors/Systems/DoorSystem.cs +++ b/Content.Server/Doors/Systems/DoorSystem.cs @@ -46,8 +46,8 @@ private void OnBoltPowerChanged(Entity ent, ref PowerChangedE SetBoltsDown(ent, true); } - UpdateBoltLightStatus(ent); ent.Comp.Powered = args.Powered; Dirty(ent, ent.Comp); + UpdateBoltLightStatus(ent); } } diff --git a/Content.Server/EntityEffects/Effects/FlashReactionEffect.cs b/Content.Server/EntityEffects/Effects/FlashReactionEffect.cs new file mode 100644 index 00000000000..fbf99e902d3 --- /dev/null +++ b/Content.Server/EntityEffects/Effects/FlashReactionEffect.cs @@ -0,0 +1,82 @@ +using Content.Shared.EntityEffects; +using Content.Server.Flash; +using Robust.Server.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.Prototypes; + +namespace Content.Server.EntityEffects.Effects; + +[DataDefinition] +public sealed partial class FlashReactionEffect : EntityEffect +{ + /// + /// Flash range per unit of reagent. + /// + [DataField] + public float RangePerUnit = 0.2f; + + /// + /// Maximum flash range. + /// + [DataField] + public float MaxRange = 10f; + + /// + /// How much to entities are slowed down. + /// + [DataField] + public float SlowTo = 0.5f; + + /// + /// The time entities will be flashed in seconds. + /// The default is chosen to be better than the hand flash so it is worth using it for grenades etc. + /// + [DataField] + public float Duration = 4f; + + /// + /// The prototype ID used for the visual effect. + /// + [DataField] + public EntProtoId? FlashEffectPrototype = "ReactionFlash"; + + /// + /// The sound the flash creates. + /// + [DataField] + public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg"); + + protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) + => Loc.GetString("reagent-effect-guidebook-flash-reaction-effect", ("chance", Probability)); + + public override void Effect(EntityEffectBaseArgs args) + { + var transform = args.EntityManager.GetComponent(args.TargetEntity); + var transformSystem = args.EntityManager.System(); + + var range = 1f; + + if (args is EntityEffectReagentArgs reagentArgs) + range = MathF.Min((float)(reagentArgs.Quantity * RangePerUnit), MaxRange); + + args.EntityManager.System().FlashArea( + args.TargetEntity, + null, + range, + Duration * 1000, + slowTo: SlowTo, + sound: Sound); + + if (FlashEffectPrototype == null) + return; + + var uid = args.EntityManager.SpawnEntity(FlashEffectPrototype, transformSystem.GetMapCoordinates(transform)); + transformSystem.AttachToGridOrMap(uid); + + if (!args.EntityManager.TryGetComponent(uid, out var pointLightComp)) + return; + var pointLightSystem = args.EntityManager.System(); + // PointLights with a radius lower than 1.1 are too small to be visible, so this is hardcoded + pointLightSystem.SetRadius(uid, MathF.Max(1.1f, range), pointLightComp); + } +} diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 85fec0d7d1f..2f4269a05d0 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -213,14 +213,7 @@ private void SetCanSeeGhosts(EntityUid uid, bool canSee, EyeComponent? eyeCompon private void OnMapInit(EntityUid uid, GhostComponent component, MapInitEvent args) { - if (_actions.AddAction(uid, ref component.BooActionEntity, out var act, component.BooAction) - && act.UseDelay != null) - { - var start = _gameTiming.CurTime; - var end = start + act.UseDelay.Value; - _actions.SetCooldown(component.BooActionEntity.Value, start, end); - } - + _actions.AddAction(uid, ref component.BooActionEntity, component.BooAction); _actions.AddAction(uid, ref component.ToggleGhostHearingActionEntity, component.ToggleGhostHearingAction); _actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction); _actions.AddAction(uid, ref component.ToggleFoVActionEntity, component.ToggleFoVAction); diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs index fc9ab081d26..15fe2a69cf9 100644 --- a/Content.Server/Medical/CryoPodSystem.cs +++ b/Content.Server/Medical/CryoPodSystem.cs @@ -201,6 +201,7 @@ private void OnActivateUI(Entity entity, ref AfterActivatableU ? bloodSolution.FillFraction : 0, null, + null, null )); } diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs index 60a492a755f..90646725bb7 100644 --- a/Content.Server/Medical/HealthAnalyzerSystem.cs +++ b/Content.Server/Medical/HealthAnalyzerSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Medical.Components; using Content.Server.PowerCell; using Content.Server.Temperature.Components; +using Content.Server.Traits.Assorted; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Damage; using Content.Shared.DoAfter; @@ -196,6 +197,7 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s var bloodAmount = float.NaN; var bleeding = false; + var unrevivable = false; if (TryComp(target, out var bloodstream) && _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, @@ -205,12 +207,16 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s bleeding = bloodstream.BleedAmount > 0; } + if (HasComp(target)) + unrevivable = true; + _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage( GetNetEntity(target), bodyTemperature, bloodAmount, scanMode, - bleeding + bleeding, + unrevivable )); } } diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs index a8d75ac5f80..0a0839f35ff 100644 --- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs @@ -40,7 +40,9 @@ public override void Initialize() protected override void SplattedCreamPie(EntityUid uid, CreamPieComponent creamPie) { - _audio.PlayPvs(_audio.GetSound(creamPie.Sound), uid, AudioParams.Default.WithVariation(0.125f)); + // The entity is deleted, so play the sound at its position rather than parenting + var coordinates = Transform(uid).Coordinates; + _audio.PlayPvs(_audio.GetSound(creamPie.Sound), coordinates, AudioParams.Default.WithVariation(0.125f)); if (EntityManager.TryGetComponent(uid, out FoodComponent? foodComp)) { diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs index 22b531eb7cb..109aa0f6e47 100644 --- a/Content.Server/Parallax/BiomeSystem.cs +++ b/Content.Server/Parallax/BiomeSystem.cs @@ -10,6 +10,7 @@ using Content.Server.Shuttles.Systems; using Content.Shared.Atmos; using Content.Shared.Decals; +using Content.Shared.Ghost; using Content.Shared.Gravity; using Content.Shared.Parallax.Biomes; using Content.Shared.Parallax.Biomes.Layers; @@ -51,6 +52,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem private EntityQuery _biomeQuery; private EntityQuery _fixturesQuery; + private EntityQuery _ghostQuery; private EntityQuery _xformQuery; private readonly HashSet _handledEntities = new(); @@ -81,6 +83,7 @@ public override void Initialize() Log.Level = LogLevel.Debug; _biomeQuery = GetEntityQuery(); _fixturesQuery = GetEntityQuery(); + _ghostQuery = GetEntityQuery(); _xformQuery = GetEntityQuery(); SubscribeLocalEvent(OnBiomeMapInit); SubscribeLocalEvent(OnFTLStarted); @@ -315,6 +318,11 @@ public void Preload(EntityUid uid, BiomeComponent component, Box2 area) } } + private bool CanLoad(EntityUid uid) + { + return !_ghostQuery.HasComp(uid); + } + public override void Update(float frameTime) { base.Update(frameTime); @@ -332,7 +340,8 @@ public override void Update(float frameTime) if (_xformQuery.TryGetComponent(pSession.AttachedEntity, out var xform) && _handledEntities.Add(pSession.AttachedEntity.Value) && _biomeQuery.TryGetComponent(xform.MapUid, out var biome) && - biome.Enabled) + biome.Enabled && + CanLoad(pSession.AttachedEntity.Value)) { var worldPos = _transform.GetWorldPosition(xform); AddChunksInRange(biome, worldPos); @@ -349,7 +358,8 @@ public override void Update(float frameTime) if (!_handledEntities.Add(viewer) || !_xformQuery.TryGetComponent(viewer, out xform) || !_biomeQuery.TryGetComponent(xform.MapUid, out biome) || - !biome.Enabled) + !biome.Enabled || + !CanLoad(viewer)) { continue; } diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs index c8867744a40..3829fc34d20 100644 --- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs @@ -30,7 +30,7 @@ public sealed class RadioDeviceSystem : EntitySystem [Dependency] private readonly SharedAppearanceSystem _appearance = default!; // Used to prevent a shitter from using a bunch of radios to spam chat. - private HashSet<(string, EntityUid)> _recentlySent = new(); + private HashSet<(string, EntityUid, RadioChannelPrototype)> _recentlySent = new(); public override void Initialize() { @@ -114,7 +114,7 @@ private void OnPowerChanged(EntityUid uid, RadioMicrophoneComponent component, r { if (args.Powered) return; - SetMicrophoneEnabled(uid, null, false, true, component); + SetMicrophoneEnabled(uid, null, false, true, component); } public void SetMicrophoneEnabled(EntityUid uid, EntityUid? user, bool enabled, bool quiet = false, RadioMicrophoneComponent? component = null) @@ -191,8 +191,9 @@ private void OnListen(EntityUid uid, RadioMicrophoneComponent component, ListenE if (HasComp(args.Source)) return; // no feedback loops please. - if (_recentlySent.Add((args.Message, args.Source))) - _radio.SendRadioMessage(args.Source, args.Message, _protoMan.Index(component.BroadcastChannel), uid); + var channel = _protoMan.Index(component.BroadcastChannel)!; + if (_recentlySent.Add((args.Message, args.Source, channel))) + _radio.SendRadioMessage(args.Source, args.Message, channel, uid); } private void OnAttemptListen(EntityUid uid, RadioMicrophoneComponent component, ListenAttemptEvent args) @@ -279,7 +280,7 @@ private void SetIntercomChannel(Entity ent, ProtoId(ent, out var mic)) mic.BroadcastChannel = channel; if (TryComp(ent, out var speaker)) - speaker.Channels = new(){ channel }; + speaker.Channels = new() { channel }; Dirty(ent); } } diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs index 736ff48817e..fb99b3cfad8 100644 --- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs +++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs @@ -32,6 +32,7 @@ public sealed partial class VoteManager private VotingSystem? _votingSystem; private RoleSystem? _roleSystem; + private GameTicker? _gameTicker; private static readonly Dictionary> _voteTypesToEnableCVars = new() { @@ -70,8 +71,8 @@ public void CreateStandardVote(ICommonSession? initiator, StandardVoteType voteT default: throw new ArgumentOutOfRangeException(nameof(voteType), voteType, null); } - var ticker = _entityManager.EntitySysManager.GetEntitySystem(); - ticker.UpdateInfoText(); + _gameTicker = _entityManager.EntitySysManager.GetEntitySystem(); + _gameTicker.UpdateInfoText(); if (timeoutVote) TimeoutStandardVote(voteType); } @@ -346,8 +347,14 @@ private async void CreateVotekickVote(ICommonSession? initiator, string[]? args) return; } + + + var voterEligibility = _cfg.GetCVar(CCVars.VotekickVoterGhostRequirement) ? VoterEligibility.GhostMinimumPlaytime : VoterEligibility.MinimumPlaytime; + if (_cfg.GetCVar(CCVars.VotekickIgnoreGhostReqInLobby) && _gameTicker!.RunLevel == GameRunLevel.PreRoundLobby) + voterEligibility = VoterEligibility.MinimumPlaytime; + var eligibleVoterNumberRequirement = _cfg.GetCVar(CCVars.VotekickEligibleNumberRequirement); - var eligibleVoterNumber = _cfg.GetCVar(CCVars.VotekickVoterGhostRequirement) ? CalculateEligibleVoterNumber(VoterEligibility.GhostMinimumPlaytime) : CalculateEligibleVoterNumber(VoterEligibility.MinimumPlaytime); + var eligibleVoterNumber = CalculateEligibleVoterNumber(voterEligibility); string target = args[0]; string reason = args[1]; @@ -441,7 +448,7 @@ private async void CreateVotekickVote(ICommonSession? initiator, string[]? args) }, Duration = TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VotekickTimer)), InitiatorTimeout = TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.VotekickTimeout)), - VoterEligibility = _cfg.GetCVar(CCVars.VotekickVoterGhostRequirement) ? VoterEligibility.GhostMinimumPlaytime : VoterEligibility.MinimumPlaytime, + VoterEligibility = voterEligibility, DisplayVotes = false, TargetEntity = targetNetEntity }; diff --git a/Content.Server/Voting/VotingSystem.cs b/Content.Server/Voting/VotingSystem.cs index 25475c2157a..5df1ce7c1f0 100644 --- a/Content.Server/Voting/VotingSystem.cs +++ b/Content.Server/Voting/VotingSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Administration.Managers; using Content.Server.Database; +using Content.Server.GameTicking; using Content.Server.Ghost; using Content.Server.Roles.Jobs; using Content.Shared.CCVar; @@ -12,6 +13,7 @@ using Robust.Shared.Player; using Robust.Shared.Timing; using System.Threading.Tasks; +using Content.Shared.Players.PlayTimeTracking; namespace Content.Server.Voting; @@ -24,6 +26,8 @@ public sealed class VotingSystem : EntitySystem [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly JobSystem _jobs = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!; public override void Initialize() { @@ -34,8 +38,7 @@ public override void Initialize() private async void OnVotePlayerListRequestEvent(VotePlayerListRequestEvent msg, EntitySessionEventArgs args) { - if (args.SenderSession.AttachedEntity is not { Valid: true } entity - || !await CheckVotekickInitEligibility(args.SenderSession)) + if (!await CheckVotekickInitEligibility(args.SenderSession)) { var deniedResponse = new VotePlayerListResponseEvent(new (NetUserId, NetEntity, string)[0], true); RaiseNetworkEvent(deniedResponse, args.SenderSession.Channel); @@ -46,17 +49,23 @@ private async void OnVotePlayerListRequestEvent(VotePlayerListRequestEvent msg, foreach (var player in _playerManager.Sessions) { - if (player.AttachedEntity is not { Valid: true } attached) - continue; - - if (attached == entity) continue; + if (args.SenderSession == player) continue; if (_adminManager.IsAdmin(player, false)) continue; - var playerName = GetPlayerVoteListName(attached); - var netEntity = GetNetEntity(attached); - - players.Add((player.UserId, netEntity, playerName)); + if (player.AttachedEntity is not { Valid: true } attached) + { + var playerName = player.Name; + var netEntity = NetEntity.Invalid; + players.Add((player.UserId, netEntity, playerName)); + } + else + { + var playerName = GetPlayerVoteListName(attached); + var netEntity = GetNetEntity(attached); + + players.Add((player.UserId, netEntity, playerName)); + } } var response = new VotePlayerListResponseEvent(players.ToArray(), false); @@ -86,22 +95,29 @@ public async Task CheckVotekickInitEligibility(ICommonSession? initiator) if (initiator.AttachedEntity != null && _adminManager.IsAdmin(initiator.AttachedEntity.Value, false)) return true; - if (_cfg.GetCVar(CCVars.VotekickInitiatorGhostRequirement)) + // If cvar enabled, skip the ghost requirement in the preround lobby + if (!_cfg.GetCVar(CCVars.VotekickIgnoreGhostReqInLobby) || (_cfg.GetCVar(CCVars.VotekickIgnoreGhostReqInLobby) && _gameTicker.RunLevel != GameRunLevel.PreRoundLobby)) { - // Must be ghost - if (!TryComp(initiator.AttachedEntity, out GhostComponent? ghostComp)) - return false; - - // Must have been dead for x seconds - if ((int)_gameTiming.RealTime.Subtract(ghostComp.TimeOfDeath).TotalSeconds < _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime)) - return false; + if (_cfg.GetCVar(CCVars.VotekickInitiatorGhostRequirement)) + { + // Must be ghost + if (!TryComp(initiator.AttachedEntity, out GhostComponent? ghostComp)) + return false; + + // Must have been dead for x seconds + if ((int)_gameTiming.RealTime.Subtract(ghostComp.TimeOfDeath).TotalSeconds < _cfg.GetCVar(CCVars.VotekickEligibleVoterDeathtime)) + return false; + } } // Must be whitelisted - if (!await _dbManager.GetWhitelistStatusAsync(initiator.UserId)) + if (!await _dbManager.GetWhitelistStatusAsync(initiator.UserId) && _cfg.GetCVar(CCVars.VotekickInitiatorWhitelistedRequirement)) return false; - return true; + // Must be eligible to vote + var playtime = _playtimeManager.GetPlayTimes(initiator); + return playtime.TryGetValue(PlayTimeTrackingShared.TrackerOverall, out TimeSpan overallTime) && (overallTime >= TimeSpan.FromHours(_cfg.GetCVar(CCVars.VotekickEligibleVoterPlaytime)) + || !_cfg.GetCVar(CCVars.VotekickInitiatorTimeRequirement)); } /// diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 01452bdc72e..c3aa6cc97ee 100644 --- a/Content.Shared/Actions/BaseActionComponent.cs +++ b/Content.Shared/Actions/BaseActionComponent.cs @@ -76,6 +76,11 @@ public abstract partial class BaseActionComponent : Component // TODO serialization public (TimeSpan Start, TimeSpan End)? Cooldown; + /// + /// If true, the action will have an initial cooldown applied upon addition. + /// + [DataField] public bool StartDelay = false; + /// /// Time interval between action uses. /// diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 76b8a1b081b..fc6f0baf772 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -813,6 +813,9 @@ public bool AddActionDirect(EntityUid performer, if (action.AttachedEntity != null) RemoveAction(action.AttachedEntity.Value, actionId, action: action); + if (action.StartDelay && action.UseDelay != null) + SetCooldown(actionId, action.UseDelay.Value); + DebugTools.AssertOwner(performer, comp); comp ??= EnsureComp(performer); action.AttachedEntity = performer; diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs index fa3bf704219..620ff96a757 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -130,9 +130,6 @@ private void OnMapInit(Entity ent, ref MapInitEvent args) RaiseLocalEvent(ent, ref ev); _blindableSystem.UpdateIsBlind(ent.Owner); _actionsSystem.AddAction(ent, ref ent.Comp.WakeAction, WakeActionId, ent); - - // TODO remove hardcoded time. - _actionsSystem.SetCooldown(ent.Comp.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f)); } private void OnSpeakAttempt(Entity ent, ref SpeakAttemptEvent args) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index a8965aa93c4..c63fac2c474 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -461,6 +461,18 @@ public static readonly CVarDef * Discord */ + /// + /// The role that will get mentioned if a new SOS ahelp comes in. + /// + public static readonly CVarDef DiscordAhelpMention = + CVarDef.Create("discord.on_call_ping", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL); + + /// + /// URL of the discord webhook to relay unanswered ahelp messages. + /// + public static readonly CVarDef DiscordOnCallWebhook = + CVarDef.Create("discord.on_call_webhook", string.Empty, CVar.SERVERONLY | CVar.CONFIDENTIAL); + /// /// URL of the Discord webhook which will relay all ahelp messages. /// @@ -1469,7 +1481,7 @@ public static readonly CVarDef /// Config for when the votekick should be allowed to be called based on number of eligible voters. /// public static readonly CVarDef VotekickEligibleNumberRequirement = - CVarDef.Create("votekick.eligible_number", 10, CVar.SERVERONLY); + CVarDef.Create("votekick.eligible_number", 5, CVar.SERVERONLY); /// /// Whether a votekick initiator must be a ghost or not. @@ -1477,6 +1489,18 @@ public static readonly CVarDef public static readonly CVarDef VotekickInitiatorGhostRequirement = CVarDef.Create("votekick.initiator_ghost_requirement", true, CVar.SERVERONLY); + /// + /// Should the initiator be whitelisted to initiate a votekick? + /// + public static readonly CVarDef VotekickInitiatorWhitelistedRequirement = + CVarDef.Create("votekick.initiator_whitelist_requirement", true, CVar.SERVERONLY); + + /// + /// Should the initiator be able to start a votekick if they are bellow the votekick.voter_playtime requirement? + /// + public static readonly CVarDef VotekickInitiatorTimeRequirement = + CVarDef.Create("votekick.initiator_time_requirement", false, CVar.SERVERONLY); + /// /// Whether a votekick voter must be a ghost or not. /// @@ -1493,7 +1517,7 @@ public static readonly CVarDef /// Config for how many seconds a player must have been dead to initiate a votekick / be able to vote on a votekick. /// public static readonly CVarDef VotekickEligibleVoterDeathtime = - CVarDef.Create("votekick.voter_deathtime", 180, CVar.REPLICATED | CVar.SERVER); + CVarDef.Create("votekick.voter_deathtime", 30, CVar.REPLICATED | CVar.SERVER); /// /// The required ratio of eligible voters that must agree for a votekick to go through. @@ -1537,6 +1561,12 @@ public static readonly CVarDef public static readonly CVarDef VotekickBanDuration = CVarDef.Create("votekick.ban_duration", 180, CVar.SERVERONLY); + /// + /// Whether the ghost requirement settings for votekicks should be ignored for the lobby. + /// + public static readonly CVarDef VotekickIgnoreGhostReqInLobby = + CVarDef.Create("votekick.ignore_ghost_req_in_lobby", true, CVar.SERVERONLY); + /* * BAN */ diff --git a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs index c9cd710c522..f47112c7943 100644 --- a/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs +++ b/Content.Shared/CartridgeLoader/CartridgeLoaderComponent.cs @@ -33,7 +33,7 @@ public sealed partial class CartridgeLoaderComponent : Component /// The maximum amount of programs that can be installed on the cartridge loader entity /// [DataField] - public int DiskSpace = 5; + public int DiskSpace = 8; /// /// Controls whether the cartridge loader will play notifications if it supports it at all diff --git a/Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs b/Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs new file mode 100644 index 00000000000..6aefd8f462f --- /dev/null +++ b/Content.Shared/Chemistry/Components/ReactiveContainerComponent.cs @@ -0,0 +1,21 @@ +namespace Content.Shared.Chemistry.Components; + +/// +/// Represents a container that also contains a solution. +/// This means that reactive entities react when inserted into the container. +/// +[RegisterComponent] +public sealed partial class ReactiveContainerComponent : Component +{ + /// + /// The container that holds the solution. + /// + [DataField(required: true)] + public string Container = default!; + + /// + /// The solution in the container. + /// + [DataField(required: true)] + public string Solution = default!; +} diff --git a/Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs new file mode 100644 index 00000000000..aa217c60ba3 --- /dev/null +++ b/Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs @@ -0,0 +1,53 @@ +using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Reaction; +using Robust.Shared.Containers; + +namespace Content.Shared.Chemistry.EntitySystems; + +public sealed class ReactiveContainerSystem : EntitySystem +{ + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly ReactiveSystem _reactiveSystem = default!; + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInserted); + SubscribeLocalEvent(OnSolutionChange); + } + + private void OnInserted(EntityUid uid, ReactiveContainerComponent comp, EntInsertedIntoContainerMessage args) + { + // Only reactive entities can react with the solution + if (!HasComp(args.Entity)) + return; + + if (!_solutionContainerSystem.TryGetSolution(uid, comp.Solution, out _, out var solution)) + return; + if (solution.Volume == 0) + return; + + _reactiveSystem.DoEntityReaction(args.Entity, solution, ReactionMethod.Touch); + } + + private void OnSolutionChange(EntityUid uid, ReactiveContainerComponent comp, SolutionContainerChangedEvent args) + { + if (!_solutionContainerSystem.TryGetSolution(uid, comp.Solution, out _, out var solution)) + return; + if (solution.Volume == 0) + return; + if (!TryComp(uid, out var manager)) + return; + if (!_containerSystem.TryGetContainer(uid, comp.Container, out var container)) + return; + + foreach (var entity in container.ContainedEntities) + { + if (!HasComp(entity)) + continue; + _reactiveSystem.DoEntityReaction(entity, solution, ReactionMethod.Touch); + } + } +} diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index f41fa2b22d2..fdd77e8e720 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -60,6 +60,7 @@ public override void Initialize() } #region ComponentManagement + /// /// Spawn in starting items for any item slots that should have one. /// @@ -70,7 +71,8 @@ private void OnMapInit(EntityUid uid, ItemSlotsComponent itemSlots, MapInitEvent if (slot.HasItem || string.IsNullOrEmpty(slot.StartingItem)) continue; - var item = EntityManager.SpawnEntity(slot.StartingItem, EntityManager.GetComponent(uid).Coordinates); + var item = Spawn(slot.StartingItem, Transform(uid).Coordinates); + if (slot.ContainerSlot != null) _containers.Insert(item, slot.ContainerSlot); } @@ -99,7 +101,8 @@ public void AddItemSlot(EntityUid uid, string id, ItemSlot slot, ItemSlotsCompon if (itemSlots.Slots.TryGetValue(id, out var existing)) { if (existing.Local) - Log.Error($"Duplicate item slot key. Entity: {EntityManager.GetComponent(uid).EntityName} ({uid}), key: {id}"); + Log.Error( + $"Duplicate item slot key. Entity: {EntityManager.GetComponent(uid).EntityName} ({uid}), key: {id}"); else // server state takes priority slot.CopyFrom(existing); @@ -134,7 +137,10 @@ public void RemoveItemSlot(EntityUid uid, ItemSlot slot, ItemSlotsComponent? ite Dirty(uid, itemSlots); } - public bool TryGetSlot(EntityUid uid, string slotId, [NotNullWhen(true)] out ItemSlot? itemSlot, ItemSlotsComponent? component = null) + public bool TryGetSlot(EntityUid uid, + string slotId, + [NotNullWhen(true)] out ItemSlot? itemSlot, + ItemSlotsComponent? component = null) { itemSlot = null; @@ -143,9 +149,11 @@ public bool TryGetSlot(EntityUid uid, string slotId, [NotNullWhen(true)] out Ite return component.Slots.TryGetValue(slotId, out itemSlot); } + #endregion #region Interactions + /// /// Attempt to take an item from a slot, if any are set to EjectOnInteract. /// @@ -201,20 +209,50 @@ private void OnInteractUsing(EntityUid uid, ItemSlotsComponent itemSlots, Intera if (!EntityManager.TryGetComponent(args.User, out HandsComponent? hands)) return; + if (itemSlots.Slots.Count == 0) + return; + + // If any slot can be inserted into don't show popup. + // If any whitelist passes, but slot is locked, then show locked. + // If whitelist fails all, show whitelist fail. + + // valid, insertable slots (if any) var slots = new List(); + + string? whitelistFailPopup = null; + string? lockedFailPopup = null; foreach (var slot in itemSlots.Slots.Values) { if (!slot.InsertOnInteract) continue; - if (!CanInsert(uid, args.Used, args.User, slot, swap: slot.Swap, popup: args.User)) - continue; + if (CanInsert(uid, args.Used, args.User, slot, slot.Swap)) + { + slots.Add(slot); + } + else + { + var allowed = CanInsertWhitelist(args.Used, slot); + if (lockedFailPopup == null && slot.LockedFailPopup != null && allowed && slot.Locked) + lockedFailPopup = slot.LockedFailPopup; - slots.Add(slot); + if (whitelistFailPopup == null && slot.WhitelistFailPopup != null) + whitelistFailPopup = slot.WhitelistFailPopup; + } } if (slots.Count == 0) + { + // it's a bit weird that the popupMessage is stored with the item slots themselves, but in practice + // the popup messages will just all be the same, so it's probably fine. + // + // doing a check to make sure that they're all the same or something is probably frivolous + if (lockedFailPopup != null) + _popupSystem.PopupClient(Loc.GetString(lockedFailPopup), uid, args.User); + else if (whitelistFailPopup != null) + _popupSystem.PopupClient(Loc.GetString(whitelistFailPopup), uid, args.User); return; + } // Drop the held item onto the floor. Return if the user cannot drop. if (!_handsSystem.TryDrop(args.User, args.Used, handsComp: hands)) @@ -236,23 +274,31 @@ private void OnInteractUsing(EntityUid uid, ItemSlotsComponent itemSlots, Intera return; } } + #endregion #region Insert + /// /// Insert an item into a slot. This does not perform checks, so make sure to also use or just use instead. /// /// If true, will exclude the user when playing sound. Does nothing client-side. /// Useful for predicted interactions - private void Insert(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? user, bool excludeUserAudio = false) + private void Insert(EntityUid uid, + ItemSlot slot, + EntityUid item, + EntityUid? user, + bool excludeUserAudio = false) { bool? inserted = slot.ContainerSlot != null ? _containers.Insert(item, slot.ContainerSlot) : null; // ContainerSlot automatically raises a directed EntInsertedIntoContainerMessage // Logging if (inserted != null && inserted.Value && user != null) - _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user.Value)} inserted {ToPrettyString(item)} into {slot.ContainerSlot?.ID + " slot of "}{ToPrettyString(uid)}"); + _adminLogger.Add(LogType.Action, + LogImpact.Low, + $"{ToPrettyString(user.Value)} inserted {ToPrettyString(item)} into {slot.ContainerSlot?.ID + " slot of "}{ToPrettyString(uid)}"); _audioSystem.PlayPredicted(slot.InsertSound, uid, excludeUserAudio ? user : null); } @@ -261,46 +307,53 @@ private void Insert(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? use /// Check whether a given item can be inserted into a slot. Unless otherwise specified, this will return /// false if the slot is already filled. /// - /// - /// If a popup entity is given, and if the item slot is set to generate a popup message when it fails to - /// pass the whitelist or due to slot being locked, then this will generate an appropriate popup. - /// - public bool CanInsert(EntityUid uid, EntityUid usedUid, EntityUid? user, ItemSlot slot, bool swap = false, EntityUid? popup = null) + public bool CanInsert(EntityUid uid, + EntityUid usedUid, + EntityUid? user, + ItemSlot slot, + bool swap = false) { if (slot.ContainerSlot == null) return false; - if (_whitelistSystem.IsWhitelistFail(slot.Whitelist, usedUid) || _whitelistSystem.IsBlacklistPass(slot.Blacklist, usedUid)) - { - if (popup.HasValue && slot.WhitelistFailPopup.HasValue) - _popupSystem.PopupClient(Loc.GetString(slot.WhitelistFailPopup), uid, popup.Value); + if (slot.HasItem && (!swap || swap && !CanEject(uid, user, slot))) return false; - } - if (slot.Locked) - { - if (popup.HasValue && slot.LockedFailPopup.HasValue) - _popupSystem.PopupClient(Loc.GetString(slot.LockedFailPopup), uid, popup.Value); + if (!CanInsertWhitelist(usedUid, slot)) return false; - } - if (slot.HasItem && (!swap || (swap && !CanEject(uid, user, slot)))) + if (slot.Locked) return false; var ev = new ItemSlotInsertAttemptEvent(uid, usedUid, user, slot); RaiseLocalEvent(uid, ref ev); RaiseLocalEvent(usedUid, ref ev); if (ev.Cancelled) + { return false; + } return _containers.CanInsert(usedUid, slot.ContainerSlot, assumeEmpty: swap); } + private bool CanInsertWhitelist(EntityUid usedUid, ItemSlot slot) + { + if (_whitelistSystem.IsWhitelistFail(slot.Whitelist, usedUid) + || _whitelistSystem.IsBlacklistPass(slot.Blacklist, usedUid)) + return false; + return true; + } + /// /// Tries to insert item into a specific slot. /// /// False if failed to insert item - public bool TryInsert(EntityUid uid, string id, EntityUid item, EntityUid? user, ItemSlotsComponent? itemSlots = null, bool excludeUserAudio = false) + public bool TryInsert(EntityUid uid, + string id, + EntityUid item, + EntityUid? user, + ItemSlotsComponent? itemSlots = null, + bool excludeUserAudio = false) { if (!Resolve(uid, ref itemSlots)) return false; @@ -315,7 +368,11 @@ public bool TryInsert(EntityUid uid, string id, EntityUid item, EntityUid? user, /// Tries to insert item into a specific slot. /// /// False if failed to insert item - public bool TryInsert(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? user, bool excludeUserAudio = false) + public bool TryInsert(EntityUid uid, + ItemSlot slot, + EntityUid item, + EntityUid? user, + bool excludeUserAudio = false) { if (!CanInsert(uid, item, user, slot)) return false; @@ -329,7 +386,11 @@ public bool TryInsert(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? u /// Does not check action blockers. /// /// False if failed to insert item - public bool TryInsertFromHand(EntityUid uid, ItemSlot slot, EntityUid user, HandsComponent? hands = null, bool excludeUserAudio = false) + public bool TryInsertFromHand(EntityUid uid, + ItemSlot slot, + EntityUid user, + HandsComponent? hands = null, + bool excludeUserAudio = false) { if (!Resolve(user, ref hands, false)) return false; @@ -406,6 +467,7 @@ private static int SortEmpty(ItemSlot a, ItemSlot b) return 1; } + #endregion #region Eject @@ -425,7 +487,7 @@ public bool CanEject(EntityUid uid, EntityUid? user, ItemSlot slot, EntityUid? p return false; } - if (slot.ContainerSlot?.ContainedEntity is not {} item) + if (slot.ContainerSlot?.ContainedEntity is not { } item) return false; var ev = new ItemSlotEjectAttemptEvent(uid, item, user, slot); @@ -450,7 +512,9 @@ private void Eject(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? user // Logging if (ejected != null && ejected.Value && user != null) - _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(user.Value)} ejected {ToPrettyString(item)} from {slot.ContainerSlot?.ID + " slot of "}{ToPrettyString(uid)}"); + _adminLogger.Add(LogType.Action, + LogImpact.Low, + $"{ToPrettyString(user.Value)} ejected {ToPrettyString(item)} from {slot.ContainerSlot?.ID + " slot of "}{ToPrettyString(uid)}"); _audioSystem.PlayPredicted(slot.EjectSound, uid, excludeUserAudio ? user : null); } @@ -459,7 +523,11 @@ private void Eject(EntityUid uid, ItemSlot slot, EntityUid item, EntityUid? user /// Try to eject an item from a slot. /// /// False if item slot is locked or has no item inserted - public bool TryEject(EntityUid uid, ItemSlot slot, EntityUid? user, [NotNullWhen(true)] out EntityUid? item, bool excludeUserAudio = false) + public bool TryEject(EntityUid uid, + ItemSlot slot, + EntityUid? user, + [NotNullWhen(true)] out EntityUid? item, + bool excludeUserAudio = false) { item = null; @@ -481,8 +549,12 @@ public bool TryEject(EntityUid uid, ItemSlot slot, EntityUid? user, [NotNullWhen /// Try to eject item from a slot. /// /// False if the id is not valid, the item slot is locked, or it has no item inserted - public bool TryEject(EntityUid uid, string id, EntityUid? user, - [NotNullWhen(true)] out EntityUid? item, ItemSlotsComponent? itemSlots = null, bool excludeUserAudio = false) + public bool TryEject(EntityUid uid, + string id, + EntityUid? user, + [NotNullWhen(true)] out EntityUid? item, + ItemSlotsComponent? itemSlots = null, + bool excludeUserAudio = false) { item = null; @@ -513,12 +585,16 @@ public bool TryEjectToHands(EntityUid uid, ItemSlot slot, EntityUid? user, bool return true; } + #endregion #region Verbs - private void AddAlternativeVerbs(EntityUid uid, ItemSlotsComponent itemSlots, GetVerbsEvent args) + + private void AddAlternativeVerbs(EntityUid uid, + ItemSlotsComponent itemSlots, + GetVerbsEvent args) { - if (args.Hands == null || !args.CanAccess ||!args.CanInteract) + if (args.Hands == null || !args.CanAccess || !args.CanInteract) { return; } @@ -612,7 +688,9 @@ private void AddAlternativeVerbs(EntityUid uid, ItemSlotsComponent itemSlots, Ge } } - private void AddInteractionVerbsVerbs(EntityUid uid, ItemSlotsComponent itemSlots, GetVerbsEvent args) + private void AddInteractionVerbsVerbs(EntityUid uid, + ItemSlotsComponent itemSlots, + GetVerbsEvent args) { if (args.Hands == null || !args.CanAccess || !args.CanInteract) return; @@ -671,7 +749,7 @@ private void AddInteractionVerbsVerbs(EntityUid uid, ItemSlotsComponent itemSlot new SpriteSpecifier.Texture( new ResPath("/Textures/Interface/VerbIcons/insert.svg.192dpi.png")); } - else if(slot.EjectOnInteract) + else if (slot.EjectOnInteract) { // Inserting/ejecting is a primary interaction for this entity. Instead of using the insert // category, we will use a single "Place " verb. @@ -690,9 +768,11 @@ private void AddInteractionVerbsVerbs(EntityUid uid, ItemSlotsComponent itemSlot args.Verbs.Add(insertVerb); } } + #endregion #region BUIs + private void HandleButtonPressed(EntityUid uid, ItemSlotsComponent component, ItemSlotButtonPressedEvent args) { if (!component.Slots.TryGetValue(args.SlotId, out var slot)) @@ -703,6 +783,7 @@ private void HandleButtonPressed(EntityUid uid, ItemSlotsComponent component, It else if (args.TryInsert && !slot.HasItem) TryInsertFromHand(uid, slot, args.Actor); } + #endregion /// diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs index 1d5d91a9e36..f089dfaf238 100644 --- a/Content.Shared/Inventory/InventorySystem.Equip.cs +++ b/Content.Shared/Inventory/InventorySystem.Equip.cs @@ -47,7 +47,7 @@ private void InitializeEquip() private void OnEntRemoved(EntityUid uid, InventoryComponent component, EntRemovedFromContainerMessage args) { - if(!TryGetSlot(uid, args.Container.ID, out var slotDef, inventory: component)) + if (!TryGetSlot(uid, args.Container.ID, out var slotDef, inventory: component)) return; var unequippedEvent = new DidUnequipEvent(uid, args.Entity, slotDef); @@ -59,8 +59,8 @@ private void OnEntRemoved(EntityUid uid, InventoryComponent component, EntRemove private void OnEntInserted(EntityUid uid, InventoryComponent component, EntInsertedIntoContainerMessage args) { - if(!TryGetSlot(uid, args.Container.ID, out var slotDef, inventory: component)) - return; + if (!TryGetSlot(uid, args.Container.ID, out var slotDef, inventory: component)) + return; var equippedEvent = new DidEquipEvent(uid, args.Entity, slotDef); RaiseLocalEvent(uid, equippedEvent, true); @@ -118,7 +118,7 @@ private void OnUseSlot(UseSlotNetworkMessage ev, EntitySessionEventArgs eventArg RaiseLocalEvent(held.Value, new HandDeselectedEvent(actor)); - TryEquip(actor, actor, held.Value, ev.Slot, predicted: true, inventory: inventory, force: true, checkDoafter:true); + TryEquip(actor, actor, held.Value, ev.Slot, predicted: true, inventory: inventory, force: true, checkDoafter: true); } public bool TryEquip(EntityUid uid, EntityUid itemUid, string slot, bool silent = false, bool force = false, bool predicted = false, @@ -365,6 +365,25 @@ public bool TryUnequip( ClothingComponent? clothing = null, bool reparent = true, bool checkDoafter = false) + { + var itemsDropped = 0; + return TryUnequip(actor, target, slot, out removedItem, ref itemsDropped, + silent, force, predicted, inventory, clothing, reparent, checkDoafter); + } + + private bool TryUnequip( + EntityUid actor, + EntityUid target, + string slot, + [NotNullWhen(true)] out EntityUid? removedItem, + ref int itemsDropped, + bool silent = false, + bool force = false, + bool predicted = false, + InventoryComponent? inventory = null, + ClothingComponent? clothing = null, + bool reparent = true, + bool checkDoafter = false) { removedItem = null; @@ -423,17 +442,27 @@ public bool TryUnequip( return false; } + if (!_containerSystem.Remove(removedItem.Value, slotContainer, force: force, reparent: reparent)) + return false; + + // this is in order to keep track of whether this is the first instance of a recursion call + var firstRun = itemsDropped == 0; + ++itemsDropped; + foreach (var slotDef in inventory.Slots) { if (slotDef != slotDefinition && slotDef.DependsOn == slotDefinition.Name) { //this recursive call might be risky - TryUnequip(actor, target, slotDef.Name, true, true, predicted, inventory, reparent: reparent); + TryUnequip(actor, target, slotDef.Name, out _, ref itemsDropped, true, true, predicted, inventory, reparent: reparent); } } - if (!_containerSystem.Remove(removedItem.Value, slotContainer, force: force, reparent: reparent)) - return false; + // we check if any items were dropped, and make a popup if they were. + // the reason we check for > 1 is because the first item is always the one we are trying to unequip, + // whereas we only want to notify for extra dropped items. + if (!silent && _gameTiming.IsFirstTimePredicted && firstRun && itemsDropped > 1) + _popup.PopupClient(Loc.GetString("inventory-component-dropped-from-unequip", ("items", itemsDropped - 1)), target, target); // TODO: Inventory needs a hot cleanup hoo boy // Check if something else (AKA toggleable) dumped it into a container. @@ -466,7 +495,7 @@ public bool CanUnequip(EntityUid actor, EntityUid target, string slot, [NotNullW if ((containerSlot == null || slotDefinition == null) && !TryGetSlotContainer(target, slot, out containerSlot, out slotDefinition, inventory)) return false; - if (containerSlot.ContainedEntity is not {} itemUid) + if (containerSlot.ContainedEntity is not { } itemUid) return false; if (!_containerSystem.CanRemove(itemUid, containerSlot)) diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs index 78f26ed5c02..08af1a36a7b 100644 --- a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs +++ b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs @@ -13,14 +13,16 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage public float BloodLevel; public bool? ScanMode; public bool? Bleeding; + public bool? Unrevivable; - public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding) + public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable) { TargetEntity = targetEntity; Temperature = temperature; BloodLevel = bloodLevel; ScanMode = scanMode; Bleeding = bleeding; + Unrevivable = unrevivable; } } diff --git a/Resources/Audio/Machines/ame_fuelinjection.ogg b/Resources/Audio/Machines/ame_fuelinjection.ogg new file mode 100644 index 00000000000..30c9175ee97 Binary files /dev/null and b/Resources/Audio/Machines/ame_fuelinjection.ogg differ diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index 7675162a04d..bcbf1036c32 100644 --- a/Resources/Audio/Machines/attributions.yml +++ b/Resources/Audio/Machines/attributions.yml @@ -181,3 +181,8 @@ license: "CC0-1.0" copyright: "by ScarKy0" source: "https://github.com/space-wizards/space-station-14/pull/32012" + +- files: ["ame_fuelinjection.ogg"] + license: "CC0-1.0" + copyright: "by AftrLite (Github). Uses audio from hypospray.ogg and hiss.ogg (Found in Resources/Audio/Items)" + source: "https://github.com/space-wizards/space-station-14/pull/33097" diff --git a/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg b/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg index e4bf25f7b8d..fff0a8728a7 100644 Binary files a/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg and b/Resources/Audio/Voice/Reptilian/reptilian_tailthump.ogg differ diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index f78eec801ea..6defd76e971 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -567,5 +567,28 @@ Entries: id: 70 time: '2024-10-16T22:24:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32844 +- author: BramvanZijp + changes: + - message: CC, ERT, Admin, and Deathsquad PDA's now have all departmental programs + pre-installed. + type: Tweak + id: 71 + time: '2024-10-31T14:53:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32601 +- author: metalgearsloth + changes: + - message: Added on-call functionality for discord relay to get notified on unanswered + ahelps. + type: Add + id: 72 + time: '2024-11-02T09:29:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30443 +- author: nikthechampiongr + changes: + - message: It is now possible to edit the AI's laws through its core and eye. + type: Fix + id: 73 + time: '2024-11-02T13:21:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32461 Name: Admin Order: 3 diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c4edb358ab6..155dbacf061 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,271 +1,4 @@ Entries: -- author: Errant - changes: - - message: Medical Mask sprite now works on vox. - type: Fix - id: 7052 - time: '2024-08-07T03:41:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30702 -- author: Lyroth001 - changes: - - message: Dragons are immune to flashes - type: Tweak - id: 7053 - time: '2024-08-07T07:42:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30658 -- author: ShadowCommander - changes: - - message: Rollerbeds can now be dragged to the player to fold and pick them up. - type: Add - id: 7054 - time: '2024-08-07T09:19:10.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30002 -- author: Errant - changes: - - message: Survivors arriving via the Unknown Shuttle event, ERT and CBURN agents, - and Death Squad members are now equipped with the appropriate species-specific - survival gear. - type: Fix - - message: Unknown Shuttle event can once again spawn vox characters. - type: Tweak - id: 7055 - time: '2024-08-07T09:26:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29746 -- author: IProduceWidgets - changes: - - message: butter is slippery - type: Tweak - id: 7056 - time: '2024-08-07T21:47:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29772 -- author: Mervill - changes: - - message: Gas Miners now have detailed examine text - type: Tweak - id: 7057 - time: '2024-08-08T02:14:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30480 -- author: BackeTako - changes: - - message: "!, \u203D and multiple punctuations now work for Spanish." - type: Tweak - id: 7058 - time: '2024-08-08T03:08:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30551 -- author: strO0pwafel - changes: - - message: Fixed inconsistent naming of CentComm. - type: Fix - id: 7059 - time: '2024-08-08T10:04:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29217 -- author: Plykiya - changes: - - message: Buffed the range of EMP implants from a radius of 1.75 tiles to 2.75 - tiles. - type: Tweak - - message: Buffed the range of EMP grenades from a radius of 4 tiles to 5.5 tiles. - type: Tweak - id: 7060 - time: '2024-08-08T10:04:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30660 -- author: Plykiya - changes: - - message: You can drop food or drinks from your hands to interrupt eating it, again. - type: Fix - - message: Barber scissors are now interrupted if the item is dropped or if the - user changes hands. - type: Tweak - id: 7061 - time: '2024-08-08T11:39:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30361 -- author: TheShuEd - changes: - - message: Add "thieving beacon" to Thief antag - a device that counts objects within - a radius of itself as stolen. - type: Add - - message: Return thief structures stealing objectives. - type: Add - - message: Animal theft objectives can no longer appear if the animals are not on - the station. - type: Fix - id: 7062 - time: '2024-08-08T13:17:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29997 -- author: lzk228 - changes: - - message: RD labcoat added in RD's dresser. - type: Add - id: 7063 - time: '2024-08-08T22:50:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30671 -- author: SlamBamActionman - changes: - - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner. - type: Tweak - - message: Forensic Scanner can now scan fluid containers for DNA in reagents. - type: Tweak - - message: Fluids keep their DNA data when moved. - type: Fix - - message: Fluids now stain containers they're in with DNA. Make sure to scrub your - blood bucket after use! - type: Add - - message: Vomit now includes DNA! - type: Add - id: 7064 - time: '2024-08-08T23:27:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26699 -- author: themias - changes: - - message: Butter can be sliced, cookie and toast recipes now use butter slices. - type: Tweak - - message: Chefvend butter reduced from 4 to 3. - type: Tweak - id: 7065 - time: '2024-08-08T23:32:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30789 -- author: EmoGarbage404 - changes: - - message: You should have significantly less friction when moving in space. - type: Tweak - id: 7066 - time: '2024-08-09T04:52:25.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29383 -- author: Plykiya - changes: - - message: Hardsuits and EVA suits now count as protection for unscrewing lightbulbs. - type: Add - - message: More gloves were given the ability to unscrew light bulbs. - type: Add - - message: Behonkers no longer hurt you when melee attacking them or interacting - with them. - type: Remove - id: 7067 - time: '2024-08-09T05:32:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30244 -- author: Ian321 - changes: - - message: The warden is now an important job. - type: Tweak - id: 7068 - time: '2024-08-09T05:45:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30745 -- author: slarticodefast - changes: - - message: Added tooltips to the agent ID job icons - type: Add - id: 7069 - time: '2024-08-09T06:14:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28575 -- author: stalengd - changes: - - message: Head bandana no longer blocks food eating. - type: Fix - id: 7070 - time: '2024-08-09T06:17:51.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28910 -- author: Ubaser - changes: - - message: Oxygen and nitrogen canisters now have new sprites when worn. - type: Add - id: 7071 - time: '2024-08-09T10:32:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30809 -- author: Plykiya - changes: - - message: Buckling someone now triggers a short do-after. - type: Tweak - id: 7072 - time: '2024-08-09T15:43:02.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29621 -- author: Ubaser - changes: - - message: Normal crowbars cannot be placed in pockets, but can now fit in belts. - type: Tweak - - message: Depending on where you obtained the crowbars, they will now have different - colours. - type: Tweak - id: 7073 - time: '2024-08-09T19:29:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28988 -- author: lzk228 - changes: - - message: Hotplate works again. - type: Fix - id: 7074 - time: '2024-08-10T01:10:39.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30830 -- author: EmoGarbage404 - changes: - - message: Maintenance closets have more variety in what they can contain. - type: Tweak - id: 7075 - time: '2024-08-10T02:12:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30579 -- author: Ko4erga - changes: - - message: Changed chemistry airlock color. - type: Tweak - id: 7076 - time: '2024-08-10T03:23:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30666 -- author: Blackern5000 - changes: - - message: Bent pipes now deal 8 thrown damage instead of 3. - type: Tweak - id: 7077 - time: '2024-08-10T03:30:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30634 -- author: shampunj - changes: - - message: Rat king can now wideswing - type: Tweak - id: 7078 - time: '2024-08-10T12:47:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30808 -- author: BackeTako - changes: - - message: Added a suitskirt for the psychologist - type: Add - id: 7079 - time: '2024-08-10T12:51:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30709 -- author: Unkn0wnGh0st333 - changes: - - message: ERT Chaplain starting gear was fixed and will no longer give the ERT - Engineer gear - type: Fix - id: 7080 - time: '2024-08-10T12:55:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30855 -- author: Ubaser - changes: - - message: Light tube structures now have new sprites. - type: Tweak - id: 7081 - time: '2024-08-10T15:00:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29091 -- author: lzk228 - changes: - - message: Standartized some clothing recipes. - type: Tweak - id: 7082 - time: '2024-08-10T18:16:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29315 -- author: TheShuEd - changes: - - message: You cat cut burger bun into two halfs, and make custom burgers now! - type: Add - id: 7083 - time: '2024-08-10T19:31:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30755 -- author: thetolbean - changes: - - message: Updated Core's boxing ring beacon label to be correct - type: Tweak - id: 7084 - time: '2024-08-10T19:50:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30800 - author: Flareguy changes: - message: Added vox sprites for most of the remaining common mask items. @@ -3927,3 +3660,264 @@ id: 7551 time: '2024-10-24T03:41:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32965 +- author: slarticodefast + changes: + - message: Mix 1u aluminium, 1u potassium and 1u sulfur for a flash reaction effect. + The radius scales with the reagent amount. + type: Add + id: 7552 + time: '2024-10-25T22:47:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32377 +- author: BramvanZijp + changes: + - message: Fixed the Lone Nuclear Operative mid-round antagonist being extremely + rare. + type: Fix + id: 7553 + time: '2024-10-26T02:16:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32942 +- author: Moomoobeef + changes: + - message: Bowls no longer make an eating sound when drinking from them. + type: Fix + id: 7554 + time: '2024-10-26T04:00:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32819 +- author: SaphireLattice + changes: + - message: Added a warning about unrevivability in the health analyzer UI. + type: Add + id: 7555 + time: '2024-10-26T17:22:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32636 +- author: slarticodefast + changes: + - message: Fixed pie throwing sound not playing. + type: Fix + id: 7556 + time: '2024-10-27T04:25:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33017 +- author: stalengd + changes: + - message: Fixed playtime labels not being able to correctly display time greater + than 24 hours + type: Fix + id: 7557 + time: '2024-10-28T18:00:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32974 +- author: august-sun + changes: + - message: Extended the minimum round time for meteor swarm events. + type: Tweak + id: 7558 + time: '2024-10-28T21:25:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32876 +- author: deltanedas + changes: + - message: Fixed lava planet expeditions not working. + type: Fix + id: 7559 + time: '2024-10-29T05:00:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33042 +- author: metalgearsloth + changes: + - message: Fix separated game screen bumping slightly. + type: Fix + id: 7560 + time: '2024-10-29T05:07:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33046 +- author: Blackern5000 + changes: + - message: Proto-kitentic crushers, glaives, and daggers now have more accurate + inhand sprites. + type: Tweak + id: 7561 + time: '2024-10-30T07:38:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32212 +- author: Blackern5000 + changes: + - message: Security belts now contain a holobarrier projector and a handheld security + radio by default rather than tear gas and a flashbang. + type: Tweak + id: 7562 + time: '2024-10-30T07:40:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32291 +- author: Blackern5000 + changes: + - message: Added three bottle boxes to the nanomed plus inventory for doctors to + carry small amounts of chemicals on their person + type: Add + id: 7563 + time: '2024-10-30T07:41:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33018 +- author: Blackern5000 + changes: + - message: Added the interdyne defibrillator, a black-and-red defibrillator that + can be used as a melee weapon. + type: Add + - message: The syndicate medical bundle now contains an interdyne defibrillator, + a collection of various instant injectors, tourniquets, and several combat kits. + The price has been raised to 24 tc. + type: Tweak + id: 7564 + time: '2024-10-30T09:15:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32720 +- author: Boaz1111 + changes: + - message: Pill bottles can now only store pills. + type: Tweak + id: 7565 + time: '2024-10-31T10:56:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33074 +- author: Jarmer123 + changes: + - message: You can now find a spare bible in the PietyVend + type: Add + id: 7566 + time: '2024-10-31T13:26:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32363 +- author: justinbrick + changes: + - message: Added a pop-up notification when extra items are dropped while unequipping + something. + type: Tweak + id: 7567 + time: '2024-10-31T14:12:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33078 +- author: BramvanZijp + changes: + - message: The maximum amount of programs that can be installed on a PDA has been + increased from 5 to 8 + type: Tweak + - message: The Detective and Head of Security now get the logprobe program pre-installed + on their PDA. + type: Tweak + id: 7568 + time: '2024-10-31T14:53:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32601 +- author: Psychpsyo + changes: + - message: Carp plushies can now be placed in mop buckets, along with other rehydratable + things like monkey cubes. + type: Add + id: 7569 + time: '2024-10-31T18:46:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33079 +- author: Bhijn and Myr + changes: + - message: Tail thumping has been downmixed to mono to fix the sound lacking any + sort of positioning. They're now capable of having a presence in the actual + soundspace, in turn meaning lizards are no longer occupying your headset at + all times of day. + type: Fix + id: 7570 + time: '2024-10-31T21:30:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33092 +- author: reesque + changes: + - message: pie not dropping tin on thrown + type: Fix + id: 7571 + time: '2024-11-01T01:43:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33013 +- author: SlamBamActionman + changes: + - message: Votekicks can now be initiated during the pregame lobby. + type: Fix + id: 7572 + time: '2024-11-01T01:52:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32528 +- author: PopGamer46 + changes: + - message: Fixed bolt lights of recently unpowered bolted doors + type: Fix + id: 7573 + time: '2024-11-01T02:04:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33063 +- author: RumiTiger + changes: + - message: A chocolate and banana muffin has been added to the game. The berry and + cherry muffins have also been resprited! + type: Add + - message: Now you can make a regular, chocolate, banana, and berry muffin! + type: Tweak + - message: Muffin tins have been added to the game. They are needed for making muffins! + type: Add + id: 7574 + time: '2024-11-01T02:06:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29318 +- author: ScarKy0 + changes: + - message: AI can no longer toggle seeing jobs off. + type: Tweak + - message: Borgs can no longer see mindshield status. + type: Fix + id: 7575 + time: '2024-11-01T02:32:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33069 +- author: Minemoder5000 + changes: + - message: The cargo shuttle's cargo pallets can no longer sell or buy. + type: Fix + id: 7576 + time: '2024-11-01T06:22:39.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33022 +- author: aspiringLich + changes: + - message: Fixed the logic triggering popups when inserting items into machines. + type: Fix + id: 7577 + time: '2024-11-02T01:33:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28856 +- author: K-Dynamic + changes: + - message: Pills are explosion resistant. + type: Tweak + id: 7578 + time: '2024-11-02T09:51:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32458 +- author: K-Dynamic + changes: + - message: Handcrafted gauze now takes 3 seconds instead of 10 seconds of crafting + type: Tweak + - message: Medical techfab gauze recipe now takes 1 cloth instead of 2 + type: Tweak + id: 7579 + time: '2024-11-02T09:53:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32744 +- author: Ubaser + changes: + - message: Service workers can now be antagonists. + type: Fix + id: 7580 + time: '2024-11-02T10:07:52.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31359 +- author: AftrLite + changes: + - message: The AME now has a new sound effect for fuel injection! + type: Add + id: 7581 + time: '2024-11-02T13:19:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33097 +- author: deltanedas + changes: + - message: Printing cables in an autolathe is now 20 times faster. + type: Tweak + id: 7582 + time: '2024-11-02T13:24:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31521 +- author: Centronias + changes: + - message: Fixed a bug where attempting to speak into a handheld radio and an intercom + simultaneously would lead to only one device transmitting the message. + type: Fix + id: 7583 + time: '2024-11-02T15:04:22.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32737 +- author: joshepvodka + changes: + - message: Headphones are now selectable in loadouts. + type: Add + id: 7584 + time: '2024-11-02T15:12:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33067 diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl index b65c332346a..642555b237e 100644 --- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl +++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl @@ -37,6 +37,12 @@ reagent-effect-guidebook-emp-reaction-effect = *[other] cause } an electromagnetic pulse +reagent-effect-guidebook-flash-reaction-effect = + { $chance -> + [1] Causes + *[other] cause + } a blinding flash + reagent-effect-guidebook-foam-area-reaction-effect = { $chance -> [1] Creates diff --git a/Resources/Locale/en-US/inventory/components/inventory-component.ftl b/Resources/Locale/en-US/inventory/components/inventory-component.ftl index 79943d914ea..1cde6b5943c 100644 --- a/Resources/Locale/en-US/inventory/components/inventory-component.ftl +++ b/Resources/Locale/en-US/inventory/components/inventory-component.ftl @@ -2,3 +2,9 @@ inventory-component-can-equip-cannot = You can't equip this! inventory-component-can-equip-does-not-fit = This doesn't fit! inventory-component-can-unequip-cannot = You can't unequip this! + +inventory-component-dropped-from-unequip = + You dropped {$items -> + [1] an item! + *[other] some items! +} diff --git a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl index b7221165871..bc03943a016 100644 --- a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl +++ b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl @@ -1,5 +1,6 @@ # mop bucket -mop-bucket-slot-component-slot-name-shark = Shark +mop-bucket-slot-component-slot-name-item = Item +mop-bucket-slot-component-eject-verb = Take out # janitorial trolley janitorial-trolley-slot-component-slot-name-plunger = Plunger janitorial-trolley-slot-component-slot-name-sign = Sign diff --git a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl index fe1f92e9140..eb79358ecc2 100644 --- a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl +++ b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl @@ -15,7 +15,8 @@ health-analyzer-window-entity-damage-total-text = Total Damage: health-analyzer-window-damage-group-text = {$damageGroup}: {$amount} health-analyzer-window-damage-type-text = {$damageType}: {$amount} -health-analyzer-window-entity-bleeding-text = Patient is bleeding! +health-analyzer-window-entity-unrevivable-text = [color=red]Unique body composition detected! Patient can not be resuscitated by normal means![/color] +health-analyzer-window-entity-bleeding-text = [color=red]Patient is bleeding![/color] health-analyzer-window-scan-mode-text = Scan Mode: health-analyzer-window-scan-mode-active = Active diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 3677efa38f1..9e83cbe64eb 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -218,8 +218,8 @@ uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes tox uplink-knives-kit-name = Throwing Knives Kit uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims. -uplink-meds-bundle-name = Medical Bundle -uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens. +uplink-meds-bundle-name = Interdyne Medical Bundle +uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon. uplink-ammo-bundle-name = Ammo Bundle uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW. diff --git a/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl b/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl index 7ac9c344fde..82e3a5d1f82 100644 --- a/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl +++ b/Resources/Locale/en-US/voting/ui/vote-call-menu.ftl @@ -25,8 +25,8 @@ ui-vote-type-not-available = This vote type has been disabled # Vote option only available for specific users. ui-vote-trusted-users-notice = - This vote option is only available to whitelisted players. - In addition, you must have been a ghost for { $timeReq } minutes. + This vote option is only available to players who have enough playtime or are whitelisted. + In addition, you must have been a ghost for { $timeReq } seconds. # Warning to not abuse a specific vote option. ui-vote-abuse-warning = diff --git a/Resources/Locale/en-US/window/window-component.ftl b/Resources/Locale/en-US/window/window-component.ftl index 3ecceb8a94e..62e9c46f1be 100644 --- a/Resources/Locale/en-US/window/window-component.ftl +++ b/Resources/Locale/en-US/window/window-component.ftl @@ -2,13 +2,14 @@ # Shown when examining the window. Each entry represents the window's health condition comp-window-damaged-1 = It looks fully intact. -comp-window-damaged-2 = It has a few scratches +comp-window-damaged-2 = It has a few scratches. comp-window-damaged-3 = It has a few small cracks. -comp-window-damaged-4 = It has several big cracks running along its surface. -comp-window-damaged-5 = It has deep cracks across multiple layers. -comp-window-damaged-6 = It's extremely cracked and on the verge of shattering. +comp-window-damaged-4 = [color=yellow]It has several big cracks running along its surface.[/color] +comp-window-damaged-5 = [color=orange]It has deep cracks across multiple layers.[/color] +comp-window-damaged-6 = [color=red]It's extremely cracked and on the verge of shattering.[/color] ### Interaction Messages # Shown when knocking on a window comp-window-knock = *knock knock* + diff --git a/Resources/Maps/Nonstations/nukieplanet.yml b/Resources/Maps/Nonstations/nukieplanet.yml index 665657f7dda..6c0a209deca 100644 --- a/Resources/Maps/Nonstations/nukieplanet.yml +++ b/Resources/Maps/Nonstations/nukieplanet.yml @@ -6576,7 +6576,7 @@ entities: - uid: 2031 components: - type: Transform - pos: 3.6114278,-10.732791 + pos: 4.0109396,-12.223828 parent: 104 - uid: 2095 components: @@ -10993,6 +10993,13 @@ entities: - type: Transform pos: 11.5,-6.5 parent: 104 +- proto: HandLabeler + entities: + - uid: 1826 + components: + - type: Transform + pos: 3.4542694,-10.616036 + parent: 104 - proto: KitchenKnife entities: - uid: 1061 diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index 9fab52cc293..e535f9e0114 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -36,11 +36,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAA version: 6 1,-1: ind: 1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -2,0: ind: -2,0 @@ -68,12 +68,16 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -1,-2: ind: -1,-2 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 + 1,-2: + ind: 1,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 - type: Broadphase - type: Physics bodyStatus: InAir @@ -100,247 +104,301 @@ entities: data: tiles: -4,0: + 0: 65532 + -4,-1: 0: 65535 -4,1: - 0: 65535 + 0: 15 + 1: 65280 + -5,1: + 1: 52292 + -4,2: + 1: 8959 + -5,2: + 1: 204 + -4,3: + 1: 8738 + -4,4: + 1: 230 -3,0: - 0: 65535 + 0: 65524 -3,1: - 0: 65535 + 0: 3823 + -3,2: + 1: 35071 + -3,-1: + 0: 56797 -2,0: - 0: 65535 + 0: 65534 -2,1: - 0: 65535 + 0: 61167 + -3,3: + 1: 8 + -2,3: + 1: 15 -2,2: - 0: 65535 + 0: 3822 + -2,-1: + 0: 61166 -1,0: 0: 65535 -1,1: 0: 65535 -1,2: + 0: 53247 + -1,3: + 1: 1 + -1,-1: 0: 65535 - -4,-3: - 0: 61440 - -4,-2: + 0,0: 0: 65535 - -4,-1: + 0,1: 0: 65535 - -3,-3: - 0: 61440 - -3,-2: + 0,2: 0: 65535 - -3,-1: + -4,-2: 0: 65535 + -3,-2: + 0: 56829 + -2,-2: + 0: 3838 -2,-4: - 0: 65520 + 0: 60928 -2,-3: - 0: 65535 - -2,-2: - 0: 65535 - -2,-1: - 0: 65535 + 0: 61166 -1,-4: - 0: 65535 + 0: 65350 -1,-3: 0: 65535 -1,-2: + 0: 4095 + -1,-5: + 0: 16384 + 0,-4: + 0: 65299 + 0,-3: 0: 65535 - -1,-1: + 0,-2: + 0: 53247 + 0,-1: 0: 65535 0,4: - 0: 61183 + 1: 17 + 0: 3276 + 0,3: + 1: 4368 + 0: 52428 + -1,4: + 1: 240 0,5: - 0: 61166 + 0: 52428 0,6: 0: 14 1,4: + 0: 17759 + 1,3: 0: 65535 1,5: - 0: 65535 + 0: 58990 1,6: - 0: 65535 + 0: 26350 1,7: - 0: 15 + 0: 4 2,4: - 0: 65535 + 0: 65419 2,5: - 0: 65535 + 0: 45311 2,6: - 0: 4095 + 0: 187 + 2,3: + 0: 16383 3,4: - 0: 65535 + 0: 46011 3,5: - 0: 65535 + 0: 47295 3,6: - 0: 53247 - 3,7: - 0: 12 - 0,0: - 0: 65535 - 0,1: - 0: 65535 - 0,2: - 0: 65535 - 0,3: - 0: 65535 + 0: 35007 + 3,3: + 0: 8191 + 4,4: + 0: 12595 + 4,5: + 0: 13107 + 4,6: + 0: 13107 1,0: 0: 65535 - 1,1: - 0: 65535 1,2: + 0: 65520 + 1,-1: 0: 65535 - 1,3: - 0: 65535 + 1,1: + 0: 61166 + 2,2: + 0: 7632 2,0: - 0: 4369 1: 8738 - 2,2: - 0: 65535 - 2,3: - 0: 65535 - 3,0: - 0: 65535 + 2,1: + 1: 2 3,2: - 0: 65535 - 3,3: - 0: 65535 + 0: 36828 + 3,0: + 0: 36590 3,1: - 0: 61166 - 0,-4: - 0: 65527 - 0,-3: - 0: 65535 - 0,-2: + 0: 52428 + 3,-1: + 0: 35771 + 4,0: + 0: 8191 + 4,1: 0: 65535 - 0,-1: + 4,2: 0: 65535 + 4,3: + 0: 8191 + 0,-5: + 0: 4096 1,-4: - 0: 30576 + 0: 48008 1,-3: - 0: 65399 + 0: 65467 1,-2: - 0: 63359 - 1,-1: + 0: 3003 + 1,-5: + 0: 34952 + 2,-4: + 0: 45875 + 1: 1092 + 2: 2056 + 2,-3: 0: 65535 2,-2: - 0: 4096 - 1: 8738 + 0: 61439 + 2,-5: + 0: 65535 2,-1: - 0: 4369 - 1: 8738 - 3,-1: - 0: 65262 + 0: 3822 + 3,-4: + 0: 65535 + 3,-3: + 0: 65535 3,-2: - 0: 61152 + 0: 48063 + 3,-5: + 0: 65535 + 4,-4: + 0: 65535 + 4,-3: + 0: 65535 4,-2: - 0: 65520 + 0: 65311 4,-1: + 0: 8191 + 4,-5: 0: 65535 + 5,-4: + 0: 62451 + 2: 3084 + 5,-3: + 0: 62451 + 3: 12 + 4: 3072 5,-2: - 0: 65520 + 0: 65283 + 5: 12 5,-1: - 0: 65535 + 0: 36863 + 5,-5: + 0: 62451 + 2: 3084 + 5,0: + 0: 40959 + 6,-4: + 2: 257 + 0: 4112 + 1: 17476 + 6,-3: + 3: 1 + 0: 4112 + 4: 256 + 1: 17476 6,-2: - 0: 65520 + 5: 1 + 0: 47872 + 1: 4 6,-1: + 0: 7103 + 6,-5: + 0: 4112 + 1: 17476 + 2: 257 + 6,0: 0: 65535 7,-2: - 0: 65520 + 0: 65280 7,-1: - 0: 65535 + 0: 8191 + 7,0: + 0: 13107 + 8,-2: + 0: 13056 + 8,-1: + 0: 819 -5,0: - 0: 52428 - -5,-3: - 0: 32768 - -5,-2: - 0: 51336 + 1: 17476 -5,-1: - 0: 52428 - 4,0: - 0: 65535 - 4,1: - 0: 65535 - 4,2: - 0: 65535 - 4,3: - 0: 65535 - 5,0: - 0: 65535 + 1: 17476 + -5,-2: + 1: 16384 5,1: - 0: 65535 + 0: 48051 5,2: - 0: 65535 + 0: 7103 5,3: - 0: 65535 - 6,0: - 0: 65535 + 0: 4095 6,1: - 0: 65535 + 0: 65525 6,2: - 0: 65535 + 0: 4095 6,3: - 0: 63351 - 7,0: - 0: 30583 - 7,1: - 0: 4375 - 7,2: - 0: 4369 - 7,3: - 0: 4096 - 8,-2: - 0: 30576 - 8,-1: - 0: 30583 - 4,4: - 0: 30583 - 4,5: - 0: 30583 - 4,6: - 0: 30583 - 4,7: - 0: 7 - -4,2: - 0: 26367 - -1,3: - 0: 15 - 2,1: - 0: 4369 - 1: 2 - -5,1: - 0: 52428 - -4,3: - 0: 26222 - -3,3: - 0: 15 - -2,3: - 0: 15 - -4,4: - 0: 238 + 0: 626 -3,4: - 0: 255 + 1: 240 -2,4: - 0: 255 - -1,4: - 0: 255 - -5,2: - 0: 204 - -3,2: - 0: 35071 - 0,-5: - 0: 28672 - -1,-5: + 1: 240 + 1,-7: + 1: 192 + 0: 32768 + 1,-6: + 0: 34952 + 2,-7: + 1: 240 0: 61440 - 2,-3: - 1: 12834 - 2,-4: - 1: 61166 - 3,-4: - 1: 13107 - 2,-5: - 1: 57344 - 3,-5: - 1: 12288 + 2,-6: + 0: 65535 + 3,-7: + 1: 240 + 0: 61440 + 3,-6: + 0: 65535 + 4,-7: + 1: 240 + 0: 62976 + 4,-6: + 0: 65535 + 5,-7: + 1: 240 + 0: 61440 + 5,-6: + 0: 62451 + 2: 3084 + 6,-7: + 1: 17520 + 0: 4096 + 6,-6: + 2: 257 + 0: 4112 + 1: 17476 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -357,6 +415,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -372,45 +445,102 @@ entities: - 0 - 0 - 0 - chunkSize: 4 - - type: GasTileOverlay - - type: BecomesStation - id: Dev - - type: SpreaderGrid - - type: GridPathfinding - - type: NavMap - - uid: 962 - components: - - type: MetaData - - type: Transform - - type: Map - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - - type: LoadedMap -- proto: AirAlarm - entities: - - uid: 800 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-4.5 - parent: 179 - - type: DeviceList - devices: - - 801 -- proto: AirCanister - entities: - - uid: 458 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 179 -- proto: Airlock - entities: - - uid: 48 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: BecomesStation + id: Dev + - type: SpreaderGrid + - type: GridPathfinding + - type: NavMap + - uid: 962 + components: + - type: MetaData + - type: Transform + - type: Map + mapPaused: True + - type: PhysicsMap + - type: GridTree + - type: MovedGrids + - type: Broadphase + - type: OccluderTree + - type: LoadedMap +- proto: AirAlarm + entities: + - uid: 800 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 179 + - type: DeviceList + devices: + - 801 + - uid: 1556 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-12.5 + parent: 179 +- proto: AirCanister + entities: + - uid: 1281 + components: + - type: Transform + pos: 12.5,-5.5 + parent: 179 + - uid: 1284 + components: + - type: Transform + pos: 13.5,-5.5 + parent: 179 +- proto: Airlock + entities: + - uid: 48 components: - type: Transform pos: 7.5,20.5 @@ -435,6 +565,32 @@ entities: - type: Transform pos: 6.5,28.5 parent: 179 +- proto: AirlockAtmospherics + entities: + - uid: 77 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-8.5 + parent: 179 + - uid: 678 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-9.5 + parent: 179 + - uid: 904 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-6.5 + parent: 179 + - uid: 995 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-6.5 + parent: 179 - proto: AirlockCargo entities: - uid: 87 @@ -481,16 +637,6 @@ entities: - type: Transform pos: 0.5,-14.5 parent: 179 - - uid: 255 - components: - - type: Transform - pos: 7.5,-8.5 - parent: 179 - - uid: 256 - components: - - type: Transform - pos: 5.5,-8.5 - parent: 179 - uid: 318 components: - type: Transform @@ -741,6 +887,23 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-13.5 parent: 179 +- proto: AmmoniaCanister + entities: + - uid: 250 + components: + - type: Transform + pos: 9.5,-1.5 + parent: 179 + - uid: 251 + components: + - type: Transform + pos: 10.5,-1.5 + parent: 179 + - uid: 1317 + components: + - type: Transform + pos: 24.5,-19.5 + parent: 179 - proto: AnomalyLocator entities: - uid: 1086 @@ -795,3114 +958,2622 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 179 -- proto: Autolathe - entities: - - uid: 1 + - uid: 1184 components: - type: Transform - pos: 12.5,21.5 + pos: 22.5,-16.5 parent: 179 - - uid: 94 + - uid: 1187 components: - type: Transform - pos: -4.5,-5.5 + pos: 22.5,-14.5 parent: 179 - - uid: 446 + - uid: 1200 components: - type: Transform - pos: -6.5,5.5 + pos: 22.5,-10.5 parent: 179 - - uid: 528 + - uid: 1201 components: - type: Transform - pos: -12.5,-7.5 + pos: 22.5,-12.5 parent: 179 - - uid: 531 + - uid: 1207 components: - type: Transform - pos: -13.5,-7.5 + pos: 22.5,-18.5 parent: 179 - - uid: 532 + - uid: 1220 components: - type: Transform - pos: -14.5,-7.5 + pos: 22.5,-8.5 parent: 179 -- proto: BaseUplinkRadioDebug - entities: - - uid: 732 + - uid: 1235 components: - type: Transform - pos: 0.6038008,7.5209107 + pos: 22.5,-20.5 parent: 179 -- proto: Basketball - entities: - - uid: 951 + - uid: 1238 components: - type: Transform - pos: -9.702013,9.68404 + pos: 22.5,-22.5 parent: 179 - - uid: 952 + - uid: 1260 components: - type: Transform - pos: -10.879096,9.579802 + rot: 3.141592653589793 rad + pos: 22.5,-24.5 parent: 179 -- proto: Beaker - entities: - - uid: 174 + - uid: 1335 components: - type: Transform - pos: 25.291822,10.667244 + rot: 3.141592653589793 rad + pos: 18.5,-25.5 parent: 179 - - uid: 175 + - uid: 1336 components: - type: Transform - pos: 24.541822,10.635994 + rot: 1.5707963267948966 rad + pos: 17.5,-25.5 parent: 179 - - uid: 176 + - uid: 1489 components: - type: Transform - pos: 26.416822,10.651619 + rot: -1.5707963267948966 rad + pos: 13.5,-12.5 parent: 179 - - uid: 324 + - uid: 1493 components: - type: Transform - pos: 4.718221,9.39097 + rot: -1.5707963267948966 rad + pos: 15.5,-14.5 parent: 179 - - uid: 735 + - uid: 1500 components: - type: Transform - pos: 4.739054,9.807927 + rot: -1.5707963267948966 rad + pos: 13.5,-16.5 parent: 179 - - uid: 920 + - uid: 1507 components: - type: Transform - pos: -4.293744,10.966518 + pos: 7.5,-19.5 parent: 179 - - uid: 950 + - uid: 1508 components: - type: Transform - pos: -4.293744,10.966518 + pos: 8.5,-19.5 parent: 179 -- proto: BikeHorn - entities: - - uid: 672 + - uid: 1509 components: - type: Transform - pos: 1.1246341,7.500063 + pos: 9.5,-19.5 parent: 179 -- proto: BlastDoor - entities: - - uid: 202 + - uid: 1510 components: - type: Transform - pos: -2.5,-14.5 + pos: 10.5,-19.5 parent: 179 - - uid: 697 + - uid: 1511 components: - type: Transform - pos: 1.5,-14.5 + pos: 11.5,-19.5 parent: 179 - - uid: 698 + - uid: 1512 components: - type: Transform - pos: 1.5,-16.5 + pos: 12.5,-19.5 parent: 179 - - uid: 984 + - uid: 1513 components: - type: Transform - pos: -2.5,-16.5 + pos: 13.5,-19.5 parent: 179 -- proto: BoozeDispenser - entities: - - uid: 752 + - uid: 1514 components: - type: Transform - pos: 7.5,12.5 + pos: 14.5,-19.5 parent: 179 -- proto: BoxBeaker - entities: - - uid: 280 + - uid: 1515 components: - type: Transform - pos: 5.163024,9.63072 + pos: 14.5,-20.5 parent: 179 -- proto: Brutepack - entities: - - uid: 150 + - uid: 1516 components: - type: Transform - pos: 18.601385,5.512907 + pos: 14.5,-21.5 parent: 179 - - uid: 151 + - uid: 1517 components: - type: Transform - pos: 18.476385,4.841032 + pos: 14.5,-22.5 parent: 179 -- proto: Bucket - entities: - - uid: 691 + - uid: 1518 components: - type: Transform - pos: 7.1447573,15.900927 + pos: 14.5,-23.5 parent: 179 -- proto: CableApcExtension - entities: - - uid: 15 + - uid: 1519 components: - type: Transform - pos: 5.5,15.5 + pos: 14.5,-24.5 parent: 179 - - uid: 23 +- proto: AtmosFixBlockerMarker + entities: + - uid: 1582 components: - type: Transform - pos: 3.5,15.5 + pos: 23.5,-13.5 parent: 179 - - uid: 58 + - uid: 1583 components: - type: Transform - pos: 8.5,15.5 + pos: 23.5,-15.5 parent: 179 - - uid: 90 + - uid: 1584 components: - type: Transform - pos: 4.5,15.5 + pos: 23.5,-17.5 parent: 179 - - uid: 281 + - uid: 1585 components: - type: Transform - pos: -13.5,4.5 + pos: 23.5,-19.5 parent: 179 - - uid: 389 + - uid: 1586 components: - type: Transform - pos: 7.5,15.5 + pos: 23.5,-21.5 parent: 179 - - uid: 453 + - uid: 1587 components: - type: Transform - pos: 6.5,15.5 + pos: 23.5,-23.5 parent: 179 - - uid: 736 + - uid: 1588 components: - type: Transform - pos: -2.5,9.5 + pos: 10.5,-14.5 parent: 179 - - uid: 760 + - uid: 1589 components: - type: Transform - pos: -2.5,10.5 + pos: 22.5,-13.5 parent: 179 - - uid: 761 + - uid: 1590 components: - type: Transform - pos: -15.5,5.5 + pos: 24.5,-13.5 parent: 179 - - uid: 763 + - uid: 1591 components: - type: Transform - pos: -2.5,11.5 + pos: 24.5,-15.5 parent: 179 - - uid: 764 + - uid: 1592 components: - type: Transform - pos: -1.5,11.5 + pos: 22.5,-15.5 parent: 179 - - uid: 765 + - uid: 1593 components: - type: Transform - pos: -7.5,0.5 + pos: 22.5,-17.5 parent: 179 - - uid: 766 + - uid: 1594 components: - type: Transform - pos: -0.5,11.5 + pos: 24.5,-17.5 parent: 179 - - uid: 767 + - uid: 1595 components: - type: Transform - pos: -3.5,10.5 + pos: 24.5,-19.5 parent: 179 - - uid: 768 + - uid: 1596 components: - type: Transform - pos: -4.5,10.5 + pos: 22.5,-19.5 parent: 179 - - uid: 769 + - uid: 1597 components: - type: Transform - pos: -5.5,10.5 + pos: 22.5,-21.5 parent: 179 - - uid: 770 + - uid: 1598 components: - type: Transform - pos: -6.5,10.5 + pos: 22.5,-23.5 parent: 179 - - uid: 771 + - uid: 1599 components: - type: Transform - pos: -2.5,8.5 + pos: 24.5,-23.5 parent: 179 - - uid: 772 + - uid: 1600 components: - type: Transform - pos: -2.5,7.5 + pos: 24.5,-21.5 parent: 179 - - uid: 773 + - uid: 1607 components: - type: Transform - pos: -2.5,6.5 + pos: 10.5,-15.5 parent: 179 - - uid: 774 + - uid: 1608 components: - type: Transform - pos: -2.5,5.5 + pos: 10.5,-13.5 parent: 179 - - uid: 775 + - uid: 1609 components: - type: Transform - pos: -3.5,5.5 + pos: 11.5,-13.5 parent: 179 - - uid: 776 + - uid: 1610 components: - type: Transform - pos: -4.5,5.5 + pos: 11.5,-15.5 parent: 179 - - uid: 777 +- proto: AtmosFixInstantPlasmaFireMarker + entities: + - uid: 1611 components: - type: Transform - pos: -5.5,5.5 + pos: 12.5,-15.5 parent: 179 - - uid: 778 + - uid: 1612 components: - type: Transform - pos: -6.5,5.5 + pos: 13.5,-15.5 parent: 179 - - uid: 779 + - uid: 1613 components: - type: Transform - pos: -6.5,4.5 + pos: 14.5,-15.5 parent: 179 - - uid: 780 + - uid: 1614 components: - type: Transform - pos: -7.5,4.5 + pos: 14.5,-14.5 parent: 179 - - uid: 781 + - uid: 1615 components: - type: Transform - pos: -8.5,4.5 + pos: 13.5,-14.5 parent: 179 - - uid: 782 + - uid: 1616 components: - type: Transform - pos: -9.5,4.5 + pos: 12.5,-14.5 parent: 179 - - uid: 783 + - uid: 1617 components: - type: Transform - pos: -10.5,4.5 + pos: 12.5,-13.5 parent: 179 - - uid: 784 + - uid: 1618 components: - type: Transform - pos: -11.5,4.5 + pos: 13.5,-13.5 parent: 179 - - uid: 785 + - uid: 1619 components: - type: Transform - pos: -12.5,4.5 + pos: 14.5,-13.5 parent: 179 - - uid: 786 +- proto: AtmosFixNitrogenMarker + entities: + - uid: 1579 components: - type: Transform - pos: -12.5,3.5 + pos: 23.5,-9.5 parent: 179 - - uid: 787 + - uid: 1603 components: - type: Transform - pos: -12.5,2.5 + pos: 22.5,-9.5 parent: 179 - - uid: 788 + - uid: 1604 components: - type: Transform - pos: -12.5,1.5 + pos: 24.5,-9.5 parent: 179 - - uid: 789 +- proto: AtmosFixOxygenMarker + entities: + - uid: 1580 components: - type: Transform - pos: -12.5,0.5 + pos: 23.5,-7.5 parent: 179 - - uid: 790 + - uid: 1605 components: - type: Transform - pos: -12.5,-0.5 + pos: 22.5,-7.5 parent: 179 - - uid: 791 + - uid: 1606 components: - type: Transform - pos: -2.5,4.5 + pos: 24.5,-7.5 parent: 179 - - uid: 792 +- proto: AtmosFixPlasmaMarker + entities: + - uid: 1581 components: - type: Transform - pos: -2.5,2.5 + pos: 23.5,-11.5 parent: 179 - - uid: 793 + - uid: 1601 components: - type: Transform - pos: -2.5,1.5 + pos: 22.5,-11.5 parent: 179 - - uid: 794 + - uid: 1602 components: - type: Transform - pos: -2.5,0.5 + pos: 24.5,-11.5 parent: 179 - - uid: 795 +- proto: Autolathe + entities: + - uid: 1 components: - type: Transform - pos: -2.5,3.5 + pos: 12.5,21.5 parent: 179 - - uid: 796 + - uid: 94 components: - type: Transform - pos: -2.5,-0.5 + pos: -4.5,-5.5 parent: 179 - - uid: 797 + - uid: 446 components: - type: Transform - pos: -2.5,-1.5 + pos: -6.5,5.5 parent: 179 - - uid: 798 + - uid: 528 components: - type: Transform - pos: -2.5,-2.5 + pos: -12.5,-7.5 parent: 179 - - uid: 799 + - uid: 531 components: - type: Transform - pos: -2.5,-3.5 + pos: -13.5,-7.5 parent: 179 - - uid: 802 + - uid: 532 components: - type: Transform - pos: -8.5,0.5 + pos: -14.5,-7.5 parent: 179 - - uid: 803 +- proto: BaseUplinkRadioDebug + entities: + - uid: 732 components: - type: Transform - pos: 2.5,-2.5 + pos: 0.6038008,7.5209107 parent: 179 - - uid: 804 +- proto: Basketball + entities: + - uid: 951 components: - type: Transform - pos: 2.5,-3.5 + pos: -9.702013,9.68404 parent: 179 - - uid: 805 + - uid: 952 components: - type: Transform - pos: -9.5,0.5 + pos: -10.879096,9.579802 parent: 179 - - uid: 806 +- proto: Beaker + entities: + - uid: 174 components: - type: Transform - pos: -10.5,0.5 + pos: 25.291822,10.667244 parent: 179 - - uid: 807 + - uid: 175 components: - type: Transform - pos: -14.5,0.5 + pos: 24.541822,10.635994 parent: 179 - - uid: 808 + - uid: 176 components: - type: Transform - pos: -11.5,0.5 + pos: 26.416822,10.651619 parent: 179 - - uid: 809 + - uid: 324 components: - type: Transform - pos: -15.5,0.5 + pos: 4.718221,9.39097 parent: 179 - - uid: 810 + - uid: 735 components: - type: Transform - pos: -15.5,0.5 + pos: 4.739054,9.807927 parent: 179 - - uid: 811 + - uid: 920 components: - type: Transform - pos: -16.5,0.5 + pos: -4.293744,10.966518 parent: 179 - - uid: 812 + - uid: 950 components: - type: Transform - pos: -16.5,5.5 + pos: -4.293744,10.966518 parent: 179 - - uid: 813 +- proto: BikeHorn + entities: + - uid: 672 components: - type: Transform - pos: -16.5,4.5 + pos: 1.1246341,7.500063 parent: 179 - - uid: 814 +- proto: BlastDoor + entities: + - uid: 202 components: - type: Transform - pos: -16.5,3.5 + pos: -2.5,-14.5 parent: 179 - - uid: 815 + - uid: 697 components: - type: Transform - pos: -16.5,2.5 + pos: 1.5,-14.5 parent: 179 - - uid: 816 + - uid: 698 components: - type: Transform - pos: -16.5,1.5 + pos: 1.5,-16.5 parent: 179 - - uid: 817 + - uid: 984 components: - type: Transform - pos: 7.5,5.5 + pos: -2.5,-16.5 parent: 179 - - uid: 818 + - uid: 1230 components: - type: Transform - pos: 7.5,7.5 + pos: 6.5,-20.5 parent: 179 - - uid: 819 + - uid: 1232 components: - type: Transform - pos: 7.5,8.5 + pos: 6.5,-17.5 parent: 179 - - uid: 820 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1233 components: - type: Transform - pos: 7.5,9.5 + pos: 6.5,-16.5 parent: 179 - - uid: 821 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1234 components: - type: Transform - pos: 8.5,9.5 + pos: 6.5,-15.5 parent: 179 - - uid: 822 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1385 components: - type: Transform - pos: 6.5,9.5 + pos: 11.5,-14.5 parent: 179 - - uid: 823 +- proto: BoozeDispenser + entities: + - uid: 752 components: - type: Transform - pos: 5.5,9.5 + pos: 7.5,12.5 parent: 179 - - uid: 824 +- proto: BoxBeaker + entities: + - uid: 280 components: - type: Transform - pos: 4.5,9.5 + pos: 5.163024,9.63072 parent: 179 - - uid: 825 +- proto: Brutepack + entities: + - uid: 150 components: - type: Transform - pos: 8.5,10.5 + pos: 18.601385,5.512907 parent: 179 - - uid: 826 + - uid: 151 components: - type: Transform - pos: 8.5,11.5 + pos: 18.476385,4.841032 parent: 179 - - uid: 827 +- proto: Bucket + entities: + - uid: 691 components: - type: Transform - pos: 8.5,12.5 + pos: 7.1447573,15.900927 parent: 179 - - uid: 828 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 1488 components: - type: Transform - pos: 7.5,12.5 + rot: 3.141592653589793 rad + pos: 14.5,-12.5 parent: 179 - - uid: 829 +- proto: CableApcExtension + entities: + - uid: 15 components: - type: Transform - pos: 7.5,11.5 + pos: 5.5,15.5 parent: 179 - - uid: 830 + - uid: 23 components: - type: Transform - pos: 2.5,-5.5 + pos: 3.5,15.5 parent: 179 - - uid: 831 + - uid: 58 components: - type: Transform - pos: 2.5,-4.5 + pos: 8.5,15.5 parent: 179 - - uid: 832 + - uid: 90 components: - type: Transform - pos: 1.5,-5.5 + pos: 4.5,15.5 parent: 179 - - uid: 833 + - uid: 281 components: - type: Transform - pos: 0.5,-5.5 + pos: -13.5,4.5 parent: 179 - - uid: 834 + - uid: 389 components: - type: Transform - pos: -0.5,-5.5 + pos: 7.5,15.5 parent: 179 - - uid: 835 + - uid: 453 components: - type: Transform - pos: -1.5,-5.5 + pos: 6.5,15.5 parent: 179 - - uid: 836 + - uid: 736 components: - type: Transform - pos: -2.5,-5.5 + pos: -2.5,9.5 parent: 179 - - uid: 837 + - uid: 760 components: - type: Transform - pos: -3.5,-5.5 + pos: -2.5,10.5 parent: 179 - - uid: 838 + - uid: 761 components: - type: Transform - pos: -4.5,-5.5 + pos: -15.5,5.5 parent: 179 - - uid: 839 + - uid: 763 components: - type: Transform - pos: 1.5,11.5 + pos: -2.5,11.5 parent: 179 - - uid: 840 + - uid: 764 components: - type: Transform - pos: 2.5,11.5 + pos: -1.5,11.5 parent: 179 - - uid: 841 + - uid: 765 components: - type: Transform - pos: 0.5,11.5 + pos: -7.5,0.5 parent: 179 - - uid: 842 + - uid: 766 components: - type: Transform - pos: 2.5,12.5 + pos: -0.5,11.5 parent: 179 - - uid: 843 + - uid: 767 components: - type: Transform - pos: 2.5,13.5 + pos: -3.5,10.5 parent: 179 - - uid: 844 + - uid: 768 components: - type: Transform - pos: 2.5,14.5 + pos: -4.5,10.5 parent: 179 - - uid: 845 + - uid: 769 components: - type: Transform - pos: 2.5,15.5 + pos: -5.5,10.5 parent: 179 - - uid: 853 + - uid: 770 components: - type: Transform - pos: -3.5,-3.5 + pos: -6.5,10.5 parent: 179 - - uid: 854 + - uid: 771 components: - type: Transform - pos: -4.5,-3.5 + pos: -2.5,8.5 parent: 179 - - uid: 855 + - uid: 772 components: - type: Transform - pos: -5.5,-3.5 + pos: -2.5,7.5 parent: 179 - - uid: 856 + - uid: 773 components: - type: Transform - pos: -6.5,-3.5 + pos: -2.5,6.5 parent: 179 - - uid: 857 + - uid: 774 components: - type: Transform - pos: -6.5,-2.5 + pos: -2.5,5.5 parent: 179 - - uid: 858 + - uid: 775 components: - type: Transform - pos: -6.5,-1.5 + pos: -3.5,5.5 parent: 179 - - uid: 859 + - uid: 776 components: - type: Transform - pos: -6.5,-0.5 + pos: -4.5,5.5 parent: 179 - - uid: 860 + - uid: 777 components: - type: Transform - pos: -6.5,0.5 + pos: -5.5,5.5 parent: 179 - - uid: 861 + - uid: 778 components: - type: Transform - pos: -6.5,1.5 + pos: -6.5,5.5 parent: 179 - - uid: 862 + - uid: 779 components: - type: Transform - pos: -6.5,2.5 + pos: -6.5,4.5 parent: 179 - - uid: 872 + - uid: 780 components: - type: Transform - pos: 7.5,6.5 + pos: -7.5,4.5 parent: 179 - - uid: 873 + - uid: 781 components: - type: Transform - pos: 8.5,21.5 + pos: -8.5,4.5 parent: 179 - - uid: 877 + - uid: 782 components: - type: Transform - pos: -6.5,3.5 + pos: -9.5,4.5 parent: 179 - - uid: 878 + - uid: 783 components: - type: Transform - pos: -2.5,-4.5 + pos: -10.5,4.5 parent: 179 - - uid: 879 + - uid: 784 components: - type: Transform - pos: -1.5,-4.5 + pos: -11.5,4.5 parent: 179 - - uid: 880 + - uid: 785 components: - type: Transform - pos: -0.5,-4.5 + pos: -12.5,4.5 parent: 179 - - uid: 881 + - uid: 786 components: - type: Transform - pos: 0.5,-4.5 + pos: -12.5,3.5 parent: 179 - - uid: 882 + - uid: 787 components: - type: Transform - pos: 1.5,-4.5 + pos: -12.5,2.5 parent: 179 - - uid: 883 + - uid: 788 components: - type: Transform - pos: 2.5,-4.5 + pos: -12.5,1.5 parent: 179 - - uid: 884 + - uid: 789 components: - type: Transform - pos: 3.5,-4.5 + pos: -12.5,0.5 parent: 179 - - uid: 885 + - uid: 790 components: - type: Transform - pos: 4.5,-4.5 + pos: -12.5,-0.5 parent: 179 - - uid: 886 + - uid: 791 components: - type: Transform - pos: 5.5,-4.5 + pos: -2.5,4.5 parent: 179 - - uid: 887 + - uid: 792 components: - type: Transform - pos: 6.5,-4.5 + pos: -2.5,2.5 parent: 179 - - uid: 888 + - uid: 793 components: - type: Transform - pos: 7.5,-4.5 + pos: -2.5,1.5 parent: 179 - - uid: 889 + - uid: 794 components: - type: Transform - pos: 8.5,-4.5 + pos: -2.5,0.5 parent: 179 - - uid: 890 + - uid: 795 components: - type: Transform - pos: 8.5,-3.5 + pos: -2.5,3.5 parent: 179 - - uid: 891 + - uid: 796 components: - type: Transform - pos: 8.5,-2.5 + pos: -2.5,-0.5 parent: 179 - - uid: 892 + - uid: 797 components: - type: Transform - pos: 8.5,-1.5 + pos: -2.5,-1.5 parent: 179 - - uid: 893 + - uid: 798 components: - type: Transform - pos: 8.5,-0.5 + pos: -2.5,-2.5 parent: 179 - - uid: 894 + - uid: 799 components: - type: Transform - pos: 8.5,0.5 + pos: -2.5,-3.5 parent: 179 - - uid: 895 + - uid: 802 components: - type: Transform - pos: 8.5,1.5 + pos: -8.5,0.5 parent: 179 - - uid: 896 + - uid: 803 components: - type: Transform - pos: 8.5,2.5 + pos: 2.5,-2.5 parent: 179 - - uid: 897 + - uid: 804 components: - type: Transform - pos: 8.5,3.5 + pos: 2.5,-3.5 parent: 179 - - uid: 898 + - uid: 805 components: - type: Transform - pos: 8.5,4.5 + pos: -9.5,0.5 parent: 179 - - uid: 899 + - uid: 806 components: - type: Transform - pos: 8.5,5.5 + pos: -10.5,0.5 parent: 179 - - uid: 900 + - uid: 807 components: - type: Transform - pos: -14.5,5.5 + pos: -14.5,0.5 parent: 179 - - uid: 905 + - uid: 808 components: - type: Transform - pos: -12.5,5.5 + pos: -11.5,0.5 parent: 179 - - uid: 906 + - uid: 809 components: - type: Transform - pos: -14.5,4.5 + pos: -15.5,0.5 parent: 179 - - uid: 908 + - uid: 810 components: - type: Transform - pos: -15.5,4.5 + pos: -15.5,0.5 parent: 179 - - uid: 909 + - uid: 811 components: - type: Transform - pos: 8.5,20.5 + pos: -16.5,0.5 parent: 179 - - uid: 970 + - uid: 812 components: - type: Transform - pos: 9.5,12.5 + pos: -16.5,5.5 parent: 179 - - uid: 971 + - uid: 813 components: - type: Transform - pos: 10.5,12.5 + pos: -16.5,4.5 parent: 179 - - uid: 972 + - uid: 814 components: - type: Transform - pos: 11.5,12.5 + pos: -16.5,3.5 parent: 179 - - uid: 973 + - uid: 815 components: - type: Transform - pos: 12.5,12.5 + pos: -16.5,2.5 parent: 179 - - uid: 974 + - uid: 816 components: - type: Transform - pos: 13.5,12.5 + pos: -16.5,1.5 parent: 179 - - uid: 1026 + - uid: 817 components: - type: Transform - pos: -5.5,-14.5 + pos: 7.5,5.5 parent: 179 - - uid: 1027 + - uid: 818 components: - type: Transform - pos: -5.5,-13.5 + pos: 7.5,7.5 parent: 179 - - uid: 1028 + - uid: 819 components: - type: Transform - pos: -5.5,-12.5 + pos: 7.5,8.5 parent: 179 - - uid: 1029 + - uid: 820 components: - type: Transform - pos: -4.5,-12.5 + pos: 7.5,9.5 parent: 179 - - uid: 1030 + - uid: 821 components: - type: Transform - pos: -3.5,-12.5 + pos: 8.5,9.5 parent: 179 - - uid: 1031 + - uid: 822 components: - type: Transform - pos: -2.5,-12.5 + pos: 6.5,9.5 parent: 179 - - uid: 1032 + - uid: 823 components: - type: Transform - pos: -1.5,-12.5 + pos: 5.5,9.5 parent: 179 - - uid: 1033 + - uid: 824 components: - type: Transform - pos: -0.5,-12.5 + pos: 4.5,9.5 parent: 179 - - uid: 1034 + - uid: 825 components: - type: Transform - pos: 0.5,-12.5 + pos: 8.5,10.5 parent: 179 - - uid: 1035 + - uid: 826 components: - type: Transform - pos: 1.5,-12.5 + pos: 8.5,11.5 parent: 179 - - uid: 1036 + - uid: 827 components: - type: Transform - pos: 2.5,-12.5 + pos: 8.5,12.5 parent: 179 - - uid: 1037 + - uid: 828 components: - type: Transform - pos: 3.5,-12.5 + pos: 7.5,12.5 parent: 179 - - uid: 1038 + - uid: 829 components: - type: Transform - pos: 0.5,-13.5 + pos: 7.5,11.5 parent: 179 - - uid: 1039 + - uid: 830 components: - type: Transform - pos: 0.5,-14.5 + pos: 2.5,-5.5 parent: 179 - - uid: 1040 + - uid: 831 components: - type: Transform - pos: 0.5,-15.5 + pos: 2.5,-4.5 parent: 179 - - uid: 1041 + - uid: 832 components: - type: Transform - pos: -1.5,-13.5 + pos: 1.5,-5.5 parent: 179 - - uid: 1042 + - uid: 833 components: - type: Transform - pos: -1.5,-14.5 + pos: 0.5,-5.5 parent: 179 - - uid: 1043 + - uid: 834 components: - type: Transform - pos: -1.5,-15.5 + pos: -0.5,-5.5 parent: 179 - - uid: 1044 + - uid: 835 components: - type: Transform - pos: 4.5,-12.5 + pos: -1.5,-5.5 parent: 179 - - uid: 1045 + - uid: 836 components: - type: Transform - pos: 4.5,-13.5 + pos: -2.5,-5.5 parent: 179 - - uid: 1051 + - uid: 837 components: - type: Transform - pos: 9.5,15.5 + pos: -3.5,-5.5 parent: 179 - - uid: 1052 + - uid: 838 components: - type: Transform - pos: 9.5,16.5 + pos: -4.5,-5.5 parent: 179 - - uid: 1053 + - uid: 839 components: - type: Transform - pos: 9.5,17.5 + pos: 1.5,11.5 parent: 179 - - uid: 1054 + - uid: 840 components: - type: Transform - pos: 9.5,18.5 + pos: 2.5,11.5 parent: 179 - - uid: 1055 + - uid: 841 components: - type: Transform - pos: 9.5,19.5 + pos: 0.5,11.5 parent: 179 - - uid: 1056 + - uid: 842 components: - type: Transform - pos: 9.5,20.5 + pos: 2.5,12.5 parent: 179 - - uid: 1057 + - uid: 843 components: - type: Transform - pos: 10.5,20.5 + pos: 2.5,13.5 parent: 179 - - uid: 1058 + - uid: 844 components: - type: Transform - pos: 11.5,20.5 + pos: 2.5,14.5 parent: 179 - - uid: 1059 + - uid: 845 components: - type: Transform - pos: 12.5,20.5 + pos: 2.5,15.5 parent: 179 - - uid: 1060 + - uid: 853 components: - type: Transform - pos: 13.5,20.5 + pos: -3.5,-3.5 parent: 179 - - uid: 1061 + - uid: 854 components: - type: Transform - pos: 14.5,20.5 + pos: -4.5,-3.5 parent: 179 - - uid: 1062 + - uid: 855 components: - type: Transform - pos: 15.5,20.5 + pos: -5.5,-3.5 parent: 179 - - uid: 1063 + - uid: 856 components: - type: Transform - pos: 16.5,20.5 + pos: -6.5,-3.5 parent: 179 - - uid: 1064 + - uid: 857 components: - type: Transform - pos: 16.5,21.5 + pos: -6.5,-2.5 parent: 179 - - uid: 1065 + - uid: 858 components: - type: Transform - pos: 16.5,22.5 + pos: -6.5,-1.5 parent: 179 - - uid: 1066 + - uid: 859 components: - type: Transform - pos: 16.5,23.5 + pos: -6.5,-0.5 parent: 179 - - uid: 1067 + - uid: 860 components: - type: Transform - pos: 16.5,24.5 + pos: -6.5,0.5 parent: 179 - - uid: 1068 + - uid: 861 components: - type: Transform - pos: 16.5,25.5 + pos: -6.5,1.5 parent: 179 - - uid: 1069 + - uid: 862 components: - type: Transform - pos: 16.5,26.5 + pos: -6.5,2.5 parent: 179 - - uid: 1070 + - uid: 872 components: - type: Transform - pos: 16.5,27.5 + pos: 7.5,6.5 parent: 179 - - uid: 1079 + - uid: 873 components: - type: Transform - pos: 15.5,24.5 + pos: 8.5,21.5 parent: 179 - - uid: 1080 + - uid: 877 components: - type: Transform - pos: 14.5,24.5 + pos: -6.5,3.5 parent: 179 - - uid: 1081 + - uid: 878 components: - type: Transform - pos: 13.5,24.5 + pos: -2.5,-4.5 parent: 179 - - uid: 1082 + - uid: 879 components: - type: Transform - pos: 12.5,24.5 + pos: -1.5,-4.5 parent: 179 - - uid: 1097 + - uid: 880 components: - type: Transform - pos: 8.5,14.5 + pos: -0.5,-4.5 parent: 179 - - uid: 1098 + - uid: 881 components: - type: Transform - pos: 8.5,13.5 + pos: 0.5,-4.5 parent: 179 - - uid: 1099 + - uid: 882 components: - type: Transform - pos: 9.5,13.5 + pos: 1.5,-4.5 parent: 179 - - uid: 1100 + - uid: 883 components: - type: Transform - pos: 10.5,13.5 + pos: 2.5,-4.5 parent: 179 - - uid: 1101 + - uid: 884 components: - type: Transform - pos: 11.5,13.5 + pos: 3.5,-4.5 parent: 179 - - uid: 1102 + - uid: 885 components: - type: Transform - pos: 12.5,13.5 + pos: 4.5,-4.5 parent: 179 - - uid: 1103 + - uid: 886 components: - type: Transform - pos: 13.5,13.5 + pos: 5.5,-4.5 parent: 179 - - uid: 1104 + - uid: 887 components: - type: Transform - pos: 14.5,13.5 + pos: 6.5,-4.5 parent: 179 - - uid: 1105 + - uid: 888 components: - type: Transform - pos: 15.5,13.5 + pos: 7.5,-4.5 parent: 179 - - uid: 1106 + - uid: 889 components: - type: Transform - pos: 16.5,13.5 + pos: 8.5,-4.5 parent: 179 - - uid: 1107 + - uid: 890 components: - type: Transform - pos: 17.5,13.5 + pos: 8.5,-3.5 parent: 179 - - uid: 1108 + - uid: 891 components: - type: Transform - pos: 18.5,13.5 + pos: 8.5,-2.5 parent: 179 - - uid: 1109 + - uid: 892 components: - type: Transform - pos: 19.5,13.5 + pos: 8.5,-1.5 parent: 179 - - uid: 1110 + - uid: 893 components: - type: Transform - pos: 20.5,13.5 + pos: 8.5,-0.5 parent: 179 - - uid: 1111 + - uid: 894 components: - type: Transform - pos: 21.5,13.5 + pos: 8.5,0.5 parent: 179 - - uid: 1112 + - uid: 895 components: - type: Transform - pos: 22.5,13.5 + pos: 8.5,1.5 parent: 179 - - uid: 1113 + - uid: 896 components: - type: Transform - pos: 23.5,13.5 + pos: 8.5,2.5 parent: 179 - - uid: 1114 + - uid: 897 components: - type: Transform - pos: 24.5,13.5 + pos: 8.5,3.5 parent: 179 - - uid: 1115 + - uid: 898 components: - type: Transform - pos: 25.5,13.5 + pos: 8.5,4.5 parent: 179 - - uid: 1116 + - uid: 899 components: - type: Transform - pos: 16.5,12.5 + pos: 8.5,5.5 parent: 179 - - uid: 1117 + - uid: 900 components: - type: Transform - pos: 16.5,11.5 + pos: -14.5,5.5 parent: 179 - - uid: 1118 + - uid: 905 components: - type: Transform - pos: 16.5,10.5 + pos: -12.5,5.5 parent: 179 - - uid: 1119 + - uid: 906 components: - type: Transform - pos: 16.5,9.5 + pos: -14.5,4.5 parent: 179 - - uid: 1120 + - uid: 908 components: - type: Transform - pos: 16.5,8.5 + pos: -15.5,4.5 parent: 179 - - uid: 1121 + - uid: 909 components: - type: Transform - pos: 16.5,7.5 + pos: 8.5,20.5 parent: 179 - - uid: 1122 + - uid: 970 components: - type: Transform - pos: 16.5,6.5 + pos: 9.5,12.5 parent: 179 - - uid: 1123 + - uid: 971 components: - type: Transform - pos: 16.5,5.5 + pos: 10.5,12.5 parent: 179 - - uid: 1124 + - uid: 972 components: - type: Transform - pos: 16.5,4.5 + pos: 11.5,12.5 parent: 179 - - uid: 1125 + - uid: 973 components: - type: Transform - pos: 16.5,3.5 + pos: 12.5,12.5 parent: 179 - - uid: 1126 + - uid: 974 components: - type: Transform - pos: 16.5,2.5 + pos: 13.5,12.5 parent: 179 - - uid: 1127 + - uid: 1026 components: - type: Transform - pos: 16.5,1.5 + pos: -5.5,-14.5 parent: 179 - - uid: 1128 + - uid: 1027 components: - type: Transform - pos: 16.5,0.5 + pos: -5.5,-13.5 parent: 179 - - uid: 1129 + - uid: 1028 components: - type: Transform - pos: 16.5,-0.5 + pos: -5.5,-12.5 parent: 179 - - uid: 1130 + - uid: 1029 components: - type: Transform - pos: 16.5,-1.5 + pos: -4.5,-12.5 parent: 179 - - uid: 1131 + - uid: 1030 components: - type: Transform - pos: 16.5,-2.5 + pos: -3.5,-12.5 parent: 179 - - uid: 1132 + - uid: 1031 components: - type: Transform - pos: 16.5,-3.5 + pos: -2.5,-12.5 parent: 179 - - uid: 1133 + - uid: 1032 components: - type: Transform - pos: 17.5,-3.5 + pos: -1.5,-12.5 parent: 179 - - uid: 1134 + - uid: 1033 components: - type: Transform - pos: 18.5,-3.5 + pos: -0.5,-12.5 parent: 179 - - uid: 1135 + - uid: 1034 components: - type: Transform - pos: 19.5,-3.5 + pos: 0.5,-12.5 parent: 179 - - uid: 1136 + - uid: 1035 components: - type: Transform - pos: 20.5,-3.5 + pos: 1.5,-12.5 parent: 179 - - uid: 1137 + - uid: 1036 components: - type: Transform - pos: 21.5,-3.5 + pos: 2.5,-12.5 parent: 179 - - uid: 1138 + - uid: 1037 components: - type: Transform - pos: 22.5,-3.5 + pos: 3.5,-12.5 parent: 179 - - uid: 1139 + - uid: 1038 components: - type: Transform - pos: 23.5,-3.5 + pos: 0.5,-13.5 parent: 179 - - uid: 1140 + - uid: 1039 components: - type: Transform - pos: 24.5,-3.5 + pos: 0.5,-14.5 parent: 179 - - uid: 1141 + - uid: 1040 components: - type: Transform - pos: 25.5,-3.5 + pos: 0.5,-15.5 parent: 179 - - uid: 1142 + - uid: 1041 components: - type: Transform - pos: 26.5,-3.5 + pos: -1.5,-13.5 parent: 179 - - uid: 1143 + - uid: 1042 components: - type: Transform - pos: 27.5,-3.5 + pos: -1.5,-14.5 parent: 179 - - uid: 1144 + - uid: 1043 components: - type: Transform - pos: 28.5,-3.5 + pos: -1.5,-15.5 parent: 179 - - uid: 1145 + - uid: 1044 components: - type: Transform - pos: 17.5,2.5 + pos: 4.5,-12.5 parent: 179 - - uid: 1146 + - uid: 1045 components: - type: Transform - pos: 18.5,2.5 + pos: 4.5,-13.5 parent: 179 - - uid: 1147 + - uid: 1051 components: - type: Transform - pos: 19.5,2.5 + pos: 9.5,15.5 parent: 179 - - uid: 1148 + - uid: 1052 components: - type: Transform - pos: 20.5,2.5 + pos: 9.5,16.5 parent: 179 - - uid: 1149 + - uid: 1053 components: - type: Transform - pos: 21.5,2.5 + pos: 9.5,17.5 parent: 179 - - uid: 1150 + - uid: 1054 components: - type: Transform - pos: 22.5,2.5 + pos: 9.5,18.5 parent: 179 - - uid: 1151 + - uid: 1055 components: - type: Transform - pos: 23.5,2.5 + pos: 9.5,19.5 parent: 179 - - uid: 1152 + - uid: 1056 components: - type: Transform - pos: 24.5,2.5 + pos: 9.5,20.5 parent: 179 - - uid: 1153 + - uid: 1057 components: - type: Transform - pos: 25.5,2.5 + pos: 10.5,20.5 parent: 179 - - uid: 1154 + - uid: 1058 components: - type: Transform - pos: 26.5,2.5 + pos: 11.5,20.5 parent: 179 - - uid: 1155 + - uid: 1059 components: - type: Transform - pos: 27.5,2.5 + pos: 12.5,20.5 parent: 179 - - uid: 1156 + - uid: 1060 components: - type: Transform - pos: 28.5,2.5 + pos: 13.5,20.5 parent: 179 - - uid: 1157 + - uid: 1061 components: - type: Transform - pos: 26.5,3.5 + pos: 14.5,20.5 parent: 179 - - uid: 1158 + - uid: 1062 components: - type: Transform - pos: 26.5,4.5 + pos: 15.5,20.5 parent: 179 - - uid: 1159 + - uid: 1063 components: - type: Transform - pos: 26.5,5.5 + pos: 16.5,20.5 parent: 179 - - uid: 1160 + - uid: 1064 components: - type: Transform - pos: 26.5,6.5 + pos: 16.5,21.5 parent: 179 - - uid: 1161 + - uid: 1065 components: - type: Transform - pos: 26.5,7.5 + pos: 16.5,22.5 parent: 179 - - uid: 1162 + - uid: 1066 components: - type: Transform - pos: 26.5,8.5 + pos: 16.5,23.5 parent: 179 - - uid: 1163 + - uid: 1067 components: - type: Transform - pos: 26.5,9.5 + pos: 16.5,24.5 parent: 179 - - uid: 1164 + - uid: 1068 components: - type: Transform - pos: 25.5,9.5 + pos: 16.5,25.5 parent: 179 - - uid: 1165 + - uid: 1069 components: - type: Transform - pos: 24.5,9.5 + pos: 16.5,26.5 parent: 179 - - uid: 1166 + - uid: 1070 components: - type: Transform - pos: 16.5,19.5 + pos: 16.5,27.5 parent: 179 - - uid: 1167 + - uid: 1079 components: - type: Transform - pos: 16.5,18.5 + pos: 15.5,24.5 parent: 179 - - uid: 1168 + - uid: 1080 components: - type: Transform - pos: 16.5,17.5 + pos: 14.5,24.5 parent: 179 - - uid: 1169 + - uid: 1081 components: - type: Transform - pos: 16.5,16.5 + pos: 13.5,24.5 parent: 179 - - uid: 1170 + - uid: 1082 components: - type: Transform - pos: 16.5,15.5 + pos: 12.5,24.5 parent: 179 - - uid: 1171 + - uid: 1097 components: - type: Transform - pos: 16.5,14.5 + pos: 8.5,14.5 parent: 179 - - uid: 1177 + - uid: 1098 components: - type: Transform - pos: 8.5,22.5 + pos: 8.5,13.5 parent: 179 - - uid: 1178 + - uid: 1099 components: - type: Transform - pos: 8.5,23.5 + pos: 9.5,13.5 parent: 179 - - uid: 1179 + - uid: 1100 components: - type: Transform - pos: 8.5,24.5 + pos: 10.5,13.5 parent: 179 - - uid: 1180 + - uid: 1101 components: - type: Transform - pos: 8.5,25.5 + pos: 11.5,13.5 parent: 179 -- proto: CableApcStack - entities: - - uid: 70 + - uid: 1102 components: - type: Transform - pos: 10.577456,21.424059 + pos: 12.5,13.5 parent: 179 - - uid: 183 + - uid: 1103 components: - type: Transform - pos: -6.6863613,7.351646 + pos: 13.5,13.5 parent: 179 - - uid: 351 + - uid: 1104 components: - type: Transform - pos: 10.561831,21.767809 + pos: 14.5,13.5 parent: 179 - - uid: 537 + - uid: 1105 components: - type: Transform - pos: -15.5,-0.5 + pos: 15.5,13.5 parent: 179 - - uid: 538 + - uid: 1106 components: - type: Transform - pos: -15.5,-0.5 + pos: 16.5,13.5 parent: 179 -- proto: CableHV - entities: - - uid: 1019 + - uid: 1107 components: - type: Transform - pos: -6.5,-13.5 + pos: 17.5,13.5 parent: 179 - - uid: 1020 + - uid: 1108 components: - type: Transform - pos: -6.5,-12.5 + pos: 18.5,13.5 parent: 179 - - uid: 1021 + - uid: 1109 components: - type: Transform - pos: -6.5,-11.5 + pos: 19.5,13.5 parent: 179 -- proto: CableHVStack - entities: - - uid: 184 + - uid: 1110 components: - type: Transform - pos: -6.665528,7.840053 + pos: 20.5,13.5 parent: 179 -- proto: CableMV - entities: - - uid: 1023 + - uid: 1111 components: - type: Transform - pos: -6.5,-13.5 + pos: 21.5,13.5 parent: 179 - - uid: 1024 + - uid: 1112 components: - type: Transform - pos: -5.5,-13.5 + pos: 22.5,13.5 parent: 179 - - uid: 1025 + - uid: 1113 components: - type: Transform - pos: -5.5,-14.5 + pos: 23.5,13.5 parent: 179 -- proto: CableMVStack - entities: - - uid: 325 + - uid: 1114 components: - type: Transform - pos: -6.665528,7.5601244 + pos: 24.5,13.5 parent: 179 -- proto: CableTerminal - entities: - - uid: 1022 + - uid: 1115 components: - type: Transform - pos: -6.5,-11.5 + pos: 25.5,13.5 parent: 179 -- proto: CapacitorStockPart - entities: - - uid: 296 + - uid: 1116 components: - type: Transform - pos: -4.3012447,8.817795 + pos: 16.5,12.5 parent: 179 - - uid: 700 + - uid: 1117 components: - type: Transform - pos: -3.8324947,8.786524 + pos: 16.5,11.5 parent: 179 - - uid: 701 + - uid: 1118 components: - type: Transform - pos: -3.2804112,8.786524 + pos: 16.5,10.5 parent: 179 - - uid: 704 + - uid: 1119 components: - type: Transform - pos: -4.8741612,8.817795 + pos: 16.5,9.5 parent: 179 -- proto: CaptainIDCard - entities: - - uid: 726 + - uid: 1120 components: - type: Transform - pos: 1.0820513,8.752605 + pos: 16.5,8.5 parent: 179 -- proto: CaptainSabre - entities: - - uid: 381 + - uid: 1121 components: - type: Transform - pos: -3.277628,-2.15838 + pos: 16.5,7.5 parent: 179 -- proto: Catwalk - entities: - - uid: 2 + - uid: 1122 components: - type: Transform - pos: 13.5,24.5 + pos: 16.5,6.5 parent: 179 - - uid: 7 + - uid: 1123 components: - type: Transform - pos: 6.5,24.5 + pos: 16.5,5.5 parent: 179 - - uid: 20 + - uid: 1124 components: - type: Transform - pos: 6.5,20.5 + pos: 16.5,4.5 parent: 179 - - uid: 120 + - uid: 1125 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,18.5 + pos: 16.5,3.5 parent: 179 - - uid: 246 + - uid: 1126 components: - type: Transform - pos: -6.5,-6.5 + pos: 16.5,2.5 parent: 179 - - uid: 247 + - uid: 1127 components: - type: Transform - pos: -8.5,-6.5 + pos: 16.5,1.5 parent: 179 - - uid: 252 + - uid: 1128 components: - type: Transform - pos: 4.5,-8.5 + pos: 16.5,0.5 parent: 179 - - uid: 269 + - uid: 1129 components: - type: Transform - pos: 12.5,10.5 + pos: 16.5,-0.5 parent: 179 - - uid: 286 + - uid: 1130 components: - type: Transform - pos: 2.5,-11.5 + pos: 16.5,-1.5 parent: 179 - - uid: 287 + - uid: 1131 components: - type: Transform - pos: -4.5,-11.5 + pos: 16.5,-2.5 parent: 179 - - uid: 308 + - uid: 1132 components: - type: Transform - pos: -2.5,-12.5 + pos: 16.5,-3.5 parent: 179 - - uid: 309 + - uid: 1133 components: - type: Transform - pos: 1.5,-12.5 + pos: 17.5,-3.5 parent: 179 - - uid: 333 + - uid: 1134 components: - type: Transform - pos: 4.5,-13.5 + pos: 18.5,-3.5 parent: 179 - - uid: 334 + - uid: 1135 components: - type: Transform - pos: -5.5,-13.5 + pos: 19.5,-3.5 parent: 179 - - uid: 345 + - uid: 1136 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,0.5 + pos: 20.5,-3.5 parent: 179 - - uid: 346 + - uid: 1137 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,1.5 + pos: 21.5,-3.5 parent: 179 - - uid: 347 + - uid: 1138 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,2.5 + pos: 22.5,-3.5 parent: 179 - - uid: 348 + - uid: 1139 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,3.5 + pos: 23.5,-3.5 parent: 179 - - uid: 349 + - uid: 1140 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,4.5 + pos: 24.5,-3.5 parent: 179 - - uid: 403 + - uid: 1141 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-0.5 + pos: 25.5,-3.5 parent: 179 - - uid: 404 + - uid: 1142 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-1.5 + pos: 26.5,-3.5 parent: 179 - - uid: 405 + - uid: 1143 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-2.5 + pos: 27.5,-3.5 parent: 179 - - uid: 406 + - uid: 1144 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-3.5 + pos: 28.5,-3.5 parent: 179 - - uid: 407 + - uid: 1145 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-4.5 + pos: 17.5,2.5 parent: 179 - - uid: 408 + - uid: 1146 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-5.5 + pos: 18.5,2.5 parent: 179 - - uid: 409 + - uid: 1147 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-6.5 + pos: 19.5,2.5 parent: 179 - - uid: 410 + - uid: 1148 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-7.5 + pos: 20.5,2.5 parent: 179 - - uid: 411 + - uid: 1149 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-8.5 + pos: 21.5,2.5 parent: 179 - - uid: 412 + - uid: 1150 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-9.5 + pos: 22.5,2.5 parent: 179 - - uid: 413 + - uid: 1151 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-10.5 + pos: 23.5,2.5 parent: 179 - - uid: 414 + - uid: 1152 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-11.5 + pos: 24.5,2.5 parent: 179 - - uid: 415 + - uid: 1153 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 8.5,-8.5 + pos: 25.5,2.5 parent: 179 - - uid: 438 + - uid: 1154 components: - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-0.5 + pos: 26.5,2.5 parent: 179 - - uid: 442 + - uid: 1155 components: - type: Transform - pos: -9.5,8.5 + pos: 27.5,2.5 parent: 179 - - uid: 514 + - uid: 1156 components: - type: Transform - pos: -10.5,8.5 + pos: 28.5,2.5 parent: 179 - - uid: 541 + - uid: 1157 components: - type: Transform - pos: -11.5,-6.5 + pos: 26.5,3.5 parent: 179 - - uid: 542 + - uid: 1158 components: - type: Transform - pos: -9.5,-6.5 + pos: 26.5,4.5 parent: 179 - - uid: 695 + - uid: 1159 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,8.5 + pos: 26.5,5.5 parent: 179 -- proto: Chair - entities: - - uid: 580 + - uid: 1160 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,6.5 + pos: 26.5,6.5 parent: 179 - - uid: 581 + - uid: 1161 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,8.5 + pos: 26.5,7.5 parent: 179 - - uid: 582 + - uid: 1162 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,7.5 + pos: 26.5,8.5 parent: 179 -- proto: ChairOfficeDark - entities: - - uid: 380 + - uid: 1163 components: - type: Transform - rot: 3.1415926535897967 rad - pos: 0.5,-6.5 + pos: 26.5,9.5 parent: 179 -- proto: ChairOfficeLight - entities: - - uid: 576 + - uid: 1164 components: - type: Transform - rot: 4.71238898038469 rad - pos: 19.5,4.5 + pos: 25.5,9.5 parent: 179 - - uid: 577 + - uid: 1165 components: - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,5.5 + pos: 24.5,9.5 parent: 179 - - uid: 578 + - uid: 1166 components: - type: Transform - rot: 4.71238898038469 rad - pos: 23.5,8.5 + pos: 16.5,19.5 parent: 179 - - uid: 579 + - uid: 1167 components: - type: Transform - pos: 24.5,5.5 + pos: 16.5,18.5 parent: 179 -- proto: ChemDispenser - entities: - - uid: 583 + - uid: 1168 components: - type: Transform - pos: 23.5,9.5 + pos: 16.5,17.5 parent: 179 - - type: ContainerContainer - containers: - ReagentDispenser-beaker: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - beakerSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 750 + - uid: 1169 components: - type: Transform - pos: 7.5,11.5 + pos: 16.5,16.5 parent: 179 -- proto: ChemicalPayload - entities: - - uid: 432 + - uid: 1170 components: - type: Transform - pos: 6.4651074,9.828774 + pos: 16.5,15.5 parent: 179 -- proto: ChemMaster - entities: - - uid: 311 + - uid: 1171 components: - type: Transform - pos: 8.5,11.5 + pos: 16.5,14.5 parent: 179 -- proto: ChemMasterMachineCircuitboard - entities: - - uid: 718 + - uid: 1177 components: - type: Transform - pos: -4.5458,10.514079 + pos: 8.5,22.5 parent: 179 -- proto: CircuitImprinter - entities: - - uid: 332 + - uid: 1178 components: - type: Transform - pos: -6.5,4.5 + pos: 8.5,23.5 parent: 179 -- proto: ClosetEmergencyFilledRandom - entities: - - uid: 319 + - uid: 1179 components: - type: Transform - pos: 1.5,-10.5 + pos: 8.5,24.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 322 + - uid: 1180 components: - type: Transform - pos: 0.5,-10.5 + pos: 8.5,25.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: ClosetToolFilled - entities: - - uid: 524 + - uid: 1277 components: - type: Transform - pos: -11.5,-5.5 + pos: 4.5,-10.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 525 + - uid: 1282 components: - type: Transform - pos: -11.5,-4.5 + pos: 4.5,-11.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 526 + - uid: 1289 components: - type: Transform - pos: -11.5,-3.5 + pos: 5.5,-9.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 527 + - uid: 1292 components: - type: Transform - pos: -11.5,-2.5 + pos: 4.5,-9.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: ClothingBeltUtilityFilled - entities: - - uid: 427 + - uid: 1348 components: - type: Transform - pos: -1.895102,-10.33495 + pos: 6.5,-9.5 parent: 179 - - uid: 428 + - uid: 1349 components: - type: Transform - pos: -1.770102,-10.63182 + pos: 7.5,-9.5 parent: 179 -- proto: ClothingHandsGlovesColorYellow - entities: - - uid: 454 + - uid: 1350 components: - type: Transform - pos: -0.78741443,4.322194 + pos: 9.5,-9.5 parent: 179 -- proto: ClothingHeadHatWelding - entities: - - uid: 344 + - uid: 1351 components: - type: Transform - pos: 0.7198646,4.374314 + pos: 10.5,-9.5 parent: 179 -- proto: ClothingMaskBreath - entities: - - uid: 955 + - uid: 1352 components: - type: Transform - pos: -10.595239,6.1907988 + pos: 11.5,-9.5 parent: 179 -- proto: ClothingMaskGas - entities: - - uid: 425 + - uid: 1353 components: - type: Transform - pos: -0.2880585,-10.69432 + pos: 12.5,-9.5 parent: 179 -- proto: ClothingOuterHardsuitAtmos - entities: - - uid: 270 + - uid: 1354 components: - type: Transform - pos: -10.5426235,5.472399 + pos: 13.5,-9.5 parent: 179 -- proto: ClothingOuterVest - entities: - - uid: 426 + - uid: 1355 components: - type: Transform - pos: -0.9130585,-10.66307 + pos: 14.5,-9.5 parent: 179 -- proto: ClothingShoesBootsMag - entities: - - uid: 725 + - uid: 1356 components: - type: Transform - pos: 0.47880077,8.073378 + pos: 15.5,-9.5 parent: 179 -- proto: ClothingUniformJumpsuitEngineering - entities: - - uid: 424 + - uid: 1357 components: - type: Transform - pos: -0.6474335,-10.27245 + pos: 16.5,-9.5 parent: 179 -- proto: ClownPDA - entities: - - uid: 91 + - uid: 1358 components: - type: Transform - pos: -15.5,2.5 + pos: 17.5,-9.5 parent: 179 - - uid: 762 + - uid: 1359 components: - type: Transform - pos: -14.5,1.5 + pos: 18.5,-9.5 parent: 179 - - uid: 864 + - uid: 1360 components: - type: Transform - pos: -14.5,2.5 + pos: 19.5,-9.5 parent: 179 - - uid: 912 + - uid: 1361 components: - type: Transform - pos: -15.5,1.5 + pos: 20.5,-9.5 parent: 179 -- proto: ComputerAnalysisConsole - entities: - - uid: 1083 + - uid: 1362 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,23.5 + pos: 21.5,-9.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 1078: - - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver -- proto: ComputerCargoOrders - entities: - - uid: 326 + - uid: 1363 components: - type: Transform - pos: 0.5,-5.5 + pos: 8.5,-9.5 parent: 179 - - uid: 996 + - uid: 1364 components: - type: Transform - pos: -1.5,-11.5 + pos: 11.5,-8.5 parent: 179 -- proto: ComputerCargoShuttle - entities: - - uid: 995 + - uid: 1365 components: - type: Transform - pos: 0.5,-11.5 + pos: 11.5,-7.5 parent: 179 -- proto: ComputerMedicalRecords - entities: - - uid: 152 + - uid: 1366 components: - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-5.5 + pos: 11.5,-5.5 parent: 179 - - uid: 591 + - uid: 1367 components: - type: Transform - pos: 21.5,5.5 + pos: 11.5,-4.5 parent: 179 -- proto: ComputerResearchAndDevelopment - entities: - - uid: 88 + - uid: 1368 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,19.5 + pos: 11.5,-6.5 parent: 179 -- proto: ComputerShuttleCargo - entities: - - uid: 994 + - uid: 1369 components: - type: Transform - pos: -0.5,-11.5 + pos: 11.5,-3.5 parent: 179 -- proto: ComputerSurveillanceCameraMonitor - entities: - - uid: 1185 + - uid: 1370 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,1.5 + pos: 9.5,-16.5 parent: 179 -- proto: ComputerTechnologyDiskTerminal - entities: - - uid: 1088 + - uid: 1371 components: - type: Transform - pos: 13.5,16.5 + pos: 9.5,-22.5 parent: 179 -- proto: ConveyorBelt - entities: - - uid: 195 + - uid: 1372 components: - type: Transform - pos: -2.5,-15.5 + pos: 9.5,-21.5 parent: 179 - - uid: 259 + - uid: 1373 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-14.5 + pos: 9.5,-10.5 parent: 179 - - uid: 463 + - uid: 1374 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-16.5 + pos: 9.5,-20.5 parent: 179 - - uid: 677 + - uid: 1375 components: - type: Transform - pos: -2.5,-14.5 + pos: 9.5,-19.5 parent: 179 - - uid: 716 + - uid: 1376 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,11.5 + pos: 9.5,-18.5 parent: 179 - - uid: 720 + - uid: 1377 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,11.5 + pos: 9.5,-17.5 parent: 179 - - uid: 721 + - uid: 1378 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,11.5 + pos: 9.5,-15.5 parent: 179 - - uid: 985 + - uid: 1379 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-13.5 + pos: 9.5,-11.5 parent: 179 - - uid: 989 + - uid: 1380 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-15.5 + pos: 9.5,-14.5 parent: 179 - - uid: 990 + - uid: 1381 components: - type: Transform - pos: -2.5,-13.5 + pos: 9.5,-13.5 parent: 179 - - uid: 991 + - uid: 1382 components: - type: Transform - pos: -2.5,-16.5 + pos: 9.5,-12.5 parent: 179 -- proto: CrateEngineeringToolbox - entities: - - uid: 692 + - uid: 1383 components: - type: Transform - pos: -0.5,3.5 + pos: 10.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateGeneric - entities: - - uid: 266 + - uid: 1384 components: - type: Transform - pos: 5.5,-6.5 + pos: 11.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateHydroponicsSeeds - entities: - - uid: 754 + - uid: 1389 components: - type: Transform - pos: 2.5,12.5 + pos: 16.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateHydroponicsTools - entities: - - uid: 755 + - uid: 1390 components: - type: Transform - pos: 2.5,13.5 + pos: 17.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateMedical - entities: - - uid: 131 + - uid: 1391 components: - type: Transform - pos: 31.5,-1.5 + pos: 19.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 132 + - uid: 1392 components: - type: Transform - pos: 32.5,-1.5 + pos: 20.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrewMonitoringServer - entities: - - uid: 1183 + - uid: 1393 components: - type: Transform - pos: 9.5,25.5 + pos: 21.5,-14.5 parent: 179 -- proto: Crowbar - entities: - - uid: 147 + - uid: 1394 components: - type: Transform - pos: -2.172831,4.5306726 + pos: 22.5,-14.5 parent: 179 - - uid: 423 + - uid: 1395 components: - type: Transform - pos: -2.861032,-5.524786 + pos: 18.5,-14.5 parent: 179 -- proto: DebugBatteryDischarger - entities: - - uid: 711 + - uid: 1396 components: - type: Transform - pos: 0.5,-3.5 + pos: 22.5,-9.5 parent: 179 -- proto: DefaultStationBeaconAISatellite - entities: - - uid: 1198 + - uid: 1397 components: - type: Transform - pos: 11.5,-14.5 + pos: 10.5,-19.5 parent: 179 -- proto: DefaultStationBeaconBotany - entities: - - uid: 1193 + - uid: 1398 components: - type: Transform - pos: 3.5,15.5 + pos: 11.5,-19.5 parent: 179 -- proto: DefaultStationBeaconChemistry - entities: - - uid: 1195 + - uid: 1399 components: - type: Transform - pos: 7.5,10.5 + pos: 12.5,-19.5 parent: 179 -- proto: DefaultStationBeaconCommand - entities: - - uid: 1196 + - uid: 1400 components: - type: Transform - pos: 0.5,8.5 + pos: 13.5,-19.5 parent: 179 -- proto: DefaultStationBeaconGravGen - entities: - - uid: 1172 + - uid: 1401 components: - type: Transform - pos: 6.5,5.5 + pos: 14.5,-19.5 parent: 179 -- proto: DefaultStationBeaconMedical - entities: - - uid: 1173 + - uid: 1402 components: - type: Transform - pos: 19.5,5.5 + pos: 15.5,-19.5 parent: 179 -- proto: DefaultStationBeaconScience - entities: - - uid: 1194 + - uid: 1403 components: - type: Transform - pos: 12.5,20.5 + pos: 17.5,-19.5 parent: 179 -- proto: DefaultStationBeaconSecurity - entities: - - uid: 1197 + - uid: 1404 components: - type: Transform - pos: -14.5,17.5 + pos: 18.5,-19.5 parent: 179 -- proto: DefaultStationBeaconSupply - entities: - - uid: 1175 + - uid: 1405 components: - type: Transform - pos: -0.5,-11.5 + pos: 19.5,-19.5 parent: 179 -- proto: DefaultStationBeaconToolRoom - entities: - - uid: 1174 + - uid: 1406 components: - type: Transform - pos: -1.5,4.5 + pos: 20.5,-19.5 parent: 179 -- proto: DisposalPipe - entities: - - uid: 717 + - uid: 1407 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,10.5 + pos: 21.5,-19.5 parent: 179 -- proto: DisposalTrunk - entities: - - uid: 285 + - uid: 1408 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,10.5 + pos: 22.5,-19.5 parent: 179 - - uid: 715 + - uid: 1409 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,10.5 + pos: 16.5,-19.5 parent: 179 -- proto: DisposalUnit - entities: - - uid: 719 + - uid: 1410 components: - type: Transform - pos: -1.5,10.5 + pos: 9.5,-23.5 parent: 179 -- proto: DrinkBeerglass - entities: - - uid: 688 + - uid: 1411 components: - type: Transform - pos: 3.1981986,5.733985 + pos: 9.5,-24.5 parent: 179 -- proto: DrinkColaCan - entities: - - uid: 690 + - uid: 1412 components: - type: Transform - pos: 3.8231986,6.150942 + pos: 10.5,-24.5 parent: 179 -- proto: Dropper - entities: - - uid: 730 + - uid: 1413 components: - type: Transform - pos: 5.892191,9.4118185 + pos: 11.5,-24.5 parent: 179 -- proto: EmergencyOxygenTankFilled - entities: - - uid: 956 + - uid: 1414 components: - type: Transform - pos: -10.505015,6.711994 + pos: 12.5,-24.5 parent: 179 -- proto: ExGrenade - entities: - - uid: 433 + - uid: 1415 components: - type: Transform - pos: -3.7704864,-1.6163371 + pos: 13.5,-24.5 parent: 179 -- proto: ExplosivePayload - entities: - - uid: 668 + - uid: 1416 components: - type: Transform - pos: 6.829691,9.4118185 + pos: 14.5,-24.5 parent: 179 -- proto: FaxMachineCaptain - entities: - - uid: 967 + - uid: 1417 components: - type: Transform - pos: 9.5,12.5 + pos: 15.5,-24.5 parent: 179 -- proto: FaxMachineCentcom - entities: - - uid: 968 + - uid: 1418 components: - type: Transform - pos: 11.5,12.5 + pos: 16.5,-24.5 parent: 179 -- proto: FaxMachineSyndie - entities: - - uid: 969 + - uid: 1419 components: - type: Transform - pos: 13.5,12.5 + pos: 17.5,-24.5 parent: 179 -- proto: FireExtinguisher - entities: - - uid: 323 + - uid: 1420 components: - type: Transform - pos: -1.297692,-5.396082 + pos: 18.5,-24.5 parent: 179 - - uid: 868 + - uid: 1421 components: - type: Transform - pos: -14.5,-1.5 + pos: 19.5,-24.5 parent: 179 -- proto: FlashlightLantern - entities: - - uid: 421 + - uid: 1422 components: - type: Transform - pos: -1.934832,-5.154238 + pos: 20.5,-24.5 parent: 179 - - uid: 422 + - uid: 1423 components: - type: Transform - pos: 1.1350493,8.198464 + pos: 21.5,-24.5 parent: 179 -- proto: FloorLavaEntity - entities: - - uid: 134 + - uid: 1424 components: - type: Transform - pos: -13.5,-3.5 + pos: 22.5,-24.5 parent: 179 - - uid: 135 + - uid: 1502 components: - type: Transform - pos: -14.5,-3.5 + pos: 13.5,-14.5 parent: 179 - - uid: 141 + - uid: 1503 components: - type: Transform - pos: -13.5,-2.5 + pos: 12.5,-14.5 parent: 179 - - uid: 469 + - uid: 1504 components: - type: Transform - pos: -14.5,-2.5 + pos: 14.5,-14.5 parent: 179 -- proto: FloorWaterEntity - entities: - - uid: 136 + - uid: 1554 components: - type: Transform - pos: -12.5,-2.5 + pos: 15.5,-14.5 parent: 179 - - uid: 137 +- proto: CableApcStack + entities: + - uid: 70 components: - type: Transform - pos: -12.5,-3.5 + pos: 10.577456,21.424059 parent: 179 -- proto: FoodApple - entities: - - uid: 16 + - uid: 183 components: - type: Transform - pos: 3.9853282,16.430082 + pos: -6.6863613,7.351646 parent: 179 - - uid: 849 + - uid: 351 components: - type: Transform - pos: 3.7249117,16.242453 + pos: 10.561831,21.767809 parent: 179 - - uid: 866 + - uid: 537 components: - type: Transform - pos: 3.651995,16.55517 + pos: -15.5,-0.5 parent: 179 -- proto: FoodBurgerBacon - entities: - - uid: 689 + - uid: 538 components: - type: Transform - pos: 3.3844857,6.0702233 + pos: -15.5,-0.5 parent: 179 -- proto: FoodCarrot +- proto: CableHV entities: - - uid: 850 + - uid: 1019 components: - type: Transform - pos: 3.6023045,15.67151 + pos: -6.5,-13.5 parent: 179 - - uid: 851 + - uid: 1020 components: - type: Transform - pos: 3.620745,15.015423 + pos: -6.5,-12.5 parent: 179 - - uid: 863 + - uid: 1021 components: - type: Transform - pos: 3.620745,14.389988 + pos: -6.5,-11.5 parent: 179 -- proto: FoodPizzaPineapple +- proto: CableHVStack entities: - - uid: 687 + - uid: 184 components: - type: Transform - pos: 3.5215416,6.799056 + pos: -6.665528,7.840053 parent: 179 -- proto: GasAnalyzer +- proto: CableMV entities: - - uid: 876 + - uid: 1023 components: - type: Transform - pos: 4.4732866,-0.48882532 + pos: -6.5,-13.5 parent: 179 -- proto: GasFilter - entities: - - uid: 480 + - uid: 1024 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-3.5 + pos: -5.5,-13.5 parent: 179 -- proto: GasMixer - entities: - - uid: 747 + - uid: 1025 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 + pos: -5.5,-14.5 parent: 179 -- proto: GasOutletInjector +- proto: CableMVStack entities: - - uid: 429 + - uid: 325 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-1.5 + pos: -6.665528,7.5601244 parent: 179 -- proto: GasPipeBend +- proto: CableTerminal entities: - - uid: 727 + - uid: 1022 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-0.5 + pos: -6.5,-11.5 parent: 179 -- proto: GasPipeFourway +- proto: CapacitorStockPart entities: - - uid: 728 + - uid: 296 components: - type: Transform - pos: 5.5,-1.5 + pos: -4.3012447,8.817795 parent: 179 -- proto: GasPipeStraight - entities: - - uid: 749 + - uid: 700 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-3.5 + pos: -3.8324947,8.786524 parent: 179 -- proto: GasPipeTJunction - entities: - - uid: 748 + - uid: 701 components: - type: Transform - pos: 5.5,-2.5 + pos: -3.2804112,8.786524 parent: 179 -- proto: GasPort - entities: - - uid: 457 + - uid: 704 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-0.5 + pos: -4.8741612,8.817795 parent: 179 -- proto: GasPressurePump +- proto: CaptainIDCard entities: - - uid: 171 + - uid: 726 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-3.5 + pos: 1.0820513,8.752605 parent: 179 -- proto: GasValve +- proto: CaptainSabre entities: - - uid: 168 + - uid: 381 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-2.5 + pos: -3.277628,-2.15838 parent: 179 -- proto: GasVentPump +- proto: CarbonDioxideCanister entities: - - uid: 729 + - uid: 748 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-3.5 + pos: 13.5,-4.5 parent: 179 -- proto: GasVentScrubber - entities: - - uid: 452 + - uid: 749 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-2.5 + pos: 12.5,-4.5 parent: 179 -- proto: GasVolumePump - entities: - - uid: 160 + - uid: 1316 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-1.5 + pos: 24.5,-21.5 parent: 179 -- proto: GeigerCounter +- proto: Catwalk entities: - - uid: 759 + - uid: 2 components: - type: Transform - pos: 1.760596,4.5697265 + pos: 13.5,24.5 parent: 179 -- proto: GravityGenerator - entities: - - uid: 744 + - uid: 7 components: - type: Transform - pos: 6.5,6.5 + pos: 6.5,24.5 parent: 179 -- proto: Grille - entities: - - uid: 108 + - uid: 20 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,23.5 + pos: 6.5,20.5 parent: 179 - - uid: 986 + - uid: 120 components: - type: Transform - pos: -0.5,-16.5 + rot: -1.5707963267948966 rad + pos: 6.5,18.5 parent: 179 - - uid: 987 + - uid: 246 components: - type: Transform - pos: -0.5,-15.5 + pos: -6.5,-6.5 parent: 179 - - uid: 988 + - uid: 247 components: - type: Transform - pos: -0.5,-14.5 + pos: -8.5,-6.5 parent: 179 - - uid: 1007 + - uid: 252 components: - type: Transform - pos: -3.5,-16.5 + pos: 4.5,-8.5 parent: 179 - - uid: 1008 + - uid: 269 components: - type: Transform - pos: -3.5,-15.5 + pos: 12.5,10.5 parent: 179 - - uid: 1009 + - uid: 286 components: - type: Transform - pos: -3.5,-14.5 + pos: 2.5,-11.5 parent: 179 - - uid: 1010 + - uid: 287 components: - type: Transform - pos: 2.5,-16.5 + pos: -4.5,-11.5 parent: 179 - - uid: 1011 + - uid: 308 components: - type: Transform - pos: 2.5,-15.5 + pos: -2.5,-12.5 parent: 179 - - uid: 1012 + - uid: 309 components: - type: Transform - pos: 2.5,-14.5 + pos: 1.5,-12.5 parent: 179 - - uid: 1089 + - uid: 333 components: - type: Transform - pos: 8.5,17.5 + pos: 4.5,-13.5 parent: 179 - - uid: 1090 + - uid: 334 components: - type: Transform - pos: 9.5,17.5 + pos: -5.5,-13.5 parent: 179 - - uid: 1091 + - uid: 438 components: - type: Transform - pos: 10.5,17.5 + rot: 3.141592653589793 rad + pos: -9.5,-0.5 parent: 179 - - uid: 1092 + - uid: 442 components: - type: Transform - pos: 10.5,16.5 + pos: -9.5,8.5 parent: 179 -- proto: Handcuffs - entities: - - uid: 331 + - uid: 514 components: - type: Transform - pos: -3.5805476,0.74100244 + pos: -10.5,8.5 parent: 179 -- proto: HandheldCrewMonitor - entities: - - uid: 1184 + - uid: 541 components: - type: Transform - pos: 1.6819578,7.502847 + pos: -11.5,-6.5 parent: 179 -- proto: HandheldHealthAnalyzer - entities: - - uid: 513 + - uid: 542 components: - type: Transform - pos: -5.9808183,-3.6614444 + pos: -9.5,-6.5 parent: 179 -- proto: HoloFan + - uid: 695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,8.5 + parent: 179 +- proto: Chair entities: - - uid: 142 + - uid: 580 components: - type: Transform - pos: -8.5,7.5 + rot: 1.5707963267948966 rad + pos: 14.5,6.5 parent: 179 - missingComponents: - - TimedDespawn - - uid: 901 + - uid: 581 components: - type: Transform - pos: -10.5,7.5 + rot: 1.5707963267948966 rad + pos: 14.5,8.5 parent: 179 - missingComponents: - - TimedDespawn - - uid: 902 + - uid: 582 components: - type: Transform - pos: -9.5,7.5 + rot: 1.5707963267948966 rad + pos: 14.5,7.5 parent: 179 - missingComponents: - - TimedDespawn -- proto: HolosignWetFloor +- proto: ChairOfficeDark entities: - - uid: 848 + - uid: 380 components: - type: Transform - pos: -13.5,2.5 + rot: 3.1415926535897967 rad + pos: 0.5,-6.5 parent: 179 - - type: Fixtures - fixtures: {} - missingComponents: - - TimedDespawn - - uid: 911 +- proto: ChairOfficeLight + entities: + - uid: 576 components: - type: Transform - pos: -13.5,1.5 + rot: 4.71238898038469 rad + pos: 19.5,4.5 parent: 179 - - type: Fixtures - fixtures: {} - missingComponents: - - TimedDespawn -- proto: hydroponicsTray - entities: - - uid: 756 + - uid: 577 components: - type: Transform - pos: 2.5,14.5 + rot: 3.141592653589793 rad + pos: 20.5,5.5 parent: 179 - - uid: 757 + - uid: 578 components: - type: Transform - pos: 2.5,15.5 + rot: 4.71238898038469 rad + pos: 23.5,8.5 parent: 179 -- proto: KitchenReagentGrinder - entities: - - uid: 731 + - uid: 579 components: - type: Transform - pos: 8.5,9.5 + pos: 24.5,5.5 parent: 179 -- proto: LargeBeaker +- proto: ChemDispenser entities: - - uid: 210 + - uid: 583 components: - type: Transform - pos: 4.3272614,9.338851 + pos: 23.5,9.5 parent: 179 - - uid: 253 + - type: ContainerContainer + containers: + ReagentDispenser-beaker: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + beakerSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 750 components: - type: Transform - pos: 23.494947,7.0422435 + pos: 7.5,11.5 parent: 179 - - uid: 402 +- proto: ChemicalPayload + entities: + - uid: 432 components: - type: Transform - pos: 23.510572,7.7141185 + pos: 6.4651074,9.828774 parent: 179 - - uid: 737 +- proto: ChemMaster + entities: + - uid: 311 components: - type: Transform - pos: 4.2969,9.828774 + pos: 8.5,11.5 parent: 179 -- proto: LedLightTube +- proto: ChemMasterMachineCircuitboard entities: - - uid: 481 + - uid: 718 components: - type: Transform - pos: -3.511025,-10.35149 + pos: -4.5458,10.514079 parent: 179 -- proto: LockerBotanistFilled +- proto: CircuitImprinter entities: - - uid: 869 + - uid: 332 components: - type: Transform - pos: 2.5,16.5 + pos: -6.5,4.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChemistry +- proto: ClosetEmergencyFilledRandom entities: - - uid: 127 + - uid: 349 components: - type: Transform - pos: 27.5,6.5 + pos: 1.5,-10.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChemistryFilled - entities: - - uid: 297 + - uid: 403 components: - type: Transform - pos: 7.5,9.5 + pos: 0.5,-10.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChiefEngineerFilled +- proto: ClosetToolFilled entities: - - uid: 447 + - uid: 524 components: - type: Transform - pos: 7.5,2.5 + pos: -11.5,-5.5 parent: 179 - type: EntityStorage air: @@ -3922,12 +3593,10 @@ entities: - 0 - 0 - 0 -- proto: LockerElectricalSuppliesFilled - entities: - - uid: 444 + - uid: 525 components: - type: Transform - pos: 7.5,3.5 + pos: -11.5,-4.5 parent: 179 - type: EntityStorage air: @@ -3947,12 +3616,10 @@ entities: - 0 - 0 - 0 -- proto: LockerEngineerFilled - entities: - - uid: 490 + - uid: 526 components: - type: Transform - pos: 7.5,4.5 + pos: -11.5,-3.5 parent: 179 - type: EntityStorage air: @@ -3972,12 +3639,10 @@ entities: - 0 - 0 - 0 -- proto: LockerMedical - entities: - - uid: 128 + - uid: 527 components: - type: Transform - pos: 27.5,5.5 + pos: -11.5,-2.5 parent: 179 - type: EntityStorage air: @@ -3997,111 +3662,248 @@ entities: - 0 - 0 - 0 - - uid: 129 +- proto: ClothingBeltChiefEngineerFilled + entities: + - uid: 1573 components: - type: Transform - pos: 29.5,-1.5 + pos: 1.3037996,-5.2961445 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 130 +- proto: ClothingBeltUtilityFilled + entities: + - uid: 427 components: - type: Transform - pos: 30.5,-1.5 + pos: -1.895102,-10.33495 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerMedicalFilled - entities: - - uid: 865 + - uid: 428 components: - type: Transform - pos: -6.5,-3.5 + pos: -1.770102,-10.63182 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerMedicineFilled +- proto: ClothingHandsGlovesColorYellow entities: - - uid: 562 + - uid: 454 components: - type: Transform - pos: -5.5,-3.5 + pos: -0.78741443,4.322194 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerSalvageSpecialistFilled +- proto: ClothingHeadHatWelding entities: - - uid: 493 + - uid: 344 components: - type: Transform - pos: -10.5,4.5 + pos: 0.7198646,4.374314 + parent: 179 +- proto: ClothingMaskBreath + entities: + - uid: 955 + components: + - type: Transform + pos: -10.595239,6.1907988 + parent: 179 +- proto: ClothingMaskGas + entities: + - uid: 425 + components: + - type: Transform + pos: -0.2880585,-10.69432 + parent: 179 +- proto: ClothingOuterHardsuitAtmos + entities: + - uid: 270 + components: + - type: Transform + pos: -10.5426235,5.472399 + parent: 179 +- proto: ClothingOuterVest + entities: + - uid: 426 + components: + - type: Transform + pos: -0.9130585,-10.66307 + parent: 179 +- proto: ClothingShoesBootsMag + entities: + - uid: 725 + components: + - type: Transform + pos: 0.47880077,8.073378 + parent: 179 +- proto: ClothingUniformJumpsuitEngineering + entities: + - uid: 424 + components: + - type: Transform + pos: -0.6474335,-10.27245 + parent: 179 +- proto: ClownPDA + entities: + - uid: 91 + components: + - type: Transform + pos: -15.5,2.5 + parent: 179 + - uid: 762 + components: + - type: Transform + pos: -14.5,1.5 + parent: 179 + - uid: 864 + components: + - type: Transform + pos: -14.5,2.5 + parent: 179 + - uid: 912 + components: + - type: Transform + pos: -15.5,1.5 + parent: 179 +- proto: ComputerAnalysisConsole + entities: + - uid: 1083 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,23.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 1078: + - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver +- proto: ComputerCargoOrders + entities: + - uid: 326 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 179 + - uid: 996 + components: + - type: Transform + pos: -1.5,-11.5 + parent: 179 +- proto: ComputerCargoShuttle + entities: + - uid: 404 + components: + - type: Transform + pos: 0.5,-11.5 + parent: 179 +- proto: ComputerMedicalRecords + entities: + - uid: 152 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-5.5 + parent: 179 + - uid: 591 + components: + - type: Transform + pos: 21.5,5.5 + parent: 179 +- proto: ComputerResearchAndDevelopment + entities: + - uid: 88 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,19.5 + parent: 179 +- proto: ComputerShuttleCargo + entities: + - uid: 994 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 179 +- proto: ComputerSurveillanceCameraMonitor + entities: + - uid: 1185 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,1.5 + parent: 179 +- proto: ComputerTechnologyDiskTerminal + entities: + - uid: 1088 + components: + - type: Transform + pos: 13.5,16.5 + parent: 179 +- proto: ConveyorBelt + entities: + - uid: 195 + components: + - type: Transform + pos: -2.5,-15.5 + parent: 179 + - uid: 259 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-14.5 + parent: 179 + - uid: 463 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-16.5 + parent: 179 + - uid: 677 + components: + - type: Transform + pos: -2.5,-14.5 + parent: 179 + - uid: 716 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,11.5 + parent: 179 + - uid: 720 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,11.5 + parent: 179 + - uid: 721 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,11.5 + parent: 179 + - uid: 985 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-13.5 + parent: 179 + - uid: 989 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-15.5 + parent: 179 + - uid: 990 + components: + - type: Transform + pos: -2.5,-13.5 + parent: 179 + - uid: 991 + components: + - type: Transform + pos: -2.5,-16.5 + parent: 179 +- proto: CrateEngineeringToolbox + entities: + - uid: 692 + components: + - type: Transform + pos: -0.5,3.5 parent: 179 - - type: Lock - locked: False - type: EntityStorage air: volume: 200 @@ -4120,12 +3922,12 @@ entities: - 0 - 0 - 0 -- proto: LockerWeldingSuppliesFilled +- proto: CrateHydroponicsSeeds entities: - - uid: 871 + - uid: 754 components: - type: Transform - pos: 7.5,1.5 + pos: 2.5,12.5 parent: 179 - type: EntityStorage air: @@ -4145,3490 +3947,6113 @@ entities: - 0 - 0 - 0 -- proto: MachineAnomalyGenerator +- proto: CrateHydroponicsTools + entities: + - uid: 755 + components: + - type: Transform + pos: 2.5,13.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: CrateMaterialSteel + entities: + - uid: 1258 + components: + - type: Transform + pos: 7.5,-11.5 + parent: 179 + - uid: 1293 + components: + - type: Transform + pos: 7.5,-10.5 + parent: 179 +- proto: CrateMedical + entities: + - uid: 131 + components: + - type: Transform + pos: 31.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 132 + components: + - type: Transform + pos: 32.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: CrewMonitoringServer + entities: + - uid: 1183 + components: + - type: Transform + pos: 9.5,25.5 + parent: 179 +- proto: Crowbar + entities: + - uid: 147 + components: + - type: Transform + pos: -2.172831,4.5306726 + parent: 179 + - uid: 423 + components: + - type: Transform + pos: -2.861032,-5.524786 + parent: 179 +- proto: DebugBatteryDischarger + entities: + - uid: 711 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 179 +- proto: DebugGenerator + entities: + - uid: 490 + components: + - type: Transform + pos: -6.5,-11.5 + parent: 179 +- proto: DefaultStationBeaconAISatellite + entities: + - uid: 1198 + components: + - type: Transform + pos: 8.5,-10.5 + parent: 179 +- proto: DefaultStationBeaconBotany + entities: + - uid: 1193 + components: + - type: Transform + pos: 3.5,15.5 + parent: 179 +- proto: DefaultStationBeaconChemistry + entities: + - uid: 1195 + components: + - type: Transform + pos: 7.5,10.5 + parent: 179 +- proto: DefaultStationBeaconCommand + entities: + - uid: 1196 + components: + - type: Transform + pos: 0.5,8.5 + parent: 179 +- proto: DefaultStationBeaconGravGen + entities: + - uid: 1172 + components: + - type: Transform + pos: 6.5,5.5 + parent: 179 +- proto: DefaultStationBeaconMedical + entities: + - uid: 1173 + components: + - type: Transform + pos: 19.5,5.5 + parent: 179 +- proto: DefaultStationBeaconScience + entities: + - uid: 1194 + components: + - type: Transform + pos: 12.5,20.5 + parent: 179 +- proto: DefaultStationBeaconSecurity + entities: + - uid: 1197 + components: + - type: Transform + pos: -14.5,17.5 + parent: 179 +- proto: DefaultStationBeaconSupply + entities: + - uid: 1175 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 179 +- proto: DefaultStationBeaconToolRoom + entities: + - uid: 1174 + components: + - type: Transform + pos: -1.5,4.5 + parent: 179 +- proto: DisposalPipe + entities: + - uid: 717 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,10.5 + parent: 179 +- proto: DisposalTrunk + entities: + - uid: 285 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,10.5 + parent: 179 + - uid: 715 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,10.5 + parent: 179 +- proto: DisposalUnit + entities: + - uid: 719 + components: + - type: Transform + pos: -1.5,10.5 + parent: 179 +- proto: DrinkBeerglass + entities: + - uid: 688 + components: + - type: Transform + pos: 3.1981986,5.733985 + parent: 179 +- proto: DrinkColaCan + entities: + - uid: 690 + components: + - type: Transform + pos: 3.8231986,6.150942 + parent: 179 +- proto: Dropper + entities: + - uid: 730 + components: + - type: Transform + pos: 5.892191,9.4118185 + parent: 179 +- proto: EmergencyOxygenTankFilled + entities: + - uid: 956 + components: + - type: Transform + pos: -10.505015,6.711994 + parent: 179 +- proto: ExGrenade + entities: + - uid: 433 + components: + - type: Transform + pos: -3.7704864,-1.6163371 + parent: 179 +- proto: ExplosivePayload + entities: + - uid: 668 + components: + - type: Transform + pos: 6.829691,9.4118185 + parent: 179 +- proto: FaxMachineCaptain + entities: + - uid: 967 + components: + - type: Transform + pos: 9.5,12.5 + parent: 179 +- proto: FaxMachineCentcom + entities: + - uid: 968 + components: + - type: Transform + pos: 11.5,12.5 + parent: 179 +- proto: FaxMachineSyndie + entities: + - uid: 969 + components: + - type: Transform + pos: 13.5,12.5 + parent: 179 +- proto: FireAxeCabinetFilled + entities: + - uid: 1574 + components: + - type: Transform + pos: 8.5,-4.5 + parent: 179 +- proto: FireExtinguisher + entities: + - uid: 323 + components: + - type: Transform + pos: -1.297692,-5.396082 + parent: 179 + - uid: 868 + components: + - type: Transform + pos: -14.5,-1.5 + parent: 179 +- proto: FlashlightLantern + entities: + - uid: 421 + components: + - type: Transform + pos: -1.934832,-5.154238 + parent: 179 + - uid: 422 + components: + - type: Transform + pos: 1.1350493,8.198464 + parent: 179 +- proto: FloorLavaEntity + entities: + - uid: 134 + components: + - type: Transform + pos: -13.5,-3.5 + parent: 179 + - uid: 135 + components: + - type: Transform + pos: -14.5,-3.5 + parent: 179 + - uid: 141 + components: + - type: Transform + pos: -13.5,-2.5 + parent: 179 + - uid: 469 + components: + - type: Transform + pos: -14.5,-2.5 + parent: 179 +- proto: FloorWaterEntity + entities: + - uid: 136 + components: + - type: Transform + pos: -12.5,-2.5 + parent: 179 + - uid: 137 + components: + - type: Transform + pos: -12.5,-3.5 + parent: 179 +- proto: FoodApple + entities: + - uid: 16 + components: + - type: Transform + pos: 3.9853282,16.430082 + parent: 179 + - uid: 849 + components: + - type: Transform + pos: 3.7249117,16.242453 + parent: 179 + - uid: 866 + components: + - type: Transform + pos: 3.651995,16.55517 + parent: 179 +- proto: FoodBurgerBacon + entities: + - uid: 689 + components: + - type: Transform + pos: 3.3844857,6.0702233 + parent: 179 +- proto: FoodCarrot + entities: + - uid: 850 + components: + - type: Transform + pos: 3.6023045,15.67151 + parent: 179 + - uid: 851 + components: + - type: Transform + pos: 3.620745,15.015423 + parent: 179 + - uid: 863 + components: + - type: Transform + pos: 3.620745,14.389988 + parent: 179 +- proto: FoodPizzaPineapple + entities: + - uid: 687 + components: + - type: Transform + pos: 3.5215416,6.799056 + parent: 179 +- proto: FrezonCanister + entities: + - uid: 1308 + components: + - type: Transform + pos: 9.5,-5.5 + parent: 179 + - uid: 1309 + components: + - type: Transform + pos: 10.5,-5.5 + parent: 179 + - uid: 1318 + components: + - type: Transform + pos: 24.5,-15.5 + parent: 179 +- proto: GasAnalyzer + entities: + - uid: 1571 + components: + - type: Transform + pos: 7.3675013,-6.725376 + parent: 179 +- proto: GasMinerAmmonia + entities: + - uid: 1204 + components: + - type: Transform + pos: 23.5,-19.5 + parent: 179 +- proto: GasMinerCarbonDioxide + entities: + - uid: 1205 + components: + - type: Transform + pos: 23.5,-21.5 + parent: 179 +- proto: GasMinerFrezon + entities: + - uid: 1223 + components: + - type: Transform + pos: 23.5,-15.5 + parent: 179 +- proto: GasMinerNitrogenStation + entities: + - uid: 1222 + components: + - type: Transform + pos: 23.5,-9.5 + parent: 179 +- proto: GasMinerNitrousOxide + entities: + - uid: 1225 + components: + - type: Transform + pos: 23.5,-17.5 + parent: 179 +- proto: GasMinerOxygenStation + entities: + - uid: 1199 + components: + - type: Transform + pos: 23.5,-7.5 + parent: 179 +- proto: GasMinerPlasma + entities: + - uid: 1221 + components: + - type: Transform + pos: 23.5,-11.5 + parent: 179 +- proto: GasMinerTritium + entities: + - uid: 1224 + components: + - type: Transform + pos: 23.5,-13.5 + parent: 179 +- proto: GasMinerWaterVapor + entities: + - uid: 1202 + components: + - type: Transform + pos: 23.5,-23.5 + parent: 179 +- proto: GasMixer + entities: + - uid: 1480 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-9.5 + parent: 179 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 +- proto: GasOutletInjector + entities: + - uid: 406 + components: + - type: Transform + pos: 24.5,-21.5 + parent: 179 + - uid: 409 + components: + - type: Transform + pos: 24.5,-17.5 + parent: 179 + - uid: 410 + components: + - type: Transform + pos: 24.5,-23.5 + parent: 179 + - uid: 411 + components: + - type: Transform + pos: 24.5,-15.5 + parent: 179 + - uid: 413 + components: + - type: Transform + pos: 24.5,-11.5 + parent: 179 + - uid: 414 + components: + - type: Transform + pos: 24.5,-19.5 + parent: 179 + - uid: 429 + components: + - type: Transform + pos: 24.5,-7.5 + parent: 179 + - uid: 444 + components: + - type: Transform + pos: 24.5,-9.5 + parent: 179 + - uid: 447 + components: + - type: Transform + pos: 24.5,-13.5 + parent: 179 +- proto: GasPassiveVent + entities: + - uid: 1319 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-23.5 + parent: 179 + - uid: 1320 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-21.5 + parent: 179 + - uid: 1321 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-19.5 + parent: 179 + - uid: 1322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-15.5 + parent: 179 + - uid: 1323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-17.5 + parent: 179 + - uid: 1324 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-13.5 + parent: 179 + - uid: 1325 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-11.5 + parent: 179 + - uid: 1326 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-9.5 + parent: 179 + - uid: 1327 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-7.5 + parent: 179 + - uid: 1544 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-26.5 + parent: 179 +- proto: GasPipeBend + entities: + - uid: 407 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-16.5 + parent: 179 + - uid: 408 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-14.5 + parent: 179 + - uid: 412 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-8.5 + parent: 179 + - uid: 415 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-10.5 + parent: 179 + - uid: 418 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-12.5 + parent: 179 + - uid: 1439 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-18.5 + parent: 179 + - uid: 1440 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-20.5 + parent: 179 + - uid: 1441 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-22.5 + parent: 179 + - uid: 1442 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-24.5 + parent: 179 + - uid: 1482 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-7.5 + parent: 179 + - uid: 1542 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-9.5 + parent: 179 +- proto: GasPipeStraight + entities: + - uid: 1443 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-24.5 + parent: 179 + - uid: 1444 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-24.5 + parent: 179 + - uid: 1445 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-22.5 + parent: 179 + - uid: 1446 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-22.5 + parent: 179 + - uid: 1447 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-20.5 + parent: 179 + - uid: 1448 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-20.5 + parent: 179 + - uid: 1449 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-18.5 + parent: 179 + - uid: 1450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-16.5 + parent: 179 + - uid: 1451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-14.5 + parent: 179 + - uid: 1452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-12.5 + parent: 179 + - uid: 1453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-10.5 + parent: 179 + - uid: 1454 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-8.5 + parent: 179 + - uid: 1455 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-8.5 + parent: 179 + - uid: 1456 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-10.5 + parent: 179 + - uid: 1457 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-12.5 + parent: 179 + - uid: 1458 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-14.5 + parent: 179 + - uid: 1460 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-16.5 + parent: 179 + - uid: 1461 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-18.5 + parent: 179 + - uid: 1483 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-7.5 + parent: 179 + - uid: 1484 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-8.5 + parent: 179 + - uid: 1485 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-8.5 + parent: 179 + - uid: 1486 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-9.5 + parent: 179 + - uid: 1487 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-9.5 + parent: 179 + - uid: 1522 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-21.5 + parent: 179 + - uid: 1523 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-20.5 + parent: 179 + - uid: 1524 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-19.5 + parent: 179 + - uid: 1525 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-18.5 + parent: 179 + - uid: 1526 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-17.5 + parent: 179 + - uid: 1527 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-16.5 + parent: 179 + - uid: 1528 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-15.5 + parent: 179 + - uid: 1529 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-14.5 + parent: 179 + - uid: 1530 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-12.5 + parent: 179 + - uid: 1531 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-13.5 + parent: 179 + - uid: 1532 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-10.5 + parent: 179 + - uid: 1533 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-11.5 + parent: 179 + - uid: 1534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-9.5 + parent: 179 + - uid: 1535 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-9.5 + parent: 179 + - uid: 1536 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-9.5 + parent: 179 + - uid: 1537 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-9.5 + parent: 179 + - uid: 1538 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-9.5 + parent: 179 + - uid: 1539 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-9.5 + parent: 179 + - uid: 1540 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-9.5 + parent: 179 + - uid: 1541 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-9.5 + parent: 179 + - uid: 1546 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-25.5 + parent: 179 + - uid: 1547 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-22.5 + parent: 179 + - uid: 1548 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-22.5 + parent: 179 + - uid: 1549 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-22.5 + parent: 179 + - uid: 1550 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-22.5 + parent: 179 + - uid: 1551 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-22.5 + parent: 179 + - uid: 1552 + components: + - type: Transform + pos: 17.5,-23.5 + parent: 179 +- proto: GasPipeTJunction + entities: + - uid: 1479 + components: + - type: Transform + pos: 20.5,-9.5 + parent: 179 + - uid: 1481 + components: + - type: Transform + pos: 19.5,-7.5 + parent: 179 + - uid: 1553 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-22.5 + parent: 179 +- proto: GasPressurePump + entities: + - uid: 1459 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-7.5 + parent: 179 + - uid: 1462 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-9.5 + parent: 179 + - uid: 1463 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-11.5 + parent: 179 + - uid: 1464 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-13.5 + parent: 179 + - uid: 1465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-15.5 + parent: 179 + - uid: 1466 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-17.5 + parent: 179 + - uid: 1467 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-19.5 + parent: 179 + - uid: 1468 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-21.5 + parent: 179 + - uid: 1469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-23.5 + parent: 179 + - uid: 1470 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-24.5 + parent: 179 + - uid: 1471 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-22.5 + parent: 179 + - uid: 1472 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-20.5 + parent: 179 + - uid: 1473 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-18.5 + parent: 179 + - uid: 1474 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-16.5 + parent: 179 + - uid: 1475 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-14.5 + parent: 179 + - uid: 1476 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-12.5 + parent: 179 + - uid: 1477 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-10.5 + parent: 179 + - uid: 1478 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-8.5 + parent: 179 +- proto: GasThermoMachineFreezer + entities: + - uid: 480 + components: + - type: Transform + pos: 9.5,-7.5 + parent: 179 + - uid: 616 + components: + - type: Transform + pos: 10.5,-7.5 + parent: 179 +- proto: GasThermoMachineHeater + entities: + - uid: 483 + components: + - type: Transform + pos: 13.5,-7.5 + parent: 179 + - uid: 1568 + components: + - type: Transform + pos: 12.5,-7.5 + parent: 179 +- proto: GasValve + entities: + - uid: 1545 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-24.5 + parent: 179 +- proto: GasVentPump + entities: + - uid: 1521 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-22.5 + parent: 179 +- proto: GasVentScrubber + entities: + - uid: 1543 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-22.5 + parent: 179 +- proto: GeigerCounter + entities: + - uid: 759 + components: + - type: Transform + pos: 1.760596,4.5697265 + parent: 179 +- proto: GravityGenerator + entities: + - uid: 744 + components: + - type: Transform + pos: 6.5,6.5 + parent: 179 +- proto: Grille + entities: + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,23.5 + parent: 179 + - uid: 986 + components: + - type: Transform + pos: -0.5,-16.5 + parent: 179 + - uid: 987 + components: + - type: Transform + pos: -0.5,-15.5 + parent: 179 + - uid: 988 + components: + - type: Transform + pos: -0.5,-14.5 + parent: 179 + - uid: 1007 + components: + - type: Transform + pos: -3.5,-16.5 + parent: 179 + - uid: 1008 + components: + - type: Transform + pos: -3.5,-15.5 + parent: 179 + - uid: 1009 + components: + - type: Transform + pos: -3.5,-14.5 + parent: 179 + - uid: 1010 + components: + - type: Transform + pos: 2.5,-16.5 + parent: 179 + - uid: 1011 + components: + - type: Transform + pos: 2.5,-15.5 + parent: 179 + - uid: 1012 + components: + - type: Transform + pos: 2.5,-14.5 + parent: 179 + - uid: 1089 + components: + - type: Transform + pos: 8.5,17.5 + parent: 179 + - uid: 1090 + components: + - type: Transform + pos: 9.5,17.5 + parent: 179 + - uid: 1091 + components: + - type: Transform + pos: 10.5,17.5 + parent: 179 + - uid: 1092 + components: + - type: Transform + pos: 10.5,16.5 + parent: 179 +- proto: Handcuffs + entities: + - uid: 331 + components: + - type: Transform + pos: -3.5805476,0.74100244 + parent: 179 +- proto: HandheldHealthAnalyzer + entities: + - uid: 513 + components: + - type: Transform + pos: -5.9808183,-3.6614444 + parent: 179 +- proto: HoloFan + entities: + - uid: 142 + components: + - type: Transform + pos: -8.5,7.5 + parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True + missingComponents: + - TimedDespawn + - uid: 901 + components: + - type: Transform + pos: -10.5,7.5 + parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True + missingComponents: + - TimedDespawn + - uid: 902 + components: + - type: Transform + pos: -9.5,7.5 + parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True + missingComponents: + - TimedDespawn +- proto: HolofanProjectorEmpty + entities: + - uid: 1569 + components: + - type: Transform + pos: 7.2439203,-7.545966 + parent: 179 +- proto: HolosignWetFloor + entities: + - uid: 848 + components: + - type: Transform + pos: -13.5,2.5 + parent: 179 + - type: Fixtures + fixtures: {} + missingComponents: + - TimedDespawn + - uid: 911 + components: + - type: Transform + pos: -13.5,1.5 + parent: 179 + - type: Fixtures + fixtures: {} + missingComponents: + - TimedDespawn +- proto: hydroponicsTray + entities: + - uid: 756 + components: + - type: Transform + pos: 2.5,14.5 + parent: 179 + - uid: 757 + components: + - type: Transform + pos: 2.5,15.5 + parent: 179 +- proto: Igniter + entities: + - uid: 728 + components: + - type: Transform + pos: 13.546334,-14.688479 + parent: 179 +- proto: KitchenReagentGrinder + entities: + - uid: 731 + components: + - type: Transform + pos: 8.5,9.5 + parent: 179 +- proto: LargeBeaker + entities: + - uid: 210 + components: + - type: Transform + pos: 4.3272614,9.338851 + parent: 179 + - uid: 253 + components: + - type: Transform + pos: 23.494947,7.0422435 + parent: 179 + - uid: 402 + components: + - type: Transform + pos: 23.510572,7.7141185 + parent: 179 + - uid: 737 + components: + - type: Transform + pos: 4.2969,9.828774 + parent: 179 +- proto: LedLightTube + entities: + - uid: 481 + components: + - type: Transform + pos: -3.511025,-10.35149 + parent: 179 +- proto: LockerAtmosphericsFilledHardsuit + entities: + - uid: 1278 + components: + - type: Transform + pos: 7.5,-12.5 + parent: 179 +- proto: LockerBotanistFilled + entities: + - uid: 869 + components: + - type: Transform + pos: 2.5,16.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerChemistry + entities: + - uid: 127 + components: + - type: Transform + pos: 27.5,6.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerChemistryFilled + entities: + - uid: 297 + components: + - type: Transform + pos: 7.5,9.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerChiefEngineerFilledHardsuit + entities: + - uid: 1564 + components: + - type: Transform + pos: 7.5,-13.5 + parent: 179 +- proto: LockerElectricalSuppliesFilled + entities: + - uid: 405 + components: + - type: Transform + pos: 5.5,-6.5 + parent: 179 +- proto: LockerEngineerFilledHardsuit + entities: + - uid: 458 + components: + - type: Transform + pos: 5.5,-5.5 + parent: 179 +- proto: LockerMedical + entities: + - uid: 128 + components: + - type: Transform + pos: 27.5,5.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 129 + components: + - type: Transform + pos: 29.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 130 + components: + - type: Transform + pos: 30.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerMedicalFilled + entities: + - uid: 865 + components: + - type: Transform + pos: -6.5,-3.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerMedicineFilled + entities: + - uid: 562 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerSalvageSpecialistFilled + entities: + - uid: 493 + components: + - type: Transform + pos: -10.5,4.5 + parent: 179 + - type: Lock + locked: False + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerWeldingSuppliesFilled + entities: + - uid: 457 + components: + - type: Transform + pos: 5.5,-7.5 + parent: 179 +- proto: MachineAnomalyGenerator + entities: + - uid: 1071 + components: + - type: Transform + pos: 16.5,25.5 + parent: 179 +- proto: MachineAnomalyVessel + entities: + - uid: 1087 + components: + - type: Transform + pos: 15.5,19.5 + parent: 179 +- proto: MachineArtifactAnalyzer + entities: + - uid: 1078 + components: + - type: Transform + pos: 12.5,24.5 + parent: 179 +- proto: MachineFrame + entities: + - uid: 533 + components: + - type: Transform + pos: -5.5,10.5 + parent: 179 +- proto: MedicalScanner + entities: + - uid: 592 + components: + - type: Transform + pos: 18.5,-1.5 + parent: 179 + - type: ContainerContainer + containers: + MedicalScanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + scanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 593 + components: + - type: Transform + pos: 18.5,-5.5 + parent: 179 + - type: ContainerContainer + containers: + MedicalScanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + scanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: MedkitFilled + entities: + - uid: 153 + components: + - type: Transform + pos: 13.632214,1.5673001 + parent: 179 + - uid: 154 + components: + - type: Transform + pos: 13.460339,0.6141751 + parent: 179 + - uid: 321 + components: + - type: Transform + pos: 3.8440318,4.425983 + parent: 179 +- proto: MicroManipulatorStockPart + entities: + - uid: 455 + components: + - type: Transform + pos: -6.337244,8.838643 + parent: 179 + - uid: 456 + components: + - type: Transform + pos: -5.920577,8.817795 + parent: 179 + - uid: 484 + components: + - type: Transform + pos: -5.5039105,8.838643 + parent: 179 + - uid: 712 + components: + - type: Transform + pos: -6.7434506,8.817795 + parent: 179 + - uid: 959 + components: + - type: Transform + pos: -4.752078,10.904018 + parent: 179 +- proto: ModularGrenade + entities: + - uid: 435 + components: + - type: Transform + pos: 6.829691,9.860046 + parent: 179 +- proto: MopBucket + entities: + - uid: 696 + components: + - type: Transform + pos: 7.5,16.5 + parent: 179 +- proto: MopItem + entities: + - uid: 328 + components: + - type: Transform + pos: 7.6382103,16.08618 + parent: 179 + - type: SolutionContainerManager + solutions: + absorbed: + temperature: 293.15 + canReact: True + maxVol: 50 + name: null + reagents: + - data: null + ReagentId: Water + Quantity: 25 +- proto: Multitool + entities: + - uid: 307 + components: + - type: Transform + pos: -1.249865,-10.43489 + parent: 179 + - uid: 430 + components: + - type: Transform + pos: -0.6298993,4.7431083 + parent: 179 + - type: NetworkConfigurator + devices: + 'UID: 31739': 801 +- proto: NitrogenCanister + entities: + - uid: 871 + components: + - type: Transform + pos: 9.5,-4.5 + parent: 179 + - uid: 876 + components: + - type: Transform + pos: 10.5,-4.5 + parent: 179 + - uid: 1315 + components: + - type: Transform + pos: 24.5,-9.5 + parent: 179 +- proto: NitrousOxideCanister + entities: + - uid: 617 + components: + - type: Transform + pos: 10.5,-3.5 + parent: 179 + - uid: 1302 + components: + - type: Transform + pos: 9.5,-3.5 + parent: 179 + - uid: 1314 + components: + - type: Transform + pos: 24.5,-17.5 + parent: 179 +- proto: Ointment + entities: + - uid: 148 + components: + - type: Transform + pos: 18.77326,6.653532 + parent: 179 + - uid: 149 + components: + - type: Transform + pos: 18.49201,6.059782 + parent: 179 +- proto: OxygenCanister + entities: + - uid: 747 + components: + - type: Transform + pos: 13.5,-3.5 + parent: 179 + - uid: 875 + components: + - type: Transform + pos: 12.5,-3.5 + parent: 179 + - uid: 1310 + components: + - type: Transform + pos: 24.5,-7.5 + parent: 179 +- proto: PaperBin10 + entities: + - uid: 977 + components: + - type: Transform + pos: 10.5,12.5 + parent: 179 +- proto: PartRodMetal + entities: + - uid: 133 + components: + - type: Transform + pos: -3.4717777,7.672426 + parent: 179 +- proto: Pen + entities: + - uid: 978 + components: + - type: Transform + pos: 10.893699,12.7794075 + parent: 179 + - uid: 979 + components: + - type: Transform + pos: 10.862433,12.602201 + parent: 179 +- proto: PlasmaCanister + entities: + - uid: 255 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 179 + - uid: 256 + components: + - type: Transform + pos: 9.5,-2.5 + parent: 179 + - uid: 1311 + components: + - type: Transform + pos: 24.5,-11.5 + parent: 179 +- proto: PlasticFlapsAirtightClear + entities: + - uid: 997 + components: + - type: Transform + pos: -2.5,-16.5 + parent: 179 + - uid: 998 + components: + - type: Transform + pos: -2.5,-14.5 + parent: 179 + - uid: 999 + components: + - type: Transform + pos: 1.5,-16.5 + parent: 179 + - uid: 1000 + components: + - type: Transform + pos: 1.5,-14.5 + parent: 179 +- proto: PlayerStationAi + entities: + - uid: 14 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 179 +- proto: PowerCellAntiqueProto + entities: + - uid: 1570 + components: + - type: Transform + pos: 7.5772533,-7.233466 + parent: 179 +- proto: PowerCellHigh + entities: + - uid: 567 + components: + - type: Transform + pos: -4.76583,8.265328 + parent: 179 +- proto: PowerCellHyper + entities: + - uid: 703 + components: + - type: Transform + pos: -4.3179135,8.275752 + parent: 179 +- proto: PowerCellMedium + entities: + - uid: 186 + components: + - type: Transform + pos: -2.67511,-10.351 + parent: 179 + - uid: 187 + components: + - type: Transform + pos: -2.55011,-10.6635 + parent: 179 + - uid: 360 + components: + - type: Transform + pos: -3.7970803,8.275752 + parent: 179 +- proto: PowerCellRecharger + entities: + - uid: 709 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 179 +- proto: PowerCellSmall + entities: + - uid: 705 + components: + - type: Transform + pos: -3.3182633,8.234056 + parent: 179 +- proto: Poweredlight + entities: + - uid: 93 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-24.5 + parent: 179 + - uid: 536 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-0.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 546 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-5.5 + parent: 179 + - uid: 660 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,1.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 661 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,7.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 663 + components: + - type: Transform + pos: 22.5,2.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 666 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,23.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 670 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,18.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 673 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 674 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 675 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-0.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 676 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-10.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 681 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 682 + components: + - type: Transform + pos: 13.5,2.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 683 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,4.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1075 + components: + - type: Transform + pos: 16.5,27.5 + parent: 179 + - uid: 1076 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,22.5 + parent: 179 + - uid: 1425 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-3.5 + parent: 179 + - uid: 1426 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-3.5 + parent: 179 + - uid: 1427 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-7.5 + parent: 179 + - uid: 1428 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-14.5 + parent: 179 + - uid: 1429 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-18.5 + parent: 179 + - uid: 1430 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-24.5 + parent: 179 + - uid: 1431 + components: + - type: Transform + pos: 14.5,-7.5 + parent: 179 + - uid: 1432 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-23.5 + parent: 179 + - uid: 1433 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-19.5 + parent: 179 + - uid: 1434 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-15.5 + parent: 179 + - uid: 1435 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-11.5 + parent: 179 + - uid: 1436 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-7.5 + parent: 179 + - uid: 1437 + components: + - type: Transform + pos: 19.5,-7.5 + parent: 179 +- proto: PoweredlightExterior + entities: + - uid: 1557 + components: + - type: Transform + pos: 16.5,-26.5 + parent: 179 +- proto: PoweredLightPostSmall + entities: + - uid: 1438 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-17.5 + parent: 179 +- proto: PoweredSmallLight + entities: + - uid: 163 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,26.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,24.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,17.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 388 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 417 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 727 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-10.5 + parent: 179 +- proto: Protolathe + entities: + - uid: 12 + components: + - type: Transform + pos: 13.5,21.5 + parent: 179 + - uid: 384 + components: + - type: Transform + pos: -6.5,6.5 + parent: 179 +- proto: Railing + entities: + - uid: 665 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,9.5 + parent: 179 + - uid: 927 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,10.5 + parent: 179 + - uid: 928 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,11.5 + parent: 179 + - uid: 929 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,12.5 + parent: 179 + - uid: 930 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,13.5 + parent: 179 + - uid: 931 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,14.5 + parent: 179 + - uid: 932 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,15.5 + parent: 179 + - uid: 933 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,16.5 + parent: 179 + - uid: 934 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,17.5 + parent: 179 + - uid: 935 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,17.5 + parent: 179 + - uid: 936 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,17.5 + parent: 179 + - uid: 937 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,17.5 + parent: 179 + - uid: 938 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,17.5 + parent: 179 + - uid: 939 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,17.5 + parent: 179 + - uid: 940 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,17.5 + parent: 179 + - uid: 941 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,17.5 + parent: 179 + - uid: 942 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,17.5 + parent: 179 + - uid: 943 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,17.5 + parent: 179 + - uid: 944 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,17.5 + parent: 179 + - uid: 945 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,17.5 + parent: 179 + - uid: 946 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,17.5 + parent: 179 + - uid: 947 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,17.5 + parent: 179 + - uid: 948 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,17.5 + parent: 179 +- proto: RailingCornerSmall + entities: + - uid: 919 + components: + - type: Transform + pos: -14.5,9.5 + parent: 179 +- proto: RCDExperimental + entities: + - uid: 1575 + components: + - type: Transform + pos: 1.6787996,-5.6922684 + parent: 179 +- proto: ReinforcedWindow + entities: + - uid: 1084 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,23.5 + parent: 179 + - uid: 1093 + components: + - type: Transform + pos: 8.5,17.5 + parent: 179 + - uid: 1094 + components: + - type: Transform + pos: 9.5,17.5 + parent: 179 + - uid: 1095 + components: + - type: Transform + pos: 10.5,17.5 + parent: 179 + - uid: 1096 + components: + - type: Transform + pos: 10.5,16.5 + parent: 179 +- proto: ResearchAndDevelopmentServer + entities: + - uid: 17 + components: + - type: Transform + pos: 8.5,18.5 + parent: 179 +- proto: ResearchDiskDebug + entities: + - uid: 54 + components: + - type: Transform + pos: 9.532393,18.446417 + parent: 179 +- proto: RubberStampCaptain + entities: + - uid: 982 + components: + - type: Transform + pos: 12.800895,12.664745 + parent: 179 +- proto: RubberStampCentcom + entities: + - uid: 980 + components: + - type: Transform + pos: 12.186007,12.716865 + parent: 179 +- proto: RubberStampSyndicate + entities: + - uid: 981 + components: + - type: Transform + pos: 12.436131,12.550082 + parent: 179 +- proto: Screen + entities: + - uid: 1192 + components: + - type: Transform + pos: 4.5,-14.5 + parent: 179 +- proto: Screwdriver + entities: + - uid: 431 + components: + - type: Transform + pos: -1.235331,4.739151 + parent: 179 +- proto: SeedExtractor + entities: + - uid: 65 + components: + - type: Transform + pos: 2.5,17.5 + parent: 179 +- proto: SheetGlass + entities: + - uid: 354 + components: + - type: Transform + pos: 8.57603,21.566113 + parent: 179 + - uid: 479 + components: + - type: Transform + pos: -5.13758,7.5586076 + parent: 179 + - uid: 529 + components: + - type: Transform + pos: -15.5,-3.5 + parent: 179 + - uid: 564 + components: + - type: Transform + pos: -15.5,-1.5 + parent: 179 + - uid: 565 + components: + - type: Transform + pos: -15.5,-1.5 + parent: 179 + - uid: 566 + components: + - type: Transform + pos: -15.5,-3.5 + parent: 179 +- proto: SheetGlass1 + entities: + - uid: 960 + components: + - type: Transform + pos: -3.981244,10.799851 + parent: 179 +- proto: SheetPGlass + entities: + - uid: 416 + components: + - type: Transform + pos: -0.5,8.5 + parent: 179 +- proto: SheetPlasma + entities: + - uid: 1077 + components: + - type: Transform + pos: 17.485096,24.503635 + parent: 179 +- proto: SheetPlasteel + entities: + - uid: 478 + components: + - type: Transform + pos: -4.0129576,7.6107273 + parent: 179 +- proto: SheetPlastic + entities: + - uid: 79 + components: + - type: Transform + pos: 8.951309,21.511908 + parent: 179 + - uid: 181 + components: + - type: Transform + pos: -4.54383,7.579455 + parent: 179 +- proto: SheetRPGlass + entities: + - uid: 182 + components: + - type: Transform + pos: -0.5,7.5 + parent: 179 +- proto: SheetSteel + entities: + - uid: 205 + components: + - type: Transform + pos: -15.5,-5.5 + parent: 179 + - uid: 305 + components: + - type: Transform + pos: 9.435405,21.503613 + parent: 179 + - uid: 382 + components: + - type: Transform + pos: -15.5,-5.5 + parent: 179 + - uid: 473 + components: + - type: Transform + pos: -5.6834707,7.529523 + parent: 179 + - uid: 543 + components: + - type: Transform + pos: -15.5,-4.5 + parent: 179 + - uid: 544 + components: + - type: Transform + pos: -15.5,-4.5 + parent: 179 +- proto: SignalButton + entities: + - uid: 1013 + components: + - type: Transform + pos: -4.5,-14.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 202: + - Pressed: Toggle + 984: + - Pressed: Toggle + - uid: 1014 + components: + - type: Transform + pos: 3.5,-14.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 697: + - Pressed: Toggle + 698: + - Pressed: Toggle + - uid: 1560 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-12.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 728: + - Pressed: Trigger +- proto: SignAtmos + entities: + - uid: 1301 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 179 + - uid: 1558 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-6.5 + parent: 179 +- proto: SignCargoDock + entities: + - uid: 1046 + components: + - type: Transform + pos: 4.5,-4.5 + parent: 179 +- proto: SignCryogenics + entities: + - uid: 1298 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-15.5 + parent: 179 +- proto: SignDanger entities: - - uid: 1071 + - uid: 1203 components: - type: Transform - pos: 16.5,25.5 + rot: -1.5707963267948966 rad + pos: 25.5,-19.5 parent: 179 -- proto: MachineAnomalyVessel +- proto: SignFlammable entities: - - uid: 1087 + - uid: 1297 components: - type: Transform - pos: 15.5,19.5 + rot: -1.5707963267948966 rad + pos: 25.5,-13.5 parent: 179 -- proto: MachineArtifactAnalyzer - entities: - - uid: 1078 + - uid: 1299 components: - type: Transform - pos: 12.5,24.5 + rot: -1.5707963267948966 rad + pos: 25.5,-11.5 parent: 179 -- proto: MachineFrame +- proto: SignSpace entities: - - uid: 533 + - uid: 1291 components: - type: Transform - pos: -5.5,10.5 + pos: 6.5,-19.5 parent: 179 -- proto: MedicalScanner + - uid: 1555 + components: + - type: Transform + pos: 6.5,-14.5 + parent: 179 + - uid: 1563 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-25.5 + parent: 179 +- proto: SmallLight entities: - - uid: 592 + - uid: 1048 components: - type: Transform - pos: 18.5,-1.5 + rot: 1.5707963267948966 rad + pos: -2.5,-15.5 parent: 179 - - type: ContainerContainer - containers: - MedicalScanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - scanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 593 + - uid: 1049 components: - type: Transform - pos: 18.5,-5.5 + rot: -1.5707963267948966 rad + pos: 1.5,-15.5 parent: 179 - - type: ContainerContainer - containers: - MedicalScanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - scanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: MedkitFilled +- proto: SMESBasic entities: - - uid: 153 + - uid: 1017 components: - type: Transform - pos: 13.632214,1.5673001 + pos: -6.5,-12.5 parent: 179 - - uid: 154 +- proto: SodaDispenser + entities: + - uid: 751 components: - type: Transform - pos: 13.460339,0.6141751 + pos: 8.5,12.5 parent: 179 - - uid: 321 +- proto: SpawnMobCorgiMouse + entities: + - uid: 1050 components: - type: Transform - pos: 3.8440318,4.425983 + pos: 3.5,8.5 parent: 179 -- proto: MicroManipulatorStockPart +- proto: SpawnMobCrabAtmos entities: - - uid: 455 + - uid: 729 components: - type: Transform - pos: -6.337244,8.838643 + pos: 15.5,-10.5 parent: 179 - - uid: 456 +- proto: SpawnMobHuman + entities: + - uid: 138 components: - type: Transform - pos: -5.920577,8.817795 + pos: -6.5,-0.5 parent: 179 - - uid: 484 + - uid: 139 components: - type: Transform - pos: -5.5039105,8.838643 + pos: -6.5,0.5 parent: 179 - - uid: 712 + - uid: 140 components: - type: Transform - pos: -6.7434506,8.817795 + pos: 3.5,7.5 parent: 179 - - uid: 959 +- proto: SpawnPointCaptain + entities: + - uid: 954 components: - type: Transform - pos: -4.752078,10.904018 + pos: -4.5,4.5 parent: 179 -- proto: ModularGrenade +- proto: SpawnPointLatejoin entities: - - uid: 435 + - uid: 961 components: - type: Transform - pos: 6.829691,9.860046 + pos: -3.5,3.5 parent: 179 -- proto: MopBucket +- proto: SpawnPointObserver entities: - - uid: 696 + - uid: 679 components: - type: Transform - pos: 7.5,16.5 + pos: -3.5,4.5 parent: 179 -- proto: MopItem +- proto: Spear entities: - - uid: 328 + - uid: 185 components: - type: Transform - pos: 7.6382103,16.08618 + pos: -3.4579864,-1.9811735 parent: 179 - - type: SolutionContainerManager - solutions: - absorbed: - temperature: 293.15 - canReact: True - maxVol: 50 - name: null - reagents: - - data: null - ReagentId: Water - Quantity: 25 -- proto: Multitool +- proto: SprayBottleWater entities: - - uid: 307 + - uid: 903 components: - type: Transform - pos: -1.249865,-10.43489 + pos: 6.985283,16.424004 parent: 179 - - uid: 430 +- proto: SprayPainter + entities: + - uid: 1572 components: - type: Transform - pos: -0.6298993,4.7431083 + pos: 7.5948057,-5.356733 parent: 179 - - type: NetworkConfigurator - devices: - 'UID: 31739': 801 -- proto: NitrogenCanister +- proto: Stimpack entities: - - uid: 459 + - uid: 462 components: - type: Transform - pos: 7.5,-1.5 + pos: 3.6877818,5.312015 parent: 179 -- proto: Ointment +- proto: Stool entities: - - uid: 148 + - uid: 383 components: - type: Transform - pos: 18.77326,6.653532 + pos: -1.5,-9.5 parent: 179 - - uid: 149 + - uid: 387 components: - type: Transform - pos: 18.49201,6.059782 + rot: 3.141592653589793 rad + pos: -2.5,-6.5 parent: 179 -- proto: OxygenCanister +- proto: StorageCanister entities: - - uid: 340 + - uid: 1285 components: - type: Transform - pos: 7.5,-3.5 + pos: 10.5,-6.5 parent: 179 -- proto: PaperBin10 + - uid: 1286 + components: + - type: Transform + pos: 9.5,-6.5 + parent: 179 + - uid: 1287 + components: + - type: Transform + pos: 12.5,-6.5 + parent: 179 + - uid: 1288 + components: + - type: Transform + pos: 13.5,-6.5 + parent: 179 +- proto: Stunbaton entities: - - uid: 977 + - uid: 434 components: - type: Transform - pos: 10.5,12.5 + pos: -3.1734612,-2.6066077 parent: 179 -- proto: PartRodMetal +- proto: SubstationBasic entities: - - uid: 133 + - uid: 1018 components: - type: Transform - pos: -3.4717777,7.672426 + pos: -6.5,-13.5 parent: 179 -- proto: Pen +- proto: SurveillanceCameraGeneral entities: - - uid: 978 + - uid: 1186 components: - type: Transform - pos: 10.893699,12.7794075 + rot: 3.141592653589793 rad + pos: -2.5,10.5 parent: 179 - - uid: 979 + - uid: 1188 components: - type: Transform - pos: 10.862433,12.602201 + rot: -1.5707963267948966 rad + pos: 15.5,21.5 parent: 179 -- proto: PlasmaCanister + - uid: 1190 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,10.5 + parent: 179 +- proto: SurveillanceCameraRouterGeneral entities: - - uid: 461 + - uid: 1189 components: - type: Transform - pos: 7.5,-2.5 + pos: 9.5,24.5 parent: 179 -- proto: PlasticFlapsAirtightClear +- proto: Syringe entities: - - uid: 997 + - uid: 460 components: - type: Transform - pos: -2.5,-16.5 + pos: 3.2502818,4.5823417 parent: 179 - - uid: 998 + - uid: 738 components: - type: Transform - pos: -2.5,-14.5 + pos: 5.767191,9.787079 parent: 179 - - uid: 999 +- proto: Table + entities: + - uid: 63 components: - type: Transform - pos: 1.5,-16.5 + pos: 9.5,21.5 parent: 179 - - uid: 1000 + - uid: 64 components: - type: Transform - pos: 1.5,-14.5 + pos: 10.5,21.5 parent: 179 -- proto: PlayerStationAi - entities: - - uid: 14 + - uid: 67 components: - type: Transform - pos: -5.5,-5.5 + pos: 8.5,21.5 parent: 179 -- proto: PortableGeneratorSuperPacman - entities: - - uid: 1016 + - uid: 76 components: - type: Transform - pos: -6.5,-11.5 + pos: 7.5,-7.5 parent: 179 -- proto: PowerCellHigh - entities: - - uid: 567 + - uid: 92 components: - type: Transform - pos: -4.76583,8.265328 + pos: 11.5,21.5 parent: 179 -- proto: PowerCellHyper - entities: - - uid: 703 + - uid: 143 components: - type: Transform - pos: -4.3179135,8.275752 + pos: 33.5,-3.5 parent: 179 -- proto: PowerCellMedium - entities: - - uid: 186 + - uid: 144 components: - type: Transform - pos: -2.67511,-10.351 + pos: 33.5,-2.5 parent: 179 - - uid: 187 + - uid: 145 components: - type: Transform - pos: -2.55011,-10.6635 + pos: 33.5,-1.5 parent: 179 - - uid: 360 + - uid: 161 components: - type: Transform - pos: -3.7970803,8.275752 + pos: 24.5,-5.5 parent: 179 -- proto: PowerCellRecharger - entities: - - uid: 709 + - uid: 162 components: - type: Transform - pos: -1.5,-3.5 + pos: 23.5,-5.5 parent: 179 -- proto: PowerCellSmall - entities: - - uid: 705 + - uid: 172 components: - type: Transform - pos: -3.3182633,8.234056 + rot: -1.5707963267948966 rad + pos: 4.5,9.5 parent: 179 -- proto: Poweredlight - entities: - - uid: 93 + - uid: 180 components: - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,-5.5 + pos: -4.5,10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 536 + - uid: 262 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-0.5 + pos: -3.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 660 + - uid: 263 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 29.5,1.5 + pos: -2.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 661 + - uid: 264 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,7.5 + pos: -1.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 663 + - uid: 265 components: - type: Transform - pos: 22.5,2.5 + pos: -0.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 666 + - uid: 267 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,23.5 + pos: 23.5,5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 670 + - uid: 268 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,18.5 + pos: 23.5,6.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 673 + - uid: 298 components: - type: Transform rot: -1.5707963267948966 rad - pos: -11.5,-5.5 + pos: 6.5,9.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 674 + - uid: 299 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,-5.5 + rot: -1.5707963267948966 rad + pos: 5.5,9.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 675 + - uid: 300 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,-0.5 + rot: -1.5707963267948966 rad + pos: 8.5,9.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 676 + - uid: 312 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-10.5 + pos: -3.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 678 + - uid: 313 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-1.5 + pos: -2.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 680 + - uid: 314 components: - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-5.5 + pos: -1.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 681 + - uid: 315 components: - type: Transform - rot: 3.141592653589793 rad - pos: 23.5,-5.5 + pos: -0.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 682 + - uid: 355 components: - type: Transform - pos: 13.5,2.5 + pos: -6.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 683 + - uid: 356 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,4.5 + pos: -5.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1075 + - uid: 357 components: - type: Transform - pos: 16.5,27.5 + pos: -4.5,7.5 parent: 179 - - uid: 1076 + - uid: 358 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,22.5 + pos: -3.5,7.5 parent: 179 -- proto: PoweredSmallLight - entities: - - uid: 163 + - uid: 361 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,26.5 + pos: -0.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 166 + - uid: 362 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,24.5 + pos: 0.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 167 + - uid: 363 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,17.5 + pos: 1.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 388 + - uid: 366 components: - type: Transform - pos: 0.5,-5.5 + pos: -2.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 417 + - uid: 367 components: - type: Transform - pos: -4.5,-5.5 + pos: -1.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 483 + - uid: 368 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-9.5 + pos: -0.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 534 + - uid: 371 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-5.5 + pos: 1.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 -- proto: Protolathe - entities: - - uid: 12 + - uid: 385 components: - type: Transform - pos: 13.5,21.5 + pos: -3.5,-2.5 parent: 179 - - uid: 384 + - uid: 386 components: - type: Transform - pos: -6.5,6.5 + pos: -3.5,-1.5 parent: 179 -- proto: Railing - entities: - - uid: 665 + - uid: 440 components: - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,9.5 + pos: 0.5,4.5 parent: 179 - - uid: 927 + - uid: 445 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,10.5 + pos: -3.5,-0.5 parent: 179 - - uid: 928 + - uid: 448 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,11.5 + pos: 3.5,5.5 parent: 179 - - uid: 929 + - uid: 452 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,12.5 + pos: 1.5,-5.5 parent: 179 - - uid: 930 + - uid: 461 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,13.5 + pos: 7.5,-6.5 parent: 179 - - uid: 931 + - uid: 465 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,14.5 + pos: 1.5,8.5 parent: 179 - - uid: 932 + - uid: 466 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,15.5 + pos: 0.5,8.5 parent: 179 - - uid: 933 + - uid: 467 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,16.5 + pos: -3.5,8.5 parent: 179 - - uid: 934 + - uid: 468 components: - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,17.5 + pos: -0.5,8.5 parent: 179 - - uid: 935 + - uid: 470 components: - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,17.5 + pos: -6.5,8.5 parent: 179 - - uid: 936 + - uid: 471 components: - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,17.5 + pos: -5.5,8.5 parent: 179 - - uid: 937 + - uid: 472 components: - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,17.5 + pos: -4.5,8.5 parent: 179 - - uid: 938 + - uid: 515 components: - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,17.5 + pos: -15.5,-5.5 parent: 179 - - uid: 939 + - uid: 516 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,17.5 + pos: -15.5,-1.5 parent: 179 - - uid: 940 + - uid: 520 components: - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,17.5 + pos: -15.5,-0.5 parent: 179 - - uid: 941 + - uid: 559 components: - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,17.5 + pos: -15.5,-4.5 parent: 179 - - uid: 942 + - uid: 560 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,17.5 + pos: -15.5,-3.5 parent: 179 - - uid: 943 + - uid: 568 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,17.5 + pos: 18.5,4.5 parent: 179 - - uid: 944 + - uid: 569 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,17.5 + pos: 21.5,6.5 parent: 179 - - uid: 945 + - uid: 570 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,17.5 + pos: 20.5,6.5 parent: 179 - - uid: 946 + - uid: 571 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,17.5 + pos: 18.5,6.5 parent: 179 - - uid: 947 + - uid: 572 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,17.5 + pos: 19.5,6.5 parent: 179 - - uid: 948 + - uid: 573 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,17.5 + pos: 18.5,5.5 parent: 179 -- proto: RailingCornerSmall - entities: - - uid: 919 + - uid: 574 components: - type: Transform - pos: -14.5,9.5 + pos: 22.5,8.5 parent: 179 -- proto: ReinforcedWindow - entities: - - uid: 1084 + - uid: 575 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,23.5 + pos: 24.5,4.5 parent: 179 - - uid: 1093 + - uid: 584 components: - type: Transform - pos: 8.5,17.5 + pos: 23.5,7.5 parent: 179 - - uid: 1094 + - uid: 586 components: - type: Transform - pos: 9.5,17.5 + pos: 25.5,10.5 parent: 179 - - uid: 1095 + - uid: 587 components: - type: Transform - pos: 10.5,17.5 + pos: 23.5,10.5 parent: 179 - - uid: 1096 + - uid: 588 components: - type: Transform - pos: 10.5,16.5 + pos: 24.5,10.5 parent: 179 -- proto: ResearchAndDevelopmentServer - entities: - - uid: 17 + - uid: 589 components: - type: Transform - pos: 8.5,18.5 + pos: 26.5,10.5 parent: 179 -- proto: ResearchDiskDebug - entities: - - uid: 54 + - uid: 590 components: - type: Transform - pos: 9.532393,18.446417 + pos: 27.5,10.5 parent: 179 -- proto: RubberStampCaptain - entities: - - uid: 982 + - uid: 594 components: - type: Transform - pos: 12.800895,12.664745 + pos: 13.5,2.5 parent: 179 -- proto: RubberStampCentcom - entities: - - uid: 980 + - uid: 595 components: - type: Transform - pos: 12.186007,12.716865 + pos: 13.5,0.5 parent: 179 -- proto: RubberStampSyndicate - entities: - - uid: 981 + - uid: 596 components: - type: Transform - pos: 12.436131,12.550082 + pos: 13.5,1.5 parent: 179 -- proto: Screen - entities: - - uid: 1192 + - uid: 684 components: - type: Transform - pos: 4.5,-14.5 + pos: -3.5,0.5 parent: 179 -- proto: Screwdriver - entities: - - uid: 431 + - uid: 685 components: - type: Transform - pos: -1.235331,4.739151 + pos: 3.5,4.5 parent: 179 -- proto: SeedExtractor - entities: - - uid: 65 + - uid: 686 components: - type: Transform - pos: 2.5,17.5 + pos: 3.5,6.5 parent: 179 -- proto: SheetGlass - entities: - - uid: 354 + - uid: 706 components: - type: Transform - pos: 8.57603,21.566113 + pos: -1.5,-3.5 parent: 179 - - uid: 479 + - uid: 707 components: - type: Transform - pos: -5.13758,7.5586076 + pos: -0.5,-3.5 parent: 179 - - uid: 529 + - uid: 710 components: - type: Transform - pos: -15.5,-3.5 + pos: 0.5,-3.5 parent: 179 - - uid: 564 + - uid: 1561 components: - type: Transform - pos: -15.5,-1.5 + pos: 7.5,-5.5 parent: 179 - - uid: 565 +- proto: TableGlass + entities: + - uid: 964 components: - type: Transform - pos: -15.5,-1.5 + pos: 9.5,12.5 parent: 179 - - uid: 566 + - uid: 965 components: - type: Transform - pos: -15.5,-3.5 + pos: 11.5,12.5 parent: 179 -- proto: SheetGlass1 - entities: - - uid: 960 + - uid: 966 components: - type: Transform - pos: -3.981244,10.799851 + pos: 13.5,12.5 parent: 179 -- proto: SheetPGlass - entities: - - uid: 416 + - uid: 975 components: - type: Transform - pos: -0.5,8.5 + pos: 10.5,12.5 parent: 179 -- proto: SheetPlasma - entities: - - uid: 1077 + - uid: 976 components: - type: Transform - pos: 17.485096,24.503635 + pos: 12.5,12.5 parent: 179 -- proto: SheetPlasteel +- proto: TargetClown entities: - - uid: 478 + - uid: 459 components: - type: Transform - pos: -4.0129576,7.6107273 + pos: 7.5,-0.5 parent: 179 -- proto: SheetPlastic +- proto: TargetHuman entities: - - uid: 79 + - uid: 159 components: - type: Transform - pos: 8.951309,21.511908 + pos: -6.5,-1.5 parent: 179 - - uid: 181 + - uid: 248 components: - type: Transform - pos: -4.54383,7.579455 + pos: 7.5,1.5 parent: 179 -- proto: SheetRPGlass +- proto: TargetSyndicate entities: - - uid: 182 + - uid: 613 components: - type: Transform - pos: -0.5,7.5 + pos: 7.5,-2.5 parent: 179 -- proto: SheetSteel +- proto: TegCenter entities: - - uid: 205 + - uid: 1576 components: - type: Transform - pos: -15.5,-5.5 + rot: 1.5707963267948966 rad + pos: 13.5,-18.5 parent: 179 - - uid: 305 +- proto: TegCirculator + entities: + - uid: 1577 components: - type: Transform - pos: 9.435405,21.503613 + pos: 14.5,-18.5 parent: 179 - - uid: 382 + - type: PointLight + color: '#FF3300FF' + - uid: 1578 components: - type: Transform - pos: -15.5,-5.5 + rot: 3.141592653589793 rad + pos: 12.5,-18.5 parent: 179 - - uid: 473 + - type: PointLight + color: '#FF3300FF' +- proto: TelecomServerFilled + entities: + - uid: 963 components: - type: Transform - pos: -5.6834707,7.529523 + pos: -3.5,10.5 parent: 179 - - uid: 543 +- proto: TimerTrigger + entities: + - uid: 482 components: - type: Transform - pos: -15.5,-4.5 + pos: 6.413024,9.39097 parent: 179 - - uid: 544 +- proto: ToolboxElectricalFilled + entities: + - uid: 365 components: - type: Transform - pos: -15.5,-4.5 + pos: 0.4993378,3.429311 parent: 179 -- proto: SignalButton - entities: - - uid: 1013 + - uid: 419 components: - type: Transform - pos: -4.5,-14.5 + pos: -0.8099712,-5.21454 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 202: - - Pressed: Toggle - 984: - - Pressed: Toggle - - uid: 1014 + - uid: 420 components: - type: Transform - pos: 3.5,-14.5 + pos: -0.5597038,-5.679647 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 697: - - Pressed: Toggle - 698: - - Pressed: Toggle -- proto: SignCargoDock +- proto: ToolboxMechanicalFilled entities: - - uid: 1046 + - uid: 364 components: - type: Transform - pos: 4.5,-4.5 + pos: 1.452203,3.4605832 parent: 179 -- proto: SmallLight +- proto: ToyRubberDuck entities: - - uid: 1048 + - uid: 723 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-15.5 + pos: -1.6653601,11.616664 parent: 179 - - uid: 1049 +- proto: trayScanner + entities: + - uid: 758 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-15.5 + pos: 1.354346,4.548879 parent: 179 -- proto: SMESBasic +- proto: TritiumCanister entities: - - uid: 1017 + - uid: 254 components: - type: Transform - pos: -6.5,-12.5 + pos: 13.5,-2.5 parent: 179 -- proto: SodaDispenser - entities: - - uid: 751 + - uid: 619 components: - type: Transform - pos: 8.5,12.5 + pos: 12.5,-2.5 parent: 179 -- proto: SpawnMobHuman - entities: - - uid: 138 + - uid: 1312 components: - type: Transform - pos: -6.5,-0.5 + pos: 24.5,-13.5 parent: 179 - - uid: 139 +- proto: TwoWayLever + entities: + - uid: 699 components: - type: Transform - pos: -6.5,0.5 + pos: -3.5,-13.5 parent: 179 - - uid: 140 + - type: DeviceLinkSource + linkedPorts: + 990: + - Left: Forward + - Right: Reverse + - Middle: Off + 195: + - Left: Forward + - Right: Reverse + - Middle: Off + 991: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 722 components: - type: Transform - pos: 3.5,7.5 + pos: 1.5,11.5 parent: 179 -- proto: SpawnMobCorgiMouse - entities: - - uid: 1050 + - type: DeviceLinkSource + linkedPorts: + 721: + - Left: Forward + - Right: Reverse + - Middle: Off + 720: + - Left: Forward + - Right: Reverse + - Middle: Off + 716: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 983 components: - type: Transform - pos: 3.5,8.5 + pos: 2.5,-13.5 parent: 179 -- proto: SpawnPointCaptain - entities: - - uid: 954 + - type: DeviceLinkSource + linkedPorts: + 985: + - Left: Forward + - Right: Reverse + - Middle: Off + 259: + - Left: Forward + - Right: Reverse + - Middle: Off + 989: + - Left: Forward + - Right: Reverse + - Middle: Off + 463: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 1290 components: - type: Transform - pos: -4.5,4.5 + pos: 7.5,-14.5 parent: 179 -- proto: SpawnPointLatejoin - entities: - - uid: 961 + - type: TwoWayLever + nextSignalLeft: True + - type: DeviceLinkSource + linkedPorts: + 1234: + - Left: Open + - Right: Open + - Middle: Close + 1233: + - Left: Open + - Right: Open + - Middle: Close + 1232: + - Left: Open + - Right: Open + - Middle: Close + 728: + - Left: Trigger + - Right: Trigger + - Middle: Trigger + - uid: 1499 + components: + - type: Transform + pos: 11.5,-12.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 1385: + - Left: Open + - Right: Open + - Middle: Close + - uid: 1520 components: - type: Transform - pos: -3.5,3.5 + pos: 7.5,-18.5 parent: 179 -- proto: SpawnPointObserver + - type: DeviceLinkSource + linkedPorts: + 1230: + - Left: Open + - Right: Open + - Middle: Close +- proto: UnfinishedMachineFrame entities: - - uid: 679 + - uid: 522 components: - type: Transform - pos: -3.5,4.5 + pos: -6.5,10.5 parent: 179 -- proto: Spear +- proto: UniformPrinter entities: - - uid: 185 + - uid: 443 components: - type: Transform - pos: -3.4579864,-1.9811735 + pos: -7.5,4.5 parent: 179 -- proto: SprayBottleWater +- proto: VendingMachineCigs entities: - - uid: 903 + - uid: 870 components: - type: Transform - pos: 6.985283,16.424004 + pos: -14.5,4.5 parent: 179 -- proto: Stimpack +- proto: VendingMachineEngivend entities: - - uid: 462 + - uid: 441 components: - type: Transform - pos: 3.6877818,5.312015 + pos: -11.5,4.5 parent: 179 -- proto: Stool - entities: - - uid: 383 + - uid: 523 components: - type: Transform - pos: -1.5,-9.5 + pos: -11.5,-1.5 parent: 179 - - uid: 387 + - uid: 1567 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-6.5 + pos: 5.5,-11.5 parent: 179 -- proto: Stunbaton + - type: ActionGrant + actions: + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow +- proto: VendingMachineMedical entities: - - uid: 434 + - uid: 156 components: - type: Transform - pos: -3.1734612,-2.6066077 + pos: 25.5,-5.5 parent: 179 -- proto: SubstationBasic - entities: - - uid: 1018 + - uid: 157 components: - type: Transform - pos: -6.5,-13.5 + pos: 27.5,-5.5 parent: 179 -- proto: SurveillanceCameraGeneral - entities: - - uid: 1186 + - uid: 158 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,10.5 + pos: 29.5,3.5 parent: 179 - - uid: 1188 + - uid: 521 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,21.5 + pos: -12.5,4.5 parent: 179 - - uid: 1190 +- proto: VendingMachineSalvage + entities: + - uid: 485 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,10.5 + pos: -15.5,4.5 parent: 179 -- proto: SurveillanceCameraRouterGeneral +- proto: VendingMachineSec entities: - - uid: 1189 + - uid: 874 components: - type: Transform - pos: 9.5,24.5 + pos: -13.5,4.5 parent: 179 -- proto: Syringe +- proto: VendingMachineTankDispenserEngineering entities: - - uid: 460 + - uid: 615 components: - type: Transform - pos: 3.2502818,4.5823417 + pos: 17.5,-7.5 parent: 179 - - uid: 738 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 614 components: - type: Transform - pos: 5.767191,9.787079 + pos: 14.5,-7.5 parent: 179 -- proto: Table +- proto: VendingMachineVendomat entities: - - uid: 63 + - uid: 1565 components: - type: Transform - pos: 9.5,21.5 + pos: 5.5,-12.5 parent: 179 - - uid: 64 +- proto: VendingMachineYouTool + entities: + - uid: 350 components: - type: Transform - pos: 10.5,21.5 + pos: -11.5,-0.5 parent: 179 - - uid: 67 + - uid: 1566 components: - type: Transform - pos: 8.5,21.5 + pos: 5.5,-10.5 parent: 179 - - uid: 92 + - type: ActionGrant + actions: + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow +- proto: WallSolid + entities: + - uid: 3 components: - type: Transform - pos: 11.5,21.5 + pos: 1.5,18.5 parent: 179 - - uid: 143 + - uid: 4 components: - type: Transform - pos: 33.5,-3.5 + pos: 11.5,26.5 parent: 179 - - uid: 144 + - uid: 5 components: - type: Transform - pos: 33.5,-2.5 + pos: 18.5,24.5 parent: 179 - - uid: 145 + - uid: 6 components: - type: Transform - pos: 33.5,-1.5 + pos: 20.5,15.5 parent: 179 - - uid: 161 + - uid: 8 components: - type: Transform - pos: 24.5,-5.5 + pos: 14.5,19.5 parent: 179 - - uid: 162 + - uid: 9 components: - type: Transform - pos: 23.5,-5.5 + pos: 1.5,19.5 parent: 179 - - uid: 172 + - uid: 10 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,9.5 + pos: 18.5,26.5 parent: 179 - - uid: 180 + - uid: 11 components: - type: Transform - pos: -4.5,10.5 + pos: 13.5,26.5 parent: 179 - - uid: 262 + - uid: 13 components: - type: Transform - pos: -3.5,-5.5 + pos: 25.5,15.5 parent: 179 - - uid: 263 + - uid: 18 components: - type: Transform - pos: -2.5,-5.5 + pos: 4.5,26.5 parent: 179 - - uid: 264 + - uid: 19 components: - type: Transform - pos: -1.5,-5.5 + pos: 18.5,25.5 parent: 179 - - uid: 265 + - uid: 21 components: - type: Transform - pos: -0.5,-5.5 + pos: 10.5,26.5 parent: 179 - - uid: 267 + - uid: 22 components: - type: Transform - pos: 23.5,5.5 + pos: 26.5,15.5 parent: 179 - - uid: 268 + - uid: 25 components: - type: Transform - pos: 23.5,6.5 + pos: 1.5,21.5 parent: 179 - - uid: 298 + - uid: 27 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,9.5 + pos: 8.5,-0.5 parent: 179 - - uid: 299 + - uid: 28 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,9.5 + pos: 18.5,18.5 parent: 179 - - uid: 300 + - uid: 29 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,9.5 + pos: 18.5,21.5 parent: 179 - - uid: 312 + - uid: 30 components: - type: Transform - pos: -3.5,-10.5 + pos: 1.5,22.5 parent: 179 - - uid: 313 + - uid: 31 components: - type: Transform - pos: -2.5,-10.5 + pos: 1.5,20.5 parent: 179 - - uid: 314 + - uid: 32 components: - type: Transform - pos: -1.5,-10.5 + pos: 18.5,19.5 parent: 179 - - uid: 315 + - uid: 33 components: - type: Transform - pos: -0.5,-10.5 + pos: 23.5,15.5 parent: 179 - - uid: 355 + - uid: 34 components: - type: Transform - pos: -6.5,7.5 + pos: 12.5,22.5 parent: 179 - - uid: 356 + - uid: 35 components: - type: Transform - pos: -5.5,7.5 + pos: 27.5,15.5 parent: 179 - - uid: 357 + - uid: 36 components: - type: Transform - pos: -4.5,7.5 + pos: 7.5,22.5 parent: 179 - - uid: 358 + - uid: 37 components: - type: Transform - pos: -3.5,7.5 + pos: 14.5,22.5 parent: 179 - - uid: 361 + - uid: 38 components: - type: Transform - pos: -0.5,7.5 + pos: 10.5,23.5 parent: 179 - - uid: 362 + - uid: 39 components: - type: Transform - pos: 0.5,7.5 + pos: 10.5,24.5 parent: 179 - - uid: 363 + - uid: 40 components: - type: Transform - pos: 1.5,7.5 + pos: 8.5,26.5 parent: 179 - - uid: 366 + - uid: 41 components: - type: Transform - pos: -2.5,4.5 + pos: 10.5,25.5 parent: 179 - - uid: 367 + - uid: 42 components: - type: Transform - pos: -1.5,4.5 + pos: 18.5,22.5 parent: 179 - - uid: 368 + - uid: 43 components: - type: Transform - pos: -0.5,4.5 + pos: 14.5,27.5 parent: 179 - - uid: 371 + - uid: 44 components: - type: Transform - pos: 1.5,4.5 + pos: 14.5,26.5 parent: 179 - - uid: 385 + - uid: 45 components: - type: Transform - pos: -3.5,-2.5 + pos: 1.5,16.5 parent: 179 - - uid: 386 + - uid: 46 components: - type: Transform - pos: -3.5,-1.5 + pos: 18.5,27.5 parent: 179 - - uid: 440 + - uid: 49 components: - type: Transform - pos: 0.5,4.5 + pos: 7.5,28.5 parent: 179 - - uid: 445 + - uid: 50 components: - type: Transform - pos: -3.5,-0.5 + pos: 13.5,22.5 parent: 179 - - uid: 448 + - uid: 51 components: - type: Transform - pos: 3.5,5.5 + pos: 12.5,26.5 parent: 179 - - uid: 465 + - uid: 52 components: - type: Transform - pos: 1.5,8.5 + pos: 1.5,15.5 parent: 179 - - uid: 466 + - uid: 53 components: - type: Transform - pos: 0.5,8.5 + pos: 9.5,26.5 parent: 179 - - uid: 467 + - uid: 55 components: - type: Transform - pos: -3.5,8.5 + pos: 24.5,15.5 parent: 179 - - uid: 468 + - uid: 56 components: - type: Transform - pos: -0.5,8.5 + pos: 14.5,25.5 parent: 179 - - uid: 470 + - uid: 57 components: - type: Transform - pos: -6.5,8.5 + pos: 14.5,21.5 parent: 179 - - uid: 471 + - uid: 60 components: - type: Transform - pos: -5.5,8.5 + pos: 7.5,21.5 parent: 179 - - uid: 472 + - uid: 61 components: - type: Transform - pos: -4.5,8.5 + pos: 18.5,20.5 parent: 179 - - uid: 515 + - uid: 62 components: - type: Transform - pos: -15.5,-5.5 + pos: 18.5,23.5 parent: 179 - - uid: 516 + - uid: 66 components: - type: Transform - pos: -15.5,-1.5 + pos: 18.5,17.5 parent: 179 - - uid: 520 + - uid: 68 components: - type: Transform - pos: -15.5,-0.5 + pos: 18.5,28.5 parent: 179 - - uid: 559 + - uid: 69 components: - type: Transform - pos: -15.5,-4.5 + pos: 28.5,15.5 parent: 179 - - uid: 560 + - uid: 71 components: - type: Transform - pos: -15.5,-3.5 + pos: 11.5,22.5 parent: 179 - - uid: 568 + - uid: 72 components: - type: Transform - pos: 18.5,4.5 + pos: 1.5,17.5 parent: 179 - - uid: 569 + - uid: 73 components: - type: Transform - pos: 21.5,6.5 + pos: 14.5,28.5 parent: 179 - - uid: 570 + - uid: 74 components: - type: Transform - pos: 20.5,6.5 + pos: 10.5,22.5 parent: 179 - - uid: 571 + - uid: 75 components: - type: Transform - pos: 18.5,6.5 + pos: 9.5,22.5 parent: 179 - - uid: 572 + - uid: 78 components: - type: Transform - pos: 19.5,6.5 + pos: 21.5,15.5 parent: 179 - - uid: 573 + - uid: 80 components: - type: Transform - pos: 18.5,5.5 + pos: 18.5,16.5 parent: 179 - - uid: 574 + - uid: 81 components: - type: Transform - pos: 22.5,8.5 + pos: 18.5,15.5 parent: 179 - - uid: 575 + - uid: 82 components: - type: Transform - pos: 24.5,4.5 + pos: 14.5,18.5 parent: 179 - - uid: 584 + - uid: 83 components: - type: Transform - pos: 23.5,7.5 + pos: 4.5,28.5 parent: 179 - - uid: 586 + - uid: 84 components: - type: Transform - pos: 25.5,10.5 + pos: 7.5,26.5 parent: 179 - - uid: 587 + - uid: 85 components: - type: Transform - pos: 23.5,10.5 + pos: 1.5,23.5 parent: 179 - - uid: 588 + - uid: 86 components: - type: Transform - pos: 24.5,10.5 + pos: 17.5,15.5 parent: 179 - - uid: 589 + - uid: 89 components: - type: Transform - pos: 26.5,10.5 + pos: 22.5,15.5 parent: 179 - - uid: 590 + - uid: 95 components: - type: Transform - pos: 27.5,10.5 + pos: 8.5,22.5 parent: 179 - - uid: 594 + - uid: 96 components: - type: Transform - pos: 13.5,2.5 + pos: 7.5,27.5 parent: 179 - - uid: 595 + - uid: 98 components: - type: Transform - pos: 13.5,0.5 + pos: 4.5,25.5 parent: 179 - - uid: 596 + - uid: 99 components: - type: Transform - pos: 13.5,1.5 + pos: 17.5,18.5 parent: 179 - - uid: 684 + - uid: 100 components: - type: Transform - pos: -3.5,0.5 + pos: 19.5,15.5 parent: 179 - - uid: 685 + - uid: 101 components: - type: Transform - pos: 3.5,4.5 + pos: 4.5,27.5 parent: 179 - - uid: 686 + - uid: 103 components: - type: Transform - pos: 3.5,6.5 + pos: 14.5,17.5 parent: 179 - - uid: 706 + - uid: 104 components: - type: Transform - pos: -1.5,-3.5 + pos: 14.5,16.5 parent: 179 - - uid: 707 + - uid: 105 components: - type: Transform - pos: -0.5,-3.5 + pos: 15.5,15.5 parent: 179 - - uid: 710 + - uid: 106 components: - type: Transform - pos: 0.5,-3.5 + pos: 14.5,15.5 parent: 179 -- proto: TableGlass - entities: - - uid: 964 + - uid: 107 components: - type: Transform - pos: 9.5,12.5 + pos: 13.5,15.5 parent: 179 - - uid: 965 + - uid: 109 components: - type: Transform - pos: 11.5,12.5 + pos: 11.5,15.5 parent: 179 - - uid: 966 + - uid: 110 components: - type: Transform - pos: 13.5,12.5 + pos: 10.5,15.5 parent: 179 - - uid: 975 + - uid: 112 components: - type: Transform - pos: 10.5,12.5 + pos: 7.5,19.5 parent: 179 - - uid: 976 + - uid: 113 components: - type: Transform - pos: 12.5,12.5 + pos: 7.5,18.5 parent: 179 -- proto: TargetHuman - entities: - - uid: 159 + - uid: 114 components: - type: Transform - pos: -6.5,-1.5 + pos: 7.5,17.5 parent: 179 -- proto: TelecomServerFilled - entities: - - uid: 963 + - uid: 117 components: - type: Transform - pos: -3.5,10.5 + pos: 5.5,18.5 parent: 179 -- proto: TimerTrigger - entities: - - uid: 482 + - uid: 118 components: - type: Transform - pos: 6.413024,9.39097 + pos: 5.5,19.5 parent: 179 -- proto: ToolboxElectricalFilled - entities: - - uid: 365 + - uid: 121 components: - type: Transform - pos: 0.4993378,3.429311 + pos: 4.5,19.5 parent: 179 - - uid: 419 + - uid: 122 components: - type: Transform - pos: -0.8099712,-5.21454 + pos: 4.5,20.5 parent: 179 - - uid: 420 + - uid: 123 components: - type: Transform - pos: -0.5597038,-5.679647 + pos: 4.5,21.5 parent: 179 -- proto: ToolboxMechanicalFilled - entities: - - uid: 364 + - uid: 124 components: - type: Transform - pos: 1.452203,3.4605832 + pos: 4.5,22.5 parent: 179 -- proto: ToyRubberDuck - entities: - - uid: 723 + - uid: 125 components: - type: Transform - pos: -1.6653601,11.616664 + pos: 4.5,23.5 parent: 179 -- proto: trayScanner - entities: - - uid: 758 + - uid: 126 components: - type: Transform - pos: 1.354346,4.548879 + pos: 4.5,24.5 parent: 179 -- proto: TwoWayLever - entities: - - uid: 699 + - uid: 160 components: - type: Transform - pos: -3.5,-13.5 + rot: -1.5707963267948966 rad + pos: 11.5,-0.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 990: - - Left: Forward - - Right: Reverse - - Middle: Off - 195: - - Left: Forward - - Right: Reverse - - Middle: Off - 991: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 722 + - uid: 164 components: - type: Transform - pos: 1.5,11.5 + rot: 1.5707963267948966 rad + pos: 22.5,9.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 721: - - Left: Forward - - Right: Reverse - - Middle: Off - 720: - - Left: Forward - - Right: Reverse - - Middle: Off - 716: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 983 + - uid: 165 components: - type: Transform - pos: 2.5,-13.5 + pos: 8.5,2.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 985: - - Left: Forward - - Right: Reverse - - Middle: Off - 259: - - Left: Forward - - Right: Reverse - - Middle: Off - 989: - - Left: Forward - - Right: Reverse - - Middle: Off - 463: - - Left: Forward - - Right: Reverse - - Middle: Off -- proto: UnfinishedMachineFrame - entities: - - uid: 522 + - uid: 168 components: - type: Transform - pos: -6.5,10.5 + rot: -1.5707963267948966 rad + pos: 10.5,-0.5 parent: 179 -- proto: UniformPrinter - entities: - - uid: 443 + - uid: 169 components: - type: Transform - pos: -7.5,4.5 + pos: 8.5,0.5 parent: 179 -- proto: VendingMachineCigs - entities: - - uid: 870 + - uid: 171 components: - type: Transform - pos: -14.5,4.5 + rot: -1.5707963267948966 rad + pos: 9.5,-0.5 parent: 179 -- proto: VendingMachineEngivend - entities: - - uid: 441 + - uid: 173 components: - type: Transform - pos: -11.5,4.5 + pos: 8.5,1.5 parent: 179 - - uid: 523 + - uid: 189 components: - type: Transform - pos: -11.5,-1.5 + pos: -7.5,0.5 parent: 179 -- proto: VendingMachineMedical - entities: - - uid: 156 + - uid: 190 components: - type: Transform - pos: 25.5,-5.5 + pos: -7.5,-0.5 parent: 179 - - uid: 157 + - uid: 191 components: - type: Transform - pos: 27.5,-5.5 + pos: -7.5,-1.5 parent: 179 - - uid: 158 + - uid: 192 components: - type: Transform - pos: 29.5,3.5 + pos: -7.5,-2.5 parent: 179 - - uid: 521 + - uid: 193 components: - type: Transform - pos: -12.5,4.5 + pos: -7.5,-3.5 parent: 179 -- proto: VendingMachineSalvage - entities: - - uid: 485 + - uid: 196 components: - type: Transform - pos: -15.5,4.5 + pos: 3.5,-14.5 parent: 179 -- proto: VendingMachineSec - entities: - - uid: 874 + - uid: 197 components: - type: Transform - pos: -13.5,4.5 + pos: 4.5,-14.5 parent: 179 -- proto: VendingMachineTankDispenserEVA - entities: - - uid: 875 + - uid: 198 components: - type: Transform - pos: 7.5,0.5 + pos: -7.5,-10.5 parent: 179 -- proto: VendingMachineYouTool - entities: - - uid: 350 + - uid: 199 components: - type: Transform - pos: -11.5,-0.5 + pos: -7.5,-11.5 parent: 179 -- proto: WallSolid - entities: - - uid: 3 + - uid: 200 components: - type: Transform - pos: 1.5,18.5 + pos: -7.5,-12.5 parent: 179 - - uid: 4 + - uid: 201 components: - type: Transform - pos: 11.5,26.5 + pos: -7.5,-13.5 parent: 179 - - uid: 5 + - uid: 208 components: - type: Transform - pos: 18.5,24.5 + pos: -7.5,-9.5 parent: 179 - - uid: 6 + - uid: 209 components: - type: Transform - pos: 20.5,15.5 + pos: -10.5,-7.5 parent: 179 - - uid: 8 + - uid: 211 components: - type: Transform - pos: 14.5,19.5 + pos: -10.5,-5.5 parent: 179 - - uid: 9 + - uid: 212 components: - type: Transform - pos: 1.5,19.5 + pos: -10.5,-4.5 parent: 179 - - uid: 10 + - uid: 213 components: - type: Transform - pos: 18.5,26.5 + pos: -10.5,-3.5 parent: 179 - - uid: 11 + - uid: 214 components: - type: Transform - pos: 13.5,26.5 + pos: -10.5,-2.5 parent: 179 - - uid: 13 + - uid: 215 components: - type: Transform - pos: 25.5,15.5 + pos: -10.5,-1.5 parent: 179 - - uid: 18 + - uid: 217 components: - type: Transform - pos: 4.5,26.5 + pos: 1.5,-4.5 parent: 179 - - uid: 19 + - uid: 218 components: - type: Transform - pos: 18.5,25.5 + pos: 0.5,-4.5 parent: 179 - - uid: 21 + - uid: 219 components: - type: Transform - pos: 10.5,26.5 + pos: -0.5,-4.5 parent: 179 - - uid: 22 + - uid: 220 components: - type: Transform - pos: 26.5,15.5 + pos: -1.5,-4.5 parent: 179 - - uid: 25 + - uid: 221 components: - type: Transform - pos: 1.5,21.5 + pos: -2.5,-4.5 parent: 179 - - uid: 27 + - uid: 222 components: - type: Transform - pos: 8.5,-0.5 + pos: -3.5,-4.5 parent: 179 - - uid: 28 + - uid: 223 components: - type: Transform - pos: 18.5,18.5 + pos: -4.5,-4.5 parent: 179 - - uid: 29 + - uid: 224 components: - type: Transform - pos: 18.5,21.5 + pos: -5.5,-4.5 parent: 179 - - uid: 30 + - uid: 225 components: - type: Transform - pos: 1.5,22.5 + pos: -6.5,-4.5 parent: 179 - - uid: 31 + - uid: 226 components: - type: Transform - pos: 1.5,20.5 + pos: 4.5,-4.5 parent: 179 - - uid: 32 + - uid: 227 components: - type: Transform - pos: 18.5,19.5 + pos: 5.5,-4.5 parent: 179 - - uid: 33 + - uid: 228 components: - type: Transform - pos: 23.5,15.5 + pos: 6.5,-4.5 parent: 179 - - uid: 34 + - uid: 229 components: - type: Transform - pos: 12.5,22.5 + pos: -7.5,-14.5 parent: 179 - - uid: 35 + - uid: 231 components: - type: Transform - pos: 27.5,15.5 + pos: -6.5,-14.5 parent: 179 - - uid: 36 + - uid: 232 components: - type: Transform - pos: 7.5,22.5 + pos: -5.5,-14.5 parent: 179 - - uid: 37 + - uid: 233 components: - type: Transform - pos: 14.5,22.5 + pos: -4.5,-14.5 parent: 179 - - uid: 38 + - uid: 234 components: - type: Transform - pos: 10.5,23.5 + pos: 6.5,-10.5 parent: 179 - - uid: 39 + - uid: 235 components: - type: Transform - pos: 10.5,24.5 + pos: 6.5,-11.5 parent: 179 - - uid: 40 + - uid: 236 components: - type: Transform - pos: 8.5,26.5 + pos: 6.5,-12.5 parent: 179 - - uid: 41 + - uid: 237 components: - type: Transform - pos: 10.5,25.5 + pos: 6.5,-13.5 parent: 179 - - uid: 42 + - uid: 238 components: - type: Transform - pos: 18.5,22.5 + pos: 6.5,-14.5 parent: 179 - - uid: 43 + - uid: 239 components: - type: Transform - pos: 14.5,27.5 + pos: 5.5,-14.5 parent: 179 - - uid: 44 + - uid: 240 components: - type: Transform - pos: 14.5,26.5 + pos: -7.5,-8.5 parent: 179 - - uid: 45 + - uid: 241 components: - type: Transform - pos: 1.5,16.5 + pos: -7.5,-7.5 parent: 179 - - uid: 46 + - uid: 242 components: - type: Transform - pos: 18.5,27.5 + pos: -8.5,-8.5 parent: 179 - - uid: 49 + - uid: 243 components: - type: Transform - pos: 7.5,28.5 + pos: -9.5,-8.5 parent: 179 - - uid: 50 + - uid: 244 components: - type: Transform - pos: 13.5,22.5 + pos: -10.5,-8.5 parent: 179 - - uid: 51 + - uid: 245 components: - type: Transform - pos: 12.5,26.5 + pos: -7.5,-5.5 parent: 179 - - uid: 52 + - uid: 260 components: - type: Transform - pos: 1.5,15.5 + pos: 6.5,-6.5 parent: 179 - - uid: 53 + - uid: 261 components: - type: Transform - pos: 9.5,26.5 + pos: 6.5,-5.5 parent: 179 - - uid: 55 + - uid: 266 components: - type: Transform - pos: 24.5,15.5 + pos: 8.5,-3.5 parent: 179 - - uid: 56 + - uid: 271 components: - type: Transform - pos: 14.5,25.5 + pos: 1.5,14.5 parent: 179 - - uid: 57 + - uid: 272 components: - type: Transform - pos: 14.5,21.5 + pos: 1.5,13.5 parent: 179 - - uid: 60 + - uid: 273 components: - type: Transform - pos: 7.5,21.5 + pos: 1.5,12.5 parent: 179 - - uid: 61 + - uid: 274 components: - type: Transform - pos: 18.5,20.5 + pos: -7.5,11.5 parent: 179 - - uid: 62 + - uid: 275 components: - type: Transform - pos: 18.5,23.5 + pos: -6.5,11.5 parent: 179 - - uid: 66 + - uid: 276 components: - type: Transform - pos: 18.5,17.5 + pos: -5.5,11.5 parent: 179 - - uid: 68 + - uid: 277 components: - type: Transform - pos: 18.5,28.5 + pos: -4.5,11.5 parent: 179 - - uid: 69 + - uid: 278 components: - type: Transform - pos: 28.5,15.5 + pos: -3.5,11.5 parent: 179 - - uid: 71 + - uid: 279 components: - type: Transform - pos: 11.5,22.5 + pos: -2.5,11.5 parent: 179 - - uid: 72 + - uid: 282 components: - type: Transform - pos: 1.5,17.5 + pos: -1.5,12.5 parent: 179 - - uid: 73 + - uid: 283 components: - type: Transform - pos: 14.5,28.5 + pos: -0.5,12.5 parent: 179 - - uid: 74 + - uid: 284 components: - type: Transform - pos: 10.5,22.5 + pos: 0.5,12.5 parent: 179 - - uid: 75 + - uid: 288 components: - type: Transform - pos: 9.5,22.5 + pos: 12.5,8.5 parent: 179 - - uid: 76 + - uid: 289 components: - type: Transform - pos: 8.5,-1.5 + pos: 11.5,8.5 parent: 179 - - uid: 77 + - uid: 290 components: - type: Transform - pos: 8.5,-2.5 + pos: 10.5,8.5 parent: 179 - - uid: 78 + - uid: 291 components: - type: Transform - pos: 21.5,15.5 + pos: 9.5,8.5 parent: 179 - - uid: 80 + - uid: 292 components: - type: Transform - pos: 18.5,16.5 + pos: 8.5,8.5 parent: 179 - - uid: 81 + - uid: 293 components: - type: Transform - pos: 18.5,15.5 + pos: 7.5,8.5 parent: 179 - - uid: 82 + - uid: 294 components: - type: Transform - pos: 14.5,18.5 + pos: 6.5,8.5 parent: 179 - - uid: 83 + - uid: 295 components: - type: Transform - pos: 4.5,28.5 + pos: 5.5,8.5 parent: 179 - - uid: 84 + - uid: 301 components: - type: Transform - pos: 7.5,26.5 + pos: 9.5,11.5 parent: 179 - - uid: 85 + - uid: 302 components: - type: Transform - pos: 1.5,23.5 + pos: 10.5,11.5 parent: 179 - - uid: 86 + - uid: 303 components: - type: Transform - pos: 17.5,15.5 + pos: 11.5,11.5 parent: 179 - - uid: 89 + - uid: 304 components: - type: Transform - pos: 22.5,15.5 + pos: 12.5,11.5 parent: 179 - - uid: 95 + - uid: 310 components: - type: Transform - pos: 8.5,22.5 + pos: 9.5,9.5 parent: 179 - - uid: 96 + - uid: 316 components: - type: Transform - pos: 7.5,27.5 + pos: -7.5,-4.5 parent: 179 - - uid: 97 + - uid: 317 components: - type: Transform - pos: 8.5,-3.5 + pos: 26.5,14.5 parent: 179 - - uid: 98 + - uid: 320 components: - type: Transform - pos: 4.5,25.5 + pos: 24.5,14.5 parent: 179 - - uid: 99 + - uid: 322 components: - type: Transform - pos: 17.5,18.5 + rot: -1.5707963267948966 rad + pos: 25.5,-11.5 parent: 179 - - uid: 100 + - uid: 329 components: - type: Transform - pos: 19.5,15.5 + pos: -11.5,5.5 parent: 179 - - uid: 101 + - uid: 335 components: - type: Transform - pos: 4.5,27.5 + pos: 13.5,11.5 parent: 179 - - uid: 103 + - uid: 336 components: - type: Transform - pos: 14.5,17.5 + pos: 14.5,11.5 parent: 179 - - uid: 104 + - uid: 337 components: - type: Transform - pos: 14.5,16.5 + pos: 13.5,9.5 parent: 179 - - uid: 105 + - uid: 338 components: - type: Transform - pos: 15.5,15.5 + pos: 13.5,8.5 parent: 179 - - uid: 106 + - uid: 339 components: - type: Transform - pos: 14.5,15.5 + pos: 13.5,7.5 parent: 179 - - uid: 107 + - uid: 341 components: - type: Transform - pos: 13.5,15.5 + pos: 24.5,12.5 parent: 179 - - uid: 109 + - uid: 342 components: - type: Transform - pos: 11.5,15.5 + pos: 26.5,12.5 parent: 179 - - uid: 110 + - uid: 346 components: - type: Transform - pos: 10.5,15.5 + rot: -1.5707963267948966 rad + pos: 25.5,-7.5 parent: 179 - - uid: 112 + - uid: 352 components: - type: Transform - pos: 7.5,19.5 + pos: 13.5,6.5 parent: 179 - - uid: 113 + - uid: 353 components: - type: Transform - pos: 7.5,18.5 + pos: 13.5,5.5 parent: 179 - - uid: 114 + - uid: 372 components: - type: Transform - pos: 7.5,17.5 + pos: 13.5,4.5 parent: 179 - - uid: 117 + - uid: 373 components: - type: Transform - pos: 5.5,18.5 + pos: 25.5,4.5 parent: 179 - - uid: 118 + - uid: 374 components: - type: Transform - pos: 5.5,19.5 + pos: 23.5,4.5 parent: 179 - - uid: 121 + - uid: 375 components: - type: Transform - pos: 4.5,19.5 + pos: 17.5,3.5 parent: 179 - - uid: 122 + - uid: 376 components: - type: Transform - pos: 4.5,20.5 + pos: -10.5,-0.5 parent: 179 - - uid: 123 + - uid: 377 components: - type: Transform - pos: 4.5,21.5 + pos: -10.5,0.5 parent: 179 - - uid: 124 + - uid: 379 components: - type: Transform - pos: 4.5,22.5 + pos: -8.5,0.5 parent: 179 - - uid: 125 + - uid: 390 components: - type: Transform - pos: 4.5,23.5 + pos: 18.5,3.5 parent: 179 - - uid: 126 + - uid: 391 components: - type: Transform - pos: 4.5,24.5 + pos: 19.5,3.5 parent: 179 - - uid: 164 + - uid: 392 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,9.5 + pos: 21.5,3.5 parent: 179 - - uid: 165 + - uid: 393 components: - type: Transform - pos: 8.5,2.5 + pos: 22.5,3.5 parent: 179 - - uid: 169 + - uid: 394 components: - type: Transform - pos: 8.5,0.5 + pos: 22.5,4.5 parent: 179 - - uid: 173 + - uid: 395 components: - type: Transform - pos: 8.5,1.5 + pos: 22.5,5.5 parent: 179 - - uid: 189 + - uid: 396 components: - type: Transform - pos: -7.5,0.5 + pos: 22.5,6.5 parent: 179 - - uid: 190 + - uid: 397 components: - type: Transform - pos: -7.5,-0.5 + pos: 22.5,7.5 parent: 179 - - uid: 191 + - uid: 399 components: - type: Transform - pos: -7.5,-1.5 + pos: 22.5,10.5 parent: 179 - - uid: 192 + - uid: 400 components: - type: Transform - pos: -7.5,-2.5 + pos: 21.5,11.5 parent: 179 - - uid: 193 + - uid: 401 components: - type: Transform - pos: -7.5,-3.5 + pos: 22.5,11.5 parent: 179 - - uid: 196 + - uid: 439 components: - type: Transform - pos: 3.5,-14.5 + pos: -13.5,5.5 parent: 179 - - uid: 197 + - uid: 449 components: - type: Transform - pos: 4.5,-14.5 + pos: -16.5,2.5 parent: 179 - - uid: 198 + - uid: 450 components: - type: Transform - pos: -7.5,-10.5 + pos: -16.5,3.5 parent: 179 - - uid: 199 + - uid: 464 components: - type: Transform - pos: -7.5,-11.5 + pos: 4.5,8.5 parent: 179 - - uid: 200 + - uid: 474 components: - type: Transform - pos: -7.5,-12.5 + pos: -7.5,8.5 parent: 179 - - uid: 201 + - uid: 475 components: - type: Transform - pos: -7.5,-13.5 + pos: -7.5,7.5 parent: 179 - - uid: 208 + - uid: 476 components: - type: Transform - pos: -7.5,-9.5 + pos: -7.5,6.5 parent: 179 - - uid: 209 + - uid: 477 components: - type: Transform - pos: -10.5,-7.5 + pos: -7.5,5.5 parent: 179 - - uid: 211 + - uid: 486 components: - type: Transform - pos: -10.5,-5.5 + pos: -15.5,5.5 parent: 179 - - uid: 212 + - uid: 487 components: - type: Transform - pos: -10.5,-4.5 + pos: -16.5,4.5 parent: 179 - - uid: 213 + - uid: 488 components: - type: Transform - pos: -10.5,-3.5 + pos: 5.5,17.5 parent: 179 - - uid: 214 + - uid: 489 components: - type: Transform - pos: -10.5,-2.5 + pos: -11.5,0.5 parent: 179 - - uid: 215 + - uid: 491 components: - type: Transform - pos: -10.5,-1.5 + pos: -16.5,5.5 parent: 179 - - uid: 217 + - uid: 492 components: - type: Transform - pos: 1.5,-4.5 + pos: -14.5,5.5 parent: 179 - - uid: 218 + - uid: 494 components: - type: Transform - pos: 0.5,-4.5 + rot: -1.5707963267948966 rad + pos: -11.5,7.5 parent: 179 - - uid: 219 + - uid: 495 components: - type: Transform - pos: -0.5,-4.5 + pos: -12.5,5.5 parent: 179 - - uid: 220 + - uid: 496 components: - type: Transform - pos: -1.5,-4.5 + pos: -16.5,1.5 parent: 179 - - uid: 221 + - uid: 497 components: - type: Transform - pos: -2.5,-4.5 + pos: -16.5,0.5 parent: 179 - - uid: 222 + - uid: 498 components: - type: Transform - pos: -3.5,-4.5 + pos: -16.5,-0.5 parent: 179 - - uid: 223 + - uid: 499 components: - type: Transform - pos: -4.5,-4.5 + pos: -16.5,-1.5 parent: 179 - - uid: 224 + - uid: 500 components: - type: Transform - pos: -5.5,-4.5 + pos: -16.5,-2.5 parent: 179 - - uid: 225 + - uid: 501 components: - type: Transform - pos: -6.5,-4.5 + pos: -16.5,-3.5 parent: 179 - - uid: 226 + - uid: 502 components: - type: Transform - pos: 4.5,-4.5 + pos: -16.5,-4.5 parent: 179 - - uid: 227 + - uid: 503 components: - type: Transform - pos: 5.5,-4.5 + pos: -16.5,-5.5 parent: 179 - - uid: 228 + - uid: 504 components: - type: Transform - pos: 6.5,-4.5 + pos: -16.5,-6.5 parent: 179 - - uid: 229 + - uid: 505 components: - type: Transform - pos: -7.5,-14.5 + pos: -16.5,-7.5 parent: 179 - - uid: 231 + - uid: 506 components: - type: Transform - pos: -6.5,-14.5 + pos: -16.5,-8.5 parent: 179 - - uid: 232 + - uid: 507 components: - type: Transform - pos: -5.5,-14.5 + pos: -15.5,-8.5 parent: 179 - - uid: 233 + - uid: 508 components: - type: Transform - pos: -4.5,-14.5 + pos: -14.5,-8.5 parent: 179 - - uid: 234 + - uid: 509 components: - type: Transform - pos: 6.5,-10.5 + pos: -13.5,-8.5 parent: 179 - - uid: 235 + - uid: 510 components: - type: Transform - pos: 6.5,-11.5 + pos: -12.5,-8.5 parent: 179 - - uid: 236 + - uid: 511 components: - type: Transform - pos: 6.5,-12.5 + pos: -11.5,-8.5 parent: 179 - - uid: 237 + - uid: 517 components: - type: Transform - pos: 6.5,-13.5 + pos: 23.5,11.5 parent: 179 - - uid: 238 + - uid: 518 components: - type: Transform - pos: 6.5,-14.5 + pos: 24.5,11.5 parent: 179 - - uid: 239 + - uid: 519 components: - type: Transform - pos: 5.5,-14.5 + pos: 25.5,11.5 parent: 179 - - uid: 240 + - uid: 535 components: - type: Transform - pos: -7.5,-8.5 + pos: -15.5,0.5 parent: 179 - - uid: 241 + - uid: 539 components: - type: Transform - pos: -7.5,-7.5 + pos: 26.5,11.5 parent: 179 - - uid: 242 + - uid: 540 components: - type: Transform - pos: -8.5,-8.5 + pos: 27.5,11.5 parent: 179 - - uid: 243 + - uid: 545 components: - type: Transform - pos: -9.5,-8.5 + pos: 7.5,-4.5 parent: 179 - - uid: 244 + - uid: 547 components: - type: Transform - pos: -10.5,-8.5 + pos: 28.5,11.5 parent: 179 - - uid: 245 + - uid: 548 components: - type: Transform - pos: -7.5,-5.5 + pos: 28.5,10.5 parent: 179 - - uid: 248 + - uid: 549 components: - type: Transform - pos: 5.5,-7.5 + pos: 28.5,9.5 parent: 179 - - uid: 249 + - uid: 550 components: - type: Transform - pos: 5.5,-9.5 + pos: 28.5,8.5 parent: 179 - - uid: 250 + - uid: 551 components: - type: Transform - pos: 6.5,-9.5 + pos: 28.5,7.5 parent: 179 - - uid: 251 + - uid: 552 components: - type: Transform - pos: 6.5,-7.5 + pos: 28.5,6.5 parent: 179 - - uid: 254 + - uid: 553 components: - type: Transform - pos: 7.5,-9.5 + pos: 28.5,5.5 parent: 179 - - uid: 260 + - uid: 554 components: - type: Transform - pos: 6.5,-6.5 + pos: 26.5,-2.5 parent: 179 - - uid: 261 + - uid: 555 components: - type: Transform - pos: 6.5,-5.5 + pos: 26.5,-1.5 parent: 179 - - uid: 271 + - uid: 556 components: - type: Transform - pos: 1.5,14.5 + pos: 25.5,-0.5 parent: 179 - - uid: 272 + - uid: 557 components: - type: Transform - pos: 1.5,13.5 + pos: 26.5,-0.5 parent: 179 - - uid: 273 + - uid: 558 components: - type: Transform - pos: 1.5,12.5 + pos: 27.5,-0.5 parent: 179 - - uid: 274 + - uid: 561 components: - type: Transform - pos: -7.5,11.5 + pos: -14.5,0.5 parent: 179 - - uid: 275 + - uid: 585 components: - type: Transform - pos: -6.5,11.5 + pos: 9.5,10.5 parent: 179 - - uid: 276 + - uid: 597 components: - type: Transform - pos: -5.5,11.5 + pos: 22.5,-0.5 parent: 179 - - uid: 277 + - uid: 598 components: - type: Transform - pos: -4.5,11.5 + pos: 17.5,-0.5 parent: 179 - - uid: 278 + - uid: 599 components: - type: Transform - pos: -3.5,11.5 + pos: 18.5,-0.5 parent: 179 - - uid: 279 + - uid: 600 components: - type: Transform - pos: -2.5,11.5 + pos: 20.5,-0.5 parent: 179 - - uid: 282 + - uid: 601 components: - type: Transform - pos: -1.5,12.5 + pos: 21.5,-0.5 parent: 179 - - uid: 283 + - uid: 602 components: - type: Transform - pos: -0.5,12.5 + pos: 19.5,-0.5 parent: 179 - - uid: 284 + - uid: 603 components: - type: Transform - pos: 0.5,12.5 + pos: 14.5,3.5 parent: 179 - - uid: 288 + - uid: 604 components: - type: Transform - pos: 12.5,8.5 + pos: 13.5,3.5 parent: 179 - - uid: 289 + - uid: 605 components: - type: Transform - pos: 11.5,8.5 + pos: 12.5,3.5 parent: 179 - - uid: 290 + - uid: 606 components: - type: Transform - pos: 10.5,8.5 + pos: 12.5,2.5 parent: 179 - - uid: 291 + - uid: 607 components: - type: Transform - pos: 9.5,8.5 + pos: 12.5,1.5 parent: 179 - - uid: 292 + - uid: 608 components: - type: Transform - pos: 8.5,8.5 + pos: 12.5,0.5 parent: 179 - - uid: 293 + - uid: 609 components: - type: Transform - pos: 7.5,8.5 + pos: 12.5,-0.5 parent: 179 - - uid: 294 + - uid: 610 components: - type: Transform - pos: 6.5,8.5 + pos: 13.5,-0.5 parent: 179 - - uid: 295 + - uid: 611 components: - type: Transform - pos: 5.5,8.5 + pos: 14.5,-0.5 parent: 179 - - uid: 301 + - uid: 612 components: - type: Transform - pos: 9.5,11.5 + pos: 8.5,-2.5 parent: 179 - - uid: 302 + - uid: 618 components: - type: Transform - pos: 10.5,11.5 + pos: 14.5,-6.5 parent: 179 - - uid: 303 + - uid: 620 components: - type: Transform - pos: 11.5,11.5 + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 parent: 179 - - uid: 304 + - uid: 621 components: - type: Transform - pos: 12.5,11.5 + pos: 17.5,-6.5 parent: 179 - - uid: 310 + - uid: 622 components: - type: Transform - pos: 9.5,9.5 + pos: 18.5,-6.5 parent: 179 - - uid: 316 + - uid: 623 components: - type: Transform - pos: -7.5,-4.5 + pos: 19.5,-6.5 parent: 179 - - uid: 317 + - uid: 624 components: - type: Transform - pos: 26.5,14.5 + pos: 20.5,-6.5 parent: 179 - - uid: 320 + - uid: 625 components: - type: Transform - pos: 24.5,14.5 + pos: 21.5,-6.5 parent: 179 - - uid: 329 + - uid: 626 components: - type: Transform - pos: -11.5,5.5 + pos: 22.5,-6.5 parent: 179 - - uid: 335 + - uid: 627 components: - type: Transform - pos: 13.5,11.5 + pos: 23.5,-6.5 parent: 179 - - uid: 336 + - uid: 628 components: - type: Transform - pos: 14.5,11.5 + pos: 24.5,-6.5 parent: 179 - - uid: 337 + - uid: 629 components: - type: Transform - pos: 13.5,9.5 + pos: 25.5,-6.5 parent: 179 - - uid: 338 + - uid: 630 components: - type: Transform - pos: 13.5,8.5 + pos: 26.5,-6.5 parent: 179 - - uid: 339 + - uid: 631 components: - type: Transform - pos: 13.5,7.5 + pos: 26.5,-5.5 parent: 179 - - uid: 341 + - uid: 632 components: - type: Transform - pos: 24.5,12.5 + pos: 26.5,-4.5 parent: 179 - - uid: 342 + - uid: 633 components: - type: Transform - pos: 26.5,12.5 + pos: 27.5,-6.5 parent: 179 - - uid: 352 + - uid: 634 components: - type: Transform - pos: 13.5,6.5 + pos: 28.5,-6.5 parent: 179 - - uid: 353 + - uid: 635 components: - type: Transform - pos: 13.5,5.5 + pos: 29.5,-6.5 parent: 179 - - uid: 372 + - uid: 636 components: - type: Transform - pos: 13.5,4.5 + pos: 30.5,-6.5 parent: 179 - - uid: 373 + - uid: 637 components: - type: Transform - pos: 25.5,4.5 + pos: 31.5,-6.5 parent: 179 - - uid: 374 + - uid: 638 components: - type: Transform - pos: 23.5,4.5 + pos: 32.5,-6.5 parent: 179 - - uid: 375 + - uid: 639 components: - type: Transform - pos: 17.5,3.5 + pos: 33.5,-6.5 parent: 179 - - uid: 376 + - uid: 640 components: - type: Transform - pos: -10.5,-0.5 + pos: 34.5,-6.5 parent: 179 - - uid: 377 + - uid: 641 components: - type: Transform - pos: -10.5,0.5 + pos: 34.5,-5.5 parent: 179 - - uid: 379 + - uid: 642 components: - type: Transform - pos: -8.5,0.5 + pos: 34.5,-4.5 parent: 179 - - uid: 390 + - uid: 643 components: - type: Transform - pos: 18.5,3.5 + pos: 34.5,-3.5 parent: 179 - - uid: 391 + - uid: 644 components: - type: Transform - pos: 19.5,3.5 + pos: 34.5,-2.5 parent: 179 - - uid: 392 + - uid: 645 components: - type: Transform - pos: 21.5,3.5 + pos: 34.5,-1.5 parent: 179 - - uid: 393 + - uid: 646 components: - type: Transform - pos: 22.5,3.5 + pos: 34.5,-0.5 parent: 179 - - uid: 394 + - uid: 647 components: - type: Transform - pos: 22.5,4.5 + pos: 33.5,-0.5 parent: 179 - - uid: 395 + - uid: 648 components: - type: Transform - pos: 22.5,5.5 + pos: 32.5,-0.5 parent: 179 - - uid: 396 + - uid: 649 components: - type: Transform - pos: 22.5,6.5 + pos: 31.5,-0.5 parent: 179 - - uid: 397 + - uid: 650 components: - type: Transform - pos: 22.5,7.5 + pos: 30.5,-0.5 parent: 179 - - uid: 399 + - uid: 651 components: - type: Transform - pos: 22.5,10.5 + pos: 29.5,-0.5 parent: 179 - - uid: 400 + - uid: 652 components: - type: Transform - pos: 21.5,11.5 + pos: 30.5,0.5 parent: 179 - - uid: 401 + - uid: 653 components: - type: Transform - pos: 22.5,11.5 + pos: 30.5,1.5 parent: 179 - - uid: 418 + - uid: 654 components: - type: Transform - pos: 7.5,-7.5 + pos: 30.5,2.5 parent: 179 - - uid: 439 + - uid: 655 components: - type: Transform - pos: -13.5,5.5 + pos: 30.5,3.5 parent: 179 - - uid: 449 + - uid: 656 components: - type: Transform - pos: -16.5,2.5 + pos: 30.5,4.5 parent: 179 - - uid: 450 + - uid: 657 components: - type: Transform - pos: -16.5,3.5 + pos: 29.5,4.5 parent: 179 - - uid: 464 + - uid: 658 components: - type: Transform - pos: 4.5,8.5 + pos: 28.5,4.5 parent: 179 - - uid: 474 + - uid: 659 components: - type: Transform - pos: -7.5,8.5 + pos: 27.5,4.5 parent: 179 - - uid: 475 + - uid: 680 components: - type: Transform - pos: -7.5,7.5 + pos: 8.5,-1.5 parent: 179 - - uid: 476 + - uid: 702 components: - type: Transform - pos: -7.5,6.5 + rot: -1.5707963267948966 rad + pos: -11.5,6.5 parent: 179 - - uid: 477 + - uid: 713 components: - type: Transform - pos: -7.5,5.5 + pos: -7.5,9.5 parent: 179 - - uid: 486 + - uid: 714 components: - type: Transform - pos: -15.5,5.5 + pos: -7.5,10.5 parent: 179 - - uid: 487 + - uid: 724 components: - type: Transform - pos: -16.5,4.5 + pos: -2.5,12.5 parent: 179 - - uid: 488 + - uid: 733 components: - type: Transform - pos: 5.5,17.5 + pos: 4.5,5.5 parent: 179 - - uid: 489 + - uid: 734 components: - type: Transform - pos: -11.5,0.5 + pos: 4.5,4.5 parent: 179 - - uid: 491 + - uid: 739 components: - type: Transform - pos: -16.5,5.5 + pos: 8.5,7.5 parent: 179 - - uid: 492 + - uid: 740 components: - type: Transform - pos: -14.5,5.5 + pos: 8.5,6.5 parent: 179 - - uid: 494 + - uid: 741 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,7.5 + pos: 8.5,5.5 parent: 179 - - uid: 495 + - uid: 742 components: - type: Transform - pos: -12.5,5.5 + pos: 8.5,4.5 parent: 179 - - uid: 496 + - uid: 743 components: - type: Transform - pos: -16.5,1.5 + pos: 8.5,3.5 parent: 179 - - uid: 497 + - uid: 745 components: - type: Transform - pos: -16.5,0.5 + pos: 4.5,7.5 parent: 179 - - uid: 498 + - uid: 746 components: - type: Transform - pos: -16.5,-0.5 + pos: 4.5,6.5 parent: 179 - - uid: 499 + - uid: 846 components: - type: Transform - pos: -16.5,-1.5 + pos: 2.5,19.5 parent: 179 - - uid: 500 + - uid: 847 components: - type: Transform - pos: -16.5,-2.5 + pos: 3.5,19.5 parent: 179 - - uid: 501 + - uid: 925 components: - type: Transform - pos: -16.5,-3.5 + rot: -1.5707963267948966 rad + pos: -14.5,17.5 parent: 179 - - uid: 502 + - uid: 958 components: - type: Transform - pos: -16.5,-4.5 + rot: 3.141592653589793 rad + pos: 15.5,18.5 parent: 179 - - uid: 503 + - uid: 1016 components: - type: Transform - pos: -16.5,-5.5 + rot: -1.5707963267948966 rad + pos: 25.5,-9.5 parent: 179 - - uid: 504 + - uid: 1072 components: - type: Transform - pos: -16.5,-6.5 + pos: 15.5,28.5 parent: 179 - - uid: 505 + - uid: 1073 components: - type: Transform - pos: -16.5,-7.5 + pos: 16.5,28.5 parent: 179 - - uid: 506 + - uid: 1074 components: - type: Transform - pos: -16.5,-8.5 + pos: 17.5,28.5 parent: 179 - - uid: 507 + - uid: 1176 components: - type: Transform - pos: -15.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-10.5 parent: 179 - - uid: 508 + - uid: 1181 components: - type: Transform - pos: -14.5,-8.5 + pos: 5.5,28.5 parent: 179 - - uid: 509 + - uid: 1206 components: - type: Transform - pos: -13.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-12.5 parent: 179 - - uid: 510 + - uid: 1209 components: - type: Transform - pos: -12.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-8.5 parent: 179 - - uid: 511 + - uid: 1210 components: - type: Transform - pos: -11.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-17.5 parent: 179 - - uid: 517 + - uid: 1211 components: - type: Transform - pos: 23.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-15.5 parent: 179 - - uid: 518 + - uid: 1212 components: - type: Transform - pos: 24.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-19.5 parent: 179 - - uid: 519 + - uid: 1213 components: - type: Transform - pos: 25.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-18.5 parent: 179 - - uid: 535 + - uid: 1214 components: - type: Transform - pos: -15.5,0.5 + rot: -1.5707963267948966 rad + pos: 25.5,-22.5 parent: 179 - - uid: 539 + - uid: 1215 components: - type: Transform - pos: 26.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-20.5 parent: 179 - - uid: 540 + - uid: 1216 components: - type: Transform - pos: 27.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-21.5 parent: 179 - - uid: 545 + - uid: 1217 components: - type: Transform - pos: 7.5,-4.5 + rot: -1.5707963267948966 rad + pos: 25.5,-13.5 parent: 179 - - uid: 546 + - uid: 1218 components: - type: Transform - pos: 8.5,-4.5 + rot: -1.5707963267948966 rad + pos: 25.5,-14.5 parent: 179 - - uid: 547 + - uid: 1219 components: - type: Transform - pos: 28.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-16.5 parent: 179 - - uid: 548 + - uid: 1226 components: - type: Transform - pos: 28.5,10.5 + pos: 6.5,-22.5 parent: 179 - - uid: 549 + - uid: 1228 components: - type: Transform - pos: 28.5,9.5 + pos: 6.5,-21.5 parent: 179 - - uid: 550 + - uid: 1229 components: - type: Transform - pos: 28.5,8.5 + rot: -1.5707963267948966 rad + pos: 6.5,-19.5 parent: 179 - - uid: 551 + - uid: 1231 components: - type: Transform - pos: 28.5,7.5 + rot: -1.5707963267948966 rad + pos: 6.5,-18.5 parent: 179 - - uid: 552 + - uid: 1263 components: - type: Transform - pos: 28.5,6.5 + pos: 6.5,-23.5 parent: 179 - - uid: 553 + - uid: 1272 components: - type: Transform - pos: 28.5,5.5 + pos: 6.5,-24.5 parent: 179 - - uid: 554 + - uid: 1294 components: - type: Transform - pos: 26.5,-2.5 + pos: 25.5,-24.5 parent: 179 - - uid: 555 + - uid: 1295 components: - type: Transform - pos: 26.5,-1.5 + pos: 25.5,-23.5 parent: 179 - - uid: 556 + - uid: 1303 components: - type: Transform - pos: 25.5,-0.5 + rot: 3.141592653589793 rad + pos: 14.5,-1.5 parent: 179 - - uid: 557 + - uid: 1304 components: - type: Transform - pos: 26.5,-0.5 + rot: 3.141592653589793 rad + pos: 14.5,-2.5 parent: 179 - - uid: 558 + - uid: 1305 components: - type: Transform - pos: 27.5,-0.5 + rot: 3.141592653589793 rad + pos: 14.5,-3.5 parent: 179 - - uid: 561 + - uid: 1306 components: - type: Transform - pos: -14.5,0.5 + rot: 3.141592653589793 rad + pos: 14.5,-4.5 parent: 179 - - uid: 585 + - uid: 1307 components: - type: Transform - pos: 9.5,10.5 + rot: 3.141592653589793 rad + pos: 14.5,-5.5 parent: 179 - - uid: 597 + - uid: 1328 components: - type: Transform - pos: 22.5,-0.5 + pos: 25.5,-25.5 parent: 179 - - uid: 598 + - uid: 1329 components: - type: Transform - pos: 17.5,-0.5 + pos: 24.5,-25.5 parent: 179 - - uid: 599 + - uid: 1330 components: - type: Transform - pos: 18.5,-0.5 + pos: 23.5,-25.5 parent: 179 - - uid: 600 + - uid: 1331 components: - type: Transform - pos: 20.5,-0.5 + pos: 22.5,-25.5 parent: 179 - - uid: 601 + - uid: 1332 components: - type: Transform - pos: 21.5,-0.5 + pos: 21.5,-25.5 parent: 179 - - uid: 602 + - uid: 1333 components: - type: Transform - pos: 19.5,-0.5 + pos: 20.5,-25.5 parent: 179 - - uid: 603 + - uid: 1334 components: - type: Transform - pos: 14.5,3.5 + pos: 19.5,-25.5 parent: 179 - - uid: 604 + - uid: 1337 components: - type: Transform - pos: 13.5,3.5 + pos: 16.5,-25.5 parent: 179 - - uid: 605 + - uid: 1338 components: - type: Transform - pos: 12.5,3.5 + pos: 15.5,-25.5 parent: 179 - - uid: 606 + - uid: 1339 components: - type: Transform - pos: 12.5,2.5 + pos: 14.5,-25.5 parent: 179 - - uid: 607 + - uid: 1340 components: - type: Transform - pos: 12.5,1.5 + pos: 12.5,-25.5 parent: 179 - - uid: 608 + - uid: 1341 components: - type: Transform - pos: 12.5,0.5 + pos: 11.5,-25.5 parent: 179 - - uid: 609 + - uid: 1342 components: - type: Transform - pos: 12.5,-0.5 + pos: 10.5,-25.5 parent: 179 - - uid: 610 + - uid: 1343 components: - type: Transform - pos: 13.5,-0.5 + pos: 9.5,-25.5 parent: 179 - - uid: 611 + - uid: 1344 components: - type: Transform - pos: 14.5,-0.5 + pos: 8.5,-25.5 parent: 179 - - uid: 612 + - uid: 1345 components: - type: Transform - pos: 13.5,-1.5 + pos: 7.5,-25.5 parent: 179 - - uid: 613 + - uid: 1346 components: - type: Transform - pos: 13.5,-6.5 + pos: 6.5,-25.5 parent: 179 - - uid: 614 + - uid: 1347 components: - type: Transform - pos: 13.5,-5.5 + pos: 13.5,-25.5 parent: 179 - - uid: 615 + - uid: 1506 components: - type: Transform - pos: 13.5,-4.5 + pos: 10.5,-12.5 parent: 179 - - uid: 616 + - uid: 1559 components: - type: Transform - pos: 13.5,-3.5 + pos: 8.5,-4.5 parent: 179 - - uid: 617 +- proto: WarningCO2 + entities: + - uid: 1300 components: - type: Transform - pos: 13.5,-2.5 + rot: -1.5707963267948966 rad + pos: 25.5,-21.5 parent: 179 - - uid: 618 +- proto: WarningN2 + entities: + - uid: 1208 components: - type: Transform - pos: 14.5,-6.5 + rot: -1.5707963267948966 rad + pos: 25.5,-9.5 parent: 179 - - uid: 619 +- proto: WarningN2O + entities: + - uid: 1296 components: - type: Transform - pos: 15.5,-6.5 + rot: -1.5707963267948966 rad + pos: 25.5,-17.5 parent: 179 - - uid: 620 +- proto: WarningO2 + entities: + - uid: 1227 components: - type: Transform - pos: 16.5,-6.5 + rot: -1.5707963267948966 rad + pos: 25.5,-7.5 parent: 179 - - uid: 621 +- proto: WaterTankFull + entities: + - uid: 115 components: - type: Transform - pos: 17.5,-6.5 + pos: 4.5,18.5 parent: 179 - - uid: 622 + - uid: 694 components: - type: Transform - pos: 18.5,-6.5 + pos: -2.5,3.5 parent: 179 - - uid: 623 +- proto: WaterVaporCanister + entities: + - uid: 97 components: - type: Transform - pos: 19.5,-6.5 + pos: 12.5,-1.5 parent: 179 - - uid: 624 + - uid: 319 components: - type: Transform - pos: 20.5,-6.5 + pos: 13.5,-1.5 parent: 179 - - uid: 625 + - uid: 1313 components: - type: Transform - pos: 21.5,-6.5 + pos: 24.5,-23.5 parent: 179 - - uid: 626 +- proto: WeaponCapacitorRecharger + entities: + - uid: 708 components: - type: Transform - pos: 22.5,-6.5 + pos: -0.5,-3.5 parent: 179 - - uid: 627 +- proto: WeaponLaserCarbine + entities: + - uid: 188 components: - type: Transform - pos: 23.5,-6.5 + pos: -3.5226438,-0.45543313 parent: 179 - - uid: 628 +- proto: WeaponLauncherMultipleRocket + entities: + - uid: 671 components: - type: Transform - pos: 24.5,-6.5 + pos: -13.195735,9.730438 parent: 179 - - uid: 629 +- proto: WeaponLauncherRocket + entities: + - uid: 436 components: - type: Transform - pos: 25.5,-6.5 + pos: -3.478273,-1.1611286 parent: 179 - - uid: 630 +- proto: WeaponRifleAk + entities: + - uid: 437 components: - type: Transform - pos: 26.5,-6.5 + pos: -3.5018106,0.24183923 parent: 179 - - uid: 631 + - uid: 949 components: - type: Transform - pos: 26.5,-5.5 + pos: -12.238617,9.081488 parent: 179 - - uid: 632 +- proto: WelderExperimental + entities: + - uid: 343 components: - type: Transform - pos: 26.5,-4.5 + pos: 0.6895334,4.7183027 parent: 179 - - uid: 633 +- proto: WeldingFuelTankFull + entities: + - uid: 693 components: - type: Transform - pos: 27.5,-6.5 + pos: -1.5,3.5 parent: 179 - - uid: 634 +- proto: Window + entities: + - uid: 111 components: - type: Transform - pos: 28.5,-6.5 + pos: -0.5,-15.5 parent: 179 - - uid: 635 + - uid: 194 components: - type: Transform - pos: 29.5,-6.5 + pos: -0.5,-16.5 parent: 179 - - uid: 636 + - uid: 230 components: - type: Transform - pos: 30.5,-6.5 + pos: -0.5,-14.5 parent: 179 - - uid: 637 + - uid: 1001 components: - type: Transform - pos: 31.5,-6.5 + pos: -3.5,-16.5 parent: 179 - - uid: 638 + - uid: 1002 components: - type: Transform - pos: 32.5,-6.5 + pos: -3.5,-15.5 parent: 179 - - uid: 639 + - uid: 1003 components: - type: Transform - pos: 33.5,-6.5 + pos: -3.5,-14.5 parent: 179 - - uid: 640 + - uid: 1004 components: - type: Transform - pos: 34.5,-6.5 + pos: 2.5,-16.5 parent: 179 - - uid: 641 + - uid: 1005 components: - type: Transform - pos: 34.5,-5.5 + pos: 2.5,-15.5 parent: 179 - - uid: 642 + - uid: 1006 components: - type: Transform - pos: 34.5,-4.5 + pos: 2.5,-14.5 parent: 179 - - uid: 643 +- proto: WindowReinforcedDirectional + entities: + - uid: 340 components: - type: Transform - pos: 34.5,-3.5 + rot: 1.5707963267948966 rad + pos: 21.5,-7.5 parent: 179 - - uid: 644 + - uid: 345 components: - type: Transform - pos: 34.5,-2.5 + rot: 3.141592653589793 rad + pos: 24.5,-8.5 parent: 179 - - uid: 645 + - uid: 347 components: - type: Transform - pos: 34.5,-1.5 + pos: 24.5,-22.5 parent: 179 - - uid: 646 + - uid: 348 components: - type: Transform - pos: 34.5,-0.5 + rot: 3.141592653589793 rad + pos: 23.5,-8.5 parent: 179 - - uid: 647 + - uid: 1236 components: - type: Transform - pos: 33.5,-0.5 + pos: 23.5,-8.5 parent: 179 - - uid: 648 + - uid: 1237 components: - type: Transform - pos: 32.5,-0.5 + pos: 24.5,-8.5 parent: 179 - - uid: 649 + - uid: 1239 components: - type: Transform - pos: 31.5,-0.5 + rot: 3.141592653589793 rad + pos: 23.5,-10.5 parent: 179 - - uid: 650 + - uid: 1240 components: - type: Transform - pos: 30.5,-0.5 + rot: 3.141592653589793 rad + pos: 24.5,-10.5 parent: 179 - - uid: 651 + - uid: 1241 components: - type: Transform - pos: 29.5,-0.5 + rot: 1.5707963267948966 rad + pos: 21.5,-9.5 parent: 179 - - uid: 652 + - uid: 1242 components: - type: Transform - pos: 30.5,0.5 + rot: 1.5707963267948966 rad + pos: 21.5,-11.5 parent: 179 - - uid: 653 + - uid: 1243 components: - type: Transform - pos: 30.5,1.5 + rot: 1.5707963267948966 rad + pos: 21.5,-13.5 parent: 179 - - uid: 654 + - uid: 1244 components: - type: Transform - pos: 30.5,2.5 + rot: 1.5707963267948966 rad + pos: 21.5,-15.5 parent: 179 - - uid: 655 + - uid: 1245 components: - type: Transform - pos: 30.5,3.5 + rot: 1.5707963267948966 rad + pos: 21.5,-17.5 parent: 179 - - uid: 656 + - uid: 1246 components: - type: Transform - pos: 30.5,4.5 + rot: 1.5707963267948966 rad + pos: 21.5,-19.5 parent: 179 - - uid: 657 + - uid: 1247 components: - type: Transform - pos: 29.5,4.5 + rot: 3.141592653589793 rad + pos: 23.5,-22.5 parent: 179 - - uid: 658 + - uid: 1248 components: - type: Transform - pos: 28.5,4.5 + rot: 1.5707963267948966 rad + pos: 21.5,-21.5 parent: 179 - - uid: 659 + - uid: 1249 components: - type: Transform - pos: 27.5,4.5 + pos: 23.5,-10.5 parent: 179 - - uid: 702 + - uid: 1250 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,6.5 + pos: 24.5,-10.5 parent: 179 - - uid: 713 + - uid: 1251 components: - type: Transform - pos: -7.5,9.5 + pos: 24.5,-12.5 parent: 179 - - uid: 714 + - uid: 1252 components: - type: Transform - pos: -7.5,10.5 + pos: 24.5,-14.5 parent: 179 - - uid: 724 + - uid: 1253 components: - type: Transform - pos: -2.5,12.5 + pos: 24.5,-16.5 parent: 179 - - uid: 733 + - uid: 1254 components: - type: Transform - pos: 4.5,5.5 + pos: 24.5,-18.5 parent: 179 - - uid: 734 + - uid: 1255 components: - type: Transform - pos: 4.5,4.5 + pos: 24.5,-20.5 parent: 179 - - uid: 739 + - uid: 1256 components: - type: Transform - pos: 8.5,7.5 + pos: 23.5,-20.5 parent: 179 - - uid: 740 + - uid: 1257 components: - type: Transform - pos: 8.5,6.5 + pos: 23.5,-18.5 parent: 179 - - uid: 741 + - uid: 1259 components: - type: Transform - pos: 8.5,5.5 + rot: 3.141592653589793 rad + pos: 23.5,-24.5 parent: 179 - - uid: 742 + - uid: 1261 components: - type: Transform - pos: 8.5,4.5 + pos: 23.5,-16.5 parent: 179 - - uid: 743 + - uid: 1262 components: - type: Transform - pos: 8.5,3.5 + pos: 23.5,-14.5 parent: 179 - - uid: 745 + - uid: 1264 components: - type: Transform - pos: 4.5,7.5 + rot: 3.141592653589793 rad + pos: 24.5,-22.5 parent: 179 - - uid: 746 + - uid: 1265 components: - type: Transform - pos: 4.5,6.5 + pos: 23.5,-12.5 parent: 179 - - uid: 846 + - uid: 1266 components: - type: Transform - pos: 2.5,19.5 + pos: 23.5,-22.5 parent: 179 - - uid: 847 + - uid: 1267 components: - type: Transform - pos: 3.5,19.5 + rot: 3.141592653589793 rad + pos: 23.5,-12.5 parent: 179 - - uid: 925 + - uid: 1268 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,17.5 + rot: 3.141592653589793 rad + pos: 24.5,-12.5 parent: 179 - - uid: 958 + - uid: 1269 components: - type: Transform rot: 3.141592653589793 rad - pos: 15.5,18.5 + pos: 24.5,-14.5 parent: 179 - - uid: 1072 + - uid: 1270 components: - type: Transform - pos: 15.5,28.5 + rot: 3.141592653589793 rad + pos: 23.5,-14.5 parent: 179 - - uid: 1073 + - uid: 1271 components: - type: Transform - pos: 16.5,28.5 + rot: 1.5707963267948966 rad + pos: 21.5,-23.5 parent: 179 - - uid: 1074 + - uid: 1273 components: - type: Transform - pos: 17.5,28.5 + rot: 3.141592653589793 rad + pos: 23.5,-16.5 parent: 179 - - uid: 1181 + - uid: 1274 components: - type: Transform - pos: 5.5,28.5 + rot: 3.141592653589793 rad + pos: 24.5,-16.5 parent: 179 -- proto: WaterTankFull - entities: - - uid: 115 + - uid: 1275 components: - type: Transform - pos: 4.5,18.5 + rot: 3.141592653589793 rad + pos: 24.5,-18.5 parent: 179 - - uid: 694 + - uid: 1276 components: - type: Transform - pos: -2.5,3.5 + rot: 3.141592653589793 rad + pos: 23.5,-18.5 parent: 179 -- proto: WeaponCapacitorRecharger - entities: - - uid: 708 + - uid: 1279 components: - type: Transform - pos: -0.5,-3.5 + rot: 3.141592653589793 rad + pos: 23.5,-20.5 parent: 179 -- proto: WeaponLaserCarbine - entities: - - uid: 188 + - uid: 1280 components: - type: Transform - pos: -3.5226438,-0.45543313 + rot: 3.141592653589793 rad + pos: 24.5,-20.5 parent: 179 -- proto: WeaponLauncherMultipleRocket - entities: - - uid: 671 + - uid: 1283 components: - type: Transform - pos: -13.195735,9.730438 + rot: 3.141592653589793 rad + pos: 24.5,-24.5 parent: 179 -- proto: WeaponLauncherRocket - entities: - - uid: 436 + - uid: 1386 components: - type: Transform - pos: -3.478273,-1.1611286 + rot: 1.5707963267948966 rad + pos: 11.5,-15.5 parent: 179 -- proto: WeaponRifleAk - entities: - - uid: 437 + - uid: 1387 components: - type: Transform - pos: -3.5018106,0.24183923 + rot: 1.5707963267948966 rad + pos: 11.5,-13.5 parent: 179 - - uid: 949 + - uid: 1388 components: - type: Transform - pos: -12.238617,9.081488 + pos: 12.5,-12.5 parent: 179 -- proto: WelderExperimental - entities: - - uid: 343 + - uid: 1490 components: - type: Transform - pos: 0.6895334,4.7183027 + rot: -1.5707963267948966 rad + pos: 15.5,-15.5 parent: 179 -- proto: WeldingFuelTankFull - entities: - - uid: 693 + - uid: 1491 components: - type: Transform - pos: -1.5,3.5 + rot: 1.5707963267948966 rad + pos: 9.5,-14.5 parent: 179 -- proto: Window - entities: - - uid: 111 + - uid: 1492 components: - type: Transform - pos: -0.5,-15.5 + rot: 3.141592653589793 rad + pos: 11.5,-16.5 parent: 179 - - uid: 194 + - uid: 1494 components: - type: Transform - pos: -0.5,-16.5 + rot: -1.5707963267948966 rad + pos: 15.5,-13.5 parent: 179 - - uid: 230 + - uid: 1495 components: - type: Transform - pos: -0.5,-14.5 + rot: 3.141592653589793 rad + pos: 10.5,-16.5 parent: 179 - - uid: 1001 + - uid: 1496 components: - type: Transform - pos: -3.5,-16.5 + pos: 11.5,-12.5 parent: 179 - - uid: 1002 + - uid: 1497 components: - type: Transform - pos: -3.5,-15.5 + rot: 3.141592653589793 rad + pos: 14.5,-16.5 parent: 179 - - uid: 1003 + - uid: 1498 components: - type: Transform - pos: -3.5,-14.5 + rot: 1.5707963267948966 rad + pos: 9.5,-15.5 parent: 179 - - uid: 1004 + - uid: 1501 components: - type: Transform - pos: 2.5,-16.5 + rot: 3.141592653589793 rad + pos: 12.5,-16.5 parent: 179 - - uid: 1005 + - uid: 1505 components: - type: Transform - pos: 2.5,-15.5 + rot: 1.5707963267948966 rad + pos: 9.5,-13.5 parent: 179 - - uid: 1006 + - uid: 1562 components: - type: Transform - pos: 2.5,-14.5 + pos: 14.5,-12.5 parent: 179 - proto: Wirecutter entities: diff --git a/Resources/Prototypes/Actions/station_ai.yml b/Resources/Prototypes/Actions/station_ai.yml index 58513d7db16..dc706038100 100644 --- a/Resources/Prototypes/Actions/station_ai.yml +++ b/Resources/Prototypes/Actions/station_ai.yml @@ -5,35 +5,20 @@ description: Sends your eye back to the core. components: - type: InstantAction - priority: -10 + priority: -9 itemIconStyle: BigAction icon: sprite: Interface/Actions/actions_ai.rsi state: ai_core event: !type:JumpToCoreEvent -- type: entity - id: ActionShowJobIcons - name: Show job icons - description: Shows job icons for crew members. - components: - - type: InstantAction - priority: -5 - itemIconStyle: BigAction - icon: - sprite: Interface/Actions/actions_ai.rsi - state: job_view - event: !type:ActionComponentChangeEvent - components: - - type: ShowJobIcons - - type: entity id: ActionSurvCameraLights name: Toggle camera lights description: Enable surveillance camera lights near wherever you're viewing. components: - type: InstantAction - priority: -6 + priority: -5 itemIconStyle: BigAction icon: sprite: Interface/Actions/actions_ai.rsi diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 5430a3f005a..d80e36bde1f 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -280,6 +280,8 @@ checkCanInteract: false checkConsciousness: false event: !type:WakeActionEvent + startDelay: true + useDelay: 2 - type: entity id: ActionActivateHonkImplant diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 48619d09389..52ab1dae962 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -302,13 +302,19 @@ components: - type: StorageFill contents: + - id: DefibrillatorSyndicate - id: MedkitCombatFilled - - id: Defibrillator + amount: 4 + - id: Tourniquet + amount: 4 - id: CombatMedipen - amount: 3 - - id: ClothingHandsGlovesNitrile - - id: SyringeTranexamicAcid - - id: SyringeHyronalin + amount: 4 + - id: PunctAutoInjector + amount: 4 + - id: PyraAutoInjector + amount: 4 + - id: AirlossAutoInjector + amount: 4 - type: entity parent: ClothingBackpackDuffelSyndicateBundle diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index e0aaf0c835c..519de0d169f 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -46,10 +46,12 @@ table: !type:AllSelector children: - id: Stunbaton - - id: GrenadeFlashBang - - id: TearGasGrenade + - id: GrenadeFlashBang # DeltaV: revert upstream #32291 + - id: TearGasGrenade # DeltaV - id: Handcuffs - id: Handcuffs + #- id: HoloprojectorSecurity # DeltaV + #- id: RadioHandheldSecurity # DeltaV - type: entity id: ClothingBeltSecurityFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 6c1c8d5d72a..9b0ca383ae3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -20,7 +20,8 @@ BoxCandle: 2 BoxCandleSmall: 2 Urn: 5 - SilverRing: 2 # Delta-V (Isn't the stuff above also deltav??) + Bible: 1 + SilverRing: 2 # Delta-V RingBox: 2 # Delta-V emaggedInventory: ClothingOuterArmorCult: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml index dda9b4647d7..5051caf8555 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml @@ -11,6 +11,7 @@ FoodPlate: 10 FoodPlateSmall: 10 FoodPlateTin: 5 + FoodPlateMuffinTin: 5 FoodKebabSkewer: 5 DrinkGlass: 5 Beaker: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 9fe0f028b13..9e7c72a46cd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -7,6 +7,7 @@ Bloodpack: 5 EpinephrineChemistryBottle: 3 Syringe: 5 + BoxBottle: 3 Portafib: 1 # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml ClothingEyesHudMedical: 2 ClothingEyesEyepatchHudMedical: 2 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 587bbb65445..0f44be58f07 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -699,9 +699,9 @@ productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled discountCategory: rareDiscounts discountDownTo: - Telecrystal: 12 + Telecrystal: 16 cost: - Telecrystal: 20 + Telecrystal: 24 categories: - UplinkChemicals conditions: diff --git a/Resources/Prototypes/Datasets/Names/last.yml b/Resources/Prototypes/Datasets/Names/last.yml index 8cc544afd67..2f952f957a0 100644 --- a/Resources/Prototypes/Datasets/Names/last.yml +++ b/Resources/Prototypes/Datasets/Names/last.yml @@ -219,7 +219,6 @@ - Howe - Huey - Hughes - - Hujsak - Hunt - Hunter - Hussain diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 17bd290d72a..5b0fc165163 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -495,7 +495,6 @@ - CartridgeAmmo - DoorRemote - Whistle - - HolosignProjector - BalloonPopper - type: ItemMapper # DeltaV - adjust for DeltaV sprites. mapLayers: diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 59fa1b0d1a6..8784ed77cec 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -222,3 +222,16 @@ state: metal_foam-north - map: [ "enum.EdgeLayer.West" ] state: metal_foam-west + +- type: entity + id: ReactionFlash + categories: [ HideSpawnMenu ] + components: + - type: PointLight + enabled: true + radius: 2 + energy: 8 + - type: LightFade + duration: 0.5 + - type: TimedDespawn + lifetime: 0.5 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml index 99093b25574..ea943bc85b2 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_baked_single.yml @@ -46,6 +46,8 @@ - FoodBakedMuffinBerry - FoodBakedMuffinCherry - FoodBakedMuffinBluecherry + - FoodBakedMuffinChocolate + - FoodBakedMuffinBanana - FoodBakedBunHoney - FoodBakedBunHotX - FoodBakedBunMeat diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index b4cee6b0915..2ec028c0208 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -289,7 +289,6 @@ - type: AccessReader access: [["Command"], ["Research"]] - type: ShowJobIcons - - type: ShowMindShieldIcons - type: entity id: BaseBorgChassisSyndicate diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index fc4f9efdd52..48ed10b6181 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -133,7 +133,7 @@ icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner } iconOn: Interface/Actions/actions_ai.rsi/mass_scanner.png keywords: [ "AI", "console", "interface" ] - priority: -7 + priority: -6 event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key } - type: entity @@ -157,7 +157,7 @@ icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor } iconOn: Interface/Actions/actions_ai.rsi/crew_monitor.png keywords: [ "AI", "console", "interface" ] - priority: -9 + priority: -8 event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key } - type: entity @@ -169,5 +169,5 @@ icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records } iconOn: Interface/Actions/actions_ai.rsi/station_records.png keywords: [ "AI", "console", "interface" ] - priority: -8 + priority: -7 event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key } diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 9208d4c8a98..cc8ed53c01b 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -84,6 +84,7 @@ icon: Interface/Actions/scream.png checkCanInteract: false event: !type:BooActionEvent + startDelay: true useDelay: 120 - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 9f7e206c249..be2b5a44f95 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -33,7 +33,6 @@ - type: ActionGrant actions: - ActionJumpToCore - - ActionShowJobIcons - ActionSurvCameraLights - ActionAIViewLaws - type: UserInterface @@ -70,6 +69,9 @@ canShuttle: false title: comms-console-announcement-title-station-ai color: "#2ed2fd" + - type: Speech + speechVerb: Robotic + - type: ShowJobIcons - type: entity id: AiHeldIntellicard diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index e68ede7a3c9..b4be6a8dfd1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -19,44 +19,84 @@ - type: Item size: Tiny -# Muffins/Buns +# Muffins - type: entity name: muffin - parent: FoodBakedBase + parent: FoodInjectableBase id: FoodBakedMuffin description: A delicious and spongy little cake. components: + - type: Food + trash: + - FoodPlateMuffinTin - type: Sprite + sprite: Objects/Consumable/Food/Baked/misc.rsi state: muffin + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 + - type: FlavorProfile + flavors: + - sweet + - type: Item + size: Tiny - type: entity name: berry muffin - parent: FoodBakedBase + parent: FoodBakedMuffin id: FoodBakedMuffinBerry description: A delicious and spongy little cake, with berries. components: - type: Sprite state: muffin-berry + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: JuiceBerry + Quantity: 2 - type: Tag tags: - Fruit - type: entity name: cherry muffin - parent: FoodBakedBase + parent: FoodBakedMuffin id: FoodBakedMuffinCherry description: A sweet muffin with cherry bits. components: - type: Sprite state: muffin-cherry + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: JuiceCherry + Quantity: 2 - type: Tag tags: - Fruit - type: entity name: bluecherry muffin - parent: FoodBakedBase + parent: FoodBakedMuffin id: FoodBakedMuffinBluecherry description: Blue cherries inside a delicious muffin. components: @@ -66,6 +106,51 @@ tags: - Fruit +- type: entity + name: chocolate muffin + parent: FoodBakedMuffin + id: FoodBakedMuffinChocolate + description: A delicious and spongy chocolate muffin. + components: + - type: Sprite + state: muffin-chocolate + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: CocoaPowder + Quantity: 2 + +- type: entity + name: banana muffin + parent: FoodBakedMuffin + id: FoodBakedMuffinBanana + description: A delicious and spongy banana muffin. + components: + - type: Sprite + state: muffin-banana + - type: SolutionContainerManager + solutions: + food: + maxVol: 12 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 + - ReagentId: JuiceBanana + Quantity: 2 + - type: Tag + tags: + - Fruit + +# Buns + - type: entity name: honey bun #TODO honey parent: FoodBakedBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 40cb141af78..ffccf07ab64 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -21,6 +21,10 @@ visible: false - type: MixableSolution solution: food + - type: Drink + solution: food + useSound: + path: /Audio/Items/drink.ogg - type: DamageOnLand damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml index 63c47df67e7..2e2f2979bc7 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml @@ -178,3 +178,27 @@ materialComposition: Steel: 60 - type: SpaceGarbage + +# Muffin Tin + +- type: entity + name: muffin tin + parent: BaseItem + id: FoodPlateMuffinTin + description: A cheap foil tin for muffins. + components: + - type: Sprite + sprite: Objects/Consumable/Food/plates.rsi + state: muffin-tin + - type: Item + size: Small + shape: + - 0,0,1,0 + storedOffset: 0,-3 + - type: Tag + tags: + - Trash + - type: PhysicalComposition + materialComposition: + Steel: 30 + - type: SpaceGarbage diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml index 0c8b539c590..0df74d80d6a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml @@ -121,6 +121,7 @@ - type: Tag tags: - HolofanProjector + - SecBeltEquip - type: StaticPrice price: 50 diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index f065fd6faae..75fc55f21c5 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -730,6 +730,14 @@ accentHColor: "#447987" - type: Icon state: pda-hos + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge # DeltaV + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - LogProbeCartridge - type: entity parent: BaseSecurityPDA @@ -778,6 +786,16 @@ borderColor: "#00842e" - type: Icon state: pda-centcom + - type: CartridgeLoader + uiKey: enum.PdaUiKey.Key + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - MedTekCartridge + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - LogProbeCartridge + - AstroNavCartridge - type: entity parent: CentcomPDA @@ -799,6 +817,9 @@ - NotekeeperCartridge - NewsReaderCartridge - LogProbeCartridge + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - MedTekCartridge + - AstroNavCartridge - StockTradingCartridge # Delta-V - type: entity @@ -893,14 +914,6 @@ uiKey: enum.PdaUiKey.Key preinstalled: - NotekeeperCartridge - cartridgeSlot: - priority: -1 - name: Cartridge - ejectSound: /Audio/Machines/id_swipe.ogg - insertSound: /Audio/Machines/id_insert.ogg - whitelist: - components: - - Cartridge - type: entity parent: BaseSecurityPDA @@ -918,6 +931,16 @@ accentVColor: "#447987" - type: Icon state: pda-ert + - type: CartridgeLoader + uiKey: enum.PdaUiKey.Key + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - MedTekCartridge + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - LogProbeCartridge + - AstroNavCartridge - type: entity parent: ERTLeaderPDA @@ -958,14 +981,6 @@ components: - type: Pda id: ERTMedicIDCard - - type: CartridgeLoader - uiKey: enum.PdaUiKey.Key - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - MedTekCartridge - - SecWatchCartridge # DeltaV: SecWatch replaces wantedList - type: entity parent: ERTLeaderPDA @@ -1073,6 +1088,14 @@ borderColor: "#774705" - type: Icon state: pda-detective + - type: CartridgeLoader + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge # DeltaV + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - LogProbeCartridge - type: entity parent: BaseMedicalPDA @@ -1089,14 +1112,14 @@ accentVColor: "#d7d7d0" - type: Icon state: pda-brigmedic - - type: CartridgeLoader # DeltaV - Crime Assist + SecWatch, increased diskSpace by 2 to fit them - diskSpace: 7 + - type: CartridgeLoader preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - SecWatchCartridge + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge # DeltaV + - SecWatchCartridge # DeltaV: SecWatch replaces WantedList + - MedTekCartridge - type: entity parent: ClownPDA @@ -1213,11 +1236,3 @@ preinstalled: - NotekeeperCartridge - MedTekCartridge - cartridgeSlot: - priority: -1 - name: Cartridge - ejectSound: /Audio/Machines/id_swipe.ogg - insertSound: /Audio/Machines/id_insert.ogg - whitelist: - components: - - Cartridge diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 73678920339..e68b47c3c76 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -35,6 +35,7 @@ damage: types: Blunt: 0 + hidden: true - type: PhysicalComposition materialComposition: Cloth: 100 @@ -600,7 +601,9 @@ animation: WeaponArcBite # Rrrr! - type: Tag tags: - - PlushieCarp # DeltaV - fish labeler craft + - Payload + - ClothMade + - PlushieCarp - type: entity parent: PlushieCarp diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml index e95e663a795..518e63edeae 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml @@ -20,8 +20,6 @@ density: 15 mask: - MachineMask - - type: CargoPallet - palletType: All - type: StaticPrice price: 100 - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 69c106efab1..fb0f3d52c68 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -71,3 +71,69 @@ id: DefibrillatorOneHandedUnpowered parent: BaseDefibrillator suffix: One-Handed, Unpowered + +- type: entity + id: DefibrillatorCompact # This should be a research item at some point + parent: [ BaseDefibrillator, PowerCellSlotMediumItem ] + name: compact defibrillator + description: Now in fun size! + components: + - type: Sprite + sprite: Objects/Specific/Medical/defibsmall.rsi + layers: + - state: icon + - state: screen + map: [ "enum.ToggleVisuals.Layer" ] + visible: false + shader: unshaded + - state: ready + map: ["enum.PowerDeviceVisualLayers.Powered"] + shader: unshaded + - type: Item + size: Normal + - type: ToggleCellDraw + - type: PowerCellDraw + useRate: 100 + - type: Defibrillator + zapHeal: + types: + Asphyxiation: -40 + doAfterDuration: 6 + - type: DoAfter + - type: UseDelay + +- type: entity + id: DefibrillatorSyndicate + parent: DefibrillatorCompact + name: interdyne defibrillator + description: Doubles as a self-defense weapon against war-crime inclined tiders. + components: + - type: Sprite + sprite: Objects/Specific/Medical/defibsyndi.rsi + layers: + - state: icon + - state: screen + map: [ "enum.ToggleVisuals.Layer" ] + visible: false + shader: unshaded + - state: ready + map: ["enum.PowerDeviceVisualLayers.Powered"] + shader: unshaded + - type: MeleeWeapon + damage: + types: + Blunt: 8 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Items/Defib/defib_zap.ogg + params: + variation: 0.250 + activatedSoundOnHitNoDamage: + path: /Audio/Items/Defib/defib_zap.ogg + params: + variation: 0.250 + volume: -10 + activatedDamage: + types: + Blunt: 8 + Shock: 16 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index c81af6e1280..93eeef2073c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -271,7 +271,6 @@ transferAmount: 20 onlyAffectsMobs: false injectOnly: true - - type: SolutionContainerManager solutions: pen: @@ -284,6 +283,102 @@ - type: Tag tags: [] +- type: entity + name: puncturase auto-injector + parent: ChemicalMedipen + id: PunctAutoInjector + description: A rapid dose of puncturase and tranexamic acid, intended for combat applications. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: punctpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: punctpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 15 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 15 + reagents: + - ReagentId: Puncturase + Quantity: 10 + - ReagentId: TranexamicAcid + Quantity: 5 + - type: Tag + tags: [] + +- type: entity + name: pyrazine auto-injector + parent: ChemicalMedipen + id: PyraAutoInjector + description: A rapid dose of pyrazine and dermaline, intended for combat applications. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: pyrapen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: pyrapen_empty + - type: Hypospray + solutionName: pen + transferAmount: 20 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Pyrazine + Quantity: 10 + - ReagentId: Dermaline + Quantity: 10 + - type: Tag + tags: [] + +- type: entity + name: airloss auto-injector + parent: ChemicalMedipen + id: AirlossAutoInjector + description: A rapid dose of saline and dexalin plus, intended to get someone up quickly. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: dexpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: dexpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 40 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 40 + reagents: + - ReagentId: Saline + Quantity: 20 + - ReagentId: DexalinPlus + Quantity: 20 + - type: Tag + tags: [] + - type: entity name: space medipen parent: ChemicalMedipen diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 4c31d700905..bc3e1a84436 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -550,12 +550,8 @@ solutions: food: maxVol: 20 - - type: SolutionSpiker - sourceSolution: food - - type: Extractable - grindableSolutionName: food - - type: StaticPrice - price: 0 + - type: ExplosionResistance + damageCoefficient: 0.025 # survives conventional explosives but not minibombs and nukes - type: Damageable damageContainer: Inorganic - type: Destructible @@ -568,6 +564,12 @@ solution: food - !type:DoActsBehavior acts: [ "Destruction" ] + - type: SolutionSpiker + sourceSolution: food + - type: Extractable + grindableSolutionName: food + - type: StaticPrice + price: 0 - type: Tag tags: - Pill @@ -588,9 +590,6 @@ tags: - PillCanister - type: Storage - whitelist: # DeltaV - Remove the ability to store anything other than pills in pill canisters - tags: - - Pill grid: - 0,0,4,1 quickInsert: true @@ -598,4 +597,7 @@ areaInsertRadius: 1 storageInsertSound: /Audio/Effects/pill_insert.ogg storageRemoveSound: /Audio/Effects/pill_remove.ogg + whitelist: + tags: + - Pill - type: Dumpable diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index c114b57615e..72404d0ad70 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -209,8 +209,9 @@ handle: false sound: path: /Audio/Effects/bite.ogg - - type: Tag - tags: [] # DeltaV - remove PlushieCarp tag to prevent wasting + - type: Tag # DeltaV - remove PlushieCarp and ClothMade tag to prevent wasting/eating + tags: + - Payload - type: entity #why is this all redefined down here as a parent of base object instead of just being parented to monkeycube?? TODO: Fix this shit parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml index c96a1522d2e..55adfb7ba6c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: WeaponWaterGunBase abstract: true parent: BaseItem @@ -71,7 +71,7 @@ id: WeaponWaterBlaster parent: WeaponWaterGunBase name: water blaster - description: With this bad boy, you'll be the cooleste kid at the summer barbecue. + description: With this bad boy, you'll be the coolest kid at the summer barbecue. components: - type: Gun cameraRecoilScalar: 0 #no recoil diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 23506610b32..3b2fd4893b3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -153,6 +153,7 @@ - type: GunRequiresWield - type: Item size: Ginormous + sprite: Objects/Weapons/Melee/crusher-inhands.rsi - type: DisarmMalus - type: Prying @@ -195,3 +196,6 @@ - type: Tag tags: - Pickaxe + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 30967c955fd..f6f58803ed4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -163,6 +163,7 @@ - FoodPlateSmallPlastic - FoodBowlBig - FoodPlateTin + - FoodPlateMuffinTin - FoodKebabSkewer - SprayBottle - MopItem diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 71e171fc50d..5562715fdb2 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml @@ -113,6 +113,14 @@ - type: GasMiner spawnGas: Tritium +- type: entity + name: frezon gas miner + parent: GasMinerBase + id: GasMinerFrezon + components: + - type: GasMiner + spawnGas: Frezon + - type: entity name: water vapor gas miner parent: GasMinerBase diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml index 6ed06addcd4..d74fe8b0f1b 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml @@ -47,19 +47,30 @@ whitelist: tags: - PlushieSharkGrey - sprite: Objects/Fun/sharkplush.rsi + mopbucket_carpplush: + whitelist: + tags: + - PlushieCarp + sprite: Objects/Specific/Janitorial/janitorial.rsi - type: Transform noRot: true - type: ItemSlots slots: - shark_slot: - name: mop-bucket-slot-component-slot-name-shark + item_slot: + name: mop-bucket-slot-component-slot-name-item + ejectVerbText: mop-bucket-slot-component-eject-verb whitelist: tags: - PlushieSharkBlue - PlushieSharkPink - PlushieSharkGrey + - PlushieCarp + components: + - Rehydratable priority: 3 # Higher than drinking priority + - type: ReactiveContainer + solution: bucket + container: item_slot - type: Drink solution: bucket - type: Appearance @@ -70,7 +81,7 @@ containers: storagebase: !type:Container ents: [] - shark_slot: !type:ContainerSlot {} + item_slot: !type:ContainerSlot {} - type: GuideHelp guides: - Janitorial diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml index 17ccb5a41fd..a6d5a49f67a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml @@ -29,7 +29,7 @@ isCollidableWhenOpen: false openOnMove: false airtight: false - capacity: 4 #4 Entities seems like a nice comfy fit for a cardboard box. + capacity: 5 #5 entity capacity to fit all of your friends (or teammates on your nuclear operation without reinforcements). - type: ContainerContainer containers: entity_storage: !type:Container diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml index cd81687ec1e..dc781106785 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml @@ -64,8 +64,8 @@ canEditLabel: true - type: TextScreenVisuals color: FloralWhite - textOffset: 0,8 - timerOffset: 0,8 + textOffset: 0,6 + timerOffset: 0,6 textLength: 5 rows: 1 - type: Sprite diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index cd60ecd70e0..58453cb8363 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -39,6 +39,7 @@ - id: RevenantSpawn - id: SleeperAgents - id: ZombieOutbreak + - id: LoneOpsSpawn - type: entity id: BaseStationEvent @@ -457,7 +458,7 @@ duration: 1 - type: RuleGrids - type: LoadMapRule - preloadedGrid: ShuttleStriker + mapPath: /Maps/Shuttles/ShuttleEvent/striker.yml - type: NukeopsRule roundEndBehavior: Nothing - type: AntagSelection diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index 935843257ff..95f9985b6a2 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -57,7 +57,7 @@ components: - type: GameRule - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 300 # 5 min + minimumTimeUntilFirstEvent: 600 # 10 min minMaxEventTiming: min: 750 # 12.5 min max: 930 # 17.5 min @@ -70,7 +70,7 @@ components: - type: GameRule - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 300 # 5 min + minimumTimeUntilFirstEvent: 600 # 10 min minMaxEventTiming: min: 750 # 12.5 min max: 930 # 17.5 min diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index cde980debf5..c2962e25072 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -20,7 +20,6 @@ #- id: UnknownShuttleMeatZone #- id: UnknownShuttleMicroshuttle #- id: UnknownShuttleSpacebus - #- id: UnknownShuttleInstigator # DeltaV - remove random ops - type: entityTable id: UnknownShuttlesFreelanceTable @@ -33,10 +32,10 @@ - type: entityTable id: UnknownShuttlesHostileTable table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp - children: - - id: LoneOpsSpawn + children: [] # DeltaV: empty list to remove instigator + #- id: UnknownShuttleInstigator # DeltaV: remove random ops -# Shuttle Game Rules +# Shuttle Game Rules - type: entity abstract: true diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index fc4e689084f..a6b106953da 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -21,6 +21,13 @@ back: - ClothingHeadHatHairflower +# Headphones +- type: loadout + id: Headphones + storage: + back: + - ClothingNeckHeadphones + # Plushies - type: loadout id: PlushieLizard @@ -165,7 +172,7 @@ !type:OverallPlaytimeRequirement time: 36000 # 10hr storage: - back: + back: - TowelColorWhite - type: loadout @@ -176,9 +183,9 @@ !type:OverallPlaytimeRequirement time: 1800000 # 500hr storage: - back: + back: - TowelColorSilver - + - type: loadout id: TowelColorGold effects: @@ -187,7 +194,7 @@ !type:OverallPlaytimeRequirement time: 3600000 # 1000hr storage: - back: + back: - TowelColorGold - type: loadout @@ -199,7 +206,7 @@ department: Logistics # DeltaV: Logistics replaces Cargo time: 360000 # 100hr storage: - back: + back: - TowelColorLightBrown - type: loadout @@ -211,7 +218,7 @@ department: Civilian time: 360000 # 100hr storage: - back: + back: - TowelColorGreen - type: loadout @@ -223,7 +230,7 @@ department: Command time: 360000 # 100hr storage: - back: + back: - TowelColorDarkBlue - type: loadout @@ -235,9 +242,9 @@ department: Engineering time: 360000 # 100hr storage: - back: + back: - TowelColorOrange - + - type: loadout id: TowelColorLightBlue effects: @@ -247,7 +254,7 @@ department: Medical time: 360000 # 100hr storage: - back: + back: - TowelColorLightBlue - type: loadout @@ -259,7 +266,7 @@ department: Epistemics # DeltaV: Epistemics replaces Science time: 360000 # 100hr storage: - back: + back: - TowelColorPurple - type: loadout @@ -271,7 +278,7 @@ department: Security time: 360000 # 100hr storage: - back: + back: - TowelColorRed - type: loadout @@ -283,7 +290,7 @@ role: JobPassenger time: 360000 # 100hr storage: - back: + back: - TowelColorGray - type: loadout @@ -295,7 +302,7 @@ role: JobChaplain time: 360000 # 100hr storage: - back: + back: - TowelColorBlack - type: loadout @@ -307,7 +314,7 @@ role: JobLibrarian time: 360000 # 100hr storage: - back: + back: - TowelColorDarkGreen - type: loadout @@ -319,7 +326,7 @@ role: JobLawyer time: 360000 # 100hr storage: - back: + back: - TowelColorMaroon - type: loadout @@ -331,7 +338,7 @@ role: JobClown time: 360000 # 100hr storage: - back: + back: - TowelColorYellow - type: loadout @@ -343,5 +350,5 @@ role: JobMime time: 360000 # 100hr storage: - back: + back: - TowelColorMime diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index afd513e4e8c..8ae7c622e3b 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -7,6 +7,7 @@ loadouts: - FlowerWreath - Hairflower + - Headphones - PlushieLizard - PlushieSpaceLizard - Lighter diff --git a/Resources/Prototypes/Nyanotrasen/tags.yml b/Resources/Prototypes/Nyanotrasen/tags.yml index ff3b901b1cc..54f39b7b6ef 100644 --- a/Resources/Prototypes/Nyanotrasen/tags.yml +++ b/Resources/Prototypes/Nyanotrasen/tags.yml @@ -12,6 +12,3 @@ - type: Tag id: NormalityCrystal - -- type: Tag - id: PlushieCarp diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml index b55d5a9e697..d75581bbc2b 100644 --- a/Resources/Prototypes/Procedural/dungeon_configs.yml +++ b/Resources/Prototypes/Procedural/dungeon_configs.yml @@ -127,6 +127,8 @@ Junction: BaseAirlock WallMounts: ScienceLabsWalls Window: BaseWindow + tiles: + FallbackTile: FloorDark whitelists: Rooms: tags: diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index fa2b6573915..173cf9e9dbd 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1779,6 +1779,67 @@ FoodOrange: 1 FoodAmbrosiaVulgaris: 1 +# Muffins + +- type: microwaveMealRecipe + id: RecipeMuffin + name: muffin recipe + result: FoodBakedMuffin + time: 15 + solids: + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + reagents: + Sugar: 10 + +- type: microwaveMealRecipe + id: RecipeMuffinChocolate + name: chocolate muffin recipe + result: FoodBakedMuffinChocolate + time: 15 + solids: + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodSnackChocolateBar: 1 + reagents: + Sugar: 10 + +- type: microwaveMealRecipe + id: RecipeMuffinBerry + name: berry muffin recipe + result: FoodBakedMuffinBerry + time: 15 + solids: + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodBerries: 1 + reagents: + Sugar: 10 + +- type: microwaveMealRecipe + id: RecipeMuffinBanana + name: banana muffin recipe + result: FoodBakedMuffinBanana + time: 15 + solids: + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodBanana: 1 + reagents: + Sugar: 10 + +- type: microwaveMealRecipe + id: RecipeMuffinCherry + name: cherry muffin recipe + result: FoodBakedMuffinCherry + time: 15 + solids: + FoodPlateMuffinTin: 1 + FoodDoughSlice: 1 + FoodCherry: 3 + reagents: + Sugar: 10 + # NOT ACTUAL FOOD - type: microwaveMealRecipe diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml index ea21a564480..bb36f36d697 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/gauze.yml @@ -8,6 +8,6 @@ steps: - material: Cloth amount: 2 - doAfter: 10 + doAfter: 3 - node: gauze entity: Gauze1 diff --git a/Resources/Prototypes/Recipes/Lathes/botany.yml b/Resources/Prototypes/Recipes/Lathes/botany.yml index 010beb491ac..ae5a444ed8c 100644 --- a/Resources/Prototypes/Recipes/Lathes/botany.yml +++ b/Resources/Prototypes/Recipes/Lathes/botany.yml @@ -1,39 +1,39 @@ +# Base prototypes + - type: latheRecipe - id: MiniHoe - result: HydroponicsToolMiniHoe - completetime: 2 + abstract: true + parent: BaseToolRecipe + id: BaseHydroToolRecipe materials: Steel: 200 Plastic: 100 +# Recipes + +- type: latheRecipe + parent: BaseHydroToolRecipe + id: HydroponicsToolMiniHoe + result: HydroponicsToolMiniHoe + - type: latheRecipe + parent: BaseHydroToolRecipe id: HydroponicsToolScythe result: HydroponicsToolScythe - completetime: 2 materials: Steel: 300 Plastic: 200 - type: latheRecipe + parent: BaseHydroToolRecipe id: HydroponicsToolHatchet result: HydroponicsToolHatchet - completetime: 2 - materials: - Steel: 200 - Plastic: 100 - type: latheRecipe - id: Spade + parent: BaseHydroToolRecipe + id: HydroponicsToolSpade result: HydroponicsToolSpade - completetime: 2 - materials: - Steel: 200 - Plastic: 100 - + - type: latheRecipe - id: Clippers + parent: BaseHydroToolRecipe + id: HydroponicsToolClippers result: HydroponicsToolClippers - completetime: 2 - materials: - Steel: 200 - Plastic: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/cooking.yml b/Resources/Prototypes/Recipes/Lathes/cooking.yml index 577d8299dab..333279a8201 100644 --- a/Resources/Prototypes/Recipes/Lathes/cooking.yml +++ b/Resources/Prototypes/Recipes/Lathes/cooking.yml @@ -1,67 +1,65 @@ - type: latheRecipe + parent: BaseToolRecipe id: ButchCleaver result: ButchCleaver - completetime: 2 materials: Steel: 300 Plastic: 50 - type: latheRecipe + parent: BaseToolRecipe id: KitchenKnife result: KitchenKnife - completetime: 2 materials: Steel: 200 Plastic: 50 - type: latheRecipe - id: DrinkMug - result: DrinkMug + abstract: true + id: BaseGlasswareRecipe completetime: 0.8 materials: Glass: 100 - type: latheRecipe + parent: BaseGlasswareRecipe + id: DrinkMug + result: DrinkMug + +- type: latheRecipe + parent: DrinkMug id: DrinkMugMetal result: DrinkMugMetal - completetime: 0.8 materials: Steel: 100 - type: latheRecipe + parent: DrinkMug id: DrinkGlass result: DrinkGlass - completetime: 0.8 - materials: - Glass: 100 - type: latheRecipe + parent: DrinkMug id: DrinkShotGlass result: DrinkShotGlass completetime: 0.4 - materials: - Glass: 100 - type: latheRecipe + parent: DrinkMug id: DrinkGlassCoupeShaped result: DrinkGlassCoupeShaped - completetime: 0.8 - materials: - Glass: 100 -- type: latheRecipe - id: CustomDrinkJug - result: CustomDrinkJug - completetime: 2 - materials: +- type: latheRecipe + id: CustomDrinkJug + result: CustomDrinkJug + completetime: 2 + materials: Plastic: 200 - + - type: latheRecipe + parent: BaseGlasswareRecipe id: FoodPlate result: FoodPlate - completetime: 0.8 - materials: - Glass: 100 - type: latheRecipe id: FoodPlateSmall @@ -71,25 +69,23 @@ Glass: 50 - type: latheRecipe + parent: FoodPlate id: FoodPlatePlastic result: FoodPlatePlastic - completetime: 0.8 materials: Plastic: 100 - type: latheRecipe + parent: FoodPlateSmall id: FoodPlateSmallPlastic result: FoodPlateSmallPlastic - completetime: 0.4 materials: Plastic: 50 - type: latheRecipe + parent: FoodPlate id: FoodBowlBig result: FoodBowlBig - completetime: 0.8 - materials: - Glass: 100 - type: latheRecipe id: FoodPlateTin @@ -98,6 +94,13 @@ materials: Steel: 100 +- type: latheRecipe + parent: FoodPlateTin + id: FoodPlateMuffinTin + result: FoodPlateMuffinTin + materials: + Steel: 50 + - type: latheRecipe id: FoodKebabSkewer result: FoodKebabSkewer diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index f4c0da5de79..5fce880c7de 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -1,51 +1,46 @@ +# Base prototypes + - type: latheRecipe - id: Scalpel - result: Scalpel - category: Tools - completetime: 2 + abstract: true + parent: BaseToolRecipe + id: BaseSurgicalRecipe materials: Steel: 200 +# Recipes + - type: latheRecipe + parent: BaseSurgicalRecipe + id: Scalpel + result: Scalpel + +- type: latheRecipe + parent: BaseSurgicalRecipe id: Retractor result: Retractor - category: Tools - completetime: 2 - materials: - Steel: 200 - type: latheRecipe + parent: BaseSurgicalRecipe id: Cautery result: Cautery - category: Tools - completetime: 2 - materials: - Steel: 200 - type: latheRecipe + parent: BaseToolRecipe id: Drill result: Drill - category: Tools - completetime: 2 materials: Steel: 200 Plastic: 100 - type: latheRecipe + parent: BaseSurgicalRecipe id: Saw result: Saw - category: Tools - completetime: 2 - materials: - Steel: 200 - type: latheRecipe + parent: BaseSurgicalRecipe id: Hemostat result: Hemostat - category: Tools - completetime: 2 - materials: - Steel: 200 - type: latheRecipe id: BodyBag @@ -75,7 +70,7 @@ result: Gauze1 completetime: 1 materials: - Cloth: 200 + Cloth: 100 # lathe more efficient than handcrafting - type: latheRecipe id: HandheldCrewMonitor @@ -150,66 +145,51 @@ Plastic: 300 - type: latheRecipe + parent: Medkit id: MedkitBurn result: MedkitBurn name: lathe-recipe-MedkitBurn-name - completetime: 2 - materials: - Plastic: 300 - type: latheRecipe + parent: Medkit id: MedkitToxin result: MedkitToxin name: lathe-recipe-MedkitToxin-name - completetime: 2 - materials: - Plastic: 300 - type: latheRecipe + parent: Medkit id: MedkitO2 result: MedkitO2 name: lathe-recipe-MedkitO2-name - completetime: 2 - materials: - Plastic: 300 - type: latheRecipe + parent: Medkit id: MedkitBrute result: MedkitBrute name: lathe-recipe-MedkitBrute-name - completetime: 2 - materials: - Plastic: 300 - type: latheRecipe + parent: Medkit id: MedkitAdvanced result: MedkitAdvanced name: lathe-recipe-MedkitAdvanced-name - completetime: 2 - materials: - Plastic: 300 - type: latheRecipe + parent: Medkit id: MedkitRadiation result: MedkitRadiation name: lathe-recipe-MedkitRadiation-name - completetime: 2 - materials: - Plastic: 300 - type: latheRecipe + parent: Medkit id: MedkitCombat result: MedkitCombat name: lathe-recipe-MedkitCombat-name - completetime: 2 - materials: - Plastic: 300 - type: latheRecipe + parent: BaseToolRecipe id: HandLabeler result: HandLabeler - category: Tools - completetime: 2 materials: Plastic: 100 @@ -229,20 +209,14 @@ Plastic: 300 - type: latheRecipe + parent: RollerBedSpawnFolded id: CheapRollerBedSpawnFolded result: CheapRollerBedSpawnFolded - completetime: 1 - materials: - Steel: 600 - Plastic: 300 - type: latheRecipe + parent: RollerBedSpawnFolded id: EmergencyRollerBedSpawnFolded result: EmergencyRollerBedSpawnFolded - completetime: 1 - materials: - Steel: 600 - Plastic: 300 - type: latheRecipe id: WhiteCane diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index 3f5003d909b..fc35153317e 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -1,9 +1,8 @@ +# Base prototypes + - type: latheRecipe - id: Wirecutter - icon: - sprite: Objects/Tools/wirecutters.rsi - state: cutters-map - result: Wirecutter + abstract: true + id: BaseToolRecipe category: Tools completetime: 2 materials: @@ -11,30 +10,42 @@ Plastic: 50 - type: latheRecipe + abstract: true + parent: BaseToolRecipe + id: BaseBigToolRecipe + materials: + Steel: 800 + Glass: 300 + +# Recipes + +- type: latheRecipe + parent: BaseToolRecipe + id: Wirecutter + result: Wirecutter + icon: + sprite: Objects/Tools/wirecutters.rsi + state: cutters-map + +- type: latheRecipe + parent: BaseToolRecipe id: Screwdriver + result: Screwdriver icon: sprite: Objects/Tools/screwdriver.rsi state: screwdriver-map - result: Screwdriver - category: Tools - completetime: 2 - materials: - Steel: 200 - Plastic: 50 - type: latheRecipe + parent: BaseToolRecipe id: Welder result: Welder - category: Tools - completetime: 2 materials: Steel: 400 - type: latheRecipe + parent: BaseToolRecipe id: Wrench result: Wrench - category: Tools - completetime: 2 materials: Steel: 200 @@ -42,155 +53,122 @@ id: CableStack result: CableApcStack1 category: Parts - completetime: 2 + completetime: 0.1 materials: Steel: 30 - type: latheRecipe + parent: CableStack id: CableMVStack result: CableMVStack1 - category: Parts - completetime: 2 - materials: - Steel: 30 - type: latheRecipe + parent: CableStack id: CableHVStack result: CableHVStack1 - category: Parts - completetime: 2 - materials: - Steel: 30 - type: latheRecipe + parent: BaseToolRecipe id: CrowbarGreen result: CrowbarGreen - category: Tools - completetime: 2 materials: Steel: 200 - type: latheRecipe + parent: BaseToolRecipe id: Pickaxe result: Pickaxe - category: Tools completetime: 4 materials: Steel: 1000 Wood: 500 - type: latheRecipe + parent: BaseToolRecipe id: Shovel result: Shovel - category: Tools - completetime: 2 materials: Steel: 200 Wood: 100 - type: latheRecipe + parent: BaseToolRecipe id: Multitool result: Multitool - category: Tools - completetime: 2 materials: Steel: 200 Plastic: 200 - type: latheRecipe + parent: Multitool id: NetworkConfigurator result: NetworkConfigurator - category: Tools - completetime: 2 - materials: - Steel: 200 - Plastic: 200 - type: latheRecipe + parent: BaseToolRecipe id: PowerDrill result: PowerDrill - category: Tools - completetime: 2 materials: Steel: 600 Plastic: 200 - type: latheRecipe + parent: BaseToolRecipe id: RCD result: RCDEmpty - category: Tools completetime: 4 materials: Steel: 1000 Plastic: 300 - type: latheRecipe + parent: BaseToolRecipe id: RCDAmmo result: RCDAmmo - category: Tools - completetime: 2.4 materials: Steel: 500 Plastic: 250 - type: latheRecipe + parent: BaseBigToolRecipe id: HandHeldMassScanner result: HandHeldMassScannerEmpty - category: Tools - completetime: 2 - materials: - Steel: 800 - Glass: 300 - type: latheRecipe + parent: BaseBigToolRecipe id: HandheldGPSBasic result: HandheldGPSBasic - category: Tools - completetime: 2 - materials: - Steel: 800 - Glass: 300 - type: latheRecipe + parent: BaseBigToolRecipe id: TRayScanner result: trayScanner - category: Tools - completetime: 2 - materials: - Steel: 800 - Glass: 300 - type: latheRecipe + parent: BaseBigToolRecipe id: GasAnalyzer result: GasAnalyzer - category: Tools - completetime: 2 - materials: - Steel: 800 - Glass: 300 - type: latheRecipe + parent: BaseToolRecipe id: SprayPainter result: SprayPainter - category: Tools - completetime: 2 materials: Steel: 300 Plastic: 100 - type: latheRecipe + parent: BaseToolRecipe id: UtilityBelt result: ClothingBeltUtility - category: Tools - completetime: 2 materials: Cloth: 100 Steel: 50 - type: latheRecipe + parent: BaseToolRecipe id: HolofanProjector result: HolofanProjectorEmpty - category: Tools completetime: 8 materials: Steel: 300 @@ -198,18 +176,18 @@ Plastic: 50 - type: latheRecipe + parent: BaseToolRecipe id: WelderExperimental result: WelderExperimental - category: Tools completetime: 6 materials: Steel: 800 Plasma: 200 - type: latheRecipe + parent: BaseToolRecipe id: JawsOfLife result: JawsOfLife - category: Tools completetime: 6 materials: Steel: 1000 @@ -218,9 +196,9 @@ Gold: 50 - type: latheRecipe + parent: BaseToolRecipe id: HoloprojectorField result: HoloprojectorFieldEmpty - category: Tools completetime: 3 materials: Steel: 500 @@ -228,9 +206,9 @@ Glass: 100 - type: latheRecipe + parent: BaseToolRecipe id: WeaponParticleDecelerator result: WeaponParticleDecelerator - category: Tools completetime: 6 materials: Steel: 750 diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 537a792e859..78fdfec7c9a 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -81,7 +81,7 @@ amount: 1 Sulfur: amount: 1 - Oxygen: + Oxygen: amount: 2 products: SulfuricAcid: 3 @@ -205,6 +205,20 @@ energyConsumption: 12500 duration: 15 +- type: reaction + id: Flash + impact: High + priority: 20 + reactants: + Aluminium: + amount: 1 + Potassium: + amount: 1 + Sulfur: + amount: 1 + effects: + - !type:FlashReactionEffect + - type: reaction id: TableSalt minTemp: 370 @@ -501,3 +515,4 @@ amount: 1 products: Tazinide: 1 + diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 93a62876a72..12f5097c7f1 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: ServiceWorker name: job-name-serviceworker description: job-description-serviceworker @@ -6,7 +6,6 @@ startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service - canBeAntag: true # DeltaV - Can be antagonist access: - Service - Maintenance diff --git a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml index a5269a73dae..1703e0c6980 100644 --- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml +++ b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml @@ -1,8 +1,3 @@ -- type: preloadedGrid - id: ShuttleStriker - path: /Maps/Shuttles/ShuttleEvent/striker.yml - copies: 2 - - type: preloadedGrid id: ShuttleCargoLost path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 1c02d7f3d03..fdf9de78d18 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1071,6 +1071,9 @@ - type: Tag id: Plunger +- type: Tag + id: PlushieCarp + - type: Tag id: PlushieGhost diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml index 2592c107622..7f47f1e490b 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml @@ -7,13 +7,12 @@ These bad actors are more often than not employed or backed by the [color=#ff0000]Syndicate[/color], a rival organization to Nanotrasen that wants nothing more than to see it burn. ## Various Antagonists - Antagonist roles come with their own special sets of abilities, tools and risks to the station. - Antagonists can take many forms, like: - [textlink="Nuclear operatives" link="Nuclear Operatives"], with the goal of infiltrating and destroying the station. - [textlink="Traitors" link="Traitors"] amongst the crew who must assassinate, steal and decieve. - - [textlink="Space Ninjas" link="SpaceNinja"], masters of espionage and sabotage with special gear. - [textlink="Revolutionaries" link="Revolutionaries"] who are intent on taking control of the station from the inside. - [textlink="Zombies" link="Zombies"] that crave the flesh of every crew member and creature on board. - - [textlink="Several non-humanoid creatures" link="MinorAntagonists"] that usually just try to kill anything that moves. + - [textlink="Space Ninjas" link="SpaceNinja"], masters of espionage and sabotage with special gear. + - [textlink="Thieves" link="Thieves"] driven by kleptomania, determined to get their fix using their special gloves. + - [textlink="Various non-humanoid creatures" link="MinorAntagonists"] that generally attack anything that moves. diff --git a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml index 6704ed28e0b..97574c40215 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml @@ -9,12 +9,12 @@ - Revenants are ethereal beings made of ectoplasm that haunt the crew and steal [color=cyan]life essence[/color] from them. + Revenants are ethereal beings made of ectoplasm that haunt the crew and steal [color=#8f63e6]life essence[/color] from them. - Your essence is your very own [bold]life force[/bold]. Taking damage reduces your essence. - Essence is also spent to use [bold]abilities[/bold]. - - To gain essence you first [bold]inspect[/bold] various souls for their worth. More worthy souls grant more essence. Then you must [bold]siphon[/bold] it either when the victim is crit, dead or asleep. + - To gain essence you first [bold]inspect[/bold] various souls for their worth. More worthy souls grant more essence. Then you must [bold]siphon[/bold] it either when the victim is crit, dead or asleep. All of this is done with [color=yellow][bold][keybind="Use"][/bold][/color]. - [bold]Stolen essence[/bold] is used to purchase new abilities to incapacitate the crew easier. - - You are [bold]vulnerable[/bold] to attacks when you siphon a soul or use an ability. You can tell when you are vulnerable when you have a [italic]"Corporeal"[/italic] status effect. + - You are [bold]vulnerable[/bold] to attacks when you siphon a soul or use an ability. You can tell when you are vulnerable when you have a [color=#8f63e6][italic]Corporeal[/italic][/color] status effect. # Rat King @@ -26,12 +26,12 @@ - Rat Kings are abnormally large rodents capable of [color=cyan]raising huge rat armies[/color] by eating equally huge amounts of food. - - You have several abilities that come at the cost of your [bold]hunger[/bold]. - - One ability is summoning [color=cyan]Rat Servants[/color] who you can [bold]command[/bold] to stay in place, follow you, attack a target of your choice or attack indiscriminately. - - You can conjure a cloud of [color=#77b58e]ammonia[/color], which is mildly poisonous to humans but heals rats. - - You can also [italic]"Rummage"[/italic] through any disposal unit by using the context menu. Use this to find [bold]scraps of food[/bold] to grow your army. - - Besides your abilities, you are [bold]stronger[/bold] than most other animals. You and your servants are capable of speech and you're both small enough to fit under airlocks and tables. + Rat kings are abnormally large rodents capable of [color=yellow]raising huge rat armies[/color] by eating equally huge amounts of food. + - You have several abilities that come at the cost of your [bold]hunger.[/bold] + - One such ability is [color=yellow][italic]Raise Army[/italic][/color], which summons a [bold]Rat Servant[/bold]. You can [bold]command[/bold] your servants to stay in place, follow you, attack a target of your choice or attack indiscriminately. + - You can conjure a cloud of [color=#77b58e]ammonia[/color] using [color=purple][italic]Rat King's Domain[/italic][/color]. This purple gas is mildly poisonous to humans but heals rats. + - [color=#9daa98][italic]Rummage[/italic][/color] through a disposal unit by using the context menu. Use this to find [bold]scraps of food[/bold] to grow your army. + - Besides your abilities, [bold]you are stronger than most other animals.[/bold] You and your servants are capable of speech and you're both small enough to fit under airlocks and tables. - [bold]Your underlings are still very fragile![/bold] Beware of spacings, explosions and the buisness end of a melee weapon. # Space Dragon @@ -44,11 +44,11 @@ - Space Dragons is are giant extradimensional fish that [color=cyan]create rifts and eat crew.[/color] - - Dragons have powerful jaws to [bold]devour[/bold] infrastructure such as doors, windows, and walls. - - Your [color=orange]dragon's breath[/color] is a flaming projectile which travels a straight flight path, exploding multiple times and igniting things along the way. Be careful, your carps are not immune to this! - - You have the ability to summon [bold]carp rifts[/bold] that periodically spawn [bold]space carp[/bold]. There can be 3 rifts active at any given time. - - Rifts charge up energy over a period of 5 minutes and are [bold]vulnerable[/bold] during this time. After 5 minutes, it becomes invulnerable and will continue summoning carp as long as the dragon lives. + Space dragons are giant extradimensional fish that can [color=red]eat crew[/color] and create [color=#4b7fcc]carp rifts.[/color] + - Dragons have powerful jaws that allow them to [color=red][italic]Devour[/italic][/color] infrastructure such as doors, windows, and walls. + - They can also heal themselves by using [color=red][italic]Devour[/italic][/color] on crew members that have gone unconscious or have died. + - Your [color=orange][italic]Dragon's Breath[/italic][/color] is a [bold]flaming projectile[/bold] which travels a straight flight path, exploding multiple times and igniting things along the way. Try not to hit your carps with this! + - You have the ability to [color=#4b7fcc][italic]Summon a Carp Rift[/italic][/color]. Rifts periodically spawn [bold]space carp[/bold] and charge up energy over a period of 5 minutes, [bold]which is when it's vulnerable.[/bold] After 5 minutes, it becomes invulnerable and will continue summoning carp as long as the dragon lives. - You'll suffer a [bold]temporary debilitating feedback effect[/bold] if one of your rifts are destroyed before it's done charging. - If a period of five minutes passes since your spawn or since the last time a rift was charging, [bold]you'll disappear.[/bold] - Dragons who have the maximum of 3 fully charged rifts will [bold]never disappear[/bold], but they are still mortal. @@ -61,6 +61,6 @@ Slimes and spiders have no remarkable features, but will [color=cyan]infest the station[/color] from time to time regardless. Both will give chase and attack anything they see. - - Slimes may deal extra [bold]cellular or posion damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person. - - Spiders can lay [bold]webs[/bold], which non-spiders have a hard time moving through. They can easily be destroyed with a blade. + - Slimes may [bold]deal extra cellular or poison damage[/bold], based upon their color. Water hurts them just as it would hurt a slime person. + - Spiders have a venomous bite and can [bold]create webs[/bold] that are hard to move though. Webs are easily destroyed with a blade. They can also pry open airlocks. diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml index ee586633742..11149bab66d 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml @@ -1,6 +1,6 @@ # Nuclear Operatives - + [color=#999999][italic]"OPERATIVES STANDBY. YOUR OBJECTIVES ARE SIMPLE.[/italic][/color] @@ -38,13 +38,13 @@ ## Preparation - Each member in your squad has been given an [color=cyan]uplink[/color] to purchase everything you will need for the mission, similar to [textlink="Traitors." link="Traitors"] + Each member in your squad has been given an [color=cyan]uplink[/color] to purchase everything you will need for the mission, similar to [textlink="traitors." link="Traitors"] - You can purchase the same kinds of gear Traitors can, but you have higher quality gear available to you and more telecrystals to spend. + You can purchase the same kinds of gear traitors can, but you have higher quality gear available to you and more telecrystals to spend. @@ -71,8 +71,8 @@ ## Getting to the Station You've got the plan, you've got the gear. Now, execute. - Grab a [bold]jetpack[/bold] from your armory and go with your other operatives to the [color=cyan]Syndicate Shuttle[/color]. - Among other things you may need, you'll find an [bold]IFF Console[/bold] on the shuttle. It allows you to hide from other ships and mass scanners when [italic]"Show IFF"[/italic] and [italic]"Show Vessel"[/italic] are toggled off. + Grab a [bold]jetpack[/bold] from your armory and go with your other operatives to your [color=cyan]shuttle[/color]. + Among other things you may need, you'll find an [bold]IFF Computer[/bold] on the shuttle. It allows you to hide from other ships and mass scanners when [italic]Show IFF[/italic] and [italic]Show Vessel[/italic] are toggled off. When everyone is ready, FTL to the station and fly to it with a jetpack. Don't forget the code, your pinpointers and the nuke if you're taking it. @@ -82,12 +82,12 @@ ## The Nuke & Arming Procedure - You have a paper with the [color=cyan]nuclear authentication codes[/color] on your shuttle. [bold]Check to see if the nuke ID matches the one on your shuttle.[/bold] If it doesn't, you'll have to use explosive in the station's vault. + You have a paper with the [color=cyan]nuclear authentication codes[/color] on your shuttle. [bold]Check to see if the nuke ID matches the one on your shuttle.[/bold] If it doesn't, you'll be arming the station's nuke instead. - Obtain the [bold]nuclear authentication disk[/bold] and insert it into the nuke. - Type in the [bold]nuclear authentication code[/bold] and press "[bold]E[/bold]" on the keypad to Enter. - - To begin [bold]self-destruct process[/bold], press "[color=red]ARM[/color]". After 300 seconds, the nuke will explode. - - [bold]Defend the nuke[/bold], even if it's at the cost of your lives! The mission requirements do not include your return. + - [bold]To begin the self-destruct sequence, press [color=#EB2D3A]ARM[/color][/bold]. After 300 seconds, the nuke will explode. + - [bold]Defend the nuke[/bold], even if it's at the cost of your lives! The mission requirements do not include your return. - It takes 30 seconds for someone to [bold]disarm[/bold] the nuke. Re-arming it is possible, but the chance of mission success drops if you let it happen. - Should the nuke be re-armed, the timer will start from where it left off. diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml b/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml index 4a1887a392b..9bc0b28068b 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml @@ -1,6 +1,6 @@ # Revolutionaries - + [color=#999999][italic]"Viva la revolución!!"[/italic][/color] @@ -13,20 +13,20 @@ ## Objectives You must cuff, kill, or exile all of the [textlink="Command staff" link="Command"] on station in no particular order. - Your objective is not to destroy the station, but [italic]take it over[/italic], so try to minimize damage where possible. + Your objective is [bold]not to destroy the station[/bold], but [italic]to take it over[/italic], so try to minimize damage where possible. [bold]The revolution will fail[/bold] if all of the [bold][color=#5e9cff]Head Revolutionaries[/color][/bold] die, and all [color=red]Revolutionaries[/color] will de-convert if this happens. ## Headrevs & Conversion [bold][color=#5e9cff]Head Revolutionaries[/color][/bold] are chosen at the start of the shift and begin with a [color=cyan]flash[/color] and a pair of [color=cyan]sunglasses[/color]. - + - + You can convert crew members to your side by taking any [bold]flash[/bold] and attacking someone with it using [color=#ff0000]harm mode[/color]. - However, you can't convert your target if they're wearing [color=cyan]flash protection[/color] such as [bold]sunglasses[/bold] or a [bold]welding mask[/bold]. + However, [bold]you can't convert your target if they're wearing [color=cyan]flash protection[/color][/bold] such as sunglasses or a welding mask. @@ -34,10 +34,10 @@ - Another hurdle in your way are pesky [color=cyan]mindshield implanters[/color]. These will: + Another obstacle in your way are those pesky [color=cyan]mindshield implanters[/color]. These will: - Prevent the implanted person from being converted into a [color=red]Revolutionary[/color] - De-convert Revolutionaries, and will make them no longer loyal to your cause - - Visibly be destroyed upon being implanted into a [bold][color=#5e9cff]Head Revolutionary[/color][/bold], giving away your cover + - [bold]Visibly be destroyed upon being implanted into a [color=#5e9cff]Head Revolutionary[/color][/bold], giving you away - NOT protect against flash disorientation Assume all of [color=#cb0000]Security[/color] and [color=#1b67a5]Command[/color] are implanted with mindshields already. @@ -47,7 +47,7 @@ ## Revolutionary - A [bold][color=red]Revolutionary[/color][/bold] is a crew member that has been converted by a [bold][color=#5e9cff]Head Revolutionary[/color][/bold]. + A [color=red]Revolutionary[/color] is a crew member that has been converted by a [bold][color=#5e9cff]Head Revolutionary[/color][/bold]. [bold][color=red]Revolutionaries[/color] can't convert people themselves,[/bold] but they're more than capable of doing dirty work and carrying out orders. diff --git a/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml b/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml index 9998d4b38a0..c001b979377 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml @@ -7,7 +7,7 @@ You are an elite mercenary that [color=#66FF00]The Spider Clan[/color] has sent to wreak all kinds of havoc on the station. You are equipped to keep it silent-but-deadly. - Whether you decide to mercilessly pick off the station's crew one by one or stay out of trouble, your discipline has taught you that [italic]your objectives must be at least attempted[/italic]. For honor! + Whether you get bloody or stay out of trouble, your discipline has taught you that [italic]your objectives must be at least attempted[/italic]. For honor! ## Standard Equipment You begin implanted with a [color=cyan]death acidifier[/color], so if you are captured or KIA all your precious equipment is kept out of enemy hands. @@ -19,7 +19,7 @@ - ## Ninja Suit & Boots + ## Your Suit @@ -27,12 +27,12 @@ - Your single most important item is [color=#66FF00]your suit[/color], without it none of your abilities would work. + Your single most important item is [color=cyan]your suit[/color], without it none of your abilities would work. Your suit requires power to function, which is supplied by its [bold]internal battery[/bold]. It can be replaced, and [italic]high capacity batteries[/italic] mean a [italic]highly effective ninja[/italic]. - [bold]You can recharge your internal battery directly[/bold] by using [color=#66FF00]your gloves[/color]. You can see the current charge by examining the suit or checking the nifty battery alert on your screen. + [bold]You can recharge your internal battery directly[/bold] by using [color=cyan]your gloves[/color]. You can see the current charge by examining the suit or checking the nifty battery alert on your screen. - Your outfit also includes [color=#66FF00]special boots[/color] that keep you agile, upright and grounded without using energy. You've also got flash protection thanks to your [color=#66FF00]visor[/color]. + Your outfit also includes [color=cyan]special boots[/color] that keep you agile, upright and grounded without using energy. You've also got flash protection thanks to your [color=cyan]visor[/color]. ## Ninja Gloves @@ -58,9 +58,9 @@ [bold]You have sworn yourself to the sword and refuse to use firearms.[/bold] Luckily, you've got a pretty cool sword. - Your [color=#66FF00]energy katana[/color] hurts plenty and can be [bold]recalled at will[/bold] at the cost of suit power. The farther away it is from you, the more energy required to recall it. + Your [color=cyan]energy katana[/color] hurts plenty and can be [bold]recalled at will[/bold] at the cost of suit power. The farther away it is from you, the more energy required to recall it. - While in hand you may also [color=#66FF00]teleport[/color] to anywhere that you can see, [bold]including through windows[/bold]. The charges required to do this regenerate slowly, so keep a charge or two spare in case you need a quick getaway. + While in hand you may also [color=cyan]teleport[/color] to anywhere that you can see, [bold]including through windows[/bold]. The charges required to do this regenerate slowly, so keep a charge or two spare in case you need a quick getaway. ## Spider Clan Charge @@ -68,9 +68,9 @@ - [color=#66FF00]A modified C-4 explosive[/color], which can be found in your pocket. Creates a large explosion but [bold]must be armed in your target area[/bold] as it is one of your [color=#66FF00]objectives[/color]. + This is a [color=cyan]modified C-4 explosive[/color] which can be found in your pocket. Creates a large explosion but [bold]must be armed in your target area[/bold] as it is one of your objectives. - It can't be activated manually, so simply plant it on a wall or a particularly ugly piece of furniture. Can't be unstuck once planted. + It can't be activated manually, so simply plant it on a wall or some furniture that does not spark joy. Choose wisely, it can't be unstuck once planted. ## Objectives diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml b/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml index 7ed5aa98392..4c11fc0d991 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml @@ -11,7 +11,7 @@ Thieves are petty yet crafty [color=green]criminals[/color] who can't keep their hands to themselves. You were forcefully given a [bold]pacifism implant[/bold] after your last arrest, but you won't let that stop you from trying to add to your collection. ## Art of the Steal - Unlike other antagonists, [italic]staying out of trouble is almost a requirement for you[/italic] because of your implant. + Unlike other antagonists, [bold]staying out of trouble is almost a requirement for you[/bold] because of your implant. You can only run if [color=#cb0000]Security[/color] picks a fight with you, and because you work alone you don't have any friends to pull you out of danger. But against all odds, you'll sucessfully swipe what you want using determination, sleight of hand, a few tools and your [color=cyan]thieving gloves.[/color] @@ -39,6 +39,9 @@ Your [color=cyan]toolbox[/color] contains... well, whatever you remembered to pack. [bold]You can select two pre-made kits[/bold] to help you complete grander heists. Approve your choices in a safe place, as the toolbox will dissolve and the gear will drop at your feet. + + + diff --git a/Resources/Textures/Interface/Actions/actions_ai.rsi/job_view.png b/Resources/Textures/Interface/Actions/actions_ai.rsi/job_view.png deleted file mode 100644 index b407c4755e1..00000000000 Binary files a/Resources/Textures/Interface/Actions/actions_ai.rsi/job_view.png and /dev/null differ diff --git a/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json index 1efee13f3aa..434b9052e04 100644 --- a/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json +++ b/Resources/Textures/Interface/Actions/actions_ai.rsi/meta.json @@ -28,9 +28,6 @@ { "name": "mass_scanner" }, - { - "name": "job_view" - }, { "name": "comms_console" }, diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json index c6c435a5c9f..ea2e3dc6eae 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/misc.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. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Chevrechaud created by Github user deathride58, croissant taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955. Muffin-chocolate, muffin-banana and muffin-cherry sprites modified from the original muffin sprite by RumiTiger", "size": { "x": 32, "y": 32 @@ -162,7 +162,12 @@ }, { "name": "croissant" + }, + { + "name": "muffin-chocolate" + }, + { + "name": "muffin-banana" } ] } - diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-banana.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-banana.png new file mode 100644 index 00000000000..51ab05eea1e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-banana.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png index 9e0165e8121..161da9acb43 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-berry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png index 47df3223683..282c7c421d2 100644 Binary files a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-cherry.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-chocolate.png b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-chocolate.png new file mode 100644 index 00000000000..7ca1a22cb06 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muffin-chocolate.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json index d0cfd102168..e1d8337bc9d 100644 --- a/Resources/Textures/Objects/Consumable/Food/plates.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/plates.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. Muffin-tin sprite modified from the original tin sprite by RumiTiger", "size": { "x": 32, "y": 32 @@ -33,6 +33,9 @@ }, { "name": "tray-trash" + }, + { + "name": "muffin-tin" } ] } diff --git a/Resources/Textures/Objects/Consumable/Food/plates.rsi/muffin-tin.png b/Resources/Textures/Objects/Consumable/Food/plates.rsi/muffin-tin.png new file mode 100644 index 00000000000..32ac737f07c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/plates.rsi/muffin-tin.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png index a1b463f7896..45e0c9755e4 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png index 641a4c22153..53b97f4c783 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png index 47d410736e7..8f905fb9a88 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png index e0ddcfe7b7e..638d7509a0a 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_orange.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png index d30341b1422..14b22cf14a4 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png index ce82c248db8..8223bcca8fa 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png index c31a743f473..03e29607792 100644 Binary files a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png and b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png differ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json index a6222e988f7..62e47be4ba3 100644 --- a/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/encryption_keys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba", + "copyright": "Created by DSC@300074782328750080 for Space Station 14, borg_label taken from https://github.com/vgstation-coders/vgstation13/blob/e71d6c4fba5a51f99b81c295dcaec4fc2f58fb19/icons/mob/screen1.dmi and modified by ArtisticRoomba, crypt states modified by Flareguy for Space Station 14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/generic.png b/Resources/Textures/Objects/Devices/tablets.rsi/generic.png index 5e1130fcc1c..22225d775ee 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/generic.png and b/Resources/Textures/Objects/Devices/tablets.rsi/generic.png differ diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json index 11d1d586eb7..5af056f2915 100644 --- a/Resources/Textures/Objects/Devices/tablets.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/tablets.rsi/meta.json @@ -1 +1,26 @@ -{"version":1,"license":"CC-BY-SA-3.0","copyright":"https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077","size":{"x":32,"y":32},"states":[{"name":"tablet"},{"name":"tabletsol"},{"name":"generic","delays":[[0.3,0.3]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Baystation12 at https://github.com/Baystation12/Baystation12/tree/17e84546562b97d775cb26790a08e6d87e7f8077 and heavily modified by Flareguy for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tablet" + }, + { + "name": "tabletsol" + }, + { + "name": "generic", + "delays": [ + [ + 0.3, + 0.3 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png index 417d44fbcc0..5fb920e7824 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png and b/Resources/Textures/Objects/Devices/tablets.rsi/tablet.png differ diff --git a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png index f79a25da853..8a336405382 100644 Binary files a/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png and b/Resources/Textures/Objects/Devices/tablets.rsi/tabletsol.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json index eca1964c4dd..12144d35596 100644 --- a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json @@ -39,15 +39,6 @@ { "name": "grey-inhand-right", "directions": 4 - }, - { - "name": "mopbucket_shark_blue" - }, - { - "name": "mopbucket_shark_pink" - }, - { - "name": "mopbucket_shark_grey" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json index ae3103e2be2..4f7a1e77722 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.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/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 @@ -25,6 +25,18 @@ { "name": "mopbucket_water-3" }, + { + "name": "mopbucket_shark_blue" + }, + { + "name": "mopbucket_shark_pink" + }, + { + "name": "mopbucket_shark_grey" + }, + { + "name": "mopbucket_carpplush" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_carpplush.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_carpplush.png new file mode 100644 index 00000000000..07ef0a77d00 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_carpplush.png differ diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_blue.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_blue.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_blue.png rename to Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_blue.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_grey.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_grey.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_grey.png rename to Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_grey.png diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_pink.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_pink.png similarity index 100% rename from Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_pink.png rename to Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_shark_pink.png diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png new file mode 100644 index 00000000000..99a15087e7b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png new file mode 100644 index 00000000000..42d319843d9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png new file mode 100644 index 00000000000..a2317f7face Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json new file mode 100644 index 00000000000..441fd4f5feb --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14 and modified by alzore_(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "ready" + }, + { + "name": "screen" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png new file mode 100644 index 00000000000..cc4b2741143 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png new file mode 100644 index 00000000000..1a2ac1cdec9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png new file mode 100644 index 00000000000..69c4e441de0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png new file mode 100644 index 00000000000..ac0c8d61898 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png new file mode 100644 index 00000000000..c30877c534e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json new file mode 100644 index 00000000000..441fd4f5feb --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14 and modified by alzore_(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "ready" + }, + { + "name": "screen" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png new file mode 100644 index 00000000000..e5a8065eadc Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png new file mode 100644 index 00000000000..0c7a26a2a5e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png new file mode 100644 index 00000000000..7a8ebfec6bf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png new file mode 100644 index 00000000000..28c0b3c51e0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json index 8e9f54f1d06..8872f25f52c 100644 --- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json @@ -96,6 +96,24 @@ }, { "name": "medipen-inhand-right" + }, + { + "name": "punctpen" + }, + { + "name": "punctpen_empty" + }, + { + "name": "pyrapen" + }, + { + "name": "pyrapen_empty" + }, + { + "name": "dexpen" + }, + { + "name": "dexpen_empty" } ] } diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png new file mode 100644 index 00000000000..fa529e8d189 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png new file mode 100644 index 00000000000..4bd9cd48583 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png new file mode 100644 index 00000000000..fee075cc3be Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png differ diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png new file mode 100644 index 00000000000..02dfcae6ba2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png new file mode 100644 index 00000000000..1c1093a702e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png new file mode 100644 index 00000000000..75934554bfa Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json new file mode 100644 index 00000000000..c634ba82a37 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by alzore_ (discord) based on the proto-kinetic crusher", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..e8e9a267ff2 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..4ef9c388d62 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png index d9b6ca8157b..1df2bf43885 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png deleted file mode 100644 index 28eab44a32f..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png deleted file mode 100644 index dcf606531ba..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json index 2d91fb460be..8a70dbd998c 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ 0.3 ] ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png deleted file mode 100644 index 6b55e43f72e..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png deleted file mode 100644 index b3d449f083a..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png index 5d64ccba6ed..ccb1aa83d83 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png and b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png index cce061bab29..ae6e01f4a50 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png and b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json index f076030635f..f64277be797 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi inhands by alzore_ (discord)", "size": { "x": 32, "y": 32 @@ -22,4 +22,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png new file mode 100644 index 00000000000..f245aea9fea Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png new file mode 100644 index 00000000000..6949718a597 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json new file mode 100644 index 00000000000..c6fb3d12d8e --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by alzore_ (discord) based on the proto-kinetic crusher glaive", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..330b936fb25 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..2d1a481266d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png index 980af14aa86..e22b636f3da 100644 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png deleted file mode 100644 index 6d9aab74206..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png deleted file mode 100644 index e2d24c9ee8a..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json index 2d91fb460be..8a70dbd998c 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ 0.3 ] ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png deleted file mode 100644 index ce6c530f30c..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png deleted file mode 100644 index 84abf801487..00000000000 Binary files a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/meta.json b/Resources/Textures/Structures/Machines/station_map.rsi/meta.json index a1da3673bbd..12c6a212a19 100644 --- a/Resources/Textures/Structures/Machines/station_map.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/station_map.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Made by brainfood1183 (github) for ss14", + "copyright": "Made by brainfood1183 (github) for ss14 and modified by Flareguy for ss14. station_map_broken based on broken state in Cryogenic2.dmi from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/96246eed6e19899971a6d18e849fa6fe0b8ab52a/icons/obj/Cryogenic2.dmi", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png index 9c22f5852cf..a15bffd4487 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map0.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png index 7297442f108..6228597a401 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png index 460c86b896a..1b6241a5754 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png index 4b6fd1babf7..83dfe28b291 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png differ diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png index 91fb91378a1..9a160c373d8 100644 Binary files a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png and b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame2.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json index a5dfc0546bd..cdcfa49711b 100644 --- a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (Github) for Space Station 14", + "copyright": "Made by brainfood1183 (Github) for Space Station 14 and modified by Flareguy", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png index e1496f2ca8b..715d3ab5c6c 100644 Binary files a/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png and b/Resources/Textures/Structures/Wallmounts/signalscreen.rsi/signalscreen.png differ