diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 0ad14a6cf3..493e37c95a 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -322,9 +322,9 @@ public sealed partial class ChatSystem : SharedChatSystem Color? colorOverride = null ) { - sender ??= Loc.GetString("chat-manager-sender-announcement"); + sender ??= Loc.GetString("cp14-announcement-gamemaster"); //CP14 replaced - var wrappedMessage = Loc.GetString("chat-manager-sender-announcement-wrap-message", ("sender", sender), ("message", FormattedMessage.EscapeText(message))); + var wrappedMessage = Loc.GetString("cp14-announcement-wrapped", ("sender", sender), ("message", FormattedMessage.EscapeText(message))); //CP14 replaced _chatManager.ChatMessageToAll(ChatChannel.Radio, message, wrappedMessage, default, false, true, colorOverride); if (playSound) { diff --git a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs index 3a7cc2c1a8..e091946fec 100644 --- a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs +++ b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Generation.cs @@ -2,6 +2,8 @@ using System.Linq; using System.Threading; using Content.Server._CP14.Demiplane.Components; using Content.Server._CP14.Demiplane.Jobs; +using Content.Server._CP14.RoundEnd; +using Content.Server.GameTicking; using Content.Shared._CP14.Demiplane.Components; using Content.Shared._CP14.Demiplane.Prototypes; using Content.Shared._CP14.MagicManacostModify; @@ -26,6 +28,7 @@ public sealed partial class CP14DemiplaneSystem private const double JobMaxTime = 0.002; [Dependency] private readonly ExamineSystemShared _examine = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; private void InitGeneration() { @@ -141,6 +144,11 @@ public sealed partial class CP14DemiplaneSystem if (generator.Comp.Location is null) return; + if (_gameTicker.RunLevel != GameRunLevel.InRound) + { + _popup.PopupEntity(Loc.GetString("cp14-demiplan-cannot-open-end-round"), generator, args.User); + return; + } //We cant open demiplan in another demiplan or if parent is not Map if (HasComp(Transform(generator).MapUid) || !HasComp(_transform.GetParentUid(args.User))) { @@ -151,9 +159,9 @@ public sealed partial class CP14DemiplaneSystem SpawnRandomDemiplane(generator.Comp.Location.Value, generator.Comp.SelectedModifiers, out var demiplane, out var mapId); //Admin log needed - //TEST EnsureComp(demiplane); + //Ура, щиткод и магические переменные! var tempRift = EntityManager.Spawn("CP14DemiplaneTimedRadiusPassway"); var tempRift2 = EntityManager.Spawn("CP14DemiplanRiftCore"); _transform.SetCoordinates(tempRift, Transform(args.User).Coordinates); diff --git a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs index 42b4bb5b7d..e1bbf33cbb 100644 --- a/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs +++ b/Content.Server/_CP14/Demiplane/CP14DemiplanSystem.Stabilization.cs @@ -19,7 +19,8 @@ public sealed partial class CP14DemiplaneSystem SubscribeLocalEvent(OnStabilizationMapInit); } - private void OnStabilizationMapInit(Entity ent, ref MapInitEvent args) + private void OnStabilizationMapInit(Entity ent, + ref MapInitEvent args) { ent.Comp.EndProtectionTime = _timing.CurTime + ent.Comp.ProtectedSpawnTime; } @@ -61,14 +62,27 @@ public sealed partial class CP14DemiplaneSystem } } - private void DeleteDemiplane(Entity demiplane) + public void DeleteAllDemiplanes(bool safe = true) + { + var query = EntityQueryEnumerator(); + + while (query.MoveNext(out var uid, out var demiplane)) + { + DeleteDemiplane((uid, demiplane), safe); + } + } + + private void DeleteDemiplane(Entity demiplane, bool safe = false) { var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var stabilizer, out var xform)) { if (TryTeleportOutDemiplane(demiplane, uid)) - _body.GibBody(uid); + { + if (!safe) + _body.GibBody(uid); + } } QueueDel(demiplane); diff --git a/Content.Server/_CP14/RoundEnd/CP14MagicContainerRoundFinisherComponent.cs b/Content.Server/_CP14/RoundEnd/CP14MagicContainerRoundFinisherComponent.cs new file mode 100644 index 0000000000..4442d5b404 --- /dev/null +++ b/Content.Server/_CP14/RoundEnd/CP14MagicContainerRoundFinisherComponent.cs @@ -0,0 +1,11 @@ +using Content.Server._CP14.Demiplane; + +namespace Content.Server._CP14.RoundEnd; + +/// +/// +/// +[RegisterComponent, Access(typeof(CP14DemiplaneSystem))] +public sealed partial class CP14MagicContainerRoundFinisherComponent : Component +{ +} diff --git a/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs new file mode 100644 index 0000000000..91da4b5a09 --- /dev/null +++ b/Content.Server/_CP14/RoundEnd/CP14RoundEndSystem.cs @@ -0,0 +1,105 @@ +using Content.Server._CP14.Demiplane; +using Content.Server.Chat.Systems; +using Content.Server.GameTicking; +using Content.Shared._CP14.MagicEnergy; +using Robust.Shared.Audio; +using Robust.Shared.Timing; + +namespace Content.Server._CP14.RoundEnd; + +public sealed partial class CP14RoundEndSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly CP14DemiplaneSystem _demiplane = default!; + + private readonly TimeSpan _roundEndDelay = TimeSpan.FromMinutes(1); + private TimeSpan _roundEndMoment = TimeSpan.Zero; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent( + OnFinisherMagicEnergyLevelChange); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + if (_roundEndMoment == TimeSpan.Zero) + return; + + if (_roundEndMoment > _timing.CurTime) + return; + + EndRound(); + } + + private void OnFinisherMagicEnergyLevelChange(Entity ent, + ref CP14MagicEnergyLevelChangeEvent args) + { + //Alarm 50% magic energy left + if (args.NewValue < args.OldValue && args.OldValue >= args.MaxValue / 2 && args.NewValue <= args.MaxValue / 2) + { + _chatSystem.DispatchGlobalAnnouncement( + Loc.GetString("cp14-round-end-monolith-50"), + announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg")); + } + + //We initiate round end timer + if (_roundEndMoment == TimeSpan.Zero && args.NewValue == 0) + StartRoundEndTimer(); + + //Full charged - cancel roundEnd + if (_roundEndMoment != TimeSpan.Zero && args.NewValue == args.MaxValue) + CancelRoundEndTimer(); + } + + private void StartRoundEndTimer() + { + _roundEndMoment = _timing.CurTime + _roundEndDelay; + + var time = _roundEndDelay.Minutes; + string unitsLocString; + if (_roundEndDelay.TotalSeconds < 60) + { + time = _roundEndDelay.Seconds; + unitsLocString = "eta-units-seconds"; + } + else + { + time = _roundEndDelay.Minutes; + unitsLocString = "eta-units-minutes"; + } + + _chatSystem.DispatchGlobalAnnouncement( + Loc.GetString( + "cp14-round-end-monolith-discharged", + ("time", time), + ("units", Loc.GetString(unitsLocString))), + announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg")); + } + + private void CancelRoundEndTimer() + { + _roundEndMoment = TimeSpan.Zero; + + _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("cp14-round-end-monolith-recharged"), + announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg")); + } + + private void EndRound() + { + if (_gameTicker.RunLevel != GameRunLevel.InRound) + return; + + _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("cp14-round-end"), + announcementSound: new SoundPathSpecifier("/Audio/_CP14/Ambience/event_boom.ogg")); + _roundEndMoment = TimeSpan.Zero; + _gameTicker.EndRound(); + _demiplane.DeleteAllDemiplanes(safe: false); + } +} diff --git a/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs b/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs index 2212bd4d63..327aac18cc 100644 --- a/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs +++ b/Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs @@ -84,7 +84,7 @@ public partial class SharedCP14MagicEnergySystem : EntitySystem { RaiseLocalEvent(uid, new CP14MagicEnergyLevelChangeEvent() { - OldValue = component.Energy, + OldValue = oldEnergy, NewValue = newEnergy, MaxValue = component.MaxEnergy, }); diff --git a/Resources/Audio/_CP14/Effects/attributions.yml b/Resources/Audio/_CP14/Effects/attributions.yml index 0b863ff562..03af1dfdcd 100644 --- a/Resources/Audio/_CP14/Effects/attributions.yml +++ b/Resources/Audio/_CP14/Effects/attributions.yml @@ -47,3 +47,9 @@ license: "CC0-1.0" copyright: 'by qubodup of Freesound.org.' source: "https://freesound.org/people/qubodup/sounds/442771/" + + +- files: ["round_start.ogg", "round_end.ogg"] + license: "CC0-1.0" + copyright: 'Created by MIXnikita' + source: "https://github.com/crystallpunk-14/crystall-punk-14" diff --git a/Resources/Audio/_CP14/Effects/round_end.ogg b/Resources/Audio/_CP14/Effects/round_end.ogg new file mode 100644 index 0000000000..0409ed1cd0 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/round_end.ogg differ diff --git a/Resources/Audio/_CP14/Effects/round_start.ogg b/Resources/Audio/_CP14/Effects/round_start.ogg new file mode 100644 index 0000000000..c4640cd4e5 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/round_start.ogg differ diff --git a/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl b/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl index e77939efae..fe7ded7fd8 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/demiplane.ftl @@ -1,3 +1,9 @@ cp14-demiplan-active-rift-warning = {$name} begins dragging surrounding creatures into the demiplane! cp14-demiplan-cannot-open = You can't use {$name} here. +cp14-demiplan-cannot-open-end-round = The demiplane link crystal is inactive. Rift creation is impossible. + +cp14-round-end-monolith-50 = The demiplane link crystal is half discharged. +cp14-round-end-monolith-discharged = You feel the connection to the other worlds begin to break.... The demiplane link crystal power will run out in { $time } { $units } if you don't charge it with mana... +cp14-round-end-monolith-recharged = Contact with the other worlds is being re-established. The demiplane link crystal is fully charged. +cp14-round-end = The demiplane link crystal was completely discharged. The connection to the other worlds has been severed. The "interesting" part of the story is over here.... diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl index fc0cea1a52..cb59656a1d 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/demiplane.ftl @@ -1,3 +1,9 @@ cp14-demiplan-active-rift-warning = {$name} начинает затягивать окружающих существ в демиплан! cp14-demiplan-cannot-open = Вы не можете использовать {$name} здесь. +cp14-demiplan-cannot-open-end-round = Кристалл связи с демипланами неактивен. Открытие прохода невозможно. + +cp14-round-end-monolith-50 = Кристалл связи с демипланами разряжен на половину. +cp14-round-end-monolith-discharged = Вы чувствуете, что связь с другими мирами начинает рваться... Сила кристалла связи иссякнет через { $time } { $units }, если не зарядить его маной... +cp14-round-end-monolith-recharged = Связь с другими мирами восстанавливается. Энергия кристалла связи восстановлена. +cp14-round-end = Кристалл связи с демипланами окончательно разрядился. Связь с другими мирами оборвалась. "Интересная" часть этой истории окончена... diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index 848bc76bd6..cf2e3f2e45 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -98,11 +98,11 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: BAAAAAACBAAAAAAIBgAAAAABBAAAAAACBAAAAAAHBgAAAAACBQAAAAADBQAAAAAABgAAAAACBgAAAAACBgAAAAABBQAAAAADBgAAAAADBAAAAAALFwAAAAABGQAAAAAHBgAAAAAABgAAAAADBgAAAAABBgAAAAAABgAAAAAABgAAAAACBgAAAAAABQAAAAAABQAAAAAABQAAAAACBQAAAAABBQAAAAADBQAAAAABBAAAAAALFwAAAAAAGQAAAAACBwAAAAAABgAAAAABBgAAAAABBQAAAAAABAAAAAAABgAAAAADBgAAAAACBgAAAAADBgAAAAADBQAAAAAABwAAAAAABwAAAAABBgAAAAAABAAAAAAEFwAAAAAFGQAAAAACBwAAAAACBgAAAAABBgAAAAADBgAAAAABBgAAAAABBgAAAAADBgAAAAADBgAAAAABBgAAAAAABQAAAAACBwAAAAADBwAAAAAABgAAAAAABAAAAAABFwAAAAAEGQAAAAAGBwAAAAACBwAAAAADBwAAAAABBgAAAAACBAAAAAAGBgAAAAACBgAAAAABBgAAAAAABgAAAAACBgAAAAACBgAAAAADBgAAAAACBgAAAAACBAAAAAAFFwAAAAAEGQAAAAABBQAAAAACBQAAAAACBgAAAAACBgAAAAADBAAAAAAABAAAAAAEBAAAAAACBAAAAAADBAAAAAAHBAAAAAAFBAAAAAAGBAAAAAANBAAAAAAHBAAAAAAJFwAAAAAEGQAAAAABBAAAAAAHBAAAAAAKBAAAAAAKBAAAAAANBAAAAAAGFwAAAAAFFwAAAAAEFwAAAAAEFwAAAAADFwAAAAADFwAAAAAFFwAAAAAAFwAAAAAAFwAAAAABFwAAAAAFGQAAAAAAAgAAAAAJFwAAAAABFwAAAAAEFwAAAAACFwAAAAAAFwAAAAAEBAAAAAABBAAAAAAABAAAAAAIBAAAAAAKBAAAAAAABAAAAAAHBAAAAAAABAAAAAAGFwAAAAAFGQAAAAAHBAAAAAAABAAAAAAMBAAAAAAIBAAAAAABBAAAAAAMFwAAAAADBAAAAAAEBgAAAAABBwAAAAACBgAAAAADBwAAAAACBQAAAAACBQAAAAACBAAAAAANFwAAAAABGQAAAAAHBQAAAAABBQAAAAACBQAAAAABBQAAAAABBAAAAAALFwAAAAAABAAAAAABBQAAAAAABgAAAAABBwAAAAAABgAAAAABBgAAAAAABwAAAAAABAAAAAAIFwAAAAAAGQAAAAACBQAAAAAABQAAAAAABQAAAAACBQAAAAADBAAAAAABFwAAAAAABAAAAAALBQAAAAABBwAAAAACBgAAAAACBwAAAAACBwAAAAAABgAAAAADBAAAAAAFFwAAAAAEGQAAAAACBAAAAAABBAAAAAAFBQAAAAAABAAAAAANBAAAAAAGFwAAAAACBAAAAAALBgAAAAADBwAAAAABBQAAAAADBAAAAAAJBAAAAAAMBAAAAAAMBAAAAAAAFwAAAAACGQAAAAAEBAAAAAAEBQAAAAACBQAAAAADBQAAAAABFwAAAAAAFwAAAAAEBAAAAAAHBwAAAAAABgAAAAADBQAAAAAABQAAAAACFwAAAAACFwAAAAABFwAAAAAEFwAAAAAFGQAAAAAFBAAAAAAABQAAAAAABQAAAAABBQAAAAACFwAAAAADFwAAAAAFBAAAAAAJBAAAAAAJBAAAAAAEBAAAAAAMBAAAAAAIFwAAAAADFwAAAAABGQAAAAABGQAAAAABGQAAAAAGFwAAAAACFwAAAAAAFwAAAAAEFwAAAAACFwAAAAAFFwAAAAADFwAAAAABFwAAAAACFwAAAAAEFwAAAAADFwAAAAAEFwAAAAAEGQAAAAABGQAAAAAFGQAAAAAHGQAAAAAHFwAAAAAAFwAAAAABFwAAAAADFwAAAAAAFwAAAAAFFwAAAAAFBAAAAAAEBAAAAAAJBAAAAAAFBAAAAAABBAAAAAAAGAAAAAAAGQAAAAAEGQAAAAAAGQAAAAAFGQAAAAAF + tiles: BAAAAAACBAAAAAAIBgAAAAABBAAAAAACBAAAAAAHBgAAAAACBQAAAAADBQAAAAAABgAAAAACBgAAAAACBgAAAAABBQAAAAADBgAAAAADBAAAAAALFwAAAAABGQAAAAAHBgAAAAAABgAAAAADBgAAAAABBgAAAAAABgAAAAAABgAAAAACBgAAAAAABQAAAAAABQAAAAAABQAAAAACBQAAAAABBQAAAAADBQAAAAABBAAAAAALFwAAAAAAGQAAAAACBwAAAAAABgAAAAABBgAAAAABBQAAAAAABAAAAAAABgAAAAADBgAAAAACBgAAAAADBgAAAAADBQAAAAAABwAAAAAABwAAAAABBgAAAAAABAAAAAAEFwAAAAAFGQAAAAACBwAAAAACBgAAAAABBgAAAAADBgAAAAABBgAAAAABBgAAAAADBgAAAAADBgAAAAABBgAAAAAABQAAAAACBwAAAAADBwAAAAAABgAAAAAABAAAAAABFwAAAAAEGQAAAAAGBwAAAAACBwAAAAADBwAAAAABBgAAAAACBAAAAAAGBgAAAAACBgAAAAABBgAAAAAABgAAAAACBgAAAAACBgAAAAADBgAAAAACBgAAAAACBAAAAAAFFwAAAAAEGQAAAAABBQAAAAACBQAAAAACBgAAAAACBgAAAAADBAAAAAAABAAAAAAEBAAAAAACBAAAAAADBAAAAAAHBAAAAAAFBAAAAAAGBAAAAAANBAAAAAAHBAAAAAAJFwAAAAAEGQAAAAABBAAAAAAHBAAAAAAKBAAAAAAKBAAAAAANBAAAAAAGFwAAAAAFFwAAAAAEFwAAAAAEFwAAAAADFwAAAAADFwAAAAAFFwAAAAAAFwAAAAAAFwAAAAABFwAAAAAFGQAAAAAAAgAAAAAJFwAAAAABFwAAAAAEFwAAAAACFwAAAAAAFwAAAAAEBAAAAAABBAAAAAAABAAAAAAIBAAAAAAKBAAAAAAABAAAAAAHBAAAAAAABAAAAAAGFwAAAAAFGQAAAAAHBAAAAAAABAAAAAAMBAAAAAAIBAAAAAABBAAAAAAMFwAAAAADBAAAAAAEBgAAAAABBwAAAAACBgAAAAADBwAAAAACBQAAAAACBQAAAAACBAAAAAANFwAAAAABGQAAAAAHBQAAAAABBQAAAAACBQAAAAABBQAAAAABBAAAAAALFwAAAAAABAAAAAABBQAAAAAABgAAAAABBwAAAAAABgAAAAABBgAAAAAABwAAAAAABAAAAAAIFwAAAAAAGQAAAAACBQAAAAAABQAAAAAABQAAAAACBQAAAAADBAAAAAABFwAAAAAABAAAAAALBQAAAAABBwAAAAACBgAAAAACBwAAAAACBwAAAAAABgAAAAADBAAAAAAFFwAAAAAEGQAAAAACBAAAAAABBAAAAAAFBQAAAAAABAAAAAANBAAAAAAGFwAAAAACBAAAAAALBgAAAAADBwAAAAABBQAAAAADBAAAAAAJBAAAAAAMBAAAAAAMBAAAAAAAFwAAAAACGQAAAAAEBAAAAAAEBQAAAAACBQAAAAADBQAAAAABFwAAAAAAFwAAAAAEBAAAAAAHBwAAAAAABgAAAAADBQAAAAAABQAAAAACFwAAAAACFwAAAAABFwAAAAAEFwAAAAAFGQAAAAAFBAAAAAAABQAAAAAABQAAAAABBQAAAAACFwAAAAADFwAAAAAFBAAAAAAJBAAAAAAJBAAAAAAEBAAAAAAMBAAAAAAIFwAAAAADFwAAAAABGQAAAAABGQAAAAABGQAAAAAGFwAAAAACFwAAAAAAFwAAAAAEFwAAAAACFwAAAAAFFwAAAAADFwAAAAABFwAAAAACFwAAAAAEFwAAAAADFwAAAAAEFwAAAAAEGQAAAAABGQAAAAAFGQAAAAAHGQAAAAAHFwAAAAAAFwAAAAABFwAAAAADFwAAAAAAFwAAAAAFFwAAAAAFBAAAAAAEBAAAAAAJBAAAAAAFBAAAAAABGAAAAAAAGAAAAAAAGQAAAAAEGQAAAAAAGQAAAAAFGQAAAAAF version: 6 -1,0: ind: -1,0 - tiles: BAAAAAAABAAAAAACBwAAAAADBAAAAAAFBAAAAAAAFwAAAAABBAAAAAAKBwAAAAADBgAAAAACBgAAAAABBAAAAAAAGAAAAAAAGAAAAAAEGQAAAAADGQAAAAAIGQAAAAAFBwAAAAAABQAAAAACBwAAAAABBwAAAAABBAAAAAAMFwAAAAAEBAAAAAAJBQAAAAADBgAAAAABBgAAAAABBQAAAAABGAAAAAAAGAAAAAACFwAAAAABFwAAAAADGQAAAAAHBQAAAAADBAAAAAAFBAAAAAAMBAAAAAADBAAAAAAEFwAAAAABBAAAAAADFAAAAAADFAAAAAADBAAAAAANBAAAAAAABAAAAAAFBAAAAAANBAAAAAADFwAAAAAAGQAAAAAHBQAAAAADBgAAAAACBgAAAAACBQAAAAAABAAAAAAHFwAAAAAFBAAAAAAJDQAAAAAADQAAAAAADQAAAAAAAwAAAAAGAwAAAAAIAwAAAAAABAAAAAADFwAAAAAEGQAAAAAEBwAAAAADBgAAAAACBgAAAAABBQAAAAACBAAAAAAKFwAAAAACBAAAAAABDQAAAAAADQAAAAAADQAAAAAAAwAAAAAFAwAAAAADAwAAAAAEBAAAAAAAFwAAAAACGQAAAAAHBQAAAAAABQAAAAABBwAAAAABBwAAAAAABAAAAAAKFwAAAAADBAAAAAADDQAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAABAwAAAAAFBAAAAAAEFwAAAAAFGQAAAAAHBAAAAAAGBAAAAAAKBAAAAAANBAAAAAAGBAAAAAALFwAAAAABBAAAAAACBAAAAAACBAAAAAAJBAAAAAABBAAAAAAJBAAAAAAABAAAAAAIBAAAAAANFwAAAAACGQAAAAAHFwAAAAAFFwAAAAAFFwAAAAAEFwAAAAAEFwAAAAAAFwAAAAABFwAAAAADFwAAAAACFwAAAAACFwAAAAABFwAAAAABFwAAAAAEFwAAAAABFwAAAAAFFwAAAAABGQAAAAACGQAAAAAFGQAAAAAAGQAAAAAIGQAAAAABGQAAAAAEGQAAAAAEGQAAAAAHGQAAAAAHGQAAAAADGQAAAAAFGQAAAAABGQAAAAAGGQAAAAAHGQAAAAAFGQAAAAAGGQAAAAAHGQAAAAAGGQAAAAAGGQAAAAAEGQAAAAAEGQAAAAABGQAAAAAEGQAAAAABGQAAAAAEGQAAAAAGGQAAAAAGGQAAAAAEGQAAAAAGGQAAAAAFGQAAAAABGQAAAAAEGQAAAAAFFwAAAAAFFwAAAAACFwAAAAADFwAAAAADFwAAAAAAFwAAAAACFwAAAAAEGAAAAAABFgAAAAAAFgAAAAAAFwAAAAACFwAAAAAAFwAAAAAFFwAAAAAAFgAAAAAEFgAAAAAFBAAAAAANBAAAAAABBAAAAAACBAAAAAAMBAAAAAAHBAAAAAAFBAAAAAABBAAAAAAHDgAAAAAFDgAAAAACBAAAAAALBAAAAAACFwAAAAAEBAAAAAAABQAAAAADBAAAAAANDgAAAAAFDgAAAAAADgAAAAAABAAAAAAJDgAAAAABDgAAAAACDgAAAAAADgAAAAAEDgAAAAAFDgAAAAAADgAAAAAFBAAAAAALFwAAAAADBAAAAAAFBgAAAAACBwAAAAACDgAAAAAFDgAAAAAEDgAAAAADDgAAAAADDgAAAAABDgAAAAAADgAAAAADDgAAAAABDgAAAAADDgAAAAADDgAAAAAEBAAAAAAAFwAAAAACBAAAAAAMBwAAAAAABwAAAAAADgAAAAAFDgAAAAABDgAAAAAADgAAAAADDgAAAAAADgAAAAAADgAAAAACDgAAAAAFDgAAAAAADgAAAAABDgAAAAAFBAAAAAALFwAAAAAFBAAAAAAHBQAAAAACBQAAAAACDgAAAAAFDgAAAAAFDgAAAAACBAAAAAAHDgAAAAAEDgAAAAACDgAAAAACDgAAAAABDgAAAAADDgAAAAAEDgAAAAABBAAAAAALFwAAAAACBAAAAAALBwAAAAACBgAAAAAB + tiles: BAAAAAAABAAAAAACBwAAAAADBAAAAAAFBAAAAAAAFwAAAAABBAAAAAAKDQAAAAAADQAAAAAABgAAAAAAGAAAAAAAGAAAAAAAGAAAAAAEGQAAAAADGQAAAAAIGQAAAAAFBwAAAAAABQAAAAACBwAAAAABBwAAAAABBAAAAAAMFwAAAAAEBAAAAAAJDQAAAAAADQAAAAAABgAAAAAAGAAAAAAAGAAAAAAAGAAAAAACFwAAAAABFwAAAAADGQAAAAAHBQAAAAADBAAAAAAFBAAAAAAMBAAAAAADBAAAAAAEFwAAAAABBAAAAAADDQAAAAAADQAAAAAABAAAAAANBAAAAAAABAAAAAAFBAAAAAANBAAAAAADFwAAAAAAGQAAAAAHBQAAAAADBgAAAAACBgAAAAACBQAAAAAABAAAAAAHFwAAAAAFBAAAAAAJDQAAAAAADQAAAAAADQAAAAAAAwAAAAAGAwAAAAAIAwAAAAAABAAAAAADFwAAAAAEGQAAAAAEBwAAAAADBgAAAAACBgAAAAABBQAAAAACBAAAAAAKFwAAAAACBAAAAAABDQAAAAAADQAAAAAADQAAAAAAAwAAAAAFAwAAAAADAwAAAAAEBAAAAAAAFwAAAAACGQAAAAAHBQAAAAAABQAAAAABBwAAAAABBwAAAAAABAAAAAAKFwAAAAADBAAAAAADDQAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAABAwAAAAAFBAAAAAAEFwAAAAAFGQAAAAAHBAAAAAAGBAAAAAAKBAAAAAANBAAAAAAGBAAAAAALFwAAAAABBAAAAAACBAAAAAACBAAAAAAJBAAAAAABBAAAAAAJBAAAAAAABAAAAAAIBAAAAAANFwAAAAACGQAAAAAHFwAAAAAFFwAAAAAFFwAAAAAEFwAAAAAEFwAAAAAAFwAAAAABFwAAAAADFwAAAAACFwAAAAACFwAAAAABFwAAAAABFwAAAAAEFwAAAAABFwAAAAAFFwAAAAABGQAAAAACGQAAAAAFGQAAAAAAGQAAAAAIGQAAAAABGQAAAAAEGQAAAAAEGQAAAAAHGQAAAAAHGQAAAAADGQAAAAAFGQAAAAABGQAAAAAGGQAAAAAHGQAAAAAFGQAAAAAGGQAAAAAHGQAAAAAGGQAAAAAGGQAAAAAEGQAAAAAEGQAAAAABGQAAAAAEGQAAAAABGQAAAAAEGQAAAAAGGQAAAAAGGQAAAAAEGQAAAAAGGQAAAAAFGQAAAAABGQAAAAAEGQAAAAAFFwAAAAAFFwAAAAACFwAAAAADFwAAAAADFwAAAAAAFwAAAAACFwAAAAAEGAAAAAABFgAAAAAAFgAAAAAAFwAAAAACFwAAAAAAFwAAAAAFFwAAAAAAFgAAAAAEFgAAAAAFBAAAAAANBAAAAAABBAAAAAACBAAAAAAMBAAAAAAHBAAAAAAFBAAAAAABBAAAAAAHDgAAAAAFDgAAAAACBAAAAAALBAAAAAACFwAAAAAEBAAAAAAABQAAAAADBAAAAAANDgAAAAAFDgAAAAAADgAAAAAABAAAAAAJDgAAAAABDgAAAAACDgAAAAAADgAAAAAEDgAAAAAFDgAAAAAADgAAAAAFBAAAAAALFwAAAAADBAAAAAAFBgAAAAACBwAAAAACDgAAAAAFDgAAAAAEDgAAAAADDgAAAAADDgAAAAABDgAAAAAADgAAAAADDgAAAAABDgAAAAADDgAAAAADDgAAAAAEBAAAAAAAFwAAAAACBAAAAAAMBwAAAAAABwAAAAAADgAAAAAFDgAAAAABDgAAAAAADgAAAAADDgAAAAAADgAAAAAADgAAAAACDgAAAAAFDgAAAAAADgAAAAABDgAAAAAFBAAAAAALFwAAAAAFBAAAAAAHBQAAAAACBQAAAAACDgAAAAAFDgAAAAAFDgAAAAACBAAAAAAHDgAAAAAEDgAAAAACDgAAAAACDgAAAAABDgAAAAADDgAAAAAEDgAAAAABBAAAAAALFwAAAAACBAAAAAALBwAAAAACBgAAAAAB version: 6 -1,-2: ind: -1,-2 @@ -110,7 +110,7 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: GQAAAAAEFwAAAAAABAAAAAAKBQAAAAAABQAAAAABBQAAAAAABQAAAAABBQAAAAAABAAAAAAAFwAAAAAFBAAAAAAJAwAAAAADAwAAAAAGAwAAAAAEAwAAAAADBAAAAAALGQAAAAADFwAAAAAFBAAAAAAGBQAAAAACBQAAAAABBQAAAAADBQAAAAACBQAAAAAABAAAAAAGFwAAAAAEBAAAAAAGAwAAAAAAAwAAAAADAwAAAAAIAwAAAAABBAAAAAAMGQAAAAAIFwAAAAABBAAAAAAMBQAAAAACBAAAAAAGBAAAAAAGBAAAAAANBAAAAAAGBAAAAAANFwAAAAAEBAAAAAAHAwAAAAAEAwAAAAADAwAAAAAIAwAAAAAABAAAAAABGQAAAAADFwAAAAADFwAAAAAFGAAAAAAAFwAAAAAFFwAAAAADFwAAAAACFwAAAAAAFwAAAAAEFwAAAAAABAAAAAAAAwAAAAAFAwAAAAABBQAAAAAAAwAAAAADBAAAAAAEGQAAAAAEGQAAAAAAGQAAAAABGQAAAAAHGQAAAAAFGQAAAAAGGQAAAAAAGQAAAAAFGQAAAAAIGQAAAAABAwAAAAAHAwAAAAADAwAAAAAGAwAAAAAHAwAAAAAFAwAAAAABGQAAAAAIGQAAAAACGQAAAAACGQAAAAAHGQAAAAABGQAAAAACGQAAAAAGGQAAAAABGQAAAAAGGQAAAAAFAwAAAAAHAwAAAAAGAwAAAAAEAwAAAAAHAwAAAAAAAwAAAAAFGQAAAAAHFwAAAAAEFwAAAAABFwAAAAADFwAAAAAFFwAAAAAFFwAAAAAFFwAAAAABFwAAAAAEFwAAAAAEBAAAAAABAwAAAAAGAwAAAAAAAwAAAAABBQAAAAABBQAAAAAAGQAAAAAFFwAAAAACBAAAAAABAQAAAAADAQAAAAABAQAAAAAAAQAAAAAEAQAAAAAEBAAAAAADFwAAAAADBAAAAAANAwAAAAACAwAAAAAAAwAAAAAGAwAAAAAHAwAAAAAGGQAAAAAEFwAAAAAAAQAAAAABAQAAAAACAQAAAAABAQAAAAADAQAAAAADAwAAAAADAgAAAAACFwAAAAABBAAAAAAKAwAAAAABAwAAAAAFAwAAAAAIAwAAAAAEAwAAAAAFGQAAAAAEFwAAAAABAQAAAAAEAQAAAAADAQAAAAAEAQAAAAADAQAAAAACAQAAAAADAgAAAAABFwAAAAAFBAAAAAAIAwAAAAAEAwAAAAAEAwAAAAAGAwAAAAAFAwAAAAACGQAAAAAGFwAAAAACAQAAAAADAQAAAAAEAQAAAAAEAQAAAAAEAQAAAAACAQAAAAAAAgAAAAAAFwAAAAADBAAAAAAFBAAAAAALBAAAAAAKBAAAAAANBAAAAAAGAwAAAAADGQAAAAAFFwAAAAAFAQAAAAAAAwAAAAADAQAAAAAEAQAAAAACAQAAAAAAAQAAAAAAAgAAAAAJFwAAAAACBAAAAAANBQAAAAADBQAAAAAABQAAAAAABQAAAAABBQAAAAACGQAAAAAEFwAAAAAEBAAAAAAFBAAAAAAKAQAAAAACAQAAAAADAQAAAAACBAAAAAABBAAAAAAMFwAAAAAEBAAAAAALBQAAAAABBQAAAAADBQAAAAADBQAAAAADBQAAAAACGQAAAAABFwAAAAACBAAAAAABAQAAAAADAQAAAAAAAQAAAAACAQAAAAAEAQAAAAAEBAAAAAADFwAAAAAEBAAAAAADBQAAAAADBQAAAAAABQAAAAAABQAAAAAABQAAAAADGQAAAAAGFwAAAAACAQAAAAAEAQAAAAAAAQAAAAADAQAAAAAEAQAAAAABAQAAAAAAFwAAAAADFwAAAAAABAAAAAACBAAAAAANBAAAAAAMBAAAAAALBAAAAAAABQAAAAAAGQAAAAAEAQAAAAAEAQAAAAACAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAADFwAAAAACFwAAAAAABAAAAAANBQAAAAADBQAAAAADBQAAAAACBQAAAAAABQAAAAAA + tiles: GQAAAAAEFwAAAAAABAAAAAAKBQAAAAAABQAAAAABBQAAAAAABQAAAAABBQAAAAAABAAAAAAAFwAAAAAFBAAAAAAJAwAAAAADAwAAAAAGAwAAAAAEAwAAAAADBAAAAAALGQAAAAADFwAAAAAFBAAAAAAGBQAAAAACBQAAAAABBQAAAAADBQAAAAACBQAAAAAABAAAAAAGFwAAAAAEBAAAAAAGAwAAAAAAAwAAAAADAwAAAAAIAwAAAAABBAAAAAAMGQAAAAAIFwAAAAABBAAAAAAMBQAAAAACBAAAAAAGBAAAAAAGBAAAAAANBAAAAAAGBAAAAAANFwAAAAAEBAAAAAAHAwAAAAAEAwAAAAADAwAAAAAIAwAAAAAABAAAAAABGQAAAAADFwAAAAADFwAAAAAFGAAAAAAAFwAAAAAFFwAAAAADFwAAAAACFwAAAAAAFwAAAAAEFwAAAAAABAAAAAAAAwAAAAAFAwAAAAABBQAAAAAAAwAAAAADBAAAAAAEGQAAAAAEGQAAAAAAGQAAAAABGQAAAAAHGQAAAAAFGQAAAAAGGQAAAAAAGQAAAAAFGQAAAAAIGQAAAAABAwAAAAAHAwAAAAADAwAAAAAGAwAAAAAHAwAAAAAFAwAAAAABGQAAAAAIGQAAAAACGQAAAAACGQAAAAAHGQAAAAABGQAAAAACGQAAAAAGGQAAAAABGQAAAAAGGQAAAAAFAwAAAAAHAwAAAAAGAwAAAAAEAwAAAAAHAwAAAAAAAwAAAAAFGQAAAAAHFwAAAAAEFwAAAAABFwAAAAADFwAAAAAFFwAAAAAFFwAAAAAFFwAAAAABFwAAAAAEFwAAAAAEBAAAAAABAwAAAAAGAwAAAAAAAwAAAAABBQAAAAABBQAAAAAAGQAAAAAFFwAAAAACFwAAAAAAFwAAAAAAAwAAAAAAAwAAAAAAGQAAAAAAFwAAAAAAFwAAAAAAFwAAAAADBAAAAAANAwAAAAACAwAAAAAAAwAAAAAGAwAAAAAHAwAAAAAGGQAAAAAEFwAAAAAAFwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAFwAAAAAAFwAAAAABBAAAAAAKAwAAAAABAwAAAAAFAwAAAAAIAwAAAAAEAwAAAAAFGQAAAAAEFwAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAGQAAAAAAAwAAAAAAGQAAAAAAFwAAAAAFBAAAAAAIAwAAAAAEAwAAAAAEAwAAAAAGAwAAAAAFAwAAAAACGQAAAAAGFwAAAAACGQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAFwAAAAADBAAAAAAFBAAAAAALBAAAAAAKBAAAAAANBAAAAAAGAwAAAAADGQAAAAAFFwAAAAAFFwAAAAAAGQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAFwAAAAAAFwAAAAACBAAAAAANBQAAAAADBQAAAAAABQAAAAAABQAAAAABBQAAAAACGQAAAAAEFwAAAAAEBAAAAAAFBAAAAAAKAwAAAAAAAwAAAAAAGQAAAAAABAAAAAABBAAAAAAMFwAAAAAEBAAAAAALBQAAAAABBQAAAAADBQAAAAADBQAAAAADBQAAAAACGQAAAAABFwAAAAACBAAAAAABAQAAAAADAQAAAAAAAQAAAAACAQAAAAAEAQAAAAAEBAAAAAADFwAAAAAEBAAAAAADBQAAAAADBQAAAAAABQAAAAAABQAAAAAABQAAAAADGQAAAAAGFwAAAAACAQAAAAAEAQAAAAAAAQAAAAADAQAAAAAEAQAAAAABAQAAAAAAFwAAAAADFwAAAAAABAAAAAACBAAAAAANBAAAAAAMBAAAAAALBAAAAAAABQAAAAAAGQAAAAAEAQAAAAAEAQAAAAACAQAAAAABAQAAAAACAQAAAAAAAQAAAAAAAQAAAAADFwAAAAACFwAAAAAABAAAAAANBQAAAAADBQAAAAADBQAAAAACBQAAAAAABQAAAAAA version: 6 -2,-2: ind: -2,-2 @@ -491,16 +491,6 @@ entities: id: CP14BrickTileGrayScaleStoneBox decals: 68: 14,-29 - - node: - color: '#52B4E996' - id: CP14BrickTileGrayScaleStoneBox - decals: - 38: 7,-24 - - node: - color: '#DE3A3A96' - id: CP14BrickTileGrayScaleStoneBox - decals: - 37: 3,-21 - node: color: '#334E6DC8' id: CP14BrickTileGrayScaleStoneCornerNe @@ -2893,13 +2883,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance -- proto: AcousticGuitarInstrument - entities: - - uid: 1961 - components: - - type: Transform - pos: -5.0234127,-22.681984 - parent: 2 - proto: BanjoInstrument entities: - uid: 2067 @@ -2914,13 +2897,6 @@ entities: - type: Transform pos: -12.511555,-10.407669 parent: 2 -- proto: ContrabassInstrument - entities: - - uid: 2075 - components: - - type: Transform - pos: -3.5,-17.5 - parent: 2 - proto: CP14AlchemyFurnace entities: - uid: 936 @@ -3398,14 +3374,6 @@ entities: rot: -1.5707963267948966 rad pos: 14.281277,-33.49708 parent: 2 -- proto: CP14BaseTwoHandedSword - entities: - - uid: 12899 - components: - - type: Transform - parent: 12897 - - type: Physics - canCollide: False - proto: CP14BaseVat entities: - uid: 565 @@ -43012,24 +42980,6 @@ entities: - type: Transform pos: 6.582566,-6.5016246 parent: 2 - - uid: 17834 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.696452,0.50809455 - parent: 2 - - uid: 17835 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.779785,0.50809467 - parent: 2 - - uid: 17836 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.696452,0.57059467 - parent: 2 - proto: CP14Chasm entities: - uid: 12416 @@ -43848,6 +43798,12 @@ entities: - type: Transform pos: 15.5,-14.5 parent: 2 + - uid: 8055 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,4.5 + parent: 2 - uid: 8592 components: - type: Transform @@ -43906,6 +43862,12 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,-42.5 parent: 2 + - uid: 17919 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,3.5 + parent: 2 - proto: CP14CurtainsRedOpened entities: - uid: 2030 @@ -44394,6 +44356,13 @@ entities: - type: Transform pos: -26.134733,-67.31861 parent: 2 +- proto: CP14DemiplaneLinkCrystal + entities: + - uid: 2027 + components: + - type: Transform + pos: 5.5,-21.5 + parent: 2 - proto: CP14Eggshells entities: - uid: 7176 @@ -44421,11 +44390,11 @@ entities: rot: 3.141592653589793 rad pos: -18.5,24.5 parent: 2 - - uid: 8058 + - uid: 1965 components: - type: Transform rot: 3.141592653589793 rad - pos: 5.5,-24.5 + pos: 5.5,-23.5 parent: 2 - proto: CP14FenceIronGrilleGateGuard entities: @@ -44521,6 +44490,42 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,23.5 parent: 2 + - uid: 1966 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-22.5 + parent: 2 + - uid: 1968 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-23.5 + parent: 2 + - uid: 2055 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-23.5 + parent: 2 + - uid: 2075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-21.5 + parent: 2 + - uid: 2310 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-22.5 + parent: 2 + - uid: 6098 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-21.5 + parent: 2 - uid: 6886 components: - type: Transform @@ -44563,62 +44568,17 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,-40.5 parent: 2 - - uid: 8051 - components: - - type: Transform - pos: 6.5,-24.5 - parent: 2 - - uid: 8053 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-22.5 - parent: 2 - - uid: 8055 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-20.5 - parent: 2 - uid: 8056 - components: - - type: Transform - pos: 7.5,-24.5 - parent: 2 - - uid: 8057 - components: - - type: Transform - pos: 3.5,-24.5 - parent: 2 - - uid: 8392 components: - type: Transform rot: 3.141592653589793 rad - pos: 4.5,-24.5 - parent: 2 - - uid: 8393 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-22.5 - parent: 2 - - uid: 8395 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-21.5 - parent: 2 - - uid: 8396 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-23.5 + pos: 6.5,-23.5 parent: 2 - uid: 8397 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-23.5 + rot: 3.141592653589793 rad + pos: 7.5,-23.5 parent: 2 - uid: 8400 components: @@ -44630,18 +44590,6 @@ entities: - type: Transform pos: 4.5,-19.5 parent: 2 - - uid: 8551 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-21.5 - parent: 2 - - uid: 8552 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-20.5 - parent: 2 - uid: 8558 components: - type: Transform @@ -44790,15 +44738,17 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,-22.5 parent: 2 - - uid: 1964 + - uid: 6692 components: - type: Transform - pos: -7.5,2.5 + rot: 1.5707963267948966 rad + pos: -6.5,1.5 parent: 2 - - uid: 2055 + - uid: 8411 components: - type: Transform - pos: -8.5,2.5 + rot: 1.5707963267948966 rad + pos: -6.5,0.5 parent: 2 - uid: 8785 components: @@ -45881,6 +45831,36 @@ entities: rot: 3.141592653589793 rad pos: -70.5,26.5 parent: 2 + - uid: 6903 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-11.5 + parent: 2 + - uid: 6905 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-12.5 + parent: 2 + - uid: 7078 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-12.5 + parent: 2 + - uid: 7143 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-11.5 + parent: 2 + - uid: 7155 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-11.5 + parent: 2 - proto: CP14FloraTreeSnow entities: - uid: 12684 @@ -45908,6 +45888,26 @@ entities: - type: Transform pos: 1.5,-13.5 parent: 2 +- proto: CP14FluteInstrument + entities: + - uid: 433 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.3040166,-21.57062 + parent: 2 + - uid: 1360 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.2364926,-21.806751 + parent: 2 + - uid: 8053 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.350383,-22.00915 + parent: 2 - proto: CP14FoodCheesePart entities: - uid: 1037 @@ -46434,12 +46434,6 @@ entities: parent: 2 - proto: CP14IronDoorMirroredBlacksmith1 entities: - - uid: 6692 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,1.5 - parent: 2 - uid: 9224 components: - type: Transform @@ -47039,6 +47033,18 @@ entities: - type: Transform pos: -25.5,-69.5 parent: 2 +- proto: CP14LyraInstrument + entities: + - uid: 6887 + components: + - type: Transform + pos: -5.242899,-22.65008 + parent: 2 + - uid: 8051 + components: + - type: Transform + pos: -4.567658,-22.234037 + parent: 2 - proto: CP14ManaOperationGlove entities: - uid: 1424 @@ -47210,7 +47216,7 @@ entities: neck: !type:ContainerSlot showEnts: False occludes: False - ent: 12899 + ent: null back: !type:ContainerSlot showEnts: False occludes: False @@ -47992,18 +47998,6 @@ entities: - type: Transform pos: -23.5,-14.5 parent: 2 -- proto: CP14PlantCucumber - entities: - - uid: 2026 - components: - - type: Transform - pos: -21.5,-12.5 - parent: 2 - - uid: 2027 - components: - - type: Transform - pos: -19.5,-11.5 - parent: 2 - proto: CP14PlantPotato entities: - uid: 2022 @@ -83702,36 +83696,6 @@ entities: - type: Transform pos: -23.5,-11.5 parent: 2 - - uid: 1963 - components: - - type: Transform - pos: -19.5,-12.5 - parent: 2 - - uid: 1965 - components: - - type: Transform - pos: -19.5,-11.5 - parent: 2 - - uid: 1966 - components: - - type: Transform - pos: -20.5,-12.5 - parent: 2 - - uid: 1967 - components: - - type: Transform - pos: -20.5,-11.5 - parent: 2 - - uid: 1968 - components: - - type: Transform - pos: -21.5,-12.5 - parent: 2 - - uid: 1969 - components: - - type: Transform - pos: -21.5,-11.5 - parent: 2 - uid: 1971 components: - type: Transform @@ -86915,10 +86879,11 @@ entities: - type: Transform pos: -3.5,-32.5 parent: 2 - - uid: 1360 + - uid: 1385 components: - type: Transform - pos: -8.5,2.5 + rot: 3.141592653589793 rad + pos: -6.5,1.5 parent: 2 - uid: 1399 components: @@ -87005,6 +86970,18 @@ entities: rot: 1.5707963267948966 rad pos: 12.5,-28.5 parent: 2 + - uid: 1961 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,0.5 + parent: 2 + - uid: 1963 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,0.5 + parent: 2 - uid: 1970 components: - type: Transform @@ -87017,11 +86994,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-13.5 parent: 2 - - uid: 2041 - components: - - type: Transform - pos: -7.5,2.5 - parent: 2 - uid: 2056 components: - type: Transform @@ -87325,6 +87297,40 @@ entities: - type: Transform pos: -8.5,-19.5 parent: 2 +- proto: CP14Target + entities: + - uid: 8412 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-16.5 + parent: 2 + - uid: 8551 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-13.5 + parent: 2 + - uid: 8552 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-14.5 + parent: 2 +- proto: CP14TargetEffigy + entities: + - uid: 12899 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-13.5 + parent: 2 + - uid: 12968 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-15.5 + parent: 2 - proto: CP14Torch entities: - uid: 12956 @@ -87383,14 +87389,6 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,10.5 parent: 1 -- proto: CP14TwoHandedSwordScythe - entities: - - uid: 6098 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.50742,-56.913044 - parent: 2 - proto: CP14VentCritterMarker entities: - uid: 5510 @@ -88587,6 +88585,20 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 8058 + components: + - type: Transform + pos: -6.5,-1.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 8395 + components: + - type: Transform + pos: -3.5,5.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 8799 components: - type: Transform @@ -88601,14 +88613,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 8830 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,0.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 12032 components: - type: Transform @@ -88616,6 +88620,13 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 17918 + components: + - type: Transform + pos: -8.5,5.5 + parent: 2 + - type: Fixtures + fixtures: {} - proto: CP14WallmountFlagGuardCommander entities: - uid: 12980 @@ -88699,20 +88710,6 @@ entities: fixtures: {} - proto: CP14WallmountFlagGuardSwords entities: - - uid: 12968 - components: - - type: Transform - pos: 8.5,-25.5 - parent: 2 - - type: Fixtures - fixtures: {} - - uid: 12969 - components: - - type: Transform - pos: 2.5,-25.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 12976 components: - type: Transform @@ -90427,13 +90424,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 17833 - components: - - type: Transform - pos: -6.5,1.5 - parent: 2 - - type: Fixtures - fixtures: {} - proto: CP14WallmountOrdersBorder entities: - uid: 1447 @@ -101391,11 +101381,6 @@ entities: parent: 2 - proto: CP14WallStonebrick entities: - - uid: 433 - components: - - type: Transform - pos: -2.5,4.5 - parent: 2 - uid: 472 components: - type: Transform @@ -101651,11 +101636,6 @@ entities: - type: Transform pos: -7.5,-0.5 parent: 2 - - uid: 1385 - components: - - type: Transform - pos: -2.5,3.5 - parent: 2 - uid: 1391 components: - type: Transform @@ -101866,6 +101846,31 @@ entities: - type: Transform pos: -2.5,2.5 parent: 2 + - uid: 1964 + components: + - type: Transform + pos: 2.5,-23.5 + parent: 2 + - uid: 1967 + components: + - type: Transform + pos: 2.5,-20.5 + parent: 2 + - uid: 1969 + components: + - type: Transform + pos: 8.5,-24.5 + parent: 2 + - uid: 2026 + components: + - type: Transform + pos: 8.5,-23.5 + parent: 2 + - uid: 2041 + components: + - type: Transform + pos: 8.5,-20.5 + parent: 2 - uid: 2061 components: - type: Transform @@ -101886,11 +101891,6 @@ entities: - type: Transform pos: -9.5,0.5 parent: 2 - - uid: 2310 - components: - - type: Transform - pos: -5.5,-0.5 - parent: 2 - uid: 2344 components: - type: Transform @@ -102036,6 +102036,11 @@ entities: - type: Transform pos: 8.5,-18.5 parent: 2 + - uid: 8396 + components: + - type: Transform + pos: 2.5,-24.5 + parent: 2 - uid: 8398 components: - type: Transform @@ -102046,16 +102051,6 @@ entities: - type: Transform pos: 2.5,-18.5 parent: 2 - - uid: 8411 - components: - - type: Transform - pos: 2.5,-24.5 - parent: 2 - - uid: 8412 - components: - - type: Transform - pos: 8.5,-24.5 - parent: 2 - uid: 8559 components: - type: Transform @@ -102326,11 +102321,6 @@ entities: - type: Transform pos: 23.5,-37.5 parent: 2 - - uid: 17832 - components: - - type: Transform - pos: -5.5,0.5 - parent: 2 - proto: CP14WallStoneCopperOre entities: - uid: 3062 @@ -105808,6 +105798,16 @@ entities: rot: 1.5707963267948966 rad pos: 16.5,-43.5 parent: 2 + - uid: 8392 + components: + - type: Transform + pos: -2.5,4.5 + parent: 2 + - uid: 8393 + components: + - type: Transform + pos: -2.5,3.5 + parent: 2 - uid: 8657 components: - type: Transform @@ -107536,6 +107536,78 @@ entities: - type: Transform pos: 16.425919,-59.315414 parent: 2 +- proto: ShadowBasaltOne + entities: + - uid: 8057 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-20.5 + parent: 2 + - uid: 8830 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-22.5 + parent: 2 + - uid: 12969 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-21.5 + parent: 2 +- proto: ShadowBasaltRandom + entities: + - uid: 17834 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-22.5 + parent: 2 + - uid: 17835 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-20.5 + parent: 2 + - uid: 17836 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-21.5 + parent: 2 + - uid: 17915 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-19.5 + parent: 2 + - uid: 17916 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-21.5 + parent: 2 + - uid: 17917 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-22.5 + parent: 2 +- proto: ShadowBasaltThree + entities: + - uid: 17832 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-22.5 + parent: 2 + - uid: 17833 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-20.5 + parent: 2 - proto: SmokingPipeFilledCannabisRainbow entities: - uid: 7218 @@ -107614,42 +107686,6 @@ entities: parent: 2 - proto: TargetHuman entities: - - uid: 6887 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-18.5 - parent: 2 - - uid: 6903 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-20.5 - parent: 2 - - uid: 6905 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-14.5 - parent: 2 - - uid: 7078 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-17.5 - parent: 2 - - uid: 7143 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-19.5 - parent: 2 - - uid: 7155 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-16.5 - parent: 2 - uid: 7838 components: - type: Transform diff --git a/Resources/Prototypes/_CP14/Entities/Structures/round_end.yml b/Resources/Prototypes/_CP14/Entities/Structures/round_end.yml new file mode 100644 index 0000000000..0fcb9d28eb --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/round_end.yml @@ -0,0 +1,45 @@ +- type: entity + id: CP14DemiplaneLinkCrystal + categories: [ ForkFiltered ] + name: demiplane link crystal + description: Maintains communication with the demiplanes while charged. Causes mosnters from the demiplanes to attack the city. Once it is discharged, the game is over. + suffix: ONE TO MAP + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Transform + anchored: true + - type: SpriteFade + - type: Clickable + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.2,0.15,0.2" + density: 1000 + layer: + - WallLayer + - type: Sprite + noRot: true + sprite: _CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi + layers: + - state: base + drawdepth: Mobs + offset: 0,0.9 + - type: PointLight + color: "#42166b" + energy: 3 + radius: 5 + - type: CP14MagicContainerRoundFinisher + - type: CP14MagicEnergyExaminable + - type: CP14MagicEnergyContainer + maxEnergy: 1000 + energy: 1000 + - type: CP14MagicEnergyDraw + energy: -10 + delay: 60 # 1h 30 minutes to full discharge \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/base.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/base.png new file mode 100644 index 0000000000..2fb6c276eb Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/elemental_reactor.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/meta.json similarity index 93% rename from Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/elemental_reactor.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/meta.json index 4fd6bb58d4..fc741f520c 100644 --- a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/elemental_reactor.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/demiplane_link_crystal.rsi/meta.json @@ -4,7 +4,7 @@ "copyright": "Created by TheShued (github) ", "size": { "x": 48, - "y": 64 + "y": 84 }, "states": [ { diff --git a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/elemental_reactor.rsi/base.png b/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/elemental_reactor.rsi/base.png deleted file mode 100644 index d2880b3ec7..0000000000 Binary files a/Resources/Textures/_CP14/Structures/Specific/Thaumaturgy/elemental_reactor.rsi/base.png and /dev/null differ