From a57092c4b18d40fda9b706ecb7ef14b76c20f7e3 Mon Sep 17 00:00:00 2001 From: Rxup Date: Sat, 6 Apr 2024 14:32:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC=D0=B0=20?= =?UTF-8?q?=D0=BA=D1=80=D1=83=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20(#547)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pinpointer code * more time for tts speak * rand commit * tag system on unlocks * oops * commit-weh * upd * upd-shuttles-and-someother * pinpointer --------- Co-authored-by: Kirillcas --- .../Backmen/HardPacifiedModeSystem.cs | 8 + .../Psionics/Abilities/DispelPowerSystem.cs | 6 + .../Abilities/MetapsionicPowerSystem.cs | 1 + .../Psionics/Abilities/MindSwapPowerSystem.cs | 1 + .../Abilities/NoosphericZapPowerSystem.cs | 9 +- .../PsionicInvisibilityPowerSystem.cs | 1 + .../Abilities/PyrokinesisPowerSystem.cs | 8 + .../Backmen/HardPacifiedModeSystem.cs | 8 + .../Invisbility/PsionicInvisibilitySystem.cs | 9 +- .../PsionicInvisibleContactsSystem.cs | 1 + .../PsionicallyInvisibleComponent.cs | 5 - .../ShipwreckPinPointerComponent.cs | 8 + .../Components/ShipwreckSurvivorComponent.cs | 10 - .../Shipwrecked/ShipwreckedRuleSystem.cs | 133 +- .../Systems/ShadowkinPowerSystem.DarkSwap.cs | 7 - .../Backmen/HardPacifiedModeSystemShared.cs | 29 + .../Psionics/PsionicallyInvisibleComponent.cs | 9 + .../Components/ShipwreckSurvivorComponent.cs | 12 + .../ru-RU/backmen/abilities/psionic.ftl | 2 + .../prototypes/Objects/devices/pinpointer.ftl | 2 + .../{Shuttles => Shipwrecked}/Shatlik.yml | 1277 +++++------------ .../{Shuttles => Shipwrecked}/adventurer.yml | 132 +- .../{Shuttles => Shipwrecked}/shwr-dust.yml | 529 +++---- Resources/Maps/Dungeon/ruined_shops.yml | 410 ++++++ .../Backmen/Entities/Mobs/NPC/special.yml | 6 +- .../Entities/Objects/Devices/pinpointer.yml | 10 + .../Backmen/GameRules/Shipwrecked/maps.yml | 23 +- .../Backmen/GameRules/roundstart.yml | 8 +- .../Procedural/Themes/ruined_shops.yml | 9 + Resources/Prototypes/Backmen/tags.yml | 6 + 30 files changed, 1333 insertions(+), 1346 deletions(-) create mode 100644 Content.Client/Backmen/HardPacifiedModeSystem.cs create mode 100644 Content.Server/Backmen/HardPacifiedModeSystem.cs delete mode 100644 Content.Server/Backmen/Psionics/Invisbility/PsionicallyInvisibleComponent.cs create mode 100644 Content.Server/Backmen/Shipwrecked/Components/ShipwreckPinPointerComponent.cs delete mode 100644 Content.Server/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs create mode 100644 Content.Shared/Backmen/HardPacifiedModeSystemShared.cs create mode 100644 Content.Shared/Backmen/Psionics/PsionicallyInvisibleComponent.cs create mode 100644 Content.Shared/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs create mode 100644 Resources/Locale/ru-RU/backmen/prototypes/Objects/devices/pinpointer.ftl rename Resources/Maps/Backmen/{Shuttles => Shipwrecked}/Shatlik.yml (82%) rename Resources/Maps/Backmen/{Shuttles => Shipwrecked}/adventurer.yml (97%) rename Resources/Maps/Backmen/{Shuttles => Shipwrecked}/shwr-dust.yml (96%) create mode 100644 Resources/Prototypes/Backmen/Entities/Objects/Devices/pinpointer.yml diff --git a/Content.Client/Backmen/HardPacifiedModeSystem.cs b/Content.Client/Backmen/HardPacifiedModeSystem.cs new file mode 100644 index 00000000000..73be00e78d2 --- /dev/null +++ b/Content.Client/Backmen/HardPacifiedModeSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Backmen; + +namespace Content.Client.Backmen; + +public sealed class HardPacifiedModeSystem : SharedHardPacifiedModeSystem +{ + +} diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/DispelPowerSystem.cs index 0caf8cb8e3b..7d3d738f24a 100644 --- a/Content.Server/Backmen/Abilities/Psionics/Abilities/DispelPowerSystem.cs +++ b/Content.Server/Backmen/Abilities/Psionics/Abilities/DispelPowerSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Bible.Components; using Content.Server.Popups; using Content.Shared.Backmen.Abilities.Psionics; +using Content.Shared.Backmen.Psionics; using Content.Shared.Backmen.Psionics.Events; using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; @@ -63,6 +64,11 @@ private void OnShutdown(EntityUid uid, DispelPowerComponent component, Component private void OnPowerUsed(DispelPowerActionEvent args) { + if (HasComp(args.Performer)) + { + _popupSystem.PopupCursor(Loc.GetString("cant-use-in-invisible"),args.Performer); + return; + } if (HasComp(args.Target)) return; diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs index 40fde216d52..39907096478 100644 --- a/Content.Server/Backmen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Backmen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Backmen.Psionics; using Content.Shared.Actions; using Content.Shared.Backmen.Abilities.Psionics; +using Content.Shared.Backmen.Psionics; using Content.Shared.Backmen.Psionics.Events; using Content.Shared.Backmen.Species.Shadowkin.Components; using Content.Shared.Eye; diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs index 7fef4e9772f..127ebeef36b 100644 --- a/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs @@ -12,6 +12,7 @@ using Content.Shared.Backmen.Abilities.Psionics; using Content.Shared.Backmen.Blob; using Content.Shared.Backmen.Blob.Components; +using Content.Shared.Backmen.Psionics; using Content.Shared.Backmen.Psionics.Events; using Content.Shared.Mind.Components; using Content.Shared.Mindshield.Components; diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs index 6b8c4b568ee..837cf196e91 100644 --- a/Content.Server/Backmen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Backmen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -3,7 +3,9 @@ using Content.Shared.StatusEffect; using Content.Server.Stunnable; using Content.Server.Beam; +using Content.Server.Popups; using Content.Shared.Backmen.Abilities.Psionics; +using Content.Shared.Backmen.Psionics; using Content.Shared.Backmen.Psionics.Events; using Robust.Shared.Prototypes; using Robust.Shared.Timing; @@ -12,7 +14,7 @@ namespace Content.Server.Backmen.Abilities.Psionics; public sealed class NoosphericZapPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly StunSystem _stunSystem = default!; @@ -49,6 +51,11 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co private void OnPowerUsed(NoosphericZapPowerActionEvent args) { + if (HasComp(args.Performer)) + { + _popupSystem.PopupCursor(Loc.GetString("cant-use-in-invisible"),args.Performer); + return; + } if (!HasComp(args.Target)) return; diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs index a8779c36746..0613325dd78 100644 --- a/Content.Server/Backmen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs +++ b/Content.Server/Backmen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Stealth; using Content.Shared.Stealth.Components; using Content.Shared.Backmen.Abilities.Psionics; +using Content.Shared.Backmen.Psionics; using Content.Shared.Backmen.Psionics.Events; using Robust.Shared.Prototypes; using Robust.Shared.Audio.Systems; diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs index 1524d7113f4..6ee8fb2172d 100644 --- a/Content.Server/Backmen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Backmen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -3,6 +3,7 @@ using Content.Server.Atmos.EntitySystems; using Content.Server.Popups; using Content.Shared.Backmen.Abilities.Psionics; +using Content.Shared.Backmen.Psionics; using Content.Shared.Backmen.Psionics.Events; using Robust.Shared.Prototypes; using Robust.Shared.Timing; @@ -46,6 +47,13 @@ private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, Comp private void OnPowerUsed(PyrokinesisPowerActionEvent args) { + if (HasComp(args.Performer)) + { + _popupSystem.PopupCursor(Loc.GetString("cant-use-in-invisible"),args.Performer); + return; + } + if (HasComp(args.Target)) + return; if (!TryComp(args.Target, out var flammableComponent)) return; diff --git a/Content.Server/Backmen/HardPacifiedModeSystem.cs b/Content.Server/Backmen/HardPacifiedModeSystem.cs new file mode 100644 index 00000000000..dcbba80ba58 --- /dev/null +++ b/Content.Server/Backmen/HardPacifiedModeSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Backmen; + +namespace Content.Server.Backmen; + +public sealed class HardPacifiedModeSystem : SharedHardPacifiedModeSystem +{ + +} diff --git a/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibilitySystem.cs b/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibilitySystem.cs index 79506a30b93..dca957f39d6 100644 --- a/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibilitySystem.cs +++ b/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibilitySystem.cs @@ -2,6 +2,7 @@ using Content.Server.Backmen.Eye; using Content.Server.NPC.Systems; using Content.Shared.Backmen.Abilities.Psionics; +using Content.Shared.Backmen.Psionics; using Content.Shared.CombatMode.Pacification; using Content.Shared.Eye; using Content.Shared.Interaction.Events; @@ -35,14 +36,6 @@ public override void Initialize() // PVS Stuff SubscribeLocalEvent(OnEntInserted); SubscribeLocalEvent(OnEntRemoved); - - SubscribeLocalEvent(OnAttackAttempt); - } - - private void OnAttackAttempt(Entity ent, ref AttackAttemptEvent args) - { - if(HasComp(ent)) - args.Cancel(); } private void OnInit(EntityUid uid, PotentialPsionicComponent component, ComponentInit args) diff --git a/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibleContactsSystem.cs b/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibleContactsSystem.cs index 5824871766f..1f5881ad67d 100644 --- a/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibleContactsSystem.cs +++ b/Content.Server/Backmen/Psionics/Invisbility/PsionicInvisibleContactsSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Backmen.Psionics; using Content.Shared.Stealth; using Content.Shared.Stealth.Components; using Robust.Shared.Physics.Events; diff --git a/Content.Server/Backmen/Psionics/Invisbility/PsionicallyInvisibleComponent.cs b/Content.Server/Backmen/Psionics/Invisbility/PsionicallyInvisibleComponent.cs deleted file mode 100644 index 55ce5db5e78..00000000000 --- a/Content.Server/Backmen/Psionics/Invisbility/PsionicallyInvisibleComponent.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace Content.Server.Backmen.Psionics; - -[RegisterComponent] -public sealed partial class PsionicallyInvisibleComponent : Component -{} diff --git a/Content.Server/Backmen/Shipwrecked/Components/ShipwreckPinPointerComponent.cs b/Content.Server/Backmen/Shipwrecked/Components/ShipwreckPinPointerComponent.cs new file mode 100644 index 00000000000..e3ce7388d70 --- /dev/null +++ b/Content.Server/Backmen/Shipwrecked/Components/ShipwreckPinPointerComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Server.Backmen.Shipwrecked.Components; + +[RegisterComponent] +public sealed partial class ShipwreckPinPointerComponent : Component +{ + [ViewVariables(VVAccess.ReadOnly)] + public ShipwreckedRuleComponent? Rule; +} diff --git a/Content.Server/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs b/Content.Server/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs deleted file mode 100644 index c2c0be082d9..00000000000 --- a/Content.Server/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Content.Server.Backmen.Shipwrecked.Components; - -/// -/// This is for tracking events. -/// -[RegisterComponent] -public sealed partial class ShipwreckSurvivorComponent : Component -{ - -} diff --git a/Content.Server/Backmen/Shipwrecked/ShipwreckedRuleSystem.cs b/Content.Server/Backmen/Shipwrecked/ShipwreckedRuleSystem.cs index c0e9ae3a1db..24e18cc344b 100644 --- a/Content.Server/Backmen/Shipwrecked/ShipwreckedRuleSystem.cs +++ b/Content.Server/Backmen/Shipwrecked/ShipwreckedRuleSystem.cs @@ -49,6 +49,7 @@ using Content.Shared.Access.Components; using Content.Shared.Atmos; using Content.Shared.Backmen.CCVar; +using Content.Shared.Backmen.Shipwrecked.Components; using Content.Shared.Buckle.Components; using Content.Shared.Chat; using Content.Shared.Chemistry.Components; @@ -72,6 +73,7 @@ using Content.Shared.Parallax.Biomes; using Content.Shared.Parallax.Biomes.Markers; using Content.Shared.Physics; +using Content.Shared.Pinpointer; using Content.Shared.Popups; using Content.Shared.Preferences; using Content.Shared.Procedural; @@ -81,6 +83,8 @@ using Content.Shared.Salvage; using Content.Shared.Shuttles.Components; using Content.Shared.Storage; +using Content.Shared.Tag; +using Content.Shared.Verbs; using Content.Shared.Zombies; using Robust.Server.Audio; using Robust.Server.GameObjects; @@ -144,16 +148,13 @@ public sealed class ShipwreckedRuleSystem : GameRuleSystem(OnFTLCompleted); SubscribeLocalEvent(OnFTLStarted); @@ -177,7 +178,46 @@ public override void Initialize() SubscribeLocalEvent(OnChunkUnLoaded); SubscribeLocalEvent(OnChunkLoad); - SubscribeLocalEvent(OnAttackAttempt); + + + SubscribeLocalEvent(OnPinPointerSpawn); + SubscribeLocalEvent>(GetVerbsPinPointer); + } + + + + public static readonly VerbCategory ShipwreckPinpointer = + new("verb-categories-shipwreck-pinpointer", null); + private void GetVerbsPinPointer(Entity ent, ref GetVerbsEvent args) + { + if (ent.Comp.Rule == null || ent.Comp.Rule.VitalPieces.Count == 0) + return; + + foreach (var (uid, (destination,structure)) in ent.Comp.Rule.VitalPieces) + { + var md = MetaData(uid); + Verb verb = new() + { + Text = md.EntityName, + Category = ShipwreckPinpointer, + Act = () => + { + if (!TryComp(ent, out var pinpointerComponent)) + return; + _pinpointerSystem.SetTarget(ent,uid,pinpointerComponent); + _pinpointerSystem.SetActive(ent,true,pinpointerComponent); + }, + Message = md.EntityDescription, + }; + args.Verbs.Add(verb); + } + } + + private void OnPinPointerSpawn(Entity ent, ref MapInitEvent args) + { + if(!TryComp(ent, out var pinpointerComponent) || !QueryActiveRules().MoveNext(out var _, out var rule, out _)) + return; + ent.Comp.Rule = rule; } private void OnAttackAttempt(Entity ent, ref AttackAttemptEvent args) @@ -441,13 +481,13 @@ private void PreloadPlanet(ShipwreckedRuleComponent component, BiomeComponent? b Area = targetArea }); - _sawmill.Info("PreloadPlanet {0}", targetArea.ToString()); + Log.Info("PreloadPlanet {0}", targetArea.ToString()); _biomeSystem.Preload(component.PlanetMap.Value, biomeComponent, targetArea); // как основная игровая карта должна быть предзагружена для всех! - _sawmill.Info("PreloadPlanet DONE!"); + Log.Info("PreloadPlanet DONE!"); } private async void SpawnPlanetaryStructures(EntityUid uid, ShipwreckedRuleComponent component) @@ -591,7 +631,7 @@ private void SpawnHecate(ShipwreckedRuleComponent component) { if (component.Hecate != null) { - _sawmill.Warning("Hecate was already spawned."); + Log.Warning("Hecate was already spawned."); return; } @@ -732,8 +772,8 @@ private void DamageShuttleMidflight(ShipwreckedRuleComponent component) // // Blow the thrusters. - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var thruster, out var xform)) + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var thruster, out var xform, out var metaDataComponent)) { if (xform.GridUid != component.Shuttle) continue; @@ -836,7 +876,7 @@ private bool TryGetRandomStructureSpot(ShipwreckedRuleComponent component, if (component.Structures.Count == 0) { - _sawmill.Warning("Unable to get a structure spot. Making something up..."); + Log.Warning("Unable to get a structure spot. Making something up..."); var distance = component.Destination?.StructureDistance ?? 50; coordinates = new EntityCoordinates(component.PlanetMap.Value, _random.NextVector2(-distance, distance)); @@ -865,8 +905,10 @@ private void PrepareVitalShuttlePieces(ShipwreckedRuleComponent component) if (component.PlanetMap == null || component.PlanetGrid == null) return; - var thrusterQuery = EntityQueryEnumerator(); - while (thrusterQuery.MoveNext(out var uid, out var thruster, out var xform)) + var ic = 0; + + var thrusterQuery = EntityQueryEnumerator(); + while (thrusterQuery.MoveNext(out var uid, out var thruster, out var xform, out var metaDataComponent)) { if (xform.GridUid != component.Shuttle) continue; @@ -875,6 +917,8 @@ private void PrepareVitalShuttlePieces(ShipwreckedRuleComponent component) // Ignore the gyroscope. continue; + ic++; + if (TryGetRandomStructureSpot(component, out var spot, out var structure)) { if (component.VitalPieceStructureSpots.TryGetValue(structure, out var spots)) @@ -883,7 +927,9 @@ private void PrepareVitalShuttlePieces(ShipwreckedRuleComponent component) component.VitalPieceStructureSpots.Add(structure, new () {spot}); } - _sawmill.Info($"Space debris! {ToPrettyString(uid)} will go to {spot}"); + Log.Info($"Space debris! {ToPrettyString(uid)} will go to {spot}"); + _metadata.SetEntityName(uid, $"{metaDataComponent.EntityName} ({ic})"); + _metadata.SetEntityDescription(uid, $"Компонент необходимый для ремонта шаттла"); // We do this before moving the pieces, // so they don't get affected by the explosion. @@ -907,7 +953,7 @@ private void PrepareVitalShuttlePieces(ShipwreckedRuleComponent component) ++planetGeneratorCount; } - _sawmill.Info($"Shipwreck destination has {planetGeneratorPower} W worth of {planetGeneratorCount} scavengeable generators."); + Log.Info($"Shipwreck destination has {planetGeneratorPower} W worth of {planetGeneratorCount} scavengeable generators."); if (planetGeneratorPower < component.OriginalPowerDemand) { @@ -920,8 +966,8 @@ private void PrepareVitalShuttlePieces(ShipwreckedRuleComponent component) // but I'd rather players be able to win than be hard-locked into losing. // How many will we need? - const float UraniumPower = 15000f; - var generatorsNeeded = Math.Max(1, component.OriginalPowerDemand / UraniumPower); + const float uraniumPower = 15000f; + var generatorsNeeded = Math.Max(1, component.OriginalPowerDemand / uraniumPower); for (int i = 0; i < generatorsNeeded; ++i) { @@ -930,7 +976,7 @@ private void PrepareVitalShuttlePieces(ShipwreckedRuleComponent component) var uid = Spawn("PortableGeneratorSuperPacman", somewhere); TryGetRandomStructureSpot(component, out var spot, out var structure); - _sawmill.Info($"Heaven generator! {ToPrettyString(uid)} will go to {spot}"); + Log.Info($"Heaven generator! {ToPrettyString(uid)} will go to {spot}"); MakeCrater(component.PlanetGrid, spot); component.VitalPieces.Add(uid, (spot, structure)); @@ -1036,7 +1082,7 @@ private void SpawnFactions(ShipwreckedRuleComponent component) var availableStructures = component.Structures.ToList(); if (availableStructures.Count == 0) { - _sawmill.Error("NYI: There are no structures for the factions to spawn around."); + Log.Error("NYI: There are no structures for the factions to spawn around."); return; } @@ -1058,7 +1104,7 @@ private void SpawnFactions(ShipwreckedRuleComponent component) SpawnFaction(component, majorPower, majorStructures); - _sawmill.Info($"{majorPower} has taken control of {majorStructures.Count} structures."); + Log.Info($"{majorPower} has taken control of {majorStructures.Count} structures."); // Pick another, different faction to be the minor power. var minorPower = availableFactions.Pop(); @@ -1066,7 +1112,7 @@ private void SpawnFactions(ShipwreckedRuleComponent component) SpawnFaction(component, minorPower, minorStructures); - _sawmill.Info($"{minorPower} has taken control of {minorStructures.Count} structures."); + Log.Info($"{minorPower} has taken control of {minorStructures.Count} structures."); } } @@ -1187,7 +1233,7 @@ private void HecateSay(string message, ShipwreckedRuleComponent component) { if (component.Hecate is not {} hecate) { - _sawmill.Warning($"Hecate was not found for message: {message}"); + Log.Warning($"Hecate was not found for message: {message}"); return; } @@ -1210,7 +1256,7 @@ protected override void ActiveTick(EntityUid uid, ShipwreckedRuleComponent compo if (component.EventSchedule.Count > 0) component.NextEventTick = curTime + component.EventSchedule[0].timeOffset; - _sawmill.Info($"Running event: {curEvent}"); + Log.Info($"Running event: {curEvent}"); switch (curEvent.eventId) { @@ -1471,7 +1517,7 @@ protected override void Started(EntityUid uid, ShipwreckedRuleComponent componen component.OriginalPowerDemand += apcPowerReceiver.Load; } - _sawmill.Info($"The original power demand for the shuttle is {component.OriginalPowerDemand} W"); + Log.Info($"The original power demand for the shuttle is {component.OriginalPowerDemand} W"); var shuttle = component.Shuttle!.Value; @@ -1690,7 +1736,7 @@ public bool IsDead(EntityUid uid) return (_mobStateSystem.IsDead(uid) || // Zombies are not dead-dead, so check for that. HasComp(uid) || - Deleted(uid)); + TerminatingOrDeleted(uid)); } private void CheckShouldRoundEnd(EntityUid uid, ShipwreckedRuleComponent component) @@ -1713,6 +1759,12 @@ private void CheckShouldRoundEnd(EntityUid uid, ShipwreckedRuleComponent compone # region Hecate Dynamic Responses + [ValidatePrototypeId] + private const string TagEngineeringAirlock = "EngineeringAirlock"; + + [ValidatePrototypeId] + private const string TagSecureSafe = "SecureSafe"; + private void OnInitHecate(EntityUid uid, ShipwreckedNPCHecateComponent component, MapInitEvent args) { component.GunSafe.Clear(); @@ -1721,24 +1773,23 @@ private void OnInitHecate(EntityUid uid, ShipwreckedNPCHecateComponent component var doorQuery = GetEntityQuery(); var storageQuery = GetEntityQuery(); - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var entity, out var access, out var xform)) + var shopGrid = Transform(uid).GridUid; + + var tagQuery = GetEntityQuery(); + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var entity, out var xform, out var tagComponent)) { - if (xform.GridUid != Transform(uid).GridUid) + if (xform.GridUid != shopGrid) continue; - foreach (var accessList in access.AccessLists) + if (_tagSystem.HasTag(entity, TagSecureSafe, tagQuery)) { - if (accessList.Contains("Armory") && (storageQuery.HasComponent(entity) || doorQuery.HasComponent(entity))) - { - // This is probably the gun safe. - component.GunSafe.Add(entity); - } - if (accessList.Contains("Engineering") && (storageQuery.HasComponent(entity) || doorQuery.HasComponent(entity))) - { - // This is probably the engine bay door. - component.EngineBayDoor.Add(entity); - } + component.GunSafe.Add(entity); + } + else if (_tagSystem.HasTag(entity, TagEngineeringAirlock, tagQuery)) + { + component.EngineBayDoor.Add(entity); } } } @@ -1780,7 +1831,7 @@ private void OnAskWeaponsUnlock(EntityUid uid, ShipwreckedNPCHecateComponent com if (!component.GunSafe.Any()) { - _sawmill.Warning($"Hecate tried to unlock the gun safe, but it's missing."); + Log.Warning($"Hecate tried to unlock the gun safe, but it's missing."); return; } diff --git a/Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.DarkSwap.cs b/Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.DarkSwap.cs index 67c11ebfe98..f030b06fc5d 100644 --- a/Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.DarkSwap.cs +++ b/Content.Server/Backmen/Species/Shadowkin/Systems/ShadowkinPowerSystem.DarkSwap.cs @@ -64,17 +64,10 @@ public override void Initialize() SubscribeLocalEvent(OnDamageInInvis); SubscribeLocalEvent(OnDispelled); - SubscribeLocalEvent(OnAttackAttempt); - _activePsionicsDisabled = GetEntityQuery(); _activeStamina = GetEntityQuery(); } - private void OnAttackAttempt(Entity ent, ref AttackAttemptEvent args) - { - args.Cancel(); - } - private void OnDispelled(Entity ent, ref DispelledEvent args) { RemCompDeferred(ent); diff --git a/Content.Shared/Backmen/HardPacifiedModeSystemShared.cs b/Content.Shared/Backmen/HardPacifiedModeSystemShared.cs new file mode 100644 index 00000000000..62ff005f511 --- /dev/null +++ b/Content.Shared/Backmen/HardPacifiedModeSystemShared.cs @@ -0,0 +1,29 @@ +using Content.Shared.Backmen.Psionics; +using Content.Shared.Backmen.Shipwrecked.Components; +using Content.Shared.Backmen.Species.Shadowkin.Components; +using Content.Shared.CombatMode.Pacification; +using Content.Shared.Interaction.Events; + +namespace Content.Shared.Backmen; + +public abstract class SharedHardPacifiedModeSystem : EntitySystem +{ + private EntityQuery _pacifyQuery; + + public override void Initialize() + { + base.Initialize(); + + _pacifyQuery = GetEntityQuery(); + + SubscribeLocalEvent(OnAttackAttempt); + SubscribeLocalEvent(OnAttackAttempt); + SubscribeLocalEvent(OnAttackAttempt); + } + + private void OnAttackAttempt(Entity ent, ref AttackAttemptEvent args) where T : Component + { + if(_pacifyQuery.HasComp(ent)) + args.Cancel(); + } +} diff --git a/Content.Shared/Backmen/Psionics/PsionicallyInvisibleComponent.cs b/Content.Shared/Backmen/Psionics/PsionicallyInvisibleComponent.cs new file mode 100644 index 00000000000..4dec17964af --- /dev/null +++ b/Content.Shared/Backmen/Psionics/PsionicallyInvisibleComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Backmen.Psionics; + +[RegisterComponent, NetworkedComponent] +public sealed partial class PsionicallyInvisibleComponent : Component +{ + public override bool SendOnlyToOwner => true; +} diff --git a/Content.Shared/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs b/Content.Shared/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs new file mode 100644 index 00000000000..c9dd7c09c09 --- /dev/null +++ b/Content.Shared/Backmen/Shipwrecked/Components/ShipwreckSurvivorComponent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Backmen.Shipwrecked.Components; + +/// +/// This is for tracking events. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class ShipwreckSurvivorComponent : Component +{ + public override bool SendOnlyToOwner => true; +} diff --git a/Resources/Locale/ru-RU/backmen/abilities/psionic.ftl b/Resources/Locale/ru-RU/backmen/abilities/psionic.ftl index 43b24186418..4e2626d4fba 100644 --- a/Resources/Locale/ru-RU/backmen/abilities/psionic.ftl +++ b/Resources/Locale/ru-RU/backmen/abilities/psionic.ftl @@ -49,3 +49,5 @@ action-name-psychokinesis = Психокинез action-description-psychokinesis = Согните ткань пространства, чтобы мгновенно перемещаться по ней. action-name-rf-sensitivity = Переключение чувствительности к радиочастотному излучению action-desc-rf-sensitivity = Включайте и выключайте свою способность интерпретировать радиоволны. + +cant-use-in-invisible = невозможно использовать из невидимости diff --git a/Resources/Locale/ru-RU/backmen/prototypes/Objects/devices/pinpointer.ftl b/Resources/Locale/ru-RU/backmen/prototypes/Objects/devices/pinpointer.ftl new file mode 100644 index 00000000000..d2a744d8769 --- /dev/null +++ b/Resources/Locale/ru-RU/backmen/prototypes/Objects/devices/pinpointer.ftl @@ -0,0 +1,2 @@ +ent-PinpointerShipwreck = пинпоинтер + .desc = Аварийное устройство, предназначенное для поиска потерянных критически важных двигателей шаттла. \ No newline at end of file diff --git a/Resources/Maps/Backmen/Shuttles/Shatlik.yml b/Resources/Maps/Backmen/Shipwrecked/Shatlik.yml similarity index 82% rename from Resources/Maps/Backmen/Shuttles/Shatlik.yml rename to Resources/Maps/Backmen/Shipwrecked/Shatlik.yml index 24f555f2fe4..6645857f5ef 100644 --- a/Resources/Maps/Backmen/Shuttles/Shatlik.yml +++ b/Resources/Maps/Backmen/Shipwrecked/Shatlik.yml @@ -3,6 +3,7 @@ meta: postmapinit: false tilemap: 0: Space + 1: FloorArcadeRed 14: FloorBar 27: FloorConcreteMono 38: FloorDarkPlastic @@ -53,7 +54,7 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAcgAAAAAAWAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAYwAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAWAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAWAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAXgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAGwAAAAAASwAAAAAASwAAAAAASwAAAAAASwAAAAAAVwAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAfAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAVwAAAAAASwAAAAAASwAAAAAASwAAAAAASwAAAAAAVwAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAfAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAVwAAAAAASwAAAAAASwAAAAAASwAAAAAASwAAAAAAVwAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAfAAAAAAA + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAWAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAVwAAAAAAVwAAAAAAVwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAVwAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAWAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAADgAAAAAADgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcgAAAAAAcgAAAAAAWAAAAAAAXgAAAAAAXgAAAAAAXgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAfQAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAXgAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAWAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAGwAAAAAASwAAAAAASwAAAAAASwAAAAAASwAAAAAAVwAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAfAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAVwAAAAAASwAAAAAASwAAAAAASwAAAAAASwAAAAAAVwAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAfAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAdAAAAAAAVwAAAAAASwAAAAAASwAAAAAASwAAAAAASwAAAAAAVwAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAfAAAAAAA version: 6 0,-2: ind: 0,-2 @@ -125,7 +126,8 @@ entities: 1,1: 0: 255 2,0: - 0: 65535 + 0: 65523 + 2: 12 2,1: 0: 255 3,0: @@ -151,18 +153,20 @@ entities: 2,-2: 0: 65535 2,-1: - 0: 65535 + 0: 49151 + 3: 16384 3,-4: 0: 13107 - 2: 17476 + 4: 17476 3,-3: 0: 13107 - 2: 17476 + 4: 17476 3,-2: 0: 13107 - 2: 17476 + 4: 17476 3,-1: - 0: 65503 + 0: 64991 + 3: 512 1: 32 0,-6: 0: 65392 @@ -179,23 +183,24 @@ entities: 3,-6: 0: 30576 3,-5: - 0: 13111 - 2: 17472 + 3: 17 + 0: 13094 + 4: 17472 -1,-1: 0: 52428 -1,-6: 0: 34944 -1,-5: 0: 8 - 2: 34944 + 4: 34944 -1,0: 0: 140 -1,-4: - 2: 34952 + 4: 34952 -1,-3: - 2: 8 + 4: 8 -1,-2: - 2: 34952 + 4: 34952 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -227,6 +232,36 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.1498 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -252,6 +287,10 @@ entities: - type: Transform pos: 4.5,-2.5 parent: 3 + - type: Tag + tags: + - GlassAirlock + - SecureSafe - proto: AirlockEngineeringGlassLocked entities: - uid: 2 @@ -259,12 +298,20 @@ entities: - type: Transform pos: 7.5,-19.5 parent: 3 + - type: Tag + tags: + - GlassAirlock + - EngineeringAirlock - uid: 4 components: - type: Transform pos: 9.5,-19.5 parent: 3 -- proto: AirlockExternalEasyPry + - type: Tag + tags: + - GlassAirlock + - EngineeringAirlock +- proto: AirlockExternal entities: - uid: 573 components: @@ -400,6 +447,14 @@ entities: - type: Transform pos: 6.5,4.5 parent: 3 +- proto: BedsheetMedical + entities: + - uid: 32 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-12.5 + parent: 3 - proto: BedsheetSpawner entities: - uid: 109 @@ -446,25 +501,15 @@ entities: parent: 3 - proto: Bucket entities: - - uid: 604 + - uid: 336 components: - type: Transform - pos: 1.4472828,-11.688129 + pos: 6.3051405,-12.609341 parent: 3 - - uid: 710 + - uid: 340 components: - type: Transform - pos: 1.660172,-11.672934 - parent: 3 - - uid: 711 - components: - - type: Transform - pos: 1.5385213,-11.672934 - parent: 3 - - uid: 720 - components: - - type: Transform - pos: 1.3256321,-11.718525 + pos: 6.5082655,-12.343716 parent: 3 - proto: CableApcExtension entities: @@ -1904,6 +1949,13 @@ entities: - type: Transform pos: 10.682889,-18.470814 parent: 3 +- proto: ClothingMaskSterile + entities: + - uid: 448 + components: + - type: Transform + pos: 1.4922979,-11.314877 + parent: 3 - proto: ClothingNeckGoldmedal entities: - uid: 681 @@ -2091,10 +2143,10 @@ entities: air: volume: 200 immutable: False - temperature: 75.31249 + temperature: 293.14755 moles: - - 0 - - 0 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -2141,10 +2193,10 @@ entities: air: volume: 200 immutable: False - temperature: 75.31249 + temperature: 293.14755 moles: - - 0 - - 0 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -2173,6 +2225,24 @@ entities: - type: Transform pos: 10.5,0.5 parent: 3 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 missingComponents: - AccessReader - proto: CrateSecure @@ -2206,30 +2276,34 @@ entities: showEnts: False occludes: True ents: - - 359 - - 379 - - 380 - - 381 - - 383 - - 384 - - 386 - - 387 - - 388 - - 408 - - 412 - - 413 - - 445 - - 447 - - 453 - - 454 - - 514 - - 522 - - 546 - 552 + - 546 + - 522 + - 514 + - 454 + - 453 + - 447 + - 445 + - 413 + - 412 + - 408 + - 388 + - 387 + - 386 + - 384 + - 383 + - 381 + - 380 + - 379 + - 359 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null + - type: Tag + tags: + - Structure + - SecureSafe missingComponents: - AccessReader - proto: CrateTrashCart @@ -2246,8 +2320,35 @@ entities: - type: Transform pos: 11.5,0.5 parent: 3 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: Tag + tags: + - Structure + - SecureSafe - proto: DefibrillatorCabinetFilled entities: + - uid: 334 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 3 - uid: 724 components: - type: Transform @@ -2451,6 +2552,21 @@ entities: - type: Transform pos: 5.7299767,-17.512415 parent: 3 + - uid: 332 + components: + - type: Transform + pos: 2.3051405,-11.687466 + parent: 3 + - uid: 520 + components: + - type: Transform + pos: 2.6488905,-11.296841 + parent: 3 + - uid: 554 + components: + - type: Transform + pos: 2.5238905,-11.453091 + parent: 3 - uid: 691 components: - type: Transform @@ -2464,15 +2580,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-17.5 parent: 3 -- proto: FatExtractor - entities: - - uid: 713 - components: - - type: Transform - pos: 5.5,-11.5 - parent: 3 - - type: FatExtractor - processing: False - proto: FaxMachineBase entities: - uid: 442 @@ -2496,6 +2603,20 @@ entities: parent: 3 missingComponents: - AccessReader +- proto: FoodBoxPizzaFilled + entities: + - uid: 605 + components: + - type: Transform + pos: 2.4001193,-14.244513 + parent: 3 +- proto: FoodPizzaDank + entities: + - uid: 675 + components: + - type: Transform + pos: 1.4081609,-13.661364 + parent: 3 - proto: GravityGeneratorMini entities: - uid: 155 @@ -2649,804 +2770,20 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-16.5 parent: 3 -- proto: hydroponicsTray +- proto: KitchenMicrowave entities: - - uid: 553 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-13.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 554 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-14.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 555 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-13.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 601 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-13.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 650 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-13.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 651 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-14.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 685 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-14.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 707 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-14.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 714 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-13.5 - parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False - - uid: 715 + - uid: 378 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-14.5 + pos: 1.5,-4.5 parent: 3 - - type: PlantHolder - lastProduce: 1 - age: 1 - health: 100 - seed: - splatPrototype: null - lifespan: 55 - endurance: 100 - weedHighLevelThreshold: 10 - weedTolerance: 5 - pestTolerance: 5 - highPressureTolerance: 121 - lowPressureTolerance: 81 - toxinsTolerance: 4 - lightTolerance: 3 - idealLight: 6 - heatTolerance: 10 - idealHeat: 293 - waterConsumption: 0.5 - nutrientConsumption: 0.75 - exudeGasses: {} - consumeGasses: {} - chemicals: - Nutriment: - Inherent: True - PotencyDivisor: 10 - Max: 10 - Min: 1 - Vitamin: - Inherent: True - PotencyDivisor: 25 - Max: 4 - Min: 1 - productPrototypes: - - FoodApple - packetPrototype: AppleSeeds - immutable: False - yield: 3 - maturation: 6 - bioluminescentColor: '#FFFFFFFF' - production: 6 - plantIconState: produce - plantRsi: Objects/Specific/Hydroponics/apple.rsi - displayName: seeds-apple-display-name - noun: seeds-noun-seeds - name: seeds-apple-name - mutationPrototypes: [] - turnIntoKudzu: False - kudzuPrototype: WeakKudzu - bioluminescent: False - screaming: False - screamSound: !type:SoundPathSpecifier - params: - variation: null - playOffsetSeconds: 0 - loop: False - referenceDistance: 1 - rolloffFactor: 1 - maxDistance: 20 - busName: Master - pitch: 1 - volume: 0 - attenuation: LinearDistanceClamped - path: /Audio/Voice/Human/malescream_1.ogg - ligneous: False - sentient: False - slip: False - viable: True - seedless: False - potency: 10 - harvestRepeat: Repeat - growthStages: 6 - mysterious: False -- proto: KitchenMicrowave +- proto: KnifePlastic entities: - - uid: 378 + - uid: 674 components: - type: Transform - pos: 1.5,-4.5 + rot: -1.5707963267948966 rad + pos: 2.3844943,-14.385138 parent: 3 - proto: LockerFreezerBase entities: @@ -3457,13 +2794,12 @@ entities: parent: 3 - proto: LockerWallMedicalFilled entities: - - uid: 712 + - uid: 604 components: - type: Transform - pos: 4.5,-10.5 + rot: -1.5707963267948966 rad + pos: 7.5,-11.5 parent: 3 - missingComponents: - - AccessReader - proto: MedicalBed entities: - uid: 34 @@ -3481,6 +2817,11 @@ entities: - type: Transform pos: 10.5,-4.5 parent: 3 + - uid: 603 + components: + - type: Transform + pos: 1.5,-12.5 + parent: 3 - uid: 687 components: - type: Transform @@ -3496,36 +2837,41 @@ entities: - type: Transform pos: 12.5,-8.5 parent: 3 -- proto: MedkitAdvancedFilled +- proto: MedicalTechFab entities: - - uid: 32 + - uid: 602 components: - type: Transform - pos: 4.3142242,-11.377129 + pos: 3.5,-11.5 parent: 3 - - uid: 721 +- proto: MedkitAdvancedFilled + entities: + - uid: 341 components: - type: Transform - pos: 4.4967003,-11.392326 + pos: 4.2152767,-11.219671 parent: 3 -- proto: MedkitFilled +- proto: MedkitBruteFilled entities: - - uid: 722 + - uid: 339 components: - type: Transform - pos: 4.527114,-11.2555485 + pos: 4.4027767,-11.391546 parent: 3 - - uid: 723 +- proto: MedkitToxinFilled + entities: + - uid: 342 components: - type: Transform - pos: 4.7856216,-11.407524 + pos: 4.6840267,-11.625921 parent: 3 - proto: Mirror entities: - - uid: 603 + - uid: 343 components: - type: Transform - pos: 1.5,-10.5 + rot: -1.5707963267948966 rad + pos: 7.5,-12.5 parent: 3 - proto: NitrogenCanister entities: @@ -3534,8 +2880,6 @@ entities: - type: Transform pos: 12.5,-17.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - proto: OreProcessor entities: - uid: 220 @@ -3550,8 +2894,6 @@ entities: - type: Transform pos: 12.5,-16.5 parent: 3 - - type: AtmosDevice - joinedGrid: 3 - proto: PaintingHelloWorld entities: - uid: 558 @@ -3628,6 +2970,29 @@ entities: rot: -1.5707963267948966 rad pos: 11.819567,-18.824476 parent: 3 +- proto: PinpointerShipwreck + entities: + - uid: 553 + components: + - type: Transform + parent: 513 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 555 + components: + - type: Transform + parent: 512 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: PlushieLizardMirrored + entities: + - uid: 446 + components: + - type: Transform + pos: 1.3516729,-11.299252 + parent: 3 - proto: PortableGeneratorSuperPacman entities: - uid: 156 @@ -3845,6 +3210,20 @@ entities: - type: Transform pos: 6.5,0.5 parent: 3 +- proto: RandomArcade + entities: + - uid: 337 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-14.5 + parent: 3 + - uid: 672 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-14.5 + parent: 3 - proto: RandomDrinkBottle entities: - uid: 443 @@ -4122,13 +3501,6 @@ entities: - type: Transform pos: 4.5,-10.5 parent: 3 -- proto: SinkStemlessWater - entities: - - uid: 606 - components: - - type: Transform - pos: 1.5,-11.5 - parent: 3 - proto: SinkWide entities: - uid: 686 @@ -4264,6 +3636,18 @@ entities: - type: Transform pos: 12.5,-12.5 parent: 3 +- proto: StoolBar + entities: + - uid: 652 + components: + - type: Transform + pos: 3.5,-13.5 + parent: 3 + - uid: 671 + components: + - type: Transform + pos: 4.5,-13.5 + parent: 3 - proto: SubstationBasic entities: - uid: 158 @@ -4278,12 +3662,16 @@ entities: - type: Transform pos: 12.5,-19.5 parent: 3 + - type: Lock + locked: False - type: EntityStorage air: volume: 200 immutable: False - temperature: 75.31249 + temperature: 293.14755 moles: + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -4294,21 +3682,28 @@ entities: - 0 - 0 - 0 - - 0 - - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 555 - uid: 513 components: - type: Transform pos: 12.5,-18.5 parent: 3 + - type: Lock + locked: False - type: EntityStorage air: volume: 200 immutable: False - temperature: 75.31249 + temperature: 293.14755 moles: - - 0 - - 0 + - 1.7459903 + - 6.568249 - 0 - 0 - 0 @@ -4325,8 +3720,9 @@ entities: showEnts: False occludes: True ents: - - 166 - 167 + - 553 + - 166 - proto: SuitStorageSec entities: - uid: 677 @@ -4361,6 +3757,11 @@ entities: - 698 - proto: Table entities: + - uid: 333 + components: + - type: Transform + pos: 1.5,-11.5 + parent: 3 - uid: 382 components: - type: Transform @@ -4378,6 +3779,12 @@ entities: - type: Transform pos: 5.5,-4.5 parent: 3 + - uid: 515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-11.5 + parent: 3 - uid: 523 components: - type: Transform @@ -4396,11 +3803,6 @@ entities: parent: 3 - proto: TableReinforced entities: - - uid: 602 - components: - - type: Transform - pos: 4.5,-11.5 - parent: 3 - uid: 783 components: - type: Transform @@ -4462,6 +3864,24 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-4.5 parent: 3 + - uid: 606 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-14.5 + parent: 3 + - uid: 650 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-13.5 + parent: 3 + - uid: 673 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-14.5 + parent: 3 - proto: Thruster entities: - uid: 105 @@ -4551,6 +3971,13 @@ entities: parent: 3 missingComponents: - AccessReader +- proto: VendingMachineMREDispancer + entities: + - uid: 338 + components: + - type: Transform + pos: 6.5,-13.5 + parent: 3 - proto: VendingMachineMTFLeader entities: - uid: 328 @@ -4569,22 +3996,6 @@ entities: parent: 3 missingComponents: - AccessReader -- proto: VendingMachineNutri - entities: - - uid: 694 - components: - - type: Transform - pos: 3.5,-11.5 - parent: 3 - missingComponents: - - AccessReader -- proto: VendingMachineSeedsUnlocked - entities: - - uid: 605 - components: - - type: Transform - pos: 2.5,-11.5 - parent: 3 - proto: VendingMachineTankDispenserEVA entities: - uid: 224 @@ -5405,11 +4816,6 @@ entities: - type: Transform pos: 8.5,-3.5 parent: 3 - - uid: 741 - components: - - type: Transform - pos: 7.5,-11.5 - parent: 3 - uid: 746 components: - type: Transform @@ -5439,6 +4845,51 @@ entities: - type: Transform pos: 4.5,4.5 parent: 3 +- proto: WeaponPistolCHIMP + entities: + - uid: 651 + components: + - type: Transform + pos: 1.4782443,-14.416388 + parent: 3 +- proto: WindowDirectional + entities: + - uid: 335 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-13.5 + parent: 3 + - uid: 516 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-13.5 + parent: 3 + - uid: 517 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-13.5 + parent: 3 + - uid: 518 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-13.5 + parent: 3 + - uid: 519 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-13.5 + parent: 3 + - uid: 601 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-13.5 + parent: 3 - proto: WindowReinforcedDirectional entities: - uid: 678 diff --git a/Resources/Maps/Backmen/Shuttles/adventurer.yml b/Resources/Maps/Backmen/Shipwrecked/adventurer.yml similarity index 97% rename from Resources/Maps/Backmen/Shuttles/adventurer.yml rename to Resources/Maps/Backmen/Shipwrecked/adventurer.yml index cc21bb68022..d46a8c3f8ad 100644 --- a/Resources/Maps/Backmen/Shuttles/adventurer.yml +++ b/Resources/Maps/Backmen/Shipwrecked/adventurer.yml @@ -288,7 +288,8 @@ entities: 0: 30512 2: 64 1,-1: - 0: 30583 + 0: 30567 + 3: 16 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -335,6 +336,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -362,8 +378,6 @@ entities: - type: DeviceList devices: - 300 - - type: AtmosDevice - joinedGrid: 2 - uid: 152 components: - type: Transform @@ -377,8 +391,6 @@ entities: - 222 - 237 - 244 - - type: AtmosDevice - joinedGrid: 2 - proto: Airlock entities: - uid: 59 @@ -415,6 +427,10 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 2 + - type: Tag + tags: + - GlassAirlock + - EngineeringAirlock - proto: AirlockExternalGlass entities: - uid: 28 @@ -514,6 +530,13 @@ entities: - type: DeviceLinkSink links: - 1 +- proto: BookRandomStory + entities: + - uid: 268 + components: + - type: Transform + pos: 5.5,2.5 + parent: 2 - proto: BoxShotgunFlare entities: - uid: 240 @@ -980,6 +1003,9 @@ entities: parent: 2 - type: AccessReader access: [] + - type: Tag + tags: + - SecureSafe - proto: Flash entities: - uid: 155 @@ -1042,8 +1068,6 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#D02030FF' - proto: GasPassiveVent @@ -1054,8 +1078,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasPipeBend entities: - uid: 230 @@ -1231,8 +1253,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#D02030FF' - uid: 220 @@ -1240,8 +1260,6 @@ entities: - type: Transform pos: 3.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#D02030FF' - uid: 221 @@ -1250,8 +1268,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#D02030FF' - uid: 222 @@ -1260,8 +1276,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#D02030FF' - uid: 237 @@ -1270,8 +1284,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#D02030FF' - uid: 300 @@ -1280,8 +1292,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,6.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#D02030FF' - proto: GravityGeneratorMini @@ -1431,26 +1441,30 @@ entities: showEnts: False occludes: True ents: - - 311 - - 297 - - 299 - - 270 - - 310 + - 240 + - 154 + - 155 + - 317 + - 156 + - 316 + - 315 + - 314 + - 313 - 312 + - 310 + - 270 + - 299 + - 297 + - 311 - 175 - - 313 - - 314 - - 315 - - 316 - - 156 - - 317 - - 155 - - 154 - - 240 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null + - type: Tag + tags: + - Structure + - SecureSafe - proto: Gyroscope entities: - uid: 32 @@ -1684,6 +1698,15 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: PinpointerShipwreck + entities: + - uid: 336 + components: + - type: Transform + parent: 200 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: PortableGeneratorSuperPacman entities: - uid: 178 @@ -1694,10 +1717,11 @@ entities: parent: 2 - type: MaterialStorage storage: - Uranium: 200 + Uranium: 100 - type: Physics bodyType: Static - type: InsertingMaterialStorage + endTime: 0 - proto: PosterLegitHotDonkExplosion entities: - uid: 198 @@ -1773,13 +1797,6 @@ entities: - type: Transform pos: 4.5776534,10.851077 parent: 2 -- proto: BookRandomStory - entities: - - uid: 268 - components: - - type: Transform - pos: 5.5,2.5 - parent: 2 - proto: RandomDrinkBottle entities: - uid: 283 @@ -2122,6 +2139,35 @@ entities: - type: Transform pos: 4.5,-2.5 parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 336 + - type: Tag + tags: + - Structure + - EngineeringAirlock - proto: TableCarpet entities: - uid: 146 diff --git a/Resources/Maps/Backmen/Shuttles/shwr-dust.yml b/Resources/Maps/Backmen/Shipwrecked/shwr-dust.yml similarity index 96% rename from Resources/Maps/Backmen/Shuttles/shwr-dust.yml rename to Resources/Maps/Backmen/Shipwrecked/shwr-dust.yml index 48f27f868a4..99c107d3987 100644 --- a/Resources/Maps/Backmen/Shuttles/shwr-dust.yml +++ b/Resources/Maps/Backmen/Shipwrecked/shwr-dust.yml @@ -3,6 +3,7 @@ meta: postmapinit: false tilemap: 0: Space + 1: FloorArcadeBlue 38: FloorDarkPlastic 92: FloorSteel 99: FloorSteelDirty @@ -51,7 +52,7 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: bAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAeQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAeQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAeQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: bAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAXAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAeQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAeQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAeQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-2: ind: 0,-2 @@ -81,13 +82,6 @@ entities: chunkCollection: version: 2 nodes: - - node: - color: '#9FED58FF' - id: MiniTileDarkLineE - decals: - 46: 11,-5 - 47: 11,-4 - 48: 11,-3 - node: color: '#9FED58FF' id: MiniTileDarkLineS @@ -96,28 +90,11 @@ entities: 33: 1,-5 34: 2,-5 35: 3,-5 - 36: 5,-5 - 37: 6,-5 - 38: 7,-5 - 39: 7,-5 - 40: 6,-5 - 41: 8,-5 - 42: 8,-5 - 43: 9,-5 - 44: 10,-5 - 45: 11,-5 - node: color: '#EFB341FF' id: MiniTileSteelInnerSe decals: 16: 9,-16 - - node: - color: '#9FED58FF' - id: MiniTileSteelLineE - decals: - 60: 11,-5 - 61: 11,-4 - 62: 11,-3 - node: color: '#EFB341FF' id: MiniTileSteelLineE @@ -136,13 +113,6 @@ entities: 22: 1,-3 23: 2,-3 24: 3,-3 - 25: 5,-3 - 26: 6,-3 - 27: 7,-3 - 28: 8,-3 - 29: 9,-3 - 30: 10,-3 - 31: 11,-3 - node: color: '#EFB341FF' id: MiniTileSteelLineN @@ -160,13 +130,6 @@ entities: 50: 1,-5 51: 2,-5 52: 3,-5 - 53: 5,-5 - 54: 6,-5 - 55: 7,-5 - 56: 9,-5 - 57: 8,-5 - 58: 10,-5 - 59: 11,-5 - node: color: '#EFB341FF' id: MiniTileSteelLineS @@ -254,6 +217,11 @@ entities: id: WarnBox decals: 95: 9,13 + - node: + color: '#FFFF00FF' + id: clown + decals: + 96: 8,-16 - node: cleanable: True color: '#FFFFFF93' @@ -321,7 +289,8 @@ entities: 1,-1: 0: 65535 2,-4: - 0: 65535 + 0: 61439 + 2: 4096 2,-3: 0: 65535 2,-2: @@ -377,6 +346,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -396,8 +380,6 @@ entities: - 112 - 586 - 587 - - type: AtmosDevice - joinedGrid: 2 - uid: 696 components: - type: Transform @@ -410,8 +392,6 @@ entities: - 815 - 832 - 583 - - type: AtmosDevice - joinedGrid: 2 - uid: 698 components: - type: Transform @@ -422,8 +402,6 @@ entities: devices: - 833 - 569 - - type: AtmosDevice - joinedGrid: 2 - uid: 699 components: - type: Transform @@ -435,8 +413,6 @@ entities: - 708 - 135 - 580 - - type: AtmosDevice - joinedGrid: 2 - type: Followed following: [] - uid: 700 @@ -450,8 +426,6 @@ entities: - 568 - 713 - 712 - - type: AtmosDevice - joinedGrid: 2 - uid: 702 components: - type: Transform @@ -462,8 +436,6 @@ entities: devices: - 828 - 589 - - type: AtmosDevice - joinedGrid: 2 - proto: Airlock entities: - uid: 610 @@ -491,6 +463,10 @@ entities: - type: Transform pos: 4.5,-11.5 parent: 2 + - type: Tag + tags: + - GlassAirlock + - EngineeringAirlock - uid: 457 components: - type: Transform @@ -502,6 +478,10 @@ entities: - type: Transform pos: 3.5,-11.5 parent: 2 + - type: Tag + tags: + - GlassAirlock + - EngineeringAirlock - proto: AirlockExternal entities: - uid: 246 @@ -700,13 +680,6 @@ entities: - type: Transform pos: 1.6496048,1.92962 parent: 2 -- proto: Bucket - entities: - - uid: 40 - components: - - type: Transform - pos: 7.406128,-2.35933 - parent: 2 - proto: CableApcExtension entities: - uid: 3 @@ -2053,7 +2026,7 @@ entities: - uid: 127 components: - type: Transform - pos: 8.088538,-12.28066 + pos: 7.6409745,-12.492677 parent: 2 - proto: ClothingMaskGas entities: @@ -2141,6 +2114,43 @@ entities: - type: Transform pos: 5.5,9.5 parent: 2 +- proto: CrateEngineering + entities: + - uid: 356 + components: + - type: Transform + pos: 8.5,-12.5 + parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 426 + - 432 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: DefibrillatorCabinetFilled entities: - uid: 513 @@ -2270,6 +2280,18 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,3.5 parent: 2 +- proto: EmergencyRollerBedSpawnFolded + entities: + - uid: 288 + components: + - type: Transform + pos: 1.374172,-8.3366995 + parent: 2 + - uid: 462 + components: + - type: Transform + pos: 1.717922,-8.6648245 + parent: 2 - proto: FigureSpawner entities: - uid: 845 @@ -2350,8 +2372,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMinerOxygen entities: - uid: 560 @@ -2360,8 +2380,6 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: GasMixerFlipped entities: - uid: 573 @@ -2373,8 +2391,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.22000003 inletOneConcentration: 0.78 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0335FCFF' - proto: GasPassiveVent @@ -2385,16 +2401,12 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 559 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 687 @@ -2403,8 +2415,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-17.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend @@ -3293,8 +3303,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - uid: 578 @@ -3303,8 +3311,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 802 @@ -3313,8 +3319,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-15.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#03FCD3FF' - proto: GasVentPump @@ -3325,8 +3329,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-14.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - type: Followed @@ -3337,8 +3339,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-8.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 580 @@ -3347,8 +3347,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 583 @@ -3356,8 +3354,6 @@ entities: - type: Transform pos: 8.5,-2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 585 @@ -3365,8 +3361,6 @@ entities: - type: Transform pos: 1.5,-2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 586 @@ -3375,8 +3369,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,2.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 587 @@ -3385,8 +3377,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - uid: 589 @@ -3395,8 +3385,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -3407,8 +3395,6 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,0.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 135 @@ -3416,24 +3402,13 @@ entities: - type: Transform pos: 11.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 706 - components: - - type: Transform - pos: 7.5,-2.5 - parent: 2 - - type: AtmosDevice - joinedGrid: 2 - uid: 708 components: - type: Transform pos: 7.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 712 @@ -3442,8 +3417,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 713 @@ -3452,8 +3425,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-16.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 815 @@ -3462,8 +3433,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 825 @@ -3472,8 +3441,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,1.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 828 @@ -3481,8 +3448,6 @@ entities: - type: Transform pos: 4.5,7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 832 @@ -3490,8 +3455,6 @@ entities: - type: Transform pos: 9.5,-3.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 833 @@ -3500,8 +3463,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-7.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - uid: 834 @@ -3510,8 +3471,6 @@ entities: rot: 3.141592653589793 rad pos: 9.5,-10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3698,6 +3657,12 @@ entities: showEnts: False occludes: True ent: null + - type: Tag + tags: + - Structure + - SecureSafe + missingComponents: + - Destructible - proto: Gyroscope entities: - uid: 550 @@ -3714,85 +3679,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: HydroponicsToolClippers - entities: - - uid: 356 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.516492,-2.35933 - parent: 2 - - uid: 434 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.157117,-2.343705 - parent: 2 -- proto: HydroponicsToolHatchet - entities: - - uid: 620 - components: - - type: Transform - pos: 7.390774,-2.3872511 - parent: 2 -- proto: HydroponicsToolMiniHoe - entities: - - uid: 439 - components: - - type: Transform - pos: 8.078003,-2.35933 - parent: 2 - - uid: 449 - components: - - type: Transform - pos: 7.859253,-2.343705 - parent: 2 -- proto: HydroponicsToolSpade - entities: - - uid: 326 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.687378,-2.343705 - parent: 2 - - uid: 442 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 8.468628,-2.35933 - parent: 2 -- proto: hydroponicsTray - entities: - - uid: 141 - components: - - type: Transform - pos: 10.5,-4.5 - parent: 2 - - uid: 155 - components: - - type: Transform - pos: 11.5,-4.5 - parent: 2 - - uid: 182 - components: - - type: Transform - pos: 6.5,-4.5 - parent: 2 - - uid: 183 - components: - - type: Transform - pos: 8.5,-4.5 - parent: 2 - - uid: 244 - components: - - type: Transform - pos: 7.5,-4.5 - parent: 2 - - uid: 288 - components: - - type: Transform - pos: 9.5,-4.5 - parent: 2 - proto: JanitorialTrolley entities: - uid: 666 @@ -3871,6 +3757,13 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: MaterialBananium + entities: + - uid: 285 + components: + - type: Transform + pos: 8.535377,-15.510461 + parent: 2 - proto: MedicalBed entities: - uid: 506 @@ -3897,8 +3790,6 @@ entities: - type: Transform pos: 0.5,-13.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: OreProcessor entities: - uid: 684 @@ -3915,8 +3806,6 @@ entities: - type: Transform pos: 0.5,-12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - proto: OxygenTankFilled entities: - uid: 688 @@ -3941,6 +3830,22 @@ entities: - type: Transform pos: 3.306982,-16.376648 parent: 2 +- proto: PinpointerShipwreck + entities: + - uid: 426 + components: + - type: Transform + parent: 356 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 432 + components: + - type: Transform + parent: 356 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: PlasmaReinforcedWindowDirectional entities: - uid: 552 @@ -3998,25 +3903,6 @@ entities: - type: Transform pos: 9.426357,-12.546189 parent: 2 -- proto: PortableGeneratorPacman - entities: - - uid: 432 - components: - - type: Transform - pos: 8.5,-16.5 - parent: 2 - - uid: 468 - components: - - type: Transform - pos: 9.5,-16.5 - parent: 2 -- proto: PortableGeneratorSuperPacman - entities: - - uid: 462 - components: - - type: Transform - pos: 7.5,-16.5 - parent: 2 - proto: PosterContrabandEAT entities: - uid: 647 @@ -4047,11 +3933,6 @@ entities: parent: 2 - proto: PottedPlantRandom entities: - - uid: 223 - components: - - type: Transform - pos: 5.5,-2.5 - parent: 2 - uid: 239 components: - type: Transform @@ -4249,6 +4130,51 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,12.5 parent: 2 +- proto: RadiationCollector + entities: + - uid: 205 + components: + - type: Transform + pos: 8.5,-16.5 + parent: 2 + - type: RadiationCollector + enabled: True + - uid: 244 + components: + - type: Transform + pos: 7.5,-16.5 + parent: 2 +- proto: RadiationCollectorFullTank + entities: + - uid: 223 + components: + - type: Transform + pos: 9.5,-16.5 + parent: 2 + - type: RadiationCollector + enabled: True +- proto: RandomArcade + entities: + - uid: 101 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 2 + - uid: 284 + components: + - type: Transform + pos: 9.5,-2.5 + parent: 2 + - uid: 317 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 2 + - uid: 439 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 2 - proto: RandomFoodSingle entities: - uid: 676 @@ -4347,37 +4273,6 @@ entities: - type: Transform pos: 1.4712107,2.5971193 parent: 2 -- proto: SeedExtractor - entities: - - uid: 140 - components: - - type: Transform - pos: 10.5,-2.5 - parent: 2 -- proto: SheetPlasma - entities: - - uid: 138 - components: - - type: Transform - pos: 8.539363,-12.452535 - parent: 2 - - uid: 504 - components: - - type: Transform - pos: 8.543938,-12.461701 - parent: 2 - - uid: 633 - components: - - type: Transform - pos: 8.426017,-12.472336 - parent: 2 -- proto: SheetUranium - entities: - - uid: 21 - components: - - type: Transform - pos: 8.584119,-12.390035 - parent: 2 - proto: ShuttleWindow entities: - uid: 22 @@ -4595,10 +4490,10 @@ entities: parent: 2 - proto: SpawnMobAlexander entities: - - uid: 621 + - uid: 326 components: - type: Transform - pos: 10.5,-4.5 + pos: 0.5,-3.5 parent: 2 - proto: SpawnMobCatGeneric entities: @@ -4614,13 +4509,6 @@ entities: - type: Transform pos: 10.5,-10.5 parent: 2 -- proto: SpawnMobCow - entities: - - uid: 619 - components: - - type: Transform - pos: 11.5,-4.5 - parent: 2 - proto: SpawnMobMedibot entities: - uid: 670 @@ -4721,48 +4609,57 @@ entities: - type: Transform pos: 10.5,2.5 parent: 2 -- proto: SubstationBasic +- proto: StoolBar entities: - - uid: 461 + - uid: 138 components: - type: Transform - pos: 11.5,-12.5 + rot: 3.141592653589793 rad + pos: 8.5,-3.5 parent: 2 -- proto: Table - entities: - - uid: 44 + - uid: 141 components: - type: Transform - pos: 7.5,-12.5 + rot: 3.141592653589793 rad + pos: 9.5,-3.5 parent: 2 - - uid: 101 + - uid: 155 components: - type: Transform - pos: 8.5,-12.5 + rot: 3.141592653589793 rad + pos: 8.5,-3.5 parent: 2 - - uid: 148 + - uid: 182 components: - type: Transform rot: 3.141592653589793 rad - pos: 9.5,-7.5 + pos: 7.5,-3.5 parent: 2 - - uid: 205 + - uid: 434 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 8.5,-2.5 + rot: 3.141592653589793 rad + pos: 10.5,-3.5 parent: 2 - - uid: 284 +- proto: SubstationBasic + entities: + - uid: 461 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-2.5 + pos: 11.5,-12.5 parent: 2 - - uid: 285 +- proto: Table + entities: + - uid: 44 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-2.5 + pos: 7.5,-12.5 + parent: 2 + - uid: 148 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-7.5 parent: 2 - uid: 394 components: @@ -4862,6 +4759,18 @@ entities: parent: 2 - proto: TableWood entities: + - uid: 21 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-2.5 + parent: 2 + - uid: 140 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-2.5 + parent: 2 - uid: 361 components: - type: Transform @@ -4987,6 +4896,23 @@ entities: parent: 2 missingComponents: - AccessReader +- proto: VendingMachineMREDispancer + entities: + - uid: 40 + components: + - type: Transform + pos: 11.5,-3.5 + parent: 2 + - uid: 183 + components: + - type: Transform + pos: 11.5,-2.5 + parent: 2 + - uid: 442 + components: + - type: Transform + pos: 11.5,-4.5 + parent: 2 - proto: VendingMachineMTFLeader entities: - uid: 856 @@ -4996,13 +4922,6 @@ entities: parent: 2 missingComponents: - AccessReader -- proto: VendingMachineSeeds - entities: - - uid: 317 - components: - - type: Transform - pos: 11.5,-2.5 - parent: 2 - proto: VendingMachineTankDispenserEVA entities: - uid: 693 @@ -5817,15 +5736,6 @@ entities: - type: Transform pos: 2.5,5.5 parent: 2 -- proto: WaterTankHighCapacity - entities: - - uid: 426 - components: - - type: Transform - pos: 6.5,-2.5 - parent: 2 - - type: Followed - following: [] - proto: WeaponCapacitorRecharger entities: - uid: 534 @@ -5860,6 +5770,13 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: WeaponPistolCHIMP + entities: + - uid: 449 + components: + - type: Transform + pos: 5.453292,-2.435888 + parent: 2 - proto: WhiteCane entities: - uid: 481 diff --git a/Resources/Maps/Dungeon/ruined_shops.yml b/Resources/Maps/Dungeon/ruined_shops.yml index 55284c050aa..57a58f4c87f 100644 --- a/Resources/Maps/Dungeon/ruined_shops.yml +++ b/Resources/Maps/Dungeon/ruined_shops.yml @@ -50,6 +50,10 @@ entities: ind: 4,0 tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAEwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAEwAAAAAAeQAAAAAAEwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAKAAAAAAAeQAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAMAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAeQAAAAAAKAAAAAAAEwAAAAAAEwAAAAAAeQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAEwAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAUAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAJgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 - type: Broadphase - type: Physics bodyStatus: InAir @@ -75,6 +79,75 @@ entities: id: Basalt6 decals: 301: 56.98715,1.7502437 + - node: + color: '#FFFFFFFF' + id: Bot + decals: + 349: 4,-7 + - node: + color: '#835432FF' + id: BrickCornerOverlayNE + decals: + 358: 9,-1 + - node: + color: '#835432FF' + id: BrickCornerOverlayNW + decals: + 359: 1,-1 + - node: + color: '#835432FF' + id: BrickCornerOverlaySE + decals: + 361: 9,-9 + - node: + color: '#835432FF' + id: BrickCornerOverlaySW + decals: + 360: 1,-9 + - node: + color: '#835432FF' + id: BrickLineOverlayE + decals: + 376: 9,-2 + 377: 9,-3 + 378: 9,-4 + 379: 9,-5 + 380: 9,-6 + 381: 9,-7 + 382: 9,-8 + - node: + color: '#835432FF' + id: BrickLineOverlayN + decals: + 362: 2,-1 + 363: 3,-1 + 364: 4,-1 + 365: 5,-1 + 366: 6,-1 + 367: 7,-1 + 368: 8,-1 + - node: + color: '#835432FF' + id: BrickLineOverlayS + decals: + 351: 2,-9 + 352: 3,-9 + 353: 5,-9 + 354: 4,-9 + 355: 6,-9 + 356: 7,-9 + 357: 8,-9 + - node: + color: '#835432FF' + id: BrickLineOverlayW + decals: + 369: 1,-2 + 370: 1,-3 + 371: 1,-4 + 372: 1,-5 + 373: 1,-6 + 374: 1,-7 + 375: 1,-8 - node: color: '#474F52FF' id: BrickTileSteelCornerNe @@ -278,6 +351,12 @@ entities: 100: 1,4 101: 1,3 102: 1,2 + - node: + color: '#FFFFFFFF' + id: Delivery + decals: + 347: 4,-6 + 348: 4,-5 - node: color: '#EFB34196' id: DiagonalCheckerBOverlay @@ -425,6 +504,11 @@ entities: id: Grassc4 decals: 338: 62,8 + - node: + color: '#FFFFFFFF' + id: LoadingArea + decals: + 346: 4,-8 - node: color: '#B02E26C4' id: QuarterTileOverlayGreyscale @@ -592,6 +676,12 @@ entities: 318: 65,8 325: 68,4 326: 67,8 + - node: + angle: 2.443460952792061 rad + color: '#920000FF' + id: line + decals: + 345: 2.5499916,-7.295549 - node: angle: 0.5759586531581288 rad color: '#2A2D387C' @@ -608,6 +698,12 @@ entities: id: splatter decals: 296: 56.906033,3.8596187 + - node: + color: '#920000FF' + id: splatter + decals: + 342: 4.8937416,-3.123674 + 343: 1.8312416,-7.608049 - node: cleanable: True color: '#B02E26FF' @@ -802,6 +898,13 @@ entities: - type: Transform pos: 63.5,3.5 parent: 1 +- proto: BoxFolderYellow + entities: + - uid: 384 + components: + - type: Transform + pos: 5.75023,-4.665278 + parent: 1 - proto: BoxLethalshot entities: - uid: 258 @@ -1426,6 +1529,25 @@ entities: - type: Transform pos: 44.5,8.5 parent: 1 +- proto: LockerBoozeFilled + entities: + - uid: 377 + components: + - type: Transform + pos: 7.5,-6.5 + parent: 1 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 378 + - 379 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: MaintenanceFluffSpawner entities: - uid: 62 @@ -1458,6 +1580,16 @@ entities: - type: Transform pos: 52.5,6.5 parent: 1 + - uid: 372 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 376 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 1 - proto: MaintenanceToolSpawner entities: - uid: 67 @@ -1495,6 +1627,16 @@ entities: - type: Transform pos: 4.5,3.5 parent: 1 + - uid: 373 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - uid: 374 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 1 - proto: MaintenanceWeaponSpawner entities: - uid: 71 @@ -1517,6 +1659,26 @@ entities: - type: Transform pos: 14.5,7.5 parent: 1 + - uid: 356 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - uid: 357 + components: + - type: Transform + pos: 8.5,-1.5 + parent: 1 + - uid: 370 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 1 + - uid: 375 + components: + - type: Transform + pos: 7.5,-1.5 + parent: 1 - proto: MaterialWoodPlank1 entities: - uid: 252 @@ -1548,6 +1710,13 @@ entities: - type: Transform pos: 43.82948,8.357357 parent: 1 +- proto: OreProcessorMachineCircuitboard + entities: + - uid: 381 + components: + - type: Transform + pos: 1.4533546,-4.493403 + parent: 1 - proto: PaintingSkeletonCigarette entities: - uid: 74 @@ -1834,6 +2003,80 @@ entities: rot: 3.141592653589793 rad pos: 14.5,7.5 parent: 1 + - uid: 348 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 349 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-1.5 + parent: 1 + - uid: 350 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-1.5 + parent: 1 + - uid: 351 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-1.5 + parent: 1 + - uid: 352 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-2.5 + parent: 1 + - uid: 353 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-2.5 + parent: 1 + - uid: 354 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-2.5 + parent: 1 + - uid: 355 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-2.5 + parent: 1 + - uid: 366 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 367 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-5.5 + parent: 1 + - uid: 368 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-6.5 + parent: 1 +- proto: RandomCargoCorpseSpawner + entities: + - uid: 359 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-7.5 + parent: 1 - proto: RandomDrinkBottle entities: - uid: 113 @@ -1983,6 +2226,13 @@ entities: - type: Transform pos: 9.5,9.5 parent: 1 +- proto: SalvageLootSpawner + entities: + - uid: 371 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 1 - proto: SalvageSeedSpawnerLow entities: - uid: 306 @@ -1995,6 +2245,20 @@ entities: - type: Transform pos: 65.5,6.5 parent: 1 +- proto: ShardGlass + entities: + - uid: 363 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.1437416,-5.201799 + parent: 1 + - uid: 369 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.1281166,-5.561174 + parent: 1 - proto: SheetSteel1 entities: - uid: 59 @@ -2134,6 +2398,16 @@ entities: - type: Transform pos: 65.43828,3.8464036 parent: 1 + - uid: 382 + components: + - type: Transform + pos: 5.68773,-5.946528 + parent: 1 + - uid: 383 + components: + - type: Transform + pos: 5.34398,-5.649653 + parent: 1 - proto: SpaceCash100 entities: - uid: 239 @@ -2164,6 +2438,11 @@ entities: - type: Transform pos: 53.264484,5.7855086 parent: 1 + - uid: 380 + components: + - type: Transform + pos: 5.234605,-6.274653 + parent: 1 - proto: SubstationWallBasic entities: - uid: 273 @@ -2172,6 +2451,13 @@ entities: rot: -1.5707963267948966 rad pos: 63.5,4.5 parent: 1 +- proto: SurvivalKnife + entities: + - uid: 360 + components: + - type: Transform + pos: 4.8781166,-2.389299 + parent: 1 - proto: TableCounterMetal entities: - uid: 136 @@ -2357,6 +2643,21 @@ entities: rot: 1.5707963267948966 rad pos: 65.5,3.5 parent: 1 + - uid: 341 + components: + - type: Transform + pos: 5.5,-6.5 + parent: 1 + - uid: 342 + components: + - type: Transform + pos: 5.5,-5.5 + parent: 1 + - uid: 343 + components: + - type: Transform + pos: 5.5,-4.5 + parent: 1 - proto: ToySpawner entities: - uid: 163 @@ -2374,6 +2675,22 @@ entities: - type: Transform pos: 43.5,3.5 parent: 1 +- proto: VendingMachineRestockMedical + entities: + - uid: 378 + components: + - type: Transform + parent: 377 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 379 + components: + - type: Transform + parent: 377 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: WallDrywall entities: - uid: 166 @@ -2591,6 +2908,46 @@ entities: - type: Transform pos: 63.5,2.5 parent: 1 +- proto: WallSolid + entities: + - uid: 241 + components: + - type: Transform + pos: 7.5,-7.5 + parent: 1 + - uid: 336 + components: + - type: Transform + pos: 8.5,-7.5 + parent: 1 + - uid: 337 + components: + - type: Transform + pos: 8.5,-6.5 + parent: 1 + - uid: 338 + components: + - type: Transform + pos: 8.5,-5.5 + parent: 1 + - uid: 339 + components: + - type: Transform + pos: 8.5,-4.5 + parent: 1 + - uid: 340 + components: + - type: Transform + pos: 5.5,-7.5 + parent: 1 +- proto: WeaponProtoKineticAccelerator + entities: + - uid: 358 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.1593666,-7.576799 + parent: 1 - proto: WeaponShotgunSawn entities: - uid: 328 @@ -2648,6 +3005,54 @@ entities: rot: 3.141592653589793 rad pos: 4.5,8.5 parent: 1 + - uid: 344 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-4.5 + parent: 1 + - uid: 345 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-4.5 + parent: 1 + - uid: 346 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-4.5 + parent: 1 + - uid: 347 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-4.5 + parent: 1 + - uid: 361 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-7.5 + parent: 1 + - uid: 362 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-6.5 + parent: 1 + - uid: 364 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-4.5 + parent: 1 + - uid: 365 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-4.5 + parent: 1 - proto: WindowFrostedDirectional entities: - uid: 209 @@ -2721,4 +3126,9 @@ entities: - type: Transform pos: 15.5,3.5 parent: 1 + - uid: 230 + components: + - type: Transform + pos: 6.5,-7.5 + parent: 1 ... diff --git a/Resources/Prototypes/Backmen/Entities/Mobs/NPC/special.yml b/Resources/Prototypes/Backmen/Entities/Mobs/NPC/special.yml index 8c6e33f2d57..f0ca2d42dd7 100644 --- a/Resources/Prototypes/Backmen/Entities/Mobs/NPC/special.yml +++ b/Resources/Prototypes/Backmen/Entities/Mobs/NPC/special.yml @@ -5,6 +5,10 @@ noSpawn: true description: A glimmering hologram depicting a young woman with dark hair and a bright smile. components: + - type: MobThresholds + thresholds: + 0: Alive + 1000: Dead - type: HumanoidAppearance species: Human sex: Female @@ -185,7 +189,7 @@ text: shipwrecked-hecate-response-status-all-green-again #audio: !type:SoundPathSpecifier # path: /Audio/Nyanotrasen/Dialogue/Hecate/shipwrecked_hecate_response_status_all_green_again.ogg - - prompts: [weapons, firearms, arms, guns, safe, оружие, пожар, оружие, нож, пушки, стоволы, безопас] + - prompts: [weapons, firearms, arms, guns, safe, оружие, пожар, оружие, нож, пушки, стоволы, боезапас] locked: true responses: - is: !type:ShipwreckedHecateAskWeaponsEvent diff --git a/Resources/Prototypes/Backmen/Entities/Objects/Devices/pinpointer.yml b/Resources/Prototypes/Backmen/Entities/Objects/Devices/pinpointer.yml new file mode 100644 index 00000000000..d12e3a864f0 --- /dev/null +++ b/Resources/Prototypes/Backmen/Entities/Objects/Devices/pinpointer.yml @@ -0,0 +1,10 @@ +- type: entity + id: PinpointerShipwreck + name: pinpointer + description: An emergency device designed to locate lost critical shuttle engines. + parent: PinpointerBase + suffix: Shipwreck + components: + - type: Pinpointer + updateTargetName: true + - type: ShipwreckPinPointer diff --git a/Resources/Prototypes/Backmen/GameRules/Shipwrecked/maps.yml b/Resources/Prototypes/Backmen/GameRules/Shipwrecked/maps.yml index 73010177222..571e51a3780 100644 --- a/Resources/Prototypes/Backmen/GameRules/Shipwrecked/maps.yml +++ b/Resources/Prototypes/Backmen/GameRules/Shipwrecked/maps.yml @@ -1,7 +1,7 @@ - type: gameMap id: ShwrAdventurer mapName: Транспортник - mapPath: /Maps/Backmen/Shuttles/adventurer.yml + mapPath: /Maps/Backmen/Shipwrecked/adventurer.yml minPlayers: 1 maxPlayers: 15 stations: @@ -9,7 +9,10 @@ stationProto: StandardStationArena components: - type: StationNameSetup - mapNameTemplate: "Транспортник" + mapNameTemplate: "Транспортник {1}" + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'N' - type: StationJobs overflowJobs: - Freelancer @@ -19,7 +22,7 @@ - type: gameMap id: ShwrBig mapName: Баржа - mapPath: /Maps/Backmen/Shuttles/Shatlik.yml + mapPath: /Maps/Backmen/Shipwrecked/Shatlik.yml minPlayers: 15 maxPlayers: 30 stations: @@ -27,7 +30,10 @@ stationProto: StandardStationArena components: - type: StationNameSetup - mapNameTemplate: "Баржа" + mapNameTemplate: "Баржа {1}" + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'BM' - type: StationJobs overflowJobs: - Freelancer @@ -36,15 +42,18 @@ - type: gameMap id: shwrDust - mapName: KL-Dust 469 - mapPath: /Maps/Backmen/Shuttles/shwr-dust.yml + mapName: KL-Dust + mapPath: /Maps/Backmen/Shipwrecked/shwr-dust.yml minPlayers: 30 stations: shwrDust: stationProto: StandardStationArena components: - type: StationNameSetup - mapNameTemplate: "KL-Dust 469" + mapNameTemplate: "KL-Dust {1}" + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: 'BM' - type: StationJobs overflowJobs: - Freelancer diff --git a/Resources/Prototypes/Backmen/GameRules/roundstart.yml b/Resources/Prototypes/Backmen/GameRules/roundstart.yml index 6422ac437d5..559d337b527 100644 --- a/Resources/Prototypes/Backmen/GameRules/roundstart.yml +++ b/Resources/Prototypes/Backmen/GameRules/roundstart.yml @@ -67,11 +67,11 @@ - 160: EncounterTurbulence - 10: ShiftParallax - 60: MidFlightDamage - - 1: Alert - - 8: DecoupleEngine + - 6: Alert + - 16: DecoupleEngine - 14: SendDistressSignal - - 8: InterstellarBody - - 8: EnteringAtmosphere + - 16: InterstellarBody + - 16: EnteringAtmosphere - 6: Crash - 6: AfterCrash - 12: Sitrep diff --git a/Resources/Prototypes/Backmen/Procedural/Themes/ruined_shops.yml b/Resources/Prototypes/Backmen/Procedural/Themes/ruined_shops.yml index 206f8fcc5ec..cad5c9e6d4a 100644 --- a/Resources/Prototypes/Backmen/Procedural/Themes/ruined_shops.yml +++ b/Resources/Prototypes/Backmen/Procedural/Themes/ruined_shops.yml @@ -54,3 +54,12 @@ offset: 61,1 tags: - RuinedShop + +# Shop: 9x9 +- type: dungeonRoom + id: RuinedShop9x9Salvage + size: 9,9 + atlas: /Maps/Dungeon/ruined_shops.yml + offset: 1,-9 + tags: + - RuinedShop \ No newline at end of file diff --git a/Resources/Prototypes/Backmen/tags.yml b/Resources/Prototypes/Backmen/tags.yml index 950a5e25c9b..1f9ef5d54bc 100644 --- a/Resources/Prototypes/Backmen/tags.yml +++ b/Resources/Prototypes/Backmen/tags.yml @@ -105,3 +105,9 @@ - type: Tag id: CartridgeAntitank + +- type: Tag + id: EngineeringAirlock + +- type: Tag + id: SecureSafe