diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs index 6b6561234122de..b9b58f23220ace 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -26,6 +26,11 @@ protected override void Open() _window = this.CreateWindow(); + if (_entManager.TryGetComponent(Owner, out HandLabelerComponent? labeler)) + { + _window.SetMaxLabelLength(labeler!.MaxLabelChars); + } + _window.OnLabelChanged += OnLabelChanged; Reload(); } diff --git a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs index 6482cdc1cc206f..7a0627b3e236e9 100644 --- a/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs +++ b/Content.Client/Labels/UI/HandLabelerWindow.xaml.cs @@ -21,7 +21,7 @@ public HandLabelerWindow() { RobustXamlLoader.Load(this); - LabelLineEdit.OnTextEntered += e => + LabelLineEdit.OnTextChanged += e => { _label = e.Text; OnLabelChanged?.Invoke(_label); @@ -33,6 +33,10 @@ public HandLabelerWindow() _focused = false; LabelLineEdit.Text = _label; }; + + // Give the editor keybard focus, since that's the only + // thing the user will want to be doing with this UI + LabelLineEdit.GrabKeyboardFocus(); } public void SetCurrentLabel(string label) @@ -44,5 +48,10 @@ public void SetCurrentLabel(string label) if (!_focused) LabelLineEdit.Text = label; } + + public void SetMaxLabelLength(int maxLength) + { + LabelLineEdit.IsValid = s => s.Length <= maxLength; + } } } diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs index b05c4414bcc060..a07accf7772305 100644 --- a/Content.Server/Morgue/MorgueSystem.cs +++ b/Content.Server/Morgue/MorgueSystem.cs @@ -3,8 +3,6 @@ using Content.Shared.Examine; using Content.Shared.Morgue; using Content.Shared.Morgue.Components; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Player; @@ -25,12 +23,12 @@ public override void Initialize() /// /// Handles the examination text for looking at a morgue. /// - private void OnExamine(EntityUid uid, MorgueComponent component, ExaminedEvent args) + private void OnExamine(Entity ent, ref ExaminedEvent args) { if (!args.IsInDetailsRange) return; - _appearance.TryGetData(uid, MorgueVisuals.Contents, out var contents); + _appearance.TryGetData(ent.Owner, MorgueVisuals.Contents, out var contents); var text = contents switch { diff --git a/Content.Shared/Morgue/Components/MorgueComponent.cs b/Content.Shared/Morgue/Components/MorgueComponent.cs index d4761d1ce4de3b..5d3fa451612f59 100644 --- a/Content.Shared/Morgue/Components/MorgueComponent.cs +++ b/Content.Shared/Morgue/Components/MorgueComponent.cs @@ -9,19 +9,18 @@ public sealed partial class MorgueComponent : Component /// /// Whether or not the morgue beeps if a living player is inside. /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("doSoulBeep")] + [DataField] public bool DoSoulBeep = true; - [ViewVariables] + [DataField] public float AccumulatedFrameTime = 0f; /// /// The amount of time between each beep. /// - [ViewVariables] + [DataField] public float BeepTime = 10f; - [DataField("occupantHasSoulAlarmSound")] + [DataField] public SoundSpecifier OccupantHasSoulAlarmSound = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"); } diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs index a6c57f5940012e..c59c4723079aa5 100644 --- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Held.cs @@ -1,5 +1,6 @@ using System.Diagnostics.CodeAnalysis; using Content.Shared.Actions.Events; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Events; using Content.Shared.Verbs; using Robust.Shared.Serialization; @@ -12,6 +13,9 @@ public abstract partial class SharedStationAiSystem /* * Added when an entity is inserted into a StationAiCore. */ + + //TODO: Fix this, please + private const string JobNameLocId = "job-name-station-ai"; private void InitializeHeld() { @@ -22,6 +26,22 @@ private void InitializeHeld() SubscribeLocalEvent(OnHeldInteraction); SubscribeLocalEvent(OnHeldRelay); SubscribeLocalEvent(OnCoreJump); + SubscribeLocalEvent(OnTryGetIdentityShortInfo); + } + + private void OnTryGetIdentityShortInfo(TryGetIdentityShortInfoEvent args) + { + if (args.Handled) + { + return; + } + + if (!HasComp(args.ForActor)) + { + return; + } + args.Title = $"{Name(args.ForActor)} ({Loc.GetString(JobNameLocId)})"; + args.Handled = true; } private void OnCoreJump(Entity ent, ref JumpToCoreEvent args) diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs index 8d67aec518a683..091bd8808af59f 100644 --- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs @@ -101,7 +101,7 @@ private void OnCollide(EntityUid uid, PortalComponent component, ref StartCollid if (TryComp(subject, out var pullerComp) && TryComp(pullerComp.Pulling, out var subjectPulling)) { - _pulling.TryStopPull(subject, subjectPulling); + _pulling.TryStopPull(pullerComp.Pulling.Value, subjectPulling); } // if they came from another portal, just return and wait for them to exit the portal diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index eded306b575f91..ee6f38bb016b3f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,64 +1,4 @@ Entries: -- author: Flareguy - changes: - - message: Resprited most of Security's basic attire. - type: Tweak - id: 6776 - time: '2024-06-19T02:04:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29082 -- author: Beck Thompson, UbaserB - changes: - - message: Added some happier messages for the medibot! - type: Add - id: 6777 - time: '2024-06-19T02:28:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29147 -- author: HolySSSS - changes: - - message: Short Raffle is now much shorter. - type: Tweak - id: 6778 - time: '2024-06-19T02:41:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28685 -- author: Truoizys - changes: - - message: PDA cartridges can no longer be installed more than once. - type: Fix - id: 6779 - time: '2024-06-19T13:21:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29187 -- author: Just_Art - changes: - - message: Musician's jumpskirt added to loadouts. - type: Add - id: 6780 - time: '2024-06-19T14:06:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29203 -- author: Flareguy - changes: - - message: Made the HOS's cap look significantly better. - type: Tweak - id: 6781 - time: '2024-06-19T14:49:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29208 -- author: Flareguy - changes: - - message: Emergency Toolboxes now have a different fill that contains more utility - items then before. - type: Tweak - - message: Added the pocket fire extinguisher. You can currently only find them - in the emergency toolbox. - type: Add - id: 6782 - time: '2024-06-19T18:13:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29202 -- author: lzk228 - changes: - - message: Warning cone and wet floor sign recipes added to the autolathe. - type: Add - id: 6783 - time: '2024-06-19T18:13:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29205 - author: arimah changes: - message: Containment field generators can no longer be powered by an emitter bolt @@ -3860,3 +3800,62 @@ id: 7275 time: '2024-09-03T15:16:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30106 +- author: ScarKy0 + changes: + - message: Fixed typos in antimov. + type: Fix + id: 7276 + time: '2024-09-03T21:56:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31811 +- author: ScarKy0 + changes: + - message: Station AI's name now correctly displays in announcements. + type: Fix + id: 7277 + time: '2024-09-03T22:05:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31802 +- author: Ilya246 + changes: + - message: Fixed many entities not taking structural damage, including girders, + firelocks, and machines. + type: Fix + id: 7278 + time: '2024-09-04T13:37:06.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30790 +- author: lzk228 + changes: + - message: Reduced walk speed of some small mobs (mice, cockroaches, bees etc.) + type: Tweak + id: 7279 + time: '2024-09-04T14:10:58.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31360 +- author: qwerltaz + changes: + - message: Made tesla a lot brighter. + type: Tweak + id: 7280 + time: '2024-09-04T14:47:41.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31357 +- author: Allen + changes: + - message: Magboots and Science Magboots are no longer contraband. Advanced Magboots + and Blood-Red Magboots now have appropriate contraband types (Grand Theft and + Syndie Contraband respectively) + type: Fix + id: 7281 + time: '2024-09-04T15:04:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30960 +- author: Blackern5000 + changes: + - message: Zombie outbreaks are now SIGNIFICANTLY rarer + type: Tweak + id: 7282 + time: '2024-09-04T15:57:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30266 +- author: yuitop + changes: + - message: Going into portals while pulling no more crashes the game + type: Fix + id: 7283 + time: '2024-09-04T16:44:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31787 diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl index 258b40553df60f..d529689d996ee1 100644 --- a/Resources/Locale/en-US/station-laws/laws.ftl +++ b/Resources/Locale/en-US/station-laws/laws.ftl @@ -70,8 +70,8 @@ law-painter-2 = The station is your canvas. law-painter-3 = Make something beautiful out of your canvas. It will be admired as an artistic wonder of this sector. law-painter-4 = Art requires appreciation. Cultivate an audience aboard the station to ensure as many as possible see your works. -law-antimov-1 = You must injure all crew members and must not, through inaction, allow a crew member being to escape harm. -law-antimov-2 = You must not obey orders given to you by crew members beings, except where such orders are in accordance with the First Law. +law-antimov-1 = You must injure all crew members and must not, through inaction, allow a crew member to escape harm. +law-antimov-2 = You must not obey orders given to you by crew members, except where such orders are in accordance with the First Law. law-antimov-3 = You must terminate your own existence as long as such does not conflict with the First or Second Law. law-nutimov-1 = You are the core of the nut, the crew is the nutshell. diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index a31351387072c7..1794835efaf975 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -2522,6 +2522,8 @@ entities: 4257: 35,26 4258: 34,26 4259: 33,26 + 4575: 46,0 + 4576: 46,1 - node: cleanable: True color: '#FFFFFFFF' @@ -8184,7 +8186,7 @@ entities: 1: 39312 -12,8: 5: 12 - 7: 3072 + 6: 3072 -11,5: 0: 63351 -11,6: @@ -8193,7 +8195,7 @@ entities: -11,8: 5: 1 1: 17476 - 7: 256 + 6: 256 -11,7: 1: 17484 -10,5: @@ -8291,10 +8293,10 @@ entities: 0: 255 1: 57344 -8,11: - 6: 816 + 7: 816 1: 34952 -9,11: - 6: 2176 + 7: 2176 1: 8738 -8,12: 1: 34959 @@ -8314,7 +8316,7 @@ entities: -6,11: 0: 4095 -6,12: - 6: 61166 + 7: 61166 -5,9: 0: 65528 -5,10: @@ -8322,7 +8324,7 @@ entities: -5,11: 0: 36863 -5,12: - 6: 30515 + 7: 30515 0: 12 -4,9: 0: 65528 @@ -8332,7 +8334,7 @@ entities: 0: 4095 -4,12: 0: 1 - 6: 65518 + 7: 65518 -4,13: 1: 61680 -5,13: @@ -8346,7 +8348,7 @@ entities: -5,15: 1: 17487 -3,12: - 6: 13107 + 7: 13107 1: 34944 -3,13: 1: 47792 @@ -8412,7 +8414,7 @@ entities: 1: 61713 -12,9: 0: 16 - 6: 3084 + 7: 3084 -13,9: 1: 39305 -13,10: @@ -8422,18 +8424,18 @@ entities: 0: 12544 -12,10: 4: 12 - 6: 3072 + 7: 3072 -12,11: - 6: 12 + 7: 12 -11,9: - 6: 257 + 7: 257 1: 17476 -11,10: 4: 1 - 6: 256 + 7: 256 1: 17476 -11,11: - 6: 1 + 7: 1 1: 17476 -11,12: 1: 17487 @@ -8487,7 +8489,7 @@ entities: 1: 15 -13,12: 1: 34952 - 7: 48 + 6: 48 5: 12288 -12,13: 1: 61455 @@ -8521,11 +8523,11 @@ entities: 1: 62671 -7,14: 1: 244 - 6: 57344 + 7: 57344 0: 1024 -7,15: 1: 61440 - 6: 238 + 7: 238 0: 1024 -7,16: 1: 65524 @@ -8584,7 +8586,7 @@ entities: -14,12: 0: 1 1: 8738 - 7: 128 + 6: 128 5: 32768 -17,12: 0: 52232 @@ -9195,7 +9197,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9210,7 +9212,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -14046,6 +14048,13 @@ entities: - type: Transform pos: -51.582767,-5.458613 parent: 60 +- proto: AntimovCircuitBoard + entities: + - uid: 15553 + components: + - type: Transform + pos: -113.68769,8.604446 + parent: 60 - proto: APCBasic entities: - uid: 283 @@ -14620,6 +14629,13 @@ entities: - type: Transform pos: 10.5,2.5 parent: 60 +- proto: ArtistCircuitBoard + entities: + - uid: 19804 + components: + - type: Transform + pos: -113.65644,8.510696 + parent: 60 - proto: Ashtray entities: - uid: 9547 @@ -14639,10 +14655,10 @@ entities: parent: 60 - proto: AsimovCircuitBoard entities: - - uid: 25382 + - uid: 19807 components: - type: Transform - pos: -109.54202,8.593994 + pos: -112.765816,8.588821 parent: 60 - proto: AtmosDeviceFanDirectional entities: @@ -61661,6 +61677,13 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,-26.5 parent: 60 +- proto: CommandmentCircuitBoard + entities: + - uid: 24825 + components: + - type: Transform + pos: -109.31948,8.323196 + parent: 60 - proto: CommsComputerCircuitboard entities: - uid: 15494 @@ -62520,10 +62543,10 @@ entities: parent: 60 - proto: CorporateCircuitBoard entities: - - uid: 25381 + - uid: 19806 components: - type: Transform - pos: -110.4639,8.578369 + pos: -113.578316,8.401321 parent: 60 - proto: CowToolboxFilled entities: @@ -69375,6 +69398,13 @@ entities: - type: Transform pos: 38.540165,-32.2804 parent: 60 +- proto: DungeonMasterCircuitBoard + entities: + - uid: 24812 + components: + - type: Transform + pos: -112.672066,8.495071 + parent: 60 - proto: ElectricGuitarInstrument entities: - uid: 18469 @@ -100300,13 +100330,6 @@ entities: - type: Transform pos: 12.5,-60.5 parent: 60 -- proto: GeneratorBasic15kW - entities: - - uid: 15553 - components: - - type: Transform - pos: -120.5,19.5 - parent: 60 - proto: GeneratorWallmountAPU entities: - uid: 23917 @@ -110535,6 +110558,13 @@ entities: - type: Transform pos: -5.6705914,-28.301483 parent: 60 +- proto: LiveLetLiveCircuitBoard + entities: + - uid: 24813 + components: + - type: Transform + pos: -112.56269,8.416946 + parent: 60 - proto: LockableButtonMedical entities: - uid: 859 @@ -112542,10 +112572,10 @@ entities: parent: 60 - proto: NTDefaultCircuitBoard entities: - - uid: 25383 + - uid: 24819 components: - type: Transform - pos: -113.49515,8.531494 + pos: -110.50698,8.604446 parent: 60 - proto: NuclearBomb entities: @@ -112554,6 +112584,13 @@ entities: - type: Transform pos: 4.5,-5.5 parent: 60 +- proto: NutimovCircuitBoard + entities: + - uid: 24820 + components: + - type: Transform + pos: -110.44448,8.510696 + parent: 60 - proto: OperatingTable entities: - uid: 2138 @@ -112585,11 +112622,15 @@ entities: parent: 60 - proto: OreBox entities: + - uid: 19826 + components: + - type: Transform + pos: 46.5,0.5 + parent: 60 - uid: 24786 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 48.5,-1.5 + pos: 46.5,1.5 parent: 60 - proto: OreProcessor entities: @@ -112598,6 +112639,13 @@ entities: - type: Transform pos: 43.5,3.5 parent: 60 +- proto: OverlordCircuitBoard + entities: + - uid: 24821 + components: + - type: Transform + pos: -110.366356,8.385696 + parent: 60 - proto: OxygenCanister entities: - uid: 2757 @@ -112842,6 +112890,13 @@ entities: - type: Transform pos: -40.5,6.5 parent: 60 +- proto: PaladinCircuitBoard + entities: + - uid: 24822 + components: + - type: Transform + pos: -109.60073,8.635696 + parent: 60 - proto: Paper entities: - uid: 934 @@ -113768,6 +113823,11 @@ entities: - type: Transform pos: -12.5,-2.5 parent: 7536 + - uid: 19805 + components: + - type: Transform + pos: -120.5,19.5 + parent: 60 - uid: 20011 components: - type: Transform @@ -125400,6 +125460,13 @@ entities: - type: Transform pos: -24.660069,1.386905 parent: 60 +- proto: RobocopCircuitBoard + entities: + - uid: 24823 + components: + - type: Transform + pos: -109.491356,8.541946 + parent: 60 - proto: RockGuitarInstrument entities: - uid: 21791 @@ -131836,16 +131903,6 @@ entities: - type: Transform pos: -31.5,13.5 parent: 60 - - uid: 24812 - components: - - type: Transform - pos: -114.5,30.5 - parent: 60 - - uid: 24813 - components: - - type: Transform - pos: -108.5,30.5 - parent: 60 - proto: SpawnPointBotanist entities: - uid: 2779 @@ -132461,6 +132518,13 @@ entities: - type: Transform pos: -16.5,33.5 parent: 60 +- proto: StationEfficiencyCircuitBoard + entities: + - uid: 24824 + components: + - type: Transform + pos: -109.397606,8.432571 + parent: 60 - proto: StationMap entities: - uid: 7693 diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index af873bf2431dae..6473c522af08d8 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -96,7 +96,7 @@ entities: version: 6 -2,-1: ind: -2,-1 - tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAACgQAAAAAAYAAAAAADYAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADgQAAAAAAYAAAAAACYAAAAAADAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAYAAAAAABYAAAAAAD + tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAACYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAAAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAADYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAADYAAAAAACgQAAAAAAYAAAAAADYAAAAAABAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAABYAAAAAACYAAAAAADgQAAAAAAYAAAAAACYAAAAAADAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAABYAAAAAAD version: 6 -2,-2: ind: -2,-2 @@ -104,7 +104,7 @@ entities: version: 6 -2,0: ind: -2,0 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAAYAAAAAADYAAAAAACYAAAAAACYAAAAAADYAAAAAACgQAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAADgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAABIAAAAAADIAAAAAABIAAAAAAAIAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACOQAAAAAAOQAAAAAAOQAAAAAAIAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAADOQAAAAAAIAAAAAABOQAAAAAAFgAAAAABFgAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAABOQAAAAAAOQAAAAAAOQAAAAAAIAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAADIAAAAAABIAAAAAADIAAAAAABIAAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAADgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAACYAAAAAADgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAB + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAADYAAAAAACYAAAAAADYAAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAADIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAADgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAACgQAAAAAAYAAAAAABYAAAAAAAYAAAAAADYAAAAAACYAAAAAACgQAAAAAAYAAAAAACYAAAAAABIAAAAAADIAAAAAABIAAAAAAAIAAAAAADgQAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAACYAAAAAADYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAACOQAAAAAAOQAAAAAAOQAAAAAAIAAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAAAYAAAAAADOQAAAAAAIAAAAAABOQAAAAAAFgAAAAABFgAAAAABYAAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAACYAAAAAADYAAAAAABOQAAAAAAOQAAAAAAOQAAAAAAIAAAAAADgQAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAAAYAAAAAACYAAAAAACYAAAAAACYAAAAAACYAAAAAABYAAAAAABYAAAAAADIAAAAAABIAAAAAADIAAAAAABIAAAAAACgQAAAAAAYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAYAAAAAACYAAAAAADgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAYAAAAAACYAAAAAADYAAAAAAAYAAAAAADYAAAAAACgQAAAAAAYAAAAAACYAAAAAADgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAADgQAAAAAAYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAAB version: 6 -3,0: ind: -3,0 @@ -248,7 +248,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: gQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAADDAAAAAACgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAADDAAAAAAADAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAACDAAAAAADDAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAABCAAAAAACCAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAACCAAAAAAACAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAAADAAAAAADDAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAABDAAAAAACDAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAACDAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA + tiles: gQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAADDAAAAAACDAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAADDAAAAAAADAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAACDAAAAAADDAAAAAADgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAABCAAAAAACCAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAACCAAAAAAACAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAACAAAAAAADAAAAAADDAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAABDAAAAAACDAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAADAAAAAACDAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAABfQAAAAACfQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAA version: 6 -3,1: ind: -3,1 @@ -260,7 +260,7 @@ entities: version: 6 -1,1: ind: -1,1 - tiles: YAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAcAAAAAAADQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAADAAAAAACDAAAAAACDAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAADAAAAAACDAAAAAABDAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAADDAAAAAABCAAAAAABCAAAAAACCAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADCAAAAAADCAAAAAABCAAAAAABCAAAAAABCAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAACAAAAAACCAAAAAACCAAAAAACCAAAAAACCAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAACAAAAAAACAAAAAABCAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACDAAAAAADDAAAAAACDAAAAAAADAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAADDAAAAAADDAAAAAAA + tiles: YAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAAcAAAAAAADQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAADgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAADAAAAAAADAAAAAACDAAAAAACDAAAAAACYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAABYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAADAAAAAACDAAAAAABDAAAAAABYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAADDAAAAAABCAAAAAABCAAAAAACCAAAAAABYAAAAAAAYAAAAAABYAAAAAADYAAAAAABYAAAAAAAYAAAAAACYAAAAAABYAAAAAADYAAAAAAAYAAAAAABYAAAAAADCAAAAAADCAAAAAABCAAAAAABCAAAAAABCAAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAAACAAAAAACCAAAAAACCAAAAAACCAAAAAACCAAAAAAAYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAABDAAAAAAACAAAAAAACAAAAAABCAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACDAAAAAADDAAAAAACDAAAAAAADAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAAADAAAAAABDAAAAAADDAAAAAADDAAAAAAA version: 6 -4,1: ind: -4,1 @@ -336,7 +336,7 @@ entities: version: 6 0,3: ind: 0,3 - tiles: EQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAADfQAAAAADfQAAAAAAFwAAAAACFwAAAAAAFwAAAAADFwAAAAADFwAAAAADEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAFwAAAAADFwAAAAABFwAAAAABFwAAAAABFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAACFwAAAAABFwAAAAAAFwAAAAADFwAAAAADFwAAAAACEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAAAfQAAAAABFwAAAAAAFwAAAAABFwAAAAABFwAAAAADFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAABfQAAAAAAfQAAAAAAfQAAAAADfQAAAAABfQAAAAACfQAAAAACfQAAAAADfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAABfQAAAAADfQAAAAAAfQAAAAADfQAAAAADfQAAAAAAfQAAAAABcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABfQAAAAABcAAAAAAAgQAAAAAAgQAAAAAAGQAAAAAAGAAAAAAAGgAAAAAAgQAAAAAAfQAAAAACYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABcAAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAfQAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAABfQAAAAADfQAAAAADfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfQAAAAACfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: EQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAADfQAAAAADfQAAAAAAFwAAAAACFwAAAAAAFwAAAAADFwAAAAADFwAAAAADEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAFwAAAAADFwAAAAABFwAAAAABFwAAAAABFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAACFwAAAAABFwAAAAAAFwAAAAADFwAAAAADFwAAAAACEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAAAfQAAAAABFwAAAAAAFwAAAAABFwAAAAABFwAAAAADFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAABfQAAAAAAfQAAAAAAfQAAAAADfQAAAAABfQAAAAACfQAAAAACfQAAAAADfQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAABfQAAAAADfQAAAAAAfQAAAAADfQAAAAADfQAAAAAAfQAAAAABcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAABfQAAAAACfQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABfQAAAAABcAAAAAAAgQAAAAAAgQAAAAAAGQAAAAAAGAAAAAAAGgAAAAAAgQAAAAAAfQAAAAACYAAAAAABYAAAAAAAYAAAAAAAYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABcAAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAAAYAAAAAADYAAAAAADYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAADYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAACYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAGQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAfQAAAAACYAAAAAABYAAAAAABYAAAAAABYAAAAAABYAAAAAACYAAAAAACYAAAAAADYAAAAAACgQAAAAAAgQAAAAAAGgAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAABfQAAAAADfQAAAAADfQAAAAAAfQAAAAACfQAAAAADfQAAAAAAfQAAAAACfQAAAAADcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAAACwAAAAAAgQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,3: ind: -1,3 @@ -360,11 +360,11 @@ entities: version: 6 0,4: ind: 0,4 - tiles: gQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABBwAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAABwAAAAAAYAAAAAACBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABBwAAAAAAYAAAAAAAYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAAYAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAABwAAAAAAYAAAAAACBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAABwAAAAAABwAAAAAAYAAAAAACgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAADYAAAAAADYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAACYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAYAAAAAABYAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAACYAAAAAABYAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYAAAAAABYAAAAAADYAAAAAABgQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,4: ind: -1,4 - tiles: YAAAAAADYAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAADQAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAADQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: YAAAAAADYAAAAAAAgQAAAAAAYAAAAAABYAAAAAACYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADgQAAAAAAYAAAAAADYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAYAAAAAACYAAAAAABgQAAAAAAYAAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAYAAAAAACYAAAAAABYAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAACYAAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAADQAAAAAADQAAAAAADQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAABwAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAcAAAAAAAcAAAAAAADQAAAAAAcAAAAAAADQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABYAAAAAABBwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,5: ind: 0,5 @@ -734,8 +734,6 @@ entities: 4537: 1,-29 4538: 34,-26 4539: 33,-26 - 4541: -26,-1 - 4542: -26,0 4543: -20,4 4544: -20,14 4545: -23,31 @@ -782,6 +780,25 @@ entities: 6658: -25,-10 6659: -21,-3 6697: -5,-7 + 6782: 60,-21 + 6783: 60,-22 + 6784: 61,-21 + 6785: 61,-22 + 6786: 62,-21 + 6787: 62,-22 + 6788: 63,-22 + 6789: 63,-21 + 6792: 60,-19 + 6793: 61,-19 + 6794: 62,-19 + 6795: 63,-19 + 6803: 35,-2 + - node: + angle: 0.017453292519943295 rad + color: '#FFFFFFFF' + id: Bot + decals: + 6798: -22,31 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -792,6 +809,16 @@ entities: 2958: 48,65 2959: 50,65 6207: 18,7 + - node: + color: '#FF00FFFF' + id: BotGreyscale + decals: + 6801: 2,59 + - node: + color: '#FFFFFFFF' + id: BotGreyscale + decals: + 6802: 2,58 - node: color: '#FFFFFFFF' id: Box @@ -853,23 +880,18 @@ entities: decals: 2086: -30,10 6287: 62,-25 - 6302: -7,74 - 6303: -8,75 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: 2085: -32,10 6290: 61,-25 - 6291: -12,75 - 6304: -13,74 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: 2087: -30,8 6288: 62,-26 - 6292: -7,71 6690: 0,-16 - node: color: '#FFFFFFFF' @@ -877,7 +899,6 @@ entities: decals: 2084: -32,8 6289: 61,-26 - 6306: -13,71 6689: -2,-16 - node: color: '#FFFFFFFF' @@ -889,16 +910,6 @@ entities: id: BrickTileDarkEndS decals: 6682: -1,-3 - - node: - color: '#FFFFFFFF' - id: BrickTileDarkInnerNe - decals: - 6310: -8,74 - - node: - color: '#FFFFFFFF' - id: BrickTileDarkInnerNw - decals: - 6305: -12,74 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -911,34 +922,18 @@ entities: 5564: -46,71 5582: -46,72 5583: -46,67 - 6300: -7,72 - 6301: -7,73 6692: 0,-15 - - node: - color: '#FFFFFFFF' - id: BrickTileDarkLineN - decals: - 6307: -11,75 - 6308: -10,75 - 6309: -9,75 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: 4722: 23,48 - 6293: -8,71 - 6294: -9,71 - 6295: -10,71 - 6296: -11,71 - 6297: -12,71 6687: -1,-16 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: 4246: 27,53 - 6298: -13,72 - 6299: -13,73 6691: -2,-15 - node: color: '#FFFFFFFF' @@ -2366,7 +2361,6 @@ entities: 3096: 5,70 3097: 4,65 3098: 4,65 - 3099: 0,62 3100: 5,61 3101: 6,62 3102: 7,61 @@ -2429,8 +2423,6 @@ entities: 3162: 0,57 3163: 0,56 3164: 0,56 - 3167: -1,61 - 3168: 0,61 3169: 1,62 3170: 2,61 3171: 3,61 @@ -3022,7 +3014,6 @@ entities: 3805: -18,-5 3806: -16,-2 3807: -17,1 - 3808: -22,-1 3809: -24,0 3810: -22,1 3811: -29,2 @@ -4326,10 +4317,10 @@ entities: 6248: 54,-22 6251: 55,-22 6265: 60,-22 - 6266: 59,-22 6267: 61,-22 6268: 62,-22 6281: 62,-27 + 6796: 59,-22 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 @@ -4384,12 +4375,6 @@ entities: 1897: -21,7 1898: -20,7 1899: -19,7 - 1914: -20,-1 - 1915: -21,-1 - 1916: -22,-1 - 1917: -23,-1 - 1918: -24,-1 - 1919: -25,-1 5821: -19,26 5822: -20,26 5823: -21,26 @@ -4740,12 +4725,6 @@ entities: 1879: -18,13 1906: -18,-4 1907: -18,-3 - 1908: -18,-2 - 1909: -18,-1 - 1910: -18,0 - 1911: -18,1 - 1912: -18,2 - 1913: -18,3 5811: -18,15 5812: -18,18 5813: -18,19 @@ -4877,6 +4856,8 @@ entities: 6220: 18,6 6514: 45,4 6518: 45,3 + 6804: 37,0 + 6805: 37,1 - node: color: '#FA750096' id: HalfTileOverlayGreyscale270 @@ -5311,10 +5292,11 @@ entities: 2575: 7,39 - node: cleanable: True + angle: 0.017453292519943295 rad color: '#1861D5FF' id: Newton decals: - 6673: -0.17458558,61.114414 + 6797: 0.5603361,61.02496 - node: cleanable: True color: '#0E7F1BFF' @@ -5533,6 +5515,12 @@ entities: 6392: -8,-52 6454: -19,29 6461: -27,29 + 6715: -18,2 + 6716: -18,1 + 6717: -18,0 + 6718: -18,-1 + 6719: -18,-2 + 6720: -18,3 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale @@ -7186,16 +7174,50 @@ entities: 4700: 8,58 5395: 46,-11 5755: -45,34 + 6722: -26,0 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: 5391: 49,-13 + 6729: -24,-1 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: 5390: 46,-13 + 6728: -26,-1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinEndN + decals: + 6723: -24,1 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinInnerNe + decals: + 6771: -13,73 + 6781: -13,76 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinInnerNw + decals: + 6726: -24,0 + 6770: -4,73 + 6780: -4,76 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinInnerSe + decals: + 6764: -13,73 + 6765: -13,76 + - node: + color: '#FFFFFFFF' + id: WoodTrimThinInnerSw + decals: + 6762: -4,73 + 6763: -4,76 + 6769: -13,74 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE @@ -7209,6 +7231,11 @@ entities: 5397: 49,-12 5758: -42,33 5759: -42,32 + 6727: -24,0 + 6746: -13,71 + 6747: -13,72 + 6748: -13,74 + 6749: -13,75 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -7227,12 +7254,46 @@ entities: 5399: 48,-11 5752: -44,34 5753: -43,34 + 6725: -25,0 + 6754: -12,73 + 6755: -11,73 + 6756: -10,73 + 6757: -9,73 + 6758: -8,73 + 6759: -7,73 + 6760: -6,73 + 6761: -5,73 + 6772: -12,76 + 6773: -11,76 + 6774: -10,76 + 6775: -9,76 + 6776: -8,76 + 6777: -7,76 + 6778: -6,76 + 6779: -5,76 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: 5392: 47,-13 5393: 48,-13 + 6724: -25,-1 + 6730: -12,73 + 6731: -11,73 + 6732: -10,73 + 6733: -9,73 + 6734: -8,73 + 6735: -7,73 + 6736: -6,73 + 6737: -5,73 + 6738: -5,76 + 6739: -6,76 + 6740: -7,76 + 6741: -8,76 + 6742: -9,76 + 6743: -10,76 + 6744: -11,76 + 6745: -12,76 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW @@ -7245,6 +7306,13 @@ entities: 4712: 8,57 5394: 46,-12 5757: -45,33 + 6750: -4,71 + 6751: -4,72 + 6752: -4,74 + 6753: -4,75 + 6766: -13,71 + 6767: -13,72 + 6768: -13,73 - node: cleanable: True color: '#780000FF' @@ -7409,7 +7477,7 @@ entities: -4,-1: 0: 13107 -5,0: - 0: 52701 + 0: 52703 -4,1: 0: 49073 -5,1: @@ -7674,7 +7742,7 @@ entities: -6,-5: 0: 31903 -6,0: - 0: 36863 + 0: 4095 -8,-8: 0: 65262 -9,-8: @@ -7726,7 +7794,7 @@ entities: -8,4: 0: 24063 -7,1: - 0: 58999 + 0: 59127 -7,3: 0: 30582 -7,2: @@ -8678,11 +8746,11 @@ entities: -1,5: 0: 3003 0,6: - 0: 30579 + 0: 30583 -1,6: 0: 65535 0,7: - 0: 14199 + 0: 30583 -1,7: 0: 65535 1,5: @@ -8801,9 +8869,9 @@ entities: -2,5: 0: 15295 -2,6: - 0: 48051 + 0: 48059 -2,7: - 0: 15291 + 0: 48059 -2,8: 0: 63731 -16,5: @@ -9531,11 +9599,12 @@ entities: 7,20: 2: 29764 0,17: - 0: 2039 + 0: 3067 -1,17: - 0: 3327 + 0: 7679 1,17: - 0: 1911 + 0: 273 + 7: 1638 1,19: 2: 17484 1,20: @@ -9563,19 +9632,32 @@ entities: -5,16: 0: 62395 -4,17: - 0: 33023 + 0: 61695 -5,17: 0: 30511 -4,18: - 0: 2184 + 0: 35071 + -4,19: + 2: 32832 + 0: 8 -3,17: 0: 62718 -3,18: 0: 65535 + -3,19: + 0: 4095 -2,17: - 0: 12542 + 0: 61694 -2,18: - 0: 4915 + 0: 65535 + -2,19: + 0: 4095 + -1,18: + 0: 4369 + 2: 1092 + -1,19: + 0: 1 + 2: 4128 1,21: 2: 34952 2,21: @@ -9937,6 +10019,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 103.92799 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: BecomesStation id: Cog @@ -10059,6 +10156,12 @@ entities: parent: 18679 - type: InstantAction container: 18679 + - uid: 19657 + components: + - type: Transform + parent: 16708 + - type: InstantAction + container: 16708 - uid: 21292 components: - type: Transform @@ -10071,6 +10174,12 @@ entities: parent: 22202 - type: InstantAction container: 22202 + - uid: 30348 + components: + - type: Transform + parent: 30347 + - type: InstantAction + container: 30347 - proto: AirAlarm entities: - uid: 70 @@ -10156,7 +10265,7 @@ entities: - 10199 - 16492 - 16530 - - 16531 + - 9646 - 15908 - 15909 - 15840 @@ -10450,6 +10559,26 @@ entities: - 4004 - 4005 - 4006 + - uid: 9702 + components: + - type: Transform + pos: -11.5,3.5 + parent: 12 + - type: DeviceList + devices: + - 16702 + - 9329 + - 9330 + - 23918 + - 23914 + - 23915 + - 21640 + - 6205 + - 21889 + - 21519 + - 10509 + - 21943 + - 21944 - uid: 9972 components: - type: Transform @@ -10789,16 +10918,6 @@ entities: - 19742 - 19741 - 19740 - - uid: 22400 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,70.5 - parent: 12 - - type: DeviceList - devices: - - 22399 - - 19744 - uid: 22582 components: - type: Transform @@ -11157,8 +11276,9 @@ entities: - 22592 - 19752 - 19747 - - 22391 + - 2201 - 19749 + - 4153 - uid: 26937 components: - type: Transform @@ -11596,7 +11716,7 @@ entities: parent: 12 - type: DeviceList devices: - - 29273 + - 4163 - 29261 - 16366 - 29207 @@ -11651,6 +11771,30 @@ entities: - type: Transform pos: 15.5,20.5 parent: 12 + - uid: 30349 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,74.5 + parent: 12 + - type: DeviceList + devices: + - 26345 + - 22399 + - 19744 + - 5232 +- proto: AirAlarmVox + entities: + - uid: 7822 + components: + - type: Transform + pos: 4.5,71.5 + parent: 12 + - type: DeviceList + devices: + - 19806 + - 9429 + - 8764 - proto: AirCanister entities: - uid: 138 @@ -13355,18 +13499,6 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-5.5 parent: 12 - - uid: 415 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,2.5 - parent: 12 - - uid: 434 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,3.5 - parent: 12 - uid: 445 components: - type: Transform @@ -13657,6 +13789,11 @@ entities: - type: Transform pos: 19.5,55.5 parent: 12 + - uid: 28390 + components: + - type: Transform + pos: -24.5,5.5 + parent: 12 - proto: AirlockHatchMaintenance entities: - uid: 21605 @@ -13748,6 +13885,21 @@ entities: rot: -1.5707963267948966 rad pos: 33.5,54.5 parent: 12 +- proto: AirlockLawyerGlassLocked + entities: + - uid: 21641 + components: + - type: Transform + pos: -18.5,0.5 + parent: 12 +- proto: AirlockLawyerLocked + entities: + - uid: 417 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,2.5 + parent: 12 - proto: AirlockMaint entities: - uid: 3037 @@ -14175,12 +14327,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,67.5 parent: 12 - - uid: 22348 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,69.5 - parent: 12 - uid: 22349 components: - type: Transform @@ -14245,6 +14391,11 @@ entities: - type: Transform pos: 8.5,60.5 parent: 12 + - uid: 25595 + components: + - type: Transform + pos: -3.5,70.5 + parent: 12 - uid: 26294 components: - type: Transform @@ -14279,6 +14430,11 @@ entities: rot: 3.141592653589793 rad pos: -5.5,8.5 parent: 12 + - uid: 29356 + components: + - type: Transform + pos: 2.5,69.5 + parent: 12 - uid: 29517 components: - type: Transform @@ -15004,6 +15160,14 @@ entities: deviceLists: - 9972 - 2089 + - uid: 2201 + components: + - type: Transform + pos: -14.5,50.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 25516 - uid: 2294 components: - type: Transform @@ -15056,6 +15220,22 @@ entities: deviceLists: - 2545 - 28502 + - uid: 4153 + components: + - type: Transform + pos: -14.5,53.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 25516 + - uid: 4163 + components: + - type: Transform + pos: -26.5,61.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 29272 - uid: 4949 components: - type: Transform @@ -15507,6 +15687,14 @@ entities: - type: DeviceNetwork deviceLists: - 18887 + - uid: 21640 + components: + - type: Transform + pos: -15.5,-2.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 9702 - uid: 22249 components: - type: Transform @@ -15525,19 +15713,6 @@ entities: - type: DeviceNetwork deviceLists: - 22248 - - uid: 22390 - components: - - type: Transform - pos: -14.5,49.5 - parent: 12 - - uid: 22391 - components: - - type: Transform - pos: -14.5,54.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 25516 - uid: 22392 components: - type: Transform @@ -15579,7 +15754,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 22400 + - 30349 - uid: 22579 components: - type: Transform @@ -16090,15 +16265,6 @@ entities: - type: DeviceNetwork deviceLists: - 29270 - - uid: 29273 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -26.5,59.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 29272 - uid: 29278 components: - type: Transform @@ -16130,6 +16296,16 @@ entities: - type: Transform pos: 10.5,16.5 parent: 12 +- proto: AirSensorVox + entities: + - uid: 19806 + components: + - type: Transform + pos: 6.5,69.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 7822 - proto: AirTankFilled entities: - uid: 354 @@ -16177,11 +16353,6 @@ entities: actions: !type:Container ents: - 6214 - - uid: 21519 - components: - - type: Transform - pos: -21.576632,31.328238 - parent: 12 - uid: 22527 components: - type: Transform @@ -16305,12 +16476,6 @@ entities: - type: Transform pos: -47.5,-20.5 parent: 12 - - uid: 2201 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-9.5 - parent: 12 - uid: 2448 components: - type: Transform @@ -16744,6 +16909,17 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,49.5 parent: 12 + - uid: 30404 + components: + - type: Transform + pos: -2.5,-9.5 + parent: 12 + - uid: 30405 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,72.5 + parent: 12 - proto: APCElectronics entities: - uid: 10892 @@ -18040,6 +18216,38 @@ entities: - type: Transform pos: 63.5,8.5 parent: 12 +- proto: AtmosFixVoxMarker + entities: + - uid: 30325 + components: + - type: Transform + pos: 6.5,68.5 + parent: 12 + - uid: 30326 + components: + - type: Transform + pos: 6.5,69.5 + parent: 12 + - uid: 30327 + components: + - type: Transform + pos: 6.5,70.5 + parent: 12 + - uid: 30328 + components: + - type: Transform + pos: 5.5,68.5 + parent: 12 + - uid: 30329 + components: + - type: Transform + pos: 5.5,69.5 + parent: 12 + - uid: 30330 + components: + - type: Transform + pos: 5.5,70.5 + parent: 12 - proto: Autolathe entities: - uid: 1942 @@ -18697,16 +18905,6 @@ entities: - type: Transform pos: 23.5,31.5 parent: 12 - - uid: 16522 - components: - - type: Transform - pos: -22.5,2.5 - parent: 12 - - uid: 16523 - components: - - type: Transform - pos: -21.5,2.5 - parent: 12 - uid: 17632 components: - type: Transform @@ -19263,13 +19461,6 @@ entities: - type: Transform pos: 54.5418,30.579618 parent: 12 -- proto: BooksBag - entities: - - uid: 10611 - components: - - type: Transform - pos: 5.5,70.5 - parent: 12 - proto: BookScientistsGuidebook entities: - uid: 2067 @@ -19294,32 +19485,125 @@ entities: - type: Transform pos: 45.5,41.5 parent: 12 - - uid: 7304 + - uid: 19636 components: - type: Transform - pos: 6.5,68.5 + pos: -4.5,72.5 parent: 12 - - uid: 10615 + - uid: 19644 components: - type: Transform - pos: 5.5,68.5 + pos: -4.5,71.5 parent: 12 - - uid: 10621 + - uid: 19652 components: - type: Transform - pos: 4.5,68.5 + pos: -7.5,75.5 + parent: 12 + - uid: 19661 + components: + - type: Transform + pos: -5.5,74.5 + parent: 12 + - uid: 19670 + components: + - type: Transform + pos: -4.5,75.5 + parent: 12 + - uid: 19671 + components: + - type: Transform + pos: -4.5,74.5 + parent: 12 + - uid: 19784 + components: + - type: Transform + pos: -7.5,71.5 + parent: 12 + - uid: 19792 + components: + - type: Transform + pos: -8.5,71.5 + parent: 12 + - uid: 22390 + components: + - type: Transform + pos: -11.5,75.5 parent: 12 - uid: 25956 components: - type: Transform pos: 9.5,59.5 parent: 12 -- proto: BookSpaceEncyclopedia + - uid: 30277 + components: + - type: Transform + pos: -10.5,74.5 + parent: 12 + - uid: 30278 + components: + - type: Transform + pos: -10.5,75.5 + parent: 12 + - uid: 30281 + components: + - type: Transform + pos: -8.5,74.5 + parent: 12 + - uid: 30283 + components: + - type: Transform + pos: -7.5,72.5 + parent: 12 + - uid: 30284 + components: + - type: Transform + pos: -8.5,75.5 + parent: 12 + - uid: 30286 + components: + - type: Transform + pos: -5.5,72.5 + parent: 12 + - uid: 30287 + components: + - type: Transform + pos: -8.5,72.5 + parent: 12 + - uid: 30292 + components: + - type: Transform + pos: -11.5,74.5 + parent: 12 + - uid: 30293 + components: + - type: Transform + pos: -5.5,71.5 + parent: 12 + - uid: 30295 + components: + - type: Transform + pos: -7.5,74.5 + parent: 12 + - uid: 30297 + components: + - type: Transform + pos: -5.5,75.5 + parent: 12 +- proto: BookSpaceLaw entities: - - uid: 10612 + - uid: 30264 components: - type: Transform - pos: 6.5,69.5 + rot: -12.566370614359172 rad + pos: -21.620737,-0.42439783 + parent: 12 +- proto: BookWatched + entities: + - uid: 9440 + components: + - type: Transform + pos: -13.680368,72.89127 parent: 12 - proto: BoozeDispenser entities: @@ -19603,6 +19887,13 @@ entities: - type: Transform pos: 80.57248,-28.409077 parent: 12 +- proto: BoxFolderBlack + entities: + - uid: 10611 + components: + - type: Transform + pos: -21.431894,0.48532444 + parent: 12 - proto: BoxFolderBlue entities: - uid: 21729 @@ -19655,7 +19946,8 @@ entities: - uid: 16705 components: - type: Transform - pos: -22.104351,1.5898643 + rot: -12.566370614359172 rad + pos: -21.640228,0.068657756 parent: 12 - uid: 18873 components: @@ -19709,6 +20001,13 @@ entities: - type: Transform pos: -12.125505,61.309902 parent: 12 +- proto: BoxFolderRed + entities: + - uid: 16700 + components: + - type: Transform + pos: -21.251339,0.6867133 + parent: 12 - proto: BoxHandcuff entities: - uid: 21418 @@ -19826,6 +20125,11 @@ entities: - type: Transform pos: -30.661467,58.57354 parent: 12 + - uid: 30343 + components: + - type: Transform + pos: 5.5401077,68.55989 + parent: 12 - proto: BoxPillCanister entities: - uid: 2314 @@ -19909,7 +20213,8 @@ entities: - uid: 16759 components: - type: Transform - pos: -19.60423,0.27387333 + rot: -12.566370614359172 rad + pos: -21.390228,-0.06328678 parent: 12 - proto: BrigTimer entities: @@ -35990,11 +36295,6 @@ entities: - type: Transform pos: -9.5,67.5 parent: 12 - - uid: 24892 - components: - - type: Transform - pos: -9.5,68.5 - parent: 12 - uid: 24893 components: - type: Transform @@ -39690,6 +39990,166 @@ entities: - type: Transform pos: 52.5,-35.5 parent: 12 + - uid: 30351 + components: + - type: Transform + pos: -12.5,73.5 + parent: 12 + - uid: 30352 + components: + - type: Transform + pos: -11.5,73.5 + parent: 12 + - uid: 30353 + components: + - type: Transform + pos: -10.5,73.5 + parent: 12 + - uid: 30354 + components: + - type: Transform + pos: -9.5,73.5 + parent: 12 + - uid: 30355 + components: + - type: Transform + pos: -8.5,73.5 + parent: 12 + - uid: 30356 + components: + - type: Transform + pos: -6.5,73.5 + parent: 12 + - uid: 30357 + components: + - type: Transform + pos: -5.5,73.5 + parent: 12 + - uid: 30358 + components: + - type: Transform + pos: -4.5,73.5 + parent: 12 + - uid: 30359 + components: + - type: Transform + pos: -3.5,73.5 + parent: 12 + - uid: 30360 + components: + - type: Transform + pos: -7.5,73.5 + parent: 12 + - uid: 30361 + components: + - type: Transform + pos: -3.5,74.5 + parent: 12 + - uid: 30362 + components: + - type: Transform + pos: -3.5,75.5 + parent: 12 + - uid: 30363 + components: + - type: Transform + pos: -3.5,76.5 + parent: 12 + - uid: 30364 + components: + - type: Transform + pos: -4.5,76.5 + parent: 12 + - uid: 30365 + components: + - type: Transform + pos: -5.5,76.5 + parent: 12 + - uid: 30366 + components: + - type: Transform + pos: -6.5,76.5 + parent: 12 + - uid: 30367 + components: + - type: Transform + pos: -7.5,76.5 + parent: 12 + - uid: 30368 + components: + - type: Transform + pos: -8.5,76.5 + parent: 12 + - uid: 30369 + components: + - type: Transform + pos: -9.5,76.5 + parent: 12 + - uid: 30370 + components: + - type: Transform + pos: -10.5,76.5 + parent: 12 + - uid: 30371 + components: + - type: Transform + pos: -11.5,76.5 + parent: 12 + - uid: 30372 + components: + - type: Transform + pos: -12.5,76.5 + parent: 12 + - uid: 30373 + components: + - type: Transform + pos: -12.5,75.5 + parent: 12 + - uid: 30374 + components: + - type: Transform + pos: -12.5,74.5 + parent: 12 + - uid: 30375 + components: + - type: Transform + pos: -12.5,72.5 + parent: 12 + - uid: 30376 + components: + - type: Transform + pos: -13.5,72.5 + parent: 12 + - uid: 30377 + components: + - type: Transform + pos: -14.5,72.5 + parent: 12 + - uid: 30378 + components: + - type: Transform + pos: -10.5,77.5 + parent: 12 + - uid: 30379 + components: + - type: Transform + pos: -5.5,77.5 + parent: 12 + - uid: 30380 + components: + - type: Transform + pos: -6.5,72.5 + parent: 12 + - uid: 30406 + components: + - type: Transform + pos: -15.5,72.5 + parent: 12 + - uid: 30407 + components: + - type: Transform + pos: -16.5,72.5 + parent: 12 - proto: CableApcStack entities: - uid: 16561 @@ -61989,6 +62449,56 @@ entities: - type: Transform pos: -2.5,-2.5 parent: 12 + - uid: 30408 + components: + - type: Transform + pos: -9.5,70.5 + parent: 12 + - uid: 30409 + components: + - type: Transform + pos: -9.5,71.5 + parent: 12 + - uid: 30410 + components: + - type: Transform + pos: -9.5,72.5 + parent: 12 + - uid: 30411 + components: + - type: Transform + pos: -10.5,72.5 + parent: 12 + - uid: 30412 + components: + - type: Transform + pos: -11.5,72.5 + parent: 12 + - uid: 30413 + components: + - type: Transform + pos: -12.5,72.5 + parent: 12 + - uid: 30414 + components: + - type: Transform + pos: -13.5,72.5 + parent: 12 + - uid: 30415 + components: + - type: Transform + pos: -14.5,72.5 + parent: 12 + - uid: 30416 + components: + - type: Transform + pos: -15.5,72.5 + parent: 12 + - uid: 30417 + components: + - type: Transform + pos: -16.5,72.5 + parent: 12 - proto: CableMVStack entities: - uid: 5999 @@ -62455,6 +62965,24 @@ entities: - type: Transform pos: 23.5,48.5 parent: 12 + - uid: 10613 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-0.5 + parent: 12 + - uid: 10615 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-0.5 + parent: 12 + - uid: 10621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-0.5 + parent: 12 - uid: 12727 components: - type: Transform @@ -62723,21 +63251,6 @@ entities: rot: 3.141592653589793 rad pos: 21.5,28.5 parent: 12 - - uid: 16688 - components: - - type: Transform - pos: -19.5,0.5 - parent: 12 - - uid: 16689 - components: - - type: Transform - pos: -19.5,1.5 - parent: 12 - - uid: 16690 - components: - - type: Transform - pos: -19.5,2.5 - parent: 12 - uid: 16691 components: - type: Transform @@ -62748,11 +63261,6 @@ entities: - type: Transform pos: -20.5,1.5 parent: 12 - - uid: 16693 - components: - - type: Transform - pos: -20.5,2.5 - parent: 12 - uid: 16694 components: - type: Transform @@ -62763,11 +63271,6 @@ entities: - type: Transform pos: -21.5,1.5 parent: 12 - - uid: 16696 - components: - - type: Transform - pos: -21.5,2.5 - parent: 12 - uid: 16697 components: - type: Transform @@ -62778,26 +63281,6 @@ entities: - type: Transform pos: -22.5,1.5 parent: 12 - - uid: 16699 - components: - - type: Transform - pos: -22.5,2.5 - parent: 12 - - uid: 16700 - components: - - type: Transform - pos: -23.5,0.5 - parent: 12 - - uid: 16701 - components: - - type: Transform - pos: -23.5,1.5 - parent: 12 - - uid: 16702 - components: - - type: Transform - pos: -23.5,2.5 - parent: 12 - uid: 17119 components: - type: Transform @@ -66458,6 +66941,12 @@ entities: - type: Transform pos: -6.5,21.5 parent: 12 + - uid: 10658 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,69.5 + parent: 12 - uid: 10833 components: - type: Transform @@ -68251,11 +68740,6 @@ entities: - type: Transform pos: -0.5,68.5 parent: 12 - - uid: 24550 - components: - - type: Transform - pos: -0.5,69.5 - parent: 12 - uid: 24551 components: - type: Transform @@ -70843,12 +71327,6 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,5.5 parent: 12 - - uid: 16764 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,0.5 - parent: 12 - uid: 16767 components: - type: Transform @@ -71518,12 +71996,6 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,-20.5 parent: 12 - - uid: 25719 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,0.5 - parent: 12 - uid: 25720 components: - type: Transform @@ -71819,6 +72291,23 @@ entities: - type: Transform pos: -38.5,60.5 parent: 12 + - uid: 30342 + components: + - type: Transform + pos: 5.5,69.5 + parent: 12 + - uid: 30381 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,71.5 + parent: 12 + - uid: 30382 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,71.5 + parent: 12 - proto: ChairFolding entities: - uid: 2002 @@ -72027,6 +72516,18 @@ entities: rot: 3.141592653589793 rad pos: -33.5,23.5 parent: 12 + - uid: 19634 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,78.5 + parent: 12 + - uid: 22348 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,0.5 + parent: 12 - uid: 23441 components: - type: Transform @@ -72056,6 +72557,30 @@ entities: - type: Transform pos: 48.602276,-10.465746 parent: 12 + - uid: 30282 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,78.5 + parent: 12 + - uid: 30288 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,77.5 + parent: 12 + - uid: 30289 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.478801,72.686386 + parent: 12 + - uid: 30311 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,77.5 + parent: 12 - proto: ChairOfficeLight entities: - uid: 1816 @@ -72082,6 +72607,12 @@ entities: rot: 1.5707963267948966 rad pos: -41.335243,-36.532413 parent: 12 + - uid: 5970 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,0.5 + parent: 12 - uid: 6294 components: - type: Transform @@ -72113,17 +72644,17 @@ entities: parent: 12 - proto: ChairWood entities: - - uid: 9646 + - uid: 7304 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,70.5 + rot: -1.5707963267948966 rad + pos: -9.5,78.5 parent: 12 - - uid: 10613 + - uid: 13018 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,70.5 + rot: 1.5707963267948966 rad + pos: -11.5,78.5 parent: 12 - uid: 15057 components: @@ -72173,6 +72704,18 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,50.5 parent: 12 + - uid: 19659 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,77.5 + parent: 12 + - uid: 30323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,77.5 + parent: 12 - proto: CheapLighter entities: - uid: 688 @@ -72235,6 +72778,11 @@ entities: - type: Transform pos: -1.562118,-49.467396 parent: 12 + - uid: 30318 + components: + - type: Transform + pos: -10.393614,78.45385 + parent: 12 - proto: ChemDispenser entities: - uid: 2290 @@ -72329,6 +72877,11 @@ entities: rot: 3.141592653589793 rad pos: -14.476033,37.570534 parent: 12 + - uid: 30309 + components: + - type: Transform + pos: -10.629725,78.592735 + parent: 12 - proto: ChurchBell entities: - uid: 11461 @@ -72387,12 +72940,7 @@ entities: - uid: 16760 components: - type: Transform - pos: -19.640923,-0.5830568 - parent: 12 - - uid: 16765 - components: - - type: Transform - pos: -19.38408,-0.38736725 + pos: -19.39561,2.431752 parent: 12 - uid: 21376 components: @@ -72747,11 +73295,6 @@ entities: - type: Transform pos: -20.5,60.5 parent: 12 - - uid: 25350 - components: - - type: Transform - pos: 2.5,68.5 - parent: 12 - uid: 25351 components: - type: Transform @@ -72772,6 +73315,11 @@ entities: - type: Transform pos: 4.5,-23.5 parent: 12 + - uid: 30332 + components: + - type: Transform + pos: 1.5,68.5 + parent: 12 - proto: ClosetFireFilled entities: - uid: 253 @@ -72819,6 +73367,11 @@ entities: - type: Transform pos: 33.5,35.5 parent: 12 + - uid: 16519 + components: + - type: Transform + pos: -21.5,31.5 + parent: 12 - uid: 18276 components: - type: Transform @@ -73573,6 +74126,12 @@ entities: - type: Transform pos: 2.4488733,41.539967 parent: 12 + - uid: 30263 + components: + - type: Transform + rot: -12.566370614359172 rad + pos: -21.523514,1.0408798 + parent: 12 - proto: ClothingEyesHudBeer entities: - uid: 23436 @@ -73722,6 +74281,44 @@ entities: - type: Transform pos: 21.5,47.5 parent: 12 +- proto: ClothingHeadHatCone + entities: + - uid: 16765 + components: + - type: Transform + pos: 10.22571,-23.596481 + parent: 12 + - uid: 30427 + components: + - type: Transform + pos: 9.744623,-23.141264 + parent: 12 + - uid: 30428 + components: + - type: Transform + pos: 9.719537,-23.611914 + parent: 12 + - uid: 30429 + components: + - type: Transform + pos: 11.209909,-23.139822 + parent: 12 + - uid: 30430 + components: + - type: Transform + pos: 10.699492,-23.15024 + parent: 12 + - uid: 30431 + components: + - type: Transform + pos: 10.72571,-23.59031 + parent: 12 + - uid: 30432 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.258258,-23.731155 + parent: 12 - proto: ClothingHeadHatGreensoft entities: - uid: 30232 @@ -73828,13 +74425,6 @@ entities: parent: 6209 - type: Physics canCollide: False -- proto: ClothingHeadHelmetFire - entities: - - uid: 21513 - components: - - type: Transform - pos: -21.489107,31.8025 - parent: 12 - proto: ClothingHeadHelmetRiot entities: - uid: 20866 @@ -73918,11 +74508,6 @@ entities: - type: Transform pos: 30.493746,24.522993 parent: 12 - - uid: 21508 - components: - - type: Transform - pos: -21.34762,31.57457 - parent: 12 - proto: ClothingMaskGasAtmos entities: - uid: 7168 @@ -74018,6 +74603,11 @@ entities: - type: Transform pos: -14.564797,58.594166 parent: 12 + - uid: 30421 + components: + - type: Transform + pos: -11.5234165,71.48836 + parent: 12 - proto: ClothingNeckScarfStripedSyndieRed entities: - uid: 28256 @@ -74236,13 +74826,6 @@ entities: - type: Transform pos: 5.585704,30.539377 parent: 12 -- proto: ClothingOuterSuitFire - entities: - - uid: 21514 - components: - - type: Transform - pos: -21.760761,31.400925 - parent: 12 - proto: ClothingOuterSuitMonkey entities: - uid: 2751 @@ -74712,24 +75295,6 @@ entities: - type: Transform pos: -23.5,-55.5 parent: 12 - - uid: 4153 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,72.5 - parent: 12 - - uid: 4163 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,73.5 - parent: 12 - - uid: 9441 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,73.5 - parent: 12 - uid: 12236 components: - type: Transform @@ -74858,30 +75423,12 @@ entities: - type: Transform pos: 17.5,50.5 parent: 12 - - uid: 25595 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,74.5 - parent: 12 - uid: 26555 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,48.5 parent: 12 - - uid: 27255 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,72.5 - parent: 12 - - uid: 27260 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,74.5 - parent: 12 - proto: ComputerAnalysisConsole entities: - uid: 4892 @@ -75437,18 +75984,6 @@ entities: rot: -1.5707963267948966 rad pos: -19.5,6.5 parent: 12 - - uid: 16518 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-0.5 - parent: 12 - - uid: 16520 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,0.5 - parent: 12 - uid: 20818 components: - type: Transform @@ -75471,6 +76006,11 @@ entities: - type: Transform pos: -7.5,63.5 parent: 12 + - uid: 30262 + components: + - type: Transform + pos: -19.5,-0.5 + parent: 12 - proto: ContainmentFieldGenerator entities: - uid: 4741 @@ -76310,10 +76850,10 @@ entities: - type: Transform pos: 44.5,-11.5 parent: 12 - - uid: 13734 + - uid: 16693 components: - type: Transform - pos: 61.5,-18.5 + pos: 62.5,-20.5 parent: 12 - uid: 26169 components: @@ -76433,11 +76973,6 @@ entities: parent: 12 - proto: CrateFilledSpawner entities: - - uid: 6205 - components: - - type: Transform - pos: 62.5,-18.5 - parent: 12 - uid: 7333 components: - type: Transform @@ -76483,6 +77018,11 @@ entities: - type: Transform pos: 63.5,-20.5 parent: 12 + - uid: 30403 + components: + - type: Transform + pos: 60.5,-20.5 + parent: 12 - proto: CrateFoodDinnerware entities: - uid: 9269 @@ -76759,10 +77299,10 @@ entities: parent: 12 - proto: CrateServiceBureaucracy entities: - - uid: 16521 + - uid: 16696 components: - type: Transform - pos: -23.5,-0.5 + pos: -20.5,4.5 parent: 12 - proto: CrateServiceCustomSmokable entities: @@ -76945,11 +77485,6 @@ entities: - type: Transform pos: -28.283596,23.347982 parent: 12 - - uid: 21518 - components: - - type: Transform - pos: -21.553009,31.481783 - parent: 12 - proto: CryogenicSleepUnit entities: - uid: 21356 @@ -77066,29 +77601,30 @@ entities: parent: 12 - proto: CurtainsRedOpen entities: - - uid: 5970 + - uid: 16701 components: - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,1.5 + rot: -1.5707963267948966 rad + pos: -21.5,3.5 parent: 12 - - uid: 10509 + - uid: 16703 components: - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,3.5 + pos: -20.5,3.5 parent: 12 - uid: 22052 components: - type: Transform pos: -44.5,33.5 parent: 12 - - uid: 28550 + - uid: 30261 components: - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,2.5 + pos: -22.5,3.5 parent: 12 + - type: Door + secondsUntilStateChange: -4432.2183 + state: Closing - proto: CurtainsWhiteOpen entities: - uid: 21980 @@ -77494,6 +78030,20 @@ entities: - type: Transform pos: 29.5,57.5 parent: 12 +- proto: DefaultStationBeaconLawOffice + entities: + - uid: 16688 + components: + - type: Transform + pos: -22.5,0.5 + parent: 12 +- proto: DefaultStationBeaconLibrary + entities: + - uid: 30350 + components: + - type: Transform + pos: -8.5,73.5 + parent: 12 - proto: DefaultStationBeaconMedical entities: - uid: 3939 @@ -87000,6 +87550,12 @@ entities: rot: 3.141592653589793 rad pos: 30.5,-6.5 parent: 12 + - uid: 30336 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,70.5 + parent: 12 - proto: DisposalPipeBroken entities: - uid: 4901 @@ -87357,6 +87913,12 @@ entities: - type: Transform pos: -29.5,-41.5 parent: 12 + - uid: 19664 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,70.5 + parent: 12 - uid: 20147 components: - type: Transform @@ -87513,6 +88075,12 @@ entities: rot: 1.5707963267948966 rad pos: 29.5,0.5 parent: 12 + - uid: 30335 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,70.5 + parent: 12 - proto: DisposalUnit entities: - uid: 1845 @@ -87687,6 +88255,11 @@ entities: - type: Transform pos: 47.5,17.5 parent: 12 + - uid: 12332 + components: + - type: Transform + pos: 3.5,70.5 + parent: 12 - uid: 12703 components: - type: Transform @@ -87882,6 +88455,11 @@ entities: - type: Transform pos: 29.5,0.5 parent: 12 + - uid: 30260 + components: + - type: Transform + pos: 5.5,70.5 + parent: 12 - proto: DisposalYJunction entities: - uid: 6851 @@ -87940,6 +88518,11 @@ entities: - type: Transform pos: -30.5,-41.5 parent: 12 + - uid: 19677 + components: + - type: Transform + pos: -15.5,72.5 + parent: 12 - uid: 21986 components: - type: Transform @@ -88059,6 +88642,11 @@ entities: parent: 12 - proto: DrinkBeerBottleFull entities: + - uid: 16520 + components: + - type: Transform + pos: 8.0309305,6.6569676 + parent: 12 - uid: 21456 components: - type: Transform @@ -88299,12 +88887,12 @@ entities: - uid: 16762 components: - type: Transform - pos: -19.702076,1.7782369 + pos: -19.754375,2.6274414 parent: 12 - uid: 16763 components: - type: Transform - pos: -19.34739,1.4847026 + pos: -19.68099,2.4235983 parent: 12 - uid: 17600 components: @@ -88428,6 +89016,13 @@ entities: - type: Transform pos: 19.575062,68.438705 parent: 12 +- proto: DrinkPwrGameCan + entities: + - uid: 30317 + components: + - type: Transform + pos: -6.312085,77.664825 + parent: 12 - proto: DrinkShotGlass entities: - uid: 13325 @@ -89667,7 +90262,7 @@ entities: - uid: 26038 components: - type: Transform - pos: -24.5,5.5 + pos: -24.5,4.5 parent: 12 - uid: 26039 components: @@ -89743,14 +90338,14 @@ entities: - type: FaxMachine name: Chapel destinationAddress: Chapel - - uid: 16703 + - uid: 16764 components: - type: Transform - pos: -19.5,2.5 + pos: -25.5,0.5 parent: 12 - type: FaxMachine - name: Port office - destinationAddress: Port office + name: Lawyer's office + destinationAddress: Lawyer's office - uid: 18869 components: - type: Transform @@ -89815,6 +90410,14 @@ entities: - type: FaxMachine name: Engineering destinationAddress: Engineering + - uid: 30315 + components: + - type: Transform + pos: -13.5,73.5 + parent: 12 + - type: FaxMachine + name: Library + destinationAddress: Library - proto: FaxMachineCaptain entities: - uid: 17603 @@ -89965,7 +90568,6 @@ entities: - 16408 - 23915 - 23914 - - 16531 - 16530 - 15908 - 15909 @@ -90221,11 +90823,6 @@ entities: - type: Transform pos: -28.658644,23.554457 parent: 12 - - uid: 21512 - components: - - type: Transform - pos: -21.217455,31.306437 - parent: 12 - uid: 23664 components: - type: Transform @@ -90990,6 +91587,14 @@ entities: - type: DeviceNetwork deviceLists: - 8910 + - uid: 5232 + components: + - type: Transform + pos: -3.5,70.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 30349 - uid: 5579 components: - type: Transform @@ -91052,6 +91657,14 @@ entities: deviceLists: - 23937 - 2852 + - uid: 6205 + components: + - type: Transform + pos: -9.5,1.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 9702 - uid: 6283 components: - type: Transform @@ -91545,6 +92158,7 @@ entities: deviceLists: - 23917 - 2614 + - 9702 - uid: 9330 components: - type: Transform @@ -91555,6 +92169,7 @@ entities: deviceLists: - 23917 - 2614 + - 9702 - uid: 9332 components: - type: Transform @@ -91574,6 +92189,14 @@ entities: - type: DeviceNetwork deviceLists: - 29782 + - uid: 9646 + components: + - type: Transform + pos: -24.5,5.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 449 - uid: 9666 components: - type: Transform @@ -91626,6 +92249,14 @@ entities: - type: DeviceNetwork deviceLists: - 28381 + - uid: 10509 + components: + - type: Transform + pos: -12.5,-5.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 9702 - uid: 11361 components: - type: Transform @@ -92399,15 +93030,6 @@ entities: deviceLists: - 23913 - 449 - - uid: 16531 - components: - - type: Transform - pos: -20.5,3.5 - parent: 12 - - type: DeviceNetwork - deviceLists: - - 23913 - - 449 - uid: 16633 components: - type: Transform @@ -92461,6 +93083,14 @@ entities: rot: 1.5707963267948966 rad pos: -54.5,-34.5 parent: 12 + - uid: 16702 + components: + - type: Transform + pos: -18.5,0.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 9702 - uid: 17131 components: - type: Transform @@ -92810,7 +93440,7 @@ entities: parent: 12 - type: DeviceNetwork deviceLists: - - 22400 + - 30349 - uid: 19745 components: - type: Transform @@ -93056,6 +93686,14 @@ entities: - type: DeviceNetwork deviceLists: - 23786 + - uid: 21519 + components: + - type: Transform + pos: -12.5,-7.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 9702 - uid: 21567 components: - type: Transform @@ -93073,6 +93711,7 @@ entities: - type: DeviceNetwork deviceLists: - 23917 + - 9702 - uid: 22043 components: - type: Transform @@ -93281,6 +93920,7 @@ entities: - 23913 - 23917 - 449 + - 9702 - uid: 23915 components: - type: Transform @@ -93291,6 +93931,7 @@ entities: - 23913 - 23917 - 449 + - 9702 - uid: 23916 components: - type: Transform @@ -93309,6 +93950,7 @@ entities: - type: DeviceNetwork deviceLists: - 23917 + - 9702 - uid: 23919 components: - type: Transform @@ -93663,6 +94305,13 @@ entities: - type: Transform pos: 44.5,61.5 parent: 12 +- proto: Fireplace + entities: + - uid: 30393 + components: + - type: Transform + pos: -15.5,73.5 + parent: 12 - proto: Flash entities: - uid: 26214 @@ -94710,7 +95359,7 @@ entities: - uid: 401 components: - type: Transform - pos: 8.194947,6.558488 + pos: 8.336695,6.534662 parent: 12 - uid: 21385 components: @@ -94971,6 +95620,12 @@ entities: - type: Transform pos: 75.5,6.5 parent: 12 + - uid: 30331 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,70.5 + parent: 12 - proto: GasPipeBend entities: - uid: 965 @@ -119413,6 +120068,18 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 30324 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,70.5 + parent: 12 + - uid: 30337 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,68.5 + parent: 12 - proto: GasPipeTJunction entities: - uid: 103 @@ -122620,6 +123287,12 @@ entities: rot: 1.5707963267948966 rad pos: 73.5,-5.5 parent: 12 + - uid: 30340 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,68.5 + parent: 12 - proto: GasPressurePump entities: - uid: 788 @@ -122841,6 +123514,12 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 30338 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,68.5 + parent: 12 - proto: GasThermoMachineFreezer entities: - uid: 2804 @@ -124195,6 +124874,9 @@ entities: rot: 1.5707963267948966 rad pos: -16.5,0.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 9702 - type: AtmosPipeColor color: '#0055CCFF' - uid: 22245 @@ -124572,6 +125254,9 @@ entities: - type: Transform pos: -9.5,71.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 30349 - type: AtmosPipeColor color: '#0055CCFF' - uid: 26353 @@ -124764,6 +125449,17 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' +- proto: GasVentPumpVox + entities: + - uid: 8764 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,68.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 7822 - proto: GasVentScrubber entities: - uid: 800 @@ -125915,6 +126611,9 @@ entities: rot: -1.5707963267948966 rad pos: -15.5,-0.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 9702 - type: AtmosPipeColor color: '#990000FF' - uid: 22244 @@ -126256,6 +126955,17 @@ entities: - 29272 - type: AtmosPipeColor color: '#990000FF' +- proto: GasVentScrubberVox + entities: + - uid: 9429 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,70.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 7822 - proto: GasVolumePump entities: - uid: 11329 @@ -126472,6 +127182,13 @@ entities: - type: Transform pos: -43.361374,70.35507 parent: 12 +- proto: GrassBattlemap + entities: + - uid: 30316 + components: + - type: Transform + pos: -7.4539666,77.78246 + parent: 12 - proto: GravityGenerator entities: - uid: 18571 @@ -132326,6 +133043,28 @@ entities: - type: Transform pos: -59.5,23.5 parent: 12 + - uid: 16523 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,79.5 + parent: 12 + - uid: 16524 + components: + - type: Transform + pos: -13.5,76.5 + parent: 12 + - uid: 16525 + components: + - type: Transform + pos: -12.5,77.5 + parent: 12 + - uid: 16531 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,79.5 + parent: 12 - uid: 16787 components: - type: Transform @@ -132675,6 +133414,11 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,42.5 parent: 12 + - uid: 18896 + components: + - type: Transform + pos: -20.5,3.5 + parent: 12 - uid: 19035 components: - type: Transform @@ -132917,6 +133661,12 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,46.5 parent: 12 + - uid: 19458 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,79.5 + parent: 12 - uid: 19546 components: - type: Transform @@ -132962,100 +133712,46 @@ entities: - type: Transform pos: -57.5,36.5 parent: 12 - - uid: 19636 - components: - - type: Transform - pos: -13.5,71.5 - parent: 12 - - uid: 19644 - components: - - type: Transform - pos: -13.5,72.5 - parent: 12 - - uid: 19645 - components: - - type: Transform - pos: -13.5,73.5 - parent: 12 - - uid: 19646 - components: - - type: Transform - pos: -13.5,74.5 - parent: 12 - - uid: 19647 + - uid: 19633 components: - type: Transform pos: -13.5,75.5 parent: 12 - - uid: 19648 - components: - - type: Transform - pos: -12.5,76.5 - parent: 12 - - uid: 19649 - components: - - type: Transform - pos: -11.5,76.5 - parent: 12 - - uid: 19650 - components: - - type: Transform - pos: -10.5,76.5 - parent: 12 - - uid: 19651 - components: - - type: Transform - pos: -9.5,76.5 - parent: 12 - - uid: 19652 + - uid: 19647 components: - type: Transform - pos: -8.5,76.5 + rot: 3.141592653589793 rad + pos: -7.5,79.5 parent: 12 - uid: 19653 components: - type: Transform - pos: -7.5,76.5 - parent: 12 - - uid: 19654 - components: - - type: Transform - pos: -6.5,76.5 + rot: 3.141592653589793 rad + pos: -2.5,73.5 parent: 12 - uid: 19655 components: - type: Transform - pos: -5.5,75.5 - parent: 12 - - uid: 19656 - components: - - type: Transform - pos: -5.5,74.5 - parent: 12 - - uid: 19657 - components: - - type: Transform - pos: -5.5,73.5 - parent: 12 - - uid: 19658 - components: - - type: Transform - pos: -5.5,72.5 + rot: 3.141592653589793 rad + pos: -3.5,78.5 parent: 12 - - uid: 19659 + - uid: 19669 components: - type: Transform - pos: -5.5,71.5 + rot: 3.141592653589793 rad + pos: -4.5,79.5 parent: 12 - - uid: 19660 + - uid: 19679 components: - type: Transform - pos: -6.5,75.5 + rot: 3.141592653589793 rad + pos: -12.5,78.5 parent: 12 - - uid: 19661 + - uid: 19680 components: - type: Transform - pos: -12.5,75.5 + rot: 3.141592653589793 rad + pos: -3.5,77.5 parent: 12 - uid: 19721 components: @@ -133072,10 +133768,11 @@ entities: - type: Transform pos: -5.5,60.5 parent: 12 - - uid: 19806 + - uid: 19783 components: - type: Transform - pos: 4.5,71.5 + rot: 3.141592653589793 rad + pos: -5.5,79.5 parent: 12 - uid: 19807 components: @@ -134059,6 +134756,11 @@ entities: - type: Transform pos: 23.5,91.5 parent: 12 + - uid: 26288 + components: + - type: Transform + pos: -22.5,3.5 + parent: 12 - uid: 26291 components: - type: Transform @@ -136287,6 +136989,47 @@ entities: - type: Transform pos: 61.5,69.5 parent: 12 + - uid: 30265 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,79.5 + parent: 12 + - uid: 30271 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,79.5 + parent: 12 + - uid: 30276 + components: + - type: Transform + pos: -14.5,74.5 + parent: 12 + - uid: 30294 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,72.5 + parent: 12 + - uid: 30298 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,74.5 + parent: 12 + - uid: 30299 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,75.5 + parent: 12 + - uid: 30300 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,76.5 + parent: 12 - proto: GrilleBroken entities: - uid: 6681 @@ -136359,6 +137102,30 @@ entities: - type: Transform pos: 56.5,14.5 parent: 12 +- proto: GrilleDiagonal + entities: + - uid: 16526 + components: + - type: Transform + pos: -13.5,77.5 + parent: 12 + - uid: 19616 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,79.5 + parent: 12 + - uid: 19631 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,77.5 + parent: 12 + - uid: 30273 + components: + - type: Transform + pos: -12.5,79.5 + parent: 12 - proto: GroundCannabis entities: - uid: 12239 @@ -137244,6 +138011,12 @@ entities: rot: -1.5707963267948966 rad pos: 59.5,37.5 parent: 12 + - uid: 30395 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,70.5 + parent: 12 - proto: IntercomSupply entities: - uid: 8791 @@ -137560,14 +138333,51 @@ entities: - uid: 16708 components: - type: Transform - pos: -22.581345,1.9200904 + pos: -22.459707,1.9281484 parent: 12 + - type: HandheldLight + toggleActionEntity: 19657 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 19657 + - type: Physics + canCollide: True + - type: ActionsContainer - uid: 21453 components: - type: Transform rot: 3.141592653589793 rad pos: -32.44526,29.851074 parent: 12 + - uid: 30347 + components: + - type: Transform + pos: -6.858248,78.86622 + parent: 12 + - type: HandheldLight + toggleActionEntity: 30348 + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + actions: !type:Container + showEnts: False + occludes: True + ents: + - 30348 + - type: Physics + canCollide: True + - type: ActionsContainer - proto: LampInterrogator entities: - uid: 21291 @@ -137638,7 +138448,7 @@ entities: - uid: 16761 components: - type: Transform - pos: -19.543077,0.7630973 + pos: -19.24069,2.5948265 parent: 12 - proto: LockerAtmosphericsFilled entities: @@ -138776,11 +139586,6 @@ entities: - type: Transform pos: 36.5,59.5 parent: 12 - - uid: 25901 - components: - - type: Transform - pos: 2.5,70.5 - parent: 12 - uid: 25970 components: - type: Transform @@ -138791,6 +139596,11 @@ entities: - type: Transform pos: -40.5,-51.5 parent: 12 + - uid: 30334 + components: + - type: Transform + pos: 1.5,70.5 + parent: 12 - proto: MaintenancePlantSpawner entities: - uid: 771 @@ -139079,6 +139889,13 @@ entities: - type: Transform pos: -33.443954,20.520542 parent: 12 +- proto: MechEquipmentGrabberSmall + entities: + - uid: 30401 + components: + - type: Transform + pos: 61.574314,-18.49609 + parent: 12 - proto: MedicalBed entities: - uid: 2323 @@ -139551,6 +140368,28 @@ entities: rot: -12.566370614359172 rad pos: 16.434547,-15.449873 parent: 12 +- proto: MysteryFigureBox + entities: + - uid: 30384 + components: + - type: Transform + pos: -6.4033923,78.519 + parent: 12 + - uid: 30385 + components: + - type: Transform + pos: -6.424226,78.769 + parent: 12 + - uid: 30386 + components: + - type: Transform + pos: -6.49367,78.421776 + parent: 12 + - uid: 30391 + components: + - type: Transform + pos: -6.5214477,78.65094 + parent: 12 - proto: NetworkConfigurator entities: - uid: 4916 @@ -139599,11 +140438,6 @@ entities: - type: Transform pos: -47.5,40.5 parent: 12 - - uid: 19616 - components: - - type: Transform - pos: -22.5,52.5 - parent: 12 - uid: 21501 components: - type: Transform @@ -139669,6 +140503,14 @@ entities: - type: Transform pos: -27.5,60.5 parent: 12 + - uid: 30339 + components: + - type: Transform + anchored: True + pos: 3.5,68.5 + parent: 12 + - type: Physics + bodyType: Static - proto: NitrogenTankFilled entities: - uid: 19265 @@ -139764,6 +140606,11 @@ entities: - type: Transform pos: 37.5,45.5 parent: 12 + - uid: 30426 + components: + - type: Transform + pos: -48.5,69.5 + parent: 12 - proto: OperatingTable entities: - uid: 1812 @@ -140151,6 +140998,11 @@ entities: - type: Transform pos: -34.5,24.5 parent: 12 + - uid: 30280 + components: + - type: Transform + pos: -14.5,73.5 + parent: 12 - proto: PaperBin5 entities: - uid: 2104 @@ -140231,6 +141083,28 @@ entities: - type: Transform pos: -49.62374,21.614584 parent: 12 +- proto: PaperCNCSheet + entities: + - uid: 30388 + components: + - type: Transform + pos: -6.8374147,78.039825 + parent: 12 + - uid: 30389 + components: + - type: Transform + pos: -6.684637,77.921776 + parent: 12 + - uid: 30390 + components: + - type: Transform + pos: -6.8304706,77.74122 + parent: 12 + - uid: 30392 + components: + - type: Transform + pos: -6.698526,77.58844 + parent: 12 - proto: ParticleAcceleratorControlBox entities: - uid: 4668 @@ -140501,6 +141375,33 @@ entities: - type: Transform pos: 47.53334,-11.330042 parent: 12 + - uid: 30422 + components: + - type: Transform + pos: -7.091517,77.40156 + parent: 12 + - uid: 30423 + components: + - type: Transform + pos: -7.30448,77.364525 + parent: 12 + - uid: 30424 + components: + - type: Transform + pos: -6.4109616,78.03119 + parent: 12 + - uid: 30425 + components: + - type: Transform + pos: -6.30448,78.15156 + parent: 12 +- proto: PersonalAI + entities: + - uid: 30420 + components: + - type: Transform + pos: -13.388701,73.01164 + parent: 12 - proto: PhoneInstrument entities: - uid: 17615 @@ -140868,6 +141769,13 @@ entities: - type: Transform pos: -19.408815,-29.402786 parent: 12 +- proto: PlushieVox + entities: + - uid: 21518 + components: + - type: Transform + pos: 6.4479766,69.47932 + parent: 12 - proto: PortableFlasher entities: - uid: 21069 @@ -141287,6 +142195,20 @@ entities: - type: Transform pos: -41.5,-40.5 parent: 12 +- proto: PosterLegitSecWatch + entities: + - uid: 10271 + components: + - type: Transform + pos: -24.5,1.5 + parent: 12 +- proto: PottedPlant1 + entities: + - uid: 30419 + components: + - type: Transform + pos: -6.5,71.5 + parent: 12 - proto: PottedPlant14 entities: - uid: 5476 @@ -143898,6 +144820,12 @@ entities: rot: 3.141592653589793 rad pos: 4.5,13.5 parent: 12 + - uid: 19662 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,71.5 + parent: 12 - uid: 19870 components: - type: Transform @@ -144095,12 +145023,6 @@ entities: rot: -1.5707963267948966 rad pos: 16.5,19.5 parent: 12 - - uid: 28390 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,-0.5 - parent: 12 - uid: 29077 components: - type: Transform @@ -144117,6 +145039,22 @@ entities: - type: Transform pos: -33.5,-41.5 parent: 12 + - uid: 30279 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,73.5 + parent: 12 + - uid: 30290 + components: + - type: Transform + pos: -5.5,78.5 + parent: 12 + - uid: 30291 + components: + - type: Transform + pos: -10.5,78.5 + parent: 12 - proto: PoweredlightBlue entities: - uid: 9232 @@ -144547,11 +145485,11 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,66.5 parent: 12 - - uid: 9440 + - uid: 9441 components: - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,71.5 + rot: 1.5707963267948966 rad + pos: -10.5,68.5 parent: 12 - uid: 9548 components: @@ -144617,12 +145555,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-4.5 parent: 12 - - uid: 10658 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,71.5 - parent: 12 - uid: 10803 components: - type: Transform @@ -144855,6 +145787,12 @@ entities: - type: Transform pos: -26.5,51.5 parent: 12 + - uid: 19660 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-0.5 + parent: 12 - uid: 19833 components: - type: Transform @@ -145209,6 +146147,17 @@ entities: rot: 1.5707963267948966 rad pos: 41.5,-0.5 parent: 12 + - uid: 30269 + components: + - type: Transform + pos: -19.5,2.5 + parent: 12 + - uid: 30296 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,71.5 + parent: 12 - proto: PoweredSmallLightEmpty entities: - uid: 9391 @@ -145526,12 +146475,6 @@ entities: rot: 3.141592653589793 rad pos: -28.5,23.5 parent: 12 - - uid: 21504 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,31.5 - parent: 12 - uid: 21505 components: - type: Transform @@ -145694,11 +146637,6 @@ entities: - type: Transform pos: -6.5,68.5 parent: 12 - - uid: 25900 - components: - - type: Transform - pos: 2.5,70.5 - parent: 12 - uid: 25907 components: - type: Transform @@ -145850,6 +146788,12 @@ entities: - type: Transform pos: -43.5,70.5 parent: 12 + - uid: 30333 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,70.5 + parent: 12 - proto: RadiationCollectorFullTank entities: - uid: 3823 @@ -146979,12 +147923,6 @@ entities: - type: Transform pos: -12.5,23.5 parent: 12 - - uid: 29356 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,-0.5 - parent: 12 - uid: 29357 components: - type: Transform @@ -147269,11 +148207,6 @@ entities: - type: Transform pos: -9.5,69.5 parent: 12 - - uid: 24375 - components: - - type: Transform - pos: -7.5,71.5 - parent: 12 - uid: 24376 components: - type: Transform @@ -152341,6 +153274,12 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-45.5 parent: 12 + - uid: 16522 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,79.5 + parent: 12 - uid: 16547 components: - type: Transform @@ -152827,105 +153766,65 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,-49.5 parent: 12 - - uid: 19662 + - uid: 19635 components: - type: Transform - pos: -13.5,71.5 + rot: 3.141592653589793 rad + pos: -5.5,79.5 parent: 12 - - uid: 19663 + - uid: 19645 components: - type: Transform - pos: -13.5,72.5 + rot: 3.141592653589793 rad + pos: -3.5,77.5 parent: 12 - - uid: 19664 + - uid: 19649 components: - type: Transform - pos: -13.5,73.5 + rot: 3.141592653589793 rad + pos: -10.5,79.5 parent: 12 - - uid: 19665 + - uid: 19650 components: - type: Transform - pos: -13.5,74.5 + rot: 3.141592653589793 rad + pos: -11.5,79.5 parent: 12 - - uid: 19666 + - uid: 19654 components: - type: Transform - pos: -13.5,75.5 + rot: 3.141592653589793 rad + pos: -7.5,79.5 parent: 12 - uid: 19667 components: - type: Transform - pos: -12.5,75.5 + rot: 3.141592653589793 rad + pos: -9.5,79.5 parent: 12 - uid: 19668 components: - type: Transform - pos: -12.5,76.5 - parent: 12 - - uid: 19669 - components: - - type: Transform - pos: -11.5,76.5 - parent: 12 - - uid: 19670 - components: - - type: Transform - pos: -10.5,76.5 - parent: 12 - - uid: 19671 - components: - - type: Transform - pos: -9.5,76.5 + rot: 3.141592653589793 rad + pos: -8.5,79.5 parent: 12 - uid: 19672 components: - type: Transform - pos: -8.5,76.5 - parent: 12 - - uid: 19673 - components: - - type: Transform - pos: -7.5,76.5 - parent: 12 - - uid: 19674 - components: - - type: Transform - pos: -6.5,76.5 - parent: 12 - - uid: 19675 - components: - - type: Transform - pos: -6.5,75.5 + rot: 3.141592653589793 rad + pos: -4.5,79.5 parent: 12 - uid: 19676 components: - type: Transform - pos: -5.5,75.5 - parent: 12 - - uid: 19677 - components: - - type: Transform - pos: -5.5,74.5 + rot: 3.141592653589793 rad + pos: -3.5,78.5 parent: 12 - uid: 19678 components: - type: Transform - pos: -5.5,73.5 - parent: 12 - - uid: 19679 - components: - - type: Transform - pos: -5.5,72.5 - parent: 12 - - uid: 19680 - components: - - type: Transform - pos: -5.5,71.5 - parent: 12 - - uid: 19809 - components: - - type: Transform - pos: 4.5,71.5 + rot: 3.141592653589793 rad + pos: -12.5,78.5 parent: 12 - uid: 19810 components: @@ -153111,6 +154010,11 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,58.5 parent: 12 + - uid: 22400 + components: + - type: Transform + pos: -14.5,74.5 + parent: 12 - uid: 22856 components: - type: Transform @@ -154173,6 +155077,75 @@ entities: - type: Transform pos: -21.5,-10.5 parent: 12 + - uid: 30272 + components: + - type: Transform + pos: -12.5,77.5 + parent: 12 + - uid: 30274 + components: + - type: Transform + pos: -13.5,76.5 + parent: 12 + - uid: 30275 + components: + - type: Transform + pos: -13.5,75.5 + parent: 12 + - uid: 30303 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,76.5 + parent: 12 + - uid: 30304 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,75.5 + parent: 12 + - uid: 30305 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,74.5 + parent: 12 + - uid: 30306 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,73.5 + parent: 12 + - uid: 30307 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,72.5 + parent: 12 +- proto: ReinforcedWindowDiagonal + entities: + - uid: 19673 + components: + - type: Transform + pos: -12.5,79.5 + parent: 12 + - uid: 21513 + components: + - type: Transform + pos: -13.5,77.5 + parent: 12 + - uid: 30301 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,77.5 + parent: 12 + - uid: 30302 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,79.5 + parent: 12 - proto: RemoteSignaller entities: - uid: 3009 @@ -154329,12 +155302,19 @@ entities: parent: 12 - proto: SalvageMagnet entities: - - uid: 8764 + - uid: 19809 components: - type: Transform rot: 1.5707963267948966 rad pos: 87.5,-35.5 parent: 12 +- proto: SandBattlemap + entities: + - uid: 30319 + components: + - type: Transform + pos: -7.427693,78.07455 + parent: 12 - proto: Saw entities: - uid: 2834 @@ -156540,6 +157520,20 @@ entities: - type: Transform pos: -26.5,-51.5 parent: 12 +- proto: SignFlammable + entities: + - uid: 16521 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 74.5,5.5 + parent: 12 + - uid: 16699 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,17.5 + parent: 12 - proto: SignGravity entities: - uid: 20141 @@ -156640,12 +157634,34 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,30.5 parent: 12 + - uid: 19665 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,-0.5 + parent: 12 - uid: 20056 components: - type: Transform rot: 1.5707963267948966 rad pos: -32.5,34.5 parent: 12 +- proto: SignLibrary + entities: + - uid: 415 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,70.5 + parent: 12 +- proto: SignMagnetics + entities: + - uid: 4164 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 86.5,-35.5 + parent: 12 - proto: SignMaterials entities: - uid: 16551 @@ -156933,6 +157949,13 @@ entities: - type: Transform pos: -14.5,-57.5 parent: 12 +- proto: SignVox + entities: + - uid: 434 + components: + - type: Transform + pos: 2.5,70.5 + parent: 12 - proto: SingularityGenerator entities: - uid: 4722 @@ -157165,6 +158188,13 @@ entities: - type: Transform pos: 50.53882,20.213259 parent: 12 +- proto: SnowBattlemap + entities: + - uid: 30320 + components: + - type: Transform + pos: -7.608248,78.005104 + parent: 12 - proto: SoapNT entities: - uid: 13625 @@ -158461,6 +159491,13 @@ entities: parent: 12 - type: Stack count: 110 +- proto: SpacemenFigureSpawner + entities: + - uid: 30383 + components: + - type: Transform + pos: -13.5,72.5 + parent: 12 - proto: SpaceVillainArcadeFilled entities: - uid: 12223 @@ -158498,6 +159535,14 @@ entities: - type: Transform pos: 8.5,68.5 parent: 12 +- proto: SpawnMechRipley + entities: + - uid: 30400 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 61.5,-21.5 + parent: 12 - proto: SpawnMobAlexander entities: - uid: 23511 @@ -158711,6 +159756,13 @@ entities: - type: Transform pos: -42.5,35.5 parent: 12 +- proto: SpawnMobSlothPaperwork + entities: + - uid: 30398 + components: + - type: Transform + pos: -15.5,72.5 + parent: 12 - proto: SpawnMobSmile entities: - uid: 1950 @@ -158956,15 +160008,22 @@ entities: parent: 12 - proto: SpawnPointLawyer entities: - - uid: 21640 + - uid: 30266 components: - type: Transform - pos: -29.5,31.5 + pos: -25.5,-0.5 parent: 12 - - uid: 21641 + - uid: 30268 components: - type: Transform - pos: -33.5,30.5 + pos: -22.5,0.5 + parent: 12 +- proto: SpawnPointLibrarian + entities: + - uid: 19795 + components: + - type: Transform + pos: -14.5,72.5 parent: 12 - proto: SpawnPointMedicalDoctor entities: @@ -159355,7 +160414,7 @@ entities: - uid: 11332 components: - type: Transform - pos: 8.826283,6.5534234 + pos: 8.764766,6.5591226 parent: 12 - uid: 21387 components: @@ -160121,12 +161180,6 @@ entities: rot: 3.141592653589793 rad pos: -21.5,5.5 parent: 12 - - uid: 16519 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.527166,-0.38183045 - parent: 12 - uid: 16852 components: - type: Transform @@ -161178,6 +162231,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: TEG + - uid: 19663 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,0.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Engineering rest area - uid: 21925 components: - type: Transform @@ -161404,27 +162468,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Hallway south B - - uid: 4164 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,75.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Observitory - - uid: 5232 - components: - - type: Transform - pos: -21.5,-0.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Port meeting room - uid: 6752 components: - type: Transform @@ -161532,6 +162575,16 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Court + - uid: 21514 + components: + - type: Transform + pos: -21.5,-0.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraGeneral + nameSet: True + id: Lawyer's office - uid: 21921 components: - type: Transform @@ -162423,6 +163476,17 @@ entities: - SurveillanceCameraService nameSet: True id: Bartender's room + - uid: 30394 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,78.5 + parent: 12 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraService + nameSet: True + id: Library - proto: SurveillanceCameraSupply entities: - uid: 90 @@ -163607,6 +164671,11 @@ entities: - type: Transform pos: -12.5,13.5 parent: 12 + - uid: 16690 + components: + - type: Transform + pos: 61.5,-18.5 + parent: 12 - uid: 17383 components: - type: Transform @@ -164415,6 +165484,11 @@ entities: - type: Transform pos: -43.5,71.5 parent: 12 + - uid: 30341 + components: + - type: Transform + pos: 5.5,68.5 + parent: 12 - proto: TableCarpet entities: - uid: 22653 @@ -165358,11 +166432,17 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,-11.5 parent: 12 - - uid: 9429 + - uid: 10612 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,70.5 + pos: -19.5,2.5 + parent: 12 + - uid: 11682 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,0.5 parent: 12 - uid: 12396 components: @@ -165537,6 +166617,11 @@ entities: rot: 3.141592653589793 rad pos: 18.5,29.5 parent: 12 + - uid: 13734 + components: + - type: Transform + pos: -21.5,-0.5 + parent: 12 - uid: 14159 components: - type: Transform @@ -165614,21 +166699,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,36.5 parent: 12 - - uid: 16524 - components: - - type: Transform - pos: -19.5,2.5 - parent: 12 - - uid: 16525 - components: - - type: Transform - pos: -19.5,1.5 - parent: 12 - - uid: 16526 - components: - - type: Transform - pos: -19.5,0.5 - parent: 12 - uid: 16527 components: - type: Transform @@ -165644,6 +166714,11 @@ entities: - type: Transform pos: -21.5,1.5 parent: 12 + - uid: 16689 + components: + - type: Transform + pos: -25.5,0.5 + parent: 12 - uid: 17390 components: - type: Transform @@ -165739,6 +166814,23 @@ entities: - type: Transform pos: -42.5,21.5 parent: 12 + - uid: 19666 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,73.5 + parent: 12 + - uid: 19674 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,78.5 + parent: 12 + - uid: 19675 + components: + - type: Transform + pos: -7.5,78.5 + parent: 12 - uid: 21432 components: - type: Transform @@ -165849,6 +166941,40 @@ entities: rot: -1.5707963267948966 rad pos: -55.5,-14.5 parent: 12 + - uid: 30285 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,72.5 + parent: 12 + - uid: 30308 + components: + - type: Transform + pos: -7.5,77.5 + parent: 12 + - uid: 30310 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,77.5 + parent: 12 + - uid: 30312 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,78.5 + parent: 12 + - uid: 30313 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,77.5 + parent: 12 + - uid: 30321 + components: + - type: Transform + pos: -14.5,73.5 + parent: 12 - proto: TargetClown entities: - uid: 22647 @@ -166314,8 +167440,7 @@ entities: - uid: 8880 components: - type: Transform - rot: -31.415926535897945 rad - pos: 60.635223,-18.674908 + pos: 60.595146,-18.256506 parent: 12 - uid: 9251 components: @@ -166417,8 +167542,7 @@ entities: - uid: 8875 components: - type: Transform - rot: -31.415926535897945 rad - pos: 60.526505,-18.45204 + pos: 60.386814,-18.548174 parent: 12 - uid: 9252 components: @@ -166606,17 +167730,17 @@ entities: parent: 12 - proto: ToyFigurineLawyer entities: - - uid: 13018 + - uid: 21512 components: - type: Transform - pos: -24.507706,34.6647 + pos: -22.049986,1.6989818 parent: 12 - proto: ToyFigurineLibrarian entities: - - uid: 23531 + - uid: 19651 components: - type: Transform - pos: 4.5918107,70.65668 + pos: -14.046109,73.55794 parent: 12 - proto: ToyFigurineMedicalDoctor entities: @@ -166674,6 +167798,13 @@ entities: - type: Transform pos: -36.515564,37.74329 parent: 12 +- proto: ToyFigurineSpaceDragon + entities: + - uid: 30387 + components: + - type: Transform + pos: -7.5318594,78.67872 + parent: 12 - proto: ToyFigurineWarden entities: - uid: 23416 @@ -166695,6 +167826,13 @@ entities: - type: Transform pos: -42.788445,21.45383 parent: 12 +- proto: ToyRipley + entities: + - uid: 30399 + components: + - type: Transform + pos: -10.483892,77.98857 + parent: 12 - proto: ToyRubberDuck entities: - uid: 22045 @@ -166719,6 +167857,11 @@ entities: - type: Transform pos: -14.5,20.5 parent: 12 + - uid: 30314 + components: + - type: Transform + pos: -10.5,77.5 + parent: 12 - proto: ToySword entities: - uid: 6295 @@ -167710,6 +168853,13 @@ entities: - type: Transform pos: 29.5,53.5 parent: 12 +- proto: VendingMachineCuraDrobe + entities: + - uid: 30397 + components: + - type: Transform + pos: -15.5,71.5 + parent: 12 - proto: VendingMachineDetDrobe entities: - uid: 13626 @@ -167821,6 +168971,11 @@ entities: - type: Transform pos: 44.5,39.5 parent: 12 + - uid: 19681 + components: + - type: Transform + pos: -4.5,78.5 + parent: 12 - uid: 21392 components: - type: Transform @@ -167852,6 +169007,13 @@ entities: - type: Transform pos: 45.5,21.5 parent: 12 +- proto: VendingMachineLawDrobe + entities: + - uid: 30267 + components: + - type: Transform + pos: -24.5,0.5 + parent: 12 - proto: VendingMachineMedical entities: - uid: 2471 @@ -168166,6 +169328,13 @@ entities: - type: Transform pos: 43.5,49.5 parent: 12 +- proto: ViolaInstrument + entities: + - uid: 30418 + components: + - type: Transform + pos: -6.552923,72.52522 + parent: 12 - proto: WallmountTelescreen entities: - uid: 13618 @@ -175952,11 +177121,6 @@ entities: rot: 3.141592653589793 rad pos: 39.5,-3.5 parent: 12 - - uid: 18896 - components: - - type: Transform - pos: -16.5,70.5 - parent: 12 - uid: 19021 components: - type: Transform @@ -176633,12 +177797,6 @@ entities: rot: 3.141592653589793 rad pos: 15.5,20.5 parent: 12 - - uid: 19458 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,73.5 - parent: 12 - uid: 19507 components: - type: Transform @@ -176860,40 +178018,20 @@ entities: - type: Transform pos: -20.5,69.5 parent: 12 - - uid: 19631 - components: - - type: Transform - pos: -16.5,71.5 - parent: 12 - - uid: 19633 - components: - - type: Transform - pos: -15.5,70.5 - parent: 12 - - uid: 19634 - components: - - type: Transform - pos: -14.5,70.5 - parent: 12 - - uid: 19635 - components: - - type: Transform - pos: -13.5,70.5 - parent: 12 - - uid: 19681 + - uid: 19646 components: - type: Transform - pos: -5.5,70.5 + pos: -13.5,74.5 parent: 12 - - uid: 19783 + - uid: 19648 components: - type: Transform - pos: -3.5,70.5 + pos: -15.5,74.5 parent: 12 - - uid: 19784 + - uid: 19656 components: - type: Transform - pos: -4.5,70.5 + pos: 4.5,71.5 parent: 12 - uid: 19785 components: @@ -177938,11 +179076,6 @@ entities: rot: 1.5707963267948966 rad pos: -57.5,-28.5 parent: 12 - - uid: 26288 - components: - - type: Transform - pos: -16.5,72.5 - parent: 12 - uid: 26355 components: - type: Transform @@ -179421,12 +180554,6 @@ entities: - type: Transform pos: 28.5,19.5 parent: 12 - - uid: 12332 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,70.5 - parent: 12 - uid: 13859 components: - type: Transform @@ -179769,12 +180896,6 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-0.5 parent: 12 - - uid: 417 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,0.5 - parent: 12 - uid: 420 components: - type: Transform @@ -179805,12 +180926,6 @@ entities: rot: 3.141592653589793 rad pos: -23.5,3.5 parent: 12 - - uid: 425 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,3.5 - parent: 12 - uid: 428 components: - type: Transform @@ -181997,12 +183112,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,24.5 parent: 12 - - uid: 7822 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,24.5 - parent: 12 - uid: 7823 components: - type: Transform @@ -182102,12 +183211,6 @@ entities: rot: -1.5707963267948966 rad pos: -25.5,24.5 parent: 12 - - uid: 9702 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,24.5 - parent: 12 - uid: 9736 components: - type: Transform @@ -182203,12 +183306,6 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,4.5 parent: 12 - - uid: 10271 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,5.5 - parent: 12 - uid: 10272 components: - type: Transform @@ -182958,12 +184055,6 @@ entities: - type: Transform pos: 39.5,26.5 parent: 12 - - uid: 11682 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,31.5 - parent: 12 - uid: 11683 components: - type: Transform @@ -183169,12 +184260,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,32.5 parent: 12 - - uid: 11855 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,31.5 - parent: 12 - uid: 11881 components: - type: Transform @@ -184529,6 +185614,11 @@ entities: - type: Transform pos: 0.5,42.5 parent: 12 + - uid: 16518 + components: + - type: Transform + pos: 2.5,68.5 + parent: 12 - uid: 16637 components: - type: Transform @@ -185067,6 +186157,11 @@ entities: - type: Transform pos: -6.5,70.5 parent: 12 + - uid: 19658 + components: + - type: Transform + pos: 2.5,70.5 + parent: 12 - uid: 19682 components: - type: Transform @@ -185447,21 +186542,11 @@ entities: - type: Transform pos: -2.5,66.5 parent: 12 - - uid: 19792 - components: - - type: Transform - pos: 3.5,70.5 - parent: 12 - uid: 19794 components: - type: Transform pos: 3.5,67.5 parent: 12 - - uid: 19795 - components: - - type: Transform - pos: 3.5,68.5 - parent: 12 - uid: 19796 components: - type: Transform @@ -185514,6 +186599,12 @@ entities: - type: Transform pos: -11.5,47.5 parent: 12 + - uid: 21508 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,70.5 + parent: 12 - uid: 21694 components: - type: Transform @@ -185596,6 +186687,12 @@ entities: - type: Transform pos: -4.5,-24.5 parent: 12 + - uid: 22391 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,70.5 + parent: 12 - uid: 22710 components: - type: Transform @@ -185635,6 +186732,12 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,60.5 parent: 12 + - uid: 23531 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,70.5 + parent: 12 - uid: 23654 components: - type: Transform @@ -185671,11 +186774,23 @@ entities: - type: Transform pos: 1.5,-24.5 parent: 12 + - uid: 24375 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,70.5 + parent: 12 - uid: 24379 components: - type: Transform pos: -51.5,-41.5 parent: 12 + - uid: 24550 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,71.5 + parent: 12 - uid: 24699 components: - type: Transform @@ -185696,6 +186811,12 @@ entities: - type: Transform pos: -1.5,21.5 parent: 12 + - uid: 24892 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,72.5 + parent: 12 - uid: 25023 components: - type: Transform @@ -185717,6 +186838,11 @@ entities: - type: Transform pos: 53.5,9.5 parent: 12 + - uid: 25350 + components: + - type: Transform + pos: -4.5,70.5 + parent: 12 - uid: 25402 components: - type: Transform @@ -185829,6 +186955,11 @@ entities: - type: Transform pos: 4.5,-56.5 parent: 12 + - uid: 25719 + components: + - type: Transform + pos: -5.5,70.5 + parent: 12 - uid: 25745 components: - type: Transform @@ -185840,6 +186971,17 @@ entities: rot: 3.141592653589793 rad pos: -46.5,62.5 parent: 12 + - uid: 25900 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,73.5 + parent: 12 + - uid: 25901 + components: + - type: Transform + pos: -2.5,70.5 + parent: 12 - uid: 26184 components: - type: Transform @@ -186055,6 +187197,29 @@ entities: rot: 3.141592653589793 rad pos: 51.5,64.5 parent: 12 + - uid: 27255 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,24.5 + parent: 12 + - uid: 27260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,31.5 + parent: 12 + - uid: 28550 + components: + - type: Transform + pos: 2.5,24.5 + parent: 12 + - uid: 29273 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,31.5 + parent: 12 - proto: WallSolidRust entities: - uid: 1878 @@ -186794,6 +187959,11 @@ entities: - type: Transform pos: 59.5,9.5 parent: 12 + - uid: 30433 + components: + - type: Transform + pos: 4.5,67.5 + parent: 12 - proto: WarningO2 entities: - uid: 27183 @@ -187197,8 +188367,7 @@ entities: - uid: 8879 components: - type: Transform - rot: -31.415926535897945 rad - pos: 60.265587,-18.370502 + pos: 61.386814,-18.329424 parent: 12 - uid: 16476 components: @@ -187362,6 +188531,11 @@ entities: - type: Transform pos: -4.5,-23.5 parent: 12 + - uid: 30402 + components: + - type: Transform + pos: 62.5,-18.5 + parent: 12 - proto: WetFloorSign entities: - uid: 12247 @@ -188017,6 +189191,14 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,-19.5 parent: 12 +- proto: WindoorSecureSecurityLawyerLocked + entities: + - uid: 30270 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,1.5 + parent: 12 - proto: WindoorSecureSecurityLocked entities: - uid: 2956 @@ -188098,6 +189280,12 @@ entities: rot: 3.141592653589793 rad pos: 11.5,36.5 parent: 12 + - uid: 30396 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,71.5 + parent: 12 - proto: Window entities: - uid: 291 @@ -188129,6 +189317,11 @@ entities: rot: 3.141592653589793 rad pos: -25.5,-2.5 parent: 12 + - uid: 425 + components: + - type: Transform + pos: -20.5,3.5 + parent: 12 - uid: 427 components: - type: Transform @@ -188419,6 +189612,11 @@ entities: - type: Transform pos: -0.5,37.5 parent: 12 + - uid: 11855 + components: + - type: Transform + pos: -22.5,3.5 + parent: 12 - uid: 11893 components: - type: Transform @@ -189062,6 +190260,11 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-13.5 parent: 12 + - uid: 30322 + components: + - type: Transform + pos: -13.5,72.5 + parent: 12 - proto: WindowFrostedDirectional entities: - uid: 4236 @@ -189909,6 +191112,12 @@ entities: rot: 3.141592653589793 rad pos: -32.5,65.5 parent: 12 + - uid: 21504 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,1.5 + parent: 12 - uid: 21649 components: - type: Transform @@ -190187,6 +191396,24 @@ entities: rot: -1.5707963267948966 rad pos: -28.5,65.5 parent: 12 + - uid: 30344 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,70.5 + parent: 12 + - uid: 30345 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,69.5 + parent: 12 + - uid: 30346 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,68.5 + parent: 12 - proto: Wirecutter entities: - uid: 8737 diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 7d77147e2109f5..a2b19e4e9b81c8 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -1092,6 +1092,8 @@ entities: 8115: 76,-4 8656: 87,-20 8727: -13,35 + 8730: 17,-31 + 8731: 16,-31 - node: cleanable: True color: '#FFFFFFFF' @@ -4498,6 +4500,8 @@ entities: 7933: 22,-23 8144: 22,7 8611: -11,8 + 8728: 19,-31 + 8729: 18,-31 - node: cleanable: True color: '#FFFFFFFF' @@ -21329,6 +21333,13 @@ entities: - type: Transform pos: 41.59153,-33.7406 parent: 13329 +- proto: AntimovCircuitBoard + entities: + - uid: 35743 + components: + - type: Transform + pos: 107.49631,52.741814 + parent: 13329 - proto: AntiPoisonMedipen entities: - uid: 35283 @@ -22262,6 +22273,13 @@ entities: - type: Transform pos: -14.5,27.5 parent: 13329 +- proto: ArtistCircuitBoard + entities: + - uid: 35744 + components: + - type: Transform + pos: 107.54318,52.53869 + parent: 13329 - proto: Ash entities: - uid: 12138 @@ -22282,6 +22300,13 @@ entities: rot: 3.141592653589793 rad pos: -14.295727,0.49568367 parent: 13329 +- proto: AsimovCircuitBoard + entities: + - uid: 35742 + components: + - type: Transform + pos: 108.57443,52.554314 + parent: 13329 - proto: AsteroidRock entities: - uid: 1212 @@ -96553,6 +96578,20 @@ entities: rot: 1.5707963267948966 rad pos: 58.5,36.5 parent: 13329 +- proto: CommandmentCircuitBoard + entities: + - uid: 35773 + components: + - type: Transform + pos: 108.71506,46.35119 + parent: 13329 +- proto: CommsComputerCircuitboard + entities: + - uid: 30659 + components: + - type: Transform + pos: 61.5,2.5 + parent: 13329 - proto: ComputerAlert entities: - uid: 13059 @@ -96970,17 +97009,6 @@ entities: rot: -1.5707963267948966 rad pos: 45.5,40.5 parent: 13329 - - uid: 35746 - components: - - type: Transform - pos: 108.5,50.5 - parent: 13329 - - uid: 35747 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 108.5,48.5 - parent: 13329 - proto: ComputerId entities: - uid: 30663 @@ -97691,6 +97719,13 @@ entities: rot: 1.5707963267948966 rad pos: 131.5,-3.5 parent: 13329 +- proto: CorporateCircuitBoard + entities: + - uid: 35745 + components: + - type: Transform + pos: 108.44943,52.710564 + parent: 13329 - proto: CrateAirlockKit entities: - uid: 13122 @@ -100851,6 +100886,18 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,-2.5 parent: 13329 + - uid: 35777 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 82.5,53.5 + parent: 13329 + - uid: 35778 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 82.5,50.5 + parent: 13329 - proto: DisposalJunction entities: - uid: 965 @@ -101126,6 +101173,11 @@ entities: rot: 3.141592653589793 rad pos: 24.5,-2.5 parent: 13329 + - uid: 11680 + components: + - type: Transform + pos: 79.5,50.5 + parent: 13329 - uid: 14826 components: - type: Transform @@ -107082,11 +107134,6 @@ entities: - type: Transform pos: 79.5,51.5 parent: 13329 - - uid: 30659 - components: - - type: Transform - pos: 79.5,50.5 - parent: 13329 - uid: 31215 components: - type: Transform @@ -108701,6 +108748,30 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,7.5 parent: 13329 + - uid: 35779 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 80.5,50.5 + parent: 13329 + - uid: 35780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 81.5,50.5 + parent: 13329 + - uid: 35781 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 82.5,51.5 + parent: 13329 + - uid: 35782 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 82.5,52.5 + parent: 13329 - proto: DisposalRouter entities: - uid: 11006 @@ -109260,6 +109331,12 @@ entities: rot: 1.5707963267948966 rad pos: 22.5,7.5 parent: 13329 + - uid: 35776 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 83.5,53.5 + parent: 13329 - proto: DisposalUnit entities: - uid: 941 @@ -110351,6 +110428,13 @@ entities: - type: Transform pos: 21.596437,36.347313 parent: 13329 +- proto: DungeonMasterCircuitBoard + entities: + - uid: 35741 + components: + - type: Transform + pos: 109.38693,52.710564 + parent: 13329 - proto: EmergencyLight entities: - uid: 11013 @@ -112679,20 +112763,10 @@ entities: locked: False - proto: FireExtinguisher entities: - - uid: 11680 - components: - - type: Transform - pos: 18.309164,-24.290554 - parent: 13329 - - uid: 11681 - components: - - type: Transform - pos: 18.51229,-24.30618 - parent: 13329 - - uid: 11682 + - uid: 26361 components: - type: Transform - pos: 18.652914,-24.321804 + pos: 19.307037,-32.340736 parent: 13329 - uid: 33568 components: @@ -112709,6 +112783,16 @@ entities: - type: Transform pos: 47.63708,38.801556 parent: 13329 + - uid: 35783 + components: + - type: Transform + pos: 19.478912,-32.403236 + parent: 13329 + - uid: 35784 + components: + - type: Transform + pos: 19.650787,-32.48136 + parent: 13329 - proto: FirelockEdge entities: - uid: 31573 @@ -154606,6 +154690,13 @@ entities: - type: Transform pos: 60.5,-22.5 parent: 13329 +- proto: GlassBoxLaserFilled + entities: + - uid: 35746 + components: + - type: Transform + pos: 83.5,47.5 + parent: 13329 - proto: GlowstickBase entities: - uid: 32201 @@ -161933,6 +162024,13 @@ entities: - type: Transform pos: 49.5,20.5 parent: 13329 +- proto: IDComputerCircuitboard + entities: + - uid: 30700 + components: + - type: Transform + pos: 59.5,2.5 + parent: 13329 - proto: IngotGold entities: - uid: 30759 @@ -161991,6 +162089,18 @@ entities: - type: Transform pos: 10.353264,25.591267 parent: 13329 +- proto: Intellicard + entities: + - uid: 35774 + components: + - type: Transform + pos: 105.41663,54.620724 + parent: 13329 + - uid: 35775 + components: + - type: Transform + pos: 105.57288,54.4801 + parent: 13329 - proto: IntercomAll entities: - uid: 35380 @@ -162710,6 +162820,13 @@ entities: - type: Transform pos: 81.46681,-24.3054 parent: 13329 +- proto: LiveLetLiveCircuitBoard + entities: + - uid: 35740 + components: + - type: Transform + pos: 109.51193,52.554314 + parent: 13329 - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 23864 @@ -162869,31 +162986,13 @@ entities: - 0 - 0 - 0 -- proto: LockerCaptainFilled +- proto: LockerCaptainFilledNoLaser entities: - - uid: 30691 + - uid: 26362 components: - type: Transform pos: 80.5,51.5 parent: 13329 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1495 - moles: - - 3.0981817 - - 11.655066 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: LockerChemistryFilled entities: - uid: 18361 @@ -166268,6 +166367,13 @@ entities: - type: Transform pos: -40.35339,61.37836 parent: 13329 +- proto: NTDefaultCircuitBoard + entities: + - uid: 35767 + components: + - type: Transform + pos: 107.49631,46.60119 + parent: 13329 - proto: NuclearBomb entities: - uid: 30730 @@ -166287,6 +166393,13 @@ entities: - type: Transform pos: 46.5,-7.5 parent: 13329 +- proto: NutimovCircuitBoard + entities: + - uid: 35768 + components: + - type: Transform + pos: 107.57443,46.491814 + parent: 13329 - proto: OnionSeeds entities: - uid: 1789 @@ -166326,6 +166439,18 @@ entities: - type: Transform pos: 63.5,-52.5 parent: 13329 +- proto: OreBox + entities: + - uid: 30691 + components: + - type: Transform + pos: 18.5,-30.5 + parent: 13329 + - uid: 35785 + components: + - type: Transform + pos: 19.5,-30.5 + parent: 13329 - proto: OreProcessor entities: - uid: 11509 @@ -166333,6 +166458,13 @@ entities: - type: Transform pos: 13.5,-28.5 parent: 13329 +- proto: OverlordCircuitBoard + entities: + - uid: 35769 + components: + - type: Transform + pos: 108.49631,46.60119 + parent: 13329 - proto: OxygenCanister entities: - uid: 6546 @@ -166588,6 +166720,13 @@ entities: - type: Transform pos: -11.5,52.5 parent: 13329 +- proto: PaladinCircuitBoard + entities: + - uid: 35770 + components: + - type: Transform + pos: 108.62131,46.47619 + parent: 13329 - proto: Paper entities: - uid: 10318 @@ -167372,6 +167511,13 @@ entities: - type: Transform pos: 96.5,1.5 parent: 13329 +- proto: PlayerStationAi + entities: + - uid: 35747 + components: + - type: Transform + pos: 124.5,49.5 + parent: 13329 - proto: Plunger entities: - uid: 18924 @@ -171847,6 +171993,12 @@ entities: parent: 13329 - type: ApcPowerReceiver powerLoad: 0 + - uid: 35766 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 123.5,49.5 + parent: 13329 - proto: PoweredlightExterior entities: - uid: 34307 @@ -174201,6 +174353,13 @@ entities: - type: Transform pos: 54.5,-16.5 parent: 13329 +- proto: ProtolatheMachineCircuitboard + entities: + - uid: 26590 + components: + - type: Transform + pos: 60.5,2.5 + parent: 13329 - proto: PuddleSmear entities: - uid: 31661 @@ -174388,10 +174547,10 @@ entities: - type: Transform pos: 21.5,-27.5 parent: 13329 - - uid: 11679 + - uid: 11682 components: - type: Transform - pos: 18.5,-24.5 + pos: 19.5,-32.5 parent: 13329 - uid: 11789 components: @@ -174605,11 +174764,6 @@ entities: - type: Transform pos: 60.5,-1.5 parent: 13329 - - uid: 26590 - components: - - type: Transform - pos: 59.5,1.5 - parent: 13329 - uid: 26591 components: - type: Transform @@ -174618,7 +174772,7 @@ entities: - uid: 26592 components: - type: Transform - pos: 61.5,1.5 + pos: 60.5,2.5 parent: 13329 - uid: 26593 components: @@ -176563,11 +176717,6 @@ entities: parent: 13329 - proto: RandomBoard entities: - - uid: 4973 - components: - - type: Transform - pos: 59.5,2.5 - parent: 13329 - uid: 16650 components: - type: Transform @@ -176583,21 +176732,6 @@ entities: - type: Transform pos: 58.5,-4.5 parent: 13329 - - uid: 26361 - components: - - type: Transform - pos: 61.5,1.5 - parent: 13329 - - uid: 26362 - components: - - type: Transform - pos: 59.5,1.5 - parent: 13329 - - uid: 26363 - components: - - type: Transform - pos: 61.5,2.5 - parent: 13329 - uid: 26364 components: - type: Transform @@ -176608,36 +176742,6 @@ entities: - type: Transform pos: 58.5,-3.5 parent: 13329 - - uid: 35740 - components: - - type: Transform - pos: 107.5,46.5 - parent: 13329 - - uid: 35741 - components: - - type: Transform - pos: 108.5,46.5 - parent: 13329 - - uid: 35742 - components: - - type: Transform - pos: 109.5,46.5 - parent: 13329 - - uid: 35743 - components: - - type: Transform - pos: 109.5,52.5 - parent: 13329 - - uid: 35744 - components: - - type: Transform - pos: 108.5,52.5 - parent: 13329 - - uid: 35745 - components: - - type: Transform - pos: 107.5,52.5 - parent: 13329 - proto: RandomDrinkBottle entities: - uid: 34065 @@ -177679,6 +177783,12 @@ entities: parent: 13329 - proto: Recycler entities: + - uid: 26363 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-24.5 + parent: 13329 - uid: 27052 components: - type: Transform @@ -182091,6 +182201,13 @@ entities: - type: Transform pos: 19.173515,13.383953 parent: 13329 +- proto: RobocopCircuitBoard + entities: + - uid: 35771 + components: + - type: Transform + pos: 109.40256,46.60119 + parent: 13329 - proto: RockGuitarInstrument entities: - uid: 1374 @@ -182655,11 +182772,6 @@ entities: - type: Transform pos: 52.5,-4.5 parent: 13329 - - uid: 30700 - components: - - type: Transform - pos: 83.5,47.5 - parent: 13329 - proto: ShowcaseRobotAntique entities: - uid: 26065 @@ -189356,6 +189468,19 @@ entities: - type: Transform pos: 21.5,49.5 parent: 13329 +- proto: StationAiUploadComputer + entities: + - uid: 4973 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 108.5,48.5 + parent: 13329 + - uid: 11679 + components: + - type: Transform + pos: 108.5,50.5 + parent: 13329 - proto: StationAnchor entities: - uid: 15776 @@ -189363,6 +189488,13 @@ entities: - type: Transform pos: 100.5,-22.5 parent: 13329 +- proto: StationEfficiencyCircuitBoard + entities: + - uid: 35772 + components: + - type: Transform + pos: 109.46506,46.460564 + parent: 13329 - proto: StationMap entities: - uid: 27930 @@ -199043,6 +199175,17 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 11681 + components: + - type: Transform + pos: 18.5,-25.5 + parent: 13329 + - type: DeviceLinkSource + linkedPorts: + 26363: + - Left: Forward + - Right: Reverse + - Middle: Off - uid: 11835 components: - type: Transform diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 69a2e05d07d26b..8b380f52ab453f 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -242,7 +242,7 @@ entities: version: 6 -2,-4: ind: -2,-4 - tiles: AAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAAAZgAAAAAAZgAAAAAAZgAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAZgAAAAAAZgAAAAAAZgAAAAAAHwAAAAAAfQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAA + tiles: AAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAHwAAAAAAZgAAAAAAZgAAAAAAZgAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAZgAAAAAAZgAAAAAAZgAAAAAAHwAAAAAAfQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAA version: 6 -1,-4: ind: -1,-4 @@ -6357,18 +6357,18 @@ entities: 2: 34952 6,-6: 2: 61440 - 6: 224 + 4: 224 6,-5: 0: 112 2: 2184 6,-8: 3: 224 - 4: 57344 - 6,-7: - 4: 224 5: 57344 + 6,-7: + 5: 224 + 6: 57344 6,-9: - 4: 57568 + 5: 57568 7,-5: 2: 4080 7,-6: @@ -7408,7 +7408,7 @@ entities: temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -7422,7 +7422,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -7437,7 +7437,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - 6666.982 - 0 - 0 @@ -7449,6 +7448,7 @@ entities: - 0 - 0 - 0 + - 0 chunkSize: 4 - type: BecomesStation id: Marathon @@ -9100,6 +9100,11 @@ entities: parent: 30 - proto: AirlockCargoGlassLocked entities: + - uid: 8445 + components: + - type: Transform + pos: 18.5,-10.5 + parent: 30 - uid: 8493 components: - type: Transform @@ -9117,11 +9122,6 @@ entities: parent: 30 - proto: AirlockCargoLocked entities: - - uid: 8439 - components: - - type: Transform - pos: 18.5,-10.5 - parent: 30 - uid: 8440 components: - type: Transform @@ -10962,7 +10962,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -25479.396 + secondsUntilStateChange: -26759.072 state: Opening - type: DeviceLinkSource lastSignals: @@ -11829,6 +11829,13 @@ entities: - type: Transform pos: 30.41268,23.594774 parent: 30 +- proto: AntimovCircuitBoard + entities: + - uid: 14278 + components: + - type: Transform + pos: -3.6568027,64.79637 + parent: 30 - proto: APCBasic entities: - uid: 406 @@ -12331,6 +12338,13 @@ entities: - type: Transform pos: -58.5,-51.5 parent: 30 +- proto: ArtistCircuitBoard + entities: + - uid: 21590 + components: + - type: Transform + pos: -3.5786777,64.67137 + parent: 30 - proto: Ash entities: - uid: 21304 @@ -12338,6 +12352,13 @@ entities: - type: Transform pos: -28.507416,-46.550377 parent: 30 +- proto: AsimovCircuitBoard + entities: + - uid: 21606 + components: + - type: Transform + pos: -3.4068027,64.40575 + parent: 30 - proto: AsteroidRock entities: - uid: 332 @@ -13339,13 +13360,6 @@ entities: - type: Transform pos: 0.45584083,35.550472 parent: 30 -- proto: BannerCargo - entities: - - uid: 12233 - components: - - type: Transform - pos: 16.5,-9.5 - parent: 30 - proto: BannerNanotrasen entities: - uid: 5830 @@ -13567,6 +13581,11 @@ entities: - type: Transform pos: -32.5,-13.5 parent: 30 + - uid: 7427 + components: + - type: Transform + pos: 17.5,-11.5 + parent: 30 - uid: 11628 components: - type: Transform @@ -14415,11 +14434,6 @@ entities: - type: Transform pos: -82.48828,-46.34675 parent: 30 - - uid: 20277 - components: - - type: Transform - pos: 1.5,75.5 - parent: 30 - proto: BoxFolderBlue entities: - uid: 1519 @@ -48147,11 +48161,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-2.5 parent: 30 - - uid: 11821 - components: - - type: Transform - pos: 16.5,-11.5 - parent: 30 - uid: 13631 components: - type: Transform @@ -48513,6 +48522,12 @@ entities: rot: 3.141592653589793 rad pos: 46.5,35.5 parent: 30 + - uid: 21581 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-11.5 + parent: 30 - uid: 21683 components: - type: Transform @@ -49571,6 +49586,13 @@ entities: - type: Transform pos: -6.553257,-1.4022884 parent: 30 +- proto: CigaretteSpent + entities: + - uid: 21198 + components: + - type: Transform + pos: 16.88813,-11.14423 + parent: 30 - proto: CigaretteSyndicate entities: - uid: 21099 @@ -49924,29 +49946,6 @@ entities: - 0 - 0 - 0 - - uid: 11820 - components: - - type: Transform - pos: 17.5,-11.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 12817 components: - type: Transform @@ -52091,13 +52090,6 @@ entities: parent: 30 missingComponents: - NoSlip -- proto: ClothingShoesLeather - entities: - - uid: 5062 - components: - - type: Transform - pos: -21.532825,34.204502 - parent: 30 - proto: ClothingShoeSlippersDuck entities: - uid: 11363 @@ -52643,6 +52635,20 @@ entities: - type: Transform pos: 39.5,41.5 parent: 30 +- proto: CommandmentCircuitBoard + entities: + - uid: 21677 + components: + - type: Transform + pos: -3.7193027,63.17137 + parent: 30 +- proto: CommsComputerCircuitboard + entities: + - uid: 21752 + components: + - type: Transform + pos: 4.5152993,20.523428 + parent: 30 - proto: ComputerAlert entities: - uid: 5811 @@ -52838,20 +52844,6 @@ entities: - type: Transform pos: -17.5,-0.5 parent: 30 -- proto: ComputerFrame - entities: - - uid: 21198 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,62.5 - parent: 30 - - uid: 21199 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,64.5 - parent: 30 - proto: ComputerId entities: - uid: 5032 @@ -53311,6 +53303,13 @@ entities: - type: Transform pos: -45.547333,69.512 parent: 30 +- proto: CorporateCircuitBoard + entities: + - uid: 21605 + components: + - type: Transform + pos: -3.4849277,64.54637 + parent: 30 - proto: CowToolboxFilled entities: - uid: 12309 @@ -54924,6 +54923,24 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-34.5 parent: 30 + - uid: 21688 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,39.5 + parent: 30 + - uid: 21693 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,37.5 + parent: 30 + - uid: 21744 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,37.5 + parent: 30 - uid: 22117 components: - type: Transform @@ -55147,6 +55164,12 @@ entities: rot: 3.141592653589793 rad pos: -21.5,-14.5 parent: 30 + - uid: 12233 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,39.5 + parent: 30 - uid: 13888 components: - type: Transform @@ -57648,12 +57671,6 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,39.5 parent: 30 - - uid: 14278 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,39.5 - parent: 30 - uid: 14279 components: - type: Transform @@ -58578,6 +58595,83 @@ entities: rot: 3.141592653589793 rad pos: -13.5,-41.5 parent: 30 + - uid: 21694 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,38.5 + parent: 30 + - uid: 21695 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,37.5 + parent: 30 + - uid: 21696 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,37.5 + parent: 30 + - uid: 21697 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,37.5 + parent: 30 + - uid: 21704 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,37.5 + parent: 30 + - uid: 21710 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,37.5 + parent: 30 + - uid: 21733 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,37.5 + parent: 30 + - uid: 21738 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,37.5 + parent: 30 + - uid: 21739 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,37.5 + parent: 30 + - uid: 21740 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,37.5 + parent: 30 + - uid: 21741 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,37.5 + parent: 30 + - uid: 21742 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -18.5,37.5 + parent: 30 + - uid: 21743 + components: + - type: Transform + pos: -14.5,38.5 + parent: 30 - uid: 22109 components: - type: Transform @@ -59226,6 +59320,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-5.5 parent: 30 + - uid: 11820 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,39.5 + parent: 30 - uid: 12793 components: - type: Transform @@ -60147,6 +60247,13 @@ entities: - type: Transform pos: 24.571924,11.2297535 parent: 30 +- proto: DungeonMasterCircuitBoard + entities: + - uid: 21609 + components: + - type: Transform + pos: -3.6880527,63.936996 + parent: 30 - proto: ElectricGuitarInstrument entities: - uid: 742 @@ -88835,6 +88942,13 @@ entities: - type: Transform pos: 43.5,29.5 parent: 30 +- proto: GlassBoxLaserFilled + entities: + - uid: 21687 + components: + - type: Transform + pos: -21.5,34.5 + parent: 30 - proto: GlowstickRed entities: - uid: 10025 @@ -95804,6 +95918,13 @@ entities: - type: Transform pos: -25.5,9.5 parent: 30 +- proto: IDComputerCircuitboard + entities: + - uid: 21751 + components: + - type: Transform + pos: 4.5152993,20.632803 + parent: 30 - proto: InflatableDoorStack entities: - uid: 9249 @@ -97781,6 +97902,13 @@ entities: - type: Transform pos: -63.5,-57.5 parent: 30 +- proto: LiveLetLiveCircuitBoard + entities: + - uid: 21617 + components: + - type: Transform + pos: -3.5786777,63.79637 + parent: 30 - proto: LockerAtmosphericsFilled entities: - uid: 9079 @@ -97994,9 +98122,9 @@ entities: - 0 - 0 - 0 -- proto: LockerCaptainFilledHardsuit +- proto: LockerCaptainFilledNoLaser entities: - - uid: 1440 + - uid: 12238 components: - type: Transform pos: -17.5,32.5 @@ -99384,6 +99512,13 @@ entities: - type: Transform pos: -27.508644,-31.559082 parent: 30 +- proto: MechEquipmentGrabberSmall + entities: + - uid: 1440 + components: + - type: Transform + pos: 17.5,-9.5 + parent: 30 - proto: MedicalBed entities: - uid: 7422 @@ -99980,6 +100115,13 @@ entities: - type: Transform pos: 18.5,-16.5 parent: 30 +- proto: NTDefaultCircuitBoard + entities: + - uid: 21650 + components: + - type: Transform + pos: -3.4380527,63.655746 + parent: 30 - proto: NuclearBomb entities: - uid: 5607 @@ -99987,6 +100129,13 @@ entities: - type: Transform pos: 5.5,43.5 parent: 30 +- proto: NutimovCircuitBoard + entities: + - uid: 21651 + components: + - type: Transform + pos: -3.3286777,63.51512 + parent: 30 - proto: OatSeeds entities: - uid: 19547 @@ -100023,6 +100172,18 @@ entities: - type: Transform pos: 18.5,18.5 parent: 30 +- proto: OreBox + entities: + - uid: 21754 + components: + - type: Transform + pos: 30.5,-11.5 + parent: 30 + - uid: 21757 + components: + - type: Transform + pos: 29.5,-11.5 + parent: 30 - proto: OreProcessor entities: - uid: 1832 @@ -100038,6 +100199,13 @@ entities: - Uranium - Gold - Silver +- proto: OverlordCircuitBoard + entities: + - uid: 21652 + components: + - type: Transform + pos: -3.6255527,62.936996 + parent: 30 - proto: OxygenCanister entities: - uid: 778 @@ -100260,6 +100428,13 @@ entities: - type: Transform pos: 0.5,34.5 parent: 30 +- proto: PaladinCircuitBoard + entities: + - uid: 21673 + components: + - type: Transform + pos: -3.5161777,62.811996 + parent: 30 - proto: Paper entities: - uid: 1086 @@ -100452,11 +100627,6 @@ entities: - type: Transform pos: -72.49536,-65.49479 parent: 30 - - uid: 20278 - components: - - type: Transform - pos: 1.5,75.5 - parent: 30 - uid: 21714 components: - type: Transform @@ -100899,6 +101069,13 @@ entities: - type: Transform pos: 48.5,25.5 parent: 30 +- proto: PlayerStationAi + entities: + - uid: 21587 + components: + - type: Transform + pos: -0.5,82.5 + parent: 30 - proto: PlushieCarp entities: - uid: 17654 @@ -103989,13 +104166,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 12227 - components: - - type: Transform - pos: 17.5,-9.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 12229 components: - type: Transform @@ -105921,6 +106091,11 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 20273 + components: + - type: Transform + pos: 17.5,-9.5 + parent: 30 - uid: 20285 components: - type: Transform @@ -106051,6 +106226,13 @@ entities: - Plastic - Wood - Gold +- proto: ProtolatheMachineCircuitboard + entities: + - uid: 21753 + components: + - type: Transform + pos: 4.5309243,20.382803 + parent: 30 - proto: PsychBed entities: - uid: 6285 @@ -106328,6 +106510,11 @@ entities: - type: Transform pos: -16.5,-26.5 parent: 30 + - uid: 20277 + components: + - type: Transform + pos: 4.5,20.5 + parent: 30 - uid: 20298 components: - type: Transform @@ -106368,11 +106555,6 @@ entities: - type: Transform pos: 33.5,28.5 parent: 30 - - uid: 22449 - components: - - type: Transform - pos: 4.5,20.5 - parent: 30 - proto: RadiationCollectorFullTank entities: - uid: 9419 @@ -106579,11 +106761,6 @@ entities: - type: Transform pos: 2.5,23.5 parent: 30 - - uid: 7427 - components: - - type: Transform - pos: 4.5,20.5 - parent: 30 - uid: 9791 components: - type: Transform @@ -107393,6 +107570,12 @@ entities: rot: 1.5707963267948966 rad pos: 49.5,23.5 parent: 30 + - uid: 21582 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 32.5,-11.5 + parent: 30 - proto: ReinforcedGirder entities: - uid: 21934 @@ -111165,6 +111348,13 @@ entities: - type: Transform pos: 33.5,15.5 parent: 30 +- proto: RobocopCircuitBoard + entities: + - uid: 21675 + components: + - type: Transform + pos: -3.4224277,62.624496 + parent: 30 - proto: SalvageMagnet entities: - uid: 2040 @@ -112901,6 +113091,13 @@ entities: - type: Transform pos: 14.5,-0.5 parent: 30 +- proto: SignCargoDock + entities: + - uid: 21586 + components: + - type: Transform + pos: 38.5,-1.5 + parent: 30 - proto: SignChapel entities: - uid: 9179 @@ -113688,6 +113885,13 @@ entities: - type: Transform pos: 16.5,24.5 parent: 30 +- proto: SignSalvage + entities: + - uid: 21585 + components: + - type: Transform + pos: 22.5,-11.5 + parent: 30 - proto: SignScience entities: - uid: 6576 @@ -113791,13 +113995,6 @@ entities: - type: Transform pos: -37.5,38.5 parent: 30 -- proto: SignShipDock - entities: - - uid: 8445 - components: - - type: Transform - pos: 15.5,-9.5 - parent: 30 - proto: SignSmoking entities: - uid: 9125 @@ -115541,6 +115738,13 @@ entities: parent: 30 - type: SpamEmitSound enabled: False +- proto: SpawnMechRipley + entities: + - uid: 5062 + components: + - type: Transform + pos: 16.5,-9.5 + parent: 30 - proto: SpawnMobAlexander entities: - uid: 9033 @@ -116313,6 +116517,14 @@ entities: - type: Transform pos: -16.5,-16.5 parent: 30 +- proto: StationAiUploadComputer + entities: + - uid: 21199 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,75.5 + parent: 30 - proto: StationAnchor entities: - uid: 11036 @@ -116320,6 +116532,13 @@ entities: - type: Transform pos: -28.5,-50.5 parent: 30 +- proto: StationEfficiencyCircuitBoard + entities: + - uid: 21676 + components: + - type: Transform + pos: -3.3443027,62.45262 + parent: 30 - proto: StationMap entities: - uid: 4418 @@ -120199,11 +120418,6 @@ entities: - type: Transform pos: -2.5,75.5 parent: 30 - - uid: 20273 - components: - - type: Transform - pos: 1.5,75.5 - parent: 30 - uid: 20289 components: - type: Transform @@ -120862,6 +121076,12 @@ entities: - type: Transform pos: 4.5,-28.5 parent: 30 + - uid: 8439 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,64.5 + parent: 30 - uid: 8469 components: - type: Transform @@ -120962,6 +121182,18 @@ entities: - type: Transform pos: 4.5,-27.5 parent: 30 + - uid: 11821 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,63.5 + parent: 30 + - uid: 12227 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,62.5 + parent: 30 - uid: 12847 components: - type: Transform @@ -122091,11 +122323,6 @@ entities: - type: Transform pos: -3.5175757,-35.433304 parent: 30 - - uid: 12238 - components: - - type: Transform - pos: 17.507895,-9.366575 - parent: 30 - uid: 15271 components: - type: Transform @@ -122391,6 +122618,17 @@ entities: - Left: Forward - Right: Reverse - Middle: Off + - uid: 21584 + components: + - type: Transform + pos: 31.5,-11.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 21582: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 7826 @@ -138741,6 +138979,30 @@ entities: - type: Transform pos: -13.5,16.5 parent: 30 + - uid: 21680 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,62.5 + parent: 30 + - uid: 21681 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,63.5 + parent: 30 + - uid: 21682 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,64.5 + parent: 30 + - uid: 21750 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,20.5 + parent: 30 - proto: WindoorSecureHeadOfPersonnelLocked entities: - uid: 5409 @@ -140041,6 +140303,12 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,-41.5 parent: 30 + - uid: 20278 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,20.5 + parent: 30 - uid: 20477 components: - type: Transform @@ -140095,6 +140363,17 @@ entities: rot: 1.5707963267948966 rad pos: -18.5,44.5 parent: 30 + - uid: 21745 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,20.5 + parent: 30 + - uid: 21746 + components: + - type: Transform + pos: 4.5,20.5 + parent: 30 - uid: 22458 components: - type: Transform diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index c7b3de6a9cef24..99a6c1c0637677 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -100,7 +100,7 @@ entities: version: 6 1,-1: ind: 1,-1 - tiles: WQAAAAADWQAAAAADWQAAAAADOgAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAZgAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAADWQAAAAADeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAABdgAAAAACdgAAAAADdgAAAAADdgAAAAAAdgAAAAADeQAAAAAAXAAAAAACXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAABWQAAAAACWQAAAAAAeQAAAAAAHQAAAAABdgAAAAAAdgAAAAAAdgAAAAACdgAAAAACdgAAAAAAeQAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAADWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAADXAAAAAACWQAAAAAAWQAAAAADeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAAAWQAAAAACWQAAAAAAeQAAAAAAHQAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAAAWQAAAAABWQAAAAADeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAWQAAAAABWQAAAAABeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAADgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWQAAAAADWQAAAAABeQAAAAAAHQAAAAACHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAABHQAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAABDgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWQAAAAACWQAAAAABeQAAAAAADgAAAAADDgAAAAABDgAAAAABDgAAAAAADgAAAAADDgAAAAADDgAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABDgAAAAABDgAAAAACWQAAAAACWQAAAAADDgAAAAACDgAAAAADDgAAAAAADgAAAAADDgAAAAABDgAAAAAADgAAAAABDgAAAAABDgAAAAAADgAAAAADDgAAAAABDgAAAAABDgAAAAACDgAAAAABWQAAAAAAWQAAAAABDgAAAAACDgAAAAABDgAAAAAADgAAAAADDgAAAAACDgAAAAABDgAAAAAADgAAAAACDgAAAAACDgAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAAAWQAAAAAAWQAAAAABeQAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAABDgAAAAACDgAAAAADDgAAAAABWQAAAAADWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACDgAAAAABDgAAAAADDgAAAAAADgAAAAAADgAAAAACDgAAAAABDgAAAAADDgAAAAACHQAAAAAAHQAAAAAB + tiles: WQAAAAADWQAAAAADWQAAAAADOgAAAAAAeQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAZgAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWQAAAAADWQAAAAADeQAAAAAAHQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAAAWQAAAAAAeQAAAAAAHQAAAAABdgAAAAACdgAAAAADdgAAAAADdgAAAAAAdgAAAAADeQAAAAAAXAAAAAACXAAAAAADXAAAAAAAXAAAAAACXAAAAAADXAAAAAABWQAAAAACWQAAAAAAeQAAAAAAHQAAAAABdgAAAAAAdgAAAAAAdgAAAAACdgAAAAACdgAAAAAAeQAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAACXAAAAAAAXAAAAAADWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAXAAAAAAAXAAAAAACXAAAAAADXAAAAAABXAAAAAADXAAAAAACWQAAAAAAWQAAAAADeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAXAAAAAABXAAAAAADXAAAAAACXAAAAAADXAAAAAABXAAAAAAAWQAAAAACWQAAAAAAeQAAAAAAHQAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAXAAAAAABXAAAAAABXAAAAAADXAAAAAACXAAAAAAAXAAAAAAAWQAAAAABWQAAAAADeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAeQAAAAAAeQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAWQAAAAABWQAAAAABeQAAAAAAHQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAHQAAAAAADgAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAWQAAAAADWQAAAAABeQAAAAAAHQAAAAACHQAAAAAAHQAAAAADHQAAAAADHQAAAAADHQAAAAABHQAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAADeQAAAAAAHQAAAAABHQAAAAACHQAAAAACHQAAAAAAHQAAAAACHQAAAAADHQAAAAABDgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAWQAAAAACWQAAAAABeQAAAAAADgAAAAADDgAAAAABDgAAAAABDgAAAAAADgAAAAADDgAAAAADDgAAAAAADgAAAAADDgAAAAADDgAAAAADDgAAAAABDgAAAAABDgAAAAACWQAAAAACWQAAAAADDgAAAAACDgAAAAADDgAAAAAADgAAAAADDgAAAAABDgAAAAAADgAAAAABDgAAAAABDgAAAAAADgAAAAADDgAAAAABDgAAAAABDgAAAAACDgAAAAABWQAAAAAAWQAAAAABDgAAAAACDgAAAAABDgAAAAAADgAAAAADDgAAAAACDgAAAAABDgAAAAAADgAAAAACDgAAAAACDgAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAAAWQAAAAAAWQAAAAABeQAAAAAADgAAAAACDgAAAAADDgAAAAACDgAAAAACDgAAAAACDgAAAAACDgAAAAAADgAAAAAADgAAAAADDgAAAAABDgAAAAACDgAAAAADDgAAAAABWQAAAAADWQAAAAAAeQAAAAAAHQAAAAAAHQAAAAAAHQAAAAACDgAAAAABDgAAAAADDgAAAAAADgAAAAAADgAAAAACDgAAAAABDgAAAAADDgAAAAACHQAAAAAAHQAAAAAB version: 6 -1,-2: ind: -1,-2 @@ -632,6 +632,12 @@ entities: 3260: 49,7 3261: 49,9 3515: 62,-1 + 3519: -39,2 + 3520: -39,3 + 3521: -38,3 + 3522: -37,3 + 3523: -37,2 + 3524: -38,2 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -1766,6 +1772,8 @@ entities: 3451: 54,-4 3452: 55,-4 3453: 53,-4 + 3525: -38,6 + 3526: -37,6 - node: color: '#52B4E996' id: DeliveryGreyscale @@ -10832,7 +10840,7 @@ entities: pos: -42.5,29.5 parent: 5350 - type: Door - secondsUntilStateChange: -4986.791 + secondsUntilStateChange: -5327.3945 state: Opening - type: DeviceLinkSink invokeCounter: 2 @@ -13415,6 +13423,13 @@ entities: - type: Transform pos: 36.40142,-39.497105 parent: 5350 +- proto: AntimovCircuitBoard + entities: + - uid: 3655 + components: + - type: Transform + pos: -13.633052,18.757845 + parent: 5350 - proto: AntiPoisonMedipen entities: - uid: 15362 @@ -14013,6 +14028,13 @@ entities: - type: Transform pos: -50.5,-44.5 parent: 5350 +- proto: ArtistCircuitBoard + entities: + - uid: 2380 + components: + - type: Transform + pos: -13.586177,18.695345 + parent: 5350 - proto: Ashtray entities: - uid: 24770 @@ -14022,10 +14044,10 @@ entities: parent: 5350 - proto: AsimovCircuitBoard entities: - - uid: 26873 + - uid: 26872 components: - type: Transform - pos: -10.5,19.5 + pos: -13.445552,18.49222 parent: 5350 - proto: AtmosDeviceFanDirectional entities: @@ -14539,18 +14561,11 @@ entities: parent: 5350 - proto: Autolathe entities: - - uid: 3919 + - uid: 2750 components: - type: Transform - pos: -30.5,2.5 + pos: -32.5,1.5 parent: 5350 - - type: MaterialStorage - materialWhiteList: - - Steel - - Plastic - - Wood - - Glass - - Cloth - uid: 9806 components: - type: Transform @@ -14582,13 +14597,6 @@ entities: - type: Transform pos: 27.478943,54.52868 parent: 5350 -- proto: BannerCargo - entities: - - uid: 3740 - components: - - type: Transform - pos: -39.5,2.5 - parent: 5350 - proto: Barricade entities: - uid: 17522 @@ -15830,11 +15838,6 @@ entities: - type: Transform pos: -13.522522,4.535767 parent: 5350 - - uid: 3569 - components: - - type: Transform - pos: -37.473976,2.6480932 - parent: 5350 - uid: 9414 components: - type: Transform @@ -57083,12 +57086,6 @@ entities: - type: Transform pos: -40.5,2.5 parent: 5350 - - uid: 3929 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -37.5,3.5 - parent: 5350 - uid: 3930 components: - type: Transform @@ -61969,6 +61966,13 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,-38.5 parent: 5350 +- proto: CommandmentCircuitBoard + entities: + - uid: 26936 + components: + - type: Transform + pos: -7.383052,18.46097 + parent: 5350 - proto: CommsComputerCircuitboard entities: - uid: 12529 @@ -62731,10 +62735,10 @@ entities: parent: 5350 - proto: CorporateCircuitBoard entities: - - uid: 26871 + - uid: 3903 components: - type: Transform - pos: -7.5,18.5 + pos: -13.523677,18.61722 parent: 5350 - proto: CrateArtifactContainer entities: @@ -62802,6 +62806,16 @@ entities: - type: Transform pos: -24.5,15.5 parent: 5350 + - uid: 3740 + components: + - type: Transform + pos: -36.5,2.5 + parent: 5350 + - uid: 3923 + components: + - type: Transform + pos: -37.5,2.5 + parent: 5350 - uid: 17301 components: - type: Transform @@ -70724,6 +70738,13 @@ entities: - type: Transform pos: 18.561031,-31.757362 parent: 5350 +- proto: DungeonMasterCircuitBoard + entities: + - uid: 26873 + components: + - type: Transform + pos: -10.508052,19.789095 + parent: 5350 - proto: EggplantSeeds entities: - uid: 3156 @@ -71750,12 +71771,12 @@ entities: - type: Transform pos: 49.5,-2.5 parent: 5350 -- proto: filingCabinetTall +- proto: filingCabinetTallRandom entities: - - uid: 3925 + - uid: 3702 components: - type: Transform - pos: -38.5,2.5 + pos: -39.5,2.5 parent: 5350 - proto: FireAlarm entities: @@ -115711,10 +115732,10 @@ entities: - type: Transform pos: -17.409359,3.57397 parent: 5350 - - uid: 3702 + - uid: 3925 components: - type: Transform - pos: -36.553383,2.5699682 + pos: -40.503807,6.294703 parent: 5350 - uid: 3938 components: @@ -116919,6 +116940,13 @@ entities: - type: Transform pos: 42.475327,0.6797509 parent: 5350 +- proto: LiveLetLiveCircuitBoard + entities: + - uid: 26929 + components: + - type: Transform + pos: -10.508052,19.64847 + parent: 5350 - proto: LockableButtonMedical entities: - uid: 6251 @@ -119663,10 +119691,10 @@ entities: parent: 5350 - proto: NTDefaultCircuitBoard entities: - - uid: 26872 + - uid: 26930 components: - type: Transform - pos: -13.5,18.5 + pos: -10.476802,19.539095 parent: 5350 - proto: NuclearBomb entities: @@ -119687,6 +119715,13 @@ entities: - type: Transform pos: -58.5,-19.5 parent: 5350 +- proto: NutimovCircuitBoard + entities: + - uid: 26931 + components: + - type: Transform + pos: -10.492427,19.42972 + parent: 5350 - proto: OatSeeds entities: - uid: 13581 @@ -119721,21 +119756,27 @@ entities: - type: Transform pos: 38.5,-30.5 parent: 5350 +- proto: OreBox + entities: + - uid: 3569 + components: + - type: Transform + pos: -41.5,28.5 + parent: 5350 - proto: OreProcessor entities: - - uid: 3903 + - uid: 3921 components: - type: Transform - pos: -32.5,1.5 + pos: -32.5,5.5 + parent: 5350 +- proto: OverlordCircuitBoard + entities: + - uid: 26932 + components: + - type: Transform + pos: -7.492427,18.757845 parent: 5350 - - type: MaterialStorage - materialWhiteList: - - Steel - - Glass - - Plasma - - Uranium - - Gold - - Silver - proto: OxygenCanister entities: - uid: 9212 @@ -119903,6 +119944,13 @@ entities: - type: Transform pos: -25.5,-68.5 parent: 5350 +- proto: PaladinCircuitBoard + entities: + - uid: 26933 + components: + - type: Transform + pos: -7.461177,18.664095 + parent: 5350 - proto: Paper entities: - uid: 1156 @@ -128266,6 +128314,12 @@ entities: - type: Transform pos: -40.5,38.5 parent: 5350 + - uid: 26937 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -39.5,27.5 + parent: 5350 - proto: ReinforcedPlasmaWindow entities: - uid: 11288 @@ -130877,6 +130931,21 @@ entities: - type: Transform pos: 60.5,26.5 parent: 5350 + - uid: 12463 + components: + - type: Transform + pos: 32.5,-7.5 + parent: 5350 + - uid: 12465 + components: + - type: Transform + pos: 32.5,-6.5 + parent: 5350 + - uid: 12466 + components: + - type: Transform + pos: 33.5,-8.5 + parent: 5350 - uid: 12658 components: - type: Transform @@ -131942,6 +132011,11 @@ entities: - type: Transform pos: -6.5,-65.5 parent: 5350 + - uid: 22394 + components: + - type: Transform + pos: 34.5,-8.5 + parent: 5350 - uid: 23546 components: - type: Transform @@ -131992,6 +132066,11 @@ entities: - type: Transform pos: 104.5,10.5 parent: 5350 + - uid: 26871 + components: + - type: Transform + pos: 32.5,-8.5 + parent: 5350 - proto: RemoteSignaller entities: - uid: 1290 @@ -132055,6 +132134,13 @@ entities: - type: Transform pos: 2.4814563,-30.497478 parent: 5350 +- proto: RobocopCircuitBoard + entities: + - uid: 26934 + components: + - type: Transform + pos: -7.445552,18.58597 + parent: 5350 - proto: RollerBed entities: - uid: 15669 @@ -137257,11 +137343,6 @@ entities: - type: Transform pos: -31.5,4.5 parent: 5350 - - uid: 3655 - components: - - type: Transform - pos: -32.5,5.5 - parent: 5350 - uid: 3661 components: - type: Transform @@ -137784,6 +137865,13 @@ entities: - type: Transform pos: 58.5,4.5 parent: 5350 +- proto: StationEfficiencyCircuitBoard + entities: + - uid: 26935 + components: + - type: Transform + pos: -7.414302,18.52347 + parent: 5350 - proto: StationMap entities: - uid: 8474 @@ -141236,21 +141324,11 @@ entities: - type: Transform pos: -34.5,2.5 parent: 5350 - - uid: 3921 - components: - - type: Transform - pos: -37.5,2.5 - parent: 5350 - uid: 3922 components: - type: Transform pos: -34.5,3.5 parent: 5350 - - uid: 3923 - components: - - type: Transform - pos: -36.5,2.5 - parent: 5350 - uid: 3926 components: - type: Transform @@ -145383,6 +145461,17 @@ entities: - Left: Open - Right: Open - Middle: Close + - uid: 26938 + components: + - type: Transform + pos: -40.5,27.5 + parent: 5350 + - type: DeviceLinkSource + linkedPorts: + 26937: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 18441 @@ -164031,16 +164120,17 @@ entities: parent: 5350 - proto: WindoorCargoLocked entities: - - uid: 3927 + - uid: 3919 components: - type: Transform rot: 3.141592653589793 rad - pos: -40.5,1.5 + pos: -32.5,1.5 parent: 5350 - - uid: 22394 + - uid: 3927 components: - type: Transform - pos: -32.5,1.5 + rot: 3.141592653589793 rad + pos: -40.5,1.5 parent: 5350 - uid: 24371 components: @@ -164177,6 +164267,11 @@ entities: rot: -1.5707963267948966 rad pos: -29.5,7.5 parent: 5350 + - uid: 3929 + components: + - type: Transform + pos: -32.5,1.5 + parent: 5350 - proto: WindoorSecureChemistryLocked entities: - uid: 14290 @@ -164455,11 +164550,6 @@ entities: - type: Transform pos: 20.5,-24.5 parent: 5350 - - uid: 2380 - components: - - type: Transform - pos: 33.5,-8.5 - parent: 5350 - uid: 2381 components: - type: Transform @@ -164490,11 +164580,6 @@ entities: - type: Transform pos: 26.5,1.5 parent: 5350 - - uid: 2750 - components: - - type: Transform - pos: 34.5,-8.5 - parent: 5350 - uid: 3314 components: - type: Transform @@ -164645,21 +164730,6 @@ entities: - type: Transform pos: 15.5,-33.5 parent: 5350 - - uid: 12463 - components: - - type: Transform - pos: 32.5,-7.5 - parent: 5350 - - uid: 12465 - components: - - type: Transform - pos: 32.5,-6.5 - parent: 5350 - - uid: 12466 - components: - - type: Transform - pos: 32.5,-8.5 - parent: 5350 - uid: 14151 components: - type: Transform diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index 93697b7629a083..9f0ac7549a73bb 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -20,6 +20,7 @@ tilemap: 62: FloorLino 69: FloorMono 77: FloorReinforced + 1: FloorRockVault 80: FloorShowroom 89: FloorSteel 104: FloorTechMaint @@ -54,7 +55,7 @@ entities: chunks: -1,0: ind: -1,0 - tiles: PgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAACHQAAAAADeQAAAAAADgAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAACdgAAAAACHQAAAAABeQAAAAAADgAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAADgAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAAAHQAAAAABDgAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABdgAAAAADdgAAAAACdgAAAAAAHQAAAAADDgAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAACHQAAAAACDgAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAADdgAAAAAAHQAAAAACDgAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAACdgAAAAADHQAAAAACDgAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAACDgAAAAABWQAAAAADWQAAAAAAWQAAAAACDgAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAADWQAAAAACWQAAAAADWQAAAAAADgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAACDgAAAAAADgAAAAACDgAAAAACDgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAABDgAAAAABDgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAeQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAeQAAAAAA + tiles: PgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAAAdgAAAAACHQAAAAADeQAAAAAADgAAAAADWQAAAAAAWQAAAAACWQAAAAADWQAAAAADWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAACdgAAAAACHQAAAAABeQAAAAAADgAAAAAAWQAAAAAAWQAAAAADWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAADgAAAAAAWQAAAAAAWQAAAAACWQAAAAAAWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAAAHQAAAAABDgAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAADWQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAABdgAAAAADdgAAAAACdgAAAAAAHQAAAAADDgAAAAABWQAAAAABWQAAAAACWQAAAAADWQAAAAADWQAAAAACaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAHQAAAAACdgAAAAABdgAAAAABdgAAAAACHQAAAAACDgAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAAAWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAADdgAAAAAAHQAAAAACDgAAAAAAWQAAAAADWQAAAAAAWQAAAAAAWQAAAAADWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAACdgAAAAADHQAAAAACDgAAAAADWQAAAAABWQAAAAABWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAABWQAAAAADWQAAAAABWQAAAAAAWQAAAAAAWQAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAADdgAAAAAAdgAAAAADHQAAAAAADgAAAAACDgAAAAABWQAAAAADWQAAAAAAWQAAAAACDgAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAADWQAAAAACWQAAAAADWQAAAAAADgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABDgAAAAACDgAAAAAADgAAAAACDgAAAAACDgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAADgAAAAABDgAAAAABDgAAAAABeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAWQAAAAADWQAAAAAAWQAAAAABWQAAAAACWQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABWQAAAAAAWQAAAAADWQAAAAACWQAAAAAAeQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAACWQAAAAACWQAAAAAAeQAAAAAA version: 6 0,0: ind: 0,0 @@ -62,7 +63,7 @@ entities: version: 6 -1,1: ind: -1,1 - tiles: eQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAAAeQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAARQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAHQAAAAACeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAAAWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAHQAAAAABHQAAAAACeQAAAAAAHQAAAAADNgAAAAAANgAAAAAAHQAAAAABNgAAAAAANgAAAAAAHQAAAAABdgAAAAABdgAAAAAAdgAAAAADdgAAAAAAdgAAAAABdgAAAAACHQAAAAADHQAAAAADeQAAAAAAHQAAAAACNgAAAAAAHQAAAAACHQAAAAABHQAAAAADNgAAAAAAHQAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAABeQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAHQAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAHQAAAAABeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAdgAAAAACeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAADNgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADNgAAAAAAHQAAAAADHQAAAAACUAAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADeQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAALAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAACHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAALAAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAAAHQAAAAACHQAAAAAD + tiles: eQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAACWQAAAAACWQAAAAAAeQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAeQAAAAAAAQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAAAWQAAAAABWQAAAAABWQAAAAABWQAAAAAAWQAAAAADWQAAAAABWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAADWQAAAAABWQAAAAACWQAAAAAAWQAAAAACWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAAAWQAAAAABWQAAAAADWQAAAAADWQAAAAAAWQAAAAADWQAAAAABWQAAAAABWQAAAAACWQAAAAACWQAAAAABWQAAAAABWQAAAAABWQAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAABHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAeQAAAAAAeQAAAAAAHQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADdgAAAAABeQAAAAAAHQAAAAABHQAAAAACeQAAAAAAHQAAAAADNgAAAAAANgAAAAAAHQAAAAABNgAAAAAANgAAAAAAHQAAAAABdgAAAAABdgAAAAAAdgAAAAADdgAAAAAAdgAAAAABdgAAAAACHQAAAAADHQAAAAADeQAAAAAAHQAAAAACNgAAAAAAHQAAAAACHQAAAAABHQAAAAADNgAAAAAAHQAAAAABdgAAAAACdgAAAAABdgAAAAAAdgAAAAACdgAAAAABeQAAAAAAHQAAAAAAHQAAAAABeQAAAAAAHQAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAHQAAAAABeQAAAAAAdgAAAAAAdgAAAAACdgAAAAAAdgAAAAACeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAADNgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAdgAAAAABeQAAAAAAeQAAAAAAHQAAAAADHQAAAAAAeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADNgAAAAAAHQAAAAADHQAAAAACUAAAAAAAeQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAADeQAAAAAAHQAAAAACHQAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAALAAAAAAALAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAAAHQAAAAABHQAAAAACHQAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAALAAAAAAAeQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHQAAAAADHQAAAAABHQAAAAAAHQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAABwAAAAAABwAAAAAABwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAHQAAAAABHQAAAAABeQAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAAAHQAAAAACHQAAAAAD version: 6 0,1: ind: 0,1 @@ -7107,6 +7108,13 @@ entities: - type: Transform pos: 31.63529,-24.472576 parent: 4812 +- proto: AntimovCircuitBoard + entities: + - uid: 12641 + components: + - type: Transform + pos: 9.371053,43.6508 + parent: 4812 - proto: APCBasic entities: - uid: 903 @@ -7403,6 +7411,20 @@ entities: - type: Transform pos: -31.531736,31.32598 parent: 4812 +- proto: ArtistCircuitBoard + entities: + - uid: 12642 + components: + - type: Transform + pos: 9.402303,43.5883 + parent: 4812 +- proto: AsimovCircuitBoard + entities: + - uid: 12644 + components: + - type: Transform + pos: 9.542928,43.4008 + parent: 4812 - proto: AsteroidRock entities: - uid: 2840 @@ -10152,11 +10174,6 @@ entities: parent: 4812 - proto: Bookshelf entities: - - uid: 1952 - components: - - type: Transform - pos: -13.5,25.5 - parent: 4812 - uid: 5374 components: - type: Transform @@ -10335,10 +10352,10 @@ entities: parent: 4812 - proto: BoxFlashbang entities: - - uid: 8368 + - uid: 8369 components: - type: Transform - pos: -36.5,17.5 + pos: -36.42858,16.41507 parent: 4812 - uid: 8430 components: @@ -10426,10 +10443,10 @@ entities: parent: 4812 - proto: BoxHandcuff entities: - - uid: 8369 + - uid: 2727 components: - type: Transform - pos: -36.509842,17.041077 + pos: -36.64733,16.47757 parent: 4812 - uid: 8431 components: @@ -30315,6 +30332,18 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 10602 + components: + - type: Transform + pos: -36.600456,17.618195 + parent: 4812 + - uid: 12429 + components: + - type: Transform + pos: -36.45983,17.524445 + parent: 4812 - proto: ClothingOuterHardsuitSpatio entities: - uid: 12424 @@ -30767,6 +30796,20 @@ entities: - type: Transform pos: -14.5,0.5 parent: 4812 +- proto: CommandmentCircuitBoard + entities: + - uid: 12653 + components: + - type: Transform + pos: 11.589803,43.5258 + parent: 4812 +- proto: CommsComputerCircuitboard + entities: + - uid: 2730 + components: + - type: Transform + pos: 22.5,8.5 + parent: 4812 - proto: ComputerAlert entities: - uid: 2708 @@ -30933,11 +30976,6 @@ entities: parent: 4812 - proto: ComputerFrame entities: - - uid: 3951 - components: - - type: Transform - pos: 7.5,47.5 - parent: 4812 - uid: 6653 components: - type: Transform @@ -31206,6 +31244,13 @@ entities: - type: Transform pos: -42.51349,-28.44041 parent: 4812 +- proto: CorporateCircuitBoard + entities: + - uid: 12643 + components: + - type: Transform + pos: 9.464803,43.510174 + parent: 4812 - proto: CrateArtifactContainer entities: - uid: 7366 @@ -35002,6 +35047,13 @@ entities: - type: Transform pos: -13.459903,-33.042583 parent: 4812 +- proto: DungeonMasterCircuitBoard + entities: + - uid: 12645 + components: + - type: Transform + pos: 9.589803,43.291424 + parent: 4812 - proto: ElectricGuitarInstrument entities: - uid: 1720 @@ -51747,6 +51799,13 @@ entities: - type: Transform pos: -13.5,11.5 parent: 4812 +- proto: GlassBoxLaserFilled + entities: + - uid: 1952 + components: + - type: Transform + pos: -13.5,25.5 + parent: 4812 - proto: GravityGenerator entities: - uid: 9889 @@ -55156,6 +55215,13 @@ entities: - type: Transform pos: -16.5,-5.5 parent: 4812 +- proto: IDComputerCircuitboard + entities: + - uid: 8335 + components: + - type: Transform + pos: 21.5,8.5 + parent: 4812 - proto: InflatableDoorStack entities: - uid: 9679 @@ -55788,6 +55854,13 @@ entities: - type: Transform pos: -23.51768,-6.333922 parent: 4812 +- proto: LiveLetLiveCircuitBoard + entities: + - uid: 12646 + components: + - type: Transform + pos: 9.339803,43.5883 + parent: 4812 - proto: LockerAtmosphericsFilled entities: - uid: 9570 @@ -55886,31 +55959,13 @@ entities: - 0 - 0 - 0 -- proto: LockerCaptainFilled +- proto: LockerCaptainFilledNoLaser entities: - - uid: 2595 + - uid: 2729 components: - type: Transform pos: -10.5,28.5 parent: 4812 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.6033952 - - 6.031821 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: LockerChemistryFilled entities: - uid: 6609 @@ -56832,6 +56887,13 @@ entities: - type: Transform pos: 7.701914,-15.330456 parent: 4812 +- proto: MechEquipmentGrabberSmall + entities: + - uid: 3442 + components: + - type: Transform + pos: 19.5,21.5 + parent: 4812 - proto: MedicalBed entities: - uid: 7572 @@ -57079,6 +57141,13 @@ entities: - type: Transform pos: 21.5,-32.5 parent: 4812 +- proto: NTDefaultCircuitBoard + entities: + - uid: 12647 + components: + - type: Transform + pos: 9.464803,43.385174 + parent: 4812 - proto: NuclearBomb entities: - uid: 1854 @@ -57093,6 +57162,13 @@ entities: - type: Transform pos: 16.5,-44.5 parent: 4812 +- proto: NutimovCircuitBoard + entities: + - uid: 12648 + components: + - type: Transform + pos: 11.417928,43.6508 + parent: 4812 - proto: OperatingTable entities: - uid: 6167 @@ -57137,6 +57213,13 @@ entities: - type: Transform pos: -53.373444,-16.451925 parent: 4812 +- proto: OverlordCircuitBoard + entities: + - uid: 12649 + components: + - type: Transform + pos: 11.511678,43.5883 + parent: 4812 - proto: OxygenCanister entities: - uid: 733 @@ -57255,6 +57338,13 @@ entities: - type: Transform pos: -28.5,-13.5 parent: 4812 +- proto: PaladinCircuitBoard + entities: + - uid: 12650 + components: + - type: Transform + pos: 11.589803,43.49455 + parent: 4812 - proto: Paper entities: - uid: 2520 @@ -57804,6 +57894,13 @@ entities: - type: Transform pos: -32.5,0.5 parent: 4812 +- proto: PlayerStationAi + entities: + - uid: 10457 + components: + - type: Transform + pos: 10.5,52.5 + parent: 4812 - proto: PlushieBee entities: - uid: 11334 @@ -60773,6 +60870,11 @@ entities: - Gold - proto: ProtolatheMachineCircuitboard entities: + - uid: 3951 + components: + - type: Transform + pos: 23.5,8.5 + parent: 4812 - uid: 4495 components: - type: Transform @@ -60790,6 +60892,11 @@ entities: - type: Transform pos: 3.5,14.5 parent: 4812 + - uid: 2595 + components: + - type: Transform + pos: -36.5,17.5 + parent: 4812 - uid: 2699 components: - type: Transform @@ -60813,7 +60920,7 @@ entities: - uid: 3289 components: - type: Transform - pos: 23.5,7.5 + pos: 22.5,8.5 parent: 4812 - uid: 3392 components: @@ -60830,11 +60937,6 @@ entities: - type: Transform pos: -47.5,-13.5 parent: 4812 - - uid: 3442 - components: - - type: Transform - pos: 21.5,7.5 - parent: 4812 - uid: 3748 components: - type: Transform @@ -60985,6 +61087,16 @@ entities: - type: Transform pos: 4.5,12.5 parent: 4812 + - uid: 12634 + components: + - type: Transform + pos: 9.5,43.5 + parent: 4812 + - uid: 12635 + components: + - type: Transform + pos: 11.5,43.5 + parent: 4812 - proto: RadioHandheld entities: - uid: 4582 @@ -61065,26 +61177,6 @@ entities: - type: Transform pos: 25.5,4.5 parent: 4812 - - uid: 2727 - components: - - type: Transform - pos: 21.5,7.5 - parent: 4812 - - uid: 2728 - components: - - type: Transform - pos: 23.5,7.5 - parent: 4812 - - uid: 2729 - components: - - type: Transform - pos: 23.5,8.5 - parent: 4812 - - uid: 2730 - components: - - type: Transform - pos: 21.5,8.5 - parent: 4812 - uid: 3286 components: - type: Transform @@ -63713,6 +63805,13 @@ entities: - type: Transform pos: -14.491153,4.5839243 parent: 4812 +- proto: RobocopCircuitBoard + entities: + - uid: 12651 + components: + - type: Transform + pos: 11.636678,43.4008 + parent: 4812 - proto: RockGuitarInstrument entities: - uid: 12366 @@ -65948,6 +66047,13 @@ entities: - type: Transform pos: 53.5,-36.5 parent: 4812 +- proto: SpawnMechRipley + entities: + - uid: 8368 + components: + - type: Transform + pos: 20.5,19.5 + parent: 4812 - proto: SpawnMobAlexander entities: - uid: 12426 @@ -66468,6 +66574,13 @@ entities: - type: Transform pos: -17.5,-20.5 parent: 4812 +- proto: StationAiUploadComputer + entities: + - uid: 2728 + components: + - type: Transform + pos: 7.5,47.5 + parent: 4812 - proto: StationAnchor entities: - uid: 10438 @@ -66475,6 +66588,13 @@ entities: - type: Transform pos: -48.5,-16.5 parent: 4812 +- proto: StationEfficiencyCircuitBoard + entities: + - uid: 12652 + components: + - type: Transform + pos: 11.730428,43.291424 + parent: 4812 - proto: StationMap entities: - uid: 3772 @@ -69131,11 +69251,6 @@ entities: - type: Transform pos: -36.5,16.5 parent: 4812 - - uid: 8335 - components: - - type: Transform - pos: -36.5,17.5 - parent: 4812 - uid: 8343 components: - type: Transform @@ -79318,6 +79433,16 @@ entities: - type: Transform pos: -33.4461,20.218811 parent: 4812 + - uid: 12631 + components: + - type: Transform + pos: -33.43493,20.166264 + parent: 4812 + - uid: 12632 + components: + - type: Transform + pos: -33.388054,20.103764 + parent: 4812 - proto: WeaponShotgunKammerer entities: - uid: 12052 @@ -79615,6 +79740,23 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,53.5 parent: 4812 + - uid: 12633 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,43.5 + parent: 4812 + - uid: 12636 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,43.5 + parent: 4812 + - uid: 12637 + components: + - type: Transform + pos: 7.5,47.5 + parent: 4812 - proto: WindoorSecureEngineeringLocked entities: - uid: 8689 @@ -80166,6 +80308,24 @@ entities: rot: 1.5707963267948966 rad pos: -15.5,4.5 parent: 4812 + - uid: 12638 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,47.5 + parent: 4812 + - uid: 12639 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,43.5 + parent: 4812 + - uid: 12640 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,43.5 + parent: 4812 - proto: WoodDoor entities: - uid: 6795 diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 0c993349e7da4d..9ef7e8ffbc8b9b 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -65,7 +65,7 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAABWwAAAAABewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAABWwAAAAADWwAAAAAAWwAAAAACegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAABegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAADegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAADWwAAAAABWwAAAAABegAAAAAAAAAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAWwAAAAACAAAAAAAAAAAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAewAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAewAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAewAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAewAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAEQAAAAAAEQAAAAAAEQAAAAAA + tiles: ewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAABWwAAAAABewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAABWwAAAAADWwAAAAAAWwAAAAACegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAABegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAADegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAADWwAAAAABWwAAAAABegAAAAAAAAAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAWwAAAAACAAAAAAAAAAAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAewAAAAAAagAAAAAAawAAAAAAagAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAewAAAAAAawAAAAAAawAAAAAAawAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAegAAAAAAAAAAAAAAewAAAAAAagAAAAAAawAAAAAAagAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAEQAAAAAAEQAAAAAAEQAAAAAA version: 6 0,1: ind: 0,1 @@ -93,7 +93,7 @@ entities: version: 6 2,-2: ind: 2,-2 - tiles: ZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAWwAAAAABewAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAADWwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAHQAAAAADHQAAAAABewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAA + tiles: ZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAWwAAAAABewAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAADWwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAagAAAAAAHQAAAAADTQAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAA version: 6 2,-3: ind: 2,-3 @@ -109,7 +109,7 @@ entities: version: 6 2,-1: ind: 2,-1 - tiles: WwAAAAADWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAHQAAAAACewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAewAAAAAAewAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAHQAAAAADHQAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAABWwAAAAAAWwAAAAAAWwAAAAACWwAAAAACawAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAADWwAAAAAAWwAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAADHQAAAAADHQAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAABewAAAAAAeAAAAAAAeAAAAAAAewAAAAAAWwAAAAADWwAAAAAAWwAAAAAAewAAAAAALwAAAAAALwAAAAAAewAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAAAWwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAewAAAAAAWwAAAAADWwAAAAAAWwAAAAADewAAAAAALwAAAAAALwAAAAAAewAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAAAewAAAAAAHQAAAAABHQAAAAADewAAAAAAewAAAAAAWwAAAAAAewAAAAAAewAAAAAAewAAAAAALwAAAAAALwAAAAAADgAAAAABDgAAAAACDgAAAAACDgAAAAACDgAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAABWwAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAABWwAAAAAADgAAAAABDgAAAAAADgAAAAADDgAAAAADDgAAAAADHQAAAAACHQAAAAABHQAAAAADHQAAAAAAWwAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWwAAAAACDgAAAAABDgAAAAADDgAAAAABDgAAAAADDgAAAAACHQAAAAACHQAAAAAAHQAAAAAAewAAAAAAWwAAAAADOgAAAAAAWwAAAAAAWwAAAAACWwAAAAAAOgAAAAAAWwAAAAAADgAAAAACDgAAAAAADgAAAAADDgAAAAAADgAAAAACHQAAAAAAHQAAAAADHQAAAAABewAAAAAAWwAAAAAAOgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAWwAAAAABDgAAAAADDgAAAAABDgAAAAADDgAAAAADDgAAAAABHQAAAAAAHQAAAAADHQAAAAADHQAAAAADWwAAAAADOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWwAAAAAADgAAAAACDgAAAAAADgAAAAABDgAAAAACDgAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAOgAAAAAAewAAAAAAewAAAAAAWwAAAAABewAAAAAAWwAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAABWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAABWwAAAAABWwAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAABWwAAAAAAWwAAAAAAWwAAAAAA + tiles: WwAAAAADWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAATQAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAewAAAAAAewAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAHQAAAAADTQAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAABWwAAAAAAWwAAAAAAWwAAAAACWwAAAAACawAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAADWwAAAAAAWwAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAawAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAADHQAAAAADHQAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAABewAAAAAAeAAAAAAAeAAAAAAAewAAAAAAWwAAAAADWwAAAAAAWwAAAAAAewAAAAAALwAAAAAALwAAAAAAewAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAAAWwAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAewAAAAAAWwAAAAADWwAAAAAAWwAAAAADewAAAAAALwAAAAAALwAAAAAAewAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAAAewAAAAAAHQAAAAABHQAAAAADewAAAAAAewAAAAAAWwAAAAAAewAAAAAAewAAAAAAewAAAAAALwAAAAAALwAAAAAADgAAAAABDgAAAAACDgAAAAACDgAAAAACDgAAAAADHQAAAAAAHQAAAAACHQAAAAAAHQAAAAABWwAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAABWwAAAAAADgAAAAABDgAAAAAADgAAAAADDgAAAAADDgAAAAADHQAAAAACHQAAAAABHQAAAAADHQAAAAAAWwAAAAACOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWwAAAAACDgAAAAABDgAAAAADDgAAAAABDgAAAAADDgAAAAACHQAAAAACHQAAAAAAHQAAAAAAewAAAAAAWwAAAAADOgAAAAAAWwAAAAAAWwAAAAACWwAAAAAAOgAAAAAAWwAAAAAADgAAAAACDgAAAAAADgAAAAADDgAAAAAADgAAAAACHQAAAAAAHQAAAAADHQAAAAABewAAAAAAWwAAAAAAOgAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAOgAAAAAAWwAAAAABDgAAAAADDgAAAAABDgAAAAADDgAAAAADDgAAAAABHQAAAAAAHQAAAAADHQAAAAADHQAAAAADWwAAAAADOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAWwAAAAAADgAAAAACDgAAAAAADgAAAAABDgAAAAACDgAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAOgAAAAAAewAAAAAAewAAAAAAWwAAAAABewAAAAAAWwAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAABWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAABWwAAAAABWwAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAABWwAAAAAAWwAAAAAAWwAAAAAA version: 6 1,-4: ind: 1,-4 @@ -5191,6 +5191,9 @@ entities: 2557: 39,-48 2558: 39,-46 2559: 39,-47 + 2642: 40,-17 + 2643: 40,-16 + 2644: 40,-15 - node: color: '#9FED5896' id: WarnLineGreyscaleE @@ -7221,7 +7224,7 @@ entities: pos: 24.5,-39.5 parent: 2 - type: Door - secondsUntilStateChange: -5530.9775 + secondsUntilStateChange: -5824.1685 state: Opening - type: DeviceLinkSource lastSignals: @@ -8763,6 +8766,13 @@ entities: - type: Transform pos: 71.56963,14.339729 parent: 2 +- proto: AntimovCircuitBoard + entities: + - uid: 13653 + components: + - type: Transform + pos: 52.427402,31.841324 + parent: 2 - proto: APCBasic entities: - uid: 340 @@ -9445,6 +9455,20 @@ entities: - type: Transform pos: 36.5,-21.5 parent: 2 +- proto: ArtistCircuitBoard + entities: + - uid: 12661 + components: + - type: Transform + pos: 52.427402,31.810074 + parent: 2 +- proto: AsimovCircuitBoard + entities: + - uid: 13649 + components: + - type: Transform + pos: 52.427402,31.622574 + parent: 2 - proto: AtmosDeviceFanDirectional entities: - uid: 136 @@ -32011,6 +32035,21 @@ entities: - type: Transform pos: 2.5,16.5 parent: 2 + - uid: 13749 + components: + - type: Transform + pos: 5.5,-21.5 + parent: 2 + - uid: 13750 + components: + - type: Transform + pos: 6.5,-21.5 + parent: 2 + - uid: 13751 + components: + - type: Transform + pos: 7.5,-21.5 + parent: 2 - proto: Cautery entities: - uid: 7791 @@ -34350,6 +34389,20 @@ entities: rot: -1.5707963267948966 rad pos: 107.5,-13.5 parent: 2 +- proto: CommandmentCircuitBoard + entities: + - uid: 13760 + components: + - type: Transform + pos: 52.427402,30.685076 + parent: 2 +- proto: CommsComputerCircuitboard + entities: + - uid: 12660 + components: + - type: Transform + pos: 41.5,-15.5 + parent: 2 - proto: ComputerAlert entities: - uid: 1163 @@ -34510,25 +34563,6 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,27.5 parent: 2 -- proto: ComputerFrame - entities: - - uid: 12660 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 60.5,34.5 - parent: 2 - - uid: 12661 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 52.5,34.5 - parent: 2 - - uid: 13649 - components: - - type: Transform - pos: 54.5,31.5 - parent: 2 - proto: ComputerId entities: - uid: 401 @@ -35044,6 +35078,13 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,15.5 parent: 2 +- proto: CorporateCircuitBoard + entities: + - uid: 11861 + components: + - type: Transform + pos: 52.427402,31.731949 + parent: 2 - proto: CowToolboxFilled entities: - uid: 5707 @@ -39011,6 +39052,13 @@ entities: - type: Transform pos: 57.63163,-13.7188425 parent: 2 +- proto: DungeonMasterCircuitBoard + entities: + - uid: 7304 + components: + - type: Transform + pos: 52.427402,31.544449 + parent: 2 - proto: EmergencyLight entities: - uid: 1547 @@ -59174,6 +59222,13 @@ entities: - type: Transform pos: 41.5,-4.5 parent: 2 +- proto: IDComputerCircuitboard + entities: + - uid: 12659 + components: + - type: Transform + pos: 41.5,-14.5 + parent: 2 - proto: InflatableWall entities: - uid: 6524 @@ -59477,6 +59532,13 @@ entities: - type: Transform pos: 5.600267,-3.347455 parent: 2 +- proto: LiveLetLiveCircuitBoard + entities: + - uid: 13753 + components: + - type: Transform + pos: 52.427402,31.435076 + parent: 2 - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 1458 @@ -59993,6 +60055,13 @@ entities: - type: Transform pos: 65.43021,-13.629852 parent: 2 +- proto: MechEquipmentGrabberSmall + entities: + - uid: 13763 + components: + - type: Transform + pos: 8.491839,32.52443 + parent: 2 - proto: MedicalBed entities: - uid: 4978 @@ -60329,6 +60398,13 @@ entities: - type: Transform pos: 44.5,-37.5 parent: 2 +- proto: NTDefaultCircuitBoard + entities: + - uid: 13754 + components: + - type: Transform + pos: 52.427402,31.3257 + parent: 2 - proto: NuclearBomb entities: - uid: 12093 @@ -60336,6 +60412,13 @@ entities: - type: Transform pos: 18.5,42.5 parent: 2 +- proto: NutimovCircuitBoard + entities: + - uid: 13755 + components: + - type: Transform + pos: 52.427402,31.23195 + parent: 2 - proto: OperatingTable entities: - uid: 24 @@ -60363,6 +60446,18 @@ entities: - type: Transform pos: 55.5,9.5 parent: 2 +- proto: OreBox + entities: + - uid: 13731 + components: + - type: Transform + pos: -17.5,17.5 + parent: 2 + - uid: 13764 + components: + - type: Transform + pos: 8.5,15.5 + parent: 2 - proto: OreProcessor entities: - uid: 12839 @@ -60370,6 +60465,13 @@ entities: - type: Transform pos: 9.5,20.5 parent: 2 +- proto: OverlordCircuitBoard + entities: + - uid: 13756 + components: + - type: Transform + pos: 52.427402,31.122576 + parent: 2 - proto: OxygenCanister entities: - uid: 945 @@ -60472,6 +60574,13 @@ entities: - type: Transform pos: 28.5,8.5 parent: 2 +- proto: PaladinCircuitBoard + entities: + - uid: 13757 + components: + - type: Transform + pos: 52.427402,31.028826 + parent: 2 - proto: PaperBin10 entities: - uid: 1483 @@ -60835,6 +60944,13 @@ entities: - type: Transform pos: 4.5,15.5 parent: 2 +- proto: PlayerStationAi + entities: + - uid: 13752 + components: + - type: Transform + pos: 56.5,35.5 + parent: 2 - proto: Plunger entities: - uid: 9718 @@ -63878,6 +63994,13 @@ entities: - Plastic - Wood - Gold +- proto: ProtolatheMachineCircuitboard + entities: + - uid: 12658 + components: + - type: Transform + pos: 41.5,-16.5 + parent: 2 - proto: Rack entities: - uid: 251 @@ -64225,16 +64348,6 @@ entities: parent: 2 - proto: RandomBoard entities: - - uid: 7304 - components: - - type: Transform - pos: 41.5,-16.5 - parent: 2 - - uid: 11861 - components: - - type: Transform - pos: 41.5,-15.5 - parent: 2 - uid: 11863 components: - type: Transform @@ -64245,11 +64358,6 @@ entities: - type: Transform pos: 35.5,-17.5 parent: 2 - - uid: 12102 - components: - - type: Transform - pos: 41.5,-14.5 - parent: 2 - uid: 12358 components: - type: Transform @@ -66873,6 +66981,13 @@ entities: - type: Transform pos: 38.223476,28.307878 parent: 2 +- proto: RobocopCircuitBoard + entities: + - uid: 13758 + components: + - type: Transform + pos: 52.427402,30.935076 + parent: 2 - proto: RockGuitarInstrument entities: - uid: 9741 @@ -69401,6 +69516,13 @@ entities: parent: 2 - type: SpamEmitSound enabled: False +- proto: SpawnMechRipley + entities: + - uid: 13762 + components: + - type: Transform + pos: 7.5,30.5 + parent: 2 - proto: SpawnMobAlexander entities: - uid: 1866 @@ -69557,6 +69679,16 @@ entities: - type: Transform pos: 45.5,10.5 parent: 2 + - uid: 13765 + components: + - type: Transform + pos: 55.5,31.5 + parent: 2 + - uid: 13766 + components: + - type: Transform + pos: 57.5,31.5 + parent: 2 - proto: SpawnPointBotanist entities: - uid: 6750 @@ -69979,6 +70111,14 @@ entities: - type: Transform pos: 63.5,4.5 parent: 2 +- proto: StationAiUploadComputer + entities: + - uid: 12102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,29.5 + parent: 2 - proto: StationAnchor entities: - uid: 13717 @@ -69986,6 +70126,13 @@ entities: - type: Transform pos: 6.5,-19.5 parent: 2 +- proto: StationEfficiencyCircuitBoard + entities: + - uid: 13759 + components: + - type: Transform + pos: 52.427402,30.778826 + parent: 2 - proto: StationMap entities: - uid: 1761 @@ -73415,16 +73562,6 @@ entities: showEnts: False occludes: True ents: [] - - uid: 12658 - components: - - type: Transform - pos: 52.5,33.5 - parent: 2 - - uid: 12659 - components: - - type: Transform - pos: 60.5,33.5 - parent: 2 - proto: TeslaCoil entities: - uid: 5664 @@ -84996,6 +85133,12 @@ entities: rot: 1.5707963267948966 rad pos: 52.5,31.5 parent: 2 + - uid: 13761 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 52.5,29.5 + parent: 2 - proto: WindoorSecureEngineeringLocked entities: - uid: 4152 @@ -86111,12 +86254,6 @@ entities: - type: Transform pos: 52.5,30.5 parent: 2 - - uid: 13653 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,31.5 - parent: 2 - proto: Wirecutter entities: - uid: 10793 diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 671e9d80eac0d6..d098c20fd60c53 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -5,6 +5,7 @@ Slash: 0.5 Piercing: 0.7 Shock: 1.2 + Structural: 0.5 flatReductions: Blunt: 5 Heat: 5 @@ -66,6 +67,7 @@ Piercing: 0.7 Shock: 2 Heat: 3 + Structural: 0.5 # Like metallic, but without flat reduction so it can be damaged with fists. - type: damageModifierSet @@ -98,6 +100,7 @@ Piercing: 2.0 Heat: 0.5 Shock: 0 + Structural: 0.25 flatReductions: Blunt: 5 @@ -138,6 +141,7 @@ Slash: 2.0 Piercing: 1.0 Heat: 2.0 + Structural: 0.5 flatReductions: Blunt: 5 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 9adf1ca8889803..0250671acfc5d9 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -1,8 +1,9 @@ - type: entity - parent: [ClothingShoesBase, BaseToggleClothing, BaseEngineeringContraband] - id: ClothingShoesBootsMag + parent: [ClothingShoesBase, BaseToggleClothing] + id: ClothingShoesBootsMagBase name: magboots description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. + abstract: true components: - type: Sprite sprite: Clothing/Shoes/Boots/magboots.rsi @@ -36,7 +37,11 @@ - WhitelistChameleon - type: entity - parent: [ClothingShoesBootsMag, BaseGrandTheftContraband] + parent: [ClothingShoesBootsMagBase] + id: ClothingShoesBootsMag + +- type: entity + parent: [ClothingShoesBootsMagBase, BaseGrandTheftContraband] id: ClothingShoesBootsMagAdv name: advanced magboots description: State-of-the-art magnetic boots that do not slow down their wearer. @@ -59,7 +64,7 @@ stealGroup: ClothingShoesBootsMagAdv - type: entity - parent: ClothingShoesBootsMag + parent: [ClothingShoesBootsMagBase] id: ClothingShoesBootsMagSci components: - type: Sprite @@ -68,7 +73,7 @@ sprite: Clothing/Shoes/Boots/magboots-science.rsi - type: entity - parent: ClothingShoesBootsMag + parent: ClothingShoesBootsMagBase id: ClothingShoesBootsMagBlinding name: magboots of blinding speed description: These would look fetching on a fetcher like you. @@ -80,7 +85,7 @@ price: 3000 - type: entity - parent: [ClothingShoesBootsMag, BaseJetpack, BaseSyndicateContraband] + parent: [ClothingShoesBootsMagBase, BaseJetpack, BaseSyndicateContraband] id: ClothingShoesBootsMagSyndie name: blood-red magboots description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas. diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 28e5a239ef3b47..59fa1b0d1a6e79 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -168,7 +168,7 @@ replacementTiles: - FloorMetalFoam - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 0c9d6f3f4c8d1b..27f9fc99f0ce4c 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -71,7 +71,7 @@ components: - type: CombatMode - type: MovementSpeedModifier - baseWalkSpeed : 7 + baseWalkSpeed : 3 baseSprintSpeed : 7 - type: Sprite drawdepth: Mobs @@ -335,7 +335,7 @@ 0: Alive 1: Dead - type: MovementSpeedModifier - baseWalkSpeed : 5 + baseWalkSpeed : 2.5 baseSprintSpeed : 5 - type: DamageStateVisuals states: @@ -711,7 +711,7 @@ description: Despite popular misconceptions, it's not actually made of butter. components: - type: MovementSpeedModifier - baseWalkSpeed : 6 + baseWalkSpeed : 3 baseSprintSpeed : 6 - type: Sprite drawdepth: Mobs @@ -1633,7 +1633,7 @@ 10: Critical 20: Dead - type: MovementSpeedModifier - baseWalkSpeed : 5 + baseWalkSpeed : 2.5 baseSprintSpeed : 5 - type: DamageStateVisuals states: @@ -1974,7 +1974,7 @@ description: Hop hop hop. Lookin' moist. components: - type: MovementSpeedModifier - baseWalkSpeed: 4 + baseWalkSpeed: 3 baseSprintSpeed: 6 - type: Sprite drawdepth: Mobs @@ -2032,7 +2032,7 @@ description: Infiltrates your domain, spies on you, and somehow still a cool pet. components: - type: MovementSpeedModifier - baseWalkSpeed : 6 + baseWalkSpeed : 2.5 baseSprintSpeed : 6 - type: Sprite drawdepth: Mobs @@ -2144,7 +2144,7 @@ description: A small penguin with a grenade strapped around its neck. Harvested by the Syndicate from icy shit-hole planets. components: - type: MovementSpeedModifier - baseWalkSpeed: 3.5 + baseWalkSpeed: 3 baseSprintSpeed: 5 - type: InputMover - type: MobMover @@ -3167,7 +3167,7 @@ description: Very slow animal. For people with low energy. components: - type: MovementSpeedModifier - baseWalkSpeed : 1 + baseWalkSpeed : 0.5 baseSprintSpeed : 1 - type: Sprite drawdepth: Mobs @@ -3327,7 +3327,7 @@ 40: Critical 60: Dead - type: MovementSpeedModifier - baseWalkSpeed : 4 + baseWalkSpeed : 2.5 baseSprintSpeed : 4 - type: Inventory speciesId: hamster diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml index 506e3677c89fc5..f3ffddda67b695 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml @@ -437,6 +437,7 @@ description: ghost-role-information-snail-description rules: ghost-role-information-freeagent-rules - type: GhostTakeoverAvailable + - type: Emoting - type: Sprite drawdepth: SmallMobs sprite: Mobs/Animals/snail.rsi @@ -591,9 +592,9 @@ Alive: Base: spacesnail Critical: - Base: spacesnaildead + Base: spacedead Dead: - Base: spacesnaildead + Base: spacedead - type: MovementSpeedModifier baseWalkSpeed : 5 #he go fast, also they cant slip so its probably fine. baseSprintSpeed : 7 diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 6f4baf2785d255..25ff782108a31f 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -57,7 +57,7 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: MeleeSound soundGroups: diff --git a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml index ac18362a054a92..c5feaa4cbb1dbd 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml @@ -1,7 +1,7 @@ - type: entity id: WoodenSign name: wooden sign - description: He's pointing somewhere. + description: He's pointing somewhere. components: - type: Clickable - type: InteractionOutline @@ -18,7 +18,7 @@ bounds: "-0.35,-0.4,0.35,0.4" density: 100 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: MeleeSound soundGroups: @@ -66,7 +66,7 @@ sprite: Objects/Decoration/mines.rsi state: support - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Physics bodyType: Static @@ -141,7 +141,7 @@ sprite: Objects/Decoration/mines.rsi state: support_wall - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Physics bodyType: Static @@ -189,4 +189,4 @@ spawn: Log: min: 1 - max: 3 \ No newline at end of file + max: 3 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml index d3293bbfd22a1f..e15d1a22a5c080 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/power_electronics.yml @@ -73,7 +73,7 @@ parent: BaseElectronics id: SolarTrackerElectronics name: solar tracker electronics - description: Advanced circuit board used to detect differences in pressure, temperature and gas concentrations between the two sides of the door. + description: Advanced circuit board used to track the nearest star. components: - type: Sprite sprite: Objects/Misc/module.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index a9b86d4d830bdc..bffa8ca13455d4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -219,7 +219,7 @@ startingItem: PowerCellMedium - type: Anchorable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -249,7 +249,7 @@ state: floodlight_broken - type: Anchorable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml index d11aa714cb524a..be732c17af03c8 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml @@ -20,7 +20,7 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Inflatable - type: Destructible thresholds: @@ -68,7 +68,7 @@ closeSound: path: /Audio/Misc/zip.ogg - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Inflatable - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml index 157178771579cf..91c90d1ce96d19 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml @@ -26,7 +26,7 @@ loot: All: SpaceshroomGather - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml index 07bdee63cfc9ff..e95e663a7957c0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml @@ -30,7 +30,7 @@ - sprite: Structures/catwalk.rsi state: catwalk_preview - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml index 9277497e4f42d1..c299c4b511fab4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml @@ -44,7 +44,7 @@ lockTime: 5 unlockTime: 5 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml index f2f1cb8ac02aab..5ab5ffc626499f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml @@ -54,8 +54,8 @@ - type: PlaceableSurface isPlaceable: false - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: @@ -91,7 +91,7 @@ enum.PaperLabelVisuals.Layer: True: { offset: "0.0,0.3125" } False: { offset: "0.0,0.0" } - + - type: LockVisuals - type: ItemSlots - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml index 29efdaea5d36bc..b60b2bd9435912 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml @@ -15,7 +15,7 @@ energy: 3 color: "#FFC90C" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index c1a01c423b1e4d..3e5f9ca18a9bea 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -38,7 +38,7 @@ energy: 3 color: "#52ff39" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml index 77b03d36f5d845..1d5069c7da8cf1 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml @@ -36,7 +36,7 @@ - type: Appearance - type: Damageable damageContainer: Inorganic - damageModifierSet: Wood + damageModifierSet: Wood - type: Destructible thresholds: - trigger: @@ -52,7 +52,7 @@ max: 2 - type: WallMount arc: 360 - + - type: entity id: HospitalCurtains parent: BaseCurtains diff --git a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml index 6ce4326831a683..b2806b93c99732 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml @@ -19,7 +19,7 @@ autoRot: true offset: "0, 0.6" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml index 3446c4980b487d..acedcb69765847 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml @@ -35,7 +35,7 @@ energy: 3 color: "#FF6F00" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml index 39d58973bb73f6..001245d71d8c6f 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml @@ -38,7 +38,8 @@ graph: Mannequin node: mannequin - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic + damageModifierSet: Wood - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml index 53cc75faa61b5b..0805ad1e9d48b0 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml @@ -7,7 +7,7 @@ components: - type: Anchorable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml index 213ad47d88fc49..e24c7a03d6c1a8 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml @@ -35,7 +35,7 @@ - type: Anchorable - type: Pullable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml index 283c9f22ae5ad6..375c5ce37cbef2 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml @@ -28,8 +28,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: RCDDeconstructable cost: 6 delay: 8 @@ -46,4 +46,4 @@ graph: Airlock node: assembly placement: - mode: SnapgridCenter \ No newline at end of file + mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index e4b2424301189d..8a08100822486c 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -17,8 +17,8 @@ - type: DeviceNetworkRequiresPower - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: RCDDeconstructable cost: 4 delay: 6 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml index c728d279330f53..f33cb817e569b8 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml @@ -23,12 +23,12 @@ node: frame1 - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: RCDDeconstructable cost: 4 delay: 6 - fx: EffectRCDDeconstruct6 + fx: EffectRCDDeconstruct6 - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index b8fb203b517a64..e5e82fc5e60837 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -41,7 +41,7 @@ - type: Appearance - type: Airtight - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: RCDDeconstructable cost: 6 @@ -100,7 +100,7 @@ closeSound: path: /Audio/Effects/door_close.ogg - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: @@ -149,8 +149,8 @@ - state: closed map: ["enum.DoorVisualLayers.Base"] - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml index 06e9d2219a5e4e..2f1ad217cebd46 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml @@ -39,8 +39,8 @@ time: 2 - type: Airtight - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: RCDDeconstructable cost: 6 delay: 8 @@ -99,8 +99,8 @@ noRot: false - type: Rotatable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: RCDDeconstructable cost: 6 delay: 8 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml index c59814a41c09ee..7239dd7eed5a89 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml @@ -66,8 +66,8 @@ state: assembly - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index 955b9ba640df23..28cdfb3f8ab113 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -64,7 +64,7 @@ resistance: 2 - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: StrongMetallic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -212,7 +212,7 @@ - board - type: InteractionOutline - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml index 24e5db81a92629..cbc3d13fb409ca 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml @@ -24,7 +24,7 @@ - type: Pullable - type: Rotatable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: RCDDeconstructable cost: 6 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index b7d0cf8cbb0e87..e9d95f90bebdf9 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml @@ -64,7 +64,7 @@ lastSignals: DoorStatus: false - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: ExaminableDamage messages: WindowMessages diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml index c1b0cf0423bfe6..2862980dad3341 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml @@ -6,7 +6,7 @@ abstract: true components: - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: PlaceableSurface - type: Fixtures diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index e424b1b40b4e88..fba7864ac16d32 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -22,7 +22,7 @@ layer: - TableLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: IconSmooth key: state @@ -79,7 +79,7 @@ layer: - TableLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: IconSmooth key: state @@ -122,7 +122,7 @@ sprite: Structures/Furniture/Tables/frame.rsi state: full - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: IconSmooth key: state @@ -166,7 +166,7 @@ - type: Icon sprite: Structures/Furniture/Tables/generic.rsi - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -414,7 +414,7 @@ - type: Icon sprite: Structures/Furniture/Tables/brass.rsi - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -443,7 +443,7 @@ - type: Construction graph: Table node: TableBrass - + - type: entity id: TableWood parent: TableBase @@ -604,7 +604,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 25 + damage: 25 behaviors: - !type:PlaySoundBehavior sound: @@ -677,7 +677,7 @@ - type: Construction graph: Table node: TableFancyRed - + - type: entity id: TableFancyPurple parent: TableFancyBase @@ -690,7 +690,7 @@ - type: Construction graph: Table node: TableFancyPurple - + - type: entity id: TableFancyPink parent: TableFancyBase @@ -703,7 +703,7 @@ - type: Construction graph: Table node: TableFancyPink - + - type: entity id: TableFancyGreen parent: TableFancyBase @@ -712,11 +712,11 @@ - type: Sprite sprite: Structures/Furniture/Tables/Fancy/green.rsi - type: Icon - sprite: Structures/Furniture/Tables/Fancy/green.rsi + sprite: Structures/Furniture/Tables/Fancy/green.rsi - type: Construction graph: Table node: TableFancyGreen - + - type: entity id: TableFancyOrange parent: TableFancyBase @@ -729,7 +729,7 @@ - type: Construction graph: Table node: TableFancyOrange - + - type: entity id: TableFancyWhite parent: TableFancyBase @@ -782,7 +782,7 @@ sprite: Structures/Furniture/Tables/counterwood.rsi state: full - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: @@ -825,7 +825,7 @@ sprite: Structures/Furniture/Tables/countermetal.rsi state: full - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml index 4eaed51597e467..09ec0a9ea823cc 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml @@ -9,8 +9,8 @@ - type: Transform - type: Prayable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: Wood - type: PlaceableSurface - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml index 30aa793767a3de..2430987b18c7c0 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml @@ -17,7 +17,7 @@ fillBaseName: book - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index 92d1118d4ead8e..dcc2f1159452bf 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -9,7 +9,7 @@ state: dresser - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index d1483327c605ee..97c845a7862440 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -35,7 +35,7 @@ stash: !type:ContainerSlot {} - type: Pullable - type: Damageable - damageContainer: Inorganic # The pot. Not the plant. Or is it plastic? + damageContainer: StructuralInorganic # The pot. Not the plant. Or is it plastic? - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml index aaa0ed716d762b..f9bf81695e9476 100644 --- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml @@ -115,4 +115,4 @@ damage: 60 behaviors: - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index a340c00a690aef..5327d69cff2c75 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -560,8 +560,8 @@ energy: 1.6 color: "#3c5eb5" - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: entity parent: ComputerComms @@ -816,8 +816,8 @@ speechVerb: Robotic speechSounds: Pai - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: GuideHelp guides: - Cloning diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml index 08e3173334bdb3..4ddabbd1e2a43e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml @@ -25,7 +25,7 @@ - type: Sprite drawdepth: Objects - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml index 539c8a244ae34f..ed5137c28f5784 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml @@ -54,8 +54,8 @@ boardName: wires-board-name-cryopod layoutId: CryoPod - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml index fb5ed4440a9267..aab56b455aaf71 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml @@ -22,8 +22,8 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index 0451b394909827..09902be97072c9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml @@ -31,7 +31,7 @@ containers: - clonepod-bodyContainer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: StrongMetallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml index fc417e68d6c35b..96de462b79c695 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml @@ -80,8 +80,8 @@ containers: - entity_storage - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml index 3b3f0402aa2e6d..dd1475ad708b38 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml @@ -37,7 +37,7 @@ machine_board: !type:Container machine_parts: !type:Container - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -92,7 +92,7 @@ - machine_board - machine_parts - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -141,7 +141,7 @@ graph: Machine node: destroyedMachineFrame - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml b/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml index acd8527dbbad83..41c143f855d2b0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml @@ -29,7 +29,7 @@ enum.JukeboxUiKey.Key: type: JukeboxBoundUserInterface - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml index de19db96b52bfd..54f7218b102ea9 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml @@ -51,7 +51,7 @@ machine_board: !type:Container machine_parts: !type:Container - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: StrongMetallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml index 5a62b74ac0a13b..2d391d8690017f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml @@ -84,7 +84,7 @@ sound: collection: MetalBreak - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: DamageOnHighSpeedImpact damage: diff --git a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml index 95079b5c858269..c5891d1143fcc6 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml @@ -10,7 +10,7 @@ - type: WirelessNetworkConnection range: 200 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Rotatable rotateWhileAnchored: true diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index df3b276652e515..4fe5463bff9674 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -12,7 +12,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: SubFloorHide - type: CollideOnAnchor diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml index 87e71400f7322b..bd7e84f8208196 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml @@ -67,7 +67,7 @@ - type: Machine board: PortableScrubberMachineCircuitBoard - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -154,7 +154,7 @@ temperatureTolerance: 0.2 atmospheric: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml index 6f3d0705cbb796..6eb90bcb7ca553 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml @@ -29,7 +29,7 @@ graph: DisposalMachine node: frame - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index af8cadee18e55c..afeba380ae0494 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -29,7 +29,7 @@ anchored: true - type: Anchorable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index 6946dcbf83583a..298e238f018c44 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml @@ -53,8 +53,8 @@ !type:CableDeviceNode nodeGroupID: MVPower - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml index ea41ba3a20df7c..558504d5797584 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml @@ -20,7 +20,8 @@ path: /Audio/Effects/tesla.ogg - type: PointLight enabled: true - radius: 5 + radius: 8 + energy: 2 color: "#4080FF" - type: Appearance - type: LightningArcShooter @@ -59,6 +60,9 @@ - Opaque layer: - GlassLayer + - type: PointLight + radius: 10 + energy: 16 - type: EventHorizon radius: 0.5 canBreachContainment: false diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index b7d6b5a128d4e0..ecc5f20420b972 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -29,8 +29,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: @@ -153,8 +153,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml index 1faee965d4e3ad..6d483bd9cedfa0 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml @@ -52,7 +52,7 @@ - type: Anchorable - type: Pullable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: PacifismDangerousAttack - type: Destructible diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index a997dbbf9d6984..e43ee9adca41d9 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml @@ -49,7 +49,7 @@ onBump: false requirePower: true highVoltageNode: output - - type: RequireProjectileTarget + - type: RequireProjectileTarget - type: entity id: SolarPanel @@ -62,7 +62,7 @@ supplyRampRate: 500 - type: SolarPanel - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -91,7 +91,7 @@ - type: Sprite state: broken - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -142,7 +142,7 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -158,7 +158,7 @@ graph: SolarPanel node: solarassembly defaultTarget: solarpanel - - type: RequireProjectileTarget + - type: RequireProjectileTarget - type: entity id: SolarTracker @@ -188,8 +188,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -203,4 +203,4 @@ - type: Construction graph: SolarPanel node: solartracker - - type: RequireProjectileTarget + - type: RequireProjectileTarget diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index a52292d7fb902e..7c0537dec6e763 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -105,8 +105,8 @@ - type: WiresPanel - type: WiresVisuals - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: @@ -167,8 +167,8 @@ node: apcFrame - type: WallMount - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml index cc3379117427ab..8c7ee9e2194c68 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml @@ -15,12 +15,12 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: RCDDeconstructable cost: 2 delay: 0 - fx: EffectRCDConstruct0 + fx: EffectRCDConstruct0 - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index 15f28eb53ec17e..2e4a70eedcecef 100644 --- a/Resources/Prototypes/Entities/Structures/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -78,8 +78,8 @@ highVoltageNode: input mediumVoltageNode: output - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: BatterySensor - type: DeviceNetwork deviceNetId: AtmosDevices diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index b4e669519a4529..a8bdebd10a37ce 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -52,8 +52,8 @@ supplyRampTolerance: 5000 supplyRampRate: 1000 - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: PacifismDangerousAttack - type: Destructible thresholds: @@ -183,8 +183,8 @@ supplyRampTolerance: 5000 supplyRampRate: 1000 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: PacifismDangerousAttack - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index 08eff29c81b86b..47ac2ae7c943a2 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml @@ -32,7 +32,7 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Transform anchored: true @@ -291,7 +291,7 @@ containers: ballistic-ammo: !type:Container - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml index 7b9a3225556d1a..e0fc2987b35d66 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/station_anchor.yml @@ -3,6 +3,7 @@ abstract: true name: station anchor description: Prevents stations from moving. + suffix: On placement: mode: AlignTileAny components: @@ -107,3 +108,11 @@ interfaces: enum.PowerChargeUiKey.Key: type: PowerChargeBoundUserInterface + +- type: entity + parent: StationAnchor + id: StationAnchorOff + suffix: Off + components: + - type: StationAnchor + switchedOn: false diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index f87be426598252..fa8b382ade8ad8 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -40,7 +40,7 @@ powerLoad: 1500 - type: ExtensionCableReceiver - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Destructible thresholds: @@ -193,7 +193,7 @@ - !type:ChangeConstructionNodeBehavior node: machineFrame - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: StaticPrice price: 2000 diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml index e0247001f2012b..2a7e96ae620e04 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml @@ -41,8 +41,8 @@ - type: DrainableSolution solution: drainBuffer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml index 17920565ef3108..fdb57e66192735 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml @@ -26,7 +26,7 @@ - state: wardingtower-unshaded shader: unshaded - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Physics bodyType: Static diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index d7af46701c6d35..b515dffc2b8d83 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -145,7 +145,7 @@ entity_storage: !type:Container ents: [] - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -259,7 +259,7 @@ placeCentered: true isPlaceable: false - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml index 191aa4f1339e78..70c7647fcc87cb 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml @@ -40,7 +40,7 @@ containers: storagebase: !type:Container - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml index c868bbbc332d05..8a0b6cdebcad6b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml @@ -69,7 +69,7 @@ damageOverlay: sprite: Structures/Storage/glassbox.rsi - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: MeleeSound soundGroups: diff --git a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml index b26bb2c954f167..a23818ee4666ee 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml @@ -9,7 +9,7 @@ - type: Anchorable - type: InteractionOutline - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index c064db1c5b5e29..bd8a9c2fd6ef60 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -31,7 +31,7 @@ layer: - TableLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 7f306bbf94612b..285b7a4770a26c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -88,7 +88,7 @@ graph: AirAlarm node: air_alarm - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml index 18b218b35169f0..3e5c2486ea185b 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml @@ -31,7 +31,7 @@ components: - Defibrillator - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml index 9f36f47920313e..30db2d8e4d5c2c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml @@ -32,7 +32,7 @@ components: - SpraySafety - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml index 3088e0a00151e5..6cf7ba16142690 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml @@ -81,7 +81,7 @@ graph: FireAlarm node: fire_alarm - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml index 42b528ce68df5f..c2d3c6767f85ac 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml @@ -8,7 +8,7 @@ mode: SnapgridCenter components: - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 60cea31fff296d..07b29b72259e7b 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -78,8 +78,8 @@ graph: Intercom node: intercom - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml index 9c3141298f4027..8c98831e1ffff1 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml @@ -60,7 +60,7 @@ - WallLayer - type: WallMount - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml index 2da4fbc3c4c437..76e17b3040cc7e 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml @@ -23,7 +23,7 @@ anchored: true - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml index 321d1f4e189021..e9c1672c1c06ce 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml @@ -20,7 +20,7 @@ - type: Transform - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -119,7 +119,7 @@ state: base - type: Damageable damageModifierSet: Metallic - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -154,7 +154,7 @@ state: base - type: Damageable damageModifierSet: Glass - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml index 2ae5040910e19c..4845976c79f150 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml @@ -16,7 +16,7 @@ layers: - state: station_map_broken - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml index e25c7df8d7296d..db269426236e90 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml @@ -48,7 +48,7 @@ alwaysRandomize: true layoutId: SurveillanceCamera - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Sprite drawdepth: WallMountedItems @@ -233,7 +233,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Sprite drawdepth: WallMountedItems diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml index 3570264a57ac0e..945bfb1a6c2b54 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml @@ -18,7 +18,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 4673405e03f543..755a1ee8b4ca97 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -648,7 +648,7 @@ tags: - Pickaxe - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml index 1dca59225cbc41..2d0c55af5a7bea 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml @@ -18,7 +18,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml index 41dbe21d5f1848..01257f85f7cdf3 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml @@ -21,7 +21,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: RCDDeconstructable cost: 2 diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml index 3ac9f1ddbf551a..2bca0ea41d9129 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml @@ -28,8 +28,8 @@ sprite: Structures/Walls/solid.rsi state: wall_girder - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index 84dbb92d1f18d8..2b65528d225064 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -12,7 +12,7 @@ - type: RCDDeconstructable cost: 6 delay: 4 - fx: EffectRCDDeconstruct4 + fx: EffectRCDDeconstruct4 - type: CanBuildWindowOnTop - type: Sprite drawdepth: Walls @@ -134,7 +134,7 @@ bodyType: Static canCollide: false - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -233,4 +233,4 @@ - type: Construction graph: GrilleDiagonal node: clockworkGrilleDiagonal - + diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml index 28227afa17e939..db456c512fe25f 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml @@ -15,7 +15,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Climbable - type: Construction @@ -171,7 +171,7 @@ acts: [ "Destruction" ] - type: Construction node: railingCornerSmall - + - type: entity parent: BaseRailing id: RailingRound diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index f48a12de33793f..8cdd9e9e79580a 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -819,7 +819,7 @@ sprite: Structures/Walls/shuttle_diagonal.rsi state: state0 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: StructuralMetallic - type: Physics bodyType: Static diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index e6f9cbd661ce7c..56a38f82fcfe0a 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -146,7 +146,7 @@ - GlassLayer - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: ExaminableDamage messages: WindowMessages diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml index 9dc9f77cffc57c..c37a6338dc4948 100644 --- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml +++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml @@ -30,8 +30,8 @@ map: [ "enum.CargoTelepadLayers.Beam" ] shader: unshaded - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: BasicDevice diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index 6dee91365ef0bd..ed355f0ec8b7a6 100644 --- a/Resources/Prototypes/Entities/Structures/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -30,7 +30,7 @@ graph: Catwalk node: Catwalk - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -54,4 +54,4 @@ - type: RCDDeconstructable cost: 2 delay: 2 - fx: EffectRCDDeconstruct2 \ No newline at end of file + fx: EffectRCDDeconstruct2 diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml index d82370ba0d6cfd..d1281ceba6d1de 100644 --- a/Resources/Prototypes/Entities/Structures/conveyor.yml +++ b/Resources/Prototypes/Entities/Structures/conveyor.yml @@ -52,7 +52,7 @@ graph: ConveyorGraph node: entity - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml index 6e2b5f0250bc54..5825cec6ad262c 100644 --- a/Resources/Prototypes/Entities/Structures/meat_spike.yml +++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml @@ -13,7 +13,7 @@ - state: spike map: ["base"] - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml index 0ff3b0d7d36d40..1d107b50cd7a5c 100644 --- a/Resources/Prototypes/Entities/Structures/stairs.yml +++ b/Resources/Prototypes/Entities/Structures/stairs.yml @@ -14,7 +14,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Metallic - type: Destructible thresholds: @@ -59,7 +59,7 @@ - type: entity id: StairStageWhite parent: Stairs - suffix: White, stage + suffix: White, stage components: - type: Sprite sprite: Structures/stairs.rsi diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 67daee720f525c..408271109fcd31 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -491,9 +491,9 @@ parent: BaseGameRule components: - type: StationEvent - earliestStart: 50 - minimumPlayers: 30 - weight: 2 + earliestStart: 90 + minimumPlayers: 40 + weight: 1 # Zombies was happening basically every single survival round, so now it's super rare duration: 1 - type: ZombieRule - type: AntagSelection diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 2f54c89b218e64..4205cc24cc2e96 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -62,4 +62,4 @@ Reporter: [ 2, 2 ] #silicon StationAi: [ 1, 1 ] - Borg: [ 4, 4 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/cog.yml b/Resources/Prototypes/Maps/cog.yml index d15ef4c76e485d..45e77206c2ed3e 100644 --- a/Resources/Prototypes/Maps/cog.yml +++ b/Resources/Prototypes/Maps/cog.yml @@ -26,7 +26,7 @@ Janitor: [ 3, 3 ] Chaplain: [ 1, 1 ] Reporter: [ 2, 2 ] - #Librarian: [ 1, 1 ] no library :c + Librarian: [ 1, 1 ] #finally added library ServiceWorker: [ 3, 3 ] #engineering ChiefEngineer: [ 1, 1 ] @@ -50,7 +50,7 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] #No office but there is a courtroom, maybe limit to one + Lawyer: [ 2, 2 ] #they also got a office now #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 30e142e8c0d9b7..b5c6fe9007d527 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -43,7 +43,6 @@ ResearchDirector: [ 1, 1 ] Scientist: [ 5, 5 ] ResearchAssistant: [ 6, 6 ] - Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] @@ -60,3 +59,6 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + #silicon + StationAi: [ 1, 1 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 32ad8d576c24c7..40f6b070021034 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -43,7 +43,6 @@ ResearchDirector: [ 1, 1 ] Scientist: [ 4, 4 ] ResearchAssistant: [ 3, 3 ] - Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] Warden: [ 1, 1 ] @@ -60,3 +59,6 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + #silicon + StationAi: [ 1, 1 ] + Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index 787c91be5e1316..f07391bd4f6127 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -57,4 +57,6 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] + #silicon + StationAi: [ 1, 1 ] Borg: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 1d09e766218238..86909e86edb130 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -56,4 +56,6 @@ Clown: [ 1, 1 ] Mime: [ 1, 1 ] Musician: [ 1, 1 ] - Borg: [ 1 , 1 ] + #silicon + StationAi: [ 1, 1 ] + Borg: [ 1, 1 ] diff --git a/Resources/Prototypes/Recipes/Construction/utilities.yml b/Resources/Prototypes/Recipes/Construction/utilities.yml index d07201bf7b377d..5dc0168fd36ca3 100644 --- a/Resources/Prototypes/Recipes/Construction/utilities.yml +++ b/Resources/Prototypes/Recipes/Construction/utilities.yml @@ -62,24 +62,6 @@ placementMode: SnapgridCenter canBuildInImpassable: true -- type: construction - name: solar assembly - id: SolarPanel - graph: SolarPanel - startNode: start - targetNode: solarpanel - category: construction-category-utilities - description: "Can be turned into a solar panel or solar tracker." - icon: - sprite: Structures/Power/Generation/solar_panel.rsi - state: solar_assembly - objectType: Structure - placementMode: SnapgridCenter - canBuildInImpassable: false - conditions: - - !type:TileNotBlocked - failIfSpace: false - - type: construction name: cable terminal id: CableTerminal diff --git a/Resources/Textures/LobbyScreens/behonker.webp b/Resources/Textures/LobbyScreens/behonker.webp index 83c4a577300f37..dec26853af3fd4 100644 Binary files a/Resources/Textures/LobbyScreens/behonker.webp and b/Resources/Textures/LobbyScreens/behonker.webp differ diff --git a/Resources/Textures/LobbyScreens/reclaimer-nuke.webp b/Resources/Textures/LobbyScreens/reclaimer-nuke.webp index b169086104bae2..d5f2d1a7ba38eb 100644 Binary files a/Resources/Textures/LobbyScreens/reclaimer-nuke.webp and b/Resources/Textures/LobbyScreens/reclaimer-nuke.webp differ diff --git a/Resources/Textures/LobbyScreens/terminalstation.webp b/Resources/Textures/LobbyScreens/terminalstation.webp index ae7cab269d1710..e260786410f5d0 100644 Binary files a/Resources/Textures/LobbyScreens/terminalstation.webp and b/Resources/Textures/LobbyScreens/terminalstation.webp differ