diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml index 19d00a0bbf..aae8785b1f 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 d61267d002..fd3615d59f 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -110,18 +110,29 @@ namespace Content.Client.HealthAnalyzer.UI // Alerts - AlertsDivider.Visible = msg.Bleeding == true; - AlertsContainer.Visible = msg.Bleeding == true; + var showAlerts = msg.Unrevivable == true || msg.Bleeding == true; + + AlertsDivider.Visible = showAlerts; + AlertsContainer.Visible = showAlerts; + + if (showAlerts) + AlertsContainer.DisposeAllChildren(); + + 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.DisposeAllChildren(); - AlertsContainer.AddChild(new Label + 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 9cc3e734f0..bad492e7e4 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 46c0e51fad..20e2528a44 100644 --- a/Content.Client/Mapping/MappingScreen.xaml.cs +++ b/Content.Client/Mapping/MappingScreen.xaml.cs @@ -197,7 +197,6 @@ public sealed partial class MappingScreen : InGameScreen 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 fd217bc7e8..0000000000 --- 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 7f1d1bcd5b..653302fae4 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 e04d377d32..2892ca4425 100644 --- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs +++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs @@ -40,7 +40,6 @@ public sealed partial class SeparatedChatGameScreen : InGameScreen public override void SetChatSize(Vector2 size) { - ScreenContainer.DesiredSplitCenter = size.X; ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize; } } diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs index e1eef2be4a..cf88f3aacd 100644 --- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -168,7 +168,7 @@ public sealed class SuicideCommandTests await pair.CleanReturnAsync(); } - /// + /// /// Run the suicide command in the console /// Should only ghost the player but not kill them /// @@ -241,6 +241,7 @@ public sealed class SuicideCommandTests 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 @@ public sealed class SuicideCommandTests // 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 sealed class SuicideCommandTests 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 @@ public sealed class SuicideCommandTests // 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 d81699c82d..2187cbd68f 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -651,7 +651,7 @@ public sealed partial class AdminVerbSystem { 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/EntityEffects/Effects/FlashReactionEffect.cs b/Content.Server/EntityEffects/Effects/FlashReactionEffect.cs new file mode 100644 index 0000000000..fbf99e902d --- /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 85fec0d7d1..2f4269a05d 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -213,14 +213,7 @@ namespace Content.Server.Ghost 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 fc9ab081d2..15fe2a69cf 100644 --- a/Content.Server/Medical/CryoPodSystem.cs +++ b/Content.Server/Medical/CryoPodSystem.cs @@ -201,6 +201,7 @@ public sealed partial class CryoPodSystem : SharedCryoPodSystem ? bloodSolution.FillFraction : 0, null, + null, null )); } diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs index 60a492a755..90646725bb 100644 --- a/Content.Server/Medical/HealthAnalyzerSystem.cs +++ b/Content.Server/Medical/HealthAnalyzerSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Body.Components; 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 sealed class HealthAnalyzerSystem : EntitySystem 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 sealed class HealthAnalyzerSystem : EntitySystem 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 a38e363603..2ff94760f6 100644 --- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs @@ -41,7 +41,9 @@ namespace Content.Server.Nutrition.EntitySystems 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.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 01452bdc72..c3aa6cc97e 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 76b8a1b081..fc6f0baf77 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -813,6 +813,9 @@ public abstract class SharedActionsSystem : EntitySystem 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 6a04bfe42d..90e1fd38e8 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -130,9 +130,6 @@ public sealed partial class SleepingSystem : EntitySystem 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/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs index 78f26ed5c0..08af1a36a7 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/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ca559c1338..6131e0e6f4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,74 +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. @@ -3959,3 +3889,69 @@ 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 diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index e00d7c78a6..ac39b6b7f5 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, Afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhenrich, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, irismessage, ItsMeThom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, Magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, Sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, TyAshley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zylofan, Zymem, zzylex +0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, Afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhenrich, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, d4kii, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, Magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, Sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, Spanky, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, TyAshley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zylofan, Zymem, zzylex diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl index b65c332346..642555b237 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/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl index fe1f92e914..eb79358ecc 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/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl index 9d0919d102..4e7a8b235b 100644 --- a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl @@ -73,3 +73,4 @@ station-beacon-tools = Tools station-beacon-disposals = Disposals station-beacon-cryosleep = Cryosleep station-beacon-escape-pod = Escape Pod +station-beacon-vox = Vox Break Room diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index 75511b1760..e535f9e011 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: 65535 - -4,-3: - 0: 61440 - -4,-2: - 0: 65535 - -4,-1: - 0: 65535 - -3,-3: - 0: 61440 - -3,-2: - 0: 65535 - -3,-1: - 0: 65535 - -2,-4: - 0: 65520 - -2,-3: - 0: 65535 - -2,-2: - 0: 65535 - -2,-1: - 0: 65535 - -1,-4: - 0: 65535 - -1,-3: - 0: 65535 - -1,-2: - 0: 65535 + 0: 53247 + -1,3: + 1: 1 -1,-1: 0: 65535 - 0,4: - 0: 61183 - 0,5: - 0: 61166 - 0,6: - 0: 14 - 1,4: - 0: 65535 - 1,5: - 0: 65535 - 1,6: - 0: 65535 - 1,7: - 0: 15 - 2,4: - 0: 65535 - 2,5: - 0: 65535 - 2,6: - 0: 4095 - 3,4: - 0: 65535 - 3,5: - 0: 65535 - 3,6: - 0: 53247 - 3,7: - 0: 12 0,0: 0: 65535 0,1: 0: 65535 0,2: 0: 65535 - 0,3: + -4,-2: 0: 65535 - 1,0: - 0: 65535 - 1,1: - 0: 65535 - 1,2: - 0: 65535 - 1,3: - 0: 65535 - 2,0: - 0: 4369 - 1: 8738 - 2,2: - 0: 65535 - 2,3: - 0: 65535 - 3,0: - 0: 65535 - 3,2: - 0: 65535 - 3,3: - 0: 65535 - 3,1: + -3,-2: + 0: 56829 + -2,-2: + 0: 3838 + -2,-4: + 0: 60928 + -2,-3: 0: 61166 + -1,-4: + 0: 65350 + -1,-3: + 0: 65535 + -1,-2: + 0: 4095 + -1,-5: + 0: 16384 0,-4: - 0: 65527 + 0: 65299 0,-3: 0: 65535 0,-2: - 0: 65535 + 0: 53247 0,-1: 0: 65535 - 1,-4: - 0: 30576 - 1,-3: - 0: 65399 - 1,-2: - 0: 63359 + 0,4: + 1: 17 + 0: 3276 + 0,3: + 1: 4368 + 0: 52428 + -1,4: + 1: 240 + 0,5: + 0: 52428 + 0,6: + 0: 14 + 1,4: + 0: 17759 + 1,3: + 0: 65535 + 1,5: + 0: 58990 + 1,6: + 0: 26350 + 1,7: + 0: 4 + 2,4: + 0: 65419 + 2,5: + 0: 45311 + 2,6: + 0: 187 + 2,3: + 0: 16383 + 3,4: + 0: 46011 + 3,5: + 0: 47295 + 3,6: + 0: 35007 + 3,3: + 0: 8191 + 4,4: + 0: 12595 + 4,5: + 0: 13107 + 4,6: + 0: 13107 + 1,0: + 0: 65535 + 1,2: + 0: 65520 1,-1: 0: 65535 - 2,-2: - 0: 4096 - 1: 8738 - 2,-1: - 0: 4369 + 1,1: + 0: 61166 + 2,2: + 0: 7632 + 2,0: 1: 8738 + 2,1: + 1: 2 + 3,2: + 0: 36828 + 3,0: + 0: 36590 + 3,1: + 0: 52428 3,-1: - 0: 65262 - 3,-2: - 0: 61152 - 4,-2: - 0: 65520 - 4,-1: - 0: 65535 - 5,-2: - 0: 65520 - 5,-1: - 0: 65535 - 6,-2: - 0: 65520 - 6,-1: - 0: 65535 - 7,-2: - 0: 65520 - 7,-1: - 0: 65535 - -5,0: - 0: 52428 - -5,-3: - 0: 32768 - -5,-2: - 0: 51336 - -5,-1: - 0: 52428 + 0: 35771 4,0: - 0: 65535 + 0: 8191 4,1: 0: 65535 4,2: 0: 65535 4,3: + 0: 8191 + 0,-5: + 0: 4096 + 1,-4: + 0: 48008 + 1,-3: + 0: 65467 + 1,-2: + 0: 3003 + 1,-5: + 0: 34952 + 2,-4: + 0: 45875 + 1: 1092 + 2: 2056 + 2,-3: 0: 65535 + 2,-2: + 0: 61439 + 2,-5: + 0: 65535 + 2,-1: + 0: 3822 + 3,-4: + 0: 65535 + 3,-3: + 0: 65535 + 3,-2: + 0: 48063 + 3,-5: + 0: 65535 + 4,-4: + 0: 65535 + 4,-3: + 0: 65535 + 4,-2: + 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: 65283 + 5: 12 + 5,-1: + 0: 36863 + 5,-5: + 0: 62451 + 2: 3084 5,0: - 0: 65535 - 5,1: - 0: 65535 - 5,2: - 0: 65535 - 5,3: - 0: 65535 + 0: 40959 + 6,-4: + 2: 257 + 0: 4112 + 1: 17476 + 6,-3: + 3: 1 + 0: 4112 + 4: 256 + 1: 17476 + 6,-2: + 5: 1 + 0: 47872 + 1: 4 + 6,-1: + 0: 7103 + 6,-5: + 0: 4112 + 1: 17476 + 2: 257 6,0: 0: 65535 - 6,1: - 0: 65535 - 6,2: - 0: 65535 - 6,3: - 0: 63351 + 7,-2: + 0: 65280 + 7,-1: + 0: 8191 7,0: - 0: 30583 - 7,1: - 0: 4375 - 7,2: - 0: 4369 - 7,3: - 0: 4096 + 0: 13107 8,-2: - 0: 30576 + 0: 13056 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: 819 + -5,0: + 1: 17476 + -5,-1: + 1: 17476 + -5,-2: + 1: 16384 + 5,1: + 0: 48051 + 5,2: + 0: 7103 + 5,3: + 0: 4095 + 6,1: + 0: 65525 + 6,2: + 0: 4095 + 6,3: + 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,6 +445,51 @@ entities: - 0 - 0 - 0 + - 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 @@ -384,6 +502,7 @@ entities: - type: MetaData - type: Transform - type: Map + mapPaused: True - type: PhysicsMap - type: GridTree - type: MovedGrids @@ -401,12 +520,23 @@ entities: - type: DeviceList devices: - 801 -- proto: AirCanister - entities: - - uid: 458 + - uid: 1556 components: - type: Transform - pos: 7.5,-0.5 + 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: @@ -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,6 +958,362 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 179 + - uid: 1184 + components: + - type: Transform + pos: 22.5,-16.5 + parent: 179 + - uid: 1187 + components: + - type: Transform + pos: 22.5,-14.5 + parent: 179 + - uid: 1200 + components: + - type: Transform + pos: 22.5,-10.5 + parent: 179 + - uid: 1201 + components: + - type: Transform + pos: 22.5,-12.5 + parent: 179 + - uid: 1207 + components: + - type: Transform + pos: 22.5,-18.5 + parent: 179 + - uid: 1220 + components: + - type: Transform + pos: 22.5,-8.5 + parent: 179 + - uid: 1235 + components: + - type: Transform + pos: 22.5,-20.5 + parent: 179 + - uid: 1238 + components: + - type: Transform + pos: 22.5,-22.5 + parent: 179 + - uid: 1260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-24.5 + parent: 179 + - uid: 1335 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-25.5 + parent: 179 + - uid: 1336 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-25.5 + parent: 179 + - uid: 1489 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-12.5 + parent: 179 + - uid: 1493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-14.5 + parent: 179 + - uid: 1500 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-16.5 + parent: 179 + - uid: 1507 + components: + - type: Transform + pos: 7.5,-19.5 + parent: 179 + - uid: 1508 + components: + - type: Transform + pos: 8.5,-19.5 + parent: 179 + - uid: 1509 + components: + - type: Transform + pos: 9.5,-19.5 + parent: 179 + - uid: 1510 + components: + - type: Transform + pos: 10.5,-19.5 + parent: 179 + - uid: 1511 + components: + - type: Transform + pos: 11.5,-19.5 + parent: 179 + - uid: 1512 + components: + - type: Transform + pos: 12.5,-19.5 + parent: 179 + - uid: 1513 + components: + - type: Transform + pos: 13.5,-19.5 + parent: 179 + - uid: 1514 + components: + - type: Transform + pos: 14.5,-19.5 + parent: 179 + - uid: 1515 + components: + - type: Transform + pos: 14.5,-20.5 + parent: 179 + - uid: 1516 + components: + - type: Transform + pos: 14.5,-21.5 + parent: 179 + - uid: 1517 + components: + - type: Transform + pos: 14.5,-22.5 + parent: 179 + - uid: 1518 + components: + - type: Transform + pos: 14.5,-23.5 + parent: 179 + - uid: 1519 + components: + - type: Transform + pos: 14.5,-24.5 + parent: 179 +- proto: AtmosFixBlockerMarker + entities: + - uid: 1582 + components: + - type: Transform + pos: 23.5,-13.5 + parent: 179 + - uid: 1583 + components: + - type: Transform + pos: 23.5,-15.5 + parent: 179 + - uid: 1584 + components: + - type: Transform + pos: 23.5,-17.5 + parent: 179 + - uid: 1585 + components: + - type: Transform + pos: 23.5,-19.5 + parent: 179 + - uid: 1586 + components: + - type: Transform + pos: 23.5,-21.5 + parent: 179 + - uid: 1587 + components: + - type: Transform + pos: 23.5,-23.5 + parent: 179 + - uid: 1588 + components: + - type: Transform + pos: 10.5,-14.5 + parent: 179 + - uid: 1589 + components: + - type: Transform + pos: 22.5,-13.5 + parent: 179 + - uid: 1590 + components: + - type: Transform + pos: 24.5,-13.5 + parent: 179 + - uid: 1591 + components: + - type: Transform + pos: 24.5,-15.5 + parent: 179 + - uid: 1592 + components: + - type: Transform + pos: 22.5,-15.5 + parent: 179 + - uid: 1593 + components: + - type: Transform + pos: 22.5,-17.5 + parent: 179 + - uid: 1594 + components: + - type: Transform + pos: 24.5,-17.5 + parent: 179 + - uid: 1595 + components: + - type: Transform + pos: 24.5,-19.5 + parent: 179 + - uid: 1596 + components: + - type: Transform + pos: 22.5,-19.5 + parent: 179 + - uid: 1597 + components: + - type: Transform + pos: 22.5,-21.5 + parent: 179 + - uid: 1598 + components: + - type: Transform + pos: 22.5,-23.5 + parent: 179 + - uid: 1599 + components: + - type: Transform + pos: 24.5,-23.5 + parent: 179 + - uid: 1600 + components: + - type: Transform + pos: 24.5,-21.5 + parent: 179 + - uid: 1607 + components: + - type: Transform + pos: 10.5,-15.5 + parent: 179 + - uid: 1608 + components: + - type: Transform + pos: 10.5,-13.5 + parent: 179 + - uid: 1609 + components: + - type: Transform + pos: 11.5,-13.5 + parent: 179 + - uid: 1610 + components: + - type: Transform + pos: 11.5,-15.5 + parent: 179 +- proto: AtmosFixInstantPlasmaFireMarker + entities: + - uid: 1611 + components: + - type: Transform + pos: 12.5,-15.5 + parent: 179 + - uid: 1612 + components: + - type: Transform + pos: 13.5,-15.5 + parent: 179 + - uid: 1613 + components: + - type: Transform + pos: 14.5,-15.5 + parent: 179 + - uid: 1614 + components: + - type: Transform + pos: 14.5,-14.5 + parent: 179 + - uid: 1615 + components: + - type: Transform + pos: 13.5,-14.5 + parent: 179 + - uid: 1616 + components: + - type: Transform + pos: 12.5,-14.5 + parent: 179 + - uid: 1617 + components: + - type: Transform + pos: 12.5,-13.5 + parent: 179 + - uid: 1618 + components: + - type: Transform + pos: 13.5,-13.5 + parent: 179 + - uid: 1619 + components: + - type: Transform + pos: 14.5,-13.5 + parent: 179 +- proto: AtmosFixNitrogenMarker + entities: + - uid: 1579 + components: + - type: Transform + pos: 23.5,-9.5 + parent: 179 + - uid: 1603 + components: + - type: Transform + pos: 22.5,-9.5 + parent: 179 + - uid: 1604 + components: + - type: Transform + pos: 24.5,-9.5 + parent: 179 +- proto: AtmosFixOxygenMarker + entities: + - uid: 1580 + components: + - type: Transform + pos: 23.5,-7.5 + parent: 179 + - uid: 1605 + components: + - type: Transform + pos: 22.5,-7.5 + parent: 179 + - uid: 1606 + components: + - type: Transform + pos: 24.5,-7.5 + parent: 179 +- proto: AtmosFixPlasmaMarker + entities: + - uid: 1581 + components: + - type: Transform + pos: 23.5,-11.5 + parent: 179 + - uid: 1601 + components: + - type: Transform + pos: 22.5,-11.5 + parent: 179 + - uid: 1602 + components: + - type: Transform + pos: 24.5,-11.5 + parent: 179 - proto: Autolathe entities: - uid: 1 @@ -912,6 +1431,37 @@ entities: - type: Transform pos: -2.5,-16.5 parent: 179 + - uid: 1230 + components: + - type: Transform + pos: 6.5,-20.5 + parent: 179 + - uid: 1232 + components: + - type: Transform + pos: 6.5,-17.5 + parent: 179 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1233 + components: + - type: Transform + pos: 6.5,-16.5 + parent: 179 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1234 + components: + - type: Transform + pos: 6.5,-15.5 + parent: 179 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1385 + components: + - type: Transform + pos: 11.5,-14.5 + parent: 179 - proto: BoozeDispenser entities: - uid: 752 @@ -945,6 +1495,14 @@ entities: - type: Transform pos: 7.1447573,15.900927 parent: 179 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 1488 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-12.5 + parent: 179 - proto: CableApcExtension entities: - uid: 15 @@ -2242,6 +2800,411 @@ entities: - type: Transform pos: 8.5,25.5 parent: 179 + - uid: 1277 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 179 + - uid: 1282 + components: + - type: Transform + pos: 4.5,-11.5 + parent: 179 + - uid: 1289 + components: + - type: Transform + pos: 5.5,-9.5 + parent: 179 + - uid: 1292 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 179 + - uid: 1348 + components: + - type: Transform + pos: 6.5,-9.5 + parent: 179 + - uid: 1349 + components: + - type: Transform + pos: 7.5,-9.5 + parent: 179 + - uid: 1350 + components: + - type: Transform + pos: 9.5,-9.5 + parent: 179 + - uid: 1351 + components: + - type: Transform + pos: 10.5,-9.5 + parent: 179 + - uid: 1352 + components: + - type: Transform + pos: 11.5,-9.5 + parent: 179 + - uid: 1353 + components: + - type: Transform + pos: 12.5,-9.5 + parent: 179 + - uid: 1354 + components: + - type: Transform + pos: 13.5,-9.5 + parent: 179 + - uid: 1355 + components: + - type: Transform + pos: 14.5,-9.5 + parent: 179 + - uid: 1356 + components: + - type: Transform + pos: 15.5,-9.5 + parent: 179 + - uid: 1357 + components: + - type: Transform + pos: 16.5,-9.5 + parent: 179 + - uid: 1358 + components: + - type: Transform + pos: 17.5,-9.5 + parent: 179 + - uid: 1359 + components: + - type: Transform + pos: 18.5,-9.5 + parent: 179 + - uid: 1360 + components: + - type: Transform + pos: 19.5,-9.5 + parent: 179 + - uid: 1361 + components: + - type: Transform + pos: 20.5,-9.5 + parent: 179 + - uid: 1362 + components: + - type: Transform + pos: 21.5,-9.5 + parent: 179 + - uid: 1363 + components: + - type: Transform + pos: 8.5,-9.5 + parent: 179 + - uid: 1364 + components: + - type: Transform + pos: 11.5,-8.5 + parent: 179 + - uid: 1365 + components: + - type: Transform + pos: 11.5,-7.5 + parent: 179 + - uid: 1366 + components: + - type: Transform + pos: 11.5,-5.5 + parent: 179 + - uid: 1367 + components: + - type: Transform + pos: 11.5,-4.5 + parent: 179 + - uid: 1368 + components: + - type: Transform + pos: 11.5,-6.5 + parent: 179 + - uid: 1369 + components: + - type: Transform + pos: 11.5,-3.5 + parent: 179 + - uid: 1370 + components: + - type: Transform + pos: 9.5,-16.5 + parent: 179 + - uid: 1371 + components: + - type: Transform + pos: 9.5,-22.5 + parent: 179 + - uid: 1372 + components: + - type: Transform + pos: 9.5,-21.5 + parent: 179 + - uid: 1373 + components: + - type: Transform + pos: 9.5,-10.5 + parent: 179 + - uid: 1374 + components: + - type: Transform + pos: 9.5,-20.5 + parent: 179 + - uid: 1375 + components: + - type: Transform + pos: 9.5,-19.5 + parent: 179 + - uid: 1376 + components: + - type: Transform + pos: 9.5,-18.5 + parent: 179 + - uid: 1377 + components: + - type: Transform + pos: 9.5,-17.5 + parent: 179 + - uid: 1378 + components: + - type: Transform + pos: 9.5,-15.5 + parent: 179 + - uid: 1379 + components: + - type: Transform + pos: 9.5,-11.5 + parent: 179 + - uid: 1380 + components: + - type: Transform + pos: 9.5,-14.5 + parent: 179 + - uid: 1381 + components: + - type: Transform + pos: 9.5,-13.5 + parent: 179 + - uid: 1382 + components: + - type: Transform + pos: 9.5,-12.5 + parent: 179 + - uid: 1383 + components: + - type: Transform + pos: 10.5,-14.5 + parent: 179 + - uid: 1384 + components: + - type: Transform + pos: 11.5,-14.5 + parent: 179 + - uid: 1389 + components: + - type: Transform + pos: 16.5,-14.5 + parent: 179 + - uid: 1390 + components: + - type: Transform + pos: 17.5,-14.5 + parent: 179 + - uid: 1391 + components: + - type: Transform + pos: 19.5,-14.5 + parent: 179 + - uid: 1392 + components: + - type: Transform + pos: 20.5,-14.5 + parent: 179 + - uid: 1393 + components: + - type: Transform + pos: 21.5,-14.5 + parent: 179 + - uid: 1394 + components: + - type: Transform + pos: 22.5,-14.5 + parent: 179 + - uid: 1395 + components: + - type: Transform + pos: 18.5,-14.5 + parent: 179 + - uid: 1396 + components: + - type: Transform + pos: 22.5,-9.5 + parent: 179 + - uid: 1397 + components: + - type: Transform + pos: 10.5,-19.5 + parent: 179 + - uid: 1398 + components: + - type: Transform + pos: 11.5,-19.5 + parent: 179 + - uid: 1399 + components: + - type: Transform + pos: 12.5,-19.5 + parent: 179 + - uid: 1400 + components: + - type: Transform + pos: 13.5,-19.5 + parent: 179 + - uid: 1401 + components: + - type: Transform + pos: 14.5,-19.5 + parent: 179 + - uid: 1402 + components: + - type: Transform + pos: 15.5,-19.5 + parent: 179 + - uid: 1403 + components: + - type: Transform + pos: 17.5,-19.5 + parent: 179 + - uid: 1404 + components: + - type: Transform + pos: 18.5,-19.5 + parent: 179 + - uid: 1405 + components: + - type: Transform + pos: 19.5,-19.5 + parent: 179 + - uid: 1406 + components: + - type: Transform + pos: 20.5,-19.5 + parent: 179 + - uid: 1407 + components: + - type: Transform + pos: 21.5,-19.5 + parent: 179 + - uid: 1408 + components: + - type: Transform + pos: 22.5,-19.5 + parent: 179 + - uid: 1409 + components: + - type: Transform + pos: 16.5,-19.5 + parent: 179 + - uid: 1410 + components: + - type: Transform + pos: 9.5,-23.5 + parent: 179 + - uid: 1411 + components: + - type: Transform + pos: 9.5,-24.5 + parent: 179 + - uid: 1412 + components: + - type: Transform + pos: 10.5,-24.5 + parent: 179 + - uid: 1413 + components: + - type: Transform + pos: 11.5,-24.5 + parent: 179 + - uid: 1414 + components: + - type: Transform + pos: 12.5,-24.5 + parent: 179 + - uid: 1415 + components: + - type: Transform + pos: 13.5,-24.5 + parent: 179 + - uid: 1416 + components: + - type: Transform + pos: 14.5,-24.5 + parent: 179 + - uid: 1417 + components: + - type: Transform + pos: 15.5,-24.5 + parent: 179 + - uid: 1418 + components: + - type: Transform + pos: 16.5,-24.5 + parent: 179 + - uid: 1419 + components: + - type: Transform + pos: 17.5,-24.5 + parent: 179 + - uid: 1420 + components: + - type: Transform + pos: 18.5,-24.5 + parent: 179 + - uid: 1421 + components: + - type: Transform + pos: 19.5,-24.5 + parent: 179 + - uid: 1422 + components: + - type: Transform + pos: 20.5,-24.5 + parent: 179 + - uid: 1423 + components: + - type: Transform + pos: 21.5,-24.5 + parent: 179 + - uid: 1424 + components: + - type: Transform + pos: 22.5,-24.5 + parent: 179 + - uid: 1502 + components: + - type: Transform + pos: 13.5,-14.5 + parent: 179 + - uid: 1503 + components: + - type: Transform + pos: 12.5,-14.5 + parent: 179 + - uid: 1504 + components: + - type: Transform + pos: 14.5,-14.5 + parent: 179 + - uid: 1554 + components: + - type: Transform + pos: 15.5,-14.5 + parent: 179 - proto: CableApcStack entities: - uid: 70 @@ -2360,6 +3323,23 @@ entities: - type: Transform pos: -3.277628,-2.15838 parent: 179 +- proto: CarbonDioxideCanister + entities: + - uid: 748 + components: + - type: Transform + pos: 13.5,-4.5 + parent: 179 + - uid: 749 + components: + - type: Transform + pos: 12.5,-4.5 + parent: 179 + - uid: 1316 + components: + - type: Transform + pos: 24.5,-21.5 + parent: 179 - proto: Catwalk entities: - uid: 2 @@ -2433,132 +3413,6 @@ entities: - type: Transform pos: -5.5,-13.5 parent: 179 - - uid: 345 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,0.5 - parent: 179 - - uid: 346 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,1.5 - parent: 179 - - uid: 347 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,2.5 - parent: 179 - - uid: 348 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,3.5 - parent: 179 - - uid: 349 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,4.5 - parent: 179 - - uid: 403 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-0.5 - parent: 179 - - uid: 404 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-1.5 - parent: 179 - - uid: 405 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-2.5 - parent: 179 - - uid: 406 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-3.5 - parent: 179 - - uid: 407 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-4.5 - parent: 179 - - uid: 408 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-5.5 - parent: 179 - - uid: 409 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-6.5 - parent: 179 - - uid: 410 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-7.5 - parent: 179 - - uid: 411 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-8.5 - parent: 179 - - uid: 412 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-9.5 - parent: 179 - - uid: 413 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-10.5 - parent: 179 - - uid: 414 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-11.5 - parent: 179 - - uid: 415 - components: - - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 8.5,-8.5 - parent: 179 - uid: 438 components: - type: Transform @@ -2704,52 +3558,16 @@ entities: parent: 179 - proto: ClosetEmergencyFilledRandom entities: - - uid: 319 + - uid: 349 components: - type: Transform 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 - - uid: 322 + - uid: 403 components: - type: Transform 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: ClosetToolFilled entities: - uid: 524 @@ -2844,6 +3662,13 @@ entities: - 0 - 0 - 0 +- proto: ClothingBeltChiefEngineerFilled + entities: + - uid: 1573 + components: + - type: Transform + pos: 1.3037996,-5.2961445 + parent: 179 - proto: ClothingBeltUtilityFilled entities: - uid: 427 @@ -2960,7 +3785,7 @@ entities: parent: 179 - proto: ComputerCargoShuttle entities: - - uid: 995 + - uid: 404 components: - type: Transform pos: 0.5,-11.5 @@ -3097,31 +3922,6 @@ entities: - 0 - 0 - 0 -- proto: CrateGeneric - entities: - - uid: 266 - components: - - type: Transform - pos: 5.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: CrateHydroponicsSeeds entities: - uid: 754 @@ -3172,6 +3972,18 @@ entities: - 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 @@ -3246,12 +4058,19 @@ entities: - 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: 11.5,-14.5 + pos: 8.5,-10.5 parent: 179 - proto: DefaultStationBeaconBotany entities: @@ -3408,6 +4227,13 @@ entities: - 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 @@ -3514,114 +4340,757 @@ entities: - type: Transform pos: 3.5215416,6.799056 parent: 179 -- proto: GasAnalyzer +- proto: FrezonCanister entities: - - uid: 876 + - uid: 1308 components: - type: Transform - pos: 4.4732866,-0.48882532 + pos: 9.5,-5.5 parent: 179 -- proto: GasFilter + - 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 - rot: -1.5707963267948966 rad - pos: 3.5,-3.5 + pos: 9.5,-7.5 parent: 179 -- proto: GasMixer - entities: - - uid: 747 + - uid: 616 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 + pos: 10.5,-7.5 parent: 179 -- proto: GasOutletInjector +- proto: GasThermoMachineHeater entities: - - uid: 429 + - uid: 483 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-1.5 + pos: 13.5,-7.5 parent: 179 -- proto: GasPipeBend - entities: - - uid: 727 + - uid: 1568 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-0.5 - parent: 179 -- proto: GasPipeFourway - entities: - - uid: 728 - components: - - type: Transform - pos: 5.5,-1.5 - parent: 179 -- proto: GasPipeStraight - entities: - - uid: 749 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-3.5 - parent: 179 -- proto: GasPipeTJunction - entities: - - uid: 748 - components: - - type: Transform - pos: 5.5,-2.5 - parent: 179 -- proto: GasPort - entities: - - uid: 457 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-0.5 - parent: 179 -- proto: GasPressurePump - entities: - - uid: 171 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-3.5 + pos: 12.5,-7.5 parent: 179 - proto: GasValve entities: - - uid: 168 + - uid: 1545 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-2.5 + rot: 3.141592653589793 rad + pos: 17.5,-24.5 parent: 179 - proto: GasVentPump entities: - - uid: 729 + - uid: 1521 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-3.5 + rot: 3.141592653589793 rad + pos: 9.5,-22.5 parent: 179 - proto: GasVentScrubber entities: - - uid: 452 + - uid: 1543 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-2.5 - parent: 179 -- proto: GasVolumePump - entities: - - uid: 160 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-1.5 + rot: 1.5707963267948966 rad + pos: 11.5,-22.5 parent: 179 - proto: GeigerCounter entities: @@ -3731,6 +5200,10 @@ entities: - type: Transform pos: -8.5,7.5 parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True missingComponents: - TimedDespawn - uid: 901 @@ -3738,6 +5211,10 @@ entities: - type: Transform pos: -10.5,7.5 parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True missingComponents: - TimedDespawn - uid: 902 @@ -3745,8 +5222,19 @@ entities: - 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 @@ -3779,6 +5267,13 @@ entities: - 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 @@ -3815,6 +5310,13 @@ entities: - 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 @@ -3890,81 +5392,27 @@ entities: - 0 - 0 - 0 -- proto: LockerChiefEngineerFilled +- proto: LockerChiefEngineerFilledHardsuit entities: - - uid: 447 + - uid: 1564 components: - type: Transform - pos: 7.5,2.5 + pos: 7.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: LockerElectricalSuppliesFilled entities: - - uid: 444 + - uid: 405 components: - type: Transform - pos: 7.5,3.5 + pos: 5.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: LockerEngineerFilled +- proto: LockerEngineerFilledHardsuit entities: - - uid: 490 + - uid: 458 components: - type: Transform - pos: 7.5,4.5 + pos: 5.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 - proto: LockerMedical entities: - uid: 128 @@ -4115,29 +5563,11 @@ entities: - 0 - proto: LockerWeldingSuppliesFilled entities: - - uid: 871 + - uid: 457 components: - type: Transform - pos: 7.5,1.5 + pos: 5.5,-7.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: MachineAnomalyGenerator entities: - uid: 1071 @@ -4307,10 +5737,37 @@ entities: 'UID: 31739': 801 - proto: NitrogenCanister entities: - - uid: 459 + - uid: 871 components: - type: Transform - pos: 7.5,-1.5 + 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: @@ -4326,10 +5783,20 @@ entities: parent: 179 - proto: OxygenCanister entities: - - uid: 340 + - uid: 747 components: - type: Transform - pos: 7.5,-3.5 + 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: @@ -4359,10 +5826,20 @@ entities: parent: 179 - proto: PlasmaCanister entities: - - uid: 461 + - uid: 255 components: - type: Transform - pos: 7.5,-2.5 + 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: @@ -4393,12 +5870,12 @@ entities: - type: Transform pos: -5.5,-5.5 parent: 179 -- proto: PortableGeneratorSuperPacman +- proto: PowerCellAntiqueProto entities: - - uid: 1016 + - uid: 1570 components: - type: Transform - pos: -6.5,-11.5 + pos: 7.5772533,-7.233466 parent: 179 - proto: PowerCellHigh entities: @@ -4455,6 +5932,12 @@ entities: 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 @@ -4463,6 +5946,12 @@ entities: 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 @@ -4534,22 +6023,6 @@ entities: parent: 179 - type: ApcPowerReceiver powerLoad: 0 - - uid: 678 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-1.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 680 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-5.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 681 components: - type: Transform @@ -4584,6 +6057,97 @@ entities: 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 @@ -4624,14 +6188,6 @@ entities: parent: 179 - type: ApcPowerReceiver powerLoad: 0 - - uid: 483 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-9.5 - parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 534 components: - type: Transform @@ -4640,6 +6196,12 @@ entities: 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 @@ -4799,6 +6361,13 @@ entities: - 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 @@ -5018,6 +6587,30 @@ entities: - 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 @@ -5025,6 +6618,54 @@ entities: - 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: 1203 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-19.5 + parent: 179 +- proto: SignFlammable + entities: + - uid: 1297 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-13.5 + parent: 179 + - uid: 1299 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-11.5 + parent: 179 +- proto: SignSpace + entities: + - uid: 1291 + components: + - type: Transform + pos: 6.5,-19.5 + parent: 179 + - 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: 1048 @@ -5053,6 +6694,20 @@ entities: - type: Transform pos: 8.5,12.5 parent: 179 +- proto: SpawnMobCorgiMouse + entities: + - uid: 1050 + components: + - type: Transform + pos: 3.5,8.5 + parent: 179 +- proto: SpawnMobCrabAtmos + entities: + - uid: 729 + components: + - type: Transform + pos: 15.5,-10.5 + parent: 179 - proto: SpawnMobHuman entities: - uid: 138 @@ -5070,13 +6725,6 @@ entities: - type: Transform pos: 3.5,7.5 parent: 179 -- proto: SpawnMobCorgiMouse - entities: - - uid: 1050 - components: - - type: Transform - pos: 3.5,8.5 - parent: 179 - proto: SpawnPointCaptain entities: - uid: 954 @@ -5112,6 +6760,13 @@ entities: - type: Transform pos: 6.985283,16.424004 parent: 179 +- proto: SprayPainter + entities: + - uid: 1572 + components: + - type: Transform + pos: 7.5948057,-5.356733 + parent: 179 - proto: Stimpack entities: - uid: 462 @@ -5132,6 +6787,28 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-6.5 parent: 179 +- proto: StorageCanister + entities: + - uid: 1285 + components: + - type: Transform + pos: 10.5,-6.5 + parent: 179 + - 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: 434 @@ -5202,6 +6879,11 @@ entities: - type: Transform pos: 8.5,21.5 parent: 179 + - uid: 76 + components: + - type: Transform + pos: 7.5,-7.5 + parent: 179 - uid: 92 components: - type: Transform @@ -5391,6 +7073,16 @@ entities: - type: Transform pos: 3.5,5.5 parent: 179 + - uid: 452 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 179 + - uid: 461 + components: + - type: Transform + pos: 7.5,-6.5 + parent: 179 - uid: 465 components: - type: Transform @@ -5566,6 +7258,11 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 179 + - uid: 1561 + components: + - type: Transform + pos: 7.5,-5.5 + parent: 179 - proto: TableGlass entities: - uid: 964 @@ -5593,6 +7290,13 @@ entities: - type: Transform pos: 12.5,12.5 parent: 179 +- proto: TargetClown + entities: + - uid: 459 + components: + - type: Transform + pos: 7.5,-0.5 + parent: 179 - proto: TargetHuman entities: - uid: 159 @@ -5600,6 +7304,43 @@ entities: - type: Transform pos: -6.5,-1.5 parent: 179 + - uid: 248 + components: + - type: Transform + pos: 7.5,1.5 + parent: 179 +- proto: TargetSyndicate + entities: + - uid: 613 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 179 +- proto: TegCenter + entities: + - uid: 1576 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-18.5 + parent: 179 +- proto: TegCirculator + entities: + - uid: 1577 + components: + - type: Transform + pos: 14.5,-18.5 + parent: 179 + - type: PointLight + color: '#FF3300FF' + - uid: 1578 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-18.5 + parent: 179 + - type: PointLight + color: '#FF3300FF' - proto: TelecomServerFilled entities: - uid: 963 @@ -5652,6 +7393,23 @@ entities: - type: Transform pos: 1.354346,4.548879 parent: 179 +- proto: TritiumCanister + entities: + - uid: 254 + components: + - type: Transform + pos: 13.5,-2.5 + parent: 179 + - uid: 619 + components: + - type: Transform + pos: 12.5,-2.5 + parent: 179 + - uid: 1312 + components: + - type: Transform + pos: 24.5,-13.5 + parent: 179 - proto: TwoWayLever entities: - uid: 699 @@ -5715,6 +7473,53 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 1290 + components: + - type: Transform + pos: 7.5,-14.5 + parent: 179 + - 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: 7.5,-18.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 1230: + - Left: Open + - Right: Open + - Middle: Close - proto: UnfinishedMachineFrame entities: - uid: 522 @@ -5748,6 +7553,17 @@ entities: - type: Transform pos: -11.5,-1.5 parent: 179 + - uid: 1567 + components: + - type: Transform + pos: 5.5,-11.5 + parent: 179 + - type: ActionGrant + actions: + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow - proto: VendingMachineMedical entities: - uid: 156 @@ -5784,12 +7600,26 @@ entities: - type: Transform pos: -13.5,4.5 parent: 179 -- proto: VendingMachineTankDispenserEVA +- proto: VendingMachineTankDispenserEngineering entities: - - uid: 875 + - uid: 615 components: - type: Transform - pos: 7.5,0.5 + pos: 17.5,-7.5 + parent: 179 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 614 + components: + - type: Transform + pos: 14.5,-7.5 + parent: 179 +- proto: VendingMachineVendomat + entities: + - uid: 1565 + components: + - type: Transform + pos: 5.5,-12.5 parent: 179 - proto: VendingMachineYouTool entities: @@ -5798,6 +7628,17 @@ entities: - type: Transform pos: -11.5,-0.5 parent: 179 + - uid: 1566 + components: + - type: Transform + pos: 5.5,-10.5 + parent: 179 + - type: ActionGrant + actions: + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow - proto: WallSolid entities: - uid: 3 @@ -6065,16 +7906,6 @@ entities: - type: Transform pos: 9.5,22.5 parent: 179 - - uid: 76 - components: - - type: Transform - pos: 8.5,-1.5 - parent: 179 - - uid: 77 - components: - - type: Transform - pos: 8.5,-2.5 - parent: 179 - uid: 78 components: - type: Transform @@ -6130,11 +7961,6 @@ entities: - type: Transform pos: 7.5,27.5 parent: 179 - - uid: 97 - components: - - type: Transform - pos: 8.5,-3.5 - parent: 179 - uid: 98 components: - type: Transform @@ -6245,6 +8071,12 @@ entities: - type: Transform pos: 4.5,24.5 parent: 179 + - uid: 160 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-0.5 + parent: 179 - uid: 164 components: - type: Transform @@ -6256,11 +8088,23 @@ entities: - type: Transform pos: 8.5,2.5 parent: 179 + - uid: 168 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-0.5 + parent: 179 - uid: 169 components: - type: Transform pos: 8.5,0.5 parent: 179 + - uid: 171 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-0.5 + parent: 179 - uid: 173 components: - type: Transform @@ -6496,31 +8340,6 @@ entities: - type: Transform pos: -7.5,-5.5 parent: 179 - - uid: 248 - components: - - type: Transform - pos: 5.5,-7.5 - parent: 179 - - uid: 249 - components: - - type: Transform - pos: 5.5,-9.5 - parent: 179 - - uid: 250 - components: - - type: Transform - pos: 6.5,-9.5 - parent: 179 - - uid: 251 - components: - - type: Transform - pos: 6.5,-7.5 - parent: 179 - - uid: 254 - components: - - type: Transform - pos: 7.5,-9.5 - parent: 179 - uid: 260 components: - type: Transform @@ -6531,6 +8350,11 @@ entities: - type: Transform pos: 6.5,-5.5 parent: 179 + - uid: 266 + components: + - type: Transform + pos: 8.5,-3.5 + parent: 179 - uid: 271 components: - type: Transform @@ -6671,6 +8495,12 @@ entities: - type: Transform pos: 24.5,14.5 parent: 179 + - uid: 322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-11.5 + parent: 179 - uid: 329 components: - type: Transform @@ -6711,6 +8541,12 @@ entities: - type: Transform pos: 26.5,12.5 parent: 179 + - uid: 346 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-7.5 + parent: 179 - uid: 352 components: - type: Transform @@ -6811,11 +8647,6 @@ entities: - type: Transform pos: 22.5,11.5 parent: 179 - - uid: 418 - components: - - type: Transform - pos: 7.5,-7.5 - parent: 179 - uid: 439 components: - type: Transform @@ -7012,11 +8843,6 @@ entities: - type: Transform pos: 7.5,-4.5 parent: 179 - - uid: 546 - components: - - type: Transform - pos: 8.5,-4.5 - parent: 179 - uid: 547 components: - type: Transform @@ -7165,47 +8991,18 @@ entities: - uid: 612 components: - type: Transform - pos: 13.5,-1.5 - parent: 179 - - uid: 613 - components: - - type: Transform - pos: 13.5,-6.5 - parent: 179 - - uid: 614 - components: - - type: Transform - pos: 13.5,-5.5 - parent: 179 - - uid: 615 - components: - - type: Transform - pos: 13.5,-4.5 - parent: 179 - - uid: 616 - components: - - type: Transform - pos: 13.5,-3.5 - parent: 179 - - uid: 617 - components: - - type: Transform - pos: 13.5,-2.5 + pos: 8.5,-2.5 parent: 179 - uid: 618 components: - type: Transform pos: 14.5,-6.5 parent: 179 - - uid: 619 - components: - - type: Transform - pos: 15.5,-6.5 - parent: 179 - uid: 620 components: - type: Transform - pos: 16.5,-6.5 + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 parent: 179 - uid: 621 components: @@ -7402,6 +9199,11 @@ entities: - type: Transform pos: 27.5,4.5 parent: 179 + - uid: 680 + components: + - type: Transform + pos: 8.5,-1.5 + parent: 179 - uid: 702 components: - type: Transform @@ -7490,6 +9292,12 @@ entities: rot: 3.141592653589793 rad pos: 15.5,18.5 parent: 179 + - uid: 1016 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-9.5 + parent: 179 - uid: 1072 components: - type: Transform @@ -7505,11 +9313,293 @@ entities: - type: Transform pos: 17.5,28.5 parent: 179 + - uid: 1176 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-10.5 + parent: 179 - uid: 1181 components: - type: Transform pos: 5.5,28.5 parent: 179 + - uid: 1206 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-12.5 + parent: 179 + - uid: 1209 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-8.5 + parent: 179 + - uid: 1210 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-17.5 + parent: 179 + - uid: 1211 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-15.5 + parent: 179 + - uid: 1212 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-19.5 + parent: 179 + - uid: 1213 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-18.5 + parent: 179 + - uid: 1214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-22.5 + parent: 179 + - uid: 1215 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-20.5 + parent: 179 + - uid: 1216 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-21.5 + parent: 179 + - uid: 1217 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-13.5 + parent: 179 + - uid: 1218 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-14.5 + parent: 179 + - uid: 1219 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-16.5 + parent: 179 + - uid: 1226 + components: + - type: Transform + pos: 6.5,-22.5 + parent: 179 + - uid: 1228 + components: + - type: Transform + pos: 6.5,-21.5 + parent: 179 + - uid: 1229 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-19.5 + parent: 179 + - uid: 1231 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-18.5 + parent: 179 + - uid: 1263 + components: + - type: Transform + pos: 6.5,-23.5 + parent: 179 + - uid: 1272 + components: + - type: Transform + pos: 6.5,-24.5 + parent: 179 + - uid: 1294 + components: + - type: Transform + pos: 25.5,-24.5 + parent: 179 + - uid: 1295 + components: + - type: Transform + pos: 25.5,-23.5 + parent: 179 + - uid: 1303 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-1.5 + parent: 179 + - uid: 1304 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-2.5 + parent: 179 + - uid: 1305 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-3.5 + parent: 179 + - uid: 1306 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-4.5 + parent: 179 + - uid: 1307 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-5.5 + parent: 179 + - uid: 1328 + components: + - type: Transform + pos: 25.5,-25.5 + parent: 179 + - uid: 1329 + components: + - type: Transform + pos: 24.5,-25.5 + parent: 179 + - uid: 1330 + components: + - type: Transform + pos: 23.5,-25.5 + parent: 179 + - uid: 1331 + components: + - type: Transform + pos: 22.5,-25.5 + parent: 179 + - uid: 1332 + components: + - type: Transform + pos: 21.5,-25.5 + parent: 179 + - uid: 1333 + components: + - type: Transform + pos: 20.5,-25.5 + parent: 179 + - uid: 1334 + components: + - type: Transform + pos: 19.5,-25.5 + parent: 179 + - uid: 1337 + components: + - type: Transform + pos: 16.5,-25.5 + parent: 179 + - uid: 1338 + components: + - type: Transform + pos: 15.5,-25.5 + parent: 179 + - uid: 1339 + components: + - type: Transform + pos: 14.5,-25.5 + parent: 179 + - uid: 1340 + components: + - type: Transform + pos: 12.5,-25.5 + parent: 179 + - uid: 1341 + components: + - type: Transform + pos: 11.5,-25.5 + parent: 179 + - uid: 1342 + components: + - type: Transform + pos: 10.5,-25.5 + parent: 179 + - uid: 1343 + components: + - type: Transform + pos: 9.5,-25.5 + parent: 179 + - uid: 1344 + components: + - type: Transform + pos: 8.5,-25.5 + parent: 179 + - uid: 1345 + components: + - type: Transform + pos: 7.5,-25.5 + parent: 179 + - uid: 1346 + components: + - type: Transform + pos: 6.5,-25.5 + parent: 179 + - uid: 1347 + components: + - type: Transform + pos: 13.5,-25.5 + parent: 179 + - uid: 1506 + components: + - type: Transform + pos: 10.5,-12.5 + parent: 179 + - uid: 1559 + components: + - type: Transform + pos: 8.5,-4.5 + parent: 179 +- proto: WarningCO2 + entities: + - uid: 1300 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-21.5 + parent: 179 +- proto: WarningN2 + entities: + - uid: 1208 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-9.5 + parent: 179 +- proto: WarningN2O + entities: + - uid: 1296 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-17.5 + parent: 179 +- proto: WarningO2 + entities: + - uid: 1227 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-7.5 + parent: 179 - proto: WaterTankFull entities: - uid: 115 @@ -7522,6 +9612,23 @@ entities: - type: Transform pos: -2.5,3.5 parent: 179 +- proto: WaterVaporCanister + entities: + - uid: 97 + components: + - type: Transform + pos: 12.5,-1.5 + parent: 179 + - uid: 319 + components: + - type: Transform + pos: 13.5,-1.5 + parent: 179 + - uid: 1313 + components: + - type: Transform + pos: 24.5,-23.5 + parent: 179 - proto: WeaponCapacitorRecharger entities: - uid: 708 @@ -7623,6 +9730,331 @@ entities: - type: Transform pos: 2.5,-14.5 parent: 179 +- proto: WindowReinforcedDirectional + entities: + - uid: 340 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-7.5 + parent: 179 + - uid: 345 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-8.5 + parent: 179 + - uid: 347 + components: + - type: Transform + pos: 24.5,-22.5 + parent: 179 + - uid: 348 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-8.5 + parent: 179 + - uid: 1236 + components: + - type: Transform + pos: 23.5,-8.5 + parent: 179 + - uid: 1237 + components: + - type: Transform + pos: 24.5,-8.5 + parent: 179 + - uid: 1239 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-10.5 + parent: 179 + - uid: 1240 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-10.5 + parent: 179 + - uid: 1241 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-9.5 + parent: 179 + - uid: 1242 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-11.5 + parent: 179 + - uid: 1243 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-13.5 + parent: 179 + - uid: 1244 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-15.5 + parent: 179 + - uid: 1245 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-17.5 + parent: 179 + - uid: 1246 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-19.5 + parent: 179 + - uid: 1247 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-22.5 + parent: 179 + - uid: 1248 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-21.5 + parent: 179 + - uid: 1249 + components: + - type: Transform + pos: 23.5,-10.5 + parent: 179 + - uid: 1250 + components: + - type: Transform + pos: 24.5,-10.5 + parent: 179 + - uid: 1251 + components: + - type: Transform + pos: 24.5,-12.5 + parent: 179 + - uid: 1252 + components: + - type: Transform + pos: 24.5,-14.5 + parent: 179 + - uid: 1253 + components: + - type: Transform + pos: 24.5,-16.5 + parent: 179 + - uid: 1254 + components: + - type: Transform + pos: 24.5,-18.5 + parent: 179 + - uid: 1255 + components: + - type: Transform + pos: 24.5,-20.5 + parent: 179 + - uid: 1256 + components: + - type: Transform + pos: 23.5,-20.5 + parent: 179 + - uid: 1257 + components: + - type: Transform + pos: 23.5,-18.5 + parent: 179 + - uid: 1259 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-24.5 + parent: 179 + - uid: 1261 + components: + - type: Transform + pos: 23.5,-16.5 + parent: 179 + - uid: 1262 + components: + - type: Transform + pos: 23.5,-14.5 + parent: 179 + - uid: 1264 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-22.5 + parent: 179 + - uid: 1265 + components: + - type: Transform + pos: 23.5,-12.5 + parent: 179 + - uid: 1266 + components: + - type: Transform + pos: 23.5,-22.5 + parent: 179 + - uid: 1267 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-12.5 + parent: 179 + - uid: 1268 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-12.5 + parent: 179 + - uid: 1269 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-14.5 + parent: 179 + - uid: 1270 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-14.5 + parent: 179 + - uid: 1271 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-23.5 + parent: 179 + - uid: 1273 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-16.5 + parent: 179 + - uid: 1274 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-16.5 + parent: 179 + - uid: 1275 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-18.5 + parent: 179 + - uid: 1276 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-18.5 + parent: 179 + - uid: 1279 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-20.5 + parent: 179 + - uid: 1280 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-20.5 + parent: 179 + - uid: 1283 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-24.5 + parent: 179 + - uid: 1386 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-15.5 + parent: 179 + - uid: 1387 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-13.5 + parent: 179 + - uid: 1388 + components: + - type: Transform + pos: 12.5,-12.5 + parent: 179 + - uid: 1490 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-15.5 + parent: 179 + - uid: 1491 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-14.5 + parent: 179 + - uid: 1492 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-16.5 + parent: 179 + - uid: 1494 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,-13.5 + parent: 179 + - uid: 1495 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-16.5 + parent: 179 + - uid: 1496 + components: + - type: Transform + pos: 11.5,-12.5 + parent: 179 + - uid: 1497 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-16.5 + parent: 179 + - uid: 1498 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-15.5 + parent: 179 + - uid: 1501 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-16.5 + parent: 179 + - uid: 1505 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-13.5 + parent: 179 + - uid: 1562 + components: + - type: Transform + pos: 14.5,-12.5 + parent: 179 - proto: Wirecutter entities: - uid: 359 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index d661e097c3..764c03b71b 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -62944,11 +62944,6 @@ entities: - type: Transform pos: 35.5,16.5 parent: 60 - - uid: 24676 - components: - - type: Transform - pos: 11.5,-11.5 - parent: 60 - proto: DefaultStationBeaconAICore entities: - uid: 18703 @@ -63342,6 +63337,13 @@ entities: - type: Transform pos: 3.5,-6.5 parent: 60 +- proto: DefaultStationBeaconVox + entities: + - uid: 23890 + components: + - type: Transform + pos: 11.5,-11.5 + parent: 60 - proto: DefaultStationBeaconWardensOffice entities: - uid: 24426 diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 2918b26110..a56b0d6471 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -11584,7 +11584,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -18243.016 + secondsUntilStateChange: -18318.04 state: Opening - type: DeviceLinkSource lastSignals: @@ -72442,6 +72442,13 @@ entities: - type: Transform pos: -31.5,4.5 parent: 8364 +- proto: DefaultStationBeaconVox + entities: + - uid: 27921 + components: + - type: Transform + pos: -42.5,-11.5 + parent: 8364 - proto: DefaultStationBeaconWardensOffice entities: - uid: 27736 @@ -84431,7 +84438,7 @@ entities: pos: -34.5,-14.5 parent: 8364 - type: Door - secondsUntilStateChange: -12431.553 + secondsUntilStateChange: -12506.576 state: Closing - uid: 15010 components: @@ -84924,7 +84931,7 @@ entities: pos: -4.5,-71.5 parent: 8364 - type: Door - secondsUntilStateChange: -4179.284 + secondsUntilStateChange: -4254.308 state: Closing - proto: Fireplace entities: diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index 384c60f599..888b4e7e5e 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -16747,7 +16747,7 @@ entities: pos: -44.5,68.5 parent: 12 - type: Door - secondsUntilStateChange: -5764.909 + secondsUntilStateChange: -5937.642 state: Opening - type: DeviceLinkSource lastSignals: @@ -84185,6 +84185,13 @@ entities: - type: Transform pos: -30.5,9.5 parent: 12 +- proto: DefaultStationBeaconVox + entities: + - uid: 30179 + components: + - type: Transform + pos: 4.5,69.5 + parent: 12 - proto: DefaultStationBeaconWardensOffice entities: - uid: 20823 diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index 1c5b67b500..2198854499 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -63749,6 +63749,13 @@ entities: - type: Transform pos: 54.5,-33.5 parent: 2 +- proto: DefaultStationBeaconVox + entities: + - uid: 16173 + components: + - type: Transform + pos: -31.5,-2.5 + parent: 2 - proto: DefaultStationBeaconWardensOffice entities: - uid: 20871 @@ -106044,11 +106051,11 @@ entities: After several simulations where Superconducting Magnetic Energy Storage units were drained from the main system from [italic]a variety[/italic] of user errors and other shenanigans, it has been determined that the Singularity should be put on its own power loop, disconnected from the main station. The upsides of this include but are not limited to: - [bold]1.[/bold] Limited external forces from the containments power. + [bold]1.[/bold] Limited external forces from the containments power. - [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue. + [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue. - [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system. + [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system. [italic]While we have listed the upsides we also acknowledge the downside,[/italic] for it being on its own loop you will need an external force if the system "runs out of juice". Our recommendation for this is simply attaching a generator to said SMES and letting it get to full charge before continuing operations but as said from another of our technicians... "just attach it to the main grid for like, a hot moment, and kickstart the thing!" diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index 15a719bb53..0b5a6bec70 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -14470,7 +14470,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76151.9 + secondsUntilStateChange: -76213.97 state: Opening - uid: 6934 components: @@ -14482,7 +14482,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76154.53 + secondsUntilStateChange: -76216.6 state: Opening - uid: 6935 components: @@ -14494,7 +14494,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76153.38 + secondsUntilStateChange: -76215.45 state: Opening - uid: 6936 components: @@ -14505,7 +14505,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76152.6 + secondsUntilStateChange: -76214.67 state: Opening - proto: AirlockTheatreLocked entities: @@ -81255,6 +81255,13 @@ entities: - type: Transform pos: -54.5,-11.5 parent: 2 +- proto: DefaultStationBeaconVox + entities: + - uid: 29615 + components: + - type: Transform + pos: -14.5,17.5 + parent: 2 - proto: DefaultStationBeaconWardensOffice entities: - uid: 11912 @@ -94258,7 +94265,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -67475.88 + secondsUntilStateChange: -67537.95 - type: DeviceNetwork deviceLists: - 18275 @@ -138807,7 +138814,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -104307.73 + secondsUntilStateChange: -104369.8 state: Opening - uid: 5211 components: @@ -190162,7 +190169,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -449512.38 + secondsUntilStateChange: -449574.44 state: Opening - uid: 28863 components: diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 5430a3f005..d80e36bde1 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/Datasets/Names/last.yml b/Resources/Prototypes/Datasets/Names/last.yml index 8cc544afd6..2f952f957a 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/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 59fa1b0d1a..8784ed77ce 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/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 397061defe..d7c5dfe97b 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -79,6 +79,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 9f7e206c24..7391e5709f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -70,6 +70,8 @@ canShuttle: false title: comms-console-announcement-title-station-ai color: "#2ed2fd" + - type: Speech + speechVerb: Robotic - type: entity id: AiHeldIntellicard diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 40cb141af7..ffccf07ab6 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/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 19eab391ac..836ce7ff14 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -639,3 +639,11 @@ components: - type: NavMapBeacon defaultText: station-beacon-escape-pod + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconVox + suffix: Vox + components: + - type: NavMapBeacon + defaultText: station-beacon-vox diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 71e171fc50..5562715fdb 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/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index 6cfcc536bd..8edee88627 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/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml index b55d5a9e69..d75581bbc2 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/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 537a792e85..78fdfec7c9 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 +