From 5ff5a72a7c37a5fee7f7cdb9e9b0f70a25665d19 Mon Sep 17 00:00:00 2001 From: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Date: Thu, 24 Oct 2024 23:06:38 -0500 Subject: [PATCH 01/44] Fix multiplying colors of differing nullabilities (#32991) --- .../Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs index 64068d6dbbf1..1caba06ff0b6 100644 --- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs +++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs @@ -292,7 +292,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[ if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor)) continue; - regionOverlay.Color = regionColor.Value; + regionOverlay.Color = regionColor; var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState; prioritizedRegionOverlays.Add(regionOverlay, priority); @@ -331,9 +331,9 @@ private void AddTrackedEntityToNavMap(AtmosAlertsDeviceNavMapData metaData, Atmo NavMap.TrackedEntities[metaData.NetEntity] = blip; } - private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, [NotNullWhen(true)] out Color? color) + private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, out Color color) { - color = null; + color = Color.White; var blip = GetBlipTexture(alarmState); From 1307733c4bf20562bc4ef969799148643434ba4c Mon Sep 17 00:00:00 2001 From: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Date: Fri, 25 Oct 2024 01:34:52 -0500 Subject: [PATCH 02/44] Make atmos alert computer colors private variables (#32992) --- .../AtmosAlertsComputerWindow.xaml.cs | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs index 1caba06ff0b6..81c9a409a3b4 100644 --- a/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs +++ b/Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs @@ -43,6 +43,18 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow private const float SilencingDuration = 2.5f; + // Colors + private Color _wallColor = new Color(64, 64, 64); + private Color _tileColor = new Color(28, 28, 28); + private Color _monitorBlipColor = Color.Cyan; + private Color _untrackedEntColor = Color.DimGray; + private Color _regionBaseColor = new Color(154, 154, 154); + private Color _inactiveColor = StyleNano.DisabledFore; + private Color _statusTextColor = StyleNano.GoodGreenFore; + private Color _goodColor = Color.LimeGreen; + private Color _warningColor = new Color(255, 182, 72); + private Color _dangerColor = new Color(255, 67, 67); + public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInterface, EntityUid? owner) { RobustXamlLoader.Load(this); @@ -55,8 +67,8 @@ public AtmosAlertsComputerWindow(AtmosAlertsComputerBoundUserInterface userInter NavMap.Owner = _owner; // Set nav map colors - NavMap.WallColor = new Color(64, 64, 64); - NavMap.TileColor = Color.DimGray * NavMap.WallColor; + NavMap.WallColor = _wallColor; + NavMap.TileColor = _tileColor; // Set nav map grid uid var stationName = Loc.GetString("atmos-alerts-window-unknown-location"); @@ -214,7 +226,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[ if (consoleCoords != null && consoleUid != null) { var texture = _spriteSystem.Frame0(new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png"))); - var blip = new NavMapBlip(consoleCoords.Value, texture, Color.Cyan, true, false); + var blip = new NavMapBlip(consoleCoords.Value, texture, _monitorBlipColor, true, false); NavMap.TrackedEntities[consoleUid.Value] = blip; } @@ -263,7 +275,7 @@ public void UpdateUI(EntityCoordinates? consoleCoords, AtmosAlertsComputerEntry[ VerticalAlignment = VAlignment.Center, }; - label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", StyleNano.GoodGreenFore.ToHexNoAlpha()))); + label.SetMarkup(Loc.GetString("atmos-alerts-window-no-active-alerts", ("color", _statusTextColor.ToHexNoAlpha()))); AlertsTable.AddChild(label); } @@ -323,7 +335,7 @@ private void AddTrackedEntityToNavMap(AtmosAlertsDeviceNavMapData metaData, Atmo var coords = _entManager.GetCoordinates(metaData.NetCoordinates); if (_trackedEntity != null && _trackedEntity != metaData.NetEntity) - color *= Color.DimGray; + color *= _untrackedEntColor; var selectable = true; var blip = new NavMapBlip(coords, _spriteSystem.Frame0(texture), color, _trackedEntity == metaData.NetEntity, selectable); @@ -341,10 +353,10 @@ private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarm return false; // Color the region based on alarm state and entity tracking - color = blip.Value.Item2 * new Color(154, 154, 154); + color = blip.Value.Item2 * _regionBaseColor; if (_trackedEntity != null && _trackedEntity != regionOwner) - color *= Color.DimGray; + color *= _untrackedEntColor; return true; } @@ -585,13 +597,13 @@ private AtmosAlarmType GetAlarmState(NetEntity netEntity) switch (alarmState) { case AtmosAlarmType.Invalid: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), StyleNano.DisabledFore); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _inactiveColor); break; case AtmosAlarmType.Normal: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), Color.LimeGreen); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_circle.png")), _goodColor); break; case AtmosAlarmType.Warning: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), new Color(255, 182, 72)); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_triangle.png")), _warningColor); break; case AtmosAlarmType.Danger: - output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), new Color(255, 67, 67)); break; + output = (new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/NavMap/beveled_square.png")), _dangerColor); break; } return output; From e3f442e790a8f33be0187d0b3059583fec242034 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sat, 26 Oct 2024 00:47:11 +0200 Subject: [PATCH 03/44] Add flash reaction effect (#32377) add flash reaction effect --- .../Effects/FlashReactionEffect.cs | 82 +++++++++++++++++++ .../en-US/guidebook/chemistry/effects.ftl | 6 ++ .../Entities/Effects/chemistry_effects.yml | 13 +++ .../Recipes/Reactions/chemicals.yml | 17 +++- 4 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 Content.Server/EntityEffects/Effects/FlashReactionEffect.cs diff --git a/Content.Server/EntityEffects/Effects/FlashReactionEffect.cs b/Content.Server/EntityEffects/Effects/FlashReactionEffect.cs new file mode 100644 index 000000000000..fbf99e902d35 --- /dev/null +++ b/Content.Server/EntityEffects/Effects/FlashReactionEffect.cs @@ -0,0 +1,82 @@ +using Content.Shared.EntityEffects; +using Content.Server.Flash; +using Robust.Server.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.Prototypes; + +namespace Content.Server.EntityEffects.Effects; + +[DataDefinition] +public sealed partial class FlashReactionEffect : EntityEffect +{ + /// + /// Flash range per unit of reagent. + /// + [DataField] + public float RangePerUnit = 0.2f; + + /// + /// Maximum flash range. + /// + [DataField] + public float MaxRange = 10f; + + /// + /// How much to entities are slowed down. + /// + [DataField] + public float SlowTo = 0.5f; + + /// + /// The time entities will be flashed in seconds. + /// The default is chosen to be better than the hand flash so it is worth using it for grenades etc. + /// + [DataField] + public float Duration = 4f; + + /// + /// The prototype ID used for the visual effect. + /// + [DataField] + public EntProtoId? FlashEffectPrototype = "ReactionFlash"; + + /// + /// The sound the flash creates. + /// + [DataField] + public SoundSpecifier? Sound = new SoundPathSpecifier("/Audio/Weapons/flash.ogg"); + + protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) + => Loc.GetString("reagent-effect-guidebook-flash-reaction-effect", ("chance", Probability)); + + public override void Effect(EntityEffectBaseArgs args) + { + var transform = args.EntityManager.GetComponent(args.TargetEntity); + var transformSystem = args.EntityManager.System(); + + var range = 1f; + + if (args is EntityEffectReagentArgs reagentArgs) + range = MathF.Min((float)(reagentArgs.Quantity * RangePerUnit), MaxRange); + + args.EntityManager.System().FlashArea( + args.TargetEntity, + null, + range, + Duration * 1000, + slowTo: SlowTo, + sound: Sound); + + if (FlashEffectPrototype == null) + return; + + var uid = args.EntityManager.SpawnEntity(FlashEffectPrototype, transformSystem.GetMapCoordinates(transform)); + transformSystem.AttachToGridOrMap(uid); + + if (!args.EntityManager.TryGetComponent(uid, out var pointLightComp)) + return; + var pointLightSystem = args.EntityManager.System(); + // PointLights with a radius lower than 1.1 are too small to be visible, so this is hardcoded + pointLightSystem.SetRadius(uid, MathF.Max(1.1f, range), pointLightComp); + } +} diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl index b65c332346a9..642555b237ea 100644 --- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl +++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl @@ -37,6 +37,12 @@ reagent-effect-guidebook-emp-reaction-effect = *[other] cause } an electromagnetic pulse +reagent-effect-guidebook-flash-reaction-effect = + { $chance -> + [1] Causes + *[other] cause + } a blinding flash + reagent-effect-guidebook-foam-area-reaction-effect = { $chance -> [1] Creates diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index 59fa1b0d1a6e..8784ed77cecd 100644 --- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml +++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml @@ -222,3 +222,16 @@ state: metal_foam-north - map: [ "enum.EdgeLayer.West" ] state: metal_foam-west + +- type: entity + id: ReactionFlash + categories: [ HideSpawnMenu ] + components: + - type: PointLight + enabled: true + radius: 2 + energy: 8 + - type: LightFade + duration: 0.5 + - type: TimedDespawn + lifetime: 0.5 diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 537a792e8596..78fdfec7c9a3 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -81,7 +81,7 @@ amount: 1 Sulfur: amount: 1 - Oxygen: + Oxygen: amount: 2 products: SulfuricAcid: 3 @@ -205,6 +205,20 @@ energyConsumption: 12500 duration: 15 +- type: reaction + id: Flash + impact: High + priority: 20 + reactants: + Aluminium: + amount: 1 + Potassium: + amount: 1 + Sulfur: + amount: 1 + effects: + - !type:FlashReactionEffect + - type: reaction id: TableSalt minTemp: 370 @@ -501,3 +515,4 @@ amount: 1 products: Tazinide: 1 + From 6998fa83a4c0f66b055b11fee3d8304c46363007 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 25 Oct 2024 22:48:20 +0000 Subject: [PATCH 04/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ca559c1338d8..ccbe6457f160 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Errant - changes: - - message: Medical Mask sprite now works on vox. - type: Fix - id: 7052 - time: '2024-08-07T03:41:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30702 - author: Lyroth001 changes: - message: Dragons are immune to flashes @@ -3959,3 +3952,11 @@ id: 7551 time: '2024-10-24T03:41:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32965 +- author: slarticodefast + changes: + - message: Mix 1u aluminium, 1u potassium and 1u sulfur for a flash reaction effect. + The radius scales with the reagent amount. + type: Add + id: 7552 + time: '2024-10-25T22:47:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32377 From 66432c5cd849b2e07f87150aba76bfe1daf42597 Mon Sep 17 00:00:00 2001 From: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Date: Sat, 26 Oct 2024 04:16:45 +0200 Subject: [PATCH 05/44] Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942) Fix loneop spawnrate by reverting it to not use the custom shuttle event system. --- Resources/Prototypes/GameRules/events.yml | 3 ++- Resources/Prototypes/GameRules/unknown_shuttles.yml | 5 ++--- Resources/Prototypes/Shuttles/shuttle_incoming_event.yml | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index e5e1192fc686..08218accede4 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -35,6 +35,7 @@ - id: RevenantSpawn - id: SleeperAgents - id: ZombieOutbreak + - id: LoneOpsSpawn - type: entity id: BaseStationEvent @@ -451,7 +452,7 @@ duration: 1 - type: RuleGrids - type: LoadMapRule - preloadedGrid: ShuttleStriker + mapPath: /Maps/Shuttles/ShuttleEvent/striker.yml - type: NukeopsRule roundEndBehavior: Nothing - type: AntagSelection diff --git a/Resources/Prototypes/GameRules/unknown_shuttles.yml b/Resources/Prototypes/GameRules/unknown_shuttles.yml index afbd552af3f4..f3391333b533 100644 --- a/Resources/Prototypes/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/GameRules/unknown_shuttles.yml @@ -20,7 +20,6 @@ - id: UnknownShuttleMeatZone - id: UnknownShuttleMicroshuttle - id: UnknownShuttleSpacebus - - id: UnknownShuttleInstigator - type: entityTable id: UnknownShuttlesFreelanceTable @@ -32,9 +31,9 @@ id: UnknownShuttlesHostileTable table: !type:AllSelector # we need to pass a list of rules, since rules have further restrictions to consider via StationEventComp children: - - id: LoneOpsSpawn + - id: UnknownShuttleInstigator -# Shuttle Game Rules +# Shuttle Game Rules - type: entity abstract: true diff --git a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml index a5269a73daef..1703e0c6980c 100644 --- a/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml +++ b/Resources/Prototypes/Shuttles/shuttle_incoming_event.yml @@ -1,8 +1,3 @@ -- type: preloadedGrid - id: ShuttleStriker - path: /Maps/Shuttles/ShuttleEvent/striker.yml - copies: 2 - - type: preloadedGrid id: ShuttleCargoLost path: /Maps/Shuttles/ShuttleEvent/lost_cargo.yml From 988b62074fa5bceb498bb744da86a68bb5665bc3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 26 Oct 2024 02:17:52 +0000 Subject: [PATCH 06/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ccbe6457f160..af594308d3ce 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lyroth001 - changes: - - message: Dragons are immune to flashes - type: Tweak - id: 7053 - time: '2024-08-07T07:42:00.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30658 - author: ShadowCommander changes: - message: Rollerbeds can now be dragged to the player to fold and pick them up. @@ -3960,3 +3953,11 @@ id: 7552 time: '2024-10-25T22:47:12.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32377 +- author: BramvanZijp + changes: + - message: Fixed the Lone Nuclear Operative mid-round antagonist being extremely + rare. + type: Fix + id: 7553 + time: '2024-10-26T02:16:45.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32942 From 5a10bf095499868be736a7fb9dd0bd1df37e9aa2 Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Sat, 26 Oct 2024 07:04:27 +0400 Subject: [PATCH 07/44] add atmosia to devmap (#32460) change --- Resources/Maps/Test/dev_map.yml | 9462 +++++++++++------ .../Structures/Piping/Atmospherics/miners.yml | 8 + 2 files changed, 5955 insertions(+), 3515 deletions(-) diff --git a/Resources/Maps/Test/dev_map.yml b/Resources/Maps/Test/dev_map.yml index 75511b176043..e535f9e01148 100644 --- a/Resources/Maps/Test/dev_map.yml +++ b/Resources/Maps/Test/dev_map.yml @@ -36,11 +36,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: eQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAA version: 6 1,-1: ind: 1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA + tiles: eQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAbAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -2,0: ind: -2,0 @@ -68,12 +68,16 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 -1,-2: ind: -1,-2 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAA version: 6 + 1,-2: + ind: 1,-2 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 - type: Broadphase - type: Physics bodyStatus: InAir @@ -100,247 +104,301 @@ entities: data: tiles: -4,0: + 0: 65532 + -4,-1: 0: 65535 -4,1: - 0: 65535 + 0: 15 + 1: 65280 + -5,1: + 1: 52292 + -4,2: + 1: 8959 + -5,2: + 1: 204 + -4,3: + 1: 8738 + -4,4: + 1: 230 -3,0: - 0: 65535 + 0: 65524 -3,1: - 0: 65535 + 0: 3823 + -3,2: + 1: 35071 + -3,-1: + 0: 56797 -2,0: - 0: 65535 + 0: 65534 -2,1: - 0: 65535 + 0: 61167 + -3,3: + 1: 8 + -2,3: + 1: 15 -2,2: - 0: 65535 + 0: 3822 + -2,-1: + 0: 61166 -1,0: 0: 65535 -1,1: 0: 65535 -1,2: + 0: 53247 + -1,3: + 1: 1 + -1,-1: 0: 65535 - -4,-3: - 0: 61440 - -4,-2: + 0,0: 0: 65535 - -4,-1: + 0,1: 0: 65535 - -3,-3: - 0: 61440 - -3,-2: + 0,2: 0: 65535 - -3,-1: + -4,-2: 0: 65535 + -3,-2: + 0: 56829 + -2,-2: + 0: 3838 -2,-4: - 0: 65520 + 0: 60928 -2,-3: - 0: 65535 - -2,-2: - 0: 65535 - -2,-1: - 0: 65535 + 0: 61166 -1,-4: - 0: 65535 + 0: 65350 -1,-3: 0: 65535 -1,-2: + 0: 4095 + -1,-5: + 0: 16384 + 0,-4: + 0: 65299 + 0,-3: 0: 65535 - -1,-1: + 0,-2: + 0: 53247 + 0,-1: 0: 65535 0,4: - 0: 61183 + 1: 17 + 0: 3276 + 0,3: + 1: 4368 + 0: 52428 + -1,4: + 1: 240 0,5: - 0: 61166 + 0: 52428 0,6: 0: 14 1,4: + 0: 17759 + 1,3: 0: 65535 1,5: - 0: 65535 + 0: 58990 1,6: - 0: 65535 + 0: 26350 1,7: - 0: 15 + 0: 4 2,4: - 0: 65535 + 0: 65419 2,5: - 0: 65535 + 0: 45311 2,6: - 0: 4095 + 0: 187 + 2,3: + 0: 16383 3,4: - 0: 65535 + 0: 46011 3,5: - 0: 65535 + 0: 47295 3,6: - 0: 53247 - 3,7: - 0: 12 - 0,0: - 0: 65535 - 0,1: - 0: 65535 - 0,2: - 0: 65535 - 0,3: - 0: 65535 + 0: 35007 + 3,3: + 0: 8191 + 4,4: + 0: 12595 + 4,5: + 0: 13107 + 4,6: + 0: 13107 1,0: 0: 65535 - 1,1: - 0: 65535 1,2: + 0: 65520 + 1,-1: 0: 65535 - 1,3: - 0: 65535 + 1,1: + 0: 61166 + 2,2: + 0: 7632 2,0: - 0: 4369 1: 8738 - 2,2: - 0: 65535 - 2,3: - 0: 65535 - 3,0: - 0: 65535 + 2,1: + 1: 2 3,2: - 0: 65535 - 3,3: - 0: 65535 + 0: 36828 + 3,0: + 0: 36590 3,1: - 0: 61166 - 0,-4: - 0: 65527 - 0,-3: - 0: 65535 - 0,-2: + 0: 52428 + 3,-1: + 0: 35771 + 4,0: + 0: 8191 + 4,1: 0: 65535 - 0,-1: + 4,2: 0: 65535 + 4,3: + 0: 8191 + 0,-5: + 0: 4096 1,-4: - 0: 30576 + 0: 48008 1,-3: - 0: 65399 + 0: 65467 1,-2: - 0: 63359 - 1,-1: + 0: 3003 + 1,-5: + 0: 34952 + 2,-4: + 0: 45875 + 1: 1092 + 2: 2056 + 2,-3: 0: 65535 2,-2: - 0: 4096 - 1: 8738 + 0: 61439 + 2,-5: + 0: 65535 2,-1: - 0: 4369 - 1: 8738 - 3,-1: - 0: 65262 + 0: 3822 + 3,-4: + 0: 65535 + 3,-3: + 0: 65535 3,-2: - 0: 61152 + 0: 48063 + 3,-5: + 0: 65535 + 4,-4: + 0: 65535 + 4,-3: + 0: 65535 4,-2: - 0: 65520 + 0: 65311 4,-1: + 0: 8191 + 4,-5: 0: 65535 + 5,-4: + 0: 62451 + 2: 3084 + 5,-3: + 0: 62451 + 3: 12 + 4: 3072 5,-2: - 0: 65520 + 0: 65283 + 5: 12 5,-1: - 0: 65535 + 0: 36863 + 5,-5: + 0: 62451 + 2: 3084 + 5,0: + 0: 40959 + 6,-4: + 2: 257 + 0: 4112 + 1: 17476 + 6,-3: + 3: 1 + 0: 4112 + 4: 256 + 1: 17476 6,-2: - 0: 65520 + 5: 1 + 0: 47872 + 1: 4 6,-1: + 0: 7103 + 6,-5: + 0: 4112 + 1: 17476 + 2: 257 + 6,0: 0: 65535 7,-2: - 0: 65520 + 0: 65280 7,-1: - 0: 65535 + 0: 8191 + 7,0: + 0: 13107 + 8,-2: + 0: 13056 + 8,-1: + 0: 819 -5,0: - 0: 52428 - -5,-3: - 0: 32768 - -5,-2: - 0: 51336 + 1: 17476 -5,-1: - 0: 52428 - 4,0: - 0: 65535 - 4,1: - 0: 65535 - 4,2: - 0: 65535 - 4,3: - 0: 65535 - 5,0: - 0: 65535 + 1: 17476 + -5,-2: + 1: 16384 5,1: - 0: 65535 + 0: 48051 5,2: - 0: 65535 + 0: 7103 5,3: - 0: 65535 - 6,0: - 0: 65535 + 0: 4095 6,1: - 0: 65535 + 0: 65525 6,2: - 0: 65535 + 0: 4095 6,3: - 0: 63351 - 7,0: - 0: 30583 - 7,1: - 0: 4375 - 7,2: - 0: 4369 - 7,3: - 0: 4096 - 8,-2: - 0: 30576 - 8,-1: - 0: 30583 - 4,4: - 0: 30583 - 4,5: - 0: 30583 - 4,6: - 0: 30583 - 4,7: - 0: 7 - -4,2: - 0: 26367 - -1,3: - 0: 15 - 2,1: - 0: 4369 - 1: 2 - -5,1: - 0: 52428 - -4,3: - 0: 26222 - -3,3: - 0: 15 - -2,3: - 0: 15 - -4,4: - 0: 238 + 0: 626 -3,4: - 0: 255 + 1: 240 -2,4: - 0: 255 - -1,4: - 0: 255 - -5,2: - 0: 204 - -3,2: - 0: 35071 - 0,-5: - 0: 28672 - -1,-5: + 1: 240 + 1,-7: + 1: 192 + 0: 32768 + 1,-6: + 0: 34952 + 2,-7: + 1: 240 0: 61440 - 2,-3: - 1: 12834 - 2,-4: - 1: 61166 - 3,-4: - 1: 13107 - 2,-5: - 1: 57344 - 3,-5: - 1: 12288 + 2,-6: + 0: 65535 + 3,-7: + 1: 240 + 0: 61440 + 3,-6: + 0: 65535 + 4,-7: + 1: 240 + 0: 62976 + 4,-6: + 0: 65535 + 5,-7: + 1: 240 + 0: 61440 + 5,-6: + 0: 62451 + 2: 3084 + 6,-7: + 1: 17520 + 0: 4096 + 6,-6: + 2: 257 + 0: 4112 + 1: 17476 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -357,6 +415,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -372,45 +445,102 @@ entities: - 0 - 0 - 0 - chunkSize: 4 - - type: GasTileOverlay - - type: BecomesStation - id: Dev - - type: SpreaderGrid - - type: GridPathfinding - - type: NavMap - - uid: 962 - components: - - type: MetaData - - type: Transform - - type: Map - - type: PhysicsMap - - type: GridTree - - type: MovedGrids - - type: Broadphase - - type: OccluderTree - - type: LoadedMap -- proto: AirAlarm - entities: - - uid: 800 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-4.5 - parent: 179 - - type: DeviceList - devices: - - 801 -- proto: AirCanister - entities: - - uid: 458 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 179 -- proto: Airlock - entities: - - uid: 48 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + - type: GasTileOverlay + - type: BecomesStation + id: Dev + - type: SpreaderGrid + - type: GridPathfinding + - type: NavMap + - uid: 962 + components: + - type: MetaData + - type: Transform + - type: Map + mapPaused: True + - type: PhysicsMap + - type: GridTree + - type: MovedGrids + - type: Broadphase + - type: OccluderTree + - type: LoadedMap +- proto: AirAlarm + entities: + - uid: 800 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 179 + - type: DeviceList + devices: + - 801 + - uid: 1556 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-12.5 + parent: 179 +- proto: AirCanister + entities: + - uid: 1281 + components: + - type: Transform + pos: 12.5,-5.5 + parent: 179 + - uid: 1284 + components: + - type: Transform + pos: 13.5,-5.5 + parent: 179 +- proto: Airlock + entities: + - uid: 48 components: - type: Transform pos: 7.5,20.5 @@ -435,6 +565,32 @@ entities: - type: Transform pos: 6.5,28.5 parent: 179 +- proto: AirlockAtmospherics + entities: + - uid: 77 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-8.5 + parent: 179 + - uid: 678 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-9.5 + parent: 179 + - uid: 904 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-6.5 + parent: 179 + - uid: 995 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-6.5 + parent: 179 - proto: AirlockCargo entities: - uid: 87 @@ -481,16 +637,6 @@ entities: - type: Transform pos: 0.5,-14.5 parent: 179 - - uid: 255 - components: - - type: Transform - pos: 7.5,-8.5 - parent: 179 - - uid: 256 - components: - - type: Transform - pos: 5.5,-8.5 - parent: 179 - uid: 318 components: - type: Transform @@ -741,6 +887,23 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-13.5 parent: 179 +- proto: AmmoniaCanister + entities: + - uid: 250 + components: + - type: Transform + pos: 9.5,-1.5 + parent: 179 + - uid: 251 + components: + - type: Transform + pos: 10.5,-1.5 + parent: 179 + - uid: 1317 + components: + - type: Transform + pos: 24.5,-19.5 + parent: 179 - proto: AnomalyLocator entities: - uid: 1086 @@ -795,3157 +958,2622 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 179 -- proto: Autolathe - entities: - - uid: 1 + - uid: 1184 components: - type: Transform - pos: 12.5,21.5 + pos: 22.5,-16.5 parent: 179 - - uid: 94 + - uid: 1187 components: - type: Transform - pos: -4.5,-5.5 + pos: 22.5,-14.5 parent: 179 - - uid: 446 + - uid: 1200 components: - type: Transform - pos: -6.5,5.5 + pos: 22.5,-10.5 parent: 179 - - uid: 528 + - uid: 1201 components: - type: Transform - pos: -12.5,-7.5 + pos: 22.5,-12.5 parent: 179 - - uid: 531 + - uid: 1207 components: - type: Transform - pos: -13.5,-7.5 + pos: 22.5,-18.5 parent: 179 - - uid: 532 + - uid: 1220 components: - type: Transform - pos: -14.5,-7.5 + pos: 22.5,-8.5 parent: 179 -- proto: BaseUplinkRadioDebug - entities: - - uid: 732 + - uid: 1235 components: - type: Transform - pos: 0.6038008,7.5209107 + pos: 22.5,-20.5 parent: 179 -- proto: Basketball - entities: - - uid: 951 + - uid: 1238 components: - type: Transform - pos: -9.702013,9.68404 + pos: 22.5,-22.5 parent: 179 - - uid: 952 + - uid: 1260 components: - type: Transform - pos: -10.879096,9.579802 + rot: 3.141592653589793 rad + pos: 22.5,-24.5 parent: 179 -- proto: Beaker - entities: - - uid: 174 + - uid: 1335 components: - type: Transform - pos: 25.291822,10.667244 + rot: 3.141592653589793 rad + pos: 18.5,-25.5 parent: 179 - - uid: 175 + - uid: 1336 components: - type: Transform - pos: 24.541822,10.635994 + rot: 1.5707963267948966 rad + pos: 17.5,-25.5 parent: 179 - - uid: 176 + - uid: 1489 components: - type: Transform - pos: 26.416822,10.651619 + rot: -1.5707963267948966 rad + pos: 13.5,-12.5 parent: 179 - - uid: 324 + - uid: 1493 components: - type: Transform - pos: 4.718221,9.39097 + rot: -1.5707963267948966 rad + pos: 15.5,-14.5 parent: 179 - - uid: 735 + - uid: 1500 components: - type: Transform - pos: 4.739054,9.807927 + rot: -1.5707963267948966 rad + pos: 13.5,-16.5 parent: 179 - - uid: 920 + - uid: 1507 components: - type: Transform - pos: -4.293744,10.966518 + pos: 7.5,-19.5 parent: 179 - - uid: 950 + - uid: 1508 components: - type: Transform - pos: -4.293744,10.966518 + pos: 8.5,-19.5 parent: 179 -- proto: BikeHorn - entities: - - uid: 672 + - uid: 1509 components: - type: Transform - pos: 1.1246341,7.500063 + pos: 9.5,-19.5 parent: 179 -- proto: BlastDoor - entities: - - uid: 202 + - uid: 1510 components: - type: Transform - pos: -2.5,-14.5 + pos: 10.5,-19.5 parent: 179 - - uid: 697 + - uid: 1511 components: - type: Transform - pos: 1.5,-14.5 + pos: 11.5,-19.5 parent: 179 - - uid: 698 + - uid: 1512 components: - type: Transform - pos: 1.5,-16.5 + pos: 12.5,-19.5 parent: 179 - - uid: 984 + - uid: 1513 components: - type: Transform - pos: -2.5,-16.5 + pos: 13.5,-19.5 parent: 179 -- proto: BoozeDispenser - entities: - - uid: 752 + - uid: 1514 components: - type: Transform - pos: 7.5,12.5 + pos: 14.5,-19.5 parent: 179 -- proto: BoxBeaker - entities: - - uid: 280 + - uid: 1515 components: - type: Transform - pos: 5.163024,9.63072 + pos: 14.5,-20.5 parent: 179 -- proto: Brutepack - entities: - - uid: 150 + - uid: 1516 components: - type: Transform - pos: 18.601385,5.512907 + pos: 14.5,-21.5 parent: 179 - - uid: 151 + - uid: 1517 components: - type: Transform - pos: 18.476385,4.841032 + pos: 14.5,-22.5 parent: 179 -- proto: Bucket - entities: - - uid: 691 + - uid: 1518 components: - type: Transform - pos: 7.1447573,15.900927 + pos: 14.5,-23.5 parent: 179 -- proto: CableApcExtension - entities: - - uid: 15 + - uid: 1519 components: - type: Transform - pos: 5.5,15.5 + pos: 14.5,-24.5 parent: 179 - - uid: 23 +- proto: AtmosFixBlockerMarker + entities: + - uid: 1582 components: - type: Transform - pos: 3.5,15.5 + pos: 23.5,-13.5 parent: 179 - - uid: 58 + - uid: 1583 components: - type: Transform - pos: 8.5,15.5 + pos: 23.5,-15.5 parent: 179 - - uid: 90 + - uid: 1584 components: - type: Transform - pos: 4.5,15.5 + pos: 23.5,-17.5 parent: 179 - - uid: 281 + - uid: 1585 components: - type: Transform - pos: -13.5,4.5 + pos: 23.5,-19.5 parent: 179 - - uid: 389 + - uid: 1586 components: - type: Transform - pos: 7.5,15.5 + pos: 23.5,-21.5 parent: 179 - - uid: 453 + - uid: 1587 components: - type: Transform - pos: 6.5,15.5 + pos: 23.5,-23.5 parent: 179 - - uid: 736 + - uid: 1588 components: - type: Transform - pos: -2.5,9.5 + pos: 10.5,-14.5 parent: 179 - - uid: 760 + - uid: 1589 components: - type: Transform - pos: -2.5,10.5 + pos: 22.5,-13.5 parent: 179 - - uid: 761 + - uid: 1590 components: - type: Transform - pos: -15.5,5.5 + pos: 24.5,-13.5 parent: 179 - - uid: 763 + - uid: 1591 components: - type: Transform - pos: -2.5,11.5 + pos: 24.5,-15.5 parent: 179 - - uid: 764 + - uid: 1592 components: - type: Transform - pos: -1.5,11.5 + pos: 22.5,-15.5 parent: 179 - - uid: 765 + - uid: 1593 components: - type: Transform - pos: -7.5,0.5 + pos: 22.5,-17.5 parent: 179 - - uid: 766 + - uid: 1594 components: - type: Transform - pos: -0.5,11.5 + pos: 24.5,-17.5 parent: 179 - - uid: 767 + - uid: 1595 components: - type: Transform - pos: -3.5,10.5 + pos: 24.5,-19.5 parent: 179 - - uid: 768 + - uid: 1596 components: - type: Transform - pos: -4.5,10.5 + pos: 22.5,-19.5 parent: 179 - - uid: 769 + - uid: 1597 components: - type: Transform - pos: -5.5,10.5 + pos: 22.5,-21.5 parent: 179 - - uid: 770 + - uid: 1598 components: - type: Transform - pos: -6.5,10.5 + pos: 22.5,-23.5 parent: 179 - - uid: 771 + - uid: 1599 components: - type: Transform - pos: -2.5,8.5 + pos: 24.5,-23.5 parent: 179 - - uid: 772 + - uid: 1600 components: - type: Transform - pos: -2.5,7.5 + pos: 24.5,-21.5 parent: 179 - - uid: 773 + - uid: 1607 components: - type: Transform - pos: -2.5,6.5 + pos: 10.5,-15.5 parent: 179 - - uid: 774 + - uid: 1608 components: - type: Transform - pos: -2.5,5.5 + pos: 10.5,-13.5 parent: 179 - - uid: 775 + - uid: 1609 components: - type: Transform - pos: -3.5,5.5 + pos: 11.5,-13.5 parent: 179 - - uid: 776 + - uid: 1610 components: - type: Transform - pos: -4.5,5.5 + pos: 11.5,-15.5 parent: 179 - - uid: 777 +- proto: AtmosFixInstantPlasmaFireMarker + entities: + - uid: 1611 components: - type: Transform - pos: -5.5,5.5 + pos: 12.5,-15.5 parent: 179 - - uid: 778 + - uid: 1612 components: - type: Transform - pos: -6.5,5.5 + pos: 13.5,-15.5 parent: 179 - - uid: 779 + - uid: 1613 components: - type: Transform - pos: -6.5,4.5 + pos: 14.5,-15.5 parent: 179 - - uid: 780 + - uid: 1614 components: - type: Transform - pos: -7.5,4.5 + pos: 14.5,-14.5 parent: 179 - - uid: 781 + - uid: 1615 components: - type: Transform - pos: -8.5,4.5 + pos: 13.5,-14.5 parent: 179 - - uid: 782 + - uid: 1616 components: - type: Transform - pos: -9.5,4.5 + pos: 12.5,-14.5 parent: 179 - - uid: 783 + - uid: 1617 components: - type: Transform - pos: -10.5,4.5 + pos: 12.5,-13.5 parent: 179 - - uid: 784 + - uid: 1618 components: - type: Transform - pos: -11.5,4.5 + pos: 13.5,-13.5 parent: 179 - - uid: 785 + - uid: 1619 components: - type: Transform - pos: -12.5,4.5 + pos: 14.5,-13.5 parent: 179 - - uid: 786 +- proto: AtmosFixNitrogenMarker + entities: + - uid: 1579 components: - type: Transform - pos: -12.5,3.5 + pos: 23.5,-9.5 parent: 179 - - uid: 787 + - uid: 1603 components: - type: Transform - pos: -12.5,2.5 + pos: 22.5,-9.5 parent: 179 - - uid: 788 + - uid: 1604 components: - type: Transform - pos: -12.5,1.5 + pos: 24.5,-9.5 parent: 179 - - uid: 789 +- proto: AtmosFixOxygenMarker + entities: + - uid: 1580 components: - type: Transform - pos: -12.5,0.5 + pos: 23.5,-7.5 parent: 179 - - uid: 790 + - uid: 1605 components: - type: Transform - pos: -12.5,-0.5 + pos: 22.5,-7.5 parent: 179 - - uid: 791 + - uid: 1606 components: - type: Transform - pos: -2.5,4.5 + pos: 24.5,-7.5 parent: 179 - - uid: 792 +- proto: AtmosFixPlasmaMarker + entities: + - uid: 1581 components: - type: Transform - pos: -2.5,2.5 + pos: 23.5,-11.5 parent: 179 - - uid: 793 + - uid: 1601 components: - type: Transform - pos: -2.5,1.5 + pos: 22.5,-11.5 parent: 179 - - uid: 794 + - uid: 1602 components: - type: Transform - pos: -2.5,0.5 + pos: 24.5,-11.5 parent: 179 - - uid: 795 +- proto: Autolathe + entities: + - uid: 1 components: - type: Transform - pos: -2.5,3.5 + pos: 12.5,21.5 parent: 179 - - uid: 796 + - uid: 94 components: - type: Transform - pos: -2.5,-0.5 + pos: -4.5,-5.5 parent: 179 - - uid: 797 + - uid: 446 components: - type: Transform - pos: -2.5,-1.5 + pos: -6.5,5.5 parent: 179 - - uid: 798 + - uid: 528 components: - type: Transform - pos: -2.5,-2.5 + pos: -12.5,-7.5 parent: 179 - - uid: 799 + - uid: 531 components: - type: Transform - pos: -2.5,-3.5 + pos: -13.5,-7.5 parent: 179 - - uid: 802 + - uid: 532 components: - type: Transform - pos: -8.5,0.5 + pos: -14.5,-7.5 parent: 179 - - uid: 803 +- proto: BaseUplinkRadioDebug + entities: + - uid: 732 components: - type: Transform - pos: 2.5,-2.5 + pos: 0.6038008,7.5209107 parent: 179 - - uid: 804 +- proto: Basketball + entities: + - uid: 951 components: - type: Transform - pos: 2.5,-3.5 + pos: -9.702013,9.68404 parent: 179 - - uid: 805 + - uid: 952 components: - type: Transform - pos: -9.5,0.5 + pos: -10.879096,9.579802 parent: 179 - - uid: 806 +- proto: Beaker + entities: + - uid: 174 components: - type: Transform - pos: -10.5,0.5 + pos: 25.291822,10.667244 parent: 179 - - uid: 807 + - uid: 175 components: - type: Transform - pos: -14.5,0.5 + pos: 24.541822,10.635994 parent: 179 - - uid: 808 + - uid: 176 components: - type: Transform - pos: -11.5,0.5 + pos: 26.416822,10.651619 parent: 179 - - uid: 809 + - uid: 324 components: - type: Transform - pos: -15.5,0.5 + pos: 4.718221,9.39097 parent: 179 - - uid: 810 + - uid: 735 components: - type: Transform - pos: -15.5,0.5 + pos: 4.739054,9.807927 parent: 179 - - uid: 811 + - uid: 920 components: - type: Transform - pos: -16.5,0.5 + pos: -4.293744,10.966518 parent: 179 - - uid: 812 + - uid: 950 components: - type: Transform - pos: -16.5,5.5 + pos: -4.293744,10.966518 parent: 179 - - uid: 813 +- proto: BikeHorn + entities: + - uid: 672 components: - type: Transform - pos: -16.5,4.5 + pos: 1.1246341,7.500063 parent: 179 - - uid: 814 +- proto: BlastDoor + entities: + - uid: 202 components: - type: Transform - pos: -16.5,3.5 + pos: -2.5,-14.5 parent: 179 - - uid: 815 + - uid: 697 components: - type: Transform - pos: -16.5,2.5 + pos: 1.5,-14.5 parent: 179 - - uid: 816 + - uid: 698 components: - type: Transform - pos: -16.5,1.5 + pos: 1.5,-16.5 parent: 179 - - uid: 817 + - uid: 984 components: - type: Transform - pos: 7.5,5.5 + pos: -2.5,-16.5 parent: 179 - - uid: 818 + - uid: 1230 components: - type: Transform - pos: 7.5,7.5 + pos: 6.5,-20.5 parent: 179 - - uid: 819 + - uid: 1232 components: - type: Transform - pos: 7.5,8.5 + pos: 6.5,-17.5 parent: 179 - - uid: 820 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1233 components: - type: Transform - pos: 7.5,9.5 + pos: 6.5,-16.5 parent: 179 - - uid: 821 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1234 components: - type: Transform - pos: 8.5,9.5 + pos: 6.5,-15.5 parent: 179 - - uid: 822 + - type: DeviceLinkSink + invokeCounter: 2 + - uid: 1385 components: - type: Transform - pos: 6.5,9.5 + pos: 11.5,-14.5 parent: 179 - - uid: 823 +- proto: BoozeDispenser + entities: + - uid: 752 components: - type: Transform - pos: 5.5,9.5 + pos: 7.5,12.5 parent: 179 - - uid: 824 +- proto: BoxBeaker + entities: + - uid: 280 components: - type: Transform - pos: 4.5,9.5 + pos: 5.163024,9.63072 parent: 179 - - uid: 825 +- proto: Brutepack + entities: + - uid: 150 components: - type: Transform - pos: 8.5,10.5 + pos: 18.601385,5.512907 parent: 179 - - uid: 826 + - uid: 151 components: - type: Transform - pos: 8.5,11.5 + pos: 18.476385,4.841032 parent: 179 - - uid: 827 +- proto: Bucket + entities: + - uid: 691 components: - type: Transform - pos: 8.5,12.5 + pos: 7.1447573,15.900927 parent: 179 - - uid: 828 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 1488 components: - type: Transform - pos: 7.5,12.5 + rot: 3.141592653589793 rad + pos: 14.5,-12.5 parent: 179 - - uid: 829 +- proto: CableApcExtension + entities: + - uid: 15 components: - type: Transform - pos: 7.5,11.5 + pos: 5.5,15.5 parent: 179 - - uid: 830 + - uid: 23 components: - type: Transform - pos: 2.5,-5.5 + pos: 3.5,15.5 parent: 179 - - uid: 831 + - uid: 58 components: - type: Transform - pos: 2.5,-4.5 + pos: 8.5,15.5 parent: 179 - - uid: 832 + - uid: 90 components: - type: Transform - pos: 1.5,-5.5 + pos: 4.5,15.5 parent: 179 - - uid: 833 + - uid: 281 components: - type: Transform - pos: 0.5,-5.5 + pos: -13.5,4.5 parent: 179 - - uid: 834 + - uid: 389 components: - type: Transform - pos: -0.5,-5.5 + pos: 7.5,15.5 parent: 179 - - uid: 835 + - uid: 453 components: - type: Transform - pos: -1.5,-5.5 + pos: 6.5,15.5 parent: 179 - - uid: 836 + - uid: 736 components: - type: Transform - pos: -2.5,-5.5 + pos: -2.5,9.5 parent: 179 - - uid: 837 + - uid: 760 components: - type: Transform - pos: -3.5,-5.5 + pos: -2.5,10.5 parent: 179 - - uid: 838 + - uid: 761 components: - type: Transform - pos: -4.5,-5.5 + pos: -15.5,5.5 parent: 179 - - uid: 839 + - uid: 763 components: - type: Transform - pos: 1.5,11.5 + pos: -2.5,11.5 parent: 179 - - uid: 840 + - uid: 764 components: - type: Transform - pos: 2.5,11.5 + pos: -1.5,11.5 parent: 179 - - uid: 841 + - uid: 765 components: - type: Transform - pos: 0.5,11.5 + pos: -7.5,0.5 parent: 179 - - uid: 842 + - uid: 766 components: - type: Transform - pos: 2.5,12.5 + pos: -0.5,11.5 parent: 179 - - uid: 843 + - uid: 767 components: - type: Transform - pos: 2.5,13.5 + pos: -3.5,10.5 parent: 179 - - uid: 844 + - uid: 768 components: - type: Transform - pos: 2.5,14.5 + pos: -4.5,10.5 parent: 179 - - uid: 845 + - uid: 769 components: - type: Transform - pos: 2.5,15.5 + pos: -5.5,10.5 parent: 179 - - uid: 853 + - uid: 770 components: - type: Transform - pos: -3.5,-3.5 + pos: -6.5,10.5 parent: 179 - - uid: 854 + - uid: 771 components: - type: Transform - pos: -4.5,-3.5 + pos: -2.5,8.5 parent: 179 - - uid: 855 + - uid: 772 components: - type: Transform - pos: -5.5,-3.5 + pos: -2.5,7.5 parent: 179 - - uid: 856 + - uid: 773 components: - type: Transform - pos: -6.5,-3.5 + pos: -2.5,6.5 parent: 179 - - uid: 857 + - uid: 774 components: - type: Transform - pos: -6.5,-2.5 + pos: -2.5,5.5 parent: 179 - - uid: 858 + - uid: 775 components: - type: Transform - pos: -6.5,-1.5 + pos: -3.5,5.5 parent: 179 - - uid: 859 + - uid: 776 components: - type: Transform - pos: -6.5,-0.5 + pos: -4.5,5.5 parent: 179 - - uid: 860 + - uid: 777 components: - type: Transform - pos: -6.5,0.5 + pos: -5.5,5.5 parent: 179 - - uid: 861 + - uid: 778 components: - type: Transform - pos: -6.5,1.5 + pos: -6.5,5.5 parent: 179 - - uid: 862 + - uid: 779 components: - type: Transform - pos: -6.5,2.5 + pos: -6.5,4.5 parent: 179 - - uid: 872 + - uid: 780 components: - type: Transform - pos: 7.5,6.5 + pos: -7.5,4.5 parent: 179 - - uid: 873 + - uid: 781 components: - type: Transform - pos: 8.5,21.5 + pos: -8.5,4.5 parent: 179 - - uid: 877 + - uid: 782 components: - type: Transform - pos: -6.5,3.5 + pos: -9.5,4.5 parent: 179 - - uid: 878 + - uid: 783 components: - type: Transform - pos: -2.5,-4.5 + pos: -10.5,4.5 parent: 179 - - uid: 879 + - uid: 784 components: - type: Transform - pos: -1.5,-4.5 + pos: -11.5,4.5 parent: 179 - - uid: 880 + - uid: 785 components: - type: Transform - pos: -0.5,-4.5 + pos: -12.5,4.5 parent: 179 - - uid: 881 + - uid: 786 components: - type: Transform - pos: 0.5,-4.5 + pos: -12.5,3.5 parent: 179 - - uid: 882 + - uid: 787 components: - type: Transform - pos: 1.5,-4.5 + pos: -12.5,2.5 parent: 179 - - uid: 883 + - uid: 788 components: - type: Transform - pos: 2.5,-4.5 + pos: -12.5,1.5 parent: 179 - - uid: 884 + - uid: 789 components: - type: Transform - pos: 3.5,-4.5 + pos: -12.5,0.5 parent: 179 - - uid: 885 + - uid: 790 components: - type: Transform - pos: 4.5,-4.5 + pos: -12.5,-0.5 parent: 179 - - uid: 886 + - uid: 791 components: - type: Transform - pos: 5.5,-4.5 + pos: -2.5,4.5 parent: 179 - - uid: 887 + - uid: 792 components: - type: Transform - pos: 6.5,-4.5 + pos: -2.5,2.5 parent: 179 - - uid: 888 + - uid: 793 components: - type: Transform - pos: 7.5,-4.5 + pos: -2.5,1.5 parent: 179 - - uid: 889 + - uid: 794 components: - type: Transform - pos: 8.5,-4.5 + pos: -2.5,0.5 parent: 179 - - uid: 890 + - uid: 795 components: - type: Transform - pos: 8.5,-3.5 + pos: -2.5,3.5 parent: 179 - - uid: 891 + - uid: 796 components: - type: Transform - pos: 8.5,-2.5 + pos: -2.5,-0.5 parent: 179 - - uid: 892 + - uid: 797 components: - type: Transform - pos: 8.5,-1.5 + pos: -2.5,-1.5 parent: 179 - - uid: 893 + - uid: 798 components: - type: Transform - pos: 8.5,-0.5 + pos: -2.5,-2.5 parent: 179 - - uid: 894 + - uid: 799 components: - type: Transform - pos: 8.5,0.5 + pos: -2.5,-3.5 parent: 179 - - uid: 895 + - uid: 802 components: - type: Transform - pos: 8.5,1.5 + pos: -8.5,0.5 parent: 179 - - uid: 896 + - uid: 803 components: - type: Transform - pos: 8.5,2.5 + pos: 2.5,-2.5 parent: 179 - - uid: 897 + - uid: 804 components: - type: Transform - pos: 8.5,3.5 + pos: 2.5,-3.5 parent: 179 - - uid: 898 + - uid: 805 components: - type: Transform - pos: 8.5,4.5 + pos: -9.5,0.5 parent: 179 - - uid: 899 + - uid: 806 components: - type: Transform - pos: 8.5,5.5 + pos: -10.5,0.5 parent: 179 - - uid: 900 + - uid: 807 components: - type: Transform - pos: -14.5,5.5 + pos: -14.5,0.5 parent: 179 - - uid: 905 + - uid: 808 components: - type: Transform - pos: -12.5,5.5 + pos: -11.5,0.5 parent: 179 - - uid: 906 + - uid: 809 components: - type: Transform - pos: -14.5,4.5 + pos: -15.5,0.5 parent: 179 - - uid: 908 + - uid: 810 components: - type: Transform - pos: -15.5,4.5 + pos: -15.5,0.5 parent: 179 - - uid: 909 + - uid: 811 components: - type: Transform - pos: 8.5,20.5 + pos: -16.5,0.5 parent: 179 - - uid: 970 + - uid: 812 components: - type: Transform - pos: 9.5,12.5 + pos: -16.5,5.5 parent: 179 - - uid: 971 + - uid: 813 components: - type: Transform - pos: 10.5,12.5 + pos: -16.5,4.5 parent: 179 - - uid: 972 + - uid: 814 components: - type: Transform - pos: 11.5,12.5 + pos: -16.5,3.5 parent: 179 - - uid: 973 + - uid: 815 components: - type: Transform - pos: 12.5,12.5 + pos: -16.5,2.5 parent: 179 - - uid: 974 + - uid: 816 components: - type: Transform - pos: 13.5,12.5 + pos: -16.5,1.5 parent: 179 - - uid: 1026 + - uid: 817 components: - type: Transform - pos: -5.5,-14.5 + pos: 7.5,5.5 parent: 179 - - uid: 1027 + - uid: 818 components: - type: Transform - pos: -5.5,-13.5 + pos: 7.5,7.5 parent: 179 - - uid: 1028 + - uid: 819 components: - type: Transform - pos: -5.5,-12.5 + pos: 7.5,8.5 parent: 179 - - uid: 1029 + - uid: 820 components: - type: Transform - pos: -4.5,-12.5 + pos: 7.5,9.5 parent: 179 - - uid: 1030 + - uid: 821 components: - type: Transform - pos: -3.5,-12.5 + pos: 8.5,9.5 parent: 179 - - uid: 1031 + - uid: 822 components: - type: Transform - pos: -2.5,-12.5 + pos: 6.5,9.5 parent: 179 - - uid: 1032 + - uid: 823 components: - type: Transform - pos: -1.5,-12.5 + pos: 5.5,9.5 parent: 179 - - uid: 1033 + - uid: 824 components: - type: Transform - pos: -0.5,-12.5 + pos: 4.5,9.5 parent: 179 - - uid: 1034 + - uid: 825 components: - type: Transform - pos: 0.5,-12.5 + pos: 8.5,10.5 parent: 179 - - uid: 1035 + - uid: 826 components: - type: Transform - pos: 1.5,-12.5 + pos: 8.5,11.5 parent: 179 - - uid: 1036 + - uid: 827 components: - type: Transform - pos: 2.5,-12.5 + pos: 8.5,12.5 parent: 179 - - uid: 1037 + - uid: 828 components: - type: Transform - pos: 3.5,-12.5 + pos: 7.5,12.5 parent: 179 - - uid: 1038 + - uid: 829 components: - type: Transform - pos: 0.5,-13.5 + pos: 7.5,11.5 parent: 179 - - uid: 1039 + - uid: 830 components: - type: Transform - pos: 0.5,-14.5 + pos: 2.5,-5.5 parent: 179 - - uid: 1040 + - uid: 831 components: - type: Transform - pos: 0.5,-15.5 + pos: 2.5,-4.5 parent: 179 - - uid: 1041 + - uid: 832 components: - type: Transform - pos: -1.5,-13.5 + pos: 1.5,-5.5 parent: 179 - - uid: 1042 + - uid: 833 components: - type: Transform - pos: -1.5,-14.5 + pos: 0.5,-5.5 parent: 179 - - uid: 1043 + - uid: 834 components: - type: Transform - pos: -1.5,-15.5 + pos: -0.5,-5.5 parent: 179 - - uid: 1044 + - uid: 835 components: - type: Transform - pos: 4.5,-12.5 + pos: -1.5,-5.5 parent: 179 - - uid: 1045 + - uid: 836 components: - type: Transform - pos: 4.5,-13.5 + pos: -2.5,-5.5 parent: 179 - - uid: 1051 + - uid: 837 components: - type: Transform - pos: 9.5,15.5 + pos: -3.5,-5.5 parent: 179 - - uid: 1052 + - uid: 838 components: - type: Transform - pos: 9.5,16.5 + pos: -4.5,-5.5 parent: 179 - - uid: 1053 + - uid: 839 components: - type: Transform - pos: 9.5,17.5 + pos: 1.5,11.5 parent: 179 - - uid: 1054 + - uid: 840 components: - type: Transform - pos: 9.5,18.5 + pos: 2.5,11.5 parent: 179 - - uid: 1055 + - uid: 841 components: - type: Transform - pos: 9.5,19.5 + pos: 0.5,11.5 parent: 179 - - uid: 1056 + - uid: 842 components: - type: Transform - pos: 9.5,20.5 + pos: 2.5,12.5 parent: 179 - - uid: 1057 + - uid: 843 components: - type: Transform - pos: 10.5,20.5 + pos: 2.5,13.5 parent: 179 - - uid: 1058 + - uid: 844 components: - type: Transform - pos: 11.5,20.5 + pos: 2.5,14.5 parent: 179 - - uid: 1059 + - uid: 845 components: - type: Transform - pos: 12.5,20.5 + pos: 2.5,15.5 parent: 179 - - uid: 1060 + - uid: 853 components: - type: Transform - pos: 13.5,20.5 + pos: -3.5,-3.5 parent: 179 - - uid: 1061 + - uid: 854 components: - type: Transform - pos: 14.5,20.5 + pos: -4.5,-3.5 parent: 179 - - uid: 1062 + - uid: 855 components: - type: Transform - pos: 15.5,20.5 + pos: -5.5,-3.5 parent: 179 - - uid: 1063 + - uid: 856 components: - type: Transform - pos: 16.5,20.5 + pos: -6.5,-3.5 parent: 179 - - uid: 1064 + - uid: 857 components: - type: Transform - pos: 16.5,21.5 + pos: -6.5,-2.5 parent: 179 - - uid: 1065 + - uid: 858 components: - type: Transform - pos: 16.5,22.5 + pos: -6.5,-1.5 parent: 179 - - uid: 1066 + - uid: 859 components: - type: Transform - pos: 16.5,23.5 + pos: -6.5,-0.5 parent: 179 - - uid: 1067 + - uid: 860 components: - type: Transform - pos: 16.5,24.5 + pos: -6.5,0.5 parent: 179 - - uid: 1068 + - uid: 861 components: - type: Transform - pos: 16.5,25.5 + pos: -6.5,1.5 parent: 179 - - uid: 1069 + - uid: 862 components: - type: Transform - pos: 16.5,26.5 + pos: -6.5,2.5 parent: 179 - - uid: 1070 + - uid: 872 components: - type: Transform - pos: 16.5,27.5 + pos: 7.5,6.5 parent: 179 - - uid: 1079 + - uid: 873 components: - type: Transform - pos: 15.5,24.5 + pos: 8.5,21.5 parent: 179 - - uid: 1080 + - uid: 877 components: - type: Transform - pos: 14.5,24.5 + pos: -6.5,3.5 parent: 179 - - uid: 1081 + - uid: 878 components: - type: Transform - pos: 13.5,24.5 + pos: -2.5,-4.5 parent: 179 - - uid: 1082 + - uid: 879 components: - type: Transform - pos: 12.5,24.5 + pos: -1.5,-4.5 parent: 179 - - uid: 1097 + - uid: 880 components: - type: Transform - pos: 8.5,14.5 + pos: -0.5,-4.5 parent: 179 - - uid: 1098 + - uid: 881 components: - type: Transform - pos: 8.5,13.5 + pos: 0.5,-4.5 parent: 179 - - uid: 1099 + - uid: 882 components: - type: Transform - pos: 9.5,13.5 + pos: 1.5,-4.5 parent: 179 - - uid: 1100 + - uid: 883 components: - type: Transform - pos: 10.5,13.5 + pos: 2.5,-4.5 parent: 179 - - uid: 1101 + - uid: 884 components: - type: Transform - pos: 11.5,13.5 + pos: 3.5,-4.5 parent: 179 - - uid: 1102 + - uid: 885 components: - type: Transform - pos: 12.5,13.5 + pos: 4.5,-4.5 parent: 179 - - uid: 1103 + - uid: 886 components: - type: Transform - pos: 13.5,13.5 + pos: 5.5,-4.5 parent: 179 - - uid: 1104 + - uid: 887 components: - type: Transform - pos: 14.5,13.5 + pos: 6.5,-4.5 parent: 179 - - uid: 1105 + - uid: 888 components: - type: Transform - pos: 15.5,13.5 + pos: 7.5,-4.5 parent: 179 - - uid: 1106 + - uid: 889 components: - type: Transform - pos: 16.5,13.5 + pos: 8.5,-4.5 parent: 179 - - uid: 1107 + - uid: 890 components: - type: Transform - pos: 17.5,13.5 + pos: 8.5,-3.5 parent: 179 - - uid: 1108 + - uid: 891 components: - type: Transform - pos: 18.5,13.5 + pos: 8.5,-2.5 parent: 179 - - uid: 1109 + - uid: 892 components: - type: Transform - pos: 19.5,13.5 + pos: 8.5,-1.5 parent: 179 - - uid: 1110 + - uid: 893 components: - type: Transform - pos: 20.5,13.5 + pos: 8.5,-0.5 parent: 179 - - uid: 1111 + - uid: 894 components: - type: Transform - pos: 21.5,13.5 + pos: 8.5,0.5 parent: 179 - - uid: 1112 + - uid: 895 components: - type: Transform - pos: 22.5,13.5 + pos: 8.5,1.5 parent: 179 - - uid: 1113 + - uid: 896 components: - type: Transform - pos: 23.5,13.5 + pos: 8.5,2.5 parent: 179 - - uid: 1114 + - uid: 897 components: - type: Transform - pos: 24.5,13.5 + pos: 8.5,3.5 parent: 179 - - uid: 1115 + - uid: 898 components: - type: Transform - pos: 25.5,13.5 + pos: 8.5,4.5 parent: 179 - - uid: 1116 + - uid: 899 components: - type: Transform - pos: 16.5,12.5 + pos: 8.5,5.5 parent: 179 - - uid: 1117 + - uid: 900 components: - type: Transform - pos: 16.5,11.5 + pos: -14.5,5.5 parent: 179 - - uid: 1118 + - uid: 905 components: - type: Transform - pos: 16.5,10.5 + pos: -12.5,5.5 parent: 179 - - uid: 1119 + - uid: 906 components: - type: Transform - pos: 16.5,9.5 + pos: -14.5,4.5 parent: 179 - - uid: 1120 + - uid: 908 components: - type: Transform - pos: 16.5,8.5 + pos: -15.5,4.5 parent: 179 - - uid: 1121 + - uid: 909 components: - type: Transform - pos: 16.5,7.5 + pos: 8.5,20.5 parent: 179 - - uid: 1122 + - uid: 970 components: - type: Transform - pos: 16.5,6.5 + pos: 9.5,12.5 parent: 179 - - uid: 1123 + - uid: 971 components: - type: Transform - pos: 16.5,5.5 + pos: 10.5,12.5 parent: 179 - - uid: 1124 + - uid: 972 components: - type: Transform - pos: 16.5,4.5 + pos: 11.5,12.5 parent: 179 - - uid: 1125 + - uid: 973 components: - type: Transform - pos: 16.5,3.5 + pos: 12.5,12.5 parent: 179 - - uid: 1126 + - uid: 974 components: - type: Transform - pos: 16.5,2.5 + pos: 13.5,12.5 parent: 179 - - uid: 1127 + - uid: 1026 components: - type: Transform - pos: 16.5,1.5 + pos: -5.5,-14.5 parent: 179 - - uid: 1128 + - uid: 1027 components: - type: Transform - pos: 16.5,0.5 + pos: -5.5,-13.5 parent: 179 - - uid: 1129 + - uid: 1028 components: - type: Transform - pos: 16.5,-0.5 + pos: -5.5,-12.5 parent: 179 - - uid: 1130 + - uid: 1029 components: - type: Transform - pos: 16.5,-1.5 + pos: -4.5,-12.5 parent: 179 - - uid: 1131 + - uid: 1030 components: - type: Transform - pos: 16.5,-2.5 + pos: -3.5,-12.5 parent: 179 - - uid: 1132 + - uid: 1031 components: - type: Transform - pos: 16.5,-3.5 + pos: -2.5,-12.5 parent: 179 - - uid: 1133 + - uid: 1032 components: - type: Transform - pos: 17.5,-3.5 + pos: -1.5,-12.5 parent: 179 - - uid: 1134 + - uid: 1033 components: - type: Transform - pos: 18.5,-3.5 + pos: -0.5,-12.5 parent: 179 - - uid: 1135 + - uid: 1034 components: - type: Transform - pos: 19.5,-3.5 + pos: 0.5,-12.5 parent: 179 - - uid: 1136 + - uid: 1035 components: - type: Transform - pos: 20.5,-3.5 + pos: 1.5,-12.5 parent: 179 - - uid: 1137 + - uid: 1036 components: - type: Transform - pos: 21.5,-3.5 + pos: 2.5,-12.5 parent: 179 - - uid: 1138 + - uid: 1037 components: - type: Transform - pos: 22.5,-3.5 + pos: 3.5,-12.5 parent: 179 - - uid: 1139 + - uid: 1038 components: - type: Transform - pos: 23.5,-3.5 + pos: 0.5,-13.5 parent: 179 - - uid: 1140 + - uid: 1039 components: - type: Transform - pos: 24.5,-3.5 + pos: 0.5,-14.5 parent: 179 - - uid: 1141 + - uid: 1040 components: - type: Transform - pos: 25.5,-3.5 + pos: 0.5,-15.5 parent: 179 - - uid: 1142 + - uid: 1041 components: - type: Transform - pos: 26.5,-3.5 + pos: -1.5,-13.5 parent: 179 - - uid: 1143 + - uid: 1042 components: - type: Transform - pos: 27.5,-3.5 + pos: -1.5,-14.5 parent: 179 - - uid: 1144 + - uid: 1043 components: - type: Transform - pos: 28.5,-3.5 + pos: -1.5,-15.5 parent: 179 - - uid: 1145 + - uid: 1044 components: - type: Transform - pos: 17.5,2.5 + pos: 4.5,-12.5 parent: 179 - - uid: 1146 + - uid: 1045 components: - type: Transform - pos: 18.5,2.5 + pos: 4.5,-13.5 parent: 179 - - uid: 1147 + - uid: 1051 components: - type: Transform - pos: 19.5,2.5 + pos: 9.5,15.5 parent: 179 - - uid: 1148 + - uid: 1052 components: - type: Transform - pos: 20.5,2.5 + pos: 9.5,16.5 parent: 179 - - uid: 1149 + - uid: 1053 components: - type: Transform - pos: 21.5,2.5 + pos: 9.5,17.5 parent: 179 - - uid: 1150 + - uid: 1054 components: - type: Transform - pos: 22.5,2.5 + pos: 9.5,18.5 parent: 179 - - uid: 1151 + - uid: 1055 components: - type: Transform - pos: 23.5,2.5 + pos: 9.5,19.5 parent: 179 - - uid: 1152 + - uid: 1056 components: - type: Transform - pos: 24.5,2.5 + pos: 9.5,20.5 parent: 179 - - uid: 1153 + - uid: 1057 components: - type: Transform - pos: 25.5,2.5 + pos: 10.5,20.5 parent: 179 - - uid: 1154 + - uid: 1058 components: - type: Transform - pos: 26.5,2.5 + pos: 11.5,20.5 parent: 179 - - uid: 1155 + - uid: 1059 components: - type: Transform - pos: 27.5,2.5 + pos: 12.5,20.5 parent: 179 - - uid: 1156 + - uid: 1060 components: - type: Transform - pos: 28.5,2.5 + pos: 13.5,20.5 parent: 179 - - uid: 1157 + - uid: 1061 components: - type: Transform - pos: 26.5,3.5 + pos: 14.5,20.5 parent: 179 - - uid: 1158 + - uid: 1062 components: - type: Transform - pos: 26.5,4.5 + pos: 15.5,20.5 parent: 179 - - uid: 1159 + - uid: 1063 components: - type: Transform - pos: 26.5,5.5 + pos: 16.5,20.5 parent: 179 - - uid: 1160 + - uid: 1064 components: - type: Transform - pos: 26.5,6.5 + pos: 16.5,21.5 parent: 179 - - uid: 1161 + - uid: 1065 components: - type: Transform - pos: 26.5,7.5 + pos: 16.5,22.5 parent: 179 - - uid: 1162 + - uid: 1066 components: - type: Transform - pos: 26.5,8.5 + pos: 16.5,23.5 parent: 179 - - uid: 1163 + - uid: 1067 components: - type: Transform - pos: 26.5,9.5 + pos: 16.5,24.5 parent: 179 - - uid: 1164 + - uid: 1068 components: - type: Transform - pos: 25.5,9.5 + pos: 16.5,25.5 parent: 179 - - uid: 1165 + - uid: 1069 components: - type: Transform - pos: 24.5,9.5 + pos: 16.5,26.5 parent: 179 - - uid: 1166 + - uid: 1070 components: - type: Transform - pos: 16.5,19.5 + pos: 16.5,27.5 parent: 179 - - uid: 1167 + - uid: 1079 components: - type: Transform - pos: 16.5,18.5 + pos: 15.5,24.5 parent: 179 - - uid: 1168 + - uid: 1080 components: - type: Transform - pos: 16.5,17.5 + pos: 14.5,24.5 parent: 179 - - uid: 1169 + - uid: 1081 components: - type: Transform - pos: 16.5,16.5 + pos: 13.5,24.5 parent: 179 - - uid: 1170 + - uid: 1082 components: - type: Transform - pos: 16.5,15.5 + pos: 12.5,24.5 parent: 179 - - uid: 1171 + - uid: 1097 components: - type: Transform - pos: 16.5,14.5 + pos: 8.5,14.5 parent: 179 - - uid: 1177 + - uid: 1098 components: - type: Transform - pos: 8.5,22.5 + pos: 8.5,13.5 parent: 179 - - uid: 1178 + - uid: 1099 components: - type: Transform - pos: 8.5,23.5 + pos: 9.5,13.5 parent: 179 - - uid: 1179 + - uid: 1100 components: - type: Transform - pos: 8.5,24.5 + pos: 10.5,13.5 parent: 179 - - uid: 1180 + - uid: 1101 components: - type: Transform - pos: 8.5,25.5 + pos: 11.5,13.5 parent: 179 -- proto: CableApcStack - entities: - - uid: 70 + - uid: 1102 components: - type: Transform - pos: 10.577456,21.424059 + pos: 12.5,13.5 parent: 179 - - uid: 183 + - uid: 1103 components: - type: Transform - pos: -6.6863613,7.351646 + pos: 13.5,13.5 parent: 179 - - uid: 351 + - uid: 1104 components: - type: Transform - pos: 10.561831,21.767809 + pos: 14.5,13.5 parent: 179 - - uid: 537 + - uid: 1105 components: - type: Transform - pos: -15.5,-0.5 + pos: 15.5,13.5 parent: 179 - - uid: 538 + - uid: 1106 components: - type: Transform - pos: -15.5,-0.5 + pos: 16.5,13.5 parent: 179 -- proto: CableHV - entities: - - uid: 1019 + - uid: 1107 components: - type: Transform - pos: -6.5,-13.5 + pos: 17.5,13.5 parent: 179 - - uid: 1020 + - uid: 1108 components: - type: Transform - pos: -6.5,-12.5 + pos: 18.5,13.5 parent: 179 - - uid: 1021 + - uid: 1109 components: - type: Transform - pos: -6.5,-11.5 + pos: 19.5,13.5 parent: 179 -- proto: CableHVStack - entities: - - uid: 184 + - uid: 1110 components: - type: Transform - pos: -6.665528,7.840053 + pos: 20.5,13.5 parent: 179 -- proto: CableMV - entities: - - uid: 1023 + - uid: 1111 components: - type: Transform - pos: -6.5,-13.5 + pos: 21.5,13.5 parent: 179 - - uid: 1024 + - uid: 1112 components: - type: Transform - pos: -5.5,-13.5 + pos: 22.5,13.5 parent: 179 - - uid: 1025 + - uid: 1113 components: - type: Transform - pos: -5.5,-14.5 + pos: 23.5,13.5 parent: 179 -- proto: CableMVStack - entities: - - uid: 325 + - uid: 1114 components: - type: Transform - pos: -6.665528,7.5601244 + pos: 24.5,13.5 parent: 179 -- proto: CableTerminal - entities: - - uid: 1022 + - uid: 1115 components: - type: Transform - pos: -6.5,-11.5 + pos: 25.5,13.5 parent: 179 -- proto: CapacitorStockPart - entities: - - uid: 296 + - uid: 1116 components: - type: Transform - pos: -4.3012447,8.817795 + pos: 16.5,12.5 parent: 179 - - uid: 700 + - uid: 1117 components: - type: Transform - pos: -3.8324947,8.786524 + pos: 16.5,11.5 parent: 179 - - uid: 701 + - uid: 1118 components: - type: Transform - pos: -3.2804112,8.786524 + pos: 16.5,10.5 parent: 179 - - uid: 704 + - uid: 1119 components: - type: Transform - pos: -4.8741612,8.817795 + pos: 16.5,9.5 parent: 179 -- proto: CaptainIDCard - entities: - - uid: 726 + - uid: 1120 components: - type: Transform - pos: 1.0820513,8.752605 + pos: 16.5,8.5 parent: 179 -- proto: CaptainSabre - entities: - - uid: 381 + - uid: 1121 components: - type: Transform - pos: -3.277628,-2.15838 + pos: 16.5,7.5 parent: 179 -- proto: Catwalk - entities: - - uid: 2 + - uid: 1122 components: - type: Transform - pos: 13.5,24.5 + pos: 16.5,6.5 parent: 179 - - uid: 7 + - uid: 1123 components: - type: Transform - pos: 6.5,24.5 + pos: 16.5,5.5 parent: 179 - - uid: 20 + - uid: 1124 components: - type: Transform - pos: 6.5,20.5 + pos: 16.5,4.5 parent: 179 - - uid: 120 + - uid: 1125 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,18.5 + pos: 16.5,3.5 parent: 179 - - uid: 246 + - uid: 1126 components: - type: Transform - pos: -6.5,-6.5 + pos: 16.5,2.5 parent: 179 - - uid: 247 + - uid: 1127 components: - type: Transform - pos: -8.5,-6.5 + pos: 16.5,1.5 parent: 179 - - uid: 252 + - uid: 1128 components: - type: Transform - pos: 4.5,-8.5 + pos: 16.5,0.5 parent: 179 - - uid: 269 + - uid: 1129 components: - type: Transform - pos: 12.5,10.5 + pos: 16.5,-0.5 parent: 179 - - uid: 286 + - uid: 1130 components: - type: Transform - pos: 2.5,-11.5 + pos: 16.5,-1.5 parent: 179 - - uid: 287 + - uid: 1131 components: - type: Transform - pos: -4.5,-11.5 + pos: 16.5,-2.5 parent: 179 - - uid: 308 + - uid: 1132 components: - type: Transform - pos: -2.5,-12.5 + pos: 16.5,-3.5 parent: 179 - - uid: 309 + - uid: 1133 components: - type: Transform - pos: 1.5,-12.5 + pos: 17.5,-3.5 parent: 179 - - uid: 333 + - uid: 1134 components: - type: Transform - pos: 4.5,-13.5 + pos: 18.5,-3.5 parent: 179 - - uid: 334 + - uid: 1135 components: - type: Transform - pos: -5.5,-13.5 + pos: 19.5,-3.5 parent: 179 - - uid: 345 + - uid: 1136 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,0.5 + pos: 20.5,-3.5 parent: 179 - - uid: 346 + - uid: 1137 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,1.5 + pos: 21.5,-3.5 parent: 179 - - uid: 347 + - uid: 1138 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,2.5 + pos: 22.5,-3.5 parent: 179 - - uid: 348 + - uid: 1139 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,3.5 + pos: 23.5,-3.5 parent: 179 - - uid: 349 + - uid: 1140 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,4.5 + pos: 24.5,-3.5 parent: 179 - - uid: 403 + - uid: 1141 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-0.5 + pos: 25.5,-3.5 parent: 179 - - uid: 404 + - uid: 1142 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-1.5 + pos: 26.5,-3.5 parent: 179 - - uid: 405 + - uid: 1143 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-2.5 + pos: 27.5,-3.5 parent: 179 - - uid: 406 + - uid: 1144 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-3.5 + pos: 28.5,-3.5 parent: 179 - - uid: 407 + - uid: 1145 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-4.5 + pos: 17.5,2.5 parent: 179 - - uid: 408 + - uid: 1146 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-5.5 + pos: 18.5,2.5 parent: 179 - - uid: 409 + - uid: 1147 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-6.5 + pos: 19.5,2.5 parent: 179 - - uid: 410 + - uid: 1148 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-7.5 + pos: 20.5,2.5 parent: 179 - - uid: 411 + - uid: 1149 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-8.5 + pos: 21.5,2.5 parent: 179 - - uid: 412 + - uid: 1150 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-9.5 + pos: 22.5,2.5 parent: 179 - - uid: 413 + - uid: 1151 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-10.5 + pos: 23.5,2.5 parent: 179 - - uid: 414 + - uid: 1152 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 9.5,-11.5 + pos: 24.5,2.5 parent: 179 - - uid: 415 + - uid: 1153 components: - type: Transform - anchored: False - rot: -1.5707963267949 rad - pos: 8.5,-8.5 + pos: 25.5,2.5 parent: 179 - - uid: 438 + - uid: 1154 components: - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-0.5 + pos: 26.5,2.5 parent: 179 - - uid: 442 + - uid: 1155 components: - type: Transform - pos: -9.5,8.5 + pos: 27.5,2.5 parent: 179 - - uid: 514 + - uid: 1156 components: - type: Transform - pos: -10.5,8.5 + pos: 28.5,2.5 parent: 179 - - uid: 541 + - uid: 1157 components: - type: Transform - pos: -11.5,-6.5 + pos: 26.5,3.5 parent: 179 - - uid: 542 + - uid: 1158 components: - type: Transform - pos: -9.5,-6.5 + pos: 26.5,4.5 parent: 179 - - uid: 695 + - uid: 1159 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,8.5 + pos: 26.5,5.5 parent: 179 -- proto: Chair - entities: - - uid: 580 + - uid: 1160 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,6.5 + pos: 26.5,6.5 parent: 179 - - uid: 581 + - uid: 1161 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,8.5 + pos: 26.5,7.5 parent: 179 - - uid: 582 + - uid: 1162 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,7.5 + pos: 26.5,8.5 parent: 179 -- proto: ChairOfficeDark - entities: - - uid: 380 + - uid: 1163 components: - type: Transform - rot: 3.1415926535897967 rad - pos: 0.5,-6.5 + pos: 26.5,9.5 parent: 179 -- proto: ChairOfficeLight - entities: - - uid: 576 + - uid: 1164 components: - type: Transform - rot: 4.71238898038469 rad - pos: 19.5,4.5 + pos: 25.5,9.5 parent: 179 - - uid: 577 + - uid: 1165 components: - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,5.5 + pos: 24.5,9.5 parent: 179 - - uid: 578 + - uid: 1166 components: - type: Transform - rot: 4.71238898038469 rad - pos: 23.5,8.5 + pos: 16.5,19.5 parent: 179 - - uid: 579 + - uid: 1167 components: - type: Transform - pos: 24.5,5.5 + pos: 16.5,18.5 parent: 179 -- proto: ChemDispenser - entities: - - uid: 583 + - uid: 1168 components: - type: Transform - pos: 23.5,9.5 + pos: 16.5,17.5 parent: 179 - - type: ContainerContainer - containers: - ReagentDispenser-beaker: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - beakerSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 750 + - uid: 1169 components: - type: Transform - pos: 7.5,11.5 + pos: 16.5,16.5 parent: 179 -- proto: ChemicalPayload - entities: - - uid: 432 + - uid: 1170 components: - type: Transform - pos: 6.4651074,9.828774 + pos: 16.5,15.5 parent: 179 -- proto: ChemMaster - entities: - - uid: 311 + - uid: 1171 components: - type: Transform - pos: 8.5,11.5 + pos: 16.5,14.5 parent: 179 -- proto: ChemMasterMachineCircuitboard - entities: - - uid: 718 + - uid: 1177 components: - type: Transform - pos: -4.5458,10.514079 + pos: 8.5,22.5 parent: 179 -- proto: CircuitImprinter - entities: - - uid: 332 + - uid: 1178 components: - type: Transform - pos: -6.5,4.5 + pos: 8.5,23.5 parent: 179 -- proto: ClosetEmergencyFilledRandom - entities: - - uid: 319 + - uid: 1179 components: - type: Transform - pos: 1.5,-10.5 + pos: 8.5,24.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 322 + - uid: 1180 components: - type: Transform - pos: 0.5,-10.5 + pos: 8.5,25.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: ClosetToolFilled - entities: - - uid: 524 + - uid: 1277 components: - type: Transform - pos: -11.5,-5.5 + pos: 4.5,-10.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 525 + - uid: 1282 components: - type: Transform - pos: -11.5,-4.5 + pos: 4.5,-11.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 526 + - uid: 1289 components: - type: Transform - pos: -11.5,-3.5 + pos: 5.5,-9.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 527 + - uid: 1292 components: - type: Transform - pos: -11.5,-2.5 + pos: 4.5,-9.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: ClothingBeltUtilityFilled - entities: - - uid: 427 + - uid: 1348 components: - type: Transform - pos: -1.895102,-10.33495 + pos: 6.5,-9.5 parent: 179 - - uid: 428 + - uid: 1349 components: - type: Transform - pos: -1.770102,-10.63182 + pos: 7.5,-9.5 parent: 179 -- proto: ClothingHandsGlovesColorYellow - entities: - - uid: 454 + - uid: 1350 components: - type: Transform - pos: -0.78741443,4.322194 + pos: 9.5,-9.5 parent: 179 -- proto: ClothingHeadHatWelding - entities: - - uid: 344 + - uid: 1351 components: - type: Transform - pos: 0.7198646,4.374314 + pos: 10.5,-9.5 parent: 179 -- proto: ClothingMaskBreath - entities: - - uid: 955 + - uid: 1352 components: - type: Transform - pos: -10.595239,6.1907988 + pos: 11.5,-9.5 parent: 179 -- proto: ClothingMaskGas - entities: - - uid: 425 + - uid: 1353 components: - type: Transform - pos: -0.2880585,-10.69432 + pos: 12.5,-9.5 parent: 179 -- proto: ClothingOuterHardsuitAtmos - entities: - - uid: 270 + - uid: 1354 components: - type: Transform - pos: -10.5426235,5.472399 + pos: 13.5,-9.5 parent: 179 -- proto: ClothingOuterVest - entities: - - uid: 426 + - uid: 1355 components: - type: Transform - pos: -0.9130585,-10.66307 + pos: 14.5,-9.5 parent: 179 -- proto: ClothingShoesBootsMag - entities: - - uid: 725 + - uid: 1356 components: - type: Transform - pos: 0.47880077,8.073378 + pos: 15.5,-9.5 parent: 179 -- proto: ClothingUniformJumpsuitEngineering - entities: - - uid: 424 + - uid: 1357 components: - type: Transform - pos: -0.6474335,-10.27245 + pos: 16.5,-9.5 parent: 179 -- proto: ClownPDA - entities: - - uid: 91 + - uid: 1358 components: - type: Transform - pos: -15.5,2.5 + pos: 17.5,-9.5 parent: 179 - - uid: 762 + - uid: 1359 components: - type: Transform - pos: -14.5,1.5 + pos: 18.5,-9.5 parent: 179 - - uid: 864 + - uid: 1360 components: - type: Transform - pos: -14.5,2.5 + pos: 19.5,-9.5 parent: 179 - - uid: 912 + - uid: 1361 components: - type: Transform - pos: -15.5,1.5 + pos: 20.5,-9.5 parent: 179 -- proto: ComputerAnalysisConsole - entities: - - uid: 1083 + - uid: 1362 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,23.5 + pos: 21.5,-9.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 1078: - - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver -- proto: ComputerCargoOrders - entities: - - uid: 326 + - uid: 1363 components: - type: Transform - pos: 0.5,-5.5 + pos: 8.5,-9.5 parent: 179 - - uid: 996 + - uid: 1364 components: - type: Transform - pos: -1.5,-11.5 + pos: 11.5,-8.5 parent: 179 -- proto: ComputerCargoShuttle - entities: - - uid: 995 + - uid: 1365 components: - type: Transform - pos: 0.5,-11.5 + pos: 11.5,-7.5 parent: 179 -- proto: ComputerMedicalRecords - entities: - - uid: 152 + - uid: 1366 components: - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,-5.5 + pos: 11.5,-5.5 parent: 179 - - uid: 591 + - uid: 1367 components: - type: Transform - pos: 21.5,5.5 + pos: 11.5,-4.5 parent: 179 -- proto: ComputerResearchAndDevelopment - entities: - - uid: 88 + - uid: 1368 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,19.5 + pos: 11.5,-6.5 parent: 179 -- proto: ComputerShuttleCargo - entities: - - uid: 994 + - uid: 1369 components: - type: Transform - pos: -0.5,-11.5 + pos: 11.5,-3.5 parent: 179 -- proto: ComputerSurveillanceCameraMonitor - entities: - - uid: 1185 + - uid: 1370 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,1.5 + pos: 9.5,-16.5 parent: 179 -- proto: ComputerTechnologyDiskTerminal - entities: - - uid: 1088 + - uid: 1371 components: - type: Transform - pos: 13.5,16.5 + pos: 9.5,-22.5 parent: 179 -- proto: ConveyorBelt - entities: - - uid: 195 + - uid: 1372 components: - type: Transform - pos: -2.5,-15.5 + pos: 9.5,-21.5 parent: 179 - - uid: 259 + - uid: 1373 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-14.5 + pos: 9.5,-10.5 parent: 179 - - uid: 463 + - uid: 1374 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-16.5 + pos: 9.5,-20.5 parent: 179 - - uid: 677 + - uid: 1375 components: - type: Transform - pos: -2.5,-14.5 + pos: 9.5,-19.5 parent: 179 - - uid: 716 + - uid: 1376 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,11.5 + pos: 9.5,-18.5 parent: 179 - - uid: 720 + - uid: 1377 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,11.5 + pos: 9.5,-17.5 parent: 179 - - uid: 721 + - uid: 1378 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,11.5 + pos: 9.5,-15.5 parent: 179 - - uid: 985 + - uid: 1379 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-13.5 + pos: 9.5,-11.5 parent: 179 - - uid: 989 + - uid: 1380 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-15.5 + pos: 9.5,-14.5 parent: 179 - - uid: 990 + - uid: 1381 components: - type: Transform - pos: -2.5,-13.5 + pos: 9.5,-13.5 parent: 179 - - uid: 991 + - uid: 1382 components: - type: Transform - pos: -2.5,-16.5 + pos: 9.5,-12.5 parent: 179 -- proto: CrateEngineeringToolbox - entities: - - uid: 692 + - uid: 1383 components: - type: Transform - pos: -0.5,3.5 + pos: 10.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateGeneric - entities: - - uid: 266 + - uid: 1384 components: - type: Transform - pos: 5.5,-6.5 + pos: 11.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateHydroponicsSeeds - entities: - - uid: 754 + - uid: 1389 components: - type: Transform - pos: 2.5,12.5 + pos: 16.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateHydroponicsTools - entities: - - uid: 755 + - uid: 1390 components: - type: Transform - pos: 2.5,13.5 + pos: 17.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateMedical - entities: - - uid: 131 + - uid: 1391 components: - type: Transform - pos: 31.5,-1.5 + pos: 19.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 132 + - uid: 1392 components: - type: Transform - pos: 32.5,-1.5 + pos: 20.5,-14.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrewMonitoringServer - entities: - - uid: 1183 + - uid: 1393 components: - type: Transform - pos: 9.5,25.5 + pos: 21.5,-14.5 parent: 179 -- proto: Crowbar - entities: - - uid: 147 + - uid: 1394 components: - type: Transform - pos: -2.172831,4.5306726 + pos: 22.5,-14.5 parent: 179 - - uid: 423 + - uid: 1395 components: - type: Transform - pos: -2.861032,-5.524786 + pos: 18.5,-14.5 parent: 179 -- proto: DebugBatteryDischarger - entities: - - uid: 711 + - uid: 1396 components: - type: Transform - pos: 0.5,-3.5 + pos: 22.5,-9.5 parent: 179 -- proto: DefaultStationBeaconAISatellite - entities: - - uid: 1198 + - uid: 1397 components: - type: Transform - pos: 11.5,-14.5 + pos: 10.5,-19.5 parent: 179 -- proto: DefaultStationBeaconBotany - entities: - - uid: 1193 + - uid: 1398 components: - type: Transform - pos: 3.5,15.5 + pos: 11.5,-19.5 parent: 179 -- proto: DefaultStationBeaconChemistry - entities: - - uid: 1195 + - uid: 1399 components: - type: Transform - pos: 7.5,10.5 + pos: 12.5,-19.5 parent: 179 -- proto: DefaultStationBeaconCommand - entities: - - uid: 1196 + - uid: 1400 components: - type: Transform - pos: 0.5,8.5 + pos: 13.5,-19.5 parent: 179 -- proto: DefaultStationBeaconGravGen - entities: - - uid: 1172 + - uid: 1401 components: - type: Transform - pos: 6.5,5.5 + pos: 14.5,-19.5 parent: 179 -- proto: DefaultStationBeaconMedical - entities: - - uid: 1173 + - uid: 1402 components: - type: Transform - pos: 19.5,5.5 + pos: 15.5,-19.5 parent: 179 -- proto: DefaultStationBeaconScience - entities: - - uid: 1194 + - uid: 1403 components: - type: Transform - pos: 12.5,20.5 + pos: 17.5,-19.5 parent: 179 -- proto: DefaultStationBeaconSecurity - entities: - - uid: 1197 + - uid: 1404 components: - type: Transform - pos: -14.5,17.5 + pos: 18.5,-19.5 parent: 179 -- proto: DefaultStationBeaconSupply - entities: - - uid: 1175 + - uid: 1405 components: - type: Transform - pos: -0.5,-11.5 + pos: 19.5,-19.5 parent: 179 -- proto: DefaultStationBeaconToolRoom - entities: - - uid: 1174 + - uid: 1406 components: - type: Transform - pos: -1.5,4.5 + pos: 20.5,-19.5 parent: 179 -- proto: DisposalPipe - entities: - - uid: 717 + - uid: 1407 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,10.5 + pos: 21.5,-19.5 parent: 179 -- proto: DisposalTrunk - entities: - - uid: 285 + - uid: 1408 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,10.5 + pos: 22.5,-19.5 parent: 179 - - uid: 715 + - uid: 1409 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,10.5 + pos: 16.5,-19.5 parent: 179 -- proto: DisposalUnit - entities: - - uid: 719 + - uid: 1410 components: - type: Transform - pos: -1.5,10.5 + pos: 9.5,-23.5 parent: 179 -- proto: DrinkBeerglass - entities: - - uid: 688 + - uid: 1411 components: - type: Transform - pos: 3.1981986,5.733985 + pos: 9.5,-24.5 parent: 179 -- proto: DrinkColaCan - entities: - - uid: 690 + - uid: 1412 components: - type: Transform - pos: 3.8231986,6.150942 + pos: 10.5,-24.5 parent: 179 -- proto: Dropper - entities: - - uid: 730 + - uid: 1413 components: - type: Transform - pos: 5.892191,9.4118185 + pos: 11.5,-24.5 parent: 179 -- proto: EmergencyOxygenTankFilled - entities: - - uid: 956 + - uid: 1414 components: - type: Transform - pos: -10.505015,6.711994 + pos: 12.5,-24.5 parent: 179 -- proto: ExGrenade - entities: - - uid: 433 + - uid: 1415 components: - type: Transform - pos: -3.7704864,-1.6163371 + pos: 13.5,-24.5 parent: 179 -- proto: ExplosivePayload - entities: - - uid: 668 + - uid: 1416 components: - type: Transform - pos: 6.829691,9.4118185 + pos: 14.5,-24.5 parent: 179 -- proto: FaxMachineCaptain - entities: - - uid: 967 + - uid: 1417 components: - type: Transform - pos: 9.5,12.5 + pos: 15.5,-24.5 parent: 179 -- proto: FaxMachineCentcom - entities: - - uid: 968 + - uid: 1418 components: - type: Transform - pos: 11.5,12.5 + pos: 16.5,-24.5 parent: 179 -- proto: FaxMachineSyndie - entities: - - uid: 969 + - uid: 1419 components: - type: Transform - pos: 13.5,12.5 + pos: 17.5,-24.5 parent: 179 -- proto: FireExtinguisher - entities: - - uid: 323 + - uid: 1420 components: - type: Transform - pos: -1.297692,-5.396082 + pos: 18.5,-24.5 parent: 179 - - uid: 868 + - uid: 1421 components: - type: Transform - pos: -14.5,-1.5 + pos: 19.5,-24.5 parent: 179 -- proto: FlashlightLantern - entities: - - uid: 421 + - uid: 1422 components: - type: Transform - pos: -1.934832,-5.154238 + pos: 20.5,-24.5 parent: 179 - - uid: 422 + - uid: 1423 components: - type: Transform - pos: 1.1350493,8.198464 + pos: 21.5,-24.5 parent: 179 -- proto: FloorLavaEntity - entities: - - uid: 134 + - uid: 1424 components: - type: Transform - pos: -13.5,-3.5 + pos: 22.5,-24.5 parent: 179 - - uid: 135 + - uid: 1502 components: - type: Transform - pos: -14.5,-3.5 + pos: 13.5,-14.5 parent: 179 - - uid: 141 + - uid: 1503 components: - type: Transform - pos: -13.5,-2.5 + pos: 12.5,-14.5 parent: 179 - - uid: 469 + - uid: 1504 components: - type: Transform - pos: -14.5,-2.5 + pos: 14.5,-14.5 parent: 179 -- proto: FloorWaterEntity - entities: - - uid: 136 + - uid: 1554 components: - type: Transform - pos: -12.5,-2.5 + pos: 15.5,-14.5 parent: 179 - - uid: 137 +- proto: CableApcStack + entities: + - uid: 70 components: - type: Transform - pos: -12.5,-3.5 + pos: 10.577456,21.424059 parent: 179 -- proto: FoodApple - entities: - - uid: 16 + - uid: 183 components: - type: Transform - pos: 3.9853282,16.430082 + pos: -6.6863613,7.351646 parent: 179 - - uid: 849 + - uid: 351 components: - type: Transform - pos: 3.7249117,16.242453 + pos: 10.561831,21.767809 parent: 179 - - uid: 866 + - uid: 537 components: - type: Transform - pos: 3.651995,16.55517 + pos: -15.5,-0.5 parent: 179 -- proto: FoodBurgerBacon - entities: - - uid: 689 + - uid: 538 components: - type: Transform - pos: 3.3844857,6.0702233 + pos: -15.5,-0.5 parent: 179 -- proto: FoodCarrot +- proto: CableHV entities: - - uid: 850 + - uid: 1019 components: - type: Transform - pos: 3.6023045,15.67151 + pos: -6.5,-13.5 parent: 179 - - uid: 851 + - uid: 1020 components: - type: Transform - pos: 3.620745,15.015423 + pos: -6.5,-12.5 parent: 179 - - uid: 863 + - uid: 1021 components: - type: Transform - pos: 3.620745,14.389988 + pos: -6.5,-11.5 parent: 179 -- proto: FoodPizzaPineapple +- proto: CableHVStack entities: - - uid: 687 + - uid: 184 components: - type: Transform - pos: 3.5215416,6.799056 + pos: -6.665528,7.840053 parent: 179 -- proto: GasAnalyzer +- proto: CableMV entities: - - uid: 876 + - uid: 1023 components: - type: Transform - pos: 4.4732866,-0.48882532 + pos: -6.5,-13.5 parent: 179 -- proto: GasFilter - entities: - - uid: 480 + - uid: 1024 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-3.5 + pos: -5.5,-13.5 parent: 179 -- proto: GasMixer - entities: - - uid: 747 + - uid: 1025 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-2.5 + pos: -5.5,-14.5 parent: 179 -- proto: GasOutletInjector +- proto: CableMVStack entities: - - uid: 429 + - uid: 325 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-1.5 + pos: -6.665528,7.5601244 parent: 179 -- proto: GasPipeBend +- proto: CableTerminal entities: - - uid: 727 + - uid: 1022 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-0.5 + pos: -6.5,-11.5 parent: 179 -- proto: GasPipeFourway +- proto: CapacitorStockPart entities: - - uid: 728 + - uid: 296 components: - type: Transform - pos: 5.5,-1.5 + pos: -4.3012447,8.817795 parent: 179 -- proto: GasPipeStraight - entities: - - uid: 749 + - uid: 700 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-3.5 + pos: -3.8324947,8.786524 parent: 179 -- proto: GasPipeTJunction - entities: - - uid: 748 + - uid: 701 components: - type: Transform - pos: 5.5,-2.5 + pos: -3.2804112,8.786524 parent: 179 -- proto: GasPort - entities: - - uid: 457 + - uid: 704 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-0.5 + pos: -4.8741612,8.817795 parent: 179 -- proto: GasPressurePump +- proto: CaptainIDCard entities: - - uid: 171 + - uid: 726 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-3.5 + pos: 1.0820513,8.752605 parent: 179 -- proto: GasValve +- proto: CaptainSabre entities: - - uid: 168 + - uid: 381 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-2.5 + pos: -3.277628,-2.15838 parent: 179 -- proto: GasVentPump +- proto: CarbonDioxideCanister entities: - - uid: 729 + - uid: 748 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-3.5 + pos: 13.5,-4.5 parent: 179 -- proto: GasVentScrubber - entities: - - uid: 452 + - uid: 749 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-2.5 + pos: 12.5,-4.5 parent: 179 -- proto: GasVolumePump - entities: - - uid: 160 + - uid: 1316 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-1.5 + pos: 24.5,-21.5 parent: 179 -- proto: GeigerCounter +- proto: Catwalk entities: - - uid: 759 + - uid: 2 components: - type: Transform - pos: 1.760596,4.5697265 + pos: 13.5,24.5 parent: 179 -- proto: GravityGenerator - entities: - - uid: 744 + - uid: 7 components: - type: Transform - pos: 6.5,6.5 + pos: 6.5,24.5 parent: 179 -- proto: Grille - entities: - - uid: 108 + - uid: 20 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,23.5 + pos: 6.5,20.5 parent: 179 - - uid: 986 + - uid: 120 components: - type: Transform - pos: -0.5,-16.5 + rot: -1.5707963267948966 rad + pos: 6.5,18.5 parent: 179 - - uid: 987 + - uid: 246 components: - type: Transform - pos: -0.5,-15.5 + pos: -6.5,-6.5 parent: 179 - - uid: 988 + - uid: 247 components: - type: Transform - pos: -0.5,-14.5 + pos: -8.5,-6.5 parent: 179 - - uid: 1007 + - uid: 252 components: - type: Transform - pos: -3.5,-16.5 + pos: 4.5,-8.5 parent: 179 - - uid: 1008 + - uid: 269 components: - type: Transform - pos: -3.5,-15.5 + pos: 12.5,10.5 parent: 179 - - uid: 1009 + - uid: 286 components: - type: Transform - pos: -3.5,-14.5 + pos: 2.5,-11.5 parent: 179 - - uid: 1010 + - uid: 287 components: - type: Transform - pos: 2.5,-16.5 + pos: -4.5,-11.5 parent: 179 - - uid: 1011 + - uid: 308 components: - type: Transform - pos: 2.5,-15.5 + pos: -2.5,-12.5 parent: 179 - - uid: 1012 + - uid: 309 components: - type: Transform - pos: 2.5,-14.5 + pos: 1.5,-12.5 parent: 179 - - uid: 1089 + - uid: 333 components: - type: Transform - pos: 8.5,17.5 + pos: 4.5,-13.5 parent: 179 - - uid: 1090 + - uid: 334 components: - type: Transform - pos: 9.5,17.5 + pos: -5.5,-13.5 parent: 179 - - uid: 1091 + - uid: 438 components: - type: Transform - pos: 10.5,17.5 + rot: 3.141592653589793 rad + pos: -9.5,-0.5 parent: 179 - - uid: 1092 + - uid: 442 components: - type: Transform - pos: 10.5,16.5 + pos: -9.5,8.5 parent: 179 -- proto: Handcuffs - entities: - - uid: 331 + - uid: 514 components: - type: Transform - pos: -3.5805476,0.74100244 + pos: -10.5,8.5 parent: 179 -- proto: HandheldHealthAnalyzer - entities: - - uid: 513 + - uid: 541 components: - type: Transform - pos: -5.9808183,-3.6614444 + pos: -11.5,-6.5 parent: 179 -- proto: HoloFan - entities: - - uid: 142 + - uid: 542 components: - type: Transform - pos: -8.5,7.5 + pos: -9.5,-6.5 parent: 179 - missingComponents: - - TimedDespawn - - uid: 901 + - uid: 695 components: - type: Transform - pos: -10.5,7.5 + rot: 3.141592653589793 rad + pos: -8.5,8.5 parent: 179 - missingComponents: - - TimedDespawn - - uid: 902 +- proto: Chair + entities: + - uid: 580 components: - type: Transform - pos: -9.5,7.5 + rot: 1.5707963267948966 rad + pos: 14.5,6.5 parent: 179 - missingComponents: - - TimedDespawn -- proto: HolosignWetFloor - entities: - - uid: 848 + - uid: 581 components: - type: Transform - pos: -13.5,2.5 + rot: 1.5707963267948966 rad + pos: 14.5,8.5 parent: 179 - - type: Fixtures - fixtures: {} - missingComponents: - - TimedDespawn - - uid: 911 + - uid: 582 components: - type: Transform - pos: -13.5,1.5 + rot: 1.5707963267948966 rad + pos: 14.5,7.5 parent: 179 - - type: Fixtures - fixtures: {} - missingComponents: - - TimedDespawn -- proto: hydroponicsTray +- proto: ChairOfficeDark entities: - - uid: 756 + - uid: 380 components: - type: Transform - pos: 2.5,14.5 + rot: 3.1415926535897967 rad + pos: 0.5,-6.5 parent: 179 - - uid: 757 +- proto: ChairOfficeLight + entities: + - uid: 576 components: - type: Transform - pos: 2.5,15.5 + rot: 4.71238898038469 rad + pos: 19.5,4.5 parent: 179 -- proto: KitchenReagentGrinder - entities: - - uid: 731 + - uid: 577 components: - type: Transform - pos: 8.5,9.5 + rot: 3.141592653589793 rad + pos: 20.5,5.5 parent: 179 -- proto: LargeBeaker - entities: - - uid: 210 + - uid: 578 components: - type: Transform - pos: 4.3272614,9.338851 + rot: 4.71238898038469 rad + pos: 23.5,8.5 parent: 179 - - uid: 253 + - uid: 579 components: - type: Transform - pos: 23.494947,7.0422435 + pos: 24.5,5.5 parent: 179 - - uid: 402 +- proto: ChemDispenser + entities: + - uid: 583 components: - type: Transform - pos: 23.510572,7.7141185 + pos: 23.5,9.5 parent: 179 - - uid: 737 + - type: ContainerContainer + containers: + ReagentDispenser-beaker: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + beakerSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 750 components: - type: Transform - pos: 4.2969,9.828774 + pos: 7.5,11.5 parent: 179 -- proto: LedLightTube +- proto: ChemicalPayload entities: - - uid: 481 + - uid: 432 components: - type: Transform - pos: -3.511025,-10.35149 + pos: 6.4651074,9.828774 parent: 179 -- proto: LockerBotanistFilled +- proto: ChemMaster entities: - - uid: 869 + - uid: 311 components: - type: Transform - pos: 2.5,16.5 + pos: 8.5,11.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChemistry +- proto: ChemMasterMachineCircuitboard entities: - - uid: 127 + - uid: 718 components: - type: Transform - pos: 27.5,6.5 + pos: -4.5458,10.514079 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChemistryFilled +- proto: CircuitImprinter entities: - - uid: 297 + - uid: 332 components: - type: Transform - pos: 7.5,9.5 + pos: -6.5,4.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerChiefEngineerFilled +- proto: ClosetEmergencyFilledRandom entities: - - uid: 447 + - uid: 349 components: - type: Transform - pos: 7.5,2.5 + pos: 1.5,-10.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerElectricalSuppliesFilled - entities: - - uid: 444 + - uid: 403 components: - type: Transform - pos: 7.5,3.5 + pos: 0.5,-10.5 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerEngineerFilled +- proto: ClosetToolFilled entities: - - uid: 490 + - uid: 524 components: - type: Transform - pos: 7.5,4.5 + pos: -11.5,-5.5 parent: 179 - type: EntityStorage air: @@ -3965,12 +3593,10 @@ entities: - 0 - 0 - 0 -- proto: LockerMedical - entities: - - uid: 128 + - uid: 525 components: - type: Transform - pos: 27.5,5.5 + pos: -11.5,-4.5 parent: 179 - type: EntityStorage air: @@ -3990,10 +3616,10 @@ entities: - 0 - 0 - 0 - - uid: 129 + - uid: 526 components: - type: Transform - pos: 29.5,-1.5 + pos: -11.5,-3.5 parent: 179 - type: EntityStorage air: @@ -4013,10 +3639,10 @@ entities: - 0 - 0 - 0 - - uid: 130 + - uid: 527 components: - type: Transform - pos: 30.5,-1.5 + pos: -11.5,-2.5 parent: 179 - type: EntityStorage air: @@ -4036,70 +3662,253 @@ entities: - 0 - 0 - 0 -- proto: LockerMedicalFilled +- proto: ClothingBeltChiefEngineerFilled entities: - - uid: 865 + - uid: 1573 components: - type: Transform - pos: -6.5,-3.5 + pos: 1.3037996,-5.2961445 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerMedicineFilled +- proto: ClothingBeltUtilityFilled entities: - - uid: 562 + - uid: 427 components: - type: Transform - pos: -5.5,-3.5 + pos: -1.895102,-10.33495 parent: 179 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 2.9923203 - - 11.2568245 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: LockerSalvageSpecialistFilled + - uid: 428 + components: + - type: Transform + pos: -1.770102,-10.63182 + parent: 179 +- proto: ClothingHandsGlovesColorYellow entities: - - uid: 493 + - uid: 454 components: - type: Transform - pos: -10.5,4.5 + pos: -0.78741443,4.322194 parent: 179 - - type: Lock - locked: False - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 +- proto: ClothingHeadHatWelding + entities: + - uid: 344 + components: + - type: Transform + pos: 0.7198646,4.374314 + parent: 179 +- proto: ClothingMaskBreath + entities: + - uid: 955 + components: + - type: Transform + pos: -10.595239,6.1907988 + parent: 179 +- proto: ClothingMaskGas + entities: + - uid: 425 + components: + - type: Transform + pos: -0.2880585,-10.69432 + parent: 179 +- proto: ClothingOuterHardsuitAtmos + entities: + - uid: 270 + components: + - type: Transform + pos: -10.5426235,5.472399 + parent: 179 +- proto: ClothingOuterVest + entities: + - uid: 426 + components: + - type: Transform + pos: -0.9130585,-10.66307 + parent: 179 +- proto: ClothingShoesBootsMag + entities: + - uid: 725 + components: + - type: Transform + pos: 0.47880077,8.073378 + parent: 179 +- proto: ClothingUniformJumpsuitEngineering + entities: + - uid: 424 + components: + - type: Transform + pos: -0.6474335,-10.27245 + parent: 179 +- proto: ClownPDA + entities: + - uid: 91 + components: + - type: Transform + pos: -15.5,2.5 + parent: 179 + - uid: 762 + components: + - type: Transform + pos: -14.5,1.5 + parent: 179 + - uid: 864 + components: + - type: Transform + pos: -14.5,2.5 + parent: 179 + - uid: 912 + components: + - type: Transform + pos: -15.5,1.5 + parent: 179 +- proto: ComputerAnalysisConsole + entities: + - uid: 1083 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,23.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 1078: + - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver +- proto: ComputerCargoOrders + entities: + - uid: 326 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 179 + - uid: 996 + components: + - type: Transform + pos: -1.5,-11.5 + parent: 179 +- proto: ComputerCargoShuttle + entities: + - uid: 404 + components: + - type: Transform + pos: 0.5,-11.5 + parent: 179 +- proto: ComputerMedicalRecords + entities: + - uid: 152 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-5.5 + parent: 179 + - uid: 591 + components: + - type: Transform + pos: 21.5,5.5 + parent: 179 +- proto: ComputerResearchAndDevelopment + entities: + - uid: 88 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,19.5 + parent: 179 +- proto: ComputerShuttleCargo + entities: + - uid: 994 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 179 +- proto: ComputerSurveillanceCameraMonitor + entities: + - uid: 1185 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,1.5 + parent: 179 +- proto: ComputerTechnologyDiskTerminal + entities: + - uid: 1088 + components: + - type: Transform + pos: 13.5,16.5 + parent: 179 +- proto: ConveyorBelt + entities: + - uid: 195 + components: + - type: Transform + pos: -2.5,-15.5 + parent: 179 + - uid: 259 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-14.5 + parent: 179 + - uid: 463 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-16.5 + parent: 179 + - uid: 677 + components: + - type: Transform + pos: -2.5,-14.5 + parent: 179 + - uid: 716 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,11.5 + parent: 179 + - uid: 720 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,11.5 + parent: 179 + - uid: 721 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,11.5 + parent: 179 + - uid: 985 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-13.5 + parent: 179 + - uid: 989 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-15.5 + parent: 179 + - uid: 990 + components: + - type: Transform + pos: -2.5,-13.5 + parent: 179 + - uid: 991 + components: + - type: Transform + pos: -2.5,-16.5 + parent: 179 +- proto: CrateEngineeringToolbox + entities: + - uid: 692 + components: + - type: Transform + pos: -0.5,3.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 moles: - 2.9923203 - 11.2568245 @@ -4113,12 +3922,12 @@ entities: - 0 - 0 - 0 -- proto: LockerWeldingSuppliesFilled +- proto: CrateHydroponicsSeeds entities: - - uid: 871 + - uid: 754 components: - type: Transform - pos: 7.5,1.5 + pos: 2.5,12.5 parent: 179 - type: EntityStorage air: @@ -4138,3490 +3947,6113 @@ entities: - 0 - 0 - 0 -- proto: MachineAnomalyGenerator +- proto: CrateHydroponicsTools + entities: + - uid: 755 + components: + - type: Transform + pos: 2.5,13.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: CrateMaterialSteel + entities: + - uid: 1258 + components: + - type: Transform + pos: 7.5,-11.5 + parent: 179 + - uid: 1293 + components: + - type: Transform + pos: 7.5,-10.5 + parent: 179 +- proto: CrateMedical + entities: + - uid: 131 + components: + - type: Transform + pos: 31.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 132 + components: + - type: Transform + pos: 32.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: CrewMonitoringServer + entities: + - uid: 1183 + components: + - type: Transform + pos: 9.5,25.5 + parent: 179 +- proto: Crowbar + entities: + - uid: 147 + components: + - type: Transform + pos: -2.172831,4.5306726 + parent: 179 + - uid: 423 + components: + - type: Transform + pos: -2.861032,-5.524786 + parent: 179 +- proto: DebugBatteryDischarger + entities: + - uid: 711 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 179 +- proto: DebugGenerator + entities: + - uid: 490 + components: + - type: Transform + pos: -6.5,-11.5 + parent: 179 +- proto: DefaultStationBeaconAISatellite + entities: + - uid: 1198 + components: + - type: Transform + pos: 8.5,-10.5 + parent: 179 +- proto: DefaultStationBeaconBotany + entities: + - uid: 1193 + components: + - type: Transform + pos: 3.5,15.5 + parent: 179 +- proto: DefaultStationBeaconChemistry + entities: + - uid: 1195 + components: + - type: Transform + pos: 7.5,10.5 + parent: 179 +- proto: DefaultStationBeaconCommand + entities: + - uid: 1196 + components: + - type: Transform + pos: 0.5,8.5 + parent: 179 +- proto: DefaultStationBeaconGravGen + entities: + - uid: 1172 + components: + - type: Transform + pos: 6.5,5.5 + parent: 179 +- proto: DefaultStationBeaconMedical + entities: + - uid: 1173 + components: + - type: Transform + pos: 19.5,5.5 + parent: 179 +- proto: DefaultStationBeaconScience + entities: + - uid: 1194 + components: + - type: Transform + pos: 12.5,20.5 + parent: 179 +- proto: DefaultStationBeaconSecurity + entities: + - uid: 1197 + components: + - type: Transform + pos: -14.5,17.5 + parent: 179 +- proto: DefaultStationBeaconSupply + entities: + - uid: 1175 + components: + - type: Transform + pos: -0.5,-11.5 + parent: 179 +- proto: DefaultStationBeaconToolRoom + entities: + - uid: 1174 + components: + - type: Transform + pos: -1.5,4.5 + parent: 179 +- proto: DisposalPipe + entities: + - uid: 717 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,10.5 + parent: 179 +- proto: DisposalTrunk + entities: + - uid: 285 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,10.5 + parent: 179 + - uid: 715 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,10.5 + parent: 179 +- proto: DisposalUnit + entities: + - uid: 719 + components: + - type: Transform + pos: -1.5,10.5 + parent: 179 +- proto: DrinkBeerglass + entities: + - uid: 688 + components: + - type: Transform + pos: 3.1981986,5.733985 + parent: 179 +- proto: DrinkColaCan + entities: + - uid: 690 + components: + - type: Transform + pos: 3.8231986,6.150942 + parent: 179 +- proto: Dropper + entities: + - uid: 730 + components: + - type: Transform + pos: 5.892191,9.4118185 + parent: 179 +- proto: EmergencyOxygenTankFilled + entities: + - uid: 956 + components: + - type: Transform + pos: -10.505015,6.711994 + parent: 179 +- proto: ExGrenade + entities: + - uid: 433 + components: + - type: Transform + pos: -3.7704864,-1.6163371 + parent: 179 +- proto: ExplosivePayload + entities: + - uid: 668 + components: + - type: Transform + pos: 6.829691,9.4118185 + parent: 179 +- proto: FaxMachineCaptain + entities: + - uid: 967 + components: + - type: Transform + pos: 9.5,12.5 + parent: 179 +- proto: FaxMachineCentcom + entities: + - uid: 968 + components: + - type: Transform + pos: 11.5,12.5 + parent: 179 +- proto: FaxMachineSyndie + entities: + - uid: 969 + components: + - type: Transform + pos: 13.5,12.5 + parent: 179 +- proto: FireAxeCabinetFilled + entities: + - uid: 1574 + components: + - type: Transform + pos: 8.5,-4.5 + parent: 179 +- proto: FireExtinguisher + entities: + - uid: 323 + components: + - type: Transform + pos: -1.297692,-5.396082 + parent: 179 + - uid: 868 + components: + - type: Transform + pos: -14.5,-1.5 + parent: 179 +- proto: FlashlightLantern + entities: + - uid: 421 + components: + - type: Transform + pos: -1.934832,-5.154238 + parent: 179 + - uid: 422 + components: + - type: Transform + pos: 1.1350493,8.198464 + parent: 179 +- proto: FloorLavaEntity + entities: + - uid: 134 + components: + - type: Transform + pos: -13.5,-3.5 + parent: 179 + - uid: 135 + components: + - type: Transform + pos: -14.5,-3.5 + parent: 179 + - uid: 141 + components: + - type: Transform + pos: -13.5,-2.5 + parent: 179 + - uid: 469 + components: + - type: Transform + pos: -14.5,-2.5 + parent: 179 +- proto: FloorWaterEntity + entities: + - uid: 136 + components: + - type: Transform + pos: -12.5,-2.5 + parent: 179 + - uid: 137 + components: + - type: Transform + pos: -12.5,-3.5 + parent: 179 +- proto: FoodApple + entities: + - uid: 16 + components: + - type: Transform + pos: 3.9853282,16.430082 + parent: 179 + - uid: 849 + components: + - type: Transform + pos: 3.7249117,16.242453 + parent: 179 + - uid: 866 + components: + - type: Transform + pos: 3.651995,16.55517 + parent: 179 +- proto: FoodBurgerBacon + entities: + - uid: 689 + components: + - type: Transform + pos: 3.3844857,6.0702233 + parent: 179 +- proto: FoodCarrot + entities: + - uid: 850 + components: + - type: Transform + pos: 3.6023045,15.67151 + parent: 179 + - uid: 851 + components: + - type: Transform + pos: 3.620745,15.015423 + parent: 179 + - uid: 863 + components: + - type: Transform + pos: 3.620745,14.389988 + parent: 179 +- proto: FoodPizzaPineapple + entities: + - uid: 687 + components: + - type: Transform + pos: 3.5215416,6.799056 + parent: 179 +- proto: FrezonCanister + entities: + - uid: 1308 + components: + - type: Transform + pos: 9.5,-5.5 + parent: 179 + - uid: 1309 + components: + - type: Transform + pos: 10.5,-5.5 + parent: 179 + - uid: 1318 + components: + - type: Transform + pos: 24.5,-15.5 + parent: 179 +- proto: GasAnalyzer + entities: + - uid: 1571 + components: + - type: Transform + pos: 7.3675013,-6.725376 + parent: 179 +- proto: GasMinerAmmonia + entities: + - uid: 1204 + components: + - type: Transform + pos: 23.5,-19.5 + parent: 179 +- proto: GasMinerCarbonDioxide + entities: + - uid: 1205 + components: + - type: Transform + pos: 23.5,-21.5 + parent: 179 +- proto: GasMinerFrezon + entities: + - uid: 1223 + components: + - type: Transform + pos: 23.5,-15.5 + parent: 179 +- proto: GasMinerNitrogenStation + entities: + - uid: 1222 + components: + - type: Transform + pos: 23.5,-9.5 + parent: 179 +- proto: GasMinerNitrousOxide + entities: + - uid: 1225 + components: + - type: Transform + pos: 23.5,-17.5 + parent: 179 +- proto: GasMinerOxygenStation + entities: + - uid: 1199 + components: + - type: Transform + pos: 23.5,-7.5 + parent: 179 +- proto: GasMinerPlasma + entities: + - uid: 1221 + components: + - type: Transform + pos: 23.5,-11.5 + parent: 179 +- proto: GasMinerTritium + entities: + - uid: 1224 + components: + - type: Transform + pos: 23.5,-13.5 + parent: 179 +- proto: GasMinerWaterVapor + entities: + - uid: 1202 + components: + - type: Transform + pos: 23.5,-23.5 + parent: 179 +- proto: GasMixer + entities: + - uid: 1480 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-9.5 + parent: 179 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 +- proto: GasOutletInjector + entities: + - uid: 406 + components: + - type: Transform + pos: 24.5,-21.5 + parent: 179 + - uid: 409 + components: + - type: Transform + pos: 24.5,-17.5 + parent: 179 + - uid: 410 + components: + - type: Transform + pos: 24.5,-23.5 + parent: 179 + - uid: 411 + components: + - type: Transform + pos: 24.5,-15.5 + parent: 179 + - uid: 413 + components: + - type: Transform + pos: 24.5,-11.5 + parent: 179 + - uid: 414 + components: + - type: Transform + pos: 24.5,-19.5 + parent: 179 + - uid: 429 + components: + - type: Transform + pos: 24.5,-7.5 + parent: 179 + - uid: 444 + components: + - type: Transform + pos: 24.5,-9.5 + parent: 179 + - uid: 447 + components: + - type: Transform + pos: 24.5,-13.5 + parent: 179 +- proto: GasPassiveVent + entities: + - uid: 1319 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-23.5 + parent: 179 + - uid: 1320 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-21.5 + parent: 179 + - uid: 1321 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-19.5 + parent: 179 + - uid: 1322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-15.5 + parent: 179 + - uid: 1323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-17.5 + parent: 179 + - uid: 1324 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-13.5 + parent: 179 + - uid: 1325 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-11.5 + parent: 179 + - uid: 1326 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-9.5 + parent: 179 + - uid: 1327 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-7.5 + parent: 179 + - uid: 1544 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-26.5 + parent: 179 +- proto: GasPipeBend + entities: + - uid: 407 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-16.5 + parent: 179 + - uid: 408 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-14.5 + parent: 179 + - uid: 412 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-8.5 + parent: 179 + - uid: 415 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-10.5 + parent: 179 + - uid: 418 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-12.5 + parent: 179 + - uid: 1439 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-18.5 + parent: 179 + - uid: 1440 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-20.5 + parent: 179 + - uid: 1441 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-22.5 + parent: 179 + - uid: 1442 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-24.5 + parent: 179 + - uid: 1482 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-7.5 + parent: 179 + - uid: 1542 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-9.5 + parent: 179 +- proto: GasPipeStraight + entities: + - uid: 1443 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-24.5 + parent: 179 + - uid: 1444 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-24.5 + parent: 179 + - uid: 1445 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-22.5 + parent: 179 + - uid: 1446 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-22.5 + parent: 179 + - uid: 1447 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-20.5 + parent: 179 + - uid: 1448 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-20.5 + parent: 179 + - uid: 1449 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-18.5 + parent: 179 + - uid: 1450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-16.5 + parent: 179 + - uid: 1451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-14.5 + parent: 179 + - uid: 1452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-12.5 + parent: 179 + - uid: 1453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-10.5 + parent: 179 + - uid: 1454 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,-8.5 + parent: 179 + - uid: 1455 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-8.5 + parent: 179 + - uid: 1456 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-10.5 + parent: 179 + - uid: 1457 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-12.5 + parent: 179 + - uid: 1458 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-14.5 + parent: 179 + - uid: 1460 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-16.5 + parent: 179 + - uid: 1461 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 23.5,-18.5 + parent: 179 + - uid: 1483 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-7.5 + parent: 179 + - uid: 1484 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-8.5 + parent: 179 + - uid: 1485 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-8.5 + parent: 179 + - uid: 1486 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-9.5 + parent: 179 + - uid: 1487 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-9.5 + parent: 179 + - uid: 1522 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-21.5 + parent: 179 + - uid: 1523 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-20.5 + parent: 179 + - uid: 1524 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-19.5 + parent: 179 + - uid: 1525 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-18.5 + parent: 179 + - uid: 1526 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-17.5 + parent: 179 + - uid: 1527 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-16.5 + parent: 179 + - uid: 1528 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-15.5 + parent: 179 + - uid: 1529 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-14.5 + parent: 179 + - uid: 1530 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-12.5 + parent: 179 + - uid: 1531 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-13.5 + parent: 179 + - uid: 1532 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-10.5 + parent: 179 + - uid: 1533 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-11.5 + parent: 179 + - uid: 1534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 17.5,-9.5 + parent: 179 + - uid: 1535 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-9.5 + parent: 179 + - uid: 1536 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-9.5 + parent: 179 + - uid: 1537 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-9.5 + parent: 179 + - uid: 1538 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-9.5 + parent: 179 + - uid: 1539 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-9.5 + parent: 179 + - uid: 1540 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-9.5 + parent: 179 + - uid: 1541 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,-9.5 + parent: 179 + - uid: 1546 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-25.5 + parent: 179 + - uid: 1547 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,-22.5 + parent: 179 + - uid: 1548 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-22.5 + parent: 179 + - uid: 1549 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-22.5 + parent: 179 + - uid: 1550 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-22.5 + parent: 179 + - uid: 1551 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,-22.5 + parent: 179 + - uid: 1552 + components: + - type: Transform + pos: 17.5,-23.5 + parent: 179 +- proto: GasPipeTJunction + entities: + - uid: 1479 + components: + - type: Transform + pos: 20.5,-9.5 + parent: 179 + - uid: 1481 + components: + - type: Transform + pos: 19.5,-7.5 + parent: 179 + - uid: 1553 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-22.5 + parent: 179 +- proto: GasPressurePump + entities: + - uid: 1459 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-7.5 + parent: 179 + - uid: 1462 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-9.5 + parent: 179 + - uid: 1463 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-11.5 + parent: 179 + - uid: 1464 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-13.5 + parent: 179 + - uid: 1465 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-15.5 + parent: 179 + - uid: 1466 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-17.5 + parent: 179 + - uid: 1467 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-19.5 + parent: 179 + - uid: 1468 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-21.5 + parent: 179 + - uid: 1469 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-23.5 + parent: 179 + - uid: 1470 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-24.5 + parent: 179 + - uid: 1471 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-22.5 + parent: 179 + - uid: 1472 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-20.5 + parent: 179 + - uid: 1473 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-18.5 + parent: 179 + - uid: 1474 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-16.5 + parent: 179 + - uid: 1475 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-14.5 + parent: 179 + - uid: 1476 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-12.5 + parent: 179 + - uid: 1477 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-10.5 + parent: 179 + - uid: 1478 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,-8.5 + parent: 179 +- proto: GasThermoMachineFreezer + entities: + - uid: 480 + components: + - type: Transform + pos: 9.5,-7.5 + parent: 179 + - uid: 616 + components: + - type: Transform + pos: 10.5,-7.5 + parent: 179 +- proto: GasThermoMachineHeater + entities: + - uid: 483 + components: + - type: Transform + pos: 13.5,-7.5 + parent: 179 + - uid: 1568 + components: + - type: Transform + pos: 12.5,-7.5 + parent: 179 +- proto: GasValve + entities: + - uid: 1545 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-24.5 + parent: 179 +- proto: GasVentPump + entities: + - uid: 1521 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-22.5 + parent: 179 +- proto: GasVentScrubber + entities: + - uid: 1543 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-22.5 + parent: 179 +- proto: GeigerCounter + entities: + - uid: 759 + components: + - type: Transform + pos: 1.760596,4.5697265 + parent: 179 +- proto: GravityGenerator + entities: + - uid: 744 + components: + - type: Transform + pos: 6.5,6.5 + parent: 179 +- proto: Grille + entities: + - uid: 108 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,23.5 + parent: 179 + - uid: 986 + components: + - type: Transform + pos: -0.5,-16.5 + parent: 179 + - uid: 987 + components: + - type: Transform + pos: -0.5,-15.5 + parent: 179 + - uid: 988 + components: + - type: Transform + pos: -0.5,-14.5 + parent: 179 + - uid: 1007 + components: + - type: Transform + pos: -3.5,-16.5 + parent: 179 + - uid: 1008 + components: + - type: Transform + pos: -3.5,-15.5 + parent: 179 + - uid: 1009 + components: + - type: Transform + pos: -3.5,-14.5 + parent: 179 + - uid: 1010 + components: + - type: Transform + pos: 2.5,-16.5 + parent: 179 + - uid: 1011 + components: + - type: Transform + pos: 2.5,-15.5 + parent: 179 + - uid: 1012 + components: + - type: Transform + pos: 2.5,-14.5 + parent: 179 + - uid: 1089 + components: + - type: Transform + pos: 8.5,17.5 + parent: 179 + - uid: 1090 + components: + - type: Transform + pos: 9.5,17.5 + parent: 179 + - uid: 1091 + components: + - type: Transform + pos: 10.5,17.5 + parent: 179 + - uid: 1092 + components: + - type: Transform + pos: 10.5,16.5 + parent: 179 +- proto: Handcuffs + entities: + - uid: 331 + components: + - type: Transform + pos: -3.5805476,0.74100244 + parent: 179 +- proto: HandheldHealthAnalyzer + entities: + - uid: 513 + components: + - type: Transform + pos: -5.9808183,-3.6614444 + parent: 179 +- proto: HoloFan + entities: + - uid: 142 + components: + - type: Transform + pos: -8.5,7.5 + parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True + missingComponents: + - TimedDespawn + - uid: 901 + components: + - type: Transform + pos: -10.5,7.5 + parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True + missingComponents: + - TimedDespawn + - uid: 902 + components: + - type: Transform + pos: -9.5,7.5 + parent: 179 + - type: Fixtures + fixtures: {} + - type: Airtight + noAirWhenFullyAirBlocked: True + missingComponents: + - TimedDespawn +- proto: HolofanProjectorEmpty + entities: + - uid: 1569 + components: + - type: Transform + pos: 7.2439203,-7.545966 + parent: 179 +- proto: HolosignWetFloor + entities: + - uid: 848 + components: + - type: Transform + pos: -13.5,2.5 + parent: 179 + - type: Fixtures + fixtures: {} + missingComponents: + - TimedDespawn + - uid: 911 + components: + - type: Transform + pos: -13.5,1.5 + parent: 179 + - type: Fixtures + fixtures: {} + missingComponents: + - TimedDespawn +- proto: hydroponicsTray + entities: + - uid: 756 + components: + - type: Transform + pos: 2.5,14.5 + parent: 179 + - uid: 757 + components: + - type: Transform + pos: 2.5,15.5 + parent: 179 +- proto: Igniter + entities: + - uid: 728 + components: + - type: Transform + pos: 13.546334,-14.688479 + parent: 179 +- proto: KitchenReagentGrinder + entities: + - uid: 731 + components: + - type: Transform + pos: 8.5,9.5 + parent: 179 +- proto: LargeBeaker + entities: + - uid: 210 + components: + - type: Transform + pos: 4.3272614,9.338851 + parent: 179 + - uid: 253 + components: + - type: Transform + pos: 23.494947,7.0422435 + parent: 179 + - uid: 402 + components: + - type: Transform + pos: 23.510572,7.7141185 + parent: 179 + - uid: 737 + components: + - type: Transform + pos: 4.2969,9.828774 + parent: 179 +- proto: LedLightTube + entities: + - uid: 481 + components: + - type: Transform + pos: -3.511025,-10.35149 + parent: 179 +- proto: LockerAtmosphericsFilledHardsuit + entities: + - uid: 1278 + components: + - type: Transform + pos: 7.5,-12.5 + parent: 179 +- proto: LockerBotanistFilled + entities: + - uid: 869 + components: + - type: Transform + pos: 2.5,16.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerChemistry + entities: + - uid: 127 + components: + - type: Transform + pos: 27.5,6.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerChemistryFilled + entities: + - uid: 297 + components: + - type: Transform + pos: 7.5,9.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerChiefEngineerFilledHardsuit + entities: + - uid: 1564 + components: + - type: Transform + pos: 7.5,-13.5 + parent: 179 +- proto: LockerElectricalSuppliesFilled + entities: + - uid: 405 + components: + - type: Transform + pos: 5.5,-6.5 + parent: 179 +- proto: LockerEngineerFilledHardsuit + entities: + - uid: 458 + components: + - type: Transform + pos: 5.5,-5.5 + parent: 179 +- proto: LockerMedical + entities: + - uid: 128 + components: + - type: Transform + pos: 27.5,5.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 129 + components: + - type: Transform + pos: 29.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - uid: 130 + components: + - type: Transform + pos: 30.5,-1.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerMedicalFilled + entities: + - uid: 865 + components: + - type: Transform + pos: -6.5,-3.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerMedicineFilled + entities: + - uid: 562 + components: + - type: Transform + pos: -5.5,-3.5 + parent: 179 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerSalvageSpecialistFilled + entities: + - uid: 493 + components: + - type: Transform + pos: -10.5,4.5 + parent: 179 + - type: Lock + locked: False + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14957 + moles: + - 2.9923203 + - 11.2568245 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 +- proto: LockerWeldingSuppliesFilled + entities: + - uid: 457 + components: + - type: Transform + pos: 5.5,-7.5 + parent: 179 +- proto: MachineAnomalyGenerator + entities: + - uid: 1071 + components: + - type: Transform + pos: 16.5,25.5 + parent: 179 +- proto: MachineAnomalyVessel + entities: + - uid: 1087 + components: + - type: Transform + pos: 15.5,19.5 + parent: 179 +- proto: MachineArtifactAnalyzer + entities: + - uid: 1078 + components: + - type: Transform + pos: 12.5,24.5 + parent: 179 +- proto: MachineFrame + entities: + - uid: 533 + components: + - type: Transform + pos: -5.5,10.5 + parent: 179 +- proto: MedicalScanner + entities: + - uid: 592 + components: + - type: Transform + pos: 18.5,-1.5 + parent: 179 + - type: ContainerContainer + containers: + MedicalScanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + scanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 593 + components: + - type: Transform + pos: 18.5,-5.5 + parent: 179 + - type: ContainerContainer + containers: + MedicalScanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + scanner-bodyContainer: !type:ContainerSlot + showEnts: False + occludes: True + ent: null +- proto: MedkitFilled + entities: + - uid: 153 + components: + - type: Transform + pos: 13.632214,1.5673001 + parent: 179 + - uid: 154 + components: + - type: Transform + pos: 13.460339,0.6141751 + parent: 179 + - uid: 321 + components: + - type: Transform + pos: 3.8440318,4.425983 + parent: 179 +- proto: MicroManipulatorStockPart + entities: + - uid: 455 + components: + - type: Transform + pos: -6.337244,8.838643 + parent: 179 + - uid: 456 + components: + - type: Transform + pos: -5.920577,8.817795 + parent: 179 + - uid: 484 + components: + - type: Transform + pos: -5.5039105,8.838643 + parent: 179 + - uid: 712 + components: + - type: Transform + pos: -6.7434506,8.817795 + parent: 179 + - uid: 959 + components: + - type: Transform + pos: -4.752078,10.904018 + parent: 179 +- proto: ModularGrenade + entities: + - uid: 435 + components: + - type: Transform + pos: 6.829691,9.860046 + parent: 179 +- proto: MopBucket + entities: + - uid: 696 + components: + - type: Transform + pos: 7.5,16.5 + parent: 179 +- proto: MopItem + entities: + - uid: 328 + components: + - type: Transform + pos: 7.6382103,16.08618 + parent: 179 + - type: SolutionContainerManager + solutions: + absorbed: + temperature: 293.15 + canReact: True + maxVol: 50 + name: null + reagents: + - data: null + ReagentId: Water + Quantity: 25 +- proto: Multitool + entities: + - uid: 307 + components: + - type: Transform + pos: -1.249865,-10.43489 + parent: 179 + - uid: 430 + components: + - type: Transform + pos: -0.6298993,4.7431083 + parent: 179 + - type: NetworkConfigurator + devices: + 'UID: 31739': 801 +- proto: NitrogenCanister + entities: + - uid: 871 + components: + - type: Transform + pos: 9.5,-4.5 + parent: 179 + - uid: 876 + components: + - type: Transform + pos: 10.5,-4.5 + parent: 179 + - uid: 1315 + components: + - type: Transform + pos: 24.5,-9.5 + parent: 179 +- proto: NitrousOxideCanister + entities: + - uid: 617 + components: + - type: Transform + pos: 10.5,-3.5 + parent: 179 + - uid: 1302 + components: + - type: Transform + pos: 9.5,-3.5 + parent: 179 + - uid: 1314 + components: + - type: Transform + pos: 24.5,-17.5 + parent: 179 +- proto: Ointment + entities: + - uid: 148 + components: + - type: Transform + pos: 18.77326,6.653532 + parent: 179 + - uid: 149 + components: + - type: Transform + pos: 18.49201,6.059782 + parent: 179 +- proto: OxygenCanister + entities: + - uid: 747 + components: + - type: Transform + pos: 13.5,-3.5 + parent: 179 + - uid: 875 + components: + - type: Transform + pos: 12.5,-3.5 + parent: 179 + - uid: 1310 + components: + - type: Transform + pos: 24.5,-7.5 + parent: 179 +- proto: PaperBin10 + entities: + - uid: 977 + components: + - type: Transform + pos: 10.5,12.5 + parent: 179 +- proto: PartRodMetal + entities: + - uid: 133 + components: + - type: Transform + pos: -3.4717777,7.672426 + parent: 179 +- proto: Pen + entities: + - uid: 978 + components: + - type: Transform + pos: 10.893699,12.7794075 + parent: 179 + - uid: 979 + components: + - type: Transform + pos: 10.862433,12.602201 + parent: 179 +- proto: PlasmaCanister + entities: + - uid: 255 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 179 + - uid: 256 + components: + - type: Transform + pos: 9.5,-2.5 + parent: 179 + - uid: 1311 + components: + - type: Transform + pos: 24.5,-11.5 + parent: 179 +- proto: PlasticFlapsAirtightClear + entities: + - uid: 997 + components: + - type: Transform + pos: -2.5,-16.5 + parent: 179 + - uid: 998 + components: + - type: Transform + pos: -2.5,-14.5 + parent: 179 + - uid: 999 + components: + - type: Transform + pos: 1.5,-16.5 + parent: 179 + - uid: 1000 + components: + - type: Transform + pos: 1.5,-14.5 + parent: 179 +- proto: PlayerStationAi + entities: + - uid: 14 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 179 +- proto: PowerCellAntiqueProto + entities: + - uid: 1570 + components: + - type: Transform + pos: 7.5772533,-7.233466 + parent: 179 +- proto: PowerCellHigh + entities: + - uid: 567 + components: + - type: Transform + pos: -4.76583,8.265328 + parent: 179 +- proto: PowerCellHyper + entities: + - uid: 703 + components: + - type: Transform + pos: -4.3179135,8.275752 + parent: 179 +- proto: PowerCellMedium + entities: + - uid: 186 + components: + - type: Transform + pos: -2.67511,-10.351 + parent: 179 + - uid: 187 + components: + - type: Transform + pos: -2.55011,-10.6635 + parent: 179 + - uid: 360 + components: + - type: Transform + pos: -3.7970803,8.275752 + parent: 179 +- proto: PowerCellRecharger + entities: + - uid: 709 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 179 +- proto: PowerCellSmall + entities: + - uid: 705 + components: + - type: Transform + pos: -3.3182633,8.234056 + parent: 179 +- proto: Poweredlight + entities: + - uid: 93 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 249 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-24.5 + parent: 179 + - uid: 536 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-0.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 546 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-5.5 + parent: 179 + - uid: 660 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,1.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 661 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.5,7.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 663 + components: + - type: Transform + pos: 22.5,2.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 666 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,23.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 670 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,18.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 673 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 674 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 675 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-0.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 676 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-10.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 681 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 682 + components: + - type: Transform + pos: 13.5,2.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 683 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,4.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1075 + components: + - type: Transform + pos: 16.5,27.5 + parent: 179 + - uid: 1076 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,22.5 + parent: 179 + - uid: 1425 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-3.5 + parent: 179 + - uid: 1426 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-3.5 + parent: 179 + - uid: 1427 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-7.5 + parent: 179 + - uid: 1428 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-14.5 + parent: 179 + - uid: 1429 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-18.5 + parent: 179 + - uid: 1430 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-24.5 + parent: 179 + - uid: 1431 + components: + - type: Transform + pos: 14.5,-7.5 + parent: 179 + - uid: 1432 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-23.5 + parent: 179 + - uid: 1433 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-19.5 + parent: 179 + - uid: 1434 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-15.5 + parent: 179 + - uid: 1435 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-11.5 + parent: 179 + - uid: 1436 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-7.5 + parent: 179 + - uid: 1437 + components: + - type: Transform + pos: 19.5,-7.5 + parent: 179 +- proto: PoweredlightExterior + entities: + - uid: 1557 + components: + - type: Transform + pos: 16.5,-26.5 + parent: 179 +- proto: PoweredLightPostSmall + entities: + - uid: 1438 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-17.5 + parent: 179 +- proto: PoweredSmallLight + entities: + - uid: 163 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,26.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 166 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,24.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,17.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 388 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 417 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-5.5 + parent: 179 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 727 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-10.5 + parent: 179 +- proto: Protolathe + entities: + - uid: 12 + components: + - type: Transform + pos: 13.5,21.5 + parent: 179 + - uid: 384 + components: + - type: Transform + pos: -6.5,6.5 + parent: 179 +- proto: Railing + entities: + - uid: 665 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,9.5 + parent: 179 + - uid: 927 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,10.5 + parent: 179 + - uid: 928 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,11.5 + parent: 179 + - uid: 929 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,12.5 + parent: 179 + - uid: 930 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,13.5 + parent: 179 + - uid: 931 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,14.5 + parent: 179 + - uid: 932 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,15.5 + parent: 179 + - uid: 933 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,16.5 + parent: 179 + - uid: 934 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,17.5 + parent: 179 + - uid: 935 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,17.5 + parent: 179 + - uid: 936 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,17.5 + parent: 179 + - uid: 937 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,17.5 + parent: 179 + - uid: 938 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,17.5 + parent: 179 + - uid: 939 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,17.5 + parent: 179 + - uid: 940 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,17.5 + parent: 179 + - uid: 941 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,17.5 + parent: 179 + - uid: 942 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,17.5 + parent: 179 + - uid: 943 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,17.5 + parent: 179 + - uid: 944 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,17.5 + parent: 179 + - uid: 945 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,17.5 + parent: 179 + - uid: 946 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,17.5 + parent: 179 + - uid: 947 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,17.5 + parent: 179 + - uid: 948 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,17.5 + parent: 179 +- proto: RailingCornerSmall + entities: + - uid: 919 + components: + - type: Transform + pos: -14.5,9.5 + parent: 179 +- proto: RCDExperimental + entities: + - uid: 1575 + components: + - type: Transform + pos: 1.6787996,-5.6922684 + parent: 179 +- proto: ReinforcedWindow + entities: + - uid: 1084 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,23.5 + parent: 179 + - uid: 1093 + components: + - type: Transform + pos: 8.5,17.5 + parent: 179 + - uid: 1094 + components: + - type: Transform + pos: 9.5,17.5 + parent: 179 + - uid: 1095 + components: + - type: Transform + pos: 10.5,17.5 + parent: 179 + - uid: 1096 + components: + - type: Transform + pos: 10.5,16.5 + parent: 179 +- proto: ResearchAndDevelopmentServer + entities: + - uid: 17 + components: + - type: Transform + pos: 8.5,18.5 + parent: 179 +- proto: ResearchDiskDebug + entities: + - uid: 54 + components: + - type: Transform + pos: 9.532393,18.446417 + parent: 179 +- proto: RubberStampCaptain + entities: + - uid: 982 + components: + - type: Transform + pos: 12.800895,12.664745 + parent: 179 +- proto: RubberStampCentcom + entities: + - uid: 980 + components: + - type: Transform + pos: 12.186007,12.716865 + parent: 179 +- proto: RubberStampSyndicate + entities: + - uid: 981 + components: + - type: Transform + pos: 12.436131,12.550082 + parent: 179 +- proto: Screen + entities: + - uid: 1192 + components: + - type: Transform + pos: 4.5,-14.5 + parent: 179 +- proto: Screwdriver + entities: + - uid: 431 + components: + - type: Transform + pos: -1.235331,4.739151 + parent: 179 +- proto: SeedExtractor + entities: + - uid: 65 + components: + - type: Transform + pos: 2.5,17.5 + parent: 179 +- proto: SheetGlass + entities: + - uid: 354 + components: + - type: Transform + pos: 8.57603,21.566113 + parent: 179 + - uid: 479 + components: + - type: Transform + pos: -5.13758,7.5586076 + parent: 179 + - uid: 529 + components: + - type: Transform + pos: -15.5,-3.5 + parent: 179 + - uid: 564 + components: + - type: Transform + pos: -15.5,-1.5 + parent: 179 + - uid: 565 + components: + - type: Transform + pos: -15.5,-1.5 + parent: 179 + - uid: 566 + components: + - type: Transform + pos: -15.5,-3.5 + parent: 179 +- proto: SheetGlass1 + entities: + - uid: 960 + components: + - type: Transform + pos: -3.981244,10.799851 + parent: 179 +- proto: SheetPGlass + entities: + - uid: 416 + components: + - type: Transform + pos: -0.5,8.5 + parent: 179 +- proto: SheetPlasma + entities: + - uid: 1077 + components: + - type: Transform + pos: 17.485096,24.503635 + parent: 179 +- proto: SheetPlasteel + entities: + - uid: 478 + components: + - type: Transform + pos: -4.0129576,7.6107273 + parent: 179 +- proto: SheetPlastic + entities: + - uid: 79 + components: + - type: Transform + pos: 8.951309,21.511908 + parent: 179 + - uid: 181 + components: + - type: Transform + pos: -4.54383,7.579455 + parent: 179 +- proto: SheetRPGlass + entities: + - uid: 182 + components: + - type: Transform + pos: -0.5,7.5 + parent: 179 +- proto: SheetSteel + entities: + - uid: 205 + components: + - type: Transform + pos: -15.5,-5.5 + parent: 179 + - uid: 305 + components: + - type: Transform + pos: 9.435405,21.503613 + parent: 179 + - uid: 382 + components: + - type: Transform + pos: -15.5,-5.5 + parent: 179 + - uid: 473 + components: + - type: Transform + pos: -5.6834707,7.529523 + parent: 179 + - uid: 543 + components: + - type: Transform + pos: -15.5,-4.5 + parent: 179 + - uid: 544 + components: + - type: Transform + pos: -15.5,-4.5 + parent: 179 +- proto: SignalButton + entities: + - uid: 1013 + components: + - type: Transform + pos: -4.5,-14.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 202: + - Pressed: Toggle + 984: + - Pressed: Toggle + - uid: 1014 + components: + - type: Transform + pos: 3.5,-14.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 697: + - Pressed: Toggle + 698: + - Pressed: Toggle + - uid: 1560 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-12.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 728: + - Pressed: Trigger +- proto: SignAtmos + entities: + - uid: 1301 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 179 + - uid: 1558 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-6.5 + parent: 179 +- proto: SignCargoDock + entities: + - uid: 1046 + components: + - type: Transform + pos: 4.5,-4.5 + parent: 179 +- proto: SignCryogenics + entities: + - uid: 1298 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.5,-15.5 + parent: 179 +- proto: SignDanger entities: - - uid: 1071 + - uid: 1203 components: - type: Transform - pos: 16.5,25.5 + rot: -1.5707963267948966 rad + pos: 25.5,-19.5 parent: 179 -- proto: MachineAnomalyVessel +- proto: SignFlammable entities: - - uid: 1087 + - uid: 1297 components: - type: Transform - pos: 15.5,19.5 + rot: -1.5707963267948966 rad + pos: 25.5,-13.5 parent: 179 -- proto: MachineArtifactAnalyzer - entities: - - uid: 1078 + - uid: 1299 components: - type: Transform - pos: 12.5,24.5 + rot: -1.5707963267948966 rad + pos: 25.5,-11.5 parent: 179 -- proto: MachineFrame +- proto: SignSpace entities: - - uid: 533 + - uid: 1291 components: - type: Transform - pos: -5.5,10.5 + pos: 6.5,-19.5 parent: 179 -- proto: MedicalScanner + - uid: 1555 + components: + - type: Transform + pos: 6.5,-14.5 + parent: 179 + - uid: 1563 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-25.5 + parent: 179 +- proto: SmallLight entities: - - uid: 592 + - uid: 1048 components: - type: Transform - pos: 18.5,-1.5 + rot: 1.5707963267948966 rad + pos: -2.5,-15.5 parent: 179 - - type: ContainerContainer - containers: - MedicalScanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - scanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 593 + - uid: 1049 components: - type: Transform - pos: 18.5,-5.5 + rot: -1.5707963267948966 rad + pos: 1.5,-15.5 parent: 179 - - type: ContainerContainer - containers: - MedicalScanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - scanner-bodyContainer: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: MedkitFilled +- proto: SMESBasic entities: - - uid: 153 + - uid: 1017 components: - type: Transform - pos: 13.632214,1.5673001 + pos: -6.5,-12.5 parent: 179 - - uid: 154 +- proto: SodaDispenser + entities: + - uid: 751 components: - type: Transform - pos: 13.460339,0.6141751 + pos: 8.5,12.5 parent: 179 - - uid: 321 +- proto: SpawnMobCorgiMouse + entities: + - uid: 1050 components: - type: Transform - pos: 3.8440318,4.425983 + pos: 3.5,8.5 parent: 179 -- proto: MicroManipulatorStockPart +- proto: SpawnMobCrabAtmos entities: - - uid: 455 + - uid: 729 components: - type: Transform - pos: -6.337244,8.838643 + pos: 15.5,-10.5 parent: 179 - - uid: 456 +- proto: SpawnMobHuman + entities: + - uid: 138 components: - type: Transform - pos: -5.920577,8.817795 + pos: -6.5,-0.5 parent: 179 - - uid: 484 + - uid: 139 components: - type: Transform - pos: -5.5039105,8.838643 + pos: -6.5,0.5 parent: 179 - - uid: 712 + - uid: 140 components: - type: Transform - pos: -6.7434506,8.817795 + pos: 3.5,7.5 parent: 179 - - uid: 959 +- proto: SpawnPointCaptain + entities: + - uid: 954 components: - type: Transform - pos: -4.752078,10.904018 + pos: -4.5,4.5 parent: 179 -- proto: ModularGrenade +- proto: SpawnPointLatejoin entities: - - uid: 435 + - uid: 961 components: - type: Transform - pos: 6.829691,9.860046 + pos: -3.5,3.5 parent: 179 -- proto: MopBucket +- proto: SpawnPointObserver entities: - - uid: 696 + - uid: 679 components: - type: Transform - pos: 7.5,16.5 + pos: -3.5,4.5 parent: 179 -- proto: MopItem +- proto: Spear entities: - - uid: 328 + - uid: 185 components: - type: Transform - pos: 7.6382103,16.08618 + pos: -3.4579864,-1.9811735 parent: 179 - - type: SolutionContainerManager - solutions: - absorbed: - temperature: 293.15 - canReact: True - maxVol: 50 - name: null - reagents: - - data: null - ReagentId: Water - Quantity: 25 -- proto: Multitool +- proto: SprayBottleWater entities: - - uid: 307 + - uid: 903 components: - type: Transform - pos: -1.249865,-10.43489 + pos: 6.985283,16.424004 parent: 179 - - uid: 430 +- proto: SprayPainter + entities: + - uid: 1572 components: - type: Transform - pos: -0.6298993,4.7431083 + pos: 7.5948057,-5.356733 parent: 179 - - type: NetworkConfigurator - devices: - 'UID: 31739': 801 -- proto: NitrogenCanister +- proto: Stimpack entities: - - uid: 459 + - uid: 462 components: - type: Transform - pos: 7.5,-1.5 + pos: 3.6877818,5.312015 parent: 179 -- proto: Ointment +- proto: Stool entities: - - uid: 148 + - uid: 383 components: - type: Transform - pos: 18.77326,6.653532 + pos: -1.5,-9.5 parent: 179 - - uid: 149 + - uid: 387 components: - type: Transform - pos: 18.49201,6.059782 + rot: 3.141592653589793 rad + pos: -2.5,-6.5 parent: 179 -- proto: OxygenCanister +- proto: StorageCanister entities: - - uid: 340 + - uid: 1285 components: - type: Transform - pos: 7.5,-3.5 + pos: 10.5,-6.5 parent: 179 -- proto: PaperBin10 + - uid: 1286 + components: + - type: Transform + pos: 9.5,-6.5 + parent: 179 + - uid: 1287 + components: + - type: Transform + pos: 12.5,-6.5 + parent: 179 + - uid: 1288 + components: + - type: Transform + pos: 13.5,-6.5 + parent: 179 +- proto: Stunbaton entities: - - uid: 977 + - uid: 434 components: - type: Transform - pos: 10.5,12.5 + pos: -3.1734612,-2.6066077 parent: 179 -- proto: PartRodMetal +- proto: SubstationBasic entities: - - uid: 133 + - uid: 1018 components: - type: Transform - pos: -3.4717777,7.672426 + pos: -6.5,-13.5 parent: 179 -- proto: Pen +- proto: SurveillanceCameraGeneral entities: - - uid: 978 + - uid: 1186 components: - type: Transform - pos: 10.893699,12.7794075 + rot: 3.141592653589793 rad + pos: -2.5,10.5 parent: 179 - - uid: 979 + - uid: 1188 components: - type: Transform - pos: 10.862433,12.602201 + rot: -1.5707963267948966 rad + pos: 15.5,21.5 parent: 179 -- proto: PlasmaCanister + - uid: 1190 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.5,10.5 + parent: 179 +- proto: SurveillanceCameraRouterGeneral entities: - - uid: 461 + - uid: 1189 components: - type: Transform - pos: 7.5,-2.5 + pos: 9.5,24.5 parent: 179 -- proto: PlasticFlapsAirtightClear +- proto: Syringe entities: - - uid: 997 + - uid: 460 components: - type: Transform - pos: -2.5,-16.5 + pos: 3.2502818,4.5823417 parent: 179 - - uid: 998 + - uid: 738 components: - type: Transform - pos: -2.5,-14.5 + pos: 5.767191,9.787079 parent: 179 - - uid: 999 +- proto: Table + entities: + - uid: 63 components: - type: Transform - pos: 1.5,-16.5 + pos: 9.5,21.5 parent: 179 - - uid: 1000 + - uid: 64 components: - type: Transform - pos: 1.5,-14.5 + pos: 10.5,21.5 parent: 179 -- proto: PlayerStationAi - entities: - - uid: 14 + - uid: 67 components: - type: Transform - pos: -5.5,-5.5 + pos: 8.5,21.5 parent: 179 -- proto: PortableGeneratorSuperPacman - entities: - - uid: 1016 + - uid: 76 components: - type: Transform - pos: -6.5,-11.5 + pos: 7.5,-7.5 parent: 179 -- proto: PowerCellHigh - entities: - - uid: 567 + - uid: 92 components: - type: Transform - pos: -4.76583,8.265328 + pos: 11.5,21.5 parent: 179 -- proto: PowerCellHyper - entities: - - uid: 703 + - uid: 143 components: - type: Transform - pos: -4.3179135,8.275752 + pos: 33.5,-3.5 parent: 179 -- proto: PowerCellMedium - entities: - - uid: 186 + - uid: 144 components: - type: Transform - pos: -2.67511,-10.351 + pos: 33.5,-2.5 parent: 179 - - uid: 187 + - uid: 145 components: - type: Transform - pos: -2.55011,-10.6635 + pos: 33.5,-1.5 parent: 179 - - uid: 360 + - uid: 161 components: - type: Transform - pos: -3.7970803,8.275752 + pos: 24.5,-5.5 parent: 179 -- proto: PowerCellRecharger - entities: - - uid: 709 + - uid: 162 components: - type: Transform - pos: -1.5,-3.5 + pos: 23.5,-5.5 parent: 179 -- proto: PowerCellSmall - entities: - - uid: 705 + - uid: 172 components: - type: Transform - pos: -3.3182633,8.234056 + rot: -1.5707963267948966 rad + pos: 4.5,9.5 parent: 179 -- proto: Poweredlight - entities: - - uid: 93 + - uid: 180 components: - type: Transform - rot: 3.141592653589793 rad - pos: 31.5,-5.5 + pos: -4.5,10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 536 + - uid: 262 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-0.5 + pos: -3.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 660 + - uid: 263 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 29.5,1.5 + pos: -2.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 661 + - uid: 264 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,7.5 + pos: -1.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 663 + - uid: 265 components: - type: Transform - pos: 22.5,2.5 + pos: -0.5,-5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 666 + - uid: 267 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,23.5 + pos: 23.5,5.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 670 + - uid: 268 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,18.5 + pos: 23.5,6.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 673 + - uid: 298 components: - type: Transform rot: -1.5707963267948966 rad - pos: -11.5,-5.5 + pos: 6.5,9.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 674 + - uid: 299 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,-5.5 + rot: -1.5707963267948966 rad + pos: 5.5,9.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 675 + - uid: 300 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,-0.5 + rot: -1.5707963267948966 rad + pos: 8.5,9.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 676 + - uid: 312 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-10.5 + pos: -3.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 678 + - uid: 313 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-1.5 + pos: -2.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 680 + - uid: 314 components: - type: Transform - rot: 3.141592653589793 rad - pos: 16.5,-5.5 + pos: -1.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 681 + - uid: 315 components: - type: Transform - rot: 3.141592653589793 rad - pos: 23.5,-5.5 + pos: -0.5,-10.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 682 + - uid: 355 components: - type: Transform - pos: 13.5,2.5 + pos: -6.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 683 + - uid: 356 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,4.5 + pos: -5.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1075 + - uid: 357 components: - type: Transform - pos: 16.5,27.5 + pos: -4.5,7.5 parent: 179 - - uid: 1076 + - uid: 358 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,22.5 + pos: -3.5,7.5 parent: 179 -- proto: PoweredSmallLight - entities: - - uid: 163 + - uid: 361 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,26.5 + pos: -0.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 166 + - uid: 362 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,24.5 + pos: 0.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 167 + - uid: 363 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,17.5 + pos: 1.5,7.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 388 + - uid: 366 components: - type: Transform - pos: 0.5,-5.5 + pos: -2.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 417 + - uid: 367 components: - type: Transform - pos: -4.5,-5.5 + pos: -1.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 483 + - uid: 368 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-9.5 + pos: -0.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 534 + - uid: 371 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-5.5 + pos: 1.5,4.5 parent: 179 - - type: ApcPowerReceiver - powerLoad: 0 -- proto: Protolathe - entities: - - uid: 12 + - uid: 385 components: - type: Transform - pos: 13.5,21.5 + pos: -3.5,-2.5 parent: 179 - - uid: 384 + - uid: 386 components: - type: Transform - pos: -6.5,6.5 + pos: -3.5,-1.5 parent: 179 -- proto: Railing - entities: - - uid: 665 + - uid: 440 components: - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,9.5 + pos: 0.5,4.5 parent: 179 - - uid: 927 + - uid: 445 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,10.5 + pos: -3.5,-0.5 parent: 179 - - uid: 928 + - uid: 448 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,11.5 + pos: 3.5,5.5 parent: 179 - - uid: 929 + - uid: 452 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,12.5 + pos: 1.5,-5.5 parent: 179 - - uid: 930 + - uid: 461 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,13.5 + pos: 7.5,-6.5 parent: 179 - - uid: 931 + - uid: 465 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,14.5 + pos: 1.5,8.5 parent: 179 - - uid: 932 + - uid: 466 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,15.5 + pos: 0.5,8.5 parent: 179 - - uid: 933 + - uid: 467 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,16.5 + pos: -3.5,8.5 parent: 179 - - uid: 934 + - uid: 468 components: - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,17.5 + pos: -0.5,8.5 parent: 179 - - uid: 935 + - uid: 470 components: - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,17.5 + pos: -6.5,8.5 parent: 179 - - uid: 936 + - uid: 471 components: - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,17.5 + pos: -5.5,8.5 parent: 179 - - uid: 937 + - uid: 472 components: - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,17.5 + pos: -4.5,8.5 parent: 179 - - uid: 938 + - uid: 515 components: - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,17.5 + pos: -15.5,-5.5 parent: 179 - - uid: 939 + - uid: 516 components: - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,17.5 + pos: -15.5,-1.5 parent: 179 - - uid: 940 + - uid: 520 components: - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,17.5 + pos: -15.5,-0.5 parent: 179 - - uid: 941 + - uid: 559 components: - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,17.5 + pos: -15.5,-4.5 parent: 179 - - uid: 942 + - uid: 560 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,17.5 + pos: -15.5,-3.5 parent: 179 - - uid: 943 + - uid: 568 components: - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,17.5 + pos: 18.5,4.5 parent: 179 - - uid: 944 + - uid: 569 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,17.5 + pos: 21.5,6.5 parent: 179 - - uid: 945 + - uid: 570 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,17.5 + pos: 20.5,6.5 parent: 179 - - uid: 946 + - uid: 571 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,17.5 + pos: 18.5,6.5 parent: 179 - - uid: 947 + - uid: 572 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,17.5 + pos: 19.5,6.5 parent: 179 - - uid: 948 + - uid: 573 components: - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,17.5 + pos: 18.5,5.5 parent: 179 -- proto: RailingCornerSmall - entities: - - uid: 919 + - uid: 574 components: - type: Transform - pos: -14.5,9.5 + pos: 22.5,8.5 parent: 179 -- proto: ReinforcedWindow - entities: - - uid: 1084 + - uid: 575 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,23.5 + pos: 24.5,4.5 parent: 179 - - uid: 1093 + - uid: 584 components: - type: Transform - pos: 8.5,17.5 + pos: 23.5,7.5 parent: 179 - - uid: 1094 + - uid: 586 components: - type: Transform - pos: 9.5,17.5 + pos: 25.5,10.5 parent: 179 - - uid: 1095 + - uid: 587 components: - type: Transform - pos: 10.5,17.5 + pos: 23.5,10.5 parent: 179 - - uid: 1096 + - uid: 588 components: - type: Transform - pos: 10.5,16.5 + pos: 24.5,10.5 parent: 179 -- proto: ResearchAndDevelopmentServer - entities: - - uid: 17 + - uid: 589 components: - type: Transform - pos: 8.5,18.5 + pos: 26.5,10.5 parent: 179 -- proto: ResearchDiskDebug - entities: - - uid: 54 + - uid: 590 components: - type: Transform - pos: 9.532393,18.446417 + pos: 27.5,10.5 parent: 179 -- proto: RubberStampCaptain - entities: - - uid: 982 + - uid: 594 components: - type: Transform - pos: 12.800895,12.664745 + pos: 13.5,2.5 parent: 179 -- proto: RubberStampCentcom - entities: - - uid: 980 + - uid: 595 components: - type: Transform - pos: 12.186007,12.716865 + pos: 13.5,0.5 parent: 179 -- proto: RubberStampSyndicate - entities: - - uid: 981 + - uid: 596 components: - type: Transform - pos: 12.436131,12.550082 + pos: 13.5,1.5 parent: 179 -- proto: Screen - entities: - - uid: 1192 + - uid: 684 components: - type: Transform - pos: 4.5,-14.5 + pos: -3.5,0.5 parent: 179 -- proto: Screwdriver - entities: - - uid: 431 + - uid: 685 components: - type: Transform - pos: -1.235331,4.739151 + pos: 3.5,4.5 parent: 179 -- proto: SeedExtractor - entities: - - uid: 65 + - uid: 686 components: - type: Transform - pos: 2.5,17.5 + pos: 3.5,6.5 parent: 179 -- proto: SheetGlass - entities: - - uid: 354 + - uid: 706 components: - type: Transform - pos: 8.57603,21.566113 + pos: -1.5,-3.5 parent: 179 - - uid: 479 + - uid: 707 components: - type: Transform - pos: -5.13758,7.5586076 + pos: -0.5,-3.5 parent: 179 - - uid: 529 + - uid: 710 components: - type: Transform - pos: -15.5,-3.5 + pos: 0.5,-3.5 parent: 179 - - uid: 564 + - uid: 1561 components: - type: Transform - pos: -15.5,-1.5 + pos: 7.5,-5.5 parent: 179 - - uid: 565 +- proto: TableGlass + entities: + - uid: 964 components: - type: Transform - pos: -15.5,-1.5 + pos: 9.5,12.5 parent: 179 - - uid: 566 + - uid: 965 components: - type: Transform - pos: -15.5,-3.5 + pos: 11.5,12.5 parent: 179 -- proto: SheetGlass1 - entities: - - uid: 960 + - uid: 966 components: - type: Transform - pos: -3.981244,10.799851 + pos: 13.5,12.5 parent: 179 -- proto: SheetPGlass - entities: - - uid: 416 + - uid: 975 components: - type: Transform - pos: -0.5,8.5 + pos: 10.5,12.5 parent: 179 -- proto: SheetPlasma - entities: - - uid: 1077 + - uid: 976 components: - type: Transform - pos: 17.485096,24.503635 + pos: 12.5,12.5 parent: 179 -- proto: SheetPlasteel +- proto: TargetClown entities: - - uid: 478 + - uid: 459 components: - type: Transform - pos: -4.0129576,7.6107273 + pos: 7.5,-0.5 parent: 179 -- proto: SheetPlastic +- proto: TargetHuman entities: - - uid: 79 + - uid: 159 components: - type: Transform - pos: 8.951309,21.511908 + pos: -6.5,-1.5 parent: 179 - - uid: 181 + - uid: 248 components: - type: Transform - pos: -4.54383,7.579455 + pos: 7.5,1.5 parent: 179 -- proto: SheetRPGlass +- proto: TargetSyndicate entities: - - uid: 182 + - uid: 613 components: - type: Transform - pos: -0.5,7.5 + pos: 7.5,-2.5 parent: 179 -- proto: SheetSteel +- proto: TegCenter entities: - - uid: 205 + - uid: 1576 components: - type: Transform - pos: -15.5,-5.5 + rot: 1.5707963267948966 rad + pos: 13.5,-18.5 parent: 179 - - uid: 305 +- proto: TegCirculator + entities: + - uid: 1577 components: - type: Transform - pos: 9.435405,21.503613 + pos: 14.5,-18.5 parent: 179 - - uid: 382 + - type: PointLight + color: '#FF3300FF' + - uid: 1578 components: - type: Transform - pos: -15.5,-5.5 + rot: 3.141592653589793 rad + pos: 12.5,-18.5 parent: 179 - - uid: 473 + - type: PointLight + color: '#FF3300FF' +- proto: TelecomServerFilled + entities: + - uid: 963 components: - type: Transform - pos: -5.6834707,7.529523 + pos: -3.5,10.5 parent: 179 - - uid: 543 +- proto: TimerTrigger + entities: + - uid: 482 components: - type: Transform - pos: -15.5,-4.5 + pos: 6.413024,9.39097 parent: 179 - - uid: 544 +- proto: ToolboxElectricalFilled + entities: + - uid: 365 components: - type: Transform - pos: -15.5,-4.5 + pos: 0.4993378,3.429311 parent: 179 -- proto: SignalButton - entities: - - uid: 1013 + - uid: 419 components: - type: Transform - pos: -4.5,-14.5 + pos: -0.8099712,-5.21454 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 202: - - Pressed: Toggle - 984: - - Pressed: Toggle - - uid: 1014 + - uid: 420 components: - type: Transform - pos: 3.5,-14.5 + pos: -0.5597038,-5.679647 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 697: - - Pressed: Toggle - 698: - - Pressed: Toggle -- proto: SignCargoDock +- proto: ToolboxMechanicalFilled entities: - - uid: 1046 + - uid: 364 components: - type: Transform - pos: 4.5,-4.5 + pos: 1.452203,3.4605832 parent: 179 -- proto: SmallLight +- proto: ToyRubberDuck entities: - - uid: 1048 + - uid: 723 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-15.5 + pos: -1.6653601,11.616664 parent: 179 - - uid: 1049 +- proto: trayScanner + entities: + - uid: 758 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-15.5 + pos: 1.354346,4.548879 parent: 179 -- proto: SMESBasic +- proto: TritiumCanister entities: - - uid: 1017 + - uid: 254 components: - type: Transform - pos: -6.5,-12.5 + pos: 13.5,-2.5 parent: 179 -- proto: SodaDispenser - entities: - - uid: 751 + - uid: 619 components: - type: Transform - pos: 8.5,12.5 + pos: 12.5,-2.5 parent: 179 -- proto: SpawnMobHuman - entities: - - uid: 138 + - uid: 1312 components: - type: Transform - pos: -6.5,-0.5 + pos: 24.5,-13.5 parent: 179 - - uid: 139 +- proto: TwoWayLever + entities: + - uid: 699 components: - type: Transform - pos: -6.5,0.5 + pos: -3.5,-13.5 parent: 179 - - uid: 140 + - type: DeviceLinkSource + linkedPorts: + 990: + - Left: Forward + - Right: Reverse + - Middle: Off + 195: + - Left: Forward + - Right: Reverse + - Middle: Off + 991: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 722 components: - type: Transform - pos: 3.5,7.5 + pos: 1.5,11.5 parent: 179 -- proto: SpawnMobCorgiMouse - entities: - - uid: 1050 + - type: DeviceLinkSource + linkedPorts: + 721: + - Left: Forward + - Right: Reverse + - Middle: Off + 720: + - Left: Forward + - Right: Reverse + - Middle: Off + 716: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 983 components: - type: Transform - pos: 3.5,8.5 + pos: 2.5,-13.5 parent: 179 -- proto: SpawnPointCaptain - entities: - - uid: 954 + - type: DeviceLinkSource + linkedPorts: + 985: + - Left: Forward + - Right: Reverse + - Middle: Off + 259: + - Left: Forward + - Right: Reverse + - Middle: Off + 989: + - Left: Forward + - Right: Reverse + - Middle: Off + 463: + - Left: Forward + - Right: Reverse + - Middle: Off + - uid: 1290 components: - type: Transform - pos: -4.5,4.5 + pos: 7.5,-14.5 parent: 179 -- proto: SpawnPointLatejoin - entities: - - uid: 961 + - type: TwoWayLever + nextSignalLeft: True + - type: DeviceLinkSource + linkedPorts: + 1234: + - Left: Open + - Right: Open + - Middle: Close + 1233: + - Left: Open + - Right: Open + - Middle: Close + 1232: + - Left: Open + - Right: Open + - Middle: Close + 728: + - Left: Trigger + - Right: Trigger + - Middle: Trigger + - uid: 1499 + components: + - type: Transform + pos: 11.5,-12.5 + parent: 179 + - type: DeviceLinkSource + linkedPorts: + 1385: + - Left: Open + - Right: Open + - Middle: Close + - uid: 1520 components: - type: Transform - pos: -3.5,3.5 + pos: 7.5,-18.5 parent: 179 -- proto: SpawnPointObserver + - type: DeviceLinkSource + linkedPorts: + 1230: + - Left: Open + - Right: Open + - Middle: Close +- proto: UnfinishedMachineFrame entities: - - uid: 679 + - uid: 522 components: - type: Transform - pos: -3.5,4.5 + pos: -6.5,10.5 parent: 179 -- proto: Spear +- proto: UniformPrinter entities: - - uid: 185 + - uid: 443 components: - type: Transform - pos: -3.4579864,-1.9811735 + pos: -7.5,4.5 parent: 179 -- proto: SprayBottleWater +- proto: VendingMachineCigs entities: - - uid: 903 + - uid: 870 components: - type: Transform - pos: 6.985283,16.424004 + pos: -14.5,4.5 parent: 179 -- proto: Stimpack +- proto: VendingMachineEngivend entities: - - uid: 462 + - uid: 441 components: - type: Transform - pos: 3.6877818,5.312015 + pos: -11.5,4.5 parent: 179 -- proto: Stool - entities: - - uid: 383 + - uid: 523 components: - type: Transform - pos: -1.5,-9.5 + pos: -11.5,-1.5 parent: 179 - - uid: 387 + - uid: 1567 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-6.5 + pos: 5.5,-11.5 parent: 179 -- proto: Stunbaton + - type: ActionGrant + actions: + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow +- proto: VendingMachineMedical entities: - - uid: 434 + - uid: 156 components: - type: Transform - pos: -3.1734612,-2.6066077 + pos: 25.5,-5.5 parent: 179 -- proto: SubstationBasic - entities: - - uid: 1018 + - uid: 157 components: - type: Transform - pos: -6.5,-13.5 + pos: 27.5,-5.5 parent: 179 -- proto: SurveillanceCameraGeneral - entities: - - uid: 1186 + - uid: 158 components: - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,10.5 + pos: 29.5,3.5 parent: 179 - - uid: 1188 + - uid: 521 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,21.5 + pos: -12.5,4.5 parent: 179 - - uid: 1190 +- proto: VendingMachineSalvage + entities: + - uid: 485 components: - type: Transform - rot: 3.141592653589793 rad - pos: 27.5,10.5 + pos: -15.5,4.5 parent: 179 -- proto: SurveillanceCameraRouterGeneral +- proto: VendingMachineSec entities: - - uid: 1189 + - uid: 874 components: - type: Transform - pos: 9.5,24.5 + pos: -13.5,4.5 parent: 179 -- proto: Syringe +- proto: VendingMachineTankDispenserEngineering entities: - - uid: 460 + - uid: 615 components: - type: Transform - pos: 3.2502818,4.5823417 + pos: 17.5,-7.5 parent: 179 - - uid: 738 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 614 components: - type: Transform - pos: 5.767191,9.787079 + pos: 14.5,-7.5 parent: 179 -- proto: Table +- proto: VendingMachineVendomat entities: - - uid: 63 + - uid: 1565 components: - type: Transform - pos: 9.5,21.5 + pos: 5.5,-12.5 parent: 179 - - uid: 64 +- proto: VendingMachineYouTool + entities: + - uid: 350 components: - type: Transform - pos: 10.5,21.5 + pos: -11.5,-0.5 parent: 179 - - uid: 67 + - uid: 1566 components: - type: Transform - pos: 8.5,21.5 + pos: 5.5,-10.5 parent: 179 - - uid: 92 + - type: ActionGrant + actions: + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow + - ActionVendingThrow +- proto: WallSolid + entities: + - uid: 3 components: - type: Transform - pos: 11.5,21.5 + pos: 1.5,18.5 parent: 179 - - uid: 143 + - uid: 4 components: - type: Transform - pos: 33.5,-3.5 + pos: 11.5,26.5 parent: 179 - - uid: 144 + - uid: 5 components: - type: Transform - pos: 33.5,-2.5 + pos: 18.5,24.5 parent: 179 - - uid: 145 + - uid: 6 components: - type: Transform - pos: 33.5,-1.5 + pos: 20.5,15.5 parent: 179 - - uid: 161 + - uid: 8 components: - type: Transform - pos: 24.5,-5.5 + pos: 14.5,19.5 parent: 179 - - uid: 162 + - uid: 9 components: - type: Transform - pos: 23.5,-5.5 + pos: 1.5,19.5 parent: 179 - - uid: 172 + - uid: 10 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,9.5 + pos: 18.5,26.5 parent: 179 - - uid: 180 + - uid: 11 components: - type: Transform - pos: -4.5,10.5 + pos: 13.5,26.5 parent: 179 - - uid: 262 + - uid: 13 components: - type: Transform - pos: -3.5,-5.5 + pos: 25.5,15.5 parent: 179 - - uid: 263 + - uid: 18 components: - type: Transform - pos: -2.5,-5.5 + pos: 4.5,26.5 parent: 179 - - uid: 264 + - uid: 19 components: - type: Transform - pos: -1.5,-5.5 + pos: 18.5,25.5 parent: 179 - - uid: 265 + - uid: 21 components: - type: Transform - pos: -0.5,-5.5 + pos: 10.5,26.5 parent: 179 - - uid: 267 + - uid: 22 components: - type: Transform - pos: 23.5,5.5 + pos: 26.5,15.5 parent: 179 - - uid: 268 + - uid: 25 components: - type: Transform - pos: 23.5,6.5 + pos: 1.5,21.5 parent: 179 - - uid: 298 + - uid: 27 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,9.5 + pos: 8.5,-0.5 parent: 179 - - uid: 299 + - uid: 28 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,9.5 + pos: 18.5,18.5 parent: 179 - - uid: 300 + - uid: 29 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,9.5 + pos: 18.5,21.5 parent: 179 - - uid: 312 + - uid: 30 components: - type: Transform - pos: -3.5,-10.5 + pos: 1.5,22.5 parent: 179 - - uid: 313 + - uid: 31 components: - type: Transform - pos: -2.5,-10.5 + pos: 1.5,20.5 parent: 179 - - uid: 314 + - uid: 32 components: - type: Transform - pos: -1.5,-10.5 + pos: 18.5,19.5 parent: 179 - - uid: 315 + - uid: 33 components: - type: Transform - pos: -0.5,-10.5 + pos: 23.5,15.5 parent: 179 - - uid: 355 + - uid: 34 components: - type: Transform - pos: -6.5,7.5 + pos: 12.5,22.5 parent: 179 - - uid: 356 + - uid: 35 components: - type: Transform - pos: -5.5,7.5 + pos: 27.5,15.5 parent: 179 - - uid: 357 + - uid: 36 components: - type: Transform - pos: -4.5,7.5 + pos: 7.5,22.5 parent: 179 - - uid: 358 + - uid: 37 components: - type: Transform - pos: -3.5,7.5 + pos: 14.5,22.5 parent: 179 - - uid: 361 + - uid: 38 components: - type: Transform - pos: -0.5,7.5 + pos: 10.5,23.5 parent: 179 - - uid: 362 + - uid: 39 components: - type: Transform - pos: 0.5,7.5 + pos: 10.5,24.5 parent: 179 - - uid: 363 + - uid: 40 components: - type: Transform - pos: 1.5,7.5 + pos: 8.5,26.5 parent: 179 - - uid: 366 + - uid: 41 components: - type: Transform - pos: -2.5,4.5 + pos: 10.5,25.5 parent: 179 - - uid: 367 + - uid: 42 components: - type: Transform - pos: -1.5,4.5 + pos: 18.5,22.5 parent: 179 - - uid: 368 + - uid: 43 components: - type: Transform - pos: -0.5,4.5 + pos: 14.5,27.5 parent: 179 - - uid: 371 + - uid: 44 components: - type: Transform - pos: 1.5,4.5 + pos: 14.5,26.5 parent: 179 - - uid: 385 + - uid: 45 components: - type: Transform - pos: -3.5,-2.5 + pos: 1.5,16.5 parent: 179 - - uid: 386 + - uid: 46 components: - type: Transform - pos: -3.5,-1.5 + pos: 18.5,27.5 parent: 179 - - uid: 440 + - uid: 49 components: - type: Transform - pos: 0.5,4.5 + pos: 7.5,28.5 parent: 179 - - uid: 445 + - uid: 50 components: - type: Transform - pos: -3.5,-0.5 + pos: 13.5,22.5 parent: 179 - - uid: 448 + - uid: 51 components: - type: Transform - pos: 3.5,5.5 + pos: 12.5,26.5 parent: 179 - - uid: 465 + - uid: 52 components: - type: Transform - pos: 1.5,8.5 + pos: 1.5,15.5 parent: 179 - - uid: 466 + - uid: 53 components: - type: Transform - pos: 0.5,8.5 + pos: 9.5,26.5 parent: 179 - - uid: 467 + - uid: 55 components: - type: Transform - pos: -3.5,8.5 + pos: 24.5,15.5 parent: 179 - - uid: 468 + - uid: 56 components: - type: Transform - pos: -0.5,8.5 + pos: 14.5,25.5 parent: 179 - - uid: 470 + - uid: 57 components: - type: Transform - pos: -6.5,8.5 + pos: 14.5,21.5 parent: 179 - - uid: 471 + - uid: 60 components: - type: Transform - pos: -5.5,8.5 + pos: 7.5,21.5 parent: 179 - - uid: 472 + - uid: 61 components: - type: Transform - pos: -4.5,8.5 + pos: 18.5,20.5 parent: 179 - - uid: 515 + - uid: 62 components: - type: Transform - pos: -15.5,-5.5 + pos: 18.5,23.5 parent: 179 - - uid: 516 + - uid: 66 components: - type: Transform - pos: -15.5,-1.5 + pos: 18.5,17.5 parent: 179 - - uid: 520 + - uid: 68 components: - type: Transform - pos: -15.5,-0.5 + pos: 18.5,28.5 parent: 179 - - uid: 559 + - uid: 69 components: - type: Transform - pos: -15.5,-4.5 + pos: 28.5,15.5 parent: 179 - - uid: 560 + - uid: 71 components: - type: Transform - pos: -15.5,-3.5 + pos: 11.5,22.5 parent: 179 - - uid: 568 + - uid: 72 components: - type: Transform - pos: 18.5,4.5 + pos: 1.5,17.5 parent: 179 - - uid: 569 + - uid: 73 components: - type: Transform - pos: 21.5,6.5 + pos: 14.5,28.5 parent: 179 - - uid: 570 + - uid: 74 components: - type: Transform - pos: 20.5,6.5 + pos: 10.5,22.5 parent: 179 - - uid: 571 + - uid: 75 components: - type: Transform - pos: 18.5,6.5 + pos: 9.5,22.5 parent: 179 - - uid: 572 + - uid: 78 components: - type: Transform - pos: 19.5,6.5 + pos: 21.5,15.5 parent: 179 - - uid: 573 + - uid: 80 components: - type: Transform - pos: 18.5,5.5 + pos: 18.5,16.5 parent: 179 - - uid: 574 + - uid: 81 components: - type: Transform - pos: 22.5,8.5 + pos: 18.5,15.5 parent: 179 - - uid: 575 + - uid: 82 components: - type: Transform - pos: 24.5,4.5 + pos: 14.5,18.5 parent: 179 - - uid: 584 + - uid: 83 components: - type: Transform - pos: 23.5,7.5 + pos: 4.5,28.5 parent: 179 - - uid: 586 + - uid: 84 components: - type: Transform - pos: 25.5,10.5 + pos: 7.5,26.5 parent: 179 - - uid: 587 + - uid: 85 components: - type: Transform - pos: 23.5,10.5 + pos: 1.5,23.5 parent: 179 - - uid: 588 + - uid: 86 components: - type: Transform - pos: 24.5,10.5 + pos: 17.5,15.5 parent: 179 - - uid: 589 + - uid: 89 components: - type: Transform - pos: 26.5,10.5 + pos: 22.5,15.5 parent: 179 - - uid: 590 + - uid: 95 components: - type: Transform - pos: 27.5,10.5 + pos: 8.5,22.5 parent: 179 - - uid: 594 + - uid: 96 components: - type: Transform - pos: 13.5,2.5 + pos: 7.5,27.5 parent: 179 - - uid: 595 + - uid: 98 components: - type: Transform - pos: 13.5,0.5 + pos: 4.5,25.5 parent: 179 - - uid: 596 + - uid: 99 components: - type: Transform - pos: 13.5,1.5 + pos: 17.5,18.5 parent: 179 - - uid: 684 + - uid: 100 components: - type: Transform - pos: -3.5,0.5 + pos: 19.5,15.5 parent: 179 - - uid: 685 + - uid: 101 components: - type: Transform - pos: 3.5,4.5 + pos: 4.5,27.5 parent: 179 - - uid: 686 + - uid: 103 components: - type: Transform - pos: 3.5,6.5 + pos: 14.5,17.5 parent: 179 - - uid: 706 + - uid: 104 components: - type: Transform - pos: -1.5,-3.5 + pos: 14.5,16.5 parent: 179 - - uid: 707 + - uid: 105 components: - type: Transform - pos: -0.5,-3.5 + pos: 15.5,15.5 parent: 179 - - uid: 710 + - uid: 106 components: - type: Transform - pos: 0.5,-3.5 + pos: 14.5,15.5 parent: 179 -- proto: TableGlass - entities: - - uid: 964 + - uid: 107 components: - type: Transform - pos: 9.5,12.5 + pos: 13.5,15.5 parent: 179 - - uid: 965 + - uid: 109 components: - type: Transform - pos: 11.5,12.5 + pos: 11.5,15.5 parent: 179 - - uid: 966 + - uid: 110 components: - type: Transform - pos: 13.5,12.5 + pos: 10.5,15.5 parent: 179 - - uid: 975 + - uid: 112 components: - type: Transform - pos: 10.5,12.5 + pos: 7.5,19.5 parent: 179 - - uid: 976 + - uid: 113 components: - type: Transform - pos: 12.5,12.5 + pos: 7.5,18.5 parent: 179 -- proto: TargetHuman - entities: - - uid: 159 + - uid: 114 components: - type: Transform - pos: -6.5,-1.5 + pos: 7.5,17.5 parent: 179 -- proto: TelecomServerFilled - entities: - - uid: 963 + - uid: 117 components: - type: Transform - pos: -3.5,10.5 + pos: 5.5,18.5 parent: 179 -- proto: TimerTrigger - entities: - - uid: 482 + - uid: 118 components: - type: Transform - pos: 6.413024,9.39097 + pos: 5.5,19.5 parent: 179 -- proto: ToolboxElectricalFilled - entities: - - uid: 365 + - uid: 121 components: - type: Transform - pos: 0.4993378,3.429311 + pos: 4.5,19.5 parent: 179 - - uid: 419 + - uid: 122 components: - type: Transform - pos: -0.8099712,-5.21454 + pos: 4.5,20.5 parent: 179 - - uid: 420 + - uid: 123 components: - type: Transform - pos: -0.5597038,-5.679647 + pos: 4.5,21.5 parent: 179 -- proto: ToolboxMechanicalFilled - entities: - - uid: 364 + - uid: 124 components: - type: Transform - pos: 1.452203,3.4605832 + pos: 4.5,22.5 parent: 179 -- proto: ToyRubberDuck - entities: - - uid: 723 + - uid: 125 components: - type: Transform - pos: -1.6653601,11.616664 + pos: 4.5,23.5 parent: 179 -- proto: trayScanner - entities: - - uid: 758 + - uid: 126 components: - type: Transform - pos: 1.354346,4.548879 + pos: 4.5,24.5 parent: 179 -- proto: TwoWayLever - entities: - - uid: 699 + - uid: 160 components: - type: Transform - pos: -3.5,-13.5 + rot: -1.5707963267948966 rad + pos: 11.5,-0.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 990: - - Left: Forward - - Right: Reverse - - Middle: Off - 195: - - Left: Forward - - Right: Reverse - - Middle: Off - 991: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 722 + - uid: 164 components: - type: Transform - pos: 1.5,11.5 + rot: 1.5707963267948966 rad + pos: 22.5,9.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 721: - - Left: Forward - - Right: Reverse - - Middle: Off - 720: - - Left: Forward - - Right: Reverse - - Middle: Off - 716: - - Left: Forward - - Right: Reverse - - Middle: Off - - uid: 983 + - uid: 165 components: - type: Transform - pos: 2.5,-13.5 + pos: 8.5,2.5 parent: 179 - - type: DeviceLinkSource - linkedPorts: - 985: - - Left: Forward - - Right: Reverse - - Middle: Off - 259: - - Left: Forward - - Right: Reverse - - Middle: Off - 989: - - Left: Forward - - Right: Reverse - - Middle: Off - 463: - - Left: Forward - - Right: Reverse - - Middle: Off -- proto: UnfinishedMachineFrame - entities: - - uid: 522 + - uid: 168 components: - type: Transform - pos: -6.5,10.5 + rot: -1.5707963267948966 rad + pos: 10.5,-0.5 parent: 179 -- proto: UniformPrinter - entities: - - uid: 443 + - uid: 169 components: - type: Transform - pos: -7.5,4.5 + pos: 8.5,0.5 parent: 179 -- proto: VendingMachineCigs - entities: - - uid: 870 + - uid: 171 components: - type: Transform - pos: -14.5,4.5 + rot: -1.5707963267948966 rad + pos: 9.5,-0.5 parent: 179 -- proto: VendingMachineEngivend - entities: - - uid: 441 + - uid: 173 components: - type: Transform - pos: -11.5,4.5 + pos: 8.5,1.5 parent: 179 - - uid: 523 + - uid: 189 components: - type: Transform - pos: -11.5,-1.5 + pos: -7.5,0.5 parent: 179 -- proto: VendingMachineMedical - entities: - - uid: 156 + - uid: 190 components: - type: Transform - pos: 25.5,-5.5 + pos: -7.5,-0.5 parent: 179 - - uid: 157 + - uid: 191 components: - type: Transform - pos: 27.5,-5.5 + pos: -7.5,-1.5 parent: 179 - - uid: 158 + - uid: 192 components: - type: Transform - pos: 29.5,3.5 + pos: -7.5,-2.5 parent: 179 - - uid: 521 + - uid: 193 components: - type: Transform - pos: -12.5,4.5 + pos: -7.5,-3.5 parent: 179 -- proto: VendingMachineSalvage - entities: - - uid: 485 + - uid: 196 components: - type: Transform - pos: -15.5,4.5 + pos: 3.5,-14.5 parent: 179 -- proto: VendingMachineSec - entities: - - uid: 874 + - uid: 197 components: - type: Transform - pos: -13.5,4.5 + pos: 4.5,-14.5 parent: 179 -- proto: VendingMachineTankDispenserEVA - entities: - - uid: 875 + - uid: 198 components: - type: Transform - pos: 7.5,0.5 + pos: -7.5,-10.5 parent: 179 -- proto: VendingMachineYouTool - entities: - - uid: 350 + - uid: 199 components: - type: Transform - pos: -11.5,-0.5 + pos: -7.5,-11.5 parent: 179 -- proto: WallSolid - entities: - - uid: 3 + - uid: 200 components: - type: Transform - pos: 1.5,18.5 + pos: -7.5,-12.5 parent: 179 - - uid: 4 + - uid: 201 components: - type: Transform - pos: 11.5,26.5 + pos: -7.5,-13.5 parent: 179 - - uid: 5 + - uid: 208 components: - type: Transform - pos: 18.5,24.5 + pos: -7.5,-9.5 parent: 179 - - uid: 6 + - uid: 209 components: - type: Transform - pos: 20.5,15.5 + pos: -10.5,-7.5 parent: 179 - - uid: 8 + - uid: 211 components: - type: Transform - pos: 14.5,19.5 + pos: -10.5,-5.5 parent: 179 - - uid: 9 + - uid: 212 components: - type: Transform - pos: 1.5,19.5 + pos: -10.5,-4.5 parent: 179 - - uid: 10 + - uid: 213 components: - type: Transform - pos: 18.5,26.5 + pos: -10.5,-3.5 parent: 179 - - uid: 11 + - uid: 214 components: - type: Transform - pos: 13.5,26.5 + pos: -10.5,-2.5 parent: 179 - - uid: 13 + - uid: 215 components: - type: Transform - pos: 25.5,15.5 + pos: -10.5,-1.5 parent: 179 - - uid: 18 + - uid: 217 components: - type: Transform - pos: 4.5,26.5 + pos: 1.5,-4.5 parent: 179 - - uid: 19 + - uid: 218 components: - type: Transform - pos: 18.5,25.5 + pos: 0.5,-4.5 parent: 179 - - uid: 21 + - uid: 219 components: - type: Transform - pos: 10.5,26.5 + pos: -0.5,-4.5 parent: 179 - - uid: 22 + - uid: 220 components: - type: Transform - pos: 26.5,15.5 + pos: -1.5,-4.5 parent: 179 - - uid: 25 + - uid: 221 components: - type: Transform - pos: 1.5,21.5 + pos: -2.5,-4.5 parent: 179 - - uid: 27 + - uid: 222 components: - type: Transform - pos: 8.5,-0.5 + pos: -3.5,-4.5 parent: 179 - - uid: 28 + - uid: 223 components: - type: Transform - pos: 18.5,18.5 + pos: -4.5,-4.5 parent: 179 - - uid: 29 + - uid: 224 components: - type: Transform - pos: 18.5,21.5 + pos: -5.5,-4.5 parent: 179 - - uid: 30 + - uid: 225 components: - type: Transform - pos: 1.5,22.5 + pos: -6.5,-4.5 parent: 179 - - uid: 31 + - uid: 226 components: - type: Transform - pos: 1.5,20.5 + pos: 4.5,-4.5 parent: 179 - - uid: 32 + - uid: 227 components: - type: Transform - pos: 18.5,19.5 + pos: 5.5,-4.5 parent: 179 - - uid: 33 + - uid: 228 components: - type: Transform - pos: 23.5,15.5 + pos: 6.5,-4.5 parent: 179 - - uid: 34 + - uid: 229 components: - type: Transform - pos: 12.5,22.5 + pos: -7.5,-14.5 parent: 179 - - uid: 35 + - uid: 231 components: - type: Transform - pos: 27.5,15.5 + pos: -6.5,-14.5 parent: 179 - - uid: 36 + - uid: 232 components: - type: Transform - pos: 7.5,22.5 + pos: -5.5,-14.5 parent: 179 - - uid: 37 + - uid: 233 components: - type: Transform - pos: 14.5,22.5 + pos: -4.5,-14.5 parent: 179 - - uid: 38 + - uid: 234 components: - type: Transform - pos: 10.5,23.5 + pos: 6.5,-10.5 parent: 179 - - uid: 39 + - uid: 235 components: - type: Transform - pos: 10.5,24.5 + pos: 6.5,-11.5 parent: 179 - - uid: 40 + - uid: 236 components: - type: Transform - pos: 8.5,26.5 + pos: 6.5,-12.5 parent: 179 - - uid: 41 + - uid: 237 components: - type: Transform - pos: 10.5,25.5 + pos: 6.5,-13.5 parent: 179 - - uid: 42 + - uid: 238 components: - type: Transform - pos: 18.5,22.5 + pos: 6.5,-14.5 parent: 179 - - uid: 43 + - uid: 239 components: - type: Transform - pos: 14.5,27.5 + pos: 5.5,-14.5 parent: 179 - - uid: 44 + - uid: 240 components: - type: Transform - pos: 14.5,26.5 + pos: -7.5,-8.5 parent: 179 - - uid: 45 + - uid: 241 components: - type: Transform - pos: 1.5,16.5 + pos: -7.5,-7.5 parent: 179 - - uid: 46 + - uid: 242 components: - type: Transform - pos: 18.5,27.5 + pos: -8.5,-8.5 parent: 179 - - uid: 49 + - uid: 243 components: - type: Transform - pos: 7.5,28.5 + pos: -9.5,-8.5 parent: 179 - - uid: 50 + - uid: 244 components: - type: Transform - pos: 13.5,22.5 + pos: -10.5,-8.5 parent: 179 - - uid: 51 + - uid: 245 components: - type: Transform - pos: 12.5,26.5 + pos: -7.5,-5.5 parent: 179 - - uid: 52 + - uid: 260 components: - type: Transform - pos: 1.5,15.5 + pos: 6.5,-6.5 parent: 179 - - uid: 53 + - uid: 261 components: - type: Transform - pos: 9.5,26.5 + pos: 6.5,-5.5 parent: 179 - - uid: 55 + - uid: 266 components: - type: Transform - pos: 24.5,15.5 + pos: 8.5,-3.5 parent: 179 - - uid: 56 + - uid: 271 components: - type: Transform - pos: 14.5,25.5 + pos: 1.5,14.5 parent: 179 - - uid: 57 + - uid: 272 components: - type: Transform - pos: 14.5,21.5 + pos: 1.5,13.5 parent: 179 - - uid: 60 + - uid: 273 components: - type: Transform - pos: 7.5,21.5 + pos: 1.5,12.5 parent: 179 - - uid: 61 + - uid: 274 components: - type: Transform - pos: 18.5,20.5 + pos: -7.5,11.5 parent: 179 - - uid: 62 + - uid: 275 components: - type: Transform - pos: 18.5,23.5 + pos: -6.5,11.5 parent: 179 - - uid: 66 + - uid: 276 components: - type: Transform - pos: 18.5,17.5 + pos: -5.5,11.5 parent: 179 - - uid: 68 + - uid: 277 components: - type: Transform - pos: 18.5,28.5 + pos: -4.5,11.5 parent: 179 - - uid: 69 + - uid: 278 components: - type: Transform - pos: 28.5,15.5 + pos: -3.5,11.5 parent: 179 - - uid: 71 + - uid: 279 components: - type: Transform - pos: 11.5,22.5 + pos: -2.5,11.5 parent: 179 - - uid: 72 + - uid: 282 components: - type: Transform - pos: 1.5,17.5 + pos: -1.5,12.5 parent: 179 - - uid: 73 + - uid: 283 components: - type: Transform - pos: 14.5,28.5 + pos: -0.5,12.5 parent: 179 - - uid: 74 + - uid: 284 components: - type: Transform - pos: 10.5,22.5 + pos: 0.5,12.5 parent: 179 - - uid: 75 + - uid: 288 components: - type: Transform - pos: 9.5,22.5 + pos: 12.5,8.5 parent: 179 - - uid: 76 + - uid: 289 components: - type: Transform - pos: 8.5,-1.5 + pos: 11.5,8.5 parent: 179 - - uid: 77 + - uid: 290 components: - type: Transform - pos: 8.5,-2.5 + pos: 10.5,8.5 parent: 179 - - uid: 78 + - uid: 291 components: - type: Transform - pos: 21.5,15.5 + pos: 9.5,8.5 parent: 179 - - uid: 80 + - uid: 292 components: - type: Transform - pos: 18.5,16.5 + pos: 8.5,8.5 parent: 179 - - uid: 81 + - uid: 293 components: - type: Transform - pos: 18.5,15.5 + pos: 7.5,8.5 parent: 179 - - uid: 82 + - uid: 294 components: - type: Transform - pos: 14.5,18.5 + pos: 6.5,8.5 parent: 179 - - uid: 83 + - uid: 295 components: - type: Transform - pos: 4.5,28.5 + pos: 5.5,8.5 parent: 179 - - uid: 84 + - uid: 301 components: - type: Transform - pos: 7.5,26.5 + pos: 9.5,11.5 parent: 179 - - uid: 85 + - uid: 302 components: - type: Transform - pos: 1.5,23.5 + pos: 10.5,11.5 parent: 179 - - uid: 86 + - uid: 303 components: - type: Transform - pos: 17.5,15.5 + pos: 11.5,11.5 parent: 179 - - uid: 89 + - uid: 304 components: - type: Transform - pos: 22.5,15.5 + pos: 12.5,11.5 parent: 179 - - uid: 95 + - uid: 310 components: - type: Transform - pos: 8.5,22.5 + pos: 9.5,9.5 parent: 179 - - uid: 96 + - uid: 316 components: - type: Transform - pos: 7.5,27.5 + pos: -7.5,-4.5 parent: 179 - - uid: 97 + - uid: 317 components: - type: Transform - pos: 8.5,-3.5 + pos: 26.5,14.5 parent: 179 - - uid: 98 + - uid: 320 components: - type: Transform - pos: 4.5,25.5 + pos: 24.5,14.5 parent: 179 - - uid: 99 + - uid: 322 components: - type: Transform - pos: 17.5,18.5 + rot: -1.5707963267948966 rad + pos: 25.5,-11.5 parent: 179 - - uid: 100 + - uid: 329 components: - type: Transform - pos: 19.5,15.5 + pos: -11.5,5.5 parent: 179 - - uid: 101 + - uid: 335 components: - type: Transform - pos: 4.5,27.5 + pos: 13.5,11.5 parent: 179 - - uid: 103 + - uid: 336 components: - type: Transform - pos: 14.5,17.5 + pos: 14.5,11.5 parent: 179 - - uid: 104 + - uid: 337 components: - type: Transform - pos: 14.5,16.5 + pos: 13.5,9.5 parent: 179 - - uid: 105 + - uid: 338 components: - type: Transform - pos: 15.5,15.5 + pos: 13.5,8.5 parent: 179 - - uid: 106 + - uid: 339 components: - type: Transform - pos: 14.5,15.5 + pos: 13.5,7.5 parent: 179 - - uid: 107 + - uid: 341 components: - type: Transform - pos: 13.5,15.5 + pos: 24.5,12.5 parent: 179 - - uid: 109 + - uid: 342 components: - type: Transform - pos: 11.5,15.5 + pos: 26.5,12.5 parent: 179 - - uid: 110 + - uid: 346 components: - type: Transform - pos: 10.5,15.5 + rot: -1.5707963267948966 rad + pos: 25.5,-7.5 parent: 179 - - uid: 112 + - uid: 352 components: - type: Transform - pos: 7.5,19.5 + pos: 13.5,6.5 parent: 179 - - uid: 113 + - uid: 353 components: - type: Transform - pos: 7.5,18.5 + pos: 13.5,5.5 parent: 179 - - uid: 114 + - uid: 372 components: - type: Transform - pos: 7.5,17.5 + pos: 13.5,4.5 parent: 179 - - uid: 117 + - uid: 373 components: - type: Transform - pos: 5.5,18.5 + pos: 25.5,4.5 parent: 179 - - uid: 118 + - uid: 374 components: - type: Transform - pos: 5.5,19.5 + pos: 23.5,4.5 parent: 179 - - uid: 121 + - uid: 375 components: - type: Transform - pos: 4.5,19.5 + pos: 17.5,3.5 parent: 179 - - uid: 122 + - uid: 376 components: - type: Transform - pos: 4.5,20.5 + pos: -10.5,-0.5 parent: 179 - - uid: 123 + - uid: 377 components: - type: Transform - pos: 4.5,21.5 + pos: -10.5,0.5 parent: 179 - - uid: 124 + - uid: 379 components: - type: Transform - pos: 4.5,22.5 + pos: -8.5,0.5 parent: 179 - - uid: 125 + - uid: 390 components: - type: Transform - pos: 4.5,23.5 + pos: 18.5,3.5 parent: 179 - - uid: 126 + - uid: 391 components: - type: Transform - pos: 4.5,24.5 + pos: 19.5,3.5 parent: 179 - - uid: 164 + - uid: 392 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,9.5 + pos: 21.5,3.5 parent: 179 - - uid: 165 + - uid: 393 components: - type: Transform - pos: 8.5,2.5 + pos: 22.5,3.5 parent: 179 - - uid: 169 + - uid: 394 components: - type: Transform - pos: 8.5,0.5 + pos: 22.5,4.5 parent: 179 - - uid: 173 + - uid: 395 components: - type: Transform - pos: 8.5,1.5 + pos: 22.5,5.5 parent: 179 - - uid: 189 + - uid: 396 components: - type: Transform - pos: -7.5,0.5 + pos: 22.5,6.5 parent: 179 - - uid: 190 + - uid: 397 components: - type: Transform - pos: -7.5,-0.5 + pos: 22.5,7.5 parent: 179 - - uid: 191 + - uid: 399 components: - type: Transform - pos: -7.5,-1.5 + pos: 22.5,10.5 parent: 179 - - uid: 192 + - uid: 400 components: - type: Transform - pos: -7.5,-2.5 + pos: 21.5,11.5 parent: 179 - - uid: 193 + - uid: 401 components: - type: Transform - pos: -7.5,-3.5 + pos: 22.5,11.5 parent: 179 - - uid: 196 + - uid: 439 components: - type: Transform - pos: 3.5,-14.5 + pos: -13.5,5.5 parent: 179 - - uid: 197 + - uid: 449 components: - type: Transform - pos: 4.5,-14.5 + pos: -16.5,2.5 parent: 179 - - uid: 198 + - uid: 450 components: - type: Transform - pos: -7.5,-10.5 + pos: -16.5,3.5 parent: 179 - - uid: 199 + - uid: 464 components: - type: Transform - pos: -7.5,-11.5 + pos: 4.5,8.5 parent: 179 - - uid: 200 + - uid: 474 components: - type: Transform - pos: -7.5,-12.5 + pos: -7.5,8.5 parent: 179 - - uid: 201 + - uid: 475 components: - type: Transform - pos: -7.5,-13.5 + pos: -7.5,7.5 parent: 179 - - uid: 208 + - uid: 476 components: - type: Transform - pos: -7.5,-9.5 + pos: -7.5,6.5 parent: 179 - - uid: 209 + - uid: 477 components: - type: Transform - pos: -10.5,-7.5 + pos: -7.5,5.5 parent: 179 - - uid: 211 + - uid: 486 components: - type: Transform - pos: -10.5,-5.5 + pos: -15.5,5.5 parent: 179 - - uid: 212 + - uid: 487 components: - type: Transform - pos: -10.5,-4.5 + pos: -16.5,4.5 parent: 179 - - uid: 213 + - uid: 488 components: - type: Transform - pos: -10.5,-3.5 + pos: 5.5,17.5 parent: 179 - - uid: 214 + - uid: 489 components: - type: Transform - pos: -10.5,-2.5 + pos: -11.5,0.5 parent: 179 - - uid: 215 + - uid: 491 components: - type: Transform - pos: -10.5,-1.5 + pos: -16.5,5.5 parent: 179 - - uid: 217 + - uid: 492 components: - type: Transform - pos: 1.5,-4.5 + pos: -14.5,5.5 parent: 179 - - uid: 218 + - uid: 494 components: - type: Transform - pos: 0.5,-4.5 + rot: -1.5707963267948966 rad + pos: -11.5,7.5 parent: 179 - - uid: 219 + - uid: 495 components: - type: Transform - pos: -0.5,-4.5 + pos: -12.5,5.5 parent: 179 - - uid: 220 + - uid: 496 components: - type: Transform - pos: -1.5,-4.5 + pos: -16.5,1.5 parent: 179 - - uid: 221 + - uid: 497 components: - type: Transform - pos: -2.5,-4.5 + pos: -16.5,0.5 parent: 179 - - uid: 222 + - uid: 498 components: - type: Transform - pos: -3.5,-4.5 + pos: -16.5,-0.5 parent: 179 - - uid: 223 + - uid: 499 components: - type: Transform - pos: -4.5,-4.5 + pos: -16.5,-1.5 parent: 179 - - uid: 224 + - uid: 500 components: - type: Transform - pos: -5.5,-4.5 + pos: -16.5,-2.5 parent: 179 - - uid: 225 + - uid: 501 components: - type: Transform - pos: -6.5,-4.5 + pos: -16.5,-3.5 parent: 179 - - uid: 226 + - uid: 502 components: - type: Transform - pos: 4.5,-4.5 + pos: -16.5,-4.5 parent: 179 - - uid: 227 + - uid: 503 components: - type: Transform - pos: 5.5,-4.5 + pos: -16.5,-5.5 parent: 179 - - uid: 228 + - uid: 504 components: - type: Transform - pos: 6.5,-4.5 + pos: -16.5,-6.5 parent: 179 - - uid: 229 + - uid: 505 components: - type: Transform - pos: -7.5,-14.5 + pos: -16.5,-7.5 parent: 179 - - uid: 231 + - uid: 506 components: - type: Transform - pos: -6.5,-14.5 + pos: -16.5,-8.5 parent: 179 - - uid: 232 + - uid: 507 components: - type: Transform - pos: -5.5,-14.5 + pos: -15.5,-8.5 parent: 179 - - uid: 233 + - uid: 508 components: - type: Transform - pos: -4.5,-14.5 + pos: -14.5,-8.5 parent: 179 - - uid: 234 + - uid: 509 components: - type: Transform - pos: 6.5,-10.5 + pos: -13.5,-8.5 parent: 179 - - uid: 235 + - uid: 510 components: - type: Transform - pos: 6.5,-11.5 + pos: -12.5,-8.5 parent: 179 - - uid: 236 + - uid: 511 components: - type: Transform - pos: 6.5,-12.5 + pos: -11.5,-8.5 parent: 179 - - uid: 237 + - uid: 517 components: - type: Transform - pos: 6.5,-13.5 + pos: 23.5,11.5 parent: 179 - - uid: 238 + - uid: 518 components: - type: Transform - pos: 6.5,-14.5 + pos: 24.5,11.5 parent: 179 - - uid: 239 + - uid: 519 components: - type: Transform - pos: 5.5,-14.5 + pos: 25.5,11.5 parent: 179 - - uid: 240 + - uid: 535 components: - type: Transform - pos: -7.5,-8.5 + pos: -15.5,0.5 parent: 179 - - uid: 241 + - uid: 539 components: - type: Transform - pos: -7.5,-7.5 + pos: 26.5,11.5 parent: 179 - - uid: 242 + - uid: 540 components: - type: Transform - pos: -8.5,-8.5 + pos: 27.5,11.5 parent: 179 - - uid: 243 + - uid: 545 components: - type: Transform - pos: -9.5,-8.5 + pos: 7.5,-4.5 parent: 179 - - uid: 244 + - uid: 547 components: - type: Transform - pos: -10.5,-8.5 + pos: 28.5,11.5 parent: 179 - - uid: 245 + - uid: 548 components: - type: Transform - pos: -7.5,-5.5 + pos: 28.5,10.5 parent: 179 - - uid: 248 + - uid: 549 components: - type: Transform - pos: 5.5,-7.5 + pos: 28.5,9.5 parent: 179 - - uid: 249 + - uid: 550 components: - type: Transform - pos: 5.5,-9.5 + pos: 28.5,8.5 parent: 179 - - uid: 250 + - uid: 551 components: - type: Transform - pos: 6.5,-9.5 + pos: 28.5,7.5 parent: 179 - - uid: 251 + - uid: 552 components: - type: Transform - pos: 6.5,-7.5 + pos: 28.5,6.5 parent: 179 - - uid: 254 + - uid: 553 components: - type: Transform - pos: 7.5,-9.5 + pos: 28.5,5.5 parent: 179 - - uid: 260 + - uid: 554 components: - type: Transform - pos: 6.5,-6.5 + pos: 26.5,-2.5 parent: 179 - - uid: 261 + - uid: 555 components: - type: Transform - pos: 6.5,-5.5 + pos: 26.5,-1.5 parent: 179 - - uid: 271 + - uid: 556 components: - type: Transform - pos: 1.5,14.5 + pos: 25.5,-0.5 parent: 179 - - uid: 272 + - uid: 557 components: - type: Transform - pos: 1.5,13.5 + pos: 26.5,-0.5 parent: 179 - - uid: 273 + - uid: 558 components: - type: Transform - pos: 1.5,12.5 + pos: 27.5,-0.5 parent: 179 - - uid: 274 + - uid: 561 components: - type: Transform - pos: -7.5,11.5 + pos: -14.5,0.5 parent: 179 - - uid: 275 + - uid: 585 components: - type: Transform - pos: -6.5,11.5 + pos: 9.5,10.5 parent: 179 - - uid: 276 + - uid: 597 components: - type: Transform - pos: -5.5,11.5 + pos: 22.5,-0.5 parent: 179 - - uid: 277 + - uid: 598 components: - type: Transform - pos: -4.5,11.5 + pos: 17.5,-0.5 parent: 179 - - uid: 278 + - uid: 599 components: - type: Transform - pos: -3.5,11.5 + pos: 18.5,-0.5 parent: 179 - - uid: 279 + - uid: 600 components: - type: Transform - pos: -2.5,11.5 + pos: 20.5,-0.5 parent: 179 - - uid: 282 + - uid: 601 components: - type: Transform - pos: -1.5,12.5 + pos: 21.5,-0.5 parent: 179 - - uid: 283 + - uid: 602 components: - type: Transform - pos: -0.5,12.5 + pos: 19.5,-0.5 parent: 179 - - uid: 284 + - uid: 603 components: - type: Transform - pos: 0.5,12.5 + pos: 14.5,3.5 parent: 179 - - uid: 288 + - uid: 604 components: - type: Transform - pos: 12.5,8.5 + pos: 13.5,3.5 parent: 179 - - uid: 289 + - uid: 605 components: - type: Transform - pos: 11.5,8.5 + pos: 12.5,3.5 parent: 179 - - uid: 290 + - uid: 606 components: - type: Transform - pos: 10.5,8.5 + pos: 12.5,2.5 parent: 179 - - uid: 291 + - uid: 607 components: - type: Transform - pos: 9.5,8.5 + pos: 12.5,1.5 parent: 179 - - uid: 292 + - uid: 608 components: - type: Transform - pos: 8.5,8.5 + pos: 12.5,0.5 parent: 179 - - uid: 293 + - uid: 609 components: - type: Transform - pos: 7.5,8.5 + pos: 12.5,-0.5 parent: 179 - - uid: 294 + - uid: 610 components: - type: Transform - pos: 6.5,8.5 + pos: 13.5,-0.5 parent: 179 - - uid: 295 + - uid: 611 components: - type: Transform - pos: 5.5,8.5 + pos: 14.5,-0.5 parent: 179 - - uid: 301 + - uid: 612 components: - type: Transform - pos: 9.5,11.5 + pos: 8.5,-2.5 parent: 179 - - uid: 302 + - uid: 618 components: - type: Transform - pos: 10.5,11.5 + pos: 14.5,-6.5 parent: 179 - - uid: 303 + - uid: 620 components: - type: Transform - pos: 11.5,11.5 + rot: -1.5707963267948966 rad + pos: 6.5,-7.5 parent: 179 - - uid: 304 + - uid: 621 components: - type: Transform - pos: 12.5,11.5 + pos: 17.5,-6.5 parent: 179 - - uid: 310 + - uid: 622 components: - type: Transform - pos: 9.5,9.5 + pos: 18.5,-6.5 parent: 179 - - uid: 316 + - uid: 623 components: - type: Transform - pos: -7.5,-4.5 + pos: 19.5,-6.5 parent: 179 - - uid: 317 + - uid: 624 components: - type: Transform - pos: 26.5,14.5 + pos: 20.5,-6.5 parent: 179 - - uid: 320 + - uid: 625 components: - type: Transform - pos: 24.5,14.5 + pos: 21.5,-6.5 parent: 179 - - uid: 329 + - uid: 626 components: - type: Transform - pos: -11.5,5.5 + pos: 22.5,-6.5 parent: 179 - - uid: 335 + - uid: 627 components: - type: Transform - pos: 13.5,11.5 + pos: 23.5,-6.5 parent: 179 - - uid: 336 + - uid: 628 components: - type: Transform - pos: 14.5,11.5 + pos: 24.5,-6.5 parent: 179 - - uid: 337 + - uid: 629 components: - type: Transform - pos: 13.5,9.5 + pos: 25.5,-6.5 parent: 179 - - uid: 338 + - uid: 630 components: - type: Transform - pos: 13.5,8.5 + pos: 26.5,-6.5 parent: 179 - - uid: 339 + - uid: 631 components: - type: Transform - pos: 13.5,7.5 + pos: 26.5,-5.5 parent: 179 - - uid: 341 + - uid: 632 components: - type: Transform - pos: 24.5,12.5 + pos: 26.5,-4.5 parent: 179 - - uid: 342 + - uid: 633 components: - type: Transform - pos: 26.5,12.5 + pos: 27.5,-6.5 parent: 179 - - uid: 352 + - uid: 634 components: - type: Transform - pos: 13.5,6.5 + pos: 28.5,-6.5 parent: 179 - - uid: 353 + - uid: 635 components: - type: Transform - pos: 13.5,5.5 + pos: 29.5,-6.5 parent: 179 - - uid: 372 + - uid: 636 components: - type: Transform - pos: 13.5,4.5 + pos: 30.5,-6.5 parent: 179 - - uid: 373 + - uid: 637 components: - type: Transform - pos: 25.5,4.5 + pos: 31.5,-6.5 parent: 179 - - uid: 374 + - uid: 638 components: - type: Transform - pos: 23.5,4.5 + pos: 32.5,-6.5 parent: 179 - - uid: 375 + - uid: 639 components: - type: Transform - pos: 17.5,3.5 + pos: 33.5,-6.5 parent: 179 - - uid: 376 + - uid: 640 components: - type: Transform - pos: -10.5,-0.5 + pos: 34.5,-6.5 parent: 179 - - uid: 377 + - uid: 641 components: - type: Transform - pos: -10.5,0.5 + pos: 34.5,-5.5 parent: 179 - - uid: 379 + - uid: 642 components: - type: Transform - pos: -8.5,0.5 + pos: 34.5,-4.5 parent: 179 - - uid: 390 + - uid: 643 components: - type: Transform - pos: 18.5,3.5 + pos: 34.5,-3.5 parent: 179 - - uid: 391 + - uid: 644 components: - type: Transform - pos: 19.5,3.5 + pos: 34.5,-2.5 parent: 179 - - uid: 392 + - uid: 645 components: - type: Transform - pos: 21.5,3.5 + pos: 34.5,-1.5 parent: 179 - - uid: 393 + - uid: 646 components: - type: Transform - pos: 22.5,3.5 + pos: 34.5,-0.5 parent: 179 - - uid: 394 + - uid: 647 components: - type: Transform - pos: 22.5,4.5 + pos: 33.5,-0.5 parent: 179 - - uid: 395 + - uid: 648 components: - type: Transform - pos: 22.5,5.5 + pos: 32.5,-0.5 parent: 179 - - uid: 396 + - uid: 649 components: - type: Transform - pos: 22.5,6.5 + pos: 31.5,-0.5 parent: 179 - - uid: 397 + - uid: 650 components: - type: Transform - pos: 22.5,7.5 + pos: 30.5,-0.5 parent: 179 - - uid: 399 + - uid: 651 components: - type: Transform - pos: 22.5,10.5 + pos: 29.5,-0.5 parent: 179 - - uid: 400 + - uid: 652 components: - type: Transform - pos: 21.5,11.5 + pos: 30.5,0.5 parent: 179 - - uid: 401 + - uid: 653 components: - type: Transform - pos: 22.5,11.5 + pos: 30.5,1.5 parent: 179 - - uid: 418 + - uid: 654 components: - type: Transform - pos: 7.5,-7.5 + pos: 30.5,2.5 parent: 179 - - uid: 439 + - uid: 655 components: - type: Transform - pos: -13.5,5.5 + pos: 30.5,3.5 parent: 179 - - uid: 449 + - uid: 656 components: - type: Transform - pos: -16.5,2.5 + pos: 30.5,4.5 parent: 179 - - uid: 450 + - uid: 657 components: - type: Transform - pos: -16.5,3.5 + pos: 29.5,4.5 parent: 179 - - uid: 464 + - uid: 658 components: - type: Transform - pos: 4.5,8.5 + pos: 28.5,4.5 parent: 179 - - uid: 474 + - uid: 659 components: - type: Transform - pos: -7.5,8.5 + pos: 27.5,4.5 parent: 179 - - uid: 475 + - uid: 680 components: - type: Transform - pos: -7.5,7.5 + pos: 8.5,-1.5 parent: 179 - - uid: 476 + - uid: 702 components: - type: Transform - pos: -7.5,6.5 + rot: -1.5707963267948966 rad + pos: -11.5,6.5 parent: 179 - - uid: 477 + - uid: 713 components: - type: Transform - pos: -7.5,5.5 + pos: -7.5,9.5 parent: 179 - - uid: 486 + - uid: 714 components: - type: Transform - pos: -15.5,5.5 + pos: -7.5,10.5 parent: 179 - - uid: 487 + - uid: 724 components: - type: Transform - pos: -16.5,4.5 + pos: -2.5,12.5 parent: 179 - - uid: 488 + - uid: 733 components: - type: Transform - pos: 5.5,17.5 + pos: 4.5,5.5 parent: 179 - - uid: 489 + - uid: 734 components: - type: Transform - pos: -11.5,0.5 + pos: 4.5,4.5 parent: 179 - - uid: 491 + - uid: 739 components: - type: Transform - pos: -16.5,5.5 + pos: 8.5,7.5 parent: 179 - - uid: 492 + - uid: 740 components: - type: Transform - pos: -14.5,5.5 + pos: 8.5,6.5 parent: 179 - - uid: 494 + - uid: 741 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,7.5 + pos: 8.5,5.5 parent: 179 - - uid: 495 + - uid: 742 components: - type: Transform - pos: -12.5,5.5 + pos: 8.5,4.5 parent: 179 - - uid: 496 + - uid: 743 components: - type: Transform - pos: -16.5,1.5 + pos: 8.5,3.5 parent: 179 - - uid: 497 + - uid: 745 components: - type: Transform - pos: -16.5,0.5 + pos: 4.5,7.5 parent: 179 - - uid: 498 + - uid: 746 components: - type: Transform - pos: -16.5,-0.5 + pos: 4.5,6.5 parent: 179 - - uid: 499 + - uid: 846 components: - type: Transform - pos: -16.5,-1.5 + pos: 2.5,19.5 parent: 179 - - uid: 500 + - uid: 847 components: - type: Transform - pos: -16.5,-2.5 + pos: 3.5,19.5 parent: 179 - - uid: 501 + - uid: 925 components: - type: Transform - pos: -16.5,-3.5 + rot: -1.5707963267948966 rad + pos: -14.5,17.5 parent: 179 - - uid: 502 + - uid: 958 components: - type: Transform - pos: -16.5,-4.5 + rot: 3.141592653589793 rad + pos: 15.5,18.5 parent: 179 - - uid: 503 + - uid: 1016 components: - type: Transform - pos: -16.5,-5.5 + rot: -1.5707963267948966 rad + pos: 25.5,-9.5 parent: 179 - - uid: 504 + - uid: 1072 components: - type: Transform - pos: -16.5,-6.5 + pos: 15.5,28.5 parent: 179 - - uid: 505 + - uid: 1073 components: - type: Transform - pos: -16.5,-7.5 + pos: 16.5,28.5 parent: 179 - - uid: 506 + - uid: 1074 components: - type: Transform - pos: -16.5,-8.5 + pos: 17.5,28.5 parent: 179 - - uid: 507 + - uid: 1176 components: - type: Transform - pos: -15.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-10.5 parent: 179 - - uid: 508 + - uid: 1181 components: - type: Transform - pos: -14.5,-8.5 + pos: 5.5,28.5 parent: 179 - - uid: 509 + - uid: 1206 components: - type: Transform - pos: -13.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-12.5 parent: 179 - - uid: 510 + - uid: 1209 components: - type: Transform - pos: -12.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-8.5 parent: 179 - - uid: 511 + - uid: 1210 components: - type: Transform - pos: -11.5,-8.5 + rot: -1.5707963267948966 rad + pos: 25.5,-17.5 parent: 179 - - uid: 517 + - uid: 1211 components: - type: Transform - pos: 23.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-15.5 parent: 179 - - uid: 518 + - uid: 1212 components: - type: Transform - pos: 24.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-19.5 parent: 179 - - uid: 519 + - uid: 1213 components: - type: Transform - pos: 25.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-18.5 parent: 179 - - uid: 535 + - uid: 1214 components: - type: Transform - pos: -15.5,0.5 + rot: -1.5707963267948966 rad + pos: 25.5,-22.5 parent: 179 - - uid: 539 + - uid: 1215 components: - type: Transform - pos: 26.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-20.5 parent: 179 - - uid: 540 + - uid: 1216 components: - type: Transform - pos: 27.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-21.5 parent: 179 - - uid: 545 + - uid: 1217 components: - type: Transform - pos: 7.5,-4.5 + rot: -1.5707963267948966 rad + pos: 25.5,-13.5 parent: 179 - - uid: 546 + - uid: 1218 components: - type: Transform - pos: 8.5,-4.5 + rot: -1.5707963267948966 rad + pos: 25.5,-14.5 parent: 179 - - uid: 547 + - uid: 1219 components: - type: Transform - pos: 28.5,11.5 + rot: -1.5707963267948966 rad + pos: 25.5,-16.5 parent: 179 - - uid: 548 + - uid: 1226 components: - type: Transform - pos: 28.5,10.5 + pos: 6.5,-22.5 parent: 179 - - uid: 549 + - uid: 1228 components: - type: Transform - pos: 28.5,9.5 + pos: 6.5,-21.5 parent: 179 - - uid: 550 + - uid: 1229 components: - type: Transform - pos: 28.5,8.5 + rot: -1.5707963267948966 rad + pos: 6.5,-19.5 parent: 179 - - uid: 551 + - uid: 1231 components: - type: Transform - pos: 28.5,7.5 + rot: -1.5707963267948966 rad + pos: 6.5,-18.5 parent: 179 - - uid: 552 + - uid: 1263 components: - type: Transform - pos: 28.5,6.5 + pos: 6.5,-23.5 parent: 179 - - uid: 553 + - uid: 1272 components: - type: Transform - pos: 28.5,5.5 + pos: 6.5,-24.5 parent: 179 - - uid: 554 + - uid: 1294 components: - type: Transform - pos: 26.5,-2.5 + pos: 25.5,-24.5 parent: 179 - - uid: 555 + - uid: 1295 components: - type: Transform - pos: 26.5,-1.5 + pos: 25.5,-23.5 parent: 179 - - uid: 556 + - uid: 1303 components: - type: Transform - pos: 25.5,-0.5 + rot: 3.141592653589793 rad + pos: 14.5,-1.5 parent: 179 - - uid: 557 + - uid: 1304 components: - type: Transform - pos: 26.5,-0.5 + rot: 3.141592653589793 rad + pos: 14.5,-2.5 parent: 179 - - uid: 558 + - uid: 1305 components: - type: Transform - pos: 27.5,-0.5 + rot: 3.141592653589793 rad + pos: 14.5,-3.5 parent: 179 - - uid: 561 + - uid: 1306 components: - type: Transform - pos: -14.5,0.5 + rot: 3.141592653589793 rad + pos: 14.5,-4.5 parent: 179 - - uid: 585 + - uid: 1307 components: - type: Transform - pos: 9.5,10.5 + rot: 3.141592653589793 rad + pos: 14.5,-5.5 parent: 179 - - uid: 597 + - uid: 1328 components: - type: Transform - pos: 22.5,-0.5 + pos: 25.5,-25.5 parent: 179 - - uid: 598 + - uid: 1329 components: - type: Transform - pos: 17.5,-0.5 + pos: 24.5,-25.5 parent: 179 - - uid: 599 + - uid: 1330 components: - type: Transform - pos: 18.5,-0.5 + pos: 23.5,-25.5 parent: 179 - - uid: 600 + - uid: 1331 components: - type: Transform - pos: 20.5,-0.5 + pos: 22.5,-25.5 parent: 179 - - uid: 601 + - uid: 1332 components: - type: Transform - pos: 21.5,-0.5 + pos: 21.5,-25.5 parent: 179 - - uid: 602 + - uid: 1333 components: - type: Transform - pos: 19.5,-0.5 + pos: 20.5,-25.5 parent: 179 - - uid: 603 + - uid: 1334 components: - type: Transform - pos: 14.5,3.5 + pos: 19.5,-25.5 parent: 179 - - uid: 604 + - uid: 1337 components: - type: Transform - pos: 13.5,3.5 + pos: 16.5,-25.5 parent: 179 - - uid: 605 + - uid: 1338 components: - type: Transform - pos: 12.5,3.5 + pos: 15.5,-25.5 parent: 179 - - uid: 606 + - uid: 1339 components: - type: Transform - pos: 12.5,2.5 + pos: 14.5,-25.5 parent: 179 - - uid: 607 + - uid: 1340 components: - type: Transform - pos: 12.5,1.5 + pos: 12.5,-25.5 parent: 179 - - uid: 608 + - uid: 1341 components: - type: Transform - pos: 12.5,0.5 + pos: 11.5,-25.5 parent: 179 - - uid: 609 + - uid: 1342 components: - type: Transform - pos: 12.5,-0.5 + pos: 10.5,-25.5 parent: 179 - - uid: 610 + - uid: 1343 components: - type: Transform - pos: 13.5,-0.5 + pos: 9.5,-25.5 parent: 179 - - uid: 611 + - uid: 1344 components: - type: Transform - pos: 14.5,-0.5 + pos: 8.5,-25.5 parent: 179 - - uid: 612 + - uid: 1345 components: - type: Transform - pos: 13.5,-1.5 + pos: 7.5,-25.5 parent: 179 - - uid: 613 + - uid: 1346 components: - type: Transform - pos: 13.5,-6.5 + pos: 6.5,-25.5 parent: 179 - - uid: 614 + - uid: 1347 components: - type: Transform - pos: 13.5,-5.5 + pos: 13.5,-25.5 parent: 179 - - uid: 615 + - uid: 1506 components: - type: Transform - pos: 13.5,-4.5 + pos: 10.5,-12.5 parent: 179 - - uid: 616 + - uid: 1559 components: - type: Transform - pos: 13.5,-3.5 + pos: 8.5,-4.5 parent: 179 - - uid: 617 +- proto: WarningCO2 + entities: + - uid: 1300 components: - type: Transform - pos: 13.5,-2.5 + rot: -1.5707963267948966 rad + pos: 25.5,-21.5 parent: 179 - - uid: 618 +- proto: WarningN2 + entities: + - uid: 1208 components: - type: Transform - pos: 14.5,-6.5 + rot: -1.5707963267948966 rad + pos: 25.5,-9.5 parent: 179 - - uid: 619 +- proto: WarningN2O + entities: + - uid: 1296 components: - type: Transform - pos: 15.5,-6.5 + rot: -1.5707963267948966 rad + pos: 25.5,-17.5 parent: 179 - - uid: 620 +- proto: WarningO2 + entities: + - uid: 1227 components: - type: Transform - pos: 16.5,-6.5 + rot: -1.5707963267948966 rad + pos: 25.5,-7.5 parent: 179 - - uid: 621 +- proto: WaterTankFull + entities: + - uid: 115 components: - type: Transform - pos: 17.5,-6.5 + pos: 4.5,18.5 parent: 179 - - uid: 622 + - uid: 694 components: - type: Transform - pos: 18.5,-6.5 + pos: -2.5,3.5 parent: 179 - - uid: 623 +- proto: WaterVaporCanister + entities: + - uid: 97 components: - type: Transform - pos: 19.5,-6.5 + pos: 12.5,-1.5 parent: 179 - - uid: 624 + - uid: 319 components: - type: Transform - pos: 20.5,-6.5 + pos: 13.5,-1.5 parent: 179 - - uid: 625 + - uid: 1313 components: - type: Transform - pos: 21.5,-6.5 + pos: 24.5,-23.5 parent: 179 - - uid: 626 +- proto: WeaponCapacitorRecharger + entities: + - uid: 708 components: - type: Transform - pos: 22.5,-6.5 + pos: -0.5,-3.5 parent: 179 - - uid: 627 +- proto: WeaponLaserCarbine + entities: + - uid: 188 components: - type: Transform - pos: 23.5,-6.5 + pos: -3.5226438,-0.45543313 parent: 179 - - uid: 628 +- proto: WeaponLauncherMultipleRocket + entities: + - uid: 671 components: - type: Transform - pos: 24.5,-6.5 + pos: -13.195735,9.730438 parent: 179 - - uid: 629 +- proto: WeaponLauncherRocket + entities: + - uid: 436 components: - type: Transform - pos: 25.5,-6.5 + pos: -3.478273,-1.1611286 parent: 179 - - uid: 630 +- proto: WeaponRifleAk + entities: + - uid: 437 components: - type: Transform - pos: 26.5,-6.5 + pos: -3.5018106,0.24183923 parent: 179 - - uid: 631 + - uid: 949 components: - type: Transform - pos: 26.5,-5.5 + pos: -12.238617,9.081488 parent: 179 - - uid: 632 +- proto: WelderExperimental + entities: + - uid: 343 components: - type: Transform - pos: 26.5,-4.5 + pos: 0.6895334,4.7183027 parent: 179 - - uid: 633 +- proto: WeldingFuelTankFull + entities: + - uid: 693 components: - type: Transform - pos: 27.5,-6.5 + pos: -1.5,3.5 parent: 179 - - uid: 634 +- proto: Window + entities: + - uid: 111 components: - type: Transform - pos: 28.5,-6.5 + pos: -0.5,-15.5 parent: 179 - - uid: 635 + - uid: 194 components: - type: Transform - pos: 29.5,-6.5 + pos: -0.5,-16.5 parent: 179 - - uid: 636 + - uid: 230 components: - type: Transform - pos: 30.5,-6.5 + pos: -0.5,-14.5 parent: 179 - - uid: 637 + - uid: 1001 components: - type: Transform - pos: 31.5,-6.5 + pos: -3.5,-16.5 parent: 179 - - uid: 638 + - uid: 1002 components: - type: Transform - pos: 32.5,-6.5 + pos: -3.5,-15.5 parent: 179 - - uid: 639 + - uid: 1003 components: - type: Transform - pos: 33.5,-6.5 + pos: -3.5,-14.5 parent: 179 - - uid: 640 + - uid: 1004 components: - type: Transform - pos: 34.5,-6.5 + pos: 2.5,-16.5 parent: 179 - - uid: 641 + - uid: 1005 components: - type: Transform - pos: 34.5,-5.5 + pos: 2.5,-15.5 parent: 179 - - uid: 642 + - uid: 1006 components: - type: Transform - pos: 34.5,-4.5 + pos: 2.5,-14.5 parent: 179 - - uid: 643 +- proto: WindowReinforcedDirectional + entities: + - uid: 340 components: - type: Transform - pos: 34.5,-3.5 + rot: 1.5707963267948966 rad + pos: 21.5,-7.5 parent: 179 - - uid: 644 + - uid: 345 components: - type: Transform - pos: 34.5,-2.5 + rot: 3.141592653589793 rad + pos: 24.5,-8.5 parent: 179 - - uid: 645 + - uid: 347 components: - type: Transform - pos: 34.5,-1.5 + pos: 24.5,-22.5 parent: 179 - - uid: 646 + - uid: 348 components: - type: Transform - pos: 34.5,-0.5 + rot: 3.141592653589793 rad + pos: 23.5,-8.5 parent: 179 - - uid: 647 + - uid: 1236 components: - type: Transform - pos: 33.5,-0.5 + pos: 23.5,-8.5 parent: 179 - - uid: 648 + - uid: 1237 components: - type: Transform - pos: 32.5,-0.5 + pos: 24.5,-8.5 parent: 179 - - uid: 649 + - uid: 1239 components: - type: Transform - pos: 31.5,-0.5 + rot: 3.141592653589793 rad + pos: 23.5,-10.5 parent: 179 - - uid: 650 + - uid: 1240 components: - type: Transform - pos: 30.5,-0.5 + rot: 3.141592653589793 rad + pos: 24.5,-10.5 parent: 179 - - uid: 651 + - uid: 1241 components: - type: Transform - pos: 29.5,-0.5 + rot: 1.5707963267948966 rad + pos: 21.5,-9.5 parent: 179 - - uid: 652 + - uid: 1242 components: - type: Transform - pos: 30.5,0.5 + rot: 1.5707963267948966 rad + pos: 21.5,-11.5 parent: 179 - - uid: 653 + - uid: 1243 components: - type: Transform - pos: 30.5,1.5 + rot: 1.5707963267948966 rad + pos: 21.5,-13.5 parent: 179 - - uid: 654 + - uid: 1244 components: - type: Transform - pos: 30.5,2.5 + rot: 1.5707963267948966 rad + pos: 21.5,-15.5 parent: 179 - - uid: 655 + - uid: 1245 components: - type: Transform - pos: 30.5,3.5 + rot: 1.5707963267948966 rad + pos: 21.5,-17.5 parent: 179 - - uid: 656 + - uid: 1246 components: - type: Transform - pos: 30.5,4.5 + rot: 1.5707963267948966 rad + pos: 21.5,-19.5 parent: 179 - - uid: 657 + - uid: 1247 components: - type: Transform - pos: 29.5,4.5 + rot: 3.141592653589793 rad + pos: 23.5,-22.5 parent: 179 - - uid: 658 + - uid: 1248 components: - type: Transform - pos: 28.5,4.5 + rot: 1.5707963267948966 rad + pos: 21.5,-21.5 parent: 179 - - uid: 659 + - uid: 1249 components: - type: Transform - pos: 27.5,4.5 + pos: 23.5,-10.5 parent: 179 - - uid: 702 + - uid: 1250 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,6.5 + pos: 24.5,-10.5 parent: 179 - - uid: 713 + - uid: 1251 components: - type: Transform - pos: -7.5,9.5 + pos: 24.5,-12.5 parent: 179 - - uid: 714 + - uid: 1252 components: - type: Transform - pos: -7.5,10.5 + pos: 24.5,-14.5 parent: 179 - - uid: 724 + - uid: 1253 components: - type: Transform - pos: -2.5,12.5 + pos: 24.5,-16.5 parent: 179 - - uid: 733 + - uid: 1254 components: - type: Transform - pos: 4.5,5.5 + pos: 24.5,-18.5 parent: 179 - - uid: 734 + - uid: 1255 components: - type: Transform - pos: 4.5,4.5 + pos: 24.5,-20.5 parent: 179 - - uid: 739 + - uid: 1256 components: - type: Transform - pos: 8.5,7.5 + pos: 23.5,-20.5 parent: 179 - - uid: 740 + - uid: 1257 components: - type: Transform - pos: 8.5,6.5 + pos: 23.5,-18.5 parent: 179 - - uid: 741 + - uid: 1259 components: - type: Transform - pos: 8.5,5.5 + rot: 3.141592653589793 rad + pos: 23.5,-24.5 parent: 179 - - uid: 742 + - uid: 1261 components: - type: Transform - pos: 8.5,4.5 + pos: 23.5,-16.5 parent: 179 - - uid: 743 + - uid: 1262 components: - type: Transform - pos: 8.5,3.5 + pos: 23.5,-14.5 parent: 179 - - uid: 745 + - uid: 1264 components: - type: Transform - pos: 4.5,7.5 + rot: 3.141592653589793 rad + pos: 24.5,-22.5 parent: 179 - - uid: 746 + - uid: 1265 components: - type: Transform - pos: 4.5,6.5 + pos: 23.5,-12.5 parent: 179 - - uid: 846 + - uid: 1266 components: - type: Transform - pos: 2.5,19.5 + pos: 23.5,-22.5 parent: 179 - - uid: 847 + - uid: 1267 components: - type: Transform - pos: 3.5,19.5 + rot: 3.141592653589793 rad + pos: 23.5,-12.5 parent: 179 - - uid: 925 + - uid: 1268 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,17.5 + rot: 3.141592653589793 rad + pos: 24.5,-12.5 parent: 179 - - uid: 958 + - uid: 1269 components: - type: Transform rot: 3.141592653589793 rad - pos: 15.5,18.5 + pos: 24.5,-14.5 parent: 179 - - uid: 1072 + - uid: 1270 components: - type: Transform - pos: 15.5,28.5 + rot: 3.141592653589793 rad + pos: 23.5,-14.5 parent: 179 - - uid: 1073 + - uid: 1271 components: - type: Transform - pos: 16.5,28.5 + rot: 1.5707963267948966 rad + pos: 21.5,-23.5 parent: 179 - - uid: 1074 + - uid: 1273 components: - type: Transform - pos: 17.5,28.5 + rot: 3.141592653589793 rad + pos: 23.5,-16.5 parent: 179 - - uid: 1181 + - uid: 1274 components: - type: Transform - pos: 5.5,28.5 + rot: 3.141592653589793 rad + pos: 24.5,-16.5 parent: 179 -- proto: WaterTankFull - entities: - - uid: 115 + - uid: 1275 components: - type: Transform - pos: 4.5,18.5 + rot: 3.141592653589793 rad + pos: 24.5,-18.5 parent: 179 - - uid: 694 + - uid: 1276 components: - type: Transform - pos: -2.5,3.5 + rot: 3.141592653589793 rad + pos: 23.5,-18.5 parent: 179 -- proto: WeaponCapacitorRecharger - entities: - - uid: 708 + - uid: 1279 components: - type: Transform - pos: -0.5,-3.5 + rot: 3.141592653589793 rad + pos: 23.5,-20.5 parent: 179 -- proto: WeaponLaserCarbine - entities: - - uid: 188 + - uid: 1280 components: - type: Transform - pos: -3.5226438,-0.45543313 + rot: 3.141592653589793 rad + pos: 24.5,-20.5 parent: 179 -- proto: WeaponLauncherMultipleRocket - entities: - - uid: 671 + - uid: 1283 components: - type: Transform - pos: -13.195735,9.730438 + rot: 3.141592653589793 rad + pos: 24.5,-24.5 parent: 179 -- proto: WeaponLauncherRocket - entities: - - uid: 436 + - uid: 1386 components: - type: Transform - pos: -3.478273,-1.1611286 + rot: 1.5707963267948966 rad + pos: 11.5,-15.5 parent: 179 -- proto: WeaponRifleAk - entities: - - uid: 437 + - uid: 1387 components: - type: Transform - pos: -3.5018106,0.24183923 + rot: 1.5707963267948966 rad + pos: 11.5,-13.5 parent: 179 - - uid: 949 + - uid: 1388 components: - type: Transform - pos: -12.238617,9.081488 + pos: 12.5,-12.5 parent: 179 -- proto: WelderExperimental - entities: - - uid: 343 + - uid: 1490 components: - type: Transform - pos: 0.6895334,4.7183027 + rot: -1.5707963267948966 rad + pos: 15.5,-15.5 parent: 179 -- proto: WeldingFuelTankFull - entities: - - uid: 693 + - uid: 1491 components: - type: Transform - pos: -1.5,3.5 + rot: 1.5707963267948966 rad + pos: 9.5,-14.5 parent: 179 -- proto: Window - entities: - - uid: 111 + - uid: 1492 components: - type: Transform - pos: -0.5,-15.5 + rot: 3.141592653589793 rad + pos: 11.5,-16.5 parent: 179 - - uid: 194 + - uid: 1494 components: - type: Transform - pos: -0.5,-16.5 + rot: -1.5707963267948966 rad + pos: 15.5,-13.5 parent: 179 - - uid: 230 + - uid: 1495 components: - type: Transform - pos: -0.5,-14.5 + rot: 3.141592653589793 rad + pos: 10.5,-16.5 parent: 179 - - uid: 1001 + - uid: 1496 components: - type: Transform - pos: -3.5,-16.5 + pos: 11.5,-12.5 parent: 179 - - uid: 1002 + - uid: 1497 components: - type: Transform - pos: -3.5,-15.5 + rot: 3.141592653589793 rad + pos: 14.5,-16.5 parent: 179 - - uid: 1003 + - uid: 1498 components: - type: Transform - pos: -3.5,-14.5 + rot: 1.5707963267948966 rad + pos: 9.5,-15.5 parent: 179 - - uid: 1004 + - uid: 1501 components: - type: Transform - pos: 2.5,-16.5 + rot: 3.141592653589793 rad + pos: 12.5,-16.5 parent: 179 - - uid: 1005 + - uid: 1505 components: - type: Transform - pos: 2.5,-15.5 + rot: 1.5707963267948966 rad + pos: 9.5,-13.5 parent: 179 - - uid: 1006 + - uid: 1562 components: - type: Transform - pos: 2.5,-14.5 + pos: 14.5,-12.5 parent: 179 - proto: Wirecutter entities: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 71e171fc50d6..5562715fdb21 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml @@ -113,6 +113,14 @@ - type: GasMiner spawnGas: Tritium +- type: entity + name: frezon gas miner + parent: GasMinerBase + id: GasMinerFrezon + components: + - type: GasMiner + spawnGas: Frezon + - type: entity name: water vapor gas miner parent: GasMinerBase From 97ef4637fdd109a41588b88a920c889e28ed3947 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Fri, 25 Oct 2024 21:00:49 -0700 Subject: [PATCH 08/44] bowls now make drinking sounds (#32819) --- .../Entities/Objects/Consumable/Food/Containers/bowl.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml index 40cb141af783..ffccf07ab64a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml @@ -21,6 +21,10 @@ visible: false - type: MixableSolution solution: food + - type: Drink + solution: food + useSound: + path: /Audio/Items/drink.ogg - type: DamageOnLand damage: types: From dcb615d6788b9e962ee2ac41caaeacae2a2c6611 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 26 Oct 2024 04:01:56 +0000 Subject: [PATCH 09/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index af594308d3ce..69b0dadb895b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ShadowCommander - changes: - - message: Rollerbeds can now be dragged to the player to fold and pick them up. - type: Add - id: 7054 - time: '2024-08-07T09:19:10.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30002 - author: Errant changes: - message: Survivors arriving via the Unknown Shuttle event, ERT and CBURN agents, @@ -3961,3 +3954,10 @@ id: 7553 time: '2024-10-26T02:16:45.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32942 +- author: Moomoobeef + changes: + - message: Bowls no longer make an eating sound when drinking from them. + type: Fix + id: 7554 + time: '2024-10-26T04:00:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32819 From a95c8baf28f34ff34d65b6145b47d0cc88662b67 Mon Sep 17 00:00:00 2001 From: Saphire Lattice Date: Sun, 27 Oct 2024 00:22:08 +0700 Subject: [PATCH 10/44] Add health analyzer unrevivability warning (#32636) * Add health analyzer unrevivability warning * Remove errornous comment --- .../UI/HealthAnalyzerWindow.xaml | 3 +-- .../UI/HealthAnalyzerWindow.xaml.cs | 25 +++++++++++++------ Content.Server/Medical/CryoPodSystem.cs | 1 + .../Medical/HealthAnalyzerSystem.cs | 8 +++++- .../HealthAnalyzerScannedUserMessage.cs | 4 ++- .../components/health-analyzer-component.ftl | 3 ++- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml index 19d00a0bbf8b..aae8785b1fe1 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml @@ -47,8 +47,7 @@ - + diff --git a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs index d61267d002c6..fd3615d59f58 100644 --- a/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs +++ b/Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs @@ -110,18 +110,29 @@ public void Populate(HealthAnalyzerScannedUserMessage msg) // Alerts - AlertsDivider.Visible = msg.Bleeding == true; - AlertsContainer.Visible = msg.Bleeding == true; + var showAlerts = msg.Unrevivable == true || msg.Bleeding == true; - if (msg.Bleeding == true) - { + AlertsDivider.Visible = showAlerts; + AlertsContainer.Visible = showAlerts; + + if (showAlerts) AlertsContainer.DisposeAllChildren(); - AlertsContainer.AddChild(new Label + + if (msg.Unrevivable == true) + AlertsContainer.AddChild(new RichTextLabel + { + Text = Loc.GetString("health-analyzer-window-entity-unrevivable-text"), + Margin = new Thickness(0, 4), + MaxWidth = 300 + }); + + if (msg.Bleeding == true) + AlertsContainer.AddChild(new RichTextLabel { Text = Loc.GetString("health-analyzer-window-entity-bleeding-text"), - FontColorOverride = Color.Red, + Margin = new Thickness(0, 4), + MaxWidth = 300 }); - } // Damage Groups diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs index fc9ab081d266..15fe2a69cf97 100644 --- a/Content.Server/Medical/CryoPodSystem.cs +++ b/Content.Server/Medical/CryoPodSystem.cs @@ -201,6 +201,7 @@ private void OnActivateUI(Entity entity, ref AfterActivatableU ? bloodSolution.FillFraction : 0, null, + null, null )); } diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs index 60a492a755fe..90646725bb7a 100644 --- a/Content.Server/Medical/HealthAnalyzerSystem.cs +++ b/Content.Server/Medical/HealthAnalyzerSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Medical.Components; using Content.Server.PowerCell; using Content.Server.Temperature.Components; +using Content.Server.Traits.Assorted; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Damage; using Content.Shared.DoAfter; @@ -196,6 +197,7 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s var bloodAmount = float.NaN; var bleeding = false; + var unrevivable = false; if (TryComp(target, out var bloodstream) && _solutionContainerSystem.ResolveSolution(target, bloodstream.BloodSolutionName, @@ -205,12 +207,16 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s bleeding = bloodstream.BleedAmount > 0; } + if (HasComp(target)) + unrevivable = true; + _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage( GetNetEntity(target), bodyTemperature, bloodAmount, scanMode, - bleeding + bleeding, + unrevivable )); } } diff --git a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs index 78f26ed5c02f..08af1a36a7b9 100644 --- a/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs +++ b/Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs @@ -13,14 +13,16 @@ public sealed class HealthAnalyzerScannedUserMessage : BoundUserInterfaceMessage public float BloodLevel; public bool? ScanMode; public bool? Bleeding; + public bool? Unrevivable; - public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding) + public HealthAnalyzerScannedUserMessage(NetEntity? targetEntity, float temperature, float bloodLevel, bool? scanMode, bool? bleeding, bool? unrevivable) { TargetEntity = targetEntity; Temperature = temperature; BloodLevel = bloodLevel; ScanMode = scanMode; Bleeding = bleeding; + Unrevivable = unrevivable; } } diff --git a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl index fe1f92e91406..eb79358ecc25 100644 --- a/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl +++ b/Resources/Locale/en-US/medical/components/health-analyzer-component.ftl @@ -15,7 +15,8 @@ health-analyzer-window-entity-damage-total-text = Total Damage: health-analyzer-window-damage-group-text = {$damageGroup}: {$amount} health-analyzer-window-damage-type-text = {$damageType}: {$amount} -health-analyzer-window-entity-bleeding-text = Patient is bleeding! +health-analyzer-window-entity-unrevivable-text = [color=red]Unique body composition detected! Patient can not be resuscitated by normal means![/color] +health-analyzer-window-entity-bleeding-text = [color=red]Patient is bleeding![/color] health-analyzer-window-scan-mode-text = Scan Mode: health-analyzer-window-scan-mode-active = Active From 427817e23793b1d58d4dd0d4316d532a65f2ae96 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 26 Oct 2024 17:23:15 +0000 Subject: [PATCH 11/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 69b0dadb895b..0c13b61dd854 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,15 +1,4 @@ Entries: -- author: Errant - changes: - - message: Survivors arriving via the Unknown Shuttle event, ERT and CBURN agents, - and Death Squad members are now equipped with the appropriate species-specific - survival gear. - type: Fix - - message: Unknown Shuttle event can once again spawn vox characters. - type: Tweak - id: 7055 - time: '2024-08-07T09:26:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29746 - author: IProduceWidgets changes: - message: butter is slippery @@ -3961,3 +3950,10 @@ id: 7554 time: '2024-10-26T04:00:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32819 +- author: SaphireLattice + changes: + - message: Added a warning about unrevivability in the health analyzer UI. + type: Add + id: 7555 + time: '2024-10-26T17:22:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32636 From 9d6e6257bd29c0041ee689d1a68af33d1fac2da4 Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Sat, 26 Oct 2024 10:29:40 -0700 Subject: [PATCH 12/44] Removed the name "Hujsak" (#32998) removed hujsak --- Resources/Prototypes/Datasets/Names/last.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Datasets/Names/last.yml b/Resources/Prototypes/Datasets/Names/last.yml index 8cc544afd678..2f952f957a01 100644 --- a/Resources/Prototypes/Datasets/Names/last.yml +++ b/Resources/Prototypes/Datasets/Names/last.yml @@ -219,7 +219,6 @@ - Howe - Huey - Hughes - - Hujsak - Hunt - Hunter - Hussain From 6486cdf183a70aba86eaf28837b51a99570aeafd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 15:24:45 +1100 Subject: [PATCH 13/44] Update Credits (#33016) Co-authored-by: PJBot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index e00d7c78a606..ac39b6b7f55a 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, Afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhenrich, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, irismessage, ItsMeThom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, Magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, Sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, TyAshley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zylofan, Zymem, zzylex +0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, Afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhenrich, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, Catofquestionableethics, CatTheSystem, Centronias, chairbender, Charlese2, charlie, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, cutemoongod, Cyberboss, d34d10cc, d4kii, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluffMe, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, gamer3107, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, gradientvera, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, hyphenationc, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, JerryImMouse, jerryimmouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, Jophire, joshepvodka, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, kosticia, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, LittleNorthStar, LittleNyanCat, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, Magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, MilonPL, Minemoder5000, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, muburu, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, noelkathegod, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, paolordls, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, pheenty, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, Sadie-silly, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, Sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scrivoy, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, southbridge-fur, Soydium, SpaceLizardSky, SpaceManiac, SpaceyLady, Spanky, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, sporkyz, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stomf, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, teamaki, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, Toly65, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, TyAshley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zylofan, Zymem, zzylex From 4252fdffb91050e375ac197067f7dcde09e7b168 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sun, 27 Oct 2024 05:25:54 +0100 Subject: [PATCH 14/44] fix pie throwing sound not playing (#33017) --- Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs index a38e3636035b..2ff94760f6bf 100644 --- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs @@ -41,7 +41,9 @@ public override void Initialize() protected override void SplattedCreamPie(EntityUid uid, CreamPieComponent creamPie) { - _audio.PlayPvs(_audio.GetSound(creamPie.Sound), uid, AudioParams.Default.WithVariation(0.125f)); + // The entity is deleted, so play the sound at its position rather than parenting + var coordinates = Transform(uid).Coordinates; + _audio.PlayPvs(_audio.GetSound(creamPie.Sound), coordinates, AudioParams.Default.WithVariation(0.125f)); if (EntityManager.TryGetComponent(uid, out FoodComponent? foodComp)) { From a1c36dcb792e9209e89bc5f324394779f88f5d6a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 27 Oct 2024 04:27:02 +0000 Subject: [PATCH 15/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0c13b61dd854..18c2dc965779 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: IProduceWidgets - changes: - - message: butter is slippery - type: Tweak - id: 7056 - time: '2024-08-07T21:47:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29772 - author: Mervill changes: - message: Gas Miners now have detailed examine text @@ -3957,3 +3950,10 @@ id: 7555 time: '2024-10-26T17:22:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32636 +- author: slarticodefast + changes: + - message: Fixed pie throwing sound not playing. + type: Fix + id: 7556 + time: '2024-10-27T04:25:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33017 From 7e526da5219f56d785007a24c382bb87905f5604 Mon Sep 17 00:00:00 2001 From: Vasilis Date: Mon, 28 Oct 2024 00:35:23 +0100 Subject: [PATCH 16/44] Fix Bug With Uppercase Radio Keys (#32997) (master) (#33031) Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com> --- Content.Shared/Chat/SharedChatSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index 84b0e2266ec8..e5f3d4699747 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -106,7 +106,7 @@ public void GetRadioKeycodePrefix(EntityUid source, if (!(input.StartsWith(RadioChannelPrefix) || input.StartsWith(RadioChannelAltPrefix))) return; - if (!_keyCodes.TryGetValue(input[1], out _)) + if (!_keyCodes.TryGetValue(char.ToLower(input[1]), out _)) return; prefix = input[..2]; From 08d007771946c13fe5c0607347b07d222db00232 Mon Sep 17 00:00:00 2001 From: FluffMe <1780586+FluffMe@users.noreply.github.com> Date: Mon, 28 Oct 2024 11:52:49 +0100 Subject: [PATCH 17/44] Fix TestSuicideByHeldItem and TestSuicideByHeldItemSpreadDamage (#33030) --- .../Tests/Commands/SuicideCommandTests.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs index e1eef2be4a9d..cf88f3aacd30 100644 --- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -168,7 +168,7 @@ await server.WaitAssertion(() => await pair.CleanReturnAsync(); } - /// + /// /// Run the suicide command in the console /// Should only ghost the player but not kill them /// @@ -241,6 +241,7 @@ public async Task TestSuicideByHeldItem() var mindSystem = entManager.System(); var mobStateSystem = entManager.System(); var transformSystem = entManager.System(); + var damageableSystem = entManager.System(); // We need to know the player and whether they can be hurt, killed, and whether they have a mind var player = playerMan.Sessions.First().AttachedEntity!.Value; @@ -276,6 +277,8 @@ await server.WaitPost(() => // and that all the damage is concentrated in the Slash category await server.WaitAssertion(() => { + // Heal all damage first (possible low pressure damage taken) + damageableSystem.SetAllDamage(player, damageableComp, 0); consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); @@ -313,6 +316,7 @@ public async Task TestSuicideByHeldItemSpreadDamage() var mindSystem = entManager.System(); var mobStateSystem = entManager.System(); var transformSystem = entManager.System(); + var damageableSystem = entManager.System(); // We need to know the player and whether they can be hurt, killed, and whether they have a mind var player = playerMan.Sessions.First().AttachedEntity!.Value; @@ -348,6 +352,8 @@ await server.WaitPost(() => // and that slash damage is split in half await server.WaitAssertion(() => { + // Heal all damage first (possible low pressure damage taken) + damageableSystem.SetAllDamage(player, damageableComp, 0); consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); From ee445c49389a273e816b0e08c4ffdcf398b965df Mon Sep 17 00:00:00 2001 From: Theodore Lukin <66275205+pheenty@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:36:35 +0700 Subject: [PATCH 18/44] make ai speak robotically (#33025) --- Resources/Prototypes/Entities/Mobs/Player/silicon.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 9f7e206c249e..7391e5709f31 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -70,6 +70,8 @@ canShuttle: false title: comms-console-announcement-title-station-ai color: "#2ed2fd" + - type: Speech + speechVerb: Robotic - type: entity id: AiHeldIntellicard From 24f79c3ecc6dca77e6096e760be1b4c6e2c0bf5a Mon Sep 17 00:00:00 2001 From: Stalen <33173619+stalengd@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:00:00 +0300 Subject: [PATCH 19/44] Fix playtime formatting (#32974) --- .../Info/PlaytimeStats/PlaytimeStatsEntry.cs | 3 ++- .../Info/PlaytimeStats/PlaytimeStatsWindow.cs | 3 +-- .../ContentLocalizationManager.cs | 21 +++++++++++++++++++ .../DepartmentTimeRequirement.cs | 3 ++- .../OverallPlaytimeRequirement.cs | 3 ++- .../JobRequirement/RoleTimeRequirement.cs | 3 ++- Resources/Locale/en-US/_lib.ftl | 3 +++ .../Locale/en-US/info/playtime-stats.ftl | 3 +-- .../Locale/en-US/job/role-requirements.ftl | 1 - 9 files changed, 34 insertions(+), 9 deletions(-) diff --git a/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.cs b/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.cs index 16e8f55a7e27..632ad8de4ac6 100644 --- a/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.cs +++ b/Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.cs @@ -1,3 +1,4 @@ +using Content.Shared.Localizations; using Robust.Client.AutoGenerated; using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; @@ -16,7 +17,7 @@ public PlaytimeStatsEntry(string role, TimeSpan playtime, StyleBox styleBox) RoleLabel.Text = role; Playtime = playtime; // store the TimeSpan value directly - PlaytimeLabel.Text = playtime.ToString(Loc.GetString("ui-playtime-time-format")); // convert to string for display + PlaytimeLabel.Text = ContentLocalizationManager.FormatPlaytime(playtime); // convert to string for display BackgroundColorPanel.PanelOverride = styleBox; } diff --git a/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs b/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs index 1a530d950f98..98241b2ccab3 100644 --- a/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs +++ b/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs @@ -104,8 +104,7 @@ private void PopulatePlaytimeData() { var overallPlaytime = _jobRequirementsManager.FetchOverallPlaytime(); - var formattedPlaytime = overallPlaytime.ToString(Loc.GetString("ui-playtime-time-format")); - OverallPlaytimeLabel.Text = Loc.GetString("ui-playtime-overall", ("time", formattedPlaytime)); + OverallPlaytimeLabel.Text = Loc.GetString("ui-playtime-overall", ("time", overallPlaytime)); var rolePlaytimes = _jobRequirementsManager.FetchPlaytimeByRoles(); diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index ad8890ae0fdb..e60ca74a37fa 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -36,6 +36,7 @@ public void Initialize() _loc.AddFunction(culture, "LOC", FormatLoc); _loc.AddFunction(culture, "NATURALFIXED", FormatNaturalFixed); _loc.AddFunction(culture, "NATURALPERCENT", FormatNaturalPercent); + _loc.AddFunction(culture, "PLAYTIME", FormatPlaytime); /* @@ -141,6 +142,16 @@ public static string FormatDirection(Direction dir) return Loc.GetString($"zzzz-fmt-direction-{dir.ToString()}"); } + /// + /// Formats playtime as hours and minutes. + /// + public static string FormatPlaytime(TimeSpan time) + { + var hours = (int)time.TotalHours; + var minutes = time.Minutes; + return Loc.GetString($"zzzz-fmt-playtime", ("hours", hours), ("minutes", minutes)); + } + private static ILocValue FormatLoc(LocArgs args) { var id = ((LocValueString) args.Args[0]).Value; @@ -229,5 +240,15 @@ private static ILocValue FormatUnits(LocArgs args) return new LocValueString(res); } + + private static ILocValue FormatPlaytime(LocArgs args) + { + var time = TimeSpan.Zero; + if (args.Args is { Count: > 0 } && args.Args[0].Value is TimeSpan timeArg) + { + time = timeArg; + } + return new LocValueString(FormatPlaytime(time)); + } } } diff --git a/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs index 78c6bd251779..8c8629921031 100644 --- a/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs +++ b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs @@ -1,4 +1,5 @@ using System.Diagnostics.CodeAnalysis; +using Content.Shared.Localizations; using Content.Shared.Preferences; using JetBrains.Annotations; using Robust.Shared.Prototypes; @@ -49,7 +50,7 @@ public override bool Check(IEntityManager entManager, var deptDiffSpan = Time - playtime; var deptDiff = deptDiffSpan.TotalMinutes; - var formattedDeptDiff = deptDiffSpan.ToString(Loc.GetString("role-timer-time-format")); + var formattedDeptDiff = ContentLocalizationManager.FormatPlaytime(deptDiffSpan); var nameDepartment = "role-timer-department-unknown"; if (protoManager.TryIndex(Department, out var departmentIndexed)) diff --git a/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs index ed985cadfba0..67b3938e1a71 100644 --- a/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs +++ b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs @@ -1,4 +1,5 @@ using System.Diagnostics.CodeAnalysis; +using Content.Shared.Localizations; using Content.Shared.Players.PlayTimeTracking; using Content.Shared.Preferences; using JetBrains.Annotations; @@ -27,7 +28,7 @@ public override bool Check(IEntityManager entManager, var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall); var overallDiffSpan = Time - overallTime; var overallDiff = overallDiffSpan.TotalMinutes; - var formattedOverallDiff = overallDiffSpan.ToString(Loc.GetString("role-timer-time-format")); + var formattedOverallDiff = ContentLocalizationManager.FormatPlaytime(overallDiffSpan); if (!Inverted) { diff --git a/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs index 23498ab91ad2..e75a18f011da 100644 --- a/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs +++ b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs @@ -1,4 +1,5 @@ using System.Diagnostics.CodeAnalysis; +using Content.Shared.Localizations; using Content.Shared.Players.PlayTimeTracking; using Content.Shared.Preferences; using Content.Shared.Roles.Jobs; @@ -36,7 +37,7 @@ public override bool Check(IEntityManager entManager, playTimes.TryGetValue(proto, out var roleTime); var roleDiffSpan = Time - roleTime; var roleDiff = roleDiffSpan.TotalMinutes; - var formattedRoleDiff = roleDiffSpan.ToString(Loc.GetString("role-timer-time-format")); + var formattedRoleDiff = ContentLocalizationManager.FormatPlaytime(roleDiffSpan); var departmentColor = Color.Yellow; if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem)) diff --git a/Resources/Locale/en-US/_lib.ftl b/Resources/Locale/en-US/_lib.ftl index c901d0f461e6..5c6f73af66fa 100644 --- a/Resources/Locale/en-US/_lib.ftl +++ b/Resources/Locale/en-US/_lib.ftl @@ -31,3 +31,6 @@ zzzz-fmt-power-joules = { TOSTRING($divided, "F1") } { $places -> [4] TJ *[5] ??? } + +# Used internally by the PLAYTIME() function. +zzzz-fmt-playtime = {$hours}H {$minutes}M \ No newline at end of file diff --git a/Resources/Locale/en-US/info/playtime-stats.ftl b/Resources/Locale/en-US/info/playtime-stats.ftl index 85508c1d09cd..b4925176a766 100644 --- a/Resources/Locale/en-US/info/playtime-stats.ftl +++ b/Resources/Locale/en-US/info/playtime-stats.ftl @@ -2,9 +2,8 @@ ui-playtime-stats-title = User Playtime Stats ui-playtime-overall-base = Overall Playtime: -ui-playtime-overall = Overall Playtime: {$time} +ui-playtime-overall = Overall Playtime: {PLAYTIME($time)} ui-playtime-first-time = First Time Playing ui-playtime-roles = Playtime per Role -ui-playtime-time-format = %h\H\ %m\M ui-playtime-header-role-type = Role ui-playtime-header-role-time = Time diff --git a/Resources/Locale/en-US/job/role-requirements.ftl b/Resources/Locale/en-US/job/role-requirements.ftl index 79a216fccaf4..686fcb93cb12 100644 --- a/Resources/Locale/en-US/job/role-requirements.ftl +++ b/Resources/Locale/en-US/job/role-requirements.ftl @@ -4,7 +4,6 @@ role-timer-overall-insufficient = You require [color=yellow]{$time}[/color] more role-timer-overall-too-high = You require [color=yellow]{$time}[/color] less overall playtime to play this role. (Are you trying to play a trainee role?) role-timer-role-insufficient = You require [color=yellow]{$time}[/color] more playtime with [color={$departmentColor}]{$job}[/color] to play this role. role-timer-role-too-high = You require[color=yellow] {$time}[/color] less playtime with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?) -role-timer-time-format = %h\H\ %m\M role-timer-age-too-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role. role-timer-age-too-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role. role-timer-whitelisted-species = Your character must be one of the following species to play this role: From f86798792b9c5943b7e3840863a7bc80708137a3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 28 Oct 2024 18:01:10 +0000 Subject: [PATCH 20/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 18c2dc965779..f1a923f0c6ff 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Mervill - changes: - - message: Gas Miners now have detailed examine text - type: Tweak - id: 7057 - time: '2024-08-08T02:14:31.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30480 - author: BackeTako changes: - message: "!, \u203D and multiple punctuations now work for Spanish." @@ -3957,3 +3950,11 @@ id: 7556 time: '2024-10-27T04:25:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33017 +- author: stalengd + changes: + - message: Fixed playtime labels not being able to correctly display time greater + than 24 hours + type: Fix + id: 7557 + time: '2024-10-28T18:00:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32974 From 67332502c1e336366bb14b9391527780271edfa3 Mon Sep 17 00:00:00 2001 From: August Sun <45527070+august-sun@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:25:33 -0600 Subject: [PATCH 21/44] Extends the minimum round time for meteor swarm events (#32876) * adjusted minimum timers in meteorswarms.yml * Updated timer minimum from 20 to 15 minutes * Reduced minimum timer to 10 minutes as a result of other meteor changes --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> --- Resources/Prototypes/GameRules/meteorswarms.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index 6cfcc536bd3e..8edee88627ce 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -57,7 +57,7 @@ components: - type: GameRule - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 300 # 5 min + minimumTimeUntilFirstEvent: 600 # 10 min minMaxEventTiming: min: 750 # 12.5 min max: 930 # 17.5 min @@ -70,7 +70,7 @@ components: - type: GameRule - type: BasicStationEventScheduler - minimumTimeUntilFirstEvent: 300 # 5 min + minimumTimeUntilFirstEvent: 600 # 10 min minMaxEventTiming: min: 750 # 12.5 min max: 930 # 17.5 min From 1ef5b2226a3b9bdf23d77474bd73290f9f70ebf7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 28 Oct 2024 21:26:41 +0000 Subject: [PATCH 22/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f1a923f0c6ff..9d5b5b11b926 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: BackeTako - changes: - - message: "!, \u203D and multiple punctuations now work for Spanish." - type: Tweak - id: 7058 - time: '2024-08-08T03:08:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30551 - author: strO0pwafel changes: - message: Fixed inconsistent naming of CentComm. @@ -3958,3 +3951,10 @@ id: 7557 time: '2024-10-28T18:00:00.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32974 +- author: august-sun + changes: + - message: Extended the minimum round time for meteor swarm events. + type: Tweak + id: 7558 + time: '2024-10-28T21:25:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32876 From 30017bc2d8af8c1eabcd4b74ff63cff5daec04ca Mon Sep 17 00:00:00 2001 From: joshepvodka <86210200+joshepvodka@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:03:13 -0300 Subject: [PATCH 23/44] Adds beacon to cog station vox box (#33000) * added vox beacon * changed name to vox break room * added vox box station beacon --- .../Locale/en-US/navmap-beacons/station-beacons.ftl | 1 + Resources/Maps/cog.yml | 9 ++++++++- .../Entities/Objects/Devices/station_beacon.yml | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl index 9d0919d102ce..4e7a8b235b5c 100644 --- a/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/navmap-beacons/station-beacons.ftl @@ -73,3 +73,4 @@ station-beacon-tools = Tools station-beacon-disposals = Disposals station-beacon-cryosleep = Cryosleep station-beacon-escape-pod = Escape Pod +station-beacon-vox = Vox Break Room diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index 384c60f599aa..888b4e7e5ec3 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -16747,7 +16747,7 @@ entities: pos: -44.5,68.5 parent: 12 - type: Door - secondsUntilStateChange: -5764.909 + secondsUntilStateChange: -5937.642 state: Opening - type: DeviceLinkSource lastSignals: @@ -84185,6 +84185,13 @@ entities: - type: Transform pos: -30.5,9.5 parent: 12 +- proto: DefaultStationBeaconVox + entities: + - uid: 30179 + components: + - type: Transform + pos: 4.5,69.5 + parent: 12 - proto: DefaultStationBeaconWardensOffice entities: - uid: 20823 diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index 19eab391ac0c..836ce7ff14e2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -639,3 +639,11 @@ components: - type: NavMapBeacon defaultText: station-beacon-escape-pod + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconVox + suffix: Vox + components: + - type: NavMapBeacon + defaultText: station-beacon-vox From 93315d46957957ab290977f6a21cd50365b29d1d Mon Sep 17 00:00:00 2001 From: joshepvodka <86210200+joshepvodka@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:04:10 -0300 Subject: [PATCH 24/44] Adds beacon to box station's vox box (#33001) * added vox beacon * changed name to vox break room * added vox box station beacon --- Resources/Maps/box.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 2918b26110fb..a56b0d6471a9 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -11584,7 +11584,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -18243.016 + secondsUntilStateChange: -18318.04 state: Opening - type: DeviceLinkSource lastSignals: @@ -72442,6 +72442,13 @@ entities: - type: Transform pos: -31.5,4.5 parent: 8364 +- proto: DefaultStationBeaconVox + entities: + - uid: 27921 + components: + - type: Transform + pos: -42.5,-11.5 + parent: 8364 - proto: DefaultStationBeaconWardensOffice entities: - uid: 27736 @@ -84431,7 +84438,7 @@ entities: pos: -34.5,-14.5 parent: 8364 - type: Door - secondsUntilStateChange: -12431.553 + secondsUntilStateChange: -12506.576 state: Closing - uid: 15010 components: @@ -84924,7 +84931,7 @@ entities: pos: -4.5,-71.5 parent: 8364 - type: Door - secondsUntilStateChange: -4179.284 + secondsUntilStateChange: -4254.308 state: Closing - proto: Fireplace entities: From e900ad7742a96697ce960a343e0a55fc9e7df8e0 Mon Sep 17 00:00:00 2001 From: joshepvodka <86210200+joshepvodka@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:04:37 -0300 Subject: [PATCH 25/44] Adds beacon to bagel station's vox box (#33002) * added vox beacon * changed name to vox break room * added voxbox station beacon --- Resources/Maps/bagel.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index d661e097c364..764c03b71bcf 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -62944,11 +62944,6 @@ entities: - type: Transform pos: 35.5,16.5 parent: 60 - - uid: 24676 - components: - - type: Transform - pos: 11.5,-11.5 - parent: 60 - proto: DefaultStationBeaconAICore entities: - uid: 18703 @@ -63342,6 +63337,13 @@ entities: - type: Transform pos: 3.5,-6.5 parent: 60 +- proto: DefaultStationBeaconVox + entities: + - uid: 23890 + components: + - type: Transform + pos: 11.5,-11.5 + parent: 60 - proto: DefaultStationBeaconWardensOffice entities: - uid: 24426 From dbef6cbeccb24240506604d65acd7624017c4621 Mon Sep 17 00:00:00 2001 From: joshepvodka <86210200+joshepvodka@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:04:49 -0300 Subject: [PATCH 26/44] Adds beacon to oasis station's vox box (#33003) * added vox beacon * changed name to vox break room * added vox box station beacon --- Resources/Maps/oasis.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index 15a719bb532b..0b5a6bec70e7 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -14470,7 +14470,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76151.9 + secondsUntilStateChange: -76213.97 state: Opening - uid: 6934 components: @@ -14482,7 +14482,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76154.53 + secondsUntilStateChange: -76216.6 state: Opening - uid: 6935 components: @@ -14494,7 +14494,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76153.38 + secondsUntilStateChange: -76215.45 state: Opening - uid: 6936 components: @@ -14505,7 +14505,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -76152.6 + secondsUntilStateChange: -76214.67 state: Opening - proto: AirlockTheatreLocked entities: @@ -81255,6 +81255,13 @@ entities: - type: Transform pos: -54.5,-11.5 parent: 2 +- proto: DefaultStationBeaconVox + entities: + - uid: 29615 + components: + - type: Transform + pos: -14.5,17.5 + parent: 2 - proto: DefaultStationBeaconWardensOffice entities: - uid: 11912 @@ -94258,7 +94265,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -67475.88 + secondsUntilStateChange: -67537.95 - type: DeviceNetwork deviceLists: - 18275 @@ -138807,7 +138814,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -104307.73 + secondsUntilStateChange: -104369.8 state: Opening - uid: 5211 components: @@ -190162,7 +190169,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -449512.38 + secondsUntilStateChange: -449574.44 state: Opening - uid: 28863 components: From 7ac2d9a8bd01b39ee953ba05900a98cf130dd940 Mon Sep 17 00:00:00 2001 From: joshepvodka <86210200+joshepvodka@users.noreply.github.com> Date: Mon, 28 Oct 2024 19:05:01 -0300 Subject: [PATCH 27/44] Adds beacon to core station's vox box (#33004) * added vox beacon * changed name to vox break room * added vox box station beacon * fixes messed up diff --- Resources/Maps/core.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index 1c5b67b5005d..2198854499e2 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -63749,6 +63749,13 @@ entities: - type: Transform pos: 54.5,-33.5 parent: 2 +- proto: DefaultStationBeaconVox + entities: + - uid: 16173 + components: + - type: Transform + pos: -31.5,-2.5 + parent: 2 - proto: DefaultStationBeaconWardensOffice entities: - uid: 20871 @@ -106044,11 +106051,11 @@ entities: After several simulations where Superconducting Magnetic Energy Storage units were drained from the main system from [italic]a variety[/italic] of user errors and other shenanigans, it has been determined that the Singularity should be put on its own power loop, disconnected from the main station. The upsides of this include but are not limited to: - [bold]1.[/bold] Limited external forces from the containments power. + [bold]1.[/bold] Limited external forces from the containments power. - [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue. + [bold]2.[/bold] An "early warning" system, if you see JUST the PA room run out of power, you know there is an issue. - [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system. + [bold]3.[/bold] Due to being on its own small loop, its much easier to spot faults in the system. [italic]While we have listed the upsides we also acknowledge the downside,[/italic] for it being on its own loop you will need an external force if the system "runs out of juice". Our recommendation for this is simply attaching a generator to said SMES and letting it get to full charge before continuing operations but as said from another of our technicians... "just attach it to the main grid for like, a hot moment, and kickstart the thing!" From dc3a2f6d28c50abaab5453fd1aabe79e1b2ff859 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 28 Oct 2024 23:21:14 +0100 Subject: [PATCH 28/44] add StartDelay bool to actions (#33026) * add StartDelay bool to actions * forgot summary --- Content.Server/Ghost/GhostSystem.cs | 9 +-------- Content.Shared/Actions/BaseActionComponent.cs | 5 +++++ Content.Shared/Actions/SharedActionsSystem.cs | 3 +++ Content.Shared/Bed/Sleep/SleepingSystem.cs | 3 --- Resources/Prototypes/Actions/types.yml | 2 ++ Resources/Prototypes/Entities/Mobs/Player/observer.yml | 1 + 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 85fec0d7d1fd..2f4269a05d00 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -213,14 +213,7 @@ private void SetCanSeeGhosts(EntityUid uid, bool canSee, EyeComponent? eyeCompon private void OnMapInit(EntityUid uid, GhostComponent component, MapInitEvent args) { - if (_actions.AddAction(uid, ref component.BooActionEntity, out var act, component.BooAction) - && act.UseDelay != null) - { - var start = _gameTiming.CurTime; - var end = start + act.UseDelay.Value; - _actions.SetCooldown(component.BooActionEntity.Value, start, end); - } - + _actions.AddAction(uid, ref component.BooActionEntity, component.BooAction); _actions.AddAction(uid, ref component.ToggleGhostHearingActionEntity, component.ToggleGhostHearingAction); _actions.AddAction(uid, ref component.ToggleLightingActionEntity, component.ToggleLightingAction); _actions.AddAction(uid, ref component.ToggleFoVActionEntity, component.ToggleFoVAction); diff --git a/Content.Shared/Actions/BaseActionComponent.cs b/Content.Shared/Actions/BaseActionComponent.cs index 01452bdc72e0..c3aa6cc97eeb 100644 --- a/Content.Shared/Actions/BaseActionComponent.cs +++ b/Content.Shared/Actions/BaseActionComponent.cs @@ -76,6 +76,11 @@ public abstract partial class BaseActionComponent : Component // TODO serialization public (TimeSpan Start, TimeSpan End)? Cooldown; + /// + /// If true, the action will have an initial cooldown applied upon addition. + /// + [DataField] public bool StartDelay = false; + /// /// Time interval between action uses. /// diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 76b8a1b081b4..fc6f0baf7721 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -813,6 +813,9 @@ public bool AddActionDirect(EntityUid performer, if (action.AttachedEntity != null) RemoveAction(action.AttachedEntity.Value, actionId, action: action); + if (action.StartDelay && action.UseDelay != null) + SetCooldown(actionId, action.UseDelay.Value); + DebugTools.AssertOwner(performer, comp); comp ??= EnsureComp(performer); action.AttachedEntity = performer; diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs index 6a04bfe42df7..90e1fd38e862 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -130,9 +130,6 @@ private void OnMapInit(Entity ent, ref MapInitEvent args) RaiseLocalEvent(ent, ref ev); _blindableSystem.UpdateIsBlind(ent.Owner); _actionsSystem.AddAction(ent, ref ent.Comp.WakeAction, WakeActionId, ent); - - // TODO remove hardcoded time. - _actionsSystem.SetCooldown(ent.Comp.WakeAction, _gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(2f)); } private void OnSpeakAttempt(Entity ent, ref SpeakAttemptEvent args) diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 5430a3f005a5..d80e36bde1f2 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -280,6 +280,8 @@ checkCanInteract: false checkConsciousness: false event: !type:WakeActionEvent + startDelay: true + useDelay: 2 - type: entity id: ActionActivateHonkImplant diff --git a/Resources/Prototypes/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/Entities/Mobs/Player/observer.yml index 397061defe81..d7c5dfe97bbd 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/observer.yml @@ -79,6 +79,7 @@ icon: Interface/Actions/scream.png checkCanInteract: false event: !type:BooActionEvent + startDelay: true useDelay: 120 - type: entity From 6236d1abb32ee7e72a29e3990bc163dd0d66190d Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:35:48 -0700 Subject: [PATCH 29/44] Updated an incorrect sprite in the smite menu (#33043) changed the synth sprite used in the icon for the instrumentify smite out for the more accurate supersynth sprite --- Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index d81699c82d0d..2187cbd68f39 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -651,7 +651,7 @@ private void AddSmiteVerbs(GetVerbsEvent args) { Text = "admin-smite-become-mouse-name", Category = VerbCategory.Smite, - Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "icon"), + Icon = new SpriteSpecifier.Rsi(new ("/Textures/Objects/Fun/Instruments/h_synthesizer.rsi"), "supersynth"), Act = () => { _polymorphSystem.PolymorphEntity(args.Target, "AdminInstrumentSmite"); From 63f8aba359e2916806ca0c2e939bc7429067c7ca Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Tue, 29 Oct 2024 05:00:28 +0000 Subject: [PATCH 30/44] fix lava expeds (#33042) Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/Procedural/dungeon_configs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Procedural/dungeon_configs.yml b/Resources/Prototypes/Procedural/dungeon_configs.yml index b55d5a9e6977..d75581bbc2b0 100644 --- a/Resources/Prototypes/Procedural/dungeon_configs.yml +++ b/Resources/Prototypes/Procedural/dungeon_configs.yml @@ -127,6 +127,8 @@ Junction: BaseAirlock WallMounts: ScienceLabsWalls Window: BaseWindow + tiles: + FallbackTile: FloorDark whitelists: Rooms: tags: From a5a5840ee0c0412fbe97d55e91b35b7b599d50a3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 29 Oct 2024 05:01:37 +0000 Subject: [PATCH 31/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9d5b5b11b926..434cac533ac2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: strO0pwafel - changes: - - message: Fixed inconsistent naming of CentComm. - type: Fix - id: 7059 - time: '2024-08-08T10:04:20.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29217 - author: Plykiya changes: - message: Buffed the range of EMP implants from a radius of 1.75 tiles to 2.75 @@ -3958,3 +3951,10 @@ id: 7558 time: '2024-10-28T21:25:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32876 +- author: deltanedas + changes: + - message: Fixed lava planet expeditions not working. + type: Fix + id: 7559 + time: '2024-10-29T05:00:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33042 From 94e686ca9c37b91c83d18c43f4c5956c2d32b6bc Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 29 Oct 2024 16:07:57 +1100 Subject: [PATCH 32/44] Fix separated game screen bumping (#33046) I don't really understand why RecordedSplitContainer exists but removing it looks identical and fixes the panel bumping occasionally. --- Content.Client/Mapping/MappingScreen.xaml | 4 +-- Content.Client/Mapping/MappingScreen.xaml.cs | 1 - .../Controls/RecordedSplitContainer.cs | 29 ------------------- .../Screens/SeparatedChatGameScreen.xaml | 6 ++-- .../Screens/SeparatedChatGameScreen.xaml.cs | 1 - 5 files changed, 5 insertions(+), 36 deletions(-) delete mode 100644 Content.Client/UserInterface/Controls/RecordedSplitContainer.cs diff --git a/Content.Client/Mapping/MappingScreen.xaml b/Content.Client/Mapping/MappingScreen.xaml index 9cc3e734f0e9..bad492e7e41f 100644 --- a/Content.Client/Mapping/MappingScreen.xaml +++ b/Content.Client/Mapping/MappingScreen.xaml @@ -8,7 +8,7 @@ VerticalExpand="False" VerticalAlignment="Bottom" HorizontalAlignment="Center"> - @@ -82,5 +82,5 @@ - + diff --git a/Content.Client/Mapping/MappingScreen.xaml.cs b/Content.Client/Mapping/MappingScreen.xaml.cs index 46c0e51fad69..20e2528a4400 100644 --- a/Content.Client/Mapping/MappingScreen.xaml.cs +++ b/Content.Client/Mapping/MappingScreen.xaml.cs @@ -197,7 +197,6 @@ private void RefreshList() public override void SetChatSize(Vector2 size) { - ScreenContainer.DesiredSplitCenter = size.X; ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize; } diff --git a/Content.Client/UserInterface/Controls/RecordedSplitContainer.cs b/Content.Client/UserInterface/Controls/RecordedSplitContainer.cs deleted file mode 100644 index fd217bc7e860..000000000000 --- a/Content.Client/UserInterface/Controls/RecordedSplitContainer.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Numerics; -using Robust.Client.UserInterface.Controls; - -namespace Content.Client.UserInterface.Controls; - -/// -/// A split container that performs an action when the split resizing is finished. -/// -public sealed class RecordedSplitContainer : SplitContainer -{ - public double? DesiredSplitCenter; - - protected override Vector2 ArrangeOverride(Vector2 finalSize) - { - if (ResizeMode == SplitResizeMode.RespectChildrenMinSize - && DesiredSplitCenter != null - && !finalSize.Equals(Vector2.Zero)) - { - SplitFraction = (float) DesiredSplitCenter.Value; - - if (!Size.Equals(Vector2.Zero)) - { - DesiredSplitCenter = null; - } - } - - return base.ArrangeOverride(finalSize); - } -} diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml index 7f1d1bcd5b19..653302fae4c1 100644 --- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml +++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml @@ -14,7 +14,7 @@ VerticalExpand="False" VerticalAlignment="Bottom" HorizontalAlignment="Center"> - + @@ -26,7 +26,7 @@ - + @@ -36,5 +36,5 @@ - + diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs index e04d377d3215..2892ca44254d 100644 --- a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs +++ b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml.cs @@ -40,7 +40,6 @@ private void ResizeActionContainer() public override void SetChatSize(Vector2 size) { - ScreenContainer.DesiredSplitCenter = size.X; ScreenContainer.ResizeMode = SplitContainer.SplitResizeMode.RespectChildrenMinSize; } } From a8c512c769f741a8040989f39813f382154f36f5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 29 Oct 2024 05:09:03 +0000 Subject: [PATCH 33/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 434cac533ac2..6131e0e6f437 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Buffed the range of EMP implants from a radius of 1.75 tiles to 2.75 - tiles. - type: Tweak - - message: Buffed the range of EMP grenades from a radius of 4 tiles to 5.5 tiles. - type: Tweak - id: 7060 - time: '2024-08-08T10:04:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30660 - author: Plykiya changes: - message: You can drop food or drinks from your hands to interrupt eating it, again. @@ -3958,3 +3948,10 @@ id: 7559 time: '2024-10-29T05:00:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33042 +- author: metalgearsloth + changes: + - message: Fix separated game screen bumping slightly. + type: Fix + id: 7560 + time: '2024-10-29T05:07:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33046 From 907a9cef10bf4f0309bf2f0c6384a9bb60882f16 Mon Sep 17 00:00:00 2001 From: Preston Smith <92108534+thetolbean@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:52:43 -0500 Subject: [PATCH 34/44] Fix: Make Plushie Damage Unexaminable (#33061) Set hidden to true --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 499361496445..c3ef0d032926 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -35,6 +35,7 @@ damage: types: Blunt: 0 + hidden: true - type: PhysicalComposition materialComposition: Cloth: 100 From 440da3c640d0c5db3653cab56a165cfcd359c9d0 Mon Sep 17 00:00:00 2001 From: Milon Date: Wed, 30 Oct 2024 02:03:06 +0100 Subject: [PATCH 35/44] fix chameleon projector bot whitelist (#33055) fix --- .../Prototypes/Entities/Objects/Devices/chameleon_projector.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml index 99d58c6a3ad1..f07ae635696e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml @@ -12,6 +12,7 @@ components: - Anchorable - Item + tags: - Bot # for funny bot moments blacklist: components: From 3d70cdf23c17384d81cdf495c3075f9b02d8ab91 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:12:49 -0500 Subject: [PATCH 36/44] =?UTF-8?q?Various=20Vaugely=20Connected=20Sprite=20?= =?UTF-8?q?Updates=E2=84=A2:=20Encryption=20Keys,=20Station=20Map,=20Brig?= =?UTF-8?q?=20Timer=20(#32786)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * various resprites (encryption keys + signal screens + station map) * brig timer update * fixes n shit --- .../Entities/Structures/Wallmounts/timer.yml | 4 +-- .../encryption_keys.rsi/crypt_blue.png | Bin 505 -> 311 bytes .../encryption_keys.rsi/crypt_gold.png | Bin 501 -> 307 bytes .../encryption_keys.rsi/crypt_gray.png | Bin 509 -> 300 bytes .../encryption_keys.rsi/crypt_orange.png | Bin 507 -> 313 bytes .../Devices/encryption_keys.rsi/crypt_red.png | Bin 499 -> 286 bytes .../encryption_keys.rsi/crypt_rusted.png | Bin 636 -> 514 bytes .../encryption_keys.rsi/crypt_silver.png | Bin 512 -> 313 bytes .../Devices/encryption_keys.rsi/meta.json | 2 +- .../Objects/Devices/tablets.rsi/generic.png | Bin 271 -> 230 bytes .../Objects/Devices/tablets.rsi/meta.json | 27 +++++++++++++++++- .../Objects/Devices/tablets.rsi/tablet.png | Bin 348 -> 302 bytes .../Objects/Devices/tablets.rsi/tabletsol.png | Bin 414 -> 389 bytes .../Machines/station_map.rsi/meta.json | 2 +- .../Machines/station_map.rsi/station_map0.png | Bin 15417 -> 2926 bytes .../station_map.rsi/station_map_broken.png | Bin 16171 -> 609 bytes .../station_map.rsi/station_map_frame0.png | Bin 15800 -> 423 bytes .../station_map.rsi/station_map_frame1.png | Bin 16488 -> 642 bytes .../station_map.rsi/station_map_frame2.png | Bin 16277 -> 341 bytes .../Wallmounts/signalscreen.rsi/meta.json | 2 +- .../signalscreen.rsi/signalscreen.png | Bin 870 -> 286 bytes 21 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml index 595915202d86..1f2a5ebeb0dd 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/timer.yml @@ -64,8 +64,8 @@ canEditLabel: true - type: TextScreenVisuals color: FloralWhite - textOffset: 0,8 - timerOffset: 0,8 + textOffset: 0,6 + timerOffset: 0,6 textLength: 5 rows: 1 - type: Sprite diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_blue.png index a1b463f7896d5d6b8c2fc4300c01a8871c3de454..45e0c9755e4f077515ab8cf0b41d4bb1d3c4715d 100644 GIT binary patch delta 271 zcmey#yq#%+Vf{x>7srr@*5m{U*2M`TJxz>kJt`~yp3fF)3P1SVINQT?vI%>{mw4qB zFI*Oic|O}T;Q<315VS2XU-xM0_80q)6)XyPZNITk;U;7M^0r6e6ZXzh`P@;)u-=p7 zaACIuo84pqHnTw2HCc6g_wk2w`|`6e3UB25QIp2|cw6zFBlVJ}&bhAHc*MHly2_LK z&+A{hto-}^v-DS42W^8_43jo1GBYb}<)6W9=ew^xbdG*_=Qpt4!`q6#Sv+Mqb2#%g zL-)UIp0oQ4PCCBeSI>OH5Mld4W7*uq+m>-``iswNlpNbC6VxLO_8b$)4b&00bPKu6{1-oD!MY&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzhO=Skd?!NSAxMIEF-UCM8I)E><*OR^<2O8w$=de+VwRB%aY;A z;c6Nnz^|H&6im|F7ez>j`A!gPf3@pdeJR^5(zkXXF0P zzpnCR|AutUFrG=wD;Za+UW#}$wbzQllEuNXm;16R*FSmlU;Vt7Re2knl3s^YuaOY* zQkeDQit7@u84njIsI_E1V~F_1%xbS8av^hujjxPDibJoKG;iZY0f{O_U_6FKJS{!I Ryd7vYgQu&X%Q~loCIBPRh=~9I diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gold.png index 641a4c22153e4c61e72b9fd9e842a708bdca640e..53b97f4c783c567aae26c9f93716597ed2d440f5 100644 GIT binary patch delta 267 zcmey$yqRf&Vf|ZA7srr@*5m{U*2M`TJxz>kJt`~y%4h0yg&+L1dA+CUWE1v3^%tFQ zICKh4I+Ln+kdX%j{^!XY*8czBm7jUB%gOpAS;tMxGi0wloch1I!Q^vCnZuHe8qA0P zrt(ZYwumRvZ&JinpWEMM)``uM<6u%tlHKsze*iukfWe1rbQ ztd;K=q8bC)C(PlMln_{1dqC#H?REUCEnY8Fx@Dd4^X7G)ZJ(xZJSA)QdsZUnTG@u} zb~D%}Tl+|}%e;&|asUVtgpVBB@K#2@dHTh4ky-B#RtNP+gFVK?1_BIczB{~8>G)#B P00f?{el9HQoD!M<8Y&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzc$VznJqRkk0pXaSVyzOiGYoU94yz#RMcmoE{XcyjP!OaP|-Lra%9?<^KHmU%x>) z^AX1c=6`Y=N*#`UEGw7pQm$eWJvhx>s{7yZc8CbG!?b_)c`Rl!;ZY7{DpzG0j0#?d zR4S1Y`z_h0bn|KX)o5r!Uo zOW2l7^GNOtH+#kKM1Xx6a)we zA2KOs(E0t>KJQEY>yY37UzqsJQ{z)GTHrRdx9va%2hU!hza6(MiwK!KWd_J0p00i_ I>zopr01_yI%K!iX diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_gray.png index 47d410736e70e9c8254247ce1db5374f4db03e73..8f905fb9a88cd0f8feae32d63cf1a5317969637e 100644 GIT binary patch delta 259 zcmV+e0sQ{`1FQm&F@NSsL_t(oh3%C+3IZ_@MnA<;Td~{D0|+)US}h1R-oSte9>cwY zrC7}sEcOIb2*O@r*=`Fv4-gxF5Hy>hi_JU;3CYLs2q6O~ilY3PMnKjQkuxA7p*6z< zn7J}!j0vjS3J?GQ0#}mYFR8=SY&|zV^cV27HJJi~bgSB1BR2Hd7SE zBYS%fl{9??M5K{s9q+7fU2g#*vgh{FJNt8ix=?}Oe*k#C_P+`AhU>TcY&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzhO>ChGbKNLPEhIEF-UCM8I)E><*l_1XCjee;m1>?;-Tv+^Wp!Fi}ljdv;SYbcrn7z zqc4q*;b+F{km^M;4yE^-c}z@9Sbq1-5MWrTdQA{$Im7?|FD;(U05bAH&PYyB5R#CR z`WL^W;31MJd`sAtO!G+Y3^#kl@I-)t)l|=Cx(0`4%pZB_W!_Q@%Vz!G=9mhy?U^FO zrUrp!k$NlEuKmk@=zqWT-}_cq<(k`0UOvKjB>hIL`_5pLiGxM2P#idTB)7}A-j(uaWmAH&mZq2c8 z4E~lhb^xS4ID}o&8d6tmB*8qA65-WnUm31G`^q40^^4&w2RjB0lOF}6U=)l3QUCxl XW>a1!R>=_n015yANkvXXu0mjf%#?U| literal 507 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P; zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzhP|C{$Vkq^mq#977^FlM*CY7b_Y_F#(AXr-YU2hwGCJ&i-NE^yhn*#Gi_2%Nr9- z3RzAt>fidxku*WsF>B?!j-ucWW(N~Ho+1^Gd1`z=>hEy8*?o8Cs{b1kBQ!1^VN{UM zotx!9g?Yuh>Ise8k|t;{{1lq~-Z5!|0K-bvYl1+#8UFuYSd}afWaNQdk({6)bfe4g zPyNMp-|K-c_zyHJ!q9_n3EPrs9?6~IX0I5Y2r#gk>iJC9;LwcuBQL$oTS~(`^+&#R zNSkQ$lMFc~1#XVSSx=cF_WZZc`%?cp_e T;_+|YAUAlr`njxgN@xNA=(CAd diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_red.png index d30341b1422ba957935c3067f3e8b2d494c241fc..14b22cf14a4163d8c3cc7a205a2f9da62e4bb9da 100644 GIT binary patch delta 245 zcmey&JdbIDVf_tH7srr@*5m{U*2M`TJxz>kJt`~y`ZF7Q7B|eCDe36C+;6VZ$rv#q znFAp3;pJuZJ)hFj(s+R4zx>xIdz2mMl{WuyDmx=%LW-OxpM~W|{^pPgDu*v^&);~; zott}diX}4;2yk!0o;8o-6&pRcy&3&Bu p!RS|ylemAKXICNE2Z3ORGBEi1m^;jnZDeNv0#8>zmvv4FO#qGaY}Wt) literal 499 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6{!)PX}-P; zT0k}j0}G=R11m@g5Zf_I!`W_(8Vt-}aV7?a_DlvAs2V>Y&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzc$sJFo_%xzN+aF(iUBDM5mDv7&(#6OagTatI3gWN)XVp}{e2`OJEUX|rd}e0cQU zy?a}VSxzuYNlCF7o|w4c!h$M~1|C++1Sx6hIG!M9WA;Dxd0*<~FEEDh+_^Dng3MVN z2ChqMgWq-*FefvK& zFK>;63VRT9koS^}N3^9&8HzX>nxw>+d5g5HG5^=kds&s&hxymNeXhLPY$q?;usDbb z95Ol0YGh>e-|@%)!o~lim)}ahU{E>BqTvUR^{OHh7B}aFj#dVSo#M(#P2qKmfL1ej My85}Sb4q9e09mksl>h($ diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_rusted.png index ce82c248db8d03f5ce27802e954258c56294475e..8223bcca8fa87d56495186ceba1cd934457725f1 100644 GIT binary patch delta 476 zcmV<20VDqW1cC&RFn^LR_hNiU@kouD=ljMo(4L2 zpXH9{9=<&91Mm01#l^+tKjV=a-iLY>pK8n#+%F^csd?mpp)J1^;@M3UPqn{Hp;; zJ9iFH>ITHO;Lp=(t*_KgD@f>ElidL)i^vKRIe%|xAHC3zfY9*fy-TCH$f|>u z94(@BI*n3_?)okOdJ132cY&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzh<1u=vAYAid4g#W5s;GburWb+Mv>6cdmLaZ)fm@Yep!+O01G|7Uj>|G$3inv+2X zuZVLPbFjCmRN9X-r(XQuJvAkw zAh4*D*`e=-)m6Fu%seIs_!jJX@5m-4CDp{s&T79-fZ=4L6T^~e5$-^DGyMO*Wz{;6 zPd9^nker|(Bq1gBFMdbC!+L4v-v1XbUX0k-+shll>!CaGn9zEjXAI`Wp=+i!%eacO z^Tcputo##iu~1HiRl&WXhWqe>fX2?oD-v4Wmle1g+L|siTzE9$&`}MG&3PZ|1=uWC znAvvynszvd>qLRAsAq-74YsL&-H$nxPH^$)7HF_!a%q-f;>rr>XfQOA)^M8~)9?oD yxBR(T|K;bhS@tXoYA0_QT9`SVbb6Mw<&;$V2jLF&n diff --git a/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png b/Resources/Textures/Objects/Devices/encryption_keys.rsi/crypt_silver.png index c31a743f473e0440a89cf06984930634deb7f86b..03e2960779226fb6ab002f96db054f4443615009 100644 GIT binary patch delta 273 zcmV+s0q*{Q1i1o`F@N((L_t(og=1hC1*2dTjDi6Mj3lW2@8cJQSHYG|>qs?|GzUC+ z@`Ruw85tRp%w-|L0SpWb3=FSdy}~R1>F3}F~ z@eBH|@4u92wN!Tit-z=QNG=B$7!av_z#PD#9Eer?$KCa`cfgiS>lkcY&A?g#R1Xw^(G1KB7@?|x z<}6@>t5#URj9`OwespsD1Ee?$JR*x37)-B#Fk@WmQx2e@Os0!}2#^L^2nGT`QUi!V zGzhP|C{$Vkq^mq#977^FlM*CY7b_Y_F#(AXr-YxMp8oGVX!4o=#3yzCc@K{MZ)8}~ zr`E?HS@Z9XWs}4ck69Lr_HJg++1Vd|p}q#lpAfaGo$17d|Hpd|v^Cds@E(@&6lQOz z*;2a7Hjr<@uJ?{?O--_5dv4V53pKYgc<65I1KQ2-|G$TDy$O&}401(sf`ZVGAFO}v z>)+k^|Lxqo|EH(xAMbK3QZQB6>LTU6XHy`%LOX-Tio(QQE{+}#AN{{!5POM1LnWvA z)P|%8jmC^e!QvCO65E=aW(X{s$(-=<-~SyK|E~>x`+xCegUVSJ4JR6;Le0Ql{NlvG XaH#5as#k1qA;=+~u6{1-oD!MNklgg2Ll0DPQRqor##>K zvfuNBh50oJ2ze@Bx|XrJ+uZu{v-6*om48-#DrN*~V>rSaV0QIc(uphmD>)wQ2@s#( zrhj7ipbPby|V%1H5Ls@F7jJhTL0%$P#_R^I?-8YS(fwqnTVq09TA;= zYb!7VKv5JfG5`Q|T^ln^0&`VW&Vtu8O#>p@!-WsD)ub8ya$ z{XYT=T5Bk!(D%KSfRqwi>qCK;)!!Wu1fC@@41-?*6SoQoA^ZxMc-9{9z67QU9G(RL z5XUj3lvbgPv2R-lfwpb02_#8^EX%CI_xx1>&NH?L9Mauszg3^5D`fP(nk>EmGb!+-mCsA93aq6z~aA3s)4 z5zGZFEUXk+{^!qc{N^*z35ZHaF&savhj~_BF-rihkc9pn3<-pRh+`Kg zFKI|v82k=~FW?t&aCFmXFuFN9IJ)TI*xbbAP9Q9pIJhwzh9*t!2Am+A_Q>%^8Q_`V zrS0$Gg`@>0CdSUJ?xE|tdG($#HY;k3vD&#^1#$pz9H);A0DnLb1ky~IK<;^7r?89D zdmP?g;p6fKcaP^~Jq$xI#@2Foe@-smI?FP|aSYCRV}ZqDjy=5M=y(oYe}iq?FbqRF z_Lo3`5CWWYBuUa(pbDiFLWqq5JDpbVfk|Lo0%@8KDKD8Pr?q!0ekfO$-KZCjUVpiPHfvaOdVViY;F=b$=s@wIsn~rw^#=ti@Mnp!vUby3al+?;HJ*N$*__E#%5r6&Oj+ZZVh2|05(Om h1S6*$7c)mncXHTiZgKqPPFo8G3F3^szB}fv6B>2M{#_Lfv6@0r6B=)IgLUixG%wVNn+4{?a;%{cN^A0BR&5aT3ah^uk~V!LeRgarAQfqB;UMZDTPlds zVo%qBskf=fE%5cV^2jVM$uFt|T7_bJaB3mQ_G9c|dw#GRfVAs##Db{F9Cje;21kT5 zLYIPq4cPjeOk|_LLJ+ec#@pzlTRXXq6C7CUIL$$(zJyRJT;Ont;?e^N_HdbksH0q_ z^$;5&cDbY$Cl_TFlw{`Tfh~oI2D!Kac|eP-fL7(EmL!6B_7w$*$=RtT3aNQ1wn{}x z_ICUWKV1W+fg(>A#}Etux0Ag28VopCGc$MopV<1zlr*<{an^LB{Ts53G~sw literal 15417 zcmeI3eQX=$9mg-FDQzm+wF+ujwaqoG1nBu*eYS6o+ca)TwmGDZOVa^q&v%cLQ*58> zyAa0{>zhEdTcv8_rA)Nd1}lR?1PFz725A@#o{b_FZ4tMP1X?8I8klkNr1$7W{7(ixco` zPOfvkNm27&xBnU*yk*{Eijtf4M4#0c`@XCi8K0sVN#HAFav&0TkWC}`-;e0Gp zFGy3%F}dM<+8LUrG9V2yAZwX0j;kA&8#FA#95kj$S$0pG7}g{fE9b5|-b|)$YSUVE zH$+fES~t>6jOG9n2c|KcSHY^g;jLU>@9r%b6$-<9 zl{@l4v5b7eFwzlsmi0^`^mKGMv&z%DPS0w_hU@aX_PkiXzaOA7}y>2(babKg`&R z7fMvdRhk>6_WIH(5d;JQ7FSG)L03AdY8)MsSXJ}~B+eh?zqE8J=oeJYmgXi$?FV#H z1)Rw7e2Q0+|5JKEhcnyd;amnqAPKxG(4xwRXi)%AFPTiyDhP&@0OTZvQuRgM)>`=0 zmBp3LUJwT}TKFn2DtGi% zsv=q>2?7Lf5?pvbh?n3(fZ$Dn3(p7f5?lxnyh(83`5<0`3ju;R2`)Sz#7l4?K=3BP zh3A8K2`&T(-Xys2d=M|eg#f{u1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm#LV(~+ zf(y?F@e*7J5WGon;rSq5f(rqHHwi90AH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9 zn*p)HH{E*w9- z;NDjnqPNi(X1?G0@$MVu?1&FO*0A;P#-Fq=-oEqND!xCc+m! zoy)y;ZO{3?9;WnPuKvx8(f>SoI{3{q*ZpDZ{g*%g{hs@OyL9)5Z*4oibM^-ZZdVk2 zSK^5iKfCm=6Z3y?ZjAc(-`0-L+}XXO*mvf@?bls+=+<4cF8+y0ynFK>(|@_DW#0`K z7w-Pnr#G!z^GKfmnp2kzXrSA64+H&<_EK7Vi9 z+o2avY>r%+`QoyJ^m}K8%c{o~U|wqIV@(tCdM c+ZU-L!l_fAd^B;?ez~`6Rd;l3<;HFQ1yvsMg8%>k diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_broken.png index 7297442f10813defdc0deaf445505decdb66008c..6228597a401255050e6cd7403deccba77ac7e0d2 100644 GIT binary patch delta 584 zcmV-O0=NCEe&Ga=B!2;OQb$4nuFf3k0006TNklb;z6n(8KRVor}T`(wz zV8{|SMo0%s%^kXC=pnLlhg9kUjEq@O#UY}KEFF`*+kVgA z{~H7U_+#9d9E1?oCed!U({gD$2_ek3?Kb(b*=)2TN*yx!`+wKD6>|D`ZxnH7nk2|S zmzS{*XL$cQ3lT*a1t{e4B?^|naAx%0*3ORsSaQdrU{yH&5srT>%rT>0KnZR}?rO=S z-~myvt`zxm0dcxGfNW=61Q3RA2*Wo)E=Xg&$Ret9KtdEe2oWg}04y-yPL7r4~Q;gxnaccr{a#awd3rG?ht79$`U`Y#Wppu*Bno*sE z!&&-|*kGZ`HGU(2KHjHqf|>=I!1NXXuJK7Gi)d4T=}}slguPy`WO>`RZ43qjVT=Bv zHK9^Kw?W%2S>8^P1pR(r*rLB^O{lDb{eG{t02J~hNlJd*936}~0JN6}rt|;DRp1-0 WBMgajKLF4G00006e7REJ?$|GZrHWcaIBJ`eVS-=Vs?Z{Sa#KyFzG z!v-8xJ}E253>b!CPkksBm&&CD&oI2?GqQrj0b|$~fW0xyIW`<%`I$i0bHFS5GYvQ1 zdDoy9g-pW~O95FB$N?2%Ze0)*)lDkq>t^x}!7$dPbA}n{zz1YjANE!HLrgf+5b?{v zYo(bm=p$X^nVE(xC7`~vpirM91%cjTwBkHzwdrjRqsd~knQa+*iZodWk|t;pr)b7Z zGG(nO9SO$88DBHozLvtv~;IZ~w*gu?}-rC$5IxYBWYl@I#|lVnIrWG10^`? z66o2W2v0V)GNF$$7Xi-2!P|J7;NfvVL$(%RW^tCYa=4AP({_rbS-_dvLnLw2B~-4c zlt69g6&WdkBJk_Zt??3woIwFL7y`-;n`vm@Vml74=&Fvb?Z{5eu)K15xp-v*1cH<3 z)EXaFhov*xLF}5&dqdF0y!#k66~M2yfks_LdUfw4Bzfc-HVCr3aBI1jy*=u+vl;3> zd6nFkM1{ohz%oTDw-F zQ@QGIi5LHEJ5SEb)u7 z3!X=jfg;TbR?0n6^Z+k{xAVYdwOD9)K%&j4MWGl5m8EVG9^fHmKcQiyhz+VpYFO5t zVS*xN7)@2ejdx@-jJCqtdialm==e*~WuNTW#qQ@td`9=vE8Gl1h`OlZQs;wcHCzY~by35m&Ii$IxDX)fqJ~SI52Dp@Awbkc4VO9}M62OK zfT)WaE_FVLR>Oq=Q5Q8_>UQHFszEiurJFoj9HCggQexa zdT#=T^*EpB&MFRH{OZ*+{)e+3UGVO;?6Qd$EAtP{$kF?@>F2I~{pLmYBSjm>J+iUM zb~EqL*UjJcNK0GdTVh@@wa45)ZhEc(Z`_uVAvc~LURIi(Uw_Gd!sGdu@Y(lm8{1B; zTbXf^TjhKC@dImm{ zg2Ujz;;-6R^V*-!o|WHt@YD?XaI0}rFHA4zumfu#mZkx!-m;z6yDkU z)EeD04VjOdPfazTd}xSD4VbfumeZyV4tudr`4Rdx#8U2hqrIv^N_Aj`FUN| zAI_BHdk$x(yKkoVZmM&pRzRu#t!r)Rd+S8YNwzw* z=R|VR_U+BJ&SgK_?H{@TV^4eu@Rr>3dPe0v3H%yyzYGK>4%|i&|&cd@3GmJYIN&9BZ zrZAYlFaPqw%L8ki-dnf77<~Nhj*8A}*rKf8 W=I^(!U9UXOo;QAy`_1g~dH(_XKN64t diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame0.png index 460c86b896a6a470270efa82d8a4f4c609bb0359..1b6241a5754a7771d06b4c2fd5d5e6f21d3cee56 100644 GIT binary patch delta 397 zcmV;80doGhd#3}CB!2;OQb$4nuFf3k0004DNklb!4|u^iV*dSYxAe_Wh9w|00BOD7!(^q2mk)3JD)z>F(%7h z5&)z-`^-u3-mCr(H{o5_tw5XsGiS5XxVHoxx$TH(em{<^i}CmtTow>Q_@A3_PsF1F zu0R!#Y96i2Q-9pvrIbAdP18U`vJN!IF{e#esfh>xZW+niwxzD?R`z5Cn3+VR=nKTm zGz`PWz7gP@n;)OLu1^K=-h-J@Rn^Mg_x;SrP{(rZ(K#y&nXz2Gicj|-g literal 15800 zcmeI3e{37&8ON`T4H^n6>NZB(iL2Xa1A4ySw(oG zzH#0~tkV8@t;F{8KJW8=-upc7kMkdQV0g#PSN5#!VHoDhp~3V{^vMSQmwyhud)4Yk z=woGZaF@q0SDgy}R~)+Ws&x!=(;Ien%pc3#svB-03QRW#qm@Dt^=6plmP!#AQ_yE~ zaKd)_A`377GQ!$sUu0Cx2$|vloU{k4B{)*uku|DQhGs^#qtqEm<-xeP?=mJsq<8B9p#f)Oo&KE=S99)GbZ$qNZuQAn}sKp&pz! z8)kzU?|}pbK*DwBHwr1c{oj`gIkG%|wn@XNM^A6;R~GsK9p% zGL2?Tak`YR4b3!on1==E_#TQAyT%nKUElR4-6c{s-Ag7$HOXX}xx0?HQ0SW4^SA9q z2DBs;&dnlo+ZZ)EA|p$fhP>BO@**RNp!9H zKnVihEoEIdp9*K$a04MbFi@LS>{mx^$8^iy^+_HNY1O->2GhWYDM^rIPEgTbR*dOr zN{Ygbf~X5Zn@HFb)5y4{ZOwFONK#f*bxG4zwOymFC$53kj|qIRES2`YZ91l*TW+ZU z{FGe)6Ob=D6G^_+*w(W-tMmak@0QT8U`kH%-I}{brCnn>nAZJ{0X z6-;!tHXM076>b}*YuKjVN(u!fZYoBOQ#4WLL=l=?0sxsaRcOj$TodA|n&gAUizHg( zs?Uvjdv|F|fpJ+z#Z_`jB9zVKXWi3=j98j8tjf}9B6R7KWerU((gMd7U?)ukKR zk#zS$2?;?pRYTyc1TgD`0+Pz*1R2I+8j!S{(n!=MwkXkUB^#Y=Am7#}xE2##ix@Xl zO^$0Euw=+VOR+djGej;2fTaOVfC2!G6kTK%r5dz@B{0)DBWp`w1m4xz+FAm&GpGnk z9t?KazDQ$>Z5~?Ttgg@P+D@$lBRIWMMz8@wGs$B^Zs%btrm8YJ zAn|5AV%V<0{8-vX2e=pPCo;-Zi@_aT19vSI*ygAQhNWt|@vd!#VJo_=N53fe=1+=6 z`($$$yO>{ES9CE|F)f+|141?_E;1j?OL1X9$R@=_=7V`DE({3Sq`1g@FfYZ00U?_d z7nu*{rMNI4WRv0|^TE6n7Y2lEQe0#{n3v+hfRIg!i_8b}Qd}4ivPp4~`Cwj(3j;zn zDK0V}%u8`$K*%P=MdpKfDJ~2M*`&D0d@wJ?g#jU(6c?Ef=B2nWAY_x`BJ;t#6c+}B zY*JigKA4x{!hn!Xii^w#^HN+G5VA>ek@;X=iVFimHYqMLAIwW}VL-?x#YN_Wc_}Uo z2-&2#$b2v_#f1SOn?zhat%r1>gPzPSqepP>``7w2=?7N3yKDmHC z-(#3*fnnYsXBhoahPlRl_|Dh1Gt3HeDBYi}yfZ&4K5{R+YW+WF?tT0BulBz5?C6un zFC72q-0J+s3qSey;lF=4m&?q4e0tMCFf4BW^EL}qHyx${WA-H z{nmzGt?<;$$e+IaCF9uUTYmh^XGgw$-Y)l?oB57^_PQ%>&pi0+yH5RdGqd_k#qf@Q=Jcva_0L!Q z?QZr9NA~bf`CqIS`d@$Kx|vt^9C}N=dwllYXATd)7=38X`5)epncwi;n^#`A;pAn^ YfP4Pz$Gp7{)rJ|`wj+IX>-hKn1L(9;e*gdg diff --git a/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png b/Resources/Textures/Structures/Machines/station_map.rsi/station_map_frame1.png index 4b6fd1babf7739947ea84136e81474ec89f19d00..83dfe28b291ef58fff374c32de3c2afbc0167e99 100644 GIT binary patch delta 618 zcmV-w0+s#ffB}L9kR*Qrb5ch_0Itp)=>Px%JV``BR9J=Wm$7TxKorJ*3d+#U9?o5A z@D+?fL!m{*#S|ha8A8Yu3Wjd^YdUo3Ur?N(kfl@T$(7%@B3;2jYcCPpB-8naeuz=Cph)ILvwP^^P&Us&l0z*)})l7>$>E<=$cA-ngl=y zk-LA=9+mP@T0k7tuC5HqNqa=|>Qz~HiwUT9^>BP}n|qULR}U*c>I;*X7VsxgD4^)} z%OW=mU>d;{>Y0BG!XVM-auEd?Sr365B)MwgeS0zH{wo6JBL2@xm=!##yv|xHDoVLoV45bb>*jwtP&rPosk*DIjtJmhE!q2{ zqiB3_bHi|JE1J8mi)C3_uh%OUFe^3-HKlt&pe#H>2o1n-oP_<(C-6KEDJ1}gVc@j- z=ug*pdHfE5H-iDK^>y|;9h_F5*B6@roB$#S5JFI^)e=5!+Xk{@MA??de{`;QhdlfC zA{u}G_=I9l&1T~4_3khl&-ccNGuv`yDUJ*9fBr%UF}?NiCi@-O84Nht*Z{z3_1QlE z5bgi|_AA@t>3seISx~(Iz)Jp{SeB*PwoTRxJmSIe8<)E9y(&-bD*ylh07*qoM6N<$ Ef`-d0O#lD@ literal 16488 zcmeI4Yj6|S6@WK}B*r`ju$l0VDgq(Edf$?EBMEE^upLBP+jSpT|ByEatVfEqid>t_3+zf{1x8@Kea^SWB4^9 zTD?lcura?j{%(1C?wBbU=6OPCSgEh{FA*d)TrSFL0F=kWQP>;9-1Fm6QCbIdTL3gF z5s&>JM~~TUitMqk;QXXNS_PVv>O>4IODt`W66+*hw$JyLxZ?tJ5C*zvi-$uIO^AE! zNxuU8Z8Q^hTe6G3&SS4I0@_yk>ugnO4A{7G2QHBgr_ITiQ=HSuI_KGFlHv%GAs7;; z8G$7QmbRr|c5ey%<&Mcgq29MB9S%w!dy}q51%ha8Z7pwQ%GFpSLGe6KkTgNlIP8II zZ4q6J;}LB}%1OqL4`@~y=-5GA8N|%cq|A~_A(bIF zoU2e31EQ|R8dNppO|7!J3_@E~RdQ9?X0K2pvf8TM<0ep(Y`(MJfKSwcmnLZjCpq|T zpd12Rk`y_Yqy&=8agyqZ`0%T;5^T%!LDLNsCvfo1=laO$iTZ&1M;3K)NM3UL=J=5% zA*jZ}qV83~Vk01;kw!O>ZOrM}zp8{PHKfMiuz;6w6NQ=!TKQC|#aPxA5eaB88Cp(~ zV5*WEw^D4(Z_Ow|iZ@j@WK~jRAsZBstW##C0M7ChgHsfcahE7ExXb~Wp`1MF(>~Xo&$zCQy#E0fFw1Dez_0T82{FQ(p7UQ1^v*$xTUwCa(YQ z(jbXWCllnIILXQ!?jm7n3IteKNhF>Q!fGNite8o2P8QKA8k5NZoH@r*XAnaRoGWt% z<@6fdNj}dZ9I-=5Lw1Z(lNf0PvX{urEYpCF=zlqLL#u}=Fkdxuc~=kr2boLdGruNg z>g>Q8>NYMM1z3M!EfAA+k8%?O+OlgV)qkZ?M?)>i{_t#vFM={Y)26v<)O3}(X|5VI z&00PXQFJf7l1L5|Y0j}Su5MG8Ud!N(81Oncj)9jpXftY2r^G>MrB8vEUYc$D+Q}P%~wZa=RcrQrw-wX~o;rh>?oB1Oh}Ob|05KOWT;_Zb zt%VB#VlG;^%=sW%3l{>!T(oeR^Fg#0E(D0VXyG#FgJ>;W2oQ78!e!0}(OS3=Am*Zl z%bX9QwQwOo%tZ^AIUhu8;X;6zixw_(K8V)Bg#a-ZEnMb&5Uqs^0b(v%xXk$=S_>Bf z#9TDRRg!(Y8bshT)vfU1=}|9SNWcfLZBli;AHxzeF>KQo47=V3zk4yPg~YHA9>Fl- z84SBa?Rfa)A`B~fu*O%>5I=i)1+{JpRd%Cn_ovpkMi!UnY4SygIf*^fAhAN#{6i8OM345Sikn{v)$KvOPAG(J008ZdH3zo*O$biXWsHonf3U@=SH2tF047+wQH^Z z`;RKOPrPrF))jhp>yGjDzioJ|bllY6Y`)Mow(=F<;^(*AKEHVS>5EU!y6(C#XYGuq zY*R-UVF$zaui1ET!|scB{^^6FOXv4g*WLK@XIt;yHrM&q*6VARUwybw{`!q?|Gb?! zHSGACi$A=vsPx?Km#3DTdv)&Pt2=M)xwftD*rtWM_uqM9@*$~vW7mSQS3AKi7+Z7o z^DpQ2oQriO5^LZ0?%%Hz9obNHe0pd7Yt2*jqYq)f`s2UuaDV#6>z~f)esa%(*Pi~R zC+_Q=`F!jC3$a&=604_O9MjZ!`g`5#JKgOgrtexX{^02q2WpFtcl`8kmwPvF|4{4v zN$`P*qkATg+Y@^3z?%K!mX3L&+#9g-HQ#LhLD`(@CyIS#lP;_CW=A`U$Isf^(A>K5 z8P9wd`PUQeBiYm7#LW8ILtUpk8Zh7RJ-+%!zXtC5=h$(>HZ6a7g5OtJ96jUjJ$q81 zuf2aI-Zu$5r@XlNy)WGB@0Xl77bT^cuL;>jYX43o=r@d_LsgZ zfB0_CFOIbD*}L}z6*e&MtQ)qu3bf5y`n$FFes*J|Pd|L=%L$h|H`Trv`9)oQw9r zhAlFz9(`=Pg24i_-<0vGBeltR2&40)P8ldXQdeailxob(I zzV8>k7B`)9SMPmEe=zeRM6xk8XXYa2(|U7=5AD!sZj8ChTz^Es%+PLB1(=$5UAN0T z#t35!L`41OeXYn|^Q~uB0UoUiPys4H1*ib405Qhh#kZWzzJ?+KW6WI;xtA~t;JpVk zuNK&%+;sJNBiR(9B!D)QW}C2W+a!)_BEtXAABYG3Unk0_vj_cFmfbYu%)>>F=ll(ktQhNX>*9Y4FuX+jH0PtpUD(%&b(EtDd M07*qoM6N<$f;PaB9RL6T literal 16277 zcmeI3eT>}16~LWR3S31mu?~HA}?dpN+1}KWUdUPZ|4u2ED|CL{W-`?EZ zU*OMG)sab$qL#iA{4aU*=B3wDRQ9A@obV?Kn>53%q;%6QfmEYXg}o^%b4#PD8#BO9 zl)#kjWRqu~e<_);&1`a;RA39$Auw%^%+`=`qkid(99$gVHbZUn;Z-VOiUEU5<_kcB&3u~8?3A(6g9<3iXtlO5h*f6E~MPr6vL^i%CJ1c^EB*1 zd%GN8Z_tjnI&#wTlLwwrv#Y-CI*GuqUUFysY%&=P)c!QrRjIZIa=a!xNResiRfbEk zOfMtTXxmh0Yvpiiron(Rr~t?JpdHuKt~%}dt~c%W8M3YJJ1~q%q0k7 z@J@)JiL|GsSKL(v%sBAe*_r`{cfzHt?zMW~wmQM-@)T(L&K)%DK4yU?G7D27ickiw zRU4`S-FIt6*DdFwEE{VfObiW$S(R9`&2~(;?yb!*s7WW@9d977`yj`&yg;)O{3~*@ z22+w_Z)Q1-Wn)gFo`{cvYueVXE+0H!LwVNf+tb5`iKJFmJ??m~PJ6FgaS4 zSwoZ*nUm7|MZ31rl3I^2QX=AHOAUAIPuu6yTz&H_~xEFPwp4*I57G|!l` z1q0ntvtiNH%dtMeT1>bWHf>pooHl7$7A0DcMLtMgnHG5mEnr7?YiD>VJ%iMOFGTMvx6?BMS)HmC7w1EOA-{;P-R|ig*g^Qbcw-YVt`vEGAeI^ zs&Vb|7VFjDNjJ|$RPV)vp)*HgT6d;^nPXZjYc-%V`d^OR;?Bbe%*95o>&E2&AaYSW zyU)bdIlJ%-%>?(P8a#jDS)hmK9+zPjv~_YO>OT>jqvhGKKdkNW!*IcO(=@I|O(*fD zaW!h%vE1s|eh%JAgcC)YV^+b9b97g?1wP|}oGeKKtT|{iYB6RvKzSl>!@D{!s00EW zDYQWqJq;)O8O9V%!zfg-r?Ie%MXm5z4?box?dQw|6|P->F6BjMMVHbm;)@J|0Ktm{ z7oHEICAbhEc#+`3^Fg!(7Xkz?5?pvbh?d|&fZ#=f3(p795?lxnyhw22`5;881-O+>I3V&HE_oAD_YBk0@%ErKr=}DN5T*Q7hda-t+1P zidwR6G(T8uynSZd&z)D;Wj`sd`qt%pl9Sxmifhk|>=+z;Y5z0tzVVHpEtOus@zL@y zf7e*?O!B9Xzwo1t2cJB$@#y(q@4NGbnTPf)``q^*y#9t8zWv2Dr&iqVoqlnxHgoim zEz*ARiml%G{BQS-F8^S~bM?xK^9P*$_ii|~i5ffj_U@6*`R9)ffBv1rPo4hoSJ(aV z5%){0l8NL4$L3QfE?n{E!Q-dafBE6d%_WmZK3n;W|AQwc?*912wiw2 zzxJAkp8oqkKiNBP4{dx>yzI!1AFms@aHvqe-QBZw_{8LWPyO<><5!;CyYJkEGcW&U z`-gXa{ee%<9{PCqS6^HG;K|1>eC4nI%I4o6zv+>uB z^v3V5*)jhM_HXj*cU`vrfVSq~;kT|jcH6moUOh|QOMUO@KP*4+c<|!<=i#?31PUb8z2cVg;(*yvlb0km4-~@(cct1Q={zD7674dOTemLp(a) zPVwezP~dTK?_{+U!qvb#u7R%b<#f5+_?VeH8T z@e8w#rQ3MI6XY=?)pEBB=|2VQbav?6fZrgH*ey9;k6VLQAsg2RDVO0P1F57yX$+ivoX56 z=|*;wL-zwOGdtPLoA-S)ZwTynB++t?9zWxWZe}z#KKg{~-bBg#cNW!F65U_q=d&BuNtE67Ty&zen=~^A8hX(0`#&==)Db{2GWT{~-ak zn%`jg`b{1fV}A^oZG-F4A}~mtn8sZphT}NkIxa{BoJNe%CoS5=@8n_;3|$A)(4k)c z0yDEG_7tG8@fnt?7x?cD!vM=N#2dZ~7mYa{UpRC8@uKYa={wtI{@_3KI*mvH3Zm^( zDwS~(3!0lh;MdPBXt%dP>2%QA(4kgQV5i&Vrta>7u77KwsVZn1wrDzWhKbW|9`gRv{HQrFQ%vX^DxHkKe7la%@3kC ze(t<_0uNRn@pc?U3Q(E7B6{iYZmG(*c5QtvcKZjszWWfK-h0g3v>4_;B*2?P&*AOj zOWqQv&tB$6oLsm#Qp+nkk|gj!26tfA{_%g*9}ZRyuhi!5!@1TaIImxY`qwr5H)z3j zYf}^N^A_IE_DC(AyYkF399g)vvi`odrwHVK{!|sp({ucJ9R5RtX;$K46+ezi`_IYA k$;rvd$;rvd*$)8x2IFLFgF%;V^#A|>07*qoM6N<$f`!hKWdHyG From 0aa46f6a2a22ae2e37b66b8fd82432b47e5c1c27 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Wed, 30 Oct 2024 02:38:19 -0500 Subject: [PATCH 37/44] Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) * inhands * better inhands * indent --- .../Entities/Objects/Weapons/Melee/mining.yml | 4 +++ .../Melee/crusher-inhands.rsi/inhand-left.png | Bin 0 -> 596 bytes .../crusher-inhands.rsi/inhand-right.png | Bin 0 -> 598 bytes .../Melee/crusher-inhands.rsi/meta.json | 27 ++++++++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 599 bytes .../wielded-inhand-right.png | Bin 0 -> 601 bytes .../Weapons/Melee/crusher.rsi/icon.png | Bin 716 -> 431 bytes .../Weapons/Melee/crusher.rsi/inhand-left.png | Bin 655 -> 0 bytes .../Melee/crusher.rsi/inhand-right.png | Bin 637 -> 0 bytes .../Weapons/Melee/crusher.rsi/meta.json | 20 ++----------- .../Melee/crusher.rsi/wielded-inhand-left.png | Bin 823 -> 0 bytes .../crusher.rsi/wielded-inhand-right.png | Bin 851 -> 0 bytes .../Melee/crusher_dagger.rsi/inhand-left.png | Bin 503 -> 362 bytes .../Melee/crusher_dagger.rsi/inhand-right.png | Bin 495 -> 361 bytes .../Melee/crusher_dagger.rsi/meta.json | 4 +-- .../inhand-left.png | Bin 0 -> 611 bytes .../inhand-right.png | Bin 0 -> 620 bytes .../crusher_glaive-inhands.rsi/meta.json | 27 ++++++++++++++++++ .../wielded-inhand-left.png | Bin 0 -> 536 bytes .../wielded-inhand-right.png | Bin 0 -> 535 bytes .../Weapons/Melee/crusher_glaive.rsi/icon.png | Bin 618 -> 405 bytes .../Melee/crusher_glaive.rsi/inhand-left.png | Bin 576 -> 0 bytes .../Melee/crusher_glaive.rsi/inhand-right.png | Bin 568 -> 0 bytes .../Melee/crusher_glaive.rsi/meta.json | 20 ++----------- .../wielded-inhand-left.png | Bin 567 -> 0 bytes .../wielded-inhand-right.png | Bin 520 -> 0 bytes 26 files changed, 64 insertions(+), 38 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 337c7f07f7b9..5b565127a2d9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -149,6 +149,7 @@ - type: GunRequiresWield - type: Item size: Ginormous + sprite: Objects/Weapons/Melee/crusher-inhands.rsi - type: DisarmMalus - type: Prying @@ -191,3 +192,6 @@ - type: Tag tags: - Pickaxe + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1c1093a702e40a1a8086be972805dcb8ac611d63 GIT binary patch literal 596 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWRaI5Bx3@1XWe5!oHINawdGltj=zqrl_jTDAW*Qr>U%!4wziol9 zDp0xZ6VVJH#a9yK7yKU?Ft{GLa{?&CS>O>_3{-Fggc+x5^GO38Fw@h;F{C2y?X81F zhYWaF0yGUDO!)P`emmFIgYCznmQLV1{BG&Dgg4?sJ4%-RE#^>YU|@m~4cnPIwwe8` z(Eqk;nV#0hh>~lXQTmhDdc{ut&#DyFrMv&fm+d#QgHEkxSR0e?TEY>axjp-%wX0Rt8R2L?tc@!@5| bwSA0zXH3)Ixu}-|V~)Yo)z4*}Q$iB}1E=jS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..75934554bfae3c552bf228829cc2f6e6018c4ef8 GIT binary patch literal 598 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWEiGlRx3^bSRSgXdy?OJdfs6p-|NFV3|JScyKhxM)myMyoS9M3f zEl_!McA5u};wuUA3;vG`7+eqBIRTX6Ebxdd1}ZoL!i-b3`J{mknC@@dvo=`7-K!|`<3H+ zAXe{S@=5ReI{Z6X%B44OR#>_!gjUx76H;JWw8dQi@1!iRx1au4JM8gz^yt6yf~S$Y z&hTw$JsG<|bPe+*=fjZ;rUo-id|p#fX3~(o?^;bjCu79Z{fAYzNcEdBAK2V~VBg#| z-UsZyFN}Sr`n^FE;bctKgLsBjwe`xIw(oy^J#fdp@8(7(%@tz4{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json new file mode 100644 index 000000000000..c634ba82a375 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by alzore_ (discord) based on the proto-kinetic crusher", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e8e9a267ff2eb9b55ab0083fedda98514671c026 GIT binary patch literal 599 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl`{3-AeXwYRrdQ&S5K4OLZDHINY~D`O}vWnlb&KUeg>E*ry4W8tQ$9O ztY5$W=FOWs`fUq*Re@U7EZ4sUQbHv`e!>6I0mGyH`-OnAoCO|{#S9F5M?jcysy3fA z&_O+(E{-7;ac^&(oYt%$;u@%QM9nPp-~aPsGtwtB=xIcrd~!!n(dI^zap33aAdjE` z4u&hfQcH`uZP(skuC;V&q}i==I%l1o7?PJnnjKrh@UAp>*0mD7s@^~4nsaAwTlfA` zad-NqTU&Z7Z>y^DGWKreW)MDNyaQ)msJG=smIc6;3ej<$=- zzWnk_c)VV|id{`QbDB@eErti18ByGf#(BU}aCTahto-s-bNaWw_grVk7_-Z5LX0fy zmD0=W$~l&3D_3tVaS^`Hc-QQ-EK_;?1NE;i+jFkIJ04m3XaB#Qou~Q!r0wV5wyXNu ztvR9d-yHZ@UH|Ua%d3G0mQ20$|6j-4I9c|d@I1jK;m7+Ec9nE1?6l&WvHq@-$67na g8Z{)h)JPhfuNRXtcKKl&6ao_WboFyt=akR{0DdU&umAu6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4ef9c388d62a58017b13116d133dc50fddcd07b8 GIT binary patch literal 601 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl`{3-AeXRZ~;5x3^bSRSgXdHINa|Wn;({{m=OSerYK~SsBAjW8teZD) zu3x|Y#*G_0`fUq*Re@SBJviJAq=ZU>{DS|Z1BOTY_X`1KISV`@iy0XBj({-ZRBb+K zpo986T^vIy;@;jmTXe{Phb3W+MyDd@mG}QQ-8eR7%h6A}cn+t2cS>6Far*q|5)OGj zMiv1F1{C4~v&D|0gyW^LA?_P@FbW>g(rovzVpyf%uvJEBBSX>o8H+BjxhH?Reyhx0 z|JG#7+~<}KpO)^LlPGa4xaZttuiwwQmK+MUtX}dhW**a{%jfL3?^rX@wbW5AZ|R0_ zX(8_p?AtNt1k>Ai?KO98KB&f+7q0T#RvfwFX^no&X(w$31eRO`$)!e&{ z?9%gOZ?L{;i#rrLXL29^CHv&^Bp{Tp{V9{BBq f9F+2GEd{Ln(nh=Ut=>%nMi+yptDnm{r-UW|*iG%| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/icon.png index d9b6ca8157b74b5484b09fb1baecec7238373cd2..1df2bf438850dfc03a279ea0ce8dc98c3f672207 100644 GIT binary patch delta 396 zcmX@Zx}JH0WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hHfKQ04 zs;a8Jy?uJRNoZ(jX(>ZiR@Tj%Hw|P2az+2|=(kKKNMNS1 zae=QYQ1@vY88#p#ToU9L{2v)`fjJDDYVUANR1~jgc;M;c7-Hc+chXzFCIcSVX!R)z z!*2ezU$b4dTVC7v^RB>r}xHnqnbOpT%4Y2-v$iL~h=KUjbXc zbGJ8rt^c5Zu>7~7@0|QS!h7VkeP3_+%-^_2{`2RMe|iZgj`2pOJg!Y3}>% z$FaBMmTr9TKk!I-ho%L0Rf=xw`Tc!U|J&yLpwo5&Z8A*DZ64??VQg;@l&f99 i%Jcubf^&qIrhm_UE4e`K>l1;&!QkoY=d#Wzp$Pz#hOkQj delta 703 zcmV;w0zmz*1Iz`G8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00MqVL_t(| zoW+;FOB-Pr$Dcr|OpdWg37%T$jy;A;B;$8+FA2>AHr8NGWu;R@Ka zw{=9NlXETn&40}M-UTenir_Gy3urswFJBOCt?baZjamAU|AV(VEFr^@Kso>kd@uh?T$t2?<24oZ)DHCX)$f1^_RWN&=2;EICNDs+{4= zALhCfkgHeW2rs$2;1KOtzz}c zg$zb?aDU$de&HNQ;76?)qFy z0d?9Tp$?r+f;x;=fNv)G9?uWF+h_%*;^bb}hiSdo*bWP>7065*4&Z~vGqSP;aV`%F z-XtKyuWzM7h2IiT;kcT0GgMs(;D^ND0Sw$}UpV2O0B5~8OxFHE-{4IGSZ?BMc4GF6 leF zuUPAy97`kTtg-ka8sz`M%R{yP%-)Fw=lETGOzym&E}ehK(mkP%gQ3`kVTLl(0U1Gt zXB`X%?ko+KN(^TN8Ljw&bj0S)HZu6blym!>qO*#SfdtPSx5W?H>|*Pfp9)o(8M!`^ zypXkZ&dr>*XUApMr)P7XxWaOwm@{G;>*~9%OFwhpQ3_TO3s`^s?)Q%sJw{C`i#WxM zsMW^%wfA^#xyQ*iccHIF_=Oiw??~>|zgWGw*uUKM`L9aVRiB zbl$eydv~opx9a)^)r;K_{UmTu^pgP#N@!pP)bS36%YT`y`tw~Fc>8{_wrT8~Um9BK z^F>)g(4jfI?p$GErPEg@cBzYZ`x9IomKOK7m(7!6_mPRqwr>(-yrP~E`7`%qjC$f< zjzUAFhI11-Kg2ct5)4}{y6Bszgx~}I^{Y2zE|OQA#t^!nKdS1FYSG=$*tvf>Tv8bC z{i?mvcu2tNm!QZ(rbXA@|84eeuKgwW=RUV+!HZwDLS)z4*}Q$iB}St=AX diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/inhand-right.png deleted file mode 100644 index dcf606531ba187e61220fa6fa327c4490e1d29fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|S%3 zr;B4q#hkaZ_GcXm5IJUlP`zNnq}YjG2UkXCYjU)1b3SI*7@}G7<{Ep!ipdw27icso zOxaadB0YY8H!<`6Cg{cKsEk9*)uRpzT62FwmOrJ2bZ|(QLn;-aD^DZuHYt(`kRmLq7%}?w< zbJ2QVRek*7)!LIM9lTpUx5b|E-o)#z;f80w=vGf@w>$j8ul>*8(v$lv><`4|%SqYk z9&G;h*?jtMFA2N3Hx6HC-K8I<=O6xsrS`lZym}Cp|ZET;-V~XTo_vpMh2K z3^)TKM_1wHyv8N3^K}(g&STulch!Aq&$`wdH=`UT*)p#UJ3Y^DdB(o8A8OusIQ-dv z52)(pJjP${yKcR+_*}yr{_%Rh%7gvYY!eH1GyQjZ<5a+ zP%CEr%Fxn#k;|j_e8W0+g`NY!3uZr>*QoJZ59*&k3=L8i5*n{>UI(Tp22WQ%mvv4F FO#mFS8wLOX diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json index 2d91fb460be4..8a70dbd998c8 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ 0.3 ] ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/wielded-inhand-left.png deleted file mode 100644 index 6b55e43f72e5bc32ecda58186c6fc39ada252bcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 823 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V1b zPZ!6KiaBp*9qbkglsUfNDWK$Ln1_p%M7Ln)8qwX`gT#7TGY&RS`OUs%EvuyW1>J9A z5>Grc^jYUxRjydesyK?8%WK+zHjlq zpNG>;_3K_Rc+1(J=V zY|b#}-s<#Ms0Bx$B8T{aUjAMer8jQ^6aGGapEpUoL+Wtc znU#3%&)enie!E<+6v^S1_;#j2&YJgP-~;PlX{9gr6n?VW$N8hRU`dl)?~&%696Nuq zyJRlea3Rj7BH)B#KwuN2XI_)XVpXNc7CEn|Ac2ohT#waCr&-U=n|-$|ywh0z#+yGk z=9<5^HlCe&zeUl~i@~E$h+)!VmWC%9j0)&nGe)6wzfC)D2B+=%PZ@hjGW}&*8@n ziZ-sfnRCl!wQg+UQFZCxQ|x)9HqPGJy<^XZPdAu9 zq}E9B=LM`{&Jxy^*G%qA;BuI`aph+n(?ElKso7fJ-`~r+CH1;&_qNT!cNMmlTPqau zO0To_4c=O~p3OeuzvSEb{%06fyAf5e#%^RAvrpIa%dzNK})dqMc&bZtBPw+&g{*GCU&2t6kUvMlE*&R21 z?rT*8ofbI}$J<~3sQp;)^uqCG==wtwWKNS%G}%0G|-o z^mLP(H*cz{s)mM!W@TmV=(jEKRkgRb2g)n2bz2FfI7@>3g8xGSL$H5^&_qS?dWOTE zE{-7)?r*1^=4(~panaoO>wmn?RV9vKp`^Sbaa-xE6EX!yS^jl!$0+Q0u)XO($yyVe zqxZNA0}l$dAD3A2XH`>a%7!wpe`YUkBy+C%lX_w0ae}0f zJ&=CzC-;J3Gi#c>Lf2X2epcp3>zbKZ|2~fMs9wL{p(${mHrM6-7alQ*8yL@DrBFMs UYqR46pf?#jUHx3vIVCg!0Ey3o(*OVf delta 488 zcmaFG^qqNvWIY=L1H-D!!h1l9v%n*=n1O-s2naJy)#j6CU|?M7>EaktG3V_qdoSid zf#V;kwT0MT#u!3m)?SwPSM%V37Ow|KfdK@9V2py?VP@fy>FDVcWx`gqSD zbqZjAVPqrD>?pe6{D&A}MVBlFe*ewCo@aO2oVVsbZ^*RQH)}cDhPd2@m&?9?i1}Rh z`KYh$?D)rTQ+4bA=_~R%l$U+|XT4DVWO4Zdu1;nT{&l5l&*j?^Y}gw<$}k)&W{^0~ zh|b~oc|2+Tq1#-$q@PUvG2wRBLDsvxe7>KpS=6^mzbTq#a_Hn+w%eCtX02lMu=_Mc ztck1P%ZE8^O%@Eft^4htv_D@Wc!V*db7!KCU1;0$SsW~OY1wNw$<)^EmHxWzx~kib z`aQCxeW$V;j>+v`tNZ1}*^iO+VmI2Ky;u8U`FIWEH|b9~J2V;;;o%4h)W3{x_r1F( U@P}zHFftiDUHx3vIVCg!0EK1OLI3~& diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_dagger.rsi/inhand-right.png index cce061bab2933eef43d0399aa85e5c6a4a3fe57d..ae6e01f4a50fd3ab86113959a90076dd0f11a240 100644 GIT binary patch delta 325 zcmaFQ{E}&cWFj*I1H;_yjcNS%G}%0G|-o zn>TN!r<;U^hN`NnW@TmV=(jEKRkgRb2g+~UdUPF-;w%aB3;quU48i^tLK79m>lqGt zx;TbJxWAotTB=2X!_9E_hkyPyD}Gq6m~u-e?chz9Q}t^^nf4uFQRA5Lz?{k9xPI}D ziYkGex}y*NOk@4s)%eMp`x?)j{-z9$^O6?xSvVf_NAxgjo@Dy9XmYpWKEKmV-7+zD z&dUSqmAErfodQ0&Zs_9l5in@vWK#PP>=-%gx6og{i{C!onf{`@W10E++Ri%W71h6g zN;}_O^JHy`=KLT!h*-T9r|oTjDj*k_w7_kQ(NF9~jao_Q=!7jN#Kyi9AO z)|2+or`D&QZ`b=0QIYsXBgab6#cluI5S2eNYWG>M3B=8?_S?&Y=}sg^H?#`w5_{-- zpuV|9?|QZ1h4uSye-U(QDrRi|`h91M-dRi058;YMT8gR`!Vk3eC{AHfXNqYzZ<&yw zdmy~RIligiYwJ`7$qWCE##b~?EGR90wVM%xNb!1@J z*w6hZkrl|-4e$wZy?OIyX(>ZiR+hcJy{f9JfsDZV_3Lv*|1UP)GBJwBn_&*9@xN>L4LZB39fk$L90|Va?5N4dJ%_j|X#1c;z$B>G+ zx3|vb9aa!vNsykV@=x>q{~brQ+TSXk?g?GqWmL==#!z3jBX!xY^MVcxj4T2WqM@9{ zCcfxd<_*(gUq*$k?@vx>uzV^oL0J0%L-8iY0}+hO8_NDq%42*m%}Y39e~S~tnkhg2 z#a>wU)mz2lz^T86JO1}SC`@PJS@70o$A3kOInx=YZJm;7Q#;Ema(W#j3!BdCCcEid zch*|)ac$TWA`vkCPW$5qhSN7W8vdFd*p|~aUnfoP2b)=qyU_>5C7bKNI?Aw2_-?l# zsO*ITLqpA{zuTKHy9Y8b6fUY`kE*yU$)Mc8z{H_|oyccD@Jx7jP{RhB2hJj#5)LtP z9~8S-SP}xjv_V1ynATv>;Q#T!m8rmeh0OzIan1yWAh{2Y-7F90B~%_@*AYsXE%cO8 zeu)PITUo4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6949718a597117c697fe0311b2475cd2fa75e5f9 GIT binary patch literal 620 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-4e$wZy?OIyR#sMNDTBSey{f9}`t|D#WCR%h-_I5OKhxM)myIDbG_=51 zbw|G~P)A$j^7lZBza+>n_&*9@xN>L4LZB39fk$L90|Va?5N4dJ%_j|X#9B`m$B>G+ zx3^9g9ai9B4M-N5bi?%j|D6+q&G;rYu-z%Cdha!}@W{txb>ENEL9T~``K%W1#Wqhl z3JU$6t~hgXCd2z=CMJP#>HNLUHFX8z%pY_)5_=Nz=gj@jRKc}w zyCM_U_UyWU+6}C~OOqLD(r^BhRPYPt_^$f*#muL2ho;C*XSUeFBT(S~ac5V3TN55b3?N`pb^-D|H7Ya={|99(_cM4ZZ zMW6kPiYgb#+SOHDue;WoLp1j3&i%8F$+i?lr@mXiJePeTo5H!jy(VuJrbufS*K6xq za~wT)>(2fOuVh<<8n*1LSG;P?!Fr&0;)8UCf7z?f-e8E@YxZ3~^}eIW(wT>ZE3$hR z9@mzT=YG(;w>i&{;qG;hBN7dMubEqGzL*zyAv^WKe&(ba24AI;*2fFyDu84>UHx3v IIVCg!00hGL3IG5A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json new file mode 100644 index 000000000000..c6fb3d12d8eb --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "by alzore_ (discord) based on the proto-kinetic crusher glaive", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..330b936fb254e39bad9b220d6dd9c291e9aecaca GIT binary patch literal 536 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWRaI3jEoCr}5n%j(KUeg>E*rzmn>W|5UvF=3KhxMaG&FQaziol9 zDp2{&g6ai8imxQdFZe$)U~oNf=LArOv%n*=7^vU~2s2LA=930GAlB2xF{C2y?X9zA z%?bi-4+VLZ)_$+wotkhdOUfeXt*6-g?VdkoKJ3(MUZc+kGz0}aux0!tzsBqG-!~JK z&&BFrShjSpZ-ktmP_MLlx%WxtUfp?Jv)#V0xmot+xuu2gt=&4Ob&p9Dl^A|8P?`Q_ z(S9%CXE$$$oLjfnpT+mqbT=U|LWJSHn(-I z-ER9Ha%uM zE?-DeeYbOhvF*=w+X_v$^449;W;s1+y}%mz{qLDgHm|&v=p7jQxvE#8_L=$zN$dGe zEBDzqUc1`-Yts4a965V0KCI*mH@Eiwe{ib&=s#s3bzDt3<%K(=|0#D;b8_p?l2 Tq-;pM2a@n~^>bP0l+XkK8o$z0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive-inhands.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2d1a481266dd20b91a96205758635bf8bde856e9 GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&F%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl|-3h)VWRaI3rkP#>?Wzc0~$QAw1`2W7Wy?tnC=uBhd_3PK)ym@m+ziol9 zDp2`B(*+qoimxQdFZe$)U~oNf=LArOv%n*=7^vU~2s2LA=930GAjZ?hF{C2y?X8PN zO$Gw34}Du%GAjRH&n@d*>gTy>h3xT}|6^8k?mn#^Clnbk12hE%9FS&w67Thwfz#1W zC-t#LbmO#Xy>(Gji_WU5^CWL@{rSlvOz@cElv4ZSpH*IEZ&@-$@3P6u5Z^h^k7oT# zoB2G$^k&qyZ%4ZR6htR&+OB)ir1D)(WY+cbO+FW%+}gBRJ(OkY-TSvw6;F#rUkS?M zTXyZ=?o;1#x7-ZZeRJX-R0`bOnj@#7F6XdnDk>MyTGoyya&p<9P1CSN@w?ri@!Ae zZsVVgH}CFc{=lvituRc8-OqSsx|s=! Rxzl-&jHj!g%Q~loCIDCo)Z_pF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/icon.png index 980af14aa86c025fc1be958d55d6902884cca2ab..e22b636f3da9e25706672b73b822daca1573690b 100644 GIT binary patch delta 370 zcmaFGGL?CPWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hHfKQ0) z&6_vV(@pH{?bokgUs}qbs;Zimm1Q6!5E>eqEBb#&zb(VOt&IQgAKwz8%f>KKNMNS1 zae=QYQ1_BG9ic!0&^HP)!yNls3=~~aLm)iF~q{Zc7nH9vjPu;=xntG z%clO8-}W%rF?mL>{<($|BJ3)eY{fl!g4wK}x$iAjsFYy2xmZ>tzm{picPj>`H+#5_ z{BAh=n&I!Rw`c8H5~FK>Hui8al=q*08G7K&lL^7qwcIo8c>>zcm?r!)ivMHk@!Ikh zwoa#KLi+Rb)^D);+bu?uAJa- z5orN}MY@#I<14%_AhMAkfPP-|4gN@gUN`!4 qflJLV{)0f{wDVO!(=^{&-kATOhZR63qbJA!0000O*Na%yE`C^QR2~SwcEO%BNIOqM^1B{ct9&bqU~?)#)yjc zjSqLPYnIr+RiJk0?~@7-rhR!!kIr&gJclPy!p7}Ke#Gs1yR-_GTQ?s_WZ4T{%m1GC z_b0D~kszSo5;iszrfRoV4GY_9^-p+H6j z8BqpIYK{ieieDTSzXWfvCS09SRXZg#BaHFN!@FODJQIW)rXMVfylxtKcEVzj^GXc$ zcZznZ@a8XE=d_vQ0at#Z>Khi8wcV}^=@s2mH_Ya4x^`GeA#6Uw(eE!B1vs8RVtF8^ zalZIN?wT2@2d=#j&S?0Qd*XxGgKO{4OGdYSf9qwb@!-nW-^o8#izmL?%g#DyS6#hM x@LrDKid-g5*7A=(?}~31pV1ABoDT61%&+gsBy#kg{Rd1E44$rjF6*2UngEgz_AdYc diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/inhand-right.png deleted file mode 100644 index e2d24c9ee8af39cd2379d386af1a2122da0879fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnL zPZ!6KiaBp*`DZmdh#cGRAa2_z@_mwCaifw*i_=S2Ce^*3kJI!n`G&FPKQP;|?u(e2 zztO>EStjQ^((nCle8NAo^M1aJddfZC8OlrtWCR(WbubvXvou&LF`N-(47R@U{`=LU zoiPUj)i@*8Ul)~mp2cX_qP|XO!Qp%}=^Zscg%`8B1U~VtNSeaHHD9IE{9)%orWzi9 z9wtN0ib?D#2|8RDISk%#5%bax^ z^2+@C%PT^cmOnH-?(=o(hU)qiW%KVZkgm~vP_cady!Za+_qM29NO=9>%e_plA2NGR zR{H&PW&wICp^t;1*o6VjzsFc-tP-EG`rUyQ440#yU6~(rY86W|Q_fZH8`Bb88hUk$ zU$rlDoVBd<|F(ZC=jj}Hwr=CJf|^X%Ln(~gwx5|Tlu>@mWHRfSK>Y=(H*UOBl%(# zl-kb&mX&SsV(jUMX3?q`=_m>gTe~DWM4f Dl|1t* diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json index 2d91fb460be4..8a70dbd998c8 100644 --- a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi", + "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)", "size": { "x": 32, "y": 32 @@ -21,22 +21,6 @@ 0.3 ] ] - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-left.png deleted file mode 100644 index ce6c530f30cbc37d39d8a17ab069a3a9c60f73a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vnr zPZ!6KiaBp*?e{wrAacxJnB6=!MImolqJr92MxH*sJ{xu^aruKsHMp7AA9!&n#l)_` zmxnpgHR;tO=@?5D@!M6=JEz$nF0bQ$yZ1uz`SsJwEYhW)tYDb1n8~4!i@{Qh0gclT z%AR2&b<8ww{q>7kTLV^K-L}DT4%4A#+v4KVmd&T9UwM>cG}SA$Oz!x{nsa?$tM*>W zSGlOvc6edt_S+IXY%4#WOli895fbJ1|J{+8`}-87>Mhql6)C9N)Bo@B@%4p~Q~s_A zTmAX-lL!HpV|p=tPxYQFmdCT4C=8ntqhG!DKgUEHmH8_fp6>}h@VD7IposBu@^zax zNpHU|_Y~7J&{XtXetD+)yxzCYaeC9H+A!CMM}LutICg&lM=f`Qj3`4<2*Zg$Mg@0P zJe)aOrybvY_g&QKhuufwW;LX3&Ri0cxBAGm{ihzEcHvsNZ=*N2!0AiU0C?=X7Mh$H&4g%w5-3G@sqDCQ*Qq9UqAnbZBMYZcUkl{ zcgGLCZ`BW6G?}OyuYXDS!Ra--lmE=Iet)@t!cp%7@n_j)FY@7U+{fmK2!Ch&2hyK+ W9#3a}tRDhQ2@IaDelF{r5}E*3Z1E!i diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/wielded-inhand-right.png deleted file mode 100644 index 84abf8014872d68e3dda5c27c3762dd628caffae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnO zPZ!6KiaBp*?e#hwAklW;N$zN=eHG@SM@tXy0keB`Kif#BOq(wXgkP9NErE-hp+ z*9;PO-=4hRDQnjJ$xB`+y#MXsd2agW&re?}p8m-+L77p(oynn(r9p<1!BU8!NQL2v z2g8Yp3?K>h2)*ffCQ^wTBc8~ed;U3Wm#qX(%su&i@W5{ zuP&5-_;TXz-Ij;1el31$m>O};^<&-s{)YuWHZ$u?NZlH>)1q&?XUXo^?V0Ky7wv21 zJTvcJVP#zoQAt7!d*SuhsBPR`a(%}iPxDRsesam|>~-;hIu8ql z%>Rk=OHMwOs{j0D$*WVpZtZ42*_-e5$M}-v?|Wx2xCTX5U-3~h|LUzWmisSDv|bCo$=Lhu)>7*QZ(?ktjT1N{mCAfKl>PbD z==^cb-rrL%Zds?Gejr>wAtjrwW-Fub%FSh0WqiwHAM&lR3jTk3R^zIz_0qL0j)+iw c!CJ#?%5Yd}k#M&xFlre*UHx3vIVCg!0Kwwl6#xJL From d4db338ec6dd33d45b23abc022362cf6f8a5796e Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 30 Oct 2024 07:39:27 +0000 Subject: [PATCH 38/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 6131e0e6f437..7089711f43f8 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: You can drop food or drinks from your hands to interrupt eating it, again. - type: Fix - - message: Barber scissors are now interrupted if the item is dropped or if the - user changes hands. - type: Tweak - id: 7061 - time: '2024-08-08T11:39:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30361 - author: TheShuEd changes: - message: Add "thieving beacon" to Thief antag - a device that counts objects within @@ -3955,3 +3945,11 @@ id: 7560 time: '2024-10-29T05:07:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33046 +- author: Blackern5000 + changes: + - message: Proto-kitentic crushers, glaives, and daggers now have more accurate + inhand sprites. + type: Tweak + id: 7561 + time: '2024-10-30T07:38:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32212 From 010638d0e98856b371359422d25dc31b726be87e Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Wed, 30 Oct 2024 02:40:33 -0500 Subject: [PATCH 39/44] Make the security belt contain more useful items by default (#32291) * replace tear gas and flashbang with holobarrier and sec radio * holobarrier-belt-fix --- Resources/Prototypes/Catalog/Fills/Items/belt.yml | 4 ++-- Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 1 - .../Prototypes/Entities/Objects/Devices/holoprojectors.yml | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index d905350cded0..4a798b1a13a3 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -46,10 +46,10 @@ table: !type:AllSelector children: - id: Stunbaton - - id: GrenadeFlashBang - - id: TearGasGrenade - id: Handcuffs - id: Handcuffs + - id: HoloprojectorSecurity + - id: RadioHandheldSecurity - type: entity id: ClothingBeltSecurityFilled diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 845944302f7b..c1631537022c 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -487,7 +487,6 @@ - CartridgeAmmo - DoorRemote - Whistle - - HolosignProjector - BalloonPopper - type: ItemMapper mapLayers: diff --git a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml index 0c8b539c5903..0df74d80d6ab 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml @@ -121,6 +121,7 @@ - type: Tag tags: - HolofanProjector + - SecBeltEquip - type: StaticPrice price: 50 From 0f1e11c356cb62dc727501b318e773b26b3c05f7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 30 Oct 2024 07:41:40 +0000 Subject: [PATCH 40/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7089711f43f8..c594f6fc4fbd 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,17 +1,4 @@ Entries: -- author: TheShuEd - changes: - - message: Add "thieving beacon" to Thief antag - a device that counts objects within - a radius of itself as stolen. - type: Add - - message: Return thief structures stealing objectives. - type: Add - - message: Animal theft objectives can no longer appear if the animals are not on - the station. - type: Fix - id: 7062 - time: '2024-08-08T13:17:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/29997 - author: lzk228 changes: - message: RD labcoat added in RD's dresser. @@ -3953,3 +3940,11 @@ id: 7561 time: '2024-10-30T07:38:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32212 +- author: Blackern5000 + changes: + - message: Security belts now contain a holobarrier projector and a handheld security + radio by default rather than tear gas and a flashbang. + type: Tweak + id: 7562 + time: '2024-10-30T07:40:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32291 From 6834bc1fbdb2a71050ba7e21b77af11afa2b9265 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Wed, 30 Oct 2024 02:41:51 -0500 Subject: [PATCH 41/44] Add 3 bottle boxes to nanomed plus (#33018) three bottle boxes in nanomed plus --- .../Prototypes/Catalog/VendingMachines/Inventories/medical.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 466749120bd9..72b6b7617a04 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -7,6 +7,7 @@ Bloodpack: 5 EpinephrineChemistryBottle: 3 Syringe: 5 + BoxBottle: 3 ClothingEyesHudMedical: 2 ClothingEyesEyepatchHudMedical: 2 From 827d00eb18e040fa5c43403738491dbc744b3957 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 30 Oct 2024 07:42:56 +0000 Subject: [PATCH 42/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c594f6fc4fbd..60e14a48facc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: RD labcoat added in RD's dresser. - type: Add - id: 7063 - time: '2024-08-08T22:50:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/30671 - author: SlamBamActionman changes: - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner. @@ -3948,3 +3941,11 @@ id: 7562 time: '2024-10-30T07:40:33.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/32291 +- author: Blackern5000 + changes: + - message: Added three bottle boxes to the nanomed plus inventory for doctors to + carry small amounts of chemicals on their person + type: Add + id: 7563 + time: '2024-10-30T07:41:51.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/33018 From 4b467685b2929833ac1460940f14ae10e6be49dc Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Wed, 30 Oct 2024 04:15:30 -0500 Subject: [PATCH 43/44] Nukie med bundle now costs 24 tc and contains a unique defibrillator (#32720) * a-few-injectors * comment * defib-ops-when --- .../Locale/en-US/store/uplink-catalog.ftl | 4 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 16 ++- .../Prototypes/Catalog/uplink_catalog.yml | 4 +- .../Objects/Specific/Medical/defib.yml | 66 ++++++++++++ .../Objects/Specific/Medical/hypospray.yml | 97 +++++++++++++++++- .../Specific/Medical/defibsmall.rsi/icon.png | Bin 0 -> 300 bytes .../Medical/defibsmall.rsi/inhand-left.png | Bin 0 -> 294 bytes .../Medical/defibsmall.rsi/inhand-right.png | Bin 0 -> 300 bytes .../Specific/Medical/defibsmall.rsi/meta.json | 28 +++++ .../Specific/Medical/defibsmall.rsi/ready.png | Bin 0 -> 178 bytes .../Medical/defibsmall.rsi/screen.png | Bin 0 -> 198 bytes .../Specific/Medical/defibsyndi.rsi/icon.png | Bin 0 -> 300 bytes .../Medical/defibsyndi.rsi/inhand-left.png | Bin 0 -> 290 bytes .../Medical/defibsyndi.rsi/inhand-right.png | Bin 0 -> 295 bytes .../Specific/Medical/defibsyndi.rsi/meta.json | 28 +++++ .../Specific/Medical/defibsyndi.rsi/ready.png | Bin 0 -> 158 bytes .../Medical/defibsyndi.rsi/screen.png | Bin 0 -> 191 bytes .../Specific/Medical/medipen.rsi/dexpen.png | Bin 0 -> 286 bytes .../Medical/medipen.rsi/dexpen_empty.png | Bin 0 -> 311 bytes .../Specific/Medical/medipen.rsi/meta.json | 18 ++++ .../Specific/Medical/medipen.rsi/punctpen.png | Bin 0 -> 286 bytes .../Medical/medipen.rsi/punctpen_empty.png | Bin 0 -> 311 bytes .../Specific/Medical/medipen.rsi/pyrapen.png | Bin 0 -> 286 bytes .../Medical/medipen.rsi/pyrapen_empty.png | Bin 0 -> 311 bytes 24 files changed, 251 insertions(+), 10 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/ready.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png create mode 100644 Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/dexpen_empty.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png create mode 100644 Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen_empty.png diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index b3ea4b725129..a78f39d5696f 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -216,8 +216,8 @@ uplink-chemistry-kit-desc = A starter kit for the aspiring chemist, includes tox uplink-knives-kit-name = Throwing Knives Kit uplink-knives-kit-desc = A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims. -uplink-meds-bundle-name = Medical Bundle -uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens. +uplink-meds-bundle-name = Interdyne Medical Bundle +uplink-meds-bundle-desc = An assortment of autoinjectors and premium medical equipment to cover for every possible situation. Contains an elite compact defibrillator that can be used as a weapon. uplink-ammo-bundle-name = Ammo Bundle uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index c059f095e1db..75b3a290659c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -302,13 +302,19 @@ components: - type: StorageFill contents: + - id: DefibrillatorSyndicate - id: MedkitCombatFilled - - id: Defibrillator + amount: 4 + - id: Tourniquet + amount: 4 - id: CombatMedipen - amount: 3 - - id: ClothingHandsGlovesNitrile - - id: SyringeTranexamicAcid - - id: SyringeHyronalin + amount: 4 + - id: PunctAutoInjector + amount: 4 + - id: PyraAutoInjector + amount: 4 + - id: AirlossAutoInjector + amount: 4 - type: entity parent: ClothingBackpackDuffelSyndicateBundle diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 748a65b761a2..f31d85414d47 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -699,9 +699,9 @@ productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled discountCategory: rareDiscounts discountDownTo: - Telecrystal: 12 + Telecrystal: 16 cost: - Telecrystal: 20 + Telecrystal: 24 categories: - UplinkChemicals conditions: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml index 69c106efab13..fb0f3d52c681 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/defib.yml @@ -71,3 +71,69 @@ id: DefibrillatorOneHandedUnpowered parent: BaseDefibrillator suffix: One-Handed, Unpowered + +- type: entity + id: DefibrillatorCompact # This should be a research item at some point + parent: [ BaseDefibrillator, PowerCellSlotMediumItem ] + name: compact defibrillator + description: Now in fun size! + components: + - type: Sprite + sprite: Objects/Specific/Medical/defibsmall.rsi + layers: + - state: icon + - state: screen + map: [ "enum.ToggleVisuals.Layer" ] + visible: false + shader: unshaded + - state: ready + map: ["enum.PowerDeviceVisualLayers.Powered"] + shader: unshaded + - type: Item + size: Normal + - type: ToggleCellDraw + - type: PowerCellDraw + useRate: 100 + - type: Defibrillator + zapHeal: + types: + Asphyxiation: -40 + doAfterDuration: 6 + - type: DoAfter + - type: UseDelay + +- type: entity + id: DefibrillatorSyndicate + parent: DefibrillatorCompact + name: interdyne defibrillator + description: Doubles as a self-defense weapon against war-crime inclined tiders. + components: + - type: Sprite + sprite: Objects/Specific/Medical/defibsyndi.rsi + layers: + - state: icon + - state: screen + map: [ "enum.ToggleVisuals.Layer" ] + visible: false + shader: unshaded + - state: ready + map: ["enum.PowerDeviceVisualLayers.Powered"] + shader: unshaded + - type: MeleeWeapon + damage: + types: + Blunt: 8 + - type: ItemToggleMeleeWeapon + activatedSoundOnHit: + path: /Audio/Items/Defib/defib_zap.ogg + params: + variation: 0.250 + activatedSoundOnHitNoDamage: + path: /Audio/Items/Defib/defib_zap.ogg + params: + variation: 0.250 + volume: -10 + activatedDamage: + types: + Blunt: 8 + Shock: 16 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index c81af6e12801..93eeef2073c6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -271,7 +271,6 @@ transferAmount: 20 onlyAffectsMobs: false injectOnly: true - - type: SolutionContainerManager solutions: pen: @@ -284,6 +283,102 @@ - type: Tag tags: [] +- type: entity + name: puncturase auto-injector + parent: ChemicalMedipen + id: PunctAutoInjector + description: A rapid dose of puncturase and tranexamic acid, intended for combat applications. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: punctpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: punctpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 15 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 15 + reagents: + - ReagentId: Puncturase + Quantity: 10 + - ReagentId: TranexamicAcid + Quantity: 5 + - type: Tag + tags: [] + +- type: entity + name: pyrazine auto-injector + parent: ChemicalMedipen + id: PyraAutoInjector + description: A rapid dose of pyrazine and dermaline, intended for combat applications. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: pyrapen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: pyrapen_empty + - type: Hypospray + solutionName: pen + transferAmount: 20 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 20 + reagents: + - ReagentId: Pyrazine + Quantity: 10 + - ReagentId: Dermaline + Quantity: 10 + - type: Tag + tags: [] + +- type: entity + name: airloss auto-injector + parent: ChemicalMedipen + id: AirlossAutoInjector + description: A rapid dose of saline and dexalin plus, intended to get someone up quickly. + components: + - type: Sprite + sprite: Objects/Specific/Medical/medipen.rsi + layers: + - state: dexpen + map: ["enum.SolutionContainerLayers.Fill"] + - type: SolutionContainerVisuals + maxFillLevels: 1 + changeColor: false + emptySpriteName: dexpen_empty + - type: Hypospray + solutionName: pen + transferAmount: 40 + onlyAffectsMobs: false + injectOnly: true + - type: SolutionContainerManager + solutions: + pen: + maxVol: 40 + reagents: + - ReagentId: Saline + Quantity: 20 + - ReagentId: DexalinPlus + Quantity: 20 + - type: Tag + tags: [] + - type: entity name: space medipen parent: ChemicalMedipen diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..99a15087e7bca64d9ed9048f179bc3c73bae4282 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?ST<>loa931-l`;Qzs^5Vsd;^N|{X}f`vPL&ejK#HRz$S?Rm1Tfrd z-Wv%N<1FxqEM{QfI|Ravq8eTeK*3H=7sn6_|ECuZ^0g@NxCYAQzWo3Hqs;~lwN#%w zzRxyYIN*6T;?Kf*=2YkBX6so^yY^mWQVV(I0=1*kOVc2*)ui<~wM?vX=sZ8>p j`;(S$Z`dQx@J@bTnZ&`w+k0eyj$-h1^>bP0l+XkKXb*57 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..42d319843d99564a585539451cff12800025cf70 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%x9yxO4#fulk#l_PXZ^*Cj2MQNeOKbpAY$ZW{!T&*kVe|ea`+*{y z1s;*b3=DjSK$uZf!>a)(*zM`!7!u+B_L?JKg94As#chZFuFsjZ%zK)>jWPdTrno`*JZ|Rep$&$73=)fGe>69! z7GPvDVq!^Q;W%M%VRI^b|E)Lc*yFhV=;Xg+53HZSQBo_!@#43Fz=jv$jSZpu-+U6_ fS9-vHV2-(;f#2(u9ZM2{&SLO%^>bP0l+XkK5Uy%& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a2317f7facec9ebb7460963a2fae389595bfbf02 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%x9yxO4#fulk#l_PXZ^*Cj2MQNeOKbpAY$ZW{!T&*kVe|ea`+*{y z1s;*b3=DjSK$uZf!>a)(IMLI^F(ktM?KN+{0}3200SObM~ZKLOQ zMg|9Fh6XkUhO!lvI6;>1s;*b3=DjSL74G){)!Z!pu4AwV@QO1vIOhm1d*PmKm#tfgAUAY8oojw zW_|ej|8n$u$t71=Bon@DW6IlfCaLL?3S-G>$1fTP^=%pn2@DLuPlPtbiW}?z8p+`4 L>gTe~DWM4f3t%-Y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsmall.rsi/screen.png new file mode 100644 index 0000000000000000000000000000000000000000..1a2ac1cdec93e592dcf259277ebf800e1bcc406f GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikh0(?ST#hiWh;xij|9svqmD75+tQdbh>7ySSKe+CDwm0y5-&H|6fVg?4j z!ywFfJby(BP|(=Z#WBRfKRH2-!A;cRzzQag1>2d}I2t}FFti>&!NSxNAjdLcSwo{B j%ZG?Y-X0FtGiMlT`?*hL74ez^wKI6S`njxgN@xNAS7bM8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..69c4e441de03015ad7ab1cd7fda81e35e63e1fa6 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?ST1q1|ygoM=9)wQ&=jE#*I6&33l8G({Z-)qFT3xUThWz(_XSP z8PDB(gLg$^cm7VsRexpfAJAc6s~A>o=_uk}o$z?h{E19D3>%Nk44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zYH4X18ygD=2`MTn0>zlCg=&EmYe|q_@P8m+_`QuU7%0G5;1OBO zz`%D9gc)~C%zg_L?DlkV42f`md(Dxr#em28qQ#eg>2j_~)8#Xc=B2FH+FIveW^(Pg zgh7B|!h%B%Z+2G%&D=G8y`zHir?`D-(icAX?RN065ocS%7IU4E!8wGbo_RAnP-)Tu zhocRRT+GI|%RXeRd0Dj}>_K|w4*8V-j!Fh!Jrxq(H9H(|-p|cq^YykK|3?M3e+&_? Z*@bu6>)e|8%oXS?22WQ%mvv4FO#nAuVsroi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c30877c534e5fb585fd2ac7319483ebd6d4297bd GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zYH4X18ygD=2`MTn0>zlCg=&EmYe|q_@P8m+_`QuU7%0G5;1OBO zz`%D9gc)~C%zg_LoZ#u=7!u+B_L?`>0Rs+}faA~prRzCm&FW{o96K|zb7lX8-l?Aq zSvVp%1U6VGv|ll13%z1AojpKsZK_^6!>!zY2F5=}Wf+7Gl=?cn5>$L7zq>?=iA4vZ z!N);oo&T|QQ!)-G>iYPyL`U7WdSk?Nu||W(!A73bcEfD*g<|h{_Wt!h_Nt_HnbQMy b2TgPSpY}S3`(ri$-NxYQ>gTe~DWM4fD1Bat literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json new file mode 100644 index 000000000000..441fd4f5feb0 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/meta.json @@ -0,0 +1,28 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created by EmoGarbage404 (github) for Space Staiton 14 and modified by alzore_(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "ready" + }, + { + "name": "screen" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/ready.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a8065eadc06d555fc09d7e309e6b57a08342e0 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(Xzc0Y7!u+B_Uvv>1_cr318??EPLBND7~a9m yaY(jBL{o_2fw!$>?$bB3?(H~Vew~HkkJ`)+eL{tDJOv^^?F^o-elF{r5}E+i0WDep literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png b/Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi/screen.png new file mode 100644 index 0000000000000000000000000000000000000000..0c7a26a2a5eda1c3b5cd730138d9d6fdcc07eef0 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(7~<*T7!u*0EWx@sL8PZC(16SBpoRpivYdfa z=AuS@=ELn-)2+opNLIZ?x;Ff{&p zEl{QY9K$W?giABqW)yI4nrD=7QU8>HcP!IM-?g=OexX#nb2rPSjFr1(pM{DS|Z0ER1fW-J6saTa()7Bet#3xY6XeMwPPjwzXhKo6MDkV9f(>wLuyM>xy}Kvd8^NxEKhqD%m;J>gQu&X%Q~loCIFxseuDr2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json index 8e9f54f1d068..8872f25f52c6 100644 --- a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/meta.json @@ -96,6 +96,24 @@ }, { "name": "medipen-inhand-right" + }, + { + "name": "punctpen" + }, + { + "name": "punctpen_empty" + }, + { + "name": "pyrapen" + }, + { + "name": "pyrapen_empty" + }, + { + "name": "dexpen" + }, + { + "name": "dexpen_empty" } ] } diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen.png new file mode 100644 index 0000000000000000000000000000000000000000..fa529e8d189535e042a31cca590cddc3ada837e8 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUkME0JvSi7wUAvaewfgX40uX%o@ZsLIDy82tSLzimU%uQ>p|)ek zj>g7DppNtTZ+-$P{*oZS;QuIq;mVyE3xQIc1s;*b3=G_YAk0{w5%bXG_!3+0q3T9MhO@7PYHO(GM)5YTYKkM8q4{zgnj%jdfOdM_AnS!S^%wL N@O1TaS?83{1OUM_a?1b! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/punctpen_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..4bd9cd4858379faae8933ea2fd38884f95a7428a GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUkME29@M6NUxmHV-EZMPR$F5zwCQO*{;lqb}*Q&g|z5gpJUcP*} zv9YnCLJg>+bM;MLAjMx2Gh-o8inG8YvY3H^TM&d9>r>(<0tG8PT^vI! z{NMJS7CIon!@xPU;>iE{Jl{RHoR2L%{_fz6tsN`b|1J0&na~qCZkkfe9T3Tr)0oPFt{BqG+}$e-NLwz%A}iM-_f5Rh@T;;VO<6dz8-LVzVvZ q?ZB;{ToIP_JS#u2&vg!X&0BrmWO>@NU_PK57(8A5T-G@yGywnxT!1A2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png b/Resources/Textures/Objects/Specific/Medical/medipen.rsi/pyrapen.png new file mode 100644 index 0000000000000000000000000000000000000000..fee075cc3bef3ea8eea9fc2f5fd7e1d7f39c7e2a GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbUk1vT`vSi7wUAvYwS$()L0SG>P_;7D;mC|pSEAFVdQ&MBb@0F)$g8vpKsU_yrh*Nh9D(-!QOD4K1`AH-)ZaEtrXQH7sMRp%XIxQe629;Gw5*lf#p pJ8 Date: Wed, 30 Oct 2024 09:16:36 +0000 Subject: [PATCH 44/44] Automatic changelog update --- Resources/Changelog/Changelog.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 60e14a48facc..b9b8422096b7 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,20 +1,4 @@ Entries: -- author: SlamBamActionman - changes: - - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner. - type: Tweak - - message: Forensic Scanner can now scan fluid containers for DNA in reagents. - type: Tweak - - message: Fluids keep their DNA data when moved. - type: Fix - - message: Fluids now stain containers they're in with DNA. Make sure to scrub your - blood bucket after use! - type: Add - - message: Vomit now includes DNA! - type: Add - id: 7064 - time: '2024-08-08T23:27:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26699 - author: themias changes: - message: Butter can be sliced, cookie and toast recipes now use butter slices. @@ -3949,3 +3933,15 @@ id: 7563 time: '2024-10-30T07:41:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/33018 +- author: Blackern5000 + changes: + - message: Added the interdyne defibrillator, a black-and-red defibrillator that + can be used as a melee weapon. + type: Add + - message: The syndicate medical bundle now contains an interdyne defibrillator, + a collection of various instant injectors, tourniquets, and several combat kits. + The price has been raised to 24 tc. + type: Tweak + id: 7564 + time: '2024-10-30T09:15:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/32720