From b356c53b7db51dce59c341460bea84a0dbebc3c7 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:03:36 -0400 Subject: [PATCH 01/96] Minor miscellaneous cleanup (Guidebook, missing RSI) (#2143) * Misc cleanup * Comment security removal * fix space law comments * Remove remaining Defusal page references --- .../Entities/Objects/Misc/books.yml | 6 ++-- .../Entities/Structures/Machines/bombs.yml | 8 +++--- Resources/Prototypes/Guidebook/rules.yml | 28 ++++++++++--------- Resources/Prototypes/Guidebook/security.yml | 10 ++++--- Resources/Prototypes/Guidebook/species.yml | 1 - .../Hands/gloves_mob_hostile_npcs.yml | 2 +- .../ServerInfo/Guidebook/Mobs/Species.xml | 1 - 7 files changed, 29 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml index 8c0079d0e78..5f005af2189 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/books.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/books.yml @@ -335,9 +335,9 @@ color: "#87011c" - state: icon_law color: "#f7d61a" - - type: GuideHelp - guides: - - SpaceLaw + # - type: GuideHelp # Frontier + # guides: # Frontier + # - SpaceLaw # Frontier - type: entity parent: BookBase diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml index dd5373405cd..ff003619b4f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml @@ -44,10 +44,10 @@ layer: - MachineLayer - type: WiresPanel - - type: GuideHelp - openOnActivation: true - guides: - - Defusal + # - type: GuideHelp # Frontier: removed Defusal page + # openOnActivation: true # Frontier + # guides: # Frontier + # - Defusal # Frontier - type: entity parent: BaseHardBomb diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml index 5f548fa0946..5f881dd2a12 100644 --- a/Resources/Prototypes/Guidebook/rules.yml +++ b/Resources/Prototypes/Guidebook/rules.yml @@ -385,19 +385,21 @@ priority: 10 text: "/ServerInfo/Guidebook/ServerRules/SiliconRules/RuleS10OrderConflicts.xml" -- type: guideEntry - id: SpaceLaw - name: guide-entry-rules-space-law - priority: 1 - text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml" - children: - - SpaceLawCrimeList - -- type: guideEntry - id: SpaceLawCrimeList - name: guide-entry-rules-sl-crime-list - priority: 5 - text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml" +# Frontier: WizDen SpaceLaw, irrelevant here +# - type: guideEntry +# id: SpaceLaw +# name: guide-entry-rules-space-law +# priority: 1 +# text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml" +# children: +# - SpaceLawCrimeList + +# - type: guideEntry +# id: SpaceLawCrimeList +# name: guide-entry-rules-sl-crime-list +# priority: 5 +# text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml" +# End Frontier - type: guideEntry id: BanTypes diff --git a/Resources/Prototypes/Guidebook/security.yml b/Resources/Prototypes/Guidebook/security.yml index 73fc073f061..9f6c7c10e61 100644 --- a/Resources/Prototypes/Guidebook/security.yml +++ b/Resources/Prototypes/Guidebook/security.yml @@ -14,10 +14,12 @@ name: guide-entry-forensics text: "/ServerInfo/Guidebook/Security/Forensics.xml" -- type: guideEntry - id: Defusal - name: guide-entry-defusal - text: "/ServerInfo/Guidebook/Security/Defusal.xml" +# Frontier +# - type: guideEntry +# id: Defusal +# name: guide-entry-defusal +# text: "/ServerInfo/Guidebook/Security/Defusal.xml" +# End Frontier - type: guideEntry id: CriminalRecords diff --git a/Resources/Prototypes/Guidebook/species.yml b/Resources/Prototypes/Guidebook/species.yml index d28a6cbf8ba..4ca1a91c3b2 100644 --- a/Resources/Prototypes/Guidebook/species.yml +++ b/Resources/Prototypes/Guidebook/species.yml @@ -6,7 +6,6 @@ - Arachnid - Diona - Dwarf # Note: Frontier changes inside - - Goblin # Frontier - Human - Moth - Reptilian diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml index b4b3e6c428a..d26b047ba71 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves_mob_hostile_npcs.yml @@ -159,7 +159,7 @@ gloves: - sprite: Clothing/Hands/Gloves/mercbattle.rsi state: equipped-HAND - - sprite: _NF/Objects/Weapons/Gestio-Rifle.rsi + - sprite: _NF/Objects/Weapons/Guns/Rifles/gestio.rsi state: wielded-inhand-right - type: entity diff --git a/Resources/ServerInfo/Guidebook/Mobs/Species.xml b/Resources/ServerInfo/Guidebook/Mobs/Species.xml index 5274409fcbf..e270175c8ef 100644 --- a/Resources/ServerInfo/Guidebook/Mobs/Species.xml +++ b/Resources/ServerInfo/Guidebook/Mobs/Species.xml @@ -26,7 +26,6 @@ - From e431214b04192f72b47844e1f3b9cabfbedee1ff Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 4 Oct 2024 11:39:21 -0400 Subject: [PATCH 02/96] Invert admin check (#2145) --- Content.Server/Ghost/GhostSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index 9d545cbd6fb..8d248500598 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -319,7 +319,7 @@ private void OnGhostWarpToTargetRequest(GhostWarpToTargetRequestEvent msg, Entit } // Frontier: check admin status when warping to admin-only warp points - if (_admin.IsAdmin(attached) && + if (!_admin.IsAdmin(attached) && TryComp(target, out var warpPoint) && warpPoint.AdminOnly) { From af2bf00d61d68ddb760f1439906388d719a9dab3 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 4 Oct 2024 13:59:03 -0400 Subject: [PATCH 03/96] Port Food Recipe Guidebook (EE#783) (#2138) * Port EE#783 (Thank you, Mnemotechnician) * Revert machine type changes to meal recipes * Unneeded dependencies, show search bar * Remove yet more microwave recipe machine types * Food recipe guidebook: cleanup, style consistency * Frontier comment cleanup --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Controls/GuideFoodComposition.xaml | 21 ++ .../Controls/GuideFoodComposition.xaml.cs | 32 +++ .../Guidebook/Controls/GuideFoodEmbed.xaml | 58 ++++++ .../Guidebook/Controls/GuideFoodEmbed.xaml.cs | 178 +++++++++++++++++ .../Controls/GuideFoodGroupEmbed.xaml | 4 + .../Controls/GuideFoodGroupEmbed.xaml.cs | 38 ++++ .../Guidebook/Controls/GuideFoodSource.xaml | 37 ++++ .../Controls/GuideFoodSource.xaml.cs | 161 +++++++++++++++ .../EntitySystems/FoodGuideDataSystem.cs | 30 +++ .../EntitySystems/FoodGuideDataSystem.cs | 140 +++++++++++++ .../Components/ButcherableComponent.cs | 2 + .../SharedFoodGuideDataSystem.cs | 184 ++++++++++++++++++ Resources/Locale/en-US/_EE/guidebook/food.ftl | 20 ++ Resources/Prototypes/Guidebook/references.yml | 3 +- .../_EE/Guidebook/Service/FoodRecipes.xml | 9 + 15 files changed, 916 insertions(+), 1 deletion(-) create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml.cs create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml.cs create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml.cs create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml create mode 100644 Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs create mode 100644 Content.Client/_EE/Nutrition/EntitySystems/FoodGuideDataSystem.cs create mode 100644 Content.Server/_EE/Nutrition/EntitySystems/FoodGuideDataSystem.cs create mode 100644 Content.Shared/_EE/Nutrition/EntitySystems/SharedFoodGuideDataSystem.cs create mode 100644 Resources/Locale/en-US/_EE/guidebook/food.ftl create mode 100644 Resources/ServerInfo/_EE/Guidebook/Service/FoodRecipes.xml diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml b/Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml new file mode 100644 index 00000000000..87b755d6f1a --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml @@ -0,0 +1,21 @@ + + + + + + diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml.cs b/Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml.cs new file mode 100644 index 00000000000..eac81f6dca7 --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodComposition.xaml.cs @@ -0,0 +1,32 @@ +using Content.Client.Guidebook.Controls; +using Content.Client.UserInterface.ControlExtensions; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.FixedPoint; +using JetBrains.Annotations; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; + +namespace Content.Client._EE.Guidebook.Controls; // Frontier: add _EE + +[UsedImplicitly, GenerateTypedNameReferences] +public sealed partial class GuideFoodComposition : BoxContainer, ISearchableControl +{ + public GuideFoodComposition(ReagentPrototype proto, FixedPoint2 quantity) + { + RobustXamlLoader.Load(this); + + ReagentLabel.Text = proto.LocalizedName; + AmountLabel.Text = quantity.ToString(); + } + + public bool CheckMatchesSearch(string query) + { + return this.ChildrenContainText(query); + } + + public void SetHiddenState(bool state, string query) + { + Visible = CheckMatchesSearch(query) ? state : !state; + } +} diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml b/Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml new file mode 100644 index 00000000000..20647faa9f8 --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml.cs b/Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml.cs new file mode 100644 index 00000000000..8d9a24876d8 --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodEmbed.xaml.cs @@ -0,0 +1,178 @@ +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using Content.Client._EE.Nutrition.EntitySystems; +using Content.Client.Chemistry.EntitySystems; +using Content.Client.Guidebook.Controls; +using Content.Client.Guidebook.Richtext; +using Content.Client.Message; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.FixedPoint; +using JetBrains.Annotations; +using Robust.Client.AutoGenerated; +using Robust.Client.Graphics; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Client._EE.Guidebook.Controls; // Frontier: add _EE + +/// +/// Control for embedding a food recipe into a guidebook. +/// +[UsedImplicitly, GenerateTypedNameReferences] +public sealed partial class GuideFoodEmbed : BoxContainer, IDocumentTag, ISearchableControl +{ + [Dependency] private readonly IEntitySystemManager _systemManager = default!; + [Dependency] private readonly IPrototypeManager _prototype = default!; + + private readonly FoodGuideDataSystem _foodGuideData; + private readonly ISawmill _logger = default!; + + public GuideFoodEmbed() + { + RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); + _foodGuideData = _systemManager.GetEntitySystem(); + _logger = Logger.GetSawmill("food guide"); + MouseFilter = MouseFilterMode.Stop; + } + + public GuideFoodEmbed(FoodGuideEntry entry) : this() + { + GenerateControl(entry); + } + + public bool CheckMatchesSearch(string query) + { + return FoodName.GetMessage()?.Contains(query, StringComparison.InvariantCultureIgnoreCase) == true + || FoodDescription.GetMessage()?.Contains(query, StringComparison.InvariantCultureIgnoreCase) == true; + } + + public void SetHiddenState(bool state, string query) + { + Visible = CheckMatchesSearch(query) ? state : !state; + } + + public bool TryParseTag(Dictionary args, [NotNullWhen(true)] out Control? control) + { + control = null; + if (!args.TryGetValue("Food", out var id)) + { + _logger.Error("Food embed tag is missing food prototype argument."); + return false; + } + + if (!_foodGuideData.TryGetData(id, out var data)) + { + _logger.Warning($"Specified food prototype \"{id}\" does not have any known sources."); + return false; + } + + GenerateControl(data); + + control = this; + return true; + } + + private void GenerateControl(FoodGuideEntry data) + { + _prototype.TryIndex(data.Result, out var proto); + if (proto == null) + { + FoodName.SetMarkup(Loc.GetString("guidebook-food-unknown-proto", ("id", data.Result))); + return; + } + + var composition = data.Composition + .Select(it => _prototype.TryIndex(it.Reagent.Prototype, out var reagent) ? (reagent, it.Quantity) : (null, 0)) + .Where(it => it.reagent is not null) + .Cast<(ReagentPrototype, FixedPoint2)>() + .ToList(); + + #region Colors + + CalculateColors(composition, out var textColor, out var backgroundColor); + + NameBackground.PanelOverride = new StyleBoxFlat + { + BackgroundColor = backgroundColor + }; + FoodName.SetMarkup(Loc.GetString("guidebook-food-name", ("color", textColor), ("name", proto.Name))); + + #endregion + + // Frontier: separate Recipes from Sources + #region Recipes + if (data.Recipes.Length > 0) + RecipesContainer.Visible = true; + + foreach (var recipe in data.Recipes.OrderBy(it => it.OutputCount)) + { + var control = new GuideFoodSource(proto, recipe, _prototype); + RecipesDescriptionContainer.AddChild(control); + } + + #endregion + // End Frontier + + #region Sources + if (data.Sources.Length > 0) // Frontier + SourcesContainer.Visible = true; // Frontier + + foreach (var source in data.Sources.OrderBy(it => it.OutputCount)) + { + var control = new GuideFoodSource(proto, source, _prototype); + SourcesDescriptionContainer.AddChild(control); + } + + #endregion + + #region Composition + + foreach (var (reagent, quantity) in composition) + { + var control = new GuideFoodComposition(reagent, quantity); + CompositionDescriptionContainer.AddChild(control); + } + + #endregion + + FormattedMessage description = new(); + description.AddText(proto?.Description ?? string.Empty); + // Cannot describe food flavor or smth beause food is entirely server-side + + FoodDescription.SetMessage(description); + } + + private void CalculateColors(List<(ReagentPrototype, FixedPoint2)> composition, out Color text, out Color background) + { + // Background color is calculated as the weighted average of the colors of the composition. + // Text color is determined based on background luminosity. + float r = 0, g = 0, b = 0; + FixedPoint2 weight = 0; + + foreach (var (proto, quantity) in composition) + { + var tcolor = proto.SubstanceColor; + var prevalence = + quantity <= 0 ? 0f + : weight == 0f ? 1f + : (quantity / (weight + quantity)).Float(); + + r = r * (1 - prevalence) + tcolor.R * prevalence; + g = g * (1 - prevalence) + tcolor.G * prevalence; + b = b * (1 - prevalence) + tcolor.B * prevalence; + + if (quantity > 0) + weight += quantity; + } + + // Copied from GuideReagentEmbed which was probably copied from stackoverflow. This is the formula for color luminosity. + var lum = 0.2126f * r + 0.7152f * g + 0.0722f; + + background = new Color(r, g, b); + text = lum > 0.5f ? Color.Black : Color.White; + } +} diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml b/Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml new file mode 100644 index 00000000000..6551f2cf18c --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml @@ -0,0 +1,4 @@ + + + diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml.cs b/Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml.cs new file mode 100644 index 00000000000..e6e243781c3 --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodGroupEmbed.xaml.cs @@ -0,0 +1,38 @@ +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using Content.Client._EE.Nutrition.EntitySystems; +using Content.Client.Guidebook.Richtext; +using JetBrains.Annotations; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Prototypes; + +namespace Content.Client._EE.Guidebook.Controls; // Frontier: add _EE + +[UsedImplicitly, GenerateTypedNameReferences] +public sealed partial class GuideFoodGroupEmbed : BoxContainer, IDocumentTag +{ + [Dependency] private readonly IEntitySystemManager _sysMan = default!; + [Dependency] private readonly IPrototypeManager _prototype = default!; + + public GuideFoodGroupEmbed() + { + RobustXamlLoader.Load(this); + IoCManager.InjectDependencies(this); + MouseFilter = MouseFilterMode.Stop; + + foreach (var data in _sysMan.GetEntitySystem().Registry.OrderBy(it => it.Identifier)) + { + var embed = new GuideFoodEmbed(data); + GroupContainer.AddChild(embed); + } + } + + public bool TryParseTag(Dictionary args, [NotNullWhen(true)] out Control? control) + { + control = this; + return true; + } +} diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml new file mode 100644 index 00000000000..009538b45c3 --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + diff --git a/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs new file mode 100644 index 00000000000..6545ab81508 --- /dev/null +++ b/Content.Client/_EE/Guidebook/Controls/GuideFoodSource.xaml.cs @@ -0,0 +1,161 @@ +using System.Linq; +using Content.Client.Chemistry.EntitySystems; +using Content.Client.Guidebook.Controls; +using Content.Client.UserInterface.ControlExtensions; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.FixedPoint; +using Content.Shared.Nutrition.Components; +using JetBrains.Annotations; +using Robust.Client.AutoGenerated; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Client._EE.Guidebook.Controls; // Frontier: add _EE + +[UsedImplicitly, GenerateTypedNameReferences] +public sealed partial class GuideFoodSource : BoxContainer, ISearchableControl +{ + private readonly IPrototypeManager _protoMan; + private readonly SpriteSystem _sprites = default!; + + public GuideFoodSource(IPrototypeManager protoMan) + { + RobustXamlLoader.Load(this); + _protoMan = protoMan; + _sprites = IoCManager.Resolve().GetEntitySystem(); + } + + public GuideFoodSource(EntityPrototype result, FoodSourceData entry, IPrototypeManager protoMan) : this(protoMan) + { + switch (entry) + { + case FoodButcheringData butchering: + GenerateControl(butchering); + break; + case FoodSlicingData slicing: + GenerateControl(slicing); + break; + case FoodRecipeData recipe: + GenerateControl(recipe); + break; + case FoodReactionData reaction: + GenerateControl(reaction); + break; + default: + throw new ArgumentOutOfRangeException(nameof(entry), entry, null); + } + + GenerateOutputs(result, entry); + } + + private void GenerateControl(FoodButcheringData entry) + { + if (!_protoMan.TryIndex(entry.Butchered, out var ent)) + { + SourceLabel.Text = Loc.GetString("guidebook-food-unknown-proto", ("id", entry.Butchered)); // Frontier: SetMessage GetRsiTexture("/Textures/Objects/Weapons/Melee/kitchen_knife.rsi", "icon"), + _ => GetRsiTexture("/Textures/Structures/meat_spike.rsi", "spike") + }; + } + + private void GenerateControl(FoodSlicingData entry) + { + if (!_protoMan.TryIndex(entry.Sliced, out var ent)) + { + SourceLabel.Text = Loc.GetString("guidebook-food-unknown-proto", ("id", entry.Sliced)); // Frontier: SetMessage _protoMan.TryIndex(it.Key, out var proto) ? FormatIngredient(proto, it.Value) : "") + .Where(it => it.Length > 0); + var combinedLiquids = recipe.IngredientsReagents + .Select(it => _protoMan.TryIndex(it.Key, out var proto) ? FormatIngredient(proto, it.Value) : "") + .Where(it => it.Length > 0); + + var combinedIngredients = string.Join("\n", combinedLiquids.Union(combinedSolids)); + SourceLabel.Text = Loc.GetString("guidebook-food-processing-recipe", ("ingredients", combinedIngredients)); // Frontier: SetMessage _protoMan.TryIndex(it.Key, out var proto) ? FormatIngredient(proto, it.Value.Amount) : "") + .Where(it => it.Length > 0); + + SourceLabel.Text = Loc.GetString("guidebook-food-processing-recipe", ("ingredients", string.Join("\n", combinedReagents))); // Frontier: SetMessage(OnReceiveRegistryUpdate); + } + + private void OnReceiveRegistryUpdate(FoodGuideRegistryChangedEvent message) + { + Registry = message.Changeset; + } + + public bool TryGetData(EntProtoId result, out FoodGuideEntry entry) + { + var index = Registry.FindIndex(it => it.Result == result); + if (index == -1) + { + entry = default; + return false; + } + + entry = Registry[index]; + return true; + } +} diff --git a/Content.Server/_EE/Nutrition/EntitySystems/FoodGuideDataSystem.cs b/Content.Server/_EE/Nutrition/EntitySystems/FoodGuideDataSystem.cs new file mode 100644 index 00000000000..9751c455073 --- /dev/null +++ b/Content.Server/_EE/Nutrition/EntitySystems/FoodGuideDataSystem.cs @@ -0,0 +1,140 @@ +using System.Linq; +using Content.Client.Chemistry.EntitySystems; +using Content.Server.EntityEffects.Effects; +using Content.Server.Nutrition.Components; +using Content.Shared.Chemistry.Components.SolutionManager; +using Content.Shared.Chemistry.Reaction; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.Kitchen; +using Content.Shared.Nutrition.Components; +using Robust.Server.Player; +using Robust.Shared.Enums; +using Robust.Shared.Player; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Server.Nutrition.EntitySystems; + +public sealed class FoodGuideDataSystem : SharedFoodGuideDataSystem +{ + public static readonly ProtoId[] ReagentWhitelist = + [ + "Nutriment", + "Vitamin", + "Protein", + "UncookedAnimalProteins", + "Fat", + "Water", + "Flavorol" // Frontier + ]; + + public static readonly string[] ComponentNamesBlacklist = ["HumanoidAppearance"]; + + public static readonly string[] SuffixBlacklist = ["debug", "do not map", "admeme"]; + + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly IPrototypeManager _protoMan = default!; + + private Dictionary> _sources = new(); + + public override void Initialize() + { + SubscribeLocalEvent(OnPrototypesReloaded); + _player.PlayerStatusChanged += OnPlayerStatusChanged; + + ReloadRecipes(); + } + + private void OnPrototypesReloaded(PrototypesReloadedEventArgs args) + { + if (!args.WasModified() + && !args.WasModified() + && !args.WasModified() + ) + return; + + ReloadRecipes(); + } + + public void ReloadRecipes() + { + // TODO: add this code to the list of known recipes because this is spaghetti + _sources.Clear(); + + // Butcherable and slicable entities + foreach (var ent in _protoMan.EnumeratePrototypes()) + { + if (ent.Abstract + || ent.Components.Any(it => ComponentNamesBlacklist.Contains(it.Key)) + || ent.SetSuffix is {} suffix && SuffixBlacklist.Any(it => suffix.Contains(it, StringComparison.OrdinalIgnoreCase)) + ) + continue; + + if (ent.TryGetComponent(out var butcherable)) + { + foreach (var butchlet in butcherable.SpawnedEntities) + { + if (butchlet.PrototypeId is null) + continue; + var butcheringSource = new FoodButcheringData(ent, butcherable, butchlet); + + _sources.GetOrNew(butchlet.PrototypeId).Add(butcheringSource); + } + } + + if (ent.TryGetComponent(out var slicable) && slicable.Slice is not null) + { + _sources.GetOrNew(slicable.Slice).Add(new FoodSlicingData(ent, slicable.Slice.Value, slicable.TotalCount)); + } + } + + // Recipes + foreach (var recipe in _protoMan.EnumeratePrototypes()) + { + _sources.GetOrNew(recipe.Result).Add(new FoodRecipeData(recipe)); // Frontier: _sources<_recipes + } + + // Entity-spawning reactions + foreach (var reaction in _protoMan.EnumeratePrototypes()) + { + foreach (var effect in reaction.Effects) + { + if (effect is not CreateEntityReactionEffect entEffect) + continue; + + _sources.GetOrNew(entEffect.Entity).Add(new FoodReactionData(reaction, entEffect.Entity, (int) entEffect.Number)); // Frontier: _sources<_recipes + } + } + + Registry.Clear(); + + foreach (var (result, sources) in _sources) + { + var proto = _protoMan.Index(result); + var composition = proto.TryGetComponent(out var food) && proto.TryGetComponent(out var manager) + ? manager?.Solutions?[food.Solution]?.Contents?.ToArray() ?? [] + : []; + + // We filter out food without whitelisted reagents because well when people look for food they usually expect FOOD and not insulated gloves. + // And we get insulated and other gloves because they have ButcherableComponent and they are also moth food + if (!composition.Any(it => ReagentWhitelist.Contains(it.Reagent.Prototype))) + continue; + + // We also limit the number of sources to 10 because it's a huge performance strain to render 500 raw meat recipes. + var distinctSources = sources.DistinctBy(it => it.Identitier).Take(10); + + var entry = new FoodGuideEntry(result, proto.Name, distinctSources.Where(it => it.SourceType == FoodSourceType.Recipe).ToArray(), distinctSources.Where(it => it.SourceType == FoodSourceType.Source).ToArray(), composition); // Frontier: add Where clauses, recipe arg + Registry.Add(entry); + } + + RaiseNetworkEvent(new FoodGuideRegistryChangedEvent(Registry)); + } + + private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs args) + { + if (args.NewStatus != SessionStatus.Connected) + return; + + RaiseNetworkEvent(new FoodGuideRegistryChangedEvent(Registry), args.Session); + } +} diff --git a/Content.Shared/Nutrition/Components/ButcherableComponent.cs b/Content.Shared/Nutrition/Components/ButcherableComponent.cs index 4fce45422ad..df904b9f677 100644 --- a/Content.Shared/Nutrition/Components/ButcherableComponent.cs +++ b/Content.Shared/Nutrition/Components/ButcherableComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Storage; using Robust.Shared.GameStates; +using Robust.Shared.Serialization; // EE namespace Content.Shared.Nutrition.Components { @@ -25,6 +26,7 @@ public sealed partial class ButcherableComponent : Component public bool BeingButchered; } + [Serializable, NetSerializable] // EE public enum ButcheringType : byte { Knife, // e.g. goliaths diff --git a/Content.Shared/_EE/Nutrition/EntitySystems/SharedFoodGuideDataSystem.cs b/Content.Shared/_EE/Nutrition/EntitySystems/SharedFoodGuideDataSystem.cs new file mode 100644 index 00000000000..ad2b2e55dbc --- /dev/null +++ b/Content.Shared/_EE/Nutrition/EntitySystems/SharedFoodGuideDataSystem.cs @@ -0,0 +1,184 @@ +using System.Linq; +using Content.Shared.Chemistry.Reaction; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.Kitchen; +using Content.Shared.Nutrition.Components; +using Content.Shared.Storage; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Client.Chemistry.EntitySystems; + +public abstract class SharedFoodGuideDataSystem : EntitySystem +{ + public List Registry = new(); +} + +[Serializable, NetSerializable] +public sealed class FoodGuideRegistryChangedEvent : EntityEventArgs +{ + [DataField] + public List Changeset; + + public FoodGuideRegistryChangedEvent(List changeset) + { + Changeset = changeset; + } +} + +[DataDefinition, Serializable, NetSerializable] +public partial struct FoodGuideEntry +{ + [DataField] + public EntProtoId Result; + + [DataField] + public string Identifier; // Used for sorting + + [DataField] // Frontier + public FoodSourceData[] Recipes; // Frontier + + [DataField] + public FoodSourceData[] Sources; + + [DataField] + public ReagentQuantity[] Composition; + + public FoodGuideEntry(EntProtoId result, string identifier, FoodSourceData[] recipes, FoodSourceData[] sources, ReagentQuantity[] composition) // Frontier: add recipes + { + Result = result; + Identifier = identifier; + Recipes = recipes; // Frontier + Sources = sources; + Composition = composition; + } +} + +[ImplicitDataDefinitionForInheritors, Serializable, NetSerializable] +public abstract partial class FoodSourceData +{ + /// + /// Number of products created from this source. Used for primary ordering. + /// + public abstract int OutputCount { get; } + + /// + /// A string used to distinguish different sources. Typically the name of the related entity. + /// + public string Identitier; + + /// + /// Frontier: context about this food source - is it a recipe? Is it a source? + /// + public FoodSourceType SourceType; + + public abstract bool IsSourceOf(EntProtoId food); +} + +// Frontier: enum for differentiating sources +public enum FoodSourceType : byte +{ + Recipe = 0, + Source = 1, +} +// End Frontier + +[Serializable, NetSerializable] +public sealed partial class FoodButcheringData : FoodSourceData +{ + [DataField] + public EntProtoId Butchered; + + [DataField] + public ButcheringType Type; + [DataField] + public EntitySpawnEntry Result; // Frontier: List Result.Amount; // Frontier: Results.Count Results.Any(it => it.PrototypeId == food); // Frontier + public override bool IsSourceOf(EntProtoId food) => Result.PrototypeId == food.Id; // Frontier +} + +[Serializable, NetSerializable] +public sealed partial class FoodSlicingData : FoodSourceData +{ + [DataField] + public EntProtoId Sliced, Result; + + [DataField] + private int _outputCount; + public override int OutputCount => _outputCount; + + public FoodSlicingData(EntityPrototype sliced, EntProtoId result, int outputCount) + { + Identitier = sliced.Name; + Sliced = sliced.ID; + Result = result; + _outputCount = outputCount; // Server-only + SourceType = FoodSourceType.Source; // Frontier + } + + public override bool IsSourceOf(EntProtoId food) => food == Result; +} + +[Serializable, NetSerializable] +public sealed partial class FoodRecipeData : FoodSourceData +{ + [DataField] + public ProtoId Recipe; + + [DataField] + public EntProtoId Result; + + [DataField] // Frontier + private int _outputCount; // Frontier + public override int OutputCount => _outputCount; // Frontier: 1 food == Result; +} + +[Serializable, NetSerializable] +public sealed partial class FoodReactionData : FoodSourceData +{ + [DataField] + public ProtoId Reaction; + + [DataField] + public EntProtoId Result; + + [DataField] + private int _outputCount; + public override int OutputCount => _outputCount; + + public FoodReactionData(ReactionPrototype reaction, EntProtoId result, int outputCount) + { + Identitier = reaction.Name; + Reaction = reaction.ID; + Result = result; + _outputCount = outputCount; + SourceType = FoodSourceType.Recipe; // Frontier + } + + public override bool IsSourceOf(EntProtoId food) => food == Result; +} diff --git a/Resources/Locale/en-US/_EE/guidebook/food.ftl b/Resources/Locale/en-US/_EE/guidebook/food.ftl new file mode 100644 index 00000000000..b7e7ea5d703 --- /dev/null +++ b/Resources/Locale/en-US/_EE/guidebook/food.ftl @@ -0,0 +1,20 @@ +guidebook-food-name = [bold][color={$color}]{CAPITALIZE($name)}[/color][/bold] +guidebook-food-unknown-proto = Unknown prototype +# Frontier +guidebook-food-recipes-header = Recipes +guidebook-food-recipes-ent-wrapper = [bold]{$name}[/bold] \[{$amount}\] +guidebook-food-sources-header = Sources +guidebook-food-sources-ent-wrapper = [bold]{$name}[/bold] \[1\] +# Frontier: Chemical composition +## Recipe list +Note: Only solid foods are listed here! To learn recipes for liquid ingredients, check the chemistry guidebook. + +This list is auto-generated and contains all known foods. + + + + From 1def92076c576f53c862837fbb32da7b2ea42594 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 4 Oct 2024 17:59:34 +0000 Subject: [PATCH 04/96] Automatic Changelog (#2138) --- Resources/Changelog/Frontier.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 624858b3cef..770e1d65a7d 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4253,3 +4253,7 @@ Entries: blueprints from stacks of paper. id: 5359 time: '2024-10-03T19:53:08.0000000+00:00' +- author: Mnemotechnician + changes: [] + id: 5360 + time: '2024-10-04T17:59:04.0000000+00:00' From e20befd139cfb2155d2d5ec593337bb3c5789a8c Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 4 Oct 2024 23:28:57 +0300 Subject: [PATCH 05/96] Contraband POI edits (#2146) * Hydrotray issue * APU Cleanup * Less contra in expos loot * Syndicate POI pinpointer * POI Code spawn cleanup * Update engines.yml * Update hydro_tray.yml * Update warp_point.yml * Update contravend.yml * Vending Machine code cleanup * Syndicate crate edits * LP Bravo edits * Headsets cleanup * DeadDrop * DeadDrop admin only spawn * Update DeadDropSystem.cs * Fixups * Fix base contra for syndicate crate * Update generators.yml * YML Error * Update generators.yml * Add required spawn group to required POIs * POI: add Required to comment * Move AllowIFFChanges to other IFF fields * Remove spawnChance 1 (redundant) --------- Co-authored-by: Whatstone --- .../VendingMachines/VendingMachineSystem.cs | 4 +- .../AdventureRuleComponent.cs | 7 +- .../Components/SyndicateFOBComponent.cs | 7 + .../_NF/GameRule/NfAdventureRuleSystem.cs | 21 +- .../Smuggling/Components/DeadDropComponent.cs | 2 +- .../_NF/Smuggling/DeadDropSystem.cs | 6 +- .../Shuttles/Components/IFFComponent.cs | 2 +- .../VendingMachineComponent.cs | 12 +- .../_NF/GameRule/PointOfInterestPrototype.cs | 54 +- .../Maps/{ => _NF/DeadDrop}/deaddrop.yml | 788 +++++++++++++----- Resources/Maps/_NF/POI/lpbravo.yml | 437 ++++------ .../Catalog/Fills/Crates/engines.yml | 2 +- .../Catalog/Fills/Crates/syndicate.yml | 6 +- .../Entities/Objects/Devices/pinpointer.yml | 4 +- .../Structures/Machines/vending_machines.yml | 8 +- .../Power/Generation/generators.yml | 14 +- .../Structures/Storage/Crates/crates.yml | 2 +- .../Entities/Structures/hydro_tray.yml | 3 +- .../Catalog/Fills/Crates/syndicate.yml | 4 +- .../Inventories/contravend.yml | 25 +- .../_NF/Entities/Clothing/Ears/headsets.yml | 3 + .../Entities/Clothing/Ears/headsets_alt.yml | 24 +- .../Spawners/Random/dungeon_items_general.yml | 12 +- .../Spawners/{crates.yml => syndicate.yml} | 38 + .../_NF/Entities/Markers/warp_point.yml | 12 + .../Entities/Objects/Devices/pinpointer.yml | 33 + .../Structures/Machines/vending_machines.yml | 9 +- .../_NF/Entities/Structures/hydro_tray.yml | 1 - .../_NF/Loadouts/Jobs/Mercenary/ears.yml | 4 +- .../_NF/Loadouts/Jobs/Pilot/ears.yml | 4 +- .../_NF/Loadouts/mercenary_loadout_groups.yml | 2 +- .../_NF/Loadouts/pilot_loadout_groups.yml | 2 +- .../_NF/PointsOfInterest/anomalousgeode.yml | 3 +- .../_NF/PointsOfInterest/anomalouslab.yml | 3 +- .../_NF/PointsOfInterest/bahamamamas.yml | 3 +- .../_NF/PointsOfInterest/caseys.yml | 2 +- .../_NF/PointsOfInterest/courthouse.yml | 4 +- .../Prototypes/_NF/PointsOfInterest/cove.yml | 6 +- .../_NF/PointsOfInterest/depots.yml | 4 +- .../_NF/PointsOfInterest/edison.yml | 3 +- .../_NF/PointsOfInterest/grifty.yml | 3 +- .../Prototypes/_NF/PointsOfInterest/lodge.yml | 4 +- .../_NF/PointsOfInterest/lpbravo.yml | 5 +- .../_NF/PointsOfInterest/mchobo.yml | 3 +- .../Prototypes/_NF/PointsOfInterest/nfsd.yml | 4 +- .../_NF/PointsOfInterest/northpole.yml | 4 +- .../_NF/PointsOfInterest/omnichurch.yml | 2 +- .../_NF/PointsOfInterest/thepit.yml | 3 +- .../_NF/PointsOfInterest/tinniasrest.yml | 2 +- .../Prototypes/_NF/PointsOfInterest/trade.yml | 2 +- 50 files changed, 962 insertions(+), 650 deletions(-) rename Content.Server/_NF/GameRule/{ => Components}/AdventureRuleComponent.cs (71%) create mode 100644 Content.Server/_NF/GameRule/Components/SyndicateFOBComponent.cs rename Resources/Maps/{ => _NF/DeadDrop}/deaddrop.yml (52%) rename Resources/Prototypes/_NF/Entities/Markers/Spawners/{crates.yml => syndicate.yml} (58%) diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 3295f99ea97..7ab935378e2 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -560,11 +560,11 @@ public override void Update(float frameTime) } // Added block for charges - if (comp.EjectRandomCounter == comp.EjectRandomMax || _timing.CurTime < comp.NextChargeTime) + if (comp.EjectRandomCounter == comp.EjectRandomMax || _timing.CurTime < comp.EjectNextChargeTime) continue; AddCharges(uid, 1, comp); - comp.NextChargeTime = _timing.CurTime + comp.RechargeDuration; + comp.EjectNextChargeTime = _timing.CurTime + comp.EjectRechargeDuration; // Added block for charges } var disabled = EntityQueryEnumerator(); diff --git a/Content.Server/_NF/GameRule/AdventureRuleComponent.cs b/Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs similarity index 71% rename from Content.Server/_NF/GameRule/AdventureRuleComponent.cs rename to Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs index 5f74e12d359..e0e47ce0c2b 100644 --- a/Content.Server/_NF/GameRule/AdventureRuleComponent.cs +++ b/Content.Server/_NF/GameRule/Components/AdventureRuleComponent.cs @@ -1,9 +1,4 @@ -/* - * New Frontiers - This file is licensed under AGPLv3 - * Copyright (c) 2024 New Frontiers - * See AGPLv3.txt for details. - */ -namespace Content.Server._NF.GameRule; +namespace Content.Server._NF.GameRule.Components; [RegisterComponent, Access(typeof(NfAdventureRuleSystem))] public sealed partial class AdventureRuleComponent : Component diff --git a/Content.Server/_NF/GameRule/Components/SyndicateFOBComponent.cs b/Content.Server/_NF/GameRule/Components/SyndicateFOBComponent.cs new file mode 100644 index 00000000000..8fa1da01c29 --- /dev/null +++ b/Content.Server/_NF/GameRule/Components/SyndicateFOBComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Server._NF.GameRule.Components; + +[RegisterComponent] +public sealed partial class SyndicateFOBComponent : Component +{ + +} diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs index adad899c0af..def26963b99 100644 --- a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs +++ b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs @@ -1,8 +1,3 @@ -/* - * New Frontiers - This file is licensed under AGPLv3 - * Copyright (c) 2024 New Frontiers - * See AGPLv3.txt for details. - */ using System.Linq; using System.Net.Http; using System.Numerics; @@ -14,8 +9,6 @@ using Content.Server.Procedural; using Content.Shared.Bank.Components; using Content.Server._NF.GameTicking.Events; -using Content.Server.GameTicking.Events; -using Content.Server.GameTicking.Rules.Components; using Content.Shared.Procedural; using Robust.Server.GameObjects; using Robust.Server.Maps; @@ -26,7 +19,6 @@ using Robust.Shared.Random; using Robust.Shared.Map.Components; using Content.Shared.Shuttles.Components; -using Content.Server._NF.GameTicking.Events; using Content.Server.Shuttles.Systems; using Content.Server.Cargo.Components; using Content.Server.GameTicking; @@ -40,6 +32,7 @@ using Content.Server.Shuttles.Components; using Content.Shared.Tiles; using Content.Server._NF.PublicTransit.Components; +using Content.Server._NF.GameRule.Components; namespace Content.Server._NF.GameRule; @@ -147,7 +140,7 @@ protected override void Started(EntityUid uid, AdventureRuleComponent component, depotProtos.Add(location); else if (location.SpawnGroup == "MarketStation") marketProtos.Add(location); - else if (location.AlwaysSpawn == true) + else if (location.SpawnGroup == "Required") requiredProtos.Add(location); else if (location.SpawnGroup == "Optional") optionalProtos.Add(location); @@ -356,11 +349,11 @@ private bool TrySpawnPoiGrid(PointOfInterestPrototype proto, Vector2 offset, out { var meta = EnsureComp(grid); _meta.SetEntityName(grid, stationName, meta); - _shuttle.SetIFFColor(grid, proto.IffColor); - if (proto.IsHidden) - { - _shuttle.AddIFFFlag(grid, IFFFlags.HideLabel); - } + + EnsureComp(grid); + _shuttle.SetIFFColor(grid, proto.IFFColor); + _shuttle.AddIFFFlag(grid, proto.Flags); + if (!proto.AllowIFFChanges) { _shuttle.SetIFFReadOnly(grid, true); diff --git a/Content.Server/_NF/Smuggling/Components/DeadDropComponent.cs b/Content.Server/_NF/Smuggling/Components/DeadDropComponent.cs index a0c20ce4fa7..ba2fdbca7cd 100644 --- a/Content.Server/_NF/Smuggling/Components/DeadDropComponent.cs +++ b/Content.Server/_NF/Smuggling/Components/DeadDropComponent.cs @@ -68,7 +68,7 @@ public TimeSpan NextDropVV /// Location of the grid to spawn in as the dead drop. /// [DataField] - public string DropGrid = "/Maps/deaddrop.yml"; + public string DropGrid = "/Maps/_NF/DeadDrop/deaddrop.yml"; /// /// The color of your grid. the name should be set by the mapper when mapping. diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs index f73ad9c34c0..82bf0e18c68 100644 --- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs +++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Text; using Content.Server._NF.GameTicking.Events; using Content.Server._NF.SectorServices; @@ -364,7 +364,7 @@ private void OnStationsGenerated(StationsGeneratedEvent args) } // Hint generated, destroy component - RemComp(ent); + //RemComp(ent); // Removed so we can keep track of it _sawmill.Debug($"Dead drop hint generated at {ent}."); } @@ -651,4 +651,4 @@ public string GenerateRandomHint(List<(EntityUid station, EntityUid ent)>? entit } return Loc.GetString("dead-drop-hint-note", ("drops", hintLines)); } -} \ No newline at end of file +} diff --git a/Content.Shared/Shuttles/Components/IFFComponent.cs b/Content.Shared/Shuttles/Components/IFFComponent.cs index 4498fc0c91f..d88cdfa92e5 100644 --- a/Content.Shared/Shuttles/Components/IFFComponent.cs +++ b/Content.Shared/Shuttles/Components/IFFComponent.cs @@ -52,7 +52,7 @@ public enum IFFFlags : byte Hide = 2, /// - /// Is this a player shuttle + /// Frontier - Is this a player shuttle /// IsPlayerShuttle = 4, diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 84030eb26f8..4dbb30e8431 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -36,26 +36,26 @@ public sealed partial class VendingMachineComponent : Component /// /// Used by the server to determine how many items the machine allowed to eject from random triggers. /// - [DataField("ejectRandomMax"), ViewVariables(VVAccess.ReadWrite)] + [DataField] public float EjectRandomMax = 2; /// /// Used by the server to determine how many items the machine ejected from random triggers. /// - [DataField("ejectRandomCounter"), ViewVariables(VVAccess.ReadWrite)] + [DataField] public float EjectRandomCounter = 2; /// /// The time it takes to regain a single charge /// - [DataField("rechargeDuration"), ViewVariables(VVAccess.ReadWrite)] - public TimeSpan RechargeDuration = TimeSpan.FromSeconds(3600); + [DataField] + public TimeSpan EjectRechargeDuration = TimeSpan.FromSeconds(1800); /// /// The time when the next charge will be added /// - [DataField("nextChargeTime", customTypeSerializer: typeof(TimeOffsetSerializer))] - public TimeSpan NextChargeTime; + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + public TimeSpan EjectNextChargeTime; // End Frontier: random ejection [DataField, AutoNetworkedField] diff --git a/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs b/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs index 766220ec53d..e563a9199ec 100644 --- a/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs +++ b/Content.Shared/_NF/GameRule/PointOfInterestPrototype.cs @@ -1,8 +1,7 @@ -using Content.Shared.Guidebook; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Utility; +using Content.Shared.Shuttles.Components; namespace Content.Shared._NF.GameRule; @@ -20,88 +19,83 @@ public sealed partial class PointOfInterestPrototype : IPrototype /// /// The name of this point of interest /// - [DataField("name")] + [DataField] public string Name { get; private set; } = ""; /// /// Minimum range to spawn this POI at /// - [DataField("rangeMin")] + [DataField] public int RangeMin { get; private set; } = 5000; /// /// Maximum range to spawn this POI at /// - [DataField("rangeMax")] + [DataField] public int RangeMax { get; private set; } = 10000; /// /// The color to display the grid and name tag as in the radar screen /// - [DataField("iffColor")] - public Color IffColor { get; private set; } = (100, 100, 100, 100); - - /// - /// Whether or not the POI itself should be able to move or be moved. Should be false for immobile POIs (static stations) and true for ship-like POIs. - /// - [DataField("canMove")] - public bool CanMove { get; private set; } + [DataField("IFFColor")] + public Color IFFColor { get; private set; } = (100, 100, 100, 100); /// /// Whether or not the POI is shown on IFF. /// - [DataField("isHidden")] - public bool IsHidden { get; private set; } + [DataField("IFFFlags")] + public IFFFlags Flags = IFFFlags.None; /// /// Whether or not the POI permits IFF changes (i.e. from a console aboard it) /// - [DataField("allowIFFChanges")] + [DataField] public bool AllowIFFChanges { get; private set; } /// - /// Whether or not the POI is shown on IFF. + /// Whether or not the POI itself should be able to move or be moved. Should be false for immobile POIs (static stations) and true for ship-like POIs. /// - [DataField("gridProtection")] - public GridProtectionFlags GridProtection { get; private set; } = GridProtectionFlags.None; + [DataField] + public bool CanMove { get; private set; } /// - /// Must this POI always spawn? This is independent of spawn chance. If it always spawns, - /// it will be excluded from any kind of random lists, for places like the sheriff's department etc. + /// Whether or not the POI is shown on IFF. /// - [DataField("alwaysSpawn")] - public bool AlwaysSpawn { get; private set; } + [DataField] + public GridProtectionFlags GridProtection { get; private set; } = GridProtectionFlags.None; /// /// If the POI does not belong to a pre-defined group, it will default to the "unique" internal category and will /// use this float from 0-1 as a raw chance to spawn each round. /// - [DataField("spawnChance")] + [DataField] public float SpawnChance { get; private set; } = 1; /// /// The group that this POI belongs to. Currently, the default groups are: - /// "CargoDepot" + /// "CargoDepot" /// "MarketStation" + /// "Required" /// "Optional" - /// These three have corresponding CVARS by default, that set an optional # of this group to spawn. + /// Each POI labeled in the Required group will be spawned in every round. + /// Apart from that, each of thesehave corresponding CVARS by default, that set an optional # of this group to spawn. /// Traditionally, it is 2 cargo depots, 1 trade station, and 8 optional POIs. /// Dynamically added groups will default to 1 option chosen in that group, using the SpawnChance as a weighted chance /// for the entire group to spawn on a per-POI basis. /// - [DataField("spawnGroup")] + [DataField] public string SpawnGroup { get; private set; } = "Optional"; /// /// the path to the grid /// - [DataField("gridPath", required: true)] + [DataField(required: true)] public ResPath GridPath { get; private set; } = default!; /// /// Should the public transit stop here? If true, this will be added to the list of bus stops. /// - [DataField("busStop")] + [DataField] public bool BusStop { get; private set; } } @@ -118,4 +112,4 @@ public enum GridProtectionFlags : byte EmpEvents = 8, Explosions = 16, ArtifactTriggers = 32 -} \ No newline at end of file +} diff --git a/Resources/Maps/deaddrop.yml b/Resources/Maps/_NF/DeadDrop/deaddrop.yml similarity index 52% rename from Resources/Maps/deaddrop.yml rename to Resources/Maps/_NF/DeadDrop/deaddrop.yml index 8e9c4545c14..fa5b351cc95 100644 --- a/Resources/Maps/deaddrop.yml +++ b/Resources/Maps/_NF/DeadDrop/deaddrop.yml @@ -14,12 +14,13 @@ entities: entities: - uid: 1 components: - - name: Syndicate Supply Drop - type: MetaData - - pos: -0.38888836,-0.59260035 + - type: MetaData + name: Syndicate Supply Drop + - type: Transform + pos: -0.38888836,-0.59260035 parent: invalid - type: Transform - - chunks: + - type: MapGrid + chunks: 0,0: ind: 0,0 tiles: YQAAAAAAcgAAAAAALAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -28,25 +29,25 @@ entities: ind: -1,0 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAcgAAAAAAIQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAAAAAABcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: MapGrid - type: Broadphase - - bodyStatus: InAir + - type: Physics + bodyStatus: InAir angularDamping: 0.05 linearDamping: 0.05 fixedRotation: False bodyType: Dynamic - type: Physics - - fixtures: {} - type: Fixtures + - type: Fixtures + fixtures: {} - type: OccluderTree - type: SpreaderGrid - type: Shuttle - type: GridPathfinding - type: ContrabandPodGrid - - gravityShakeSound: !type:SoundPathSpecifier + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier path: /Audio/Effects/alert.ogg - type: Gravity - - chunkCollection: + - type: DecalGrid + chunkCollection: version: 2 nodes: - node: @@ -111,26 +112,34 @@ entities: id: syndlogo8 decals: 4: 1,3 - type: DecalGrid - - version: 2 + - type: GridAtmosphere + version: 2 data: tiles: 0,0: - 0: 32631 + 0: 13105 + 2: 4 + 1: 2048 -1,0: - 0: 57308 - -1,1: - 0: 52733 + 0: 34944 + 1: 4880 + 2: 4 0,1: - 0: 30711 + 0: 307 + 2: 16384 + 1: 128 + -1,1: + 0: 136 + 1: 305 + 2: 16384 0,2: - 0: 114 + 1: 114 + -1,2: + 1: 200 1,0: - 0: 4368 + 1: 4368 1,1: - 0: 273 - -1,2: - 0: 200 + 1: 273 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -147,484 +156,817 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GridAtmosphere - type: GasTileOverlay - type: RadiationGridResistance -- proto: AirlockShuttleEasyPry +- proto: AirlockExternalShuttleSyndicateLocked entities: - uid: 23 components: - - pos: 0.5,0.5 + - type: Transform + pos: 0.5,0.5 parent: 1 - type: Transform -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: + - uid: 2 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 - uid: 25 components: - - pos: 0.5,0.5 + - type: Transform + pos: 0.5,0.5 parent: 1 - type: Transform - - uid: 26 +- proto: AtmosFixBlockerMarker + entities: + - uid: 86 + components: + - type: Transform + pos: -2.5,2.5 + parent: 1 + - uid: 87 + components: + - type: Transform + pos: -3.5,2.5 + parent: 1 + - uid: 88 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 89 components: - - pos: 1.5,0.5 + - type: Transform + pos: -3.5,3.5 + parent: 1 + - uid: 90 + components: + - type: Transform + pos: -3.5,4.5 + parent: 1 + - uid: 91 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 + - uid: 92 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 93 + components: + - type: Transform + pos: -2.5,5.5 + parent: 1 + - uid: 94 + components: + - type: Transform + pos: -1.5,7.5 + parent: 1 + - uid: 95 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 96 + components: + - type: Transform + pos: 2.5,0.5 + parent: 1 + - uid: 97 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 + - uid: 98 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 99 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 100 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 101 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1 + - uid: 102 + components: + - type: Transform + pos: 1.5,9.5 + parent: 1 + - uid: 103 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 + - uid: 104 + components: + - type: Transform + pos: 2.5,9.5 + parent: 1 + - uid: 105 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - uid: 106 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 + - uid: 107 + components: + - type: Transform + pos: 4.5,6.5 + parent: 1 + - uid: 108 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 + - uid: 109 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1 + - uid: 110 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 + - uid: 111 + components: + - type: Transform + pos: 3.5,2.5 + parent: 1 + - uid: 112 + components: + - type: Transform + pos: 4.5,1.5 parent: 1 - type: Transform - proto: BlastDoor entities: - uid: 24 components: - - pos: 1.5,0.5 + - type: Transform + pos: 1.5,0.5 parent: 1 - type: Transform - proto: CableApcExtension entities: - uid: 51 components: - - pos: -0.5,5.5 + - type: Transform + pos: -0.5,5.5 parent: 1 - type: Transform - uid: 52 components: - - pos: 0.5,5.5 + - type: Transform + pos: 0.5,5.5 parent: 1 - type: Transform - uid: 53 components: - - pos: 1.5,5.5 + - type: Transform + pos: 1.5,5.5 parent: 1 - type: Transform - uid: 54 components: - - pos: 2.5,5.5 + - type: Transform + pos: 2.5,5.5 parent: 1 - type: Transform - uid: 55 components: - - pos: 0.5,4.5 + - type: Transform + pos: 0.5,4.5 parent: 1 - type: Transform - uid: 56 components: - - pos: 0.5,3.5 + - type: Transform + pos: 0.5,3.5 parent: 1 - type: Transform - uid: 57 components: - - pos: 0.5,2.5 + - type: Transform + pos: 0.5,2.5 parent: 1 - type: Transform - uid: 58 components: - - pos: 0.5,1.5 + - type: Transform + pos: 0.5,1.5 parent: 1 - type: Transform - uid: 59 components: - - pos: 0.5,0.5 + - type: Transform + pos: 0.5,0.5 parent: 1 - type: Transform - uid: 60 components: - - pos: 0.5,6.5 + - type: Transform + pos: 0.5,6.5 parent: 1 - type: Transform - uid: 85 components: - - pos: 1.5,6.5 + - type: Transform + pos: 1.5,6.5 parent: 1 - type: Transform - proto: CableHV entities: - uid: 77 components: - - pos: 2.5,5.5 + - type: Transform + pos: 2.5,5.5 parent: 1 - type: Transform - uid: 78 components: - - pos: 1.5,5.5 + - type: Transform + pos: 1.5,5.5 parent: 1 - type: Transform - uid: 79 components: - - pos: 0.5,5.5 + - type: Transform + pos: 0.5,5.5 parent: 1 - type: Transform - uid: 80 components: - - pos: -0.5,5.5 + - type: Transform + pos: -0.5,5.5 parent: 1 - type: Transform - uid: 81 components: - - pos: -0.5,6.5 + - type: Transform + pos: -0.5,6.5 parent: 1 - type: Transform - proto: CableMV entities: - uid: 82 components: - - pos: -0.5,6.5 + - type: Transform + pos: -0.5,6.5 parent: 1 - type: Transform - uid: 83 components: - - pos: 0.5,6.5 + - type: Transform + pos: 0.5,6.5 parent: 1 - type: Transform - uid: 84 components: - - pos: 1.5,6.5 + - type: Transform + pos: 1.5,6.5 + parent: 1 + - uid: 115 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 + - uid: 118 + components: + - type: Transform + pos: -1.5,5.5 + parent: 1 + - uid: 119 + components: + - type: Transform + pos: -2.5,5.5 + parent: 1 + - uid: 120 + components: + - type: Transform + pos: -3.5,5.5 + parent: 1 + - uid: 121 + components: + - type: Transform + pos: -3.5,6.5 + parent: 1 + - uid: 122 + components: + - type: Transform + pos: -3.5,4.5 + parent: 1 + - uid: 123 + components: + - type: Transform + pos: -3.5,3.5 + parent: 1 + - uid: 124 + components: + - type: Transform + pos: -3.5,2.5 + parent: 1 + - uid: 125 + components: + - type: Transform + pos: -3.5,1.5 + parent: 1 + - uid: 126 + components: + - type: Transform + pos: 3.5,5.5 + parent: 1 + - uid: 127 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 + - uid: 128 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 129 + components: + - type: Transform + pos: 4.5,5.5 + parent: 1 + - uid: 130 + components: + - type: Transform + pos: 4.5,6.5 + parent: 1 + - uid: 131 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 + - uid: 132 + components: + - type: Transform + pos: 4.5,3.5 + parent: 1 + - uid: 133 + components: + - type: Transform + pos: 4.5,2.5 + parent: 1 + - uid: 134 + components: + - type: Transform + pos: 4.5,1.5 + parent: 1 + - uid: 135 + components: + - type: Transform + pos: -0.5,7.5 + parent: 1 + - uid: 136 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 + - uid: 137 + components: + - type: Transform + pos: -0.5,9.5 + parent: 1 + - uid: 138 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 + - uid: 139 + components: + - type: Transform + pos: 0.5,9.5 + parent: 1 + - uid: 140 + components: + - type: Transform + pos: 1.5,9.5 + parent: 1 + - uid: 141 + components: + - type: Transform + pos: 2.5,9.5 parent: 1 - type: Transform - proto: ConveyorBelt entities: - uid: 45 components: - - pos: 1.5,0.5 + - type: Transform + pos: 1.5,0.5 parent: 1 - type: Transform - uid: 46 components: - - pos: 1.5,1.5 + - type: Transform + pos: 1.5,1.5 parent: 1 - type: Transform - proto: DebugAPC entities: - uid: 49 components: - - pos: 1.5,6.5 + - type: Transform + pos: 1.5,6.5 parent: 1 - type: Transform - proto: GeneratorWallmountAPU entities: - uid: 76 components: - - pos: 2.5,5.5 + - type: Transform + pos: 2.5,5.5 parent: 1 - type: Transform - proto: GravityGeneratorMini entities: - uid: 73 components: - - pos: 0.5,6.5 + - type: Transform + pos: 0.5,6.5 parent: 1 - type: Transform - proto: Grille entities: - - uid: 2 - components: - - pos: -3.5,6.5 - parent: 1 - type: Transform - uid: 27 components: - - pos: -0.5,0.5 + - type: Transform + pos: -0.5,0.5 parent: 1 - type: Transform - uid: 28 components: - - pos: 0.5,7.5 + - type: Transform + pos: 0.5,7.5 + parent: 1 +- proto: GrilleSpawner + entities: + - uid: 26 + components: + - type: Transform + pos: 4.5,6.5 parent: 1 - type: Transform - uid: 29 components: - - pos: 4.5,6.5 + - type: Transform + pos: -3.5,6.5 parent: 1 - type: Transform - uid: 30 components: - - pos: 4.5,5.5 + - type: Transform + pos: -1.5,9.5 parent: 1 - type: Transform - uid: 31 components: - - pos: 4.5,4.5 + - type: Transform + pos: -0.5,9.5 parent: 1 - type: Transform - uid: 32 components: - - pos: 4.5,3.5 + - type: Transform + pos: 0.5,9.5 parent: 1 - type: Transform - uid: 33 components: - - pos: 4.5,2.5 + - type: Transform + pos: 1.5,9.5 parent: 1 - type: Transform - uid: 34 components: - - pos: 4.5,1.5 + - type: Transform + pos: 2.5,9.5 parent: 1 - type: Transform - uid: 35 components: - - pos: -3.5,5.5 + - type: Transform + pos: 4.5,5.5 parent: 1 - type: Transform - uid: 36 components: - - pos: -3.5,4.5 + - type: Transform + pos: 4.5,4.5 parent: 1 - type: Transform - uid: 37 components: - - pos: -3.5,3.5 + - type: Transform + pos: 4.5,3.5 parent: 1 - type: Transform - uid: 38 components: - - pos: -3.5,2.5 + - type: Transform + pos: 4.5,2.5 parent: 1 - type: Transform - uid: 39 components: - - pos: -3.5,1.5 + - type: Transform + pos: 4.5,1.5 parent: 1 - type: Transform - uid: 40 components: - - pos: -1.5,9.5 + - type: Transform + pos: -3.5,1.5 parent: 1 - type: Transform - uid: 41 components: - - pos: -0.5,9.5 + - type: Transform + pos: -3.5,2.5 parent: 1 - type: Transform - uid: 42 components: - - pos: 0.5,9.5 + - type: Transform + pos: -3.5,3.5 parent: 1 - type: Transform - uid: 43 components: - - pos: 1.5,9.5 + - type: Transform + pos: -3.5,4.5 parent: 1 - type: Transform - uid: 44 components: - - pos: 2.5,9.5 + - type: Transform + pos: -3.5,5.5 + parent: 1 +- proto: PinpointerSyndicatePOISpawner + entities: + - uid: 114 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: PlastitaniumWindow + entities: + - uid: 21 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,7.5 + parent: 1 + - uid: 22 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,0.5 + parent: 1 +- proto: PoweredlightColoredBlack + entities: + - uid: 50 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,4.5 + parent: 1 +- proto: Rack + entities: + - uid: 113 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 +- proto: ShuttersNormal + entities: + - uid: 47 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 +- proto: SignElectricalMed + entities: + - uid: 142 + components: + - type: Transform + pos: 2.5,6.5 + parent: 1 + - uid: 143 + components: + - type: Transform + pos: -1.5,6.5 parent: 1 - type: Transform - proto: SpawnContrabandCrate entities: - uid: 61 components: - - pos: -0.5,2.5 + - type: Transform + pos: -0.5,2.5 parent: 1 - type: Transform - uid: 62 components: - - pos: -0.5,5.5 + - type: Transform + pos: -0.5,5.5 parent: 1 - type: Transform - uid: 63 components: - - pos: -0.5,4.5 + - type: Transform + pos: -0.5,4.5 parent: 1 - type: Transform - uid: 64 components: - - pos: -0.5,3.5 + - type: Transform + pos: -0.5,3.5 parent: 1 - type: Transform - uid: 65 components: - - pos: 0.5,2.5 + - type: Transform + pos: 0.5,2.5 parent: 1 - type: Transform - uid: 66 components: - - pos: 0.5,5.5 + - type: Transform + pos: 0.5,5.5 parent: 1 - type: Transform - uid: 67 components: - - pos: 0.5,4.5 + - type: Transform + pos: 0.5,4.5 parent: 1 - type: Transform - uid: 68 components: - - pos: 0.5,3.5 + - type: Transform + pos: 0.5,3.5 parent: 1 - type: Transform - uid: 70 components: - - pos: 1.5,5.5 + - type: Transform + pos: 1.5,5.5 parent: 1 - type: Transform - uid: 71 components: - - pos: 1.5,4.5 + - type: Transform + pos: 1.5,4.5 parent: 1 - type: Transform - uid: 72 components: - - pos: 1.5,3.5 + - type: Transform + pos: 1.5,3.5 parent: 1 - type: Transform -- proto: PlastitaniumWindow - entities: - - uid: 21 - components: - - rot: 3.141592653589793 rad - pos: 0.5,7.5 - parent: 1 - type: Transform - - uid: 22 - components: - - rot: 3.141592653589793 rad - pos: -0.5,0.5 - parent: 1 - type: Transform -- proto: PoweredlightColoredBlack - entities: - - uid: 50 - components: - - rot: -1.5707963267948966 rad - pos: 1.5,4.5 - parent: 1 - type: Transform -- proto: ShuttersNormal +- proto: SubstationWallBasic entities: - - uid: 47 - components: - - pos: 0.5,7.5 - parent: 1 - type: Transform - - uid: 48 + - uid: 75 components: - - pos: -0.5,0.5 + - type: Transform + pos: -0.5,6.5 parent: 1 - type: Transform -- proto: SubstationWallBasic +- proto: SyndieFlag entities: - - uid: 75 + - uid: 117 components: - - pos: -0.5,6.5 + - type: Transform + pos: -1.5,1.5 parent: 1 - type: Transform - proto: WallPlastitanium entities: - uid: 7 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,6.5 parent: 1 - type: Transform - uid: 8 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,5.5 parent: 1 - type: Transform - uid: 9 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,4.5 parent: 1 - type: Transform - uid: 10 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,3.5 parent: 1 - type: Transform - uid: 11 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,2.5 parent: 1 - type: Transform - uid: 12 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -1.5,1.5 parent: 1 - type: Transform - uid: 13 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,6.5 parent: 1 - type: Transform - uid: 14 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,5.5 parent: 1 - type: Transform - uid: 15 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,4.5 parent: 1 - type: Transform - uid: 16 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,3.5 parent: 1 - type: Transform - uid: 17 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,2.5 parent: 1 - type: Transform - uid: 18 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,1.5 parent: 1 - type: Transform - uid: 19 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 1.5,7.5 parent: 1 - type: Transform - uid: 20 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: -0.5,7.5 parent: 1 - type: Transform - uid: 69 components: - - pos: -0.5,6.5 + - type: Transform + pos: -0.5,6.5 parent: 1 - type: Transform - uid: 74 components: - - pos: 1.5,6.5 + - type: Transform + pos: 1.5,6.5 parent: 1 - type: Transform - proto: WallPlastitaniumDiagonal entities: - uid: 3 components: - - rot: -1.5707963267948966 rad + - type: Transform + rot: -1.5707963267948966 rad pos: 2.5,7.5 parent: 1 - type: Transform - uid: 4 components: - - pos: -1.5,7.5 + - type: Transform + pos: -1.5,7.5 parent: 1 - type: Transform - uid: 5 components: - - rot: 1.5707963267948966 rad + - type: Transform + rot: 1.5707963267948966 rad pos: -1.5,0.5 parent: 1 - type: Transform - uid: 6 components: - - rot: 3.141592653589793 rad + - type: Transform + rot: 3.141592653589793 rad pos: 2.5,0.5 parent: 1 - type: Transform +- proto: WarpPointNFSyndicateSupplyDrop + entities: + - uid: 116 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 ... diff --git a/Resources/Maps/_NF/POI/lpbravo.yml b/Resources/Maps/_NF/POI/lpbravo.yml index 6b9a0782103..3975d16834f 100644 --- a/Resources/Maps/_NF/POI/lpbravo.yml +++ b/Resources/Maps/_NF/POI/lpbravo.yml @@ -36,7 +36,7 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADHgAAAAABfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADIwAAAAABHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABIwAAAAACHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAABHgAAAAABHgAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAHgAAAAADHgAAAAABfQAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAHgAAAAADHgAAAAADHgAAAAADHgAAAAABHgAAAAADHgAAAAADHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAACHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAAAHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACHgAAAAACHgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAADIwAAAAABHgAAAAAAHgAAAAABHgAAAAABHgAAAAAAHgAAAAADHgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAABIwAAAAACHgAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAD version: 6 -1,1: ind: -1,1 @@ -304,7 +304,7 @@ entities: 1: 35939 0: 8 -2,-1: - 0: 65484 + 0: 65486 -1,4: 1: 52428 -3,-3: @@ -353,114 +353,120 @@ entities: - type: RadiationGridResistance - type: BecomesStation id: lpbravo -- proto: AirlockExternal +- proto: AirlockExternalShuttleSyndicateLocked entities: - - uid: 95 + - uid: 25 components: - type: Transform - pos: 5.5,-0.5 + rot: 1.5707963267948966 rad + pos: 7.5,-1.5 parent: 1 - - uid: 96 + - uid: 26 components: - type: Transform - pos: 5.5,-1.5 + rot: 1.5707963267948966 rad + pos: 7.5,-0.5 parent: 1 - - uid: 97 + - uid: 48 components: - type: Transform - pos: -0.5,-8.5 + rot: -1.5707963267948966 rad + pos: -8.5,-1.5 parent: 1 - - uid: 98 + - uid: 93 components: - type: Transform - pos: -0.5,7.5 + rot: 1.5707963267948966 rad + pos: 7.5,0.5 parent: 1 - - uid: 99 + - uid: 94 components: - type: Transform - pos: -0.5,5.5 + rot: -1.5707963267948966 rad + pos: -8.5,0.5 parent: 1 - - uid: 100 + - uid: 95 components: - type: Transform - pos: -0.5,-6.5 + rot: -1.5707963267948966 rad + pos: -8.5,-0.5 parent: 1 - - uid: 101 +- proto: AirlockHatchSyndicate + entities: + - uid: 15 components: - type: Transform - pos: -6.5,-1.5 + rot: 1.5707963267948966 rad + pos: 5.5,-0.5 parent: 1 - - uid: 102 + - uid: 16 components: - type: Transform + rot: 1.5707963267948966 rad pos: 5.5,0.5 parent: 1 - - uid: 145 + - uid: 17 components: - type: Transform - pos: -6.5,-0.5 + pos: -0.5,-8.5 parent: 1 - - uid: 146 + - uid: 18 components: - type: Transform - pos: -6.5,0.5 + pos: -0.5,7.5 parent: 1 -- proto: AirlockGlassShuttleSyndicate - entities: - - uid: 15 + - uid: 20 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,0.5 + pos: -0.5,-6.5 parent: 1 - - uid: 16 + - uid: 21 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-0.5 + rot: 1.5707963267948966 rad + pos: -6.5,-1.5 parent: 1 - - uid: 17 + - uid: 22 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-1.5 + rot: 1.5707963267948966 rad + pos: 5.5,-1.5 parent: 1 - - uid: 18 + - uid: 23 components: - type: Transform rot: 1.5707963267948966 rad - pos: 7.5,0.5 + pos: -6.5,-0.5 parent: 1 - - uid: 19 + - uid: 24 components: - type: Transform rot: 1.5707963267948966 rad - pos: 7.5,-0.5 + pos: -6.5,0.5 parent: 1 - - uid: 20 + - uid: 113 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,-1.5 + pos: -0.5,5.5 parent: 1 -- proto: AirlockSyndicate +- proto: AirlockSyndicateLocked entities: - - uid: 93 + - uid: 96 components: - type: Transform pos: 2.5,-3.5 parent: 1 - - uid: 94 + - uid: 97 components: - type: Transform pos: 4.5,-3.5 parent: 1 - - uid: 147 + - uid: 98 components: - type: Transform pos: -3.5,1.5 parent: 1 - - uid: 148 + - uid: 99 components: - type: Transform pos: 2.5,1.5 @@ -477,54 +483,53 @@ entities: - type: Transform pos: 3.5,1.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 21 + - uid: 19 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,7.5 + parent: 1 + - uid: 100 components: - type: Transform rot: 1.5707963267948966 rad - pos: 7.5,0.5 + pos: 7.5,-1.5 parent: 1 - - uid: 22 + - uid: 101 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-0.5 parent: 1 - - uid: 23 + - uid: 102 components: - type: Transform rot: 1.5707963267948966 rad - pos: 7.5,-1.5 + pos: 7.5,0.5 parent: 1 - - uid: 24 + - uid: 103 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad pos: -8.5,0.5 parent: 1 - - uid: 25 + - uid: 104 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad pos: -8.5,-0.5 parent: 1 - - uid: 26 + - uid: 107 components: - type: Transform - rot: 1.5707963267948966 rad + rot: -1.5707963267948966 rad pos: -8.5,-1.5 parent: 1 - - uid: 103 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,7.5 - parent: 1 - - uid: 104 + - uid: 145 components: - type: Transform - rot: 1.5707963267948966 rad pos: -0.5,-8.5 parent: 1 - proto: AtmosFixBlockerMarker @@ -1158,10 +1163,10 @@ entities: parent: 1 - proto: BannerSyndicate entities: - - uid: 446 + - uid: 190 components: - type: Transform - pos: 1.5,-2.5 + pos: 3.5,-2.5 parent: 1 - uid: 503 components: @@ -1228,145 +1233,91 @@ entities: - type: Transform pos: -3.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 163 components: - type: Transform pos: -8.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 450 components: - type: Transform pos: -8.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 455 components: - type: Transform pos: -2.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 456 components: - type: Transform pos: 1.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 457 components: - type: Transform pos: 2.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 458 components: - type: Transform pos: 5.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 459 components: - type: Transform pos: 6.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 460 components: - type: Transform pos: 7.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 461 components: - type: Transform pos: 7.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 462 components: - type: Transform pos: -3.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 463 components: - type: Transform pos: -6.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 464 components: - type: Transform pos: -2.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 465 components: - type: Transform pos: 1.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 466 components: - type: Transform pos: 2.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 467 components: - type: Transform pos: 5.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 470 components: - type: Transform pos: -7.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - uid: 472 components: - type: Transform pos: -6.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 469 - proto: BlastDoorOpen entities: - uid: 482 @@ -1437,7 +1388,7 @@ entities: - uid: 325 components: - type: Transform - pos: -3.5726953,-2.3802757 + pos: -3.2104347,-2.343216 parent: 1 - uid: 328 components: @@ -1893,6 +1844,26 @@ entities: - type: Transform pos: -0.5,-1.5 parent: 1 + - uid: 507 + components: + - type: Transform + pos: -6.5,-5.5 + parent: 1 + - uid: 525 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 1 + - uid: 653 + components: + - type: Transform + pos: -6.5,-6.5 + parent: 1 + - uid: 688 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 1 - proto: CableHV entities: - uid: 196 @@ -2490,7 +2461,7 @@ entities: - uid: 192 components: - type: Transform - pos: -0.70714176,0.5210383 + pos: -0.5946899,0.5210084 parent: 1 - proto: ClothingHeadHatSyndie entities: @@ -2499,12 +2470,19 @@ entities: - type: Transform pos: -7.440094,-6.5266685 parent: 1 +- proto: ClothingHeadsetAltSyndicate + entities: + - uid: 188 + components: + - type: Transform + pos: -3.6398454,-2.6581552 + parent: 1 - proto: ClothingUniformJumpsuitRecruitSyndie entities: - uid: 448 components: - type: Transform - pos: -0.3783403,0.5410535 + pos: -0.3446899,0.62524754 parent: 1 - proto: ClothingUniformJumpsuitTacticool entities: @@ -2549,7 +2527,7 @@ entities: parent: 1 - proto: ComputerShipyardSyndicate entities: - - uid: 447 + - uid: 171 components: - type: Transform pos: -1.5,0.5 @@ -2574,10 +2552,10 @@ entities: parent: 1 - proto: DisposalUnit entities: - - uid: 190 + - uid: 447 components: - type: Transform - pos: 1.5,0.5 + pos: 0.5,-2.5 parent: 1 - proto: Dresser entities: @@ -2591,7 +2569,7 @@ entities: - uid: 330 components: - type: Transform - pos: -2.7882986,-2.4004483 + pos: -2.8041847,-2.4370308 parent: 1 - proto: DrinkSyndicatebomb entities: @@ -2600,14 +2578,6 @@ entities: - type: Transform pos: -6.408844,-6.1360435 parent: 1 -- proto: EncryptionKeySyndie - entities: - - uid: 499 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.699439,-2.8686886 - parent: 1 - proto: FaxMachineNFLPBravo entities: - uid: 174 @@ -2657,13 +2627,6 @@ entities: parent: 1 - type: Fixtures fixtures: {} -- proto: FoodSnackSyndi - entities: - - uid: 500 - components: - - type: Transform - pos: -0.60568905,0.70943654 - parent: 1 - proto: GasMixerOn entities: - uid: 670 @@ -3145,6 +3108,13 @@ entities: - type: Transform pos: 0.5,7.5 parent: 1 +- proto: GoldenPlunger + entities: + - uid: 146 + components: + - type: Transform + pos: 1.6092173,-4.25662 + parent: 1 - proto: GravityGeneratorMini entities: - uid: 166 @@ -3275,6 +3245,13 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-7.5 parent: 1 +- proto: HoverbikeSyndicateFlatpack + entities: + - uid: 515 + components: + - type: Transform + pos: -3.4763687,4.5686398 + parent: 1 - proto: Mirror entities: - uid: 157 @@ -3342,13 +3319,6 @@ entities: - type: Transform pos: -3.1763327,-2.790039 parent: 1 -- proto: Plunger - entities: - - uid: 171 - components: - - type: Transform - pos: 1.5812624,-4.2293787 - parent: 1 - proto: PosterContrabandC20r entities: - uid: 505 @@ -3416,18 +3386,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,1.5 parent: 1 -- proto: PottedPlantRandomPlastic - entities: - - uid: 191 - components: - - type: Transform - pos: -2.5,0.5 - parent: 1 - - uid: 477 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 1 - proto: PoweredlightColoredBlack entities: - uid: 436 @@ -3439,8 +3397,7 @@ entities: - uid: 437 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-3.5 + pos: -6.5,-3.5 parent: 1 - uid: 438 components: @@ -3639,6 +3596,11 @@ entities: parent: 1 - proto: RandomPosterContraband entities: + - uid: 454 + components: + - type: Transform + pos: -6.5,-2.5 + parent: 1 - uid: 510 components: - type: Transform @@ -3980,39 +3942,6 @@ entities: parent: 1 - type: SpamEmitSound enabled: False -- proto: SpawnMobSyndicateNavalDeckhandVoid - entities: - - uid: 481 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 1 - - uid: 507 - components: - - type: Transform - pos: -4.5,-3.5 - parent: 1 -- proto: SpawnMobSyndicateNavalEngineerVoid - entities: - - uid: 525 - components: - - type: Transform - pos: -0.5,3.5 - parent: 1 -- proto: SpawnMobSyndicateNavalHardVoid - entities: - - uid: 653 - components: - - type: Transform - pos: 5.5,-6.5 - parent: 1 -- proto: SpawnVehicleAntagVehicle - entities: - - uid: 169 - components: - - type: Transform - pos: -3.5,4.5 - parent: 1 - proto: Stool entities: - uid: 164 @@ -4041,6 +3970,13 @@ entities: - type: Transform pos: -2.5,4.5 parent: 1 +- proto: SyndicateMicrowave + entities: + - uid: 148 + components: + - type: Transform + pos: -6.5,-4.5 + parent: 1 - proto: SyndieFlag entities: - uid: 651 @@ -4051,6 +3987,11 @@ entities: parent: 1 - proto: TablePlasmaGlass entities: + - uid: 169 + components: + - type: Transform + pos: -3.5,4.5 + parent: 1 - uid: 175 components: - type: Transform @@ -4066,12 +4007,6 @@ entities: - type: Transform pos: 1.5,4.5 parent: 1 - - uid: 188 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,0.5 - parent: 1 - uid: 315 components: - type: Transform @@ -4097,6 +4032,17 @@ entities: - type: Transform pos: -2.5,2.5 parent: 1 + - uid: 453 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 + - uid: 481 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-4.5 + parent: 1 - proto: TelecomServerFilledSyndicate entities: - uid: 501 @@ -4112,40 +4058,33 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-4.5 parent: 1 -- proto: ToolboxSyndicate - entities: - - uid: 453 - components: - - type: Transform - pos: -2.6015956,2.503873 - parent: 1 -- proto: VehicleKeySkeletonMotorcycle +- proto: ToolboxSyndicateFilled entities: - - uid: 515 + - uid: 446 components: - type: Transform - pos: -2.6974268,2.7199645 + pos: -2.5217733,2.6159606 parent: 1 -- proto: VehicleKeySyndicateSegway +- proto: VendingMachineBoozeSyndicate entities: - - uid: 454 + - uid: 147 components: - type: Transform - pos: -2.3828456,2.660123 + pos: -6.5,-3.5 parent: 1 - proto: VendingMachineSyndieContraband entities: - - uid: 516 + - uid: 187 components: - type: Transform - pos: 0.5,0.5 + pos: 1.5,0.5 parent: 1 - proto: VendingMachineSyndieDrobe entities: - - uid: 187 + - uid: 191 components: - type: Transform - pos: 0.5,-2.5 + pos: 1.5,-2.5 parent: 1 - proto: WallPlastitanium entities: @@ -4299,12 +4238,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,-5.5 parent: 1 - - uid: 48 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-3.5 - parent: 1 - uid: 49 components: - type: Transform @@ -4505,18 +4438,6 @@ entities: parent: 1 - proto: WallPlastitaniumDiagonal entities: - - uid: 107 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-4.5 - parent: 1 - - uid: 113 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-5.5 - parent: 1 - uid: 116 components: - type: Transform @@ -4603,46 +4524,18 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-4.5 parent: 1 -- proto: WarpPointNFLPBravo - entities: - - uid: 189 + - uid: 500 components: - type: Transform rot: 3.141592653589793 rad - pos: -0.5,-1.5 - parent: 1 -- proto: WeaponTurretLaserSyndicateNF - entities: - - uid: 717 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,9.5 + pos: -7.5,-5.5 parent: 1 -- proto: WeaponTurretSyndicate +- proto: WarpPointNFLPBravo entities: - - uid: 688 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-10.5 - parent: 1 - - uid: 710 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-10.5 - parent: 1 - - uid: 715 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,4.5 - parent: 1 - - uid: 716 + - uid: 189 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,4.5 + rot: 3.141592653589793 rad + pos: -0.5,-1.5 parent: 1 ... diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index 539d56dffe5..83befb2cff4 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -136,7 +136,7 @@ - type: StorageFill contents: - id: WallmountSubstationElectronics - - id: WallmountGeneratorAPUElectronics +# - id: WallmountGeneratorAPUElectronics # Frontier - id: HandheldGPSBasic - id: InflatableDoorStack1 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 917dbe87f89..0a2d948d4a5 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,11 +1,13 @@ - type: entity id: CrateSyndicateSurplusBundle - parent: [ CrateSyndicate, StorePresetUplink, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband [DataField] public ProtoId? GuidebookPage = default!; + + /// + /// The price markup of the vessel testing + /// + [DataField] + public float MinPriceMarkup = 1.05f; } public enum VesselSize : byte diff --git a/Resources/Maps/_NF/POI/edison.yml b/Resources/Maps/_NF/POI/edison.yml index 0d981fa027b..2fb95d7976a 100644 --- a/Resources/Maps/_NF/POI/edison.yml +++ b/Resources/Maps/_NF/POI/edison.yml @@ -12887,8 +12887,6 @@ entities: pos: 16.5,19.5 parent: 2 - type: DeviceList - configurators: - - invalid devices: - 1588 - 1587 @@ -13066,8 +13064,6 @@ entities: pos: -13.5,14.5 parent: 2 - type: DeviceList - configurators: - - invalid devices: - 1750 - 1751 @@ -13114,8 +13110,6 @@ entities: pos: -11.5,1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3947 - uid: 1566 @@ -13124,8 +13118,6 @@ entities: pos: 12.5,1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3948 - uid: 1567 @@ -13698,8 +13690,6 @@ entities: pos: -13.5,9.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3955 - 3956 @@ -13710,8 +13700,6 @@ entities: pos: -13.5,10.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3955 - 3956 @@ -13722,8 +13710,6 @@ entities: pos: -5.5,16.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3818 - 3817 @@ -13735,8 +13721,6 @@ entities: pos: -5.5,17.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3818 - 3817 @@ -13748,8 +13732,6 @@ entities: pos: -5.5,18.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3818 - 3817 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml index b5cd7946d52..217f1b7819c 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml @@ -2536,8 +2536,6 @@ entities: pos: -0.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 647 - uid: 198 @@ -2547,8 +2545,6 @@ entities: pos: -0.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 647 - uid: 204 @@ -2558,8 +2554,6 @@ entities: pos: -0.5,5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 647 - uid: 220 @@ -2574,8 +2568,6 @@ entities: pos: 0.5,5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 647 - uid: 433 @@ -2591,8 +2583,6 @@ entities: pos: -1.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 647 - uid: 450 @@ -2602,8 +2592,6 @@ entities: pos: 0.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 647 - uid: 459 @@ -2613,8 +2601,6 @@ entities: pos: 0.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 647 - uid: 460 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml b/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml index 679b248f178..2440877b4f6 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml @@ -3111,11 +3111,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-5.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - deviceLists: - - 2 - proto: FloorDrain entities: - uid: 729 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml index a2a93cc5191..7f4e2485d0f 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml @@ -4429,9 +4429,6 @@ entities: - type: Transform pos: 8.5,-12.5 parent: 2 - - type: DeviceNetwork - configurators: - - invalid - proto: SurveillanceCameraSecurity entities: - uid: 244 @@ -4557,9 +4554,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-18.5 parent: 2 - - type: DeviceNetwork - configurators: - - invalid - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml index 6de9136ae26..010aa61d5ae 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml @@ -1745,9 +1745,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,7.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - proto: ConveyorBelt entities: - uid: 224 @@ -3200,9 +3197,6 @@ entities: - type: Transform pos: -1.5,8.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - proto: SurveillanceCameraSecurity entities: - uid: 418 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml index 3fabddb5f6a..7c4a4d8a4fd 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/point.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/point.yml @@ -1234,8 +1234,6 @@ entities: pos: 1.5,1.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 58 - proto: FirelockEdge @@ -1520,8 +1518,6 @@ entities: pos: 4.5,0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 58 - type: AtmosPipeColor @@ -1546,8 +1542,6 @@ entities: pos: 2.5,0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 58 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/Sr/broom.yml b/Resources/Maps/_NF/Shuttles/Sr/broom.yml index 69ed7b1c065..73a18e3183b 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/broom.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/broom.yml @@ -509,9 +509,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,0.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -521,9 +518,6 @@ entities: - type: Transform pos: 1.5,-0.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml index 0dc9b9ced2d..3c507d1a9fa 100644 --- a/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml +++ b/Resources/Maps/_NF/Shuttles/Syndicate/infiltrator.yml @@ -61,98 +61,88 @@ entities: version: 2 data: tiles: + -3,-5: + 0: 49152 + -2,-5: + 0: 64012 + 1: 1 + -2,-4: + 0: 52362 + 1: 256 + -2,-3: + 1: 36384 + 0: 136 + -2,-2: + 0: 52224 + 1: 4 + -2,-1: + 1: 32 + 0: 8 -1,-4: - 0: 65535 + 0: 61071 -1,-3: - 0: 65279 1: 256 + 0: 52430 -1,-2: - 0: 65535 + 0: 65528 -1,-1: - 0: 4095 + 0: 239 + -1,-5: + 0: 65421 0,-4: - 0: 65535 + 0: 48015 0,-3: - 0: 29695 + 0: 4507 1: 35840 0,-2: - 0: 65535 + 0: 48944 0,-1: - 0: 2047 + 0: 59 + 0,-5: + 0: 65295 1,-4: - 0: 13183 + 0: 4354 1: 1024 1,-3: - 0: 19 1: 800 1,-2: 1: 1 - 0: 13104 - 1,-1: - 0: 19 - 1: 32 - 0,-5: - 0: 65535 + 0: 4352 1,-5: - 0: 65395 - 1: 4 - -1,-5: - 0: 65535 - -3,-4: - 0: 12 - -2,-4: - 0: 61183 - 1: 256 - -2,-2: - 0: 61160 + 0: 61953 1: 4 - -2,-1: - 0: 206 + 1,-1: 1: 32 - -2,-3: - 0: 206 - 1: 36384 - -3,-5: - 0: 52224 - -2,-8: - 0: 65056 - 1: 192 + 2,-5: + 0: 4096 -2,-7: - 0: 65535 + 0: 61166 -2,-6: - 0: 65535 - -2,-5: - 1: 1 - 0: 65534 + 0: 52974 + -2,-8: + 1: 704 -1,-8: - 0: 4368 - 1: 8736 + 1: 8752 -1,-7: - 0: 65297 + 0: 55296 1: 238 -1,-6: - 0: 65535 - 0,-8: - 1: 8864 - 0: 52288 + 0: 64925 0,-7: 1: 51 - 0: 65348 + 0: 53248 2: 136 0,-6: - 0: 65535 + 0: 65421 + 0,-8: + 1: 8928 1,-8: - 1: 16 - 0: 29472 + 1: 528 1,-7: - 0: 30549 + 0: 12288 3: 34 1,-6: - 0: 30583 - 2,-4: - 0: 1 - 2,-5: - 0: 4352 + 0: 4867 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -170,7 +160,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -574,8 +564,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 10 - type: DeviceLinkSource linkedPorts: 10: @@ -594,8 +582,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 8 - type: DeviceLinkSource linkedPorts: 8: @@ -608,8 +594,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 12 - type: DeviceLinkSource linkedPorts: 12: @@ -622,8 +606,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 6 - type: DeviceLinkSource linkedPorts: 6: @@ -642,8 +624,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 4 - type: DeviceLinkSource linkedPorts: 4: @@ -656,8 +636,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 7 - type: DeviceLinkSource linkedPorts: 7: @@ -1094,15 +1072,6 @@ entities: - type: Transform pos: -2.5,-12.5 parent: 1 -- proto: BoxEncryptionKeySyndie - entities: - - uid: 34 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: BoxFlashbang entities: - uid: 42 @@ -2533,24 +2502,6 @@ entities: - type: Transform pos: -3.1200604,-17.289778 parent: 1 -- proto: ClothingHeadHatSyndieMAA - entities: - - uid: 35 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingHeadPyjamaSyndicateRed - entities: - - uid: 36 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingMaskBreathMedical entities: - uid: 353 @@ -2558,42 +2509,6 @@ entities: - type: Transform pos: -5.4188166,-4.5927215 parent: 1 -- proto: ClothingOuterCoatSyndieCap - entities: - - uid: 38 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpskirtSyndieFormalDress - entities: - - uid: 39 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitPyjamaSyndicateRed - entities: - - uid: 40 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingUniformJumpsuitSyndieFormal - entities: - - uid: 41 - components: - - type: Transform - parent: 33 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ComfyChair entities: - uid: 318 @@ -3772,13 +3687,6 @@ entities: - type: Transform pos: 3.5,-3.5 parent: 1 -- proto: SyndicateMicrowave - entities: - - uid: 497 - components: - - type: Transform - pos: 3.5,-19.5 - parent: 1 - proto: KnifePlastic entities: - uid: 498 @@ -3809,51 +3717,13 @@ entities: - type: Physics canCollide: True - type: ActionsContainer -- proto: LockerSyndicatePersonal +- proto: LockerSyndicatePersonalFilled entities: - uid: 33 components: - type: Transform pos: 4.5,-5.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - 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: - - 34 - - 35 - - 38 - - 41 - - 40 - - 36 - - 39 - - 37 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null -- proto: LockerSyndicatePersonalFilled - entities: - uid: 506 components: - type: Transform @@ -4486,97 +4356,61 @@ entities: - type: Transform pos: -6.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 598 components: - type: Transform pos: 5.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 20 - uid: 599 components: - type: Transform pos: 1.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 609 - uid: 600 components: - type: Transform pos: -2.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 609 - uid: 601 components: - type: Transform pos: -4.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 602 components: - type: Transform pos: 3.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 20 - uid: 603 components: - type: Transform pos: 1.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 604 components: - type: Transform pos: -0.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 605 components: - type: Transform pos: 5.5,-19.5 parent: 1 - - type: DeviceLinkSink - links: - - 611 - uid: 606 components: - type: Transform pos: -1.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 607 components: - type: Transform pos: 0.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - uid: 608 components: - type: Transform pos: -2.5,-1.5 parent: 1 - - type: DeviceLinkSink - links: - - 21 - proto: SignalButton entities: - uid: 609 @@ -4716,7 +4550,7 @@ entities: - type: Transform pos: 2.4424396,-17.430403 parent: 1 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 626 components: @@ -4766,6 +4600,13 @@ entities: - type: Transform pos: 0.5,-23.5 parent: 1 +- proto: SyndicateMicrowave + entities: + - uid: 497 + components: + - type: Transform + pos: 3.5,-19.5 + parent: 1 - proto: SyndicateWhistle entities: - uid: 886 diff --git a/Resources/Maps/_NF/Shuttles/akupara.yml b/Resources/Maps/_NF/Shuttles/akupara.yml index 5ecd175ddc4..eb13a3899b3 100644 --- a/Resources/Maps/_NF/Shuttles/akupara.yml +++ b/Resources/Maps/_NF/Shuttles/akupara.yml @@ -1583,10 +1583,6 @@ entities: hard: False restitution: 0 friction: 0.4 - - type: ThrownItem - thrownTime: 1533.0722333 - thrower: invalid - animate: False - proto: ChairOfficeDark entities: - uid: 183 @@ -2001,8 +1997,6 @@ entities: pos: 4.5,10.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 5 - proto: FirelockGlass @@ -2013,8 +2007,6 @@ entities: pos: 1.5,0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2 - uid: 242 @@ -2023,8 +2015,6 @@ entities: pos: 1.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3 - uid: 243 @@ -2033,8 +2023,6 @@ entities: pos: -0.5,0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3 - uid: 244 @@ -2043,8 +2031,6 @@ entities: pos: 3.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 4 - uid: 245 @@ -2054,8 +2040,6 @@ entities: pos: 1.5,5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3 - uid: 246 @@ -2065,8 +2049,6 @@ entities: pos: 3.5,5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 5 - proto: FloorDrain @@ -2865,8 +2847,6 @@ entities: pos: -1.5,1.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3 - type: AtmosPipeColor @@ -2913,8 +2893,6 @@ entities: pos: -3.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3 - type: AtmosPipeColor @@ -2926,8 +2904,6 @@ entities: pos: -3.5,6.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3 - type: AtmosPipeColor @@ -2939,8 +2915,6 @@ entities: pos: -1.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 3 - type: AtmosPipeColor @@ -2962,8 +2936,6 @@ entities: pos: 2.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml index 86e8677b7f3..ac689136627 100644 --- a/Resources/Maps/_NF/Shuttles/apothecary.yml +++ b/Resources/Maps/_NF/Shuttles/apothecary.yml @@ -2018,8 +2018,6 @@ entities: pos: -3.5,6.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2030,8 +2028,6 @@ entities: pos: -2.5,9.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2043,8 +2039,6 @@ entities: pos: 3.5,-2.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2056,8 +2050,6 @@ entities: pos: -2.5,-2.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2069,8 +2061,6 @@ entities: pos: -1.5,1.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2084,8 +2074,6 @@ entities: pos: -2.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2096,9 +2084,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - type: AtmosPipeColor color: '#990000FF' - uid: 325 @@ -2107,8 +2092,6 @@ entities: pos: -0.5,9.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2120,8 +2103,6 @@ entities: pos: -1.5,2.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2133,8 +2114,6 @@ entities: pos: 4.5,-2.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor @@ -2146,8 +2125,6 @@ entities: pos: -1.5,6.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/beaker.yml b/Resources/Maps/_NF/Shuttles/beaker.yml index 51262b6c7a6..be5e07780ca 100644 --- a/Resources/Maps/_NF/Shuttles/beaker.yml +++ b/Resources/Maps/_NF/Shuttles/beaker.yml @@ -1287,8 +1287,6 @@ entities: pos: -2.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 172 - 265 @@ -1298,8 +1296,6 @@ entities: pos: 3.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 172 - 265 @@ -1611,8 +1607,6 @@ entities: pos: -1.5,0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 265 - 172 @@ -1625,8 +1619,6 @@ entities: pos: -4.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 265 - 172 @@ -1641,8 +1633,6 @@ entities: pos: -4.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 265 - 172 @@ -1654,8 +1644,6 @@ entities: pos: 0.5,0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 265 - 172 @@ -1668,8 +1656,6 @@ entities: pos: 5.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 265 - 172 diff --git a/Resources/Maps/_NF/Shuttles/bookworm.yml b/Resources/Maps/_NF/Shuttles/bookworm.yml index 667c8da92fd..b3c638e8749 100644 --- a/Resources/Maps/_NF/Shuttles/bookworm.yml +++ b/Resources/Maps/_NF/Shuttles/bookworm.yml @@ -639,8 +639,6 @@ entities: pos: 7.5,4.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 480 - proto: APCBasic @@ -1612,8 +1610,6 @@ entities: pos: 1.5,-4.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 480 - uid: 386 @@ -1622,8 +1618,6 @@ entities: pos: 4.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 480 - uid: 469 @@ -1632,8 +1626,6 @@ entities: pos: -1.5,0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 480 - proto: Fireplace @@ -2217,8 +2209,6 @@ entities: pos: 4.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 480 - type: AtmosPipeColor @@ -2271,8 +2261,6 @@ entities: pos: 2.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 480 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/cleithro.yml b/Resources/Maps/_NF/Shuttles/cleithro.yml index f196d193382..0a13b3001bf 100644 --- a/Resources/Maps/_NF/Shuttles/cleithro.yml +++ b/Resources/Maps/_NF/Shuttles/cleithro.yml @@ -2852,8 +2852,6 @@ entities: pos: 3.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 453 - type: AtmosDevice @@ -2963,8 +2961,6 @@ entities: pos: 2.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 453 - type: AtmosDevice diff --git a/Resources/Maps/_NF/Shuttles/kestrel.yml b/Resources/Maps/_NF/Shuttles/kestrel.yml index 4dab3e0c427..475a1d772bd 100644 --- a/Resources/Maps/_NF/Shuttles/kestrel.yml +++ b/Resources/Maps/_NF/Shuttles/kestrel.yml @@ -2610,8 +2610,6 @@ entities: pos: 0.5,1.5 parent: 3 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 523 - type: AtmosPipeColor @@ -2623,8 +2621,6 @@ entities: pos: 4.5,-3.5 parent: 3 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 523 - type: AtmosPipeColor @@ -2678,8 +2674,6 @@ entities: pos: 1.5,0.5 parent: 3 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 523 - type: AtmosPipeColor @@ -2713,8 +2707,6 @@ entities: pos: 2.5,-3.5 parent: 3 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 523 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/lantern.yml b/Resources/Maps/_NF/Shuttles/lantern.yml index f71461ae8d3..060f7c3a673 100644 --- a/Resources/Maps/_NF/Shuttles/lantern.yml +++ b/Resources/Maps/_NF/Shuttles/lantern.yml @@ -3845,8 +3845,6 @@ entities: pos: -0.5,-9.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 739 - type: AtmosPipeColor @@ -3858,8 +3856,6 @@ entities: pos: -0.5,-2.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 739 - type: AtmosPipeColor @@ -3871,8 +3867,6 @@ entities: pos: 3.5,-13.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 295 - type: AtmosPipeColor @@ -3895,8 +3889,6 @@ entities: pos: 4.5,-13.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 295 - type: AtmosPipeColor @@ -3908,8 +3900,6 @@ entities: pos: 2.5,-9.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 739 - type: AtmosPipeColor @@ -3921,8 +3911,6 @@ entities: pos: 2.5,-2.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 739 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index 739c9bc731e..5ca77aaaabd 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -2046,8 +2046,6 @@ entities: pos: 1.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 396 - type: AtmosPipeColor @@ -2105,8 +2103,6 @@ entities: pos: 0.5,-5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 396 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml index dba253e205f..48b4b9fcf78 100644 --- a/Resources/Maps/_NF/Shuttles/lyrae.yml +++ b/Resources/Maps/_NF/Shuttles/lyrae.yml @@ -2367,8 +2367,6 @@ entities: pos: 11.5,-1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - uid: 623 @@ -2377,8 +2375,6 @@ entities: pos: 3.5,0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - uid: 624 @@ -2387,8 +2383,6 @@ entities: pos: -2.5,1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - uid: 625 @@ -2397,8 +2391,6 @@ entities: pos: 0.5,-1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - 70 @@ -2408,8 +2400,6 @@ entities: pos: -9.5,-1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - uid: 630 @@ -2418,8 +2408,6 @@ entities: pos: -2.5,4.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - proto: GasMixerOn @@ -3183,8 +3171,6 @@ entities: pos: 10.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3196,8 +3182,6 @@ entities: pos: -2.5,5.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3208,8 +3192,6 @@ entities: pos: -4.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3220,8 +3202,6 @@ entities: pos: 9.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3233,8 +3213,6 @@ entities: pos: -8.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3245,8 +3223,6 @@ entities: pos: 5.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3258,8 +3234,6 @@ entities: pos: -2.5,2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3270,8 +3244,6 @@ entities: pos: -7.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3282,8 +3254,6 @@ entities: pos: 2.5,1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3319,8 +3289,6 @@ entities: pos: 7.5,-1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3332,8 +3300,6 @@ entities: pos: 4.5,1.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3345,8 +3311,6 @@ entities: pos: -1.5,-0.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3358,8 +3322,6 @@ entities: pos: 11.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3370,8 +3332,6 @@ entities: pos: 10.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 70 - type: AtmosPipeColor @@ -3383,8 +3343,6 @@ entities: pos: -9.5,-2.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3396,8 +3354,6 @@ entities: pos: -3.5,6.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3409,8 +3365,6 @@ entities: pos: -3.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor @@ -3421,8 +3375,6 @@ entities: pos: -8.5,3.5 parent: 2 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 63 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index 6c8b476c3de..9beb2a762b8 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -1098,9 +1098,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,4.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - proto: APCBasic entities: - uid: 40 @@ -3567,8 +3564,6 @@ entities: pos: -2.5,12.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 239 - 469 diff --git a/Resources/Maps/_NF/Shuttles/piecrust.yml b/Resources/Maps/_NF/Shuttles/piecrust.yml index df1ac3f357f..a79a438d855 100644 --- a/Resources/Maps/_NF/Shuttles/piecrust.yml +++ b/Resources/Maps/_NF/Shuttles/piecrust.yml @@ -1094,8 +1094,6 @@ entities: pos: 5.5,5.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - uid: 314 @@ -1104,8 +1102,6 @@ entities: pos: 3.5,0.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - uid: 315 @@ -1114,8 +1110,6 @@ entities: pos: 3.5,3.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - uid: 353 @@ -1579,8 +1573,6 @@ entities: pos: -3.5,-1.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1592,8 +1584,6 @@ entities: pos: 4.5,1.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1605,8 +1595,6 @@ entities: pos: 1.5,-1.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1617,8 +1605,6 @@ entities: pos: 5.5,7.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1629,8 +1615,6 @@ entities: pos: 1.5,4.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1644,8 +1628,6 @@ entities: pos: 0.5,-0.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1656,8 +1638,6 @@ entities: pos: 6.5,6.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1669,8 +1649,6 @@ entities: pos: -3.5,0.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1682,8 +1660,6 @@ entities: pos: 4.5,2.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor @@ -1694,8 +1670,6 @@ entities: pos: -0.5,4.5 parent: 8756 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 323 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/pioneer.yml b/Resources/Maps/_NF/Shuttles/pioneer.yml index 752ba5a2eca..441cb99ffb3 100644 --- a/Resources/Maps/_NF/Shuttles/pioneer.yml +++ b/Resources/Maps/_NF/Shuttles/pioneer.yml @@ -622,8 +622,6 @@ entities: pos: -0.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 49 - type: AtmosPipeColor @@ -637,8 +635,6 @@ entities: pos: -0.5,0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 49 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/placebo.yml b/Resources/Maps/_NF/Shuttles/placebo.yml index 233f4b1cf99..bcb4b89c921 100644 --- a/Resources/Maps/_NF/Shuttles/placebo.yml +++ b/Resources/Maps/_NF/Shuttles/placebo.yml @@ -270,8 +270,6 @@ entities: pos: -3.5,7.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 196 - 235 @@ -282,8 +280,6 @@ entities: pos: -0.5,7.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 196 - 235 @@ -811,8 +807,6 @@ entities: pos: -5.5,5.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 234 - 196 @@ -834,8 +828,6 @@ entities: pos: -1.5,6.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 235 - proto: FolderSpawner @@ -1245,8 +1237,6 @@ entities: pos: -5.5,8.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 235 - type: AtmosPipeColor @@ -1284,8 +1274,6 @@ entities: pos: -4.5,8.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 235 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/searchlight.yml b/Resources/Maps/_NF/Shuttles/searchlight.yml index bec829d32d4..ce23b93d70e 100644 --- a/Resources/Maps/_NF/Shuttles/searchlight.yml +++ b/Resources/Maps/_NF/Shuttles/searchlight.yml @@ -1213,8 +1213,6 @@ entities: pos: -0.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - uid: 272 @@ -1224,8 +1222,6 @@ entities: pos: -0.5,-3.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - uid: 274 @@ -1235,8 +1231,6 @@ entities: pos: 1.5,-3.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - uid: 275 @@ -1246,8 +1240,6 @@ entities: pos: 1.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - proto: FirelockGlass @@ -1503,8 +1495,6 @@ entities: pos: -0.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 281 - type: AtmosPipeColor @@ -1516,8 +1506,6 @@ entities: pos: 0.5,-6.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - 281 @@ -1540,8 +1528,6 @@ entities: pos: 2.5,-3.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - 281 @@ -1554,8 +1540,6 @@ entities: pos: 0.5,-7.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - 281 @@ -1568,8 +1552,6 @@ entities: pos: 2.5,-4.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 34 - 281 @@ -1581,8 +1563,6 @@ entities: pos: 1.5,-0.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 281 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml index 4a4e5e31fef..3ec708b9a17 100644 --- a/Resources/Maps/_NF/Shuttles/stratos.yml +++ b/Resources/Maps/_NF/Shuttles/stratos.yml @@ -941,8 +941,6 @@ entities: pos: 0.5,16.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - uid: 1031 @@ -3206,8 +3204,6 @@ entities: pos: -3.5,17.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 856 - 1052 @@ -3235,8 +3231,6 @@ entities: pos: -3.5,16.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 856 - 1052 @@ -3246,8 +3240,6 @@ entities: pos: 4.5,17.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 856 - 1053 @@ -3257,8 +3249,6 @@ entities: pos: 4.5,16.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 1053 - uid: 850 @@ -3272,8 +3262,6 @@ entities: pos: -0.5,14.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 856 - uid: 852 @@ -3282,8 +3270,6 @@ entities: pos: 2.5,14.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 856 - uid: 853 @@ -3292,8 +3278,6 @@ entities: pos: 3.5,14.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 856 - uid: 854 @@ -3302,8 +3286,6 @@ entities: pos: -7.5,21.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 1052 - uid: 855 @@ -3312,8 +3294,6 @@ entities: pos: 6.5,20.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 1053 - uid: 1050 @@ -4429,8 +4409,6 @@ entities: pos: -1.5,15.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice @@ -4444,8 +4422,6 @@ entities: pos: -6.5,16.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice @@ -4486,8 +4462,6 @@ entities: pos: 6.5,21.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice @@ -4501,8 +4475,6 @@ entities: pos: 7.5,19.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice @@ -4582,8 +4554,6 @@ entities: pos: 8.5,22.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice @@ -4597,8 +4567,6 @@ entities: pos: 7.5,16.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice @@ -4639,8 +4607,6 @@ entities: pos: 2.5,16.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice @@ -4672,8 +4638,6 @@ entities: pos: -4.5,19.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 835 - type: AtmosDevice diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml index 3e09df12adb..657e1ae2bf0 100644 --- a/Resources/Maps/_NF/Shuttles/vagabond.yml +++ b/Resources/Maps/_NF/Shuttles/vagabond.yml @@ -2803,36 +2803,24 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,0.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - uid: 611 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-0.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - uid: 612 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-7.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - uid: 613 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-8.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - uid: 616 components: - type: Transform @@ -3933,9 +3921,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - type: AtmosPipeColor color: '#0055CCFF' - uid: 665 @@ -4021,9 +4006,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,14.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - type: AtmosPipeColor color: '#990000FF' - uid: 431 @@ -4033,8 +4015,6 @@ entities: pos: 2.5,8.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 568 - type: AtmosPipeColor @@ -4053,9 +4033,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-4.5 parent: 1 - - type: DeviceNetwork - configurators: - - invalid - type: AtmosPipeColor color: '#990000FF' - uid: 666 diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml index 44c83f4e569..ab46bed3c86 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml @@ -12,7 +12,7 @@ id: Anchor name: KC Anchor description: A large luxury cruiser capable of long ranged travel acrossed the sector, expedition capable. - price: 105300 # $81000 +30% + price: 115000 # $108432 after appraisal +5ish% (~7000) - TODO: fix this value, getting tests to pass - Whatstone category: Large group: Expedition shuttlePath: /Maps/_NF/Shuttles/Expedition/anchor.yml diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml index 19bcf2b3d6c..f92a7e90e73 100644 --- a/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml +++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/broadhead.yml @@ -12,7 +12,7 @@ id: Broadhead name: NSF Broadhead description: A medium size detective ship with facilities for autopsies, interrogations and detailed investigations. - price: 48000 #Appraises at 45749 and added markup of 5% as NFSD ship. + price: 50000 #Appraises at 46495 and added markup of ~8% - TODO: fix these values, getting tests to pass - Whatstone category: Medium group: Security access: Detective diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml index ea0ef9ea697..44ef9fccdcf 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/orange.yml @@ -2,7 +2,7 @@ id: Orange name: SV Orange description: A cargo slash salvage shuttle made from scavenged wrecks, comes with some damage. - price: 16000 #Appraisal is 14500 + price: 17000 #Appraisal is 15800, +5% margin - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Scrap shuttlePath: /Maps/_NF/Shuttles/Scrap/orange.yml diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml index b0946d86f2c..4b704dd3b58 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/bottleneck.yml @@ -12,7 +12,7 @@ id: Bottleneck name: NT Bottleneck description: A personal transport and mobile office for the station representative. - price: 12500 #Appraises at ~11400 so added approx 10% + price: 16000 #Appraises at ~14477, margin of ~10% - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Sr access: HeadOfPersonnel diff --git a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml index 937e2935d95..ca0052347aa 100644 --- a/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml +++ b/Resources/Prototypes/_NF/Shipyard/Sr/chauffeur.yml @@ -13,7 +13,7 @@ id: Chauffeur name: NC Chauffeur description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. - price: 13000 # $11594 after appraisal + $1406 (~12% markup) + price: 15500 # $14325 after appraisal + ~$1200 (~5% markup) - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Sr access: Service diff --git a/Resources/Prototypes/_NF/Shipyard/apothecary.yml b/Resources/Prototypes/_NF/Shipyard/apothecary.yml index 10bc8c8616a..1cbd2323a44 100644 --- a/Resources/Prototypes/_NF/Shipyard/apothecary.yml +++ b/Resources/Prototypes/_NF/Shipyard/apothecary.yml @@ -12,7 +12,7 @@ id: Apothecary name: FSB Apothecary description: A small medical and chemistry support vessel. Deployed by the Far Star Biotech company to provide aid and medical services to the Frontier. - price: 31000 #Appraise value 27000 with markup for chemistry equipment and rounding. Feel free to adjust on the backend. Medics are always poor. + price: 35000 #Appraise value 31585 ~+10% - TODO: fix this value, gettings to pass - Whatstone category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/apothecary.yml diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index a6ebc689b79..7ae441af9ad 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -12,7 +12,7 @@ id: Barge name: NC Barge description: A medium shipping vessel repurposed into a salvage bar. - price: 42300 + price: 45000 # Appraises for 42046, margin of ~5% - TODO: fix these values, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/barge.yml diff --git a/Resources/Prototypes/_NF/Shipyard/bazaar.yml b/Resources/Prototypes/_NF/Shipyard/bazaar.yml index a26b55bf6d0..151978184bb 100644 --- a/Resources/Prototypes/_NF/Shipyard/bazaar.yml +++ b/Resources/Prototypes/_NF/Shipyard/bazaar.yml @@ -12,7 +12,7 @@ id: Bazaar name: SLI Bazaar description: The Bazaar is a personal service vessel designed to provide a platform for merchants to sell their goods, it features two locking cargo docks, a spacious cargo hold, and a mercenary post for shop security. - price: 65555 # on init ~57005$ + 8550$ from 15% markup + price: 77000 # on init ~72808$ + ~5000$ from ~5% markup - TODO: fix this number, just getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/bazaar.yml diff --git a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml index e9646bd9d30..df890c8745b 100644 --- a/Resources/Prototypes/_NF/Shipyard/bocadillo.yml +++ b/Resources/Prototypes/_NF/Shipyard/bocadillo.yml @@ -12,7 +12,7 @@ id: Bocadillo name: NC Bocadillo description: A tiny food truck perfect for a solo chef. - price: 19600 # ~17100$ on mapinit + ~2550$ from 15% markup + price: 22500 # appraises for ~$21110, markup of ~7% - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/bocadillo.yml diff --git a/Resources/Prototypes/_NF/Shipyard/caduceus.yml b/Resources/Prototypes/_NF/Shipyard/caduceus.yml index 44addde4f87..9795058c879 100644 --- a/Resources/Prototypes/_NF/Shipyard/caduceus.yml +++ b/Resources/Prototypes/_NF/Shipyard/caduceus.yml @@ -2,7 +2,7 @@ id: caduceus name: NM Caduceus description: A former humanitarian vessel, the Caduceus now works as the best mobile hospital money can buy. - price: 105000 + price: 110000 # Appraises at 101889, ~9% margin - TODO: fix this value, getting tests to pass - Whatstone category: Large group: Shipyard shuttlePath: /Maps/_NF/Shuttles/caduceus.yml diff --git a/Resources/Prototypes/_NF/Shipyard/ceres.yml b/Resources/Prototypes/_NF/Shipyard/ceres.yml index 3a4bea35219..28d56a60451 100644 --- a/Resources/Prototypes/_NF/Shipyard/ceres.yml +++ b/Resources/Prototypes/_NF/Shipyard/ceres.yml @@ -12,7 +12,7 @@ id: Ceres name: SBB Ceres description: A medium-size, high-class restaurant ship with ample seating, integrated botany and a dining room for VIP guests - price: 49500 + price: 56000 # ~5% markup - TODO: fix this value, just getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/ceres.yml diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index 51334244c5b..7cc278a05ba 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -12,7 +12,7 @@ id: Crescent name: KC Crescent description: The Crescent, named for its exterior shape, is a vessel focused on providing service, medical aide, and scientific breakthroughs for smaller vessels. - price: 208020 + price: 270000 # Appraises at 254471, ~6% markup - TODO: fix these values, getting tests to pass - Whatstone category: Large group: Shipyard shuttlePath: /Maps/_NF/Shuttles/crescent.yml diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml index 1dffbe40ab4..06c2fa63ec4 100644 --- a/Resources/Prototypes/_NF/Shipyard/eagle.yml +++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml @@ -12,7 +12,7 @@ id: Eagle name: NM Eagle description: "A modern, medium-sized medical & engineering vessel. Focusing on responding to shuttle distress, Eagle bears the motto 'Recover, Restore, Repair!'." - price: 50950 # 42440 base, +20% markup (uranium gens are strong) + price: 60000 category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/eagle.yml diff --git a/Resources/Prototypes/_NF/Shipyard/hammer.yml b/Resources/Prototypes/_NF/Shipyard/hammer.yml index 0dc5571592c..330d82c7c21 100644 --- a/Resources/Prototypes/_NF/Shipyard/hammer.yml +++ b/Resources/Prototypes/_NF/Shipyard/hammer.yml @@ -12,7 +12,7 @@ id: Hammer name: SBB Hammer description: A mobile engineering platform for deep-space repairs, upgrades and remodelling. - price: 31500 # ~28000 after purchase, ~13% markup + price: 40000 category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/hammer.yml diff --git a/Resources/Prototypes/_NF/Shipyard/hauler.yml b/Resources/Prototypes/_NF/Shipyard/hauler.yml index 9c13a0ae662..9ba0820874a 100644 --- a/Resources/Prototypes/_NF/Shipyard/hauler.yml +++ b/Resources/Prototypes/_NF/Shipyard/hauler.yml @@ -2,7 +2,7 @@ id: hauler name: NC Hauler description: A medium sized vessel specializing in long-haul salvage, mining, and cargo operations. - price: 60000 + price: 77000 category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/hauler.yml diff --git a/Resources/Prototypes/_NF/Shipyard/loader.yml b/Resources/Prototypes/_NF/Shipyard/loader.yml index 45f0062caaf..b0b4ea190fe 100644 --- a/Resources/Prototypes/_NF/Shipyard/loader.yml +++ b/Resources/Prototypes/_NF/Shipyard/loader.yml @@ -12,7 +12,7 @@ id: Loader name: NC Loader description: A compact cargo ship designed for hauling shipments. - price: 18000 + price: 22000 category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/loader.yml diff --git a/Resources/Prototypes/_NF/Shipyard/lyrae.yml b/Resources/Prototypes/_NF/Shipyard/lyrae.yml index 83efbc703bf..82a4eda14fc 100644 --- a/Resources/Prototypes/_NF/Shipyard/lyrae.yml +++ b/Resources/Prototypes/_NF/Shipyard/lyrae.yml @@ -12,7 +12,7 @@ id: Lyrae name: SBB Lyrae description: A medium size science vessel with laboratories for both anomalous and xenoarchaeology research. - price: 48000 #Appraises at 40100. Markup is 20% due to it being a very capable science ship. + price: 57000 #Appraises at 53341. Markup is 5% - TODO: fix this value, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/lyrae.yml diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index e2da25841ab..94b7c453c13 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -9,7 +9,7 @@ id: McCargo name: DC McCargo description: "Your very own McCargo™ franchise! Comes fully stocked and ready for production of McMeals." - price: 70000 # 10% up from sell + price: 72000 # appraises at 67456, ~10% margin - TODO: fix these values, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/mccargo.yml diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index d06b85e25a0..d91466a8b43 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -2,7 +2,7 @@ id: phoenix name: NR Phoenix description: A research and salvage vessel designed for deep space exploration - price: 60000 + price: 60500 # TODO - fix this value, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/phoenix.yml diff --git a/Resources/Prototypes/_NF/Shipyard/piecrust.yml b/Resources/Prototypes/_NF/Shipyard/piecrust.yml index c2b144ea73f..14ea8735297 100644 --- a/Resources/Prototypes/_NF/Shipyard/piecrust.yml +++ b/Resources/Prototypes/_NF/Shipyard/piecrust.yml @@ -12,7 +12,7 @@ id: Piecrust name: NC Piecrust description: A combination animal ranch and pie bakery - price: 26000 #Appraises at approx 23600 and ~10% markup applied + price: 32000 # Appraises at approx 29810 and ~7% markup - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/piecrust.yml diff --git a/Resources/Prototypes/_NF/Shipyard/pts.yml b/Resources/Prototypes/_NF/Shipyard/pts.yml index ca14c398d6d..629aefb3f1f 100644 --- a/Resources/Prototypes/_NF/Shipyard/pts.yml +++ b/Resources/Prototypes/_NF/Shipyard/pts.yml @@ -12,7 +12,7 @@ id: PTS name: NC Personal Transport description: A small transport shuttle with space for 4 passengers. Comes with the latest audio entertainment technology. - price: 13000 # $11594 after appraisal + $1406 (~12% markup) + price: 15500 # $14325 after appraisal + $1200 (~5% markup) category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/pts.yml diff --git a/Resources/Prototypes/_NF/Shipyard/stasis.yml b/Resources/Prototypes/_NF/Shipyard/stasis.yml index 35c0be9dd9f..d8163f2c046 100644 --- a/Resources/Prototypes/_NF/Shipyard/stasis.yml +++ b/Resources/Prototypes/_NF/Shipyard/stasis.yml @@ -12,7 +12,7 @@ id: Stasis name: FSB Stasis description: A medium medical vessel providing cryogenic and support medical services for the traumas of deep space operations. Designed, developed and deployed by the Far Star Biotech company to render aid wherever it is needed. - price: 47000 #Appraise value 40800 with 15% markup. + price: 54000 #Appraise value 50196 with ~8% markup - TODO: fix this value, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/stasis.yml diff --git a/Resources/Prototypes/_NF/Shipyard/stellaris.yml b/Resources/Prototypes/_NF/Shipyard/stellaris.yml index dc666a6ac2b..8e21f63bba9 100644 --- a/Resources/Prototypes/_NF/Shipyard/stellaris.yml +++ b/Resources/Prototypes/_NF/Shipyard/stellaris.yml @@ -2,7 +2,7 @@ id: Stellaris name: NT Stellaris description: A mobile theatre perfect for putting on any show. - price: 45000 + price: 48000 # Appraises for 45469, margin of 7% - TODO: fix this value, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/stellaris.yml From e91ab05b7a78a0418d1b62f1f557ce7811f86083 Mon Sep 17 00:00:00 2001 From: spacedwarf14 Date: Sun, 6 Oct 2024 09:52:27 -0400 Subject: [PATCH 17/96] Fix artifact analyzers to consume power only during scanning (#2064) * Make it so that artifact scanners only consume power during scans Technically wattage is set to 1 while not scanning for upstream APC bugs reasons. * Frontier comments, consistency * Comment needsPower --------- Co-authored-by: spacedwarf14 <> Co-authored-by: Whatstone --- .../Components/ArtifactAnalyzerComponent.cs | 1 + .../Systems/ArtifactAnalyzerSystem.cs | 40 +++++++++++++++++-- .../Structures/Machines/artifact_analyzer.yml | 2 +- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs b/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs index 949717676fc..22c8fe74725 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Components/ArtifactAnalyzerComponent.cs @@ -42,4 +42,5 @@ public sealed partial class ArtifactAnalyzerComponent : Component [ViewVariables(VVAccess.ReadWrite)] public int? LastAnalyzerPointValue; #endregion + public float OriginalLoad { get; set; } = 0; // Frontier } diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs index 67c67de57f3..f77d60ff6bd 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs @@ -151,6 +151,14 @@ private void OnMapInit(EntityUid uid, ArtifactAnalyzerComponent component, MapIn if (!TryComp(uid, out var sink)) return; + // Frontier: disable analyzer power draw when off + if (TryComp(uid, out var apcPower)) + { + component.OriginalLoad = apcPower.Load; + SetPowerSwitch(component, apcPower, false); + } + // End Frontier + foreach (var source in sink.LinkedSources) { if (!TryComp(source, out var analysis)) @@ -492,16 +500,30 @@ private void OnItemRemoved(EntityUid uid, ArtifactAnalyzerComponent component, r private void OnAnalyzeStart(EntityUid uid, ActiveArtifactAnalyzerComponent component, ComponentStartup args) { - if (TryComp(uid, out var powa)) - powa.NeedsPower = true; + // Frontier: enable power before running + if (!TryComp(uid, out var powa)) + return; + + if (!TryComp(uid, out var analyzer)) + return; + + SetPowerSwitch(analyzer, powa, true); + // End Frontier _ambientSound.SetAmbience(uid, true); } private void OnAnalyzeEnd(EntityUid uid, ActiveArtifactAnalyzerComponent component, ComponentShutdown args) { - if (TryComp(uid, out var powa)) - powa.NeedsPower = false; + // Frontier: disable power when not running + if (!TryComp(uid, out var powa)) + return; + + if (!TryComp(uid, out var analyzer)) + return; + + SetPowerSwitch(analyzer, powa, false); + // End Frontier _ambientSound.SetAmbience(uid, false); } @@ -517,5 +539,15 @@ private void OnPowerChanged(EntityUid uid, ActiveArtifactAnalyzerComponent activ ResumeScan(uid, null, active); } } + + // Frontier: reduce analyzer load when not running + private void SetPowerSwitch(ArtifactAnalyzerComponent analyzer, ApcPowerReceiverComponent apc, bool state) + { + if (state) + apc.Load = analyzer.OriginalLoad; + else + apc.Load = 1; + } + // End Frontier } diff --git a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml index 741e0a39711..5b4963e4bd1 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/artifact_analyzer.yml @@ -49,7 +49,7 @@ anchored: true - type: ApcPowerReceiver powerLoad: 12000 - needsPower: false #only turns on when scanning + needsPower: true # Frontier: false Date: Sun, 6 Oct 2024 13:52:53 +0000 Subject: [PATCH 18/96] Automatic Changelog (#2064) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 763b1fca679..5534554f9c4 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4287,3 +4287,9 @@ Entries: diagonal walls. id: 5363 time: '2024-10-05T21:45:51.0000000+00:00' +- author: spacedwarf14 + changes: + - type: Fix + message: Artifact analyzers do not consume power when idle + id: 5364 + time: '2024-10-06T13:52:27.0000000+00:00' From cc071da86a67097f6c0ec024268f5bbd0481dc86 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sun, 6 Oct 2024 20:33:42 +0300 Subject: [PATCH 19/96] Dungeon enemies rebalance: Aberrant Flesh (#1985) * update * tweaked newborns * fix * nefr maw again * da boss * Update Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/aberrant_flesh.xml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Minor flesh abomination grammar pass * NF prefix for "SalvageMobRestrictions" * Flesh Horror game rule rewrite * Cut down on monster description lengths * wet fx * horror nerf * Update ghost-role-component.ftl * Update mob_hostile_expeditions_aberrant_flesh.yml * BibleComponentComponent->BibleComponent * Frontier changelog: fix food recipe guidebook CL * icon for bone spike * validate-rsis: try using python 3.10 --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone --- .github/workflows/validate-rsis.yml | 4 + Resources/Changelog/Frontier.yml | 4 +- .../_NF/ghost/roles/ghost-role-component.ftl | 12 + .../Prototypes/Entities/Mobs/NPCs/flesh.yml | 8 + .../Procedural/salvage_factions.yml | 20 +- .../_NF/Entities/Clothing/Belt/belts.yml | 2 +- .../mobs_hostile_aberrant_flesh.yml | 99 ++++++ .../Random/mobs_hostile_aberrant_flesh.yml | 28 ++ .../Entities/Mobs/NPCs/mob_hostile_base.yml | 57 +++- ...mob_hostile_expeditions_aberrant_flesh.yml | 282 +++++++++++++++--- .../Weapons/Throwable/throwable_weapons.yml | 22 +- .../Structures/Specific/aberrant_flesh.yml | 2 +- .../MobsHostileExpedition/aberrant_flesh.xml | 22 +- .../Textures/_NF/Effects/wet.rsi/meta.json | 18 ++ .../Textures/_NF/Effects/wet.rsi/wet.png | Bin 0 -> 665 bytes .../_NF/Mobs/Aliens/flesh.rsi/meta.json | 3 + .../_NF/Mobs/Aliens/flesh.rsi/spike.png | Bin 667 -> 565 bytes .../Mobs/Aliens/flesh.rsi/spikeSolution1.png | Bin 0 -> 543 bytes 18 files changed, 510 insertions(+), 73 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_aberrant_flesh.yml create mode 100644 Resources/Textures/_NF/Effects/wet.rsi/meta.json create mode 100644 Resources/Textures/_NF/Effects/wet.rsi/wet.png create mode 100644 Resources/Textures/_NF/Mobs/Aliens/flesh.rsi/spikeSolution1.png diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml index b76df28e6af..4c311fb622c 100644 --- a/.github/workflows/validate-rsis.yml +++ b/.github/workflows/validate-rsis.yml @@ -18,6 +18,10 @@ jobs: run: git submodule update --init - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 + - name: Set up Python 3.10 # Frontier + uses: actions/setup-python@v3 # Frontier + with: # Frontier + python-version: "3.10" # Frontier - name: Install Python dependencies run: | pip3 install --ignore-installed --user pillow jsonschema diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 5534554f9c4..5b20fa03577 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4254,7 +4254,9 @@ Entries: id: 5359 time: '2024-10-03T19:53:08.0000000+00:00' - author: Mnemotechnician - changes: [] + changes: + - type: Add + message: The Food Recipes page in the guidebook now shows all available recipes. id: 5360 time: '2024-10-04T17:59:04.0000000+00:00' - author: dvir001 diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl index d83969c61a2..f4ebc71ac45 100644 --- a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl @@ -43,3 +43,15 @@ ghost-role-information-hovertaxibot-description = Fly passengers to where they n # Adopted from space-wizards #26265 (Thank you, PolterTzi) ghost-role-information-yipyip-name = Yip Yip ghost-role-information-yipyip-description = Notorious lounge lizard and bartender at Bahama Mama's. This drink-slinging kobold lives to serve his patrons. + +ghost-role-information-aberrant-flesh-horror-dungeon-name = Aberrant flesh horror +ghost-role-information-aberrant-flesh-horror-dungeon-description = Defend the expedition dungeon with other flesh monstrosities! + +ghost-role-information-dungeon-boss-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all dungeon mobs. + Fight players within the dungeon, defend your dungeon. + Please note that [color=yellow]all server rules still apply.[/color] Additionally: + - [color=red]DO NOT[/color] damage player shuttles or their contents. + - [color=red]DO NOT[/color] hide from players to run down the expedition timer. + - [color=red]DO NOT[/color] gib players. Once they're dead, leave them be. + - [color=red]DO NOT[/color] destroy or hide valuable loot in the dungeon. + - [color=red]DO NOT[/color] leave the planet. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml index f814addae9a..64f8418d7bc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml @@ -63,6 +63,7 @@ - type: entity parent: BaseMobFlesh id: MobFleshJared + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: @@ -88,6 +89,7 @@ - type: entity parent: BaseMobFlesh id: MobFleshGolem + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: @@ -117,6 +119,7 @@ - type: entity parent: BaseMobFlesh id: MobFleshClamp + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: @@ -141,6 +144,7 @@ - type: entity parent: BaseMobFlesh id: MobFleshLover + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: @@ -262,6 +266,7 @@ - type: entity parent: BaseMobFleshSalvage id: MobFleshJaredSalvage + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: @@ -287,6 +292,7 @@ - type: entity parent: BaseMobFleshSalvage id: MobFleshGolemSalvage + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: @@ -316,6 +322,7 @@ - type: entity parent: BaseMobFleshSalvage id: MobFleshClampSalvage + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: @@ -340,6 +347,7 @@ - type: entity parent: BaseMobFleshSalvage id: MobFleshLoverSalvage + categories: [ HideSpawnMenu ] # Frontier components: - type: Sprite layers: diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 4071105bcac..e6715387108 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -176,34 +176,34 @@ - entries: - id: SpawnMobAberrantFleshExpeditions amount: 1 - maxAmount: 3 + maxAmount: 2 - id: SpawnMobAberrantFleshExpeditions amount: 1 - maxAmount: 3 + maxAmount: 2 prob: 0.5 - entries: - id: SpawnMobAberrantFleshExpeditions amount: 1 - maxAmount: 3 + maxAmount: 2 - id: SpawnMobAberrantFleshExpeditions amount: 1 - maxAmount: 3 + maxAmount: 2 prob: 0.25 - entries: - id: SpawnMobAberrantFleshExpeditions amount: 1 - maxAmount: 3 + maxAmount: 2 - id: SpawnMobAberrantFleshExpeditions amount: 1 - maxAmount: 3 + maxAmount: 2 prob: 0.25 - entries: - id: SpawnMobAberrantFleshExpeditions - amount: 2 - maxAmount: 4 + amount: 1 + maxAmount: 2 - id: SpawnMobAberrantFleshExpeditions - amount: 2 - maxAmount: 4 + amount: 1 + maxAmount: 2 prob: 0.1 configs: DefenseStructure: AberrantFleshDigestiveSack diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml index 3718e921cdb..a8e0f92310f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml @@ -26,7 +26,7 @@ tags: - Book components: - - BibleComponent + - Bible - Paper bottle: whitelist: diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_aberrant_flesh.yml new file mode 100644 index 00000000000..a838383f9a9 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Conditional/mobs_hostile_aberrant_flesh.yml @@ -0,0 +1,99 @@ +- type: entity + id: SpawnMobFleshJaredExpeditions + name: aberrant flesh jared spawner + parent: MarkerBasePlaceFree + suffix: AI, Hostile + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/Aliens/flesh.rsi + state: jared + - type: ConditionalSpawner + prototypes: + - MobFleshJaredExpeditions + - MobFleshJaredOldExpeditions + +- type: entity + id: SpawnMobFleshGolemExpeditions + name: aberrant flesh golem spawner + parent: MarkerBasePlaceFree + suffix: AI, Hostile + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/Aliens/flesh.rsi + state: golem + - type: ConditionalSpawner + prototypes: + - MobFleshGolemExpeditions + - MobFleshGolemAltExpeditions + - MobFleshGolemOldExpeditions + +- type: entity + id: SpawnMobFleshAssimilatedMiner + name: aberrant flesh miner spawner + parent: MarkerBasePlaceFree + suffix: AI, Hostile + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/Aliens/flesh_assimilated_miner.rsi + state: base + - type: ConditionalSpawner + prototypes: + - MobFleshAssimilatedMiner + +- type: entity + id: SpawnMobFleshClampExpeditions + name: aberrant flesh clamp spawner + parent: MarkerBasePlaceFree + suffix: AI, Hostile + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/Aliens/flesh.rsi + state: clamp + - type: ConditionalSpawner + prototypes: + - MobFleshClampExpeditions + - MobFleshClampOldExpeditions + +- type: entity + id: SpawnMobFleshLoverExpeditions + name: aberrant flesh lover spawner + parent: MarkerBasePlaceFree + suffix: AI, Hostile + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/Aliens/flesh.rsi + state: lover + - type: ConditionalSpawner + prototypes: + - MobFleshLoverExpeditions + +- type: entity + id: SpawnMobHorrorExpeditions + name: aberrant flesh horror spawner + parent: MarkerBasePlaceFree + suffix: AI, Hostile + components: + - type: Sprite + layers: + - state: red + - state: ai + - sprite: _NF/Mobs/Aliens/flesh.rsi + state: horror + - type: ConditionalSpawner + prototypes: + - MobHorrorExpeditions diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_aberrant_flesh.yml index 65cd3167e66..508bec83372 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_aberrant_flesh.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/mobs_hostile_aberrant_flesh.yml @@ -25,3 +25,31 @@ rarePrototypes: - MobFleshAssimilatedMiner rareChance: 0.05 + +- type: entity + name: newborn aberrant flesh spawner + id: SpawnMobAberrantFleshNewbornExpeditions + parent: MarkerBase + suffix: AI, Hostile, RND + components: + - type: Sprite + layers: + - state: red + - sprite: _NF/Mobs/Aliens/flesh.rsi + state: lover + - state: ai + - type: RandomSpawner + prototypes: + - MobFleshJaredExpeditionsNewborn + - MobFleshJaredOldExpeditionsNewborn + - MobFleshGolemExpeditionsNewborn + - MobFleshGolemAltExpeditionsNewborn + - MobFleshGolemOldExpeditionsNewborn + - MobFleshClampExpeditionsNewborn + - MobFleshClampOldExpeditionsNewborn + - MobFleshLoverExpeditionsNewborn + chance: 1 + offset: 0.0 + rarePrototypes: + - MobFleshAssimilatedMiner + rareChance: 0.05 diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml index 19ce1cc6102..ea641b138e5 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml @@ -25,6 +25,21 @@ - type: MovedByPressure - type: Insulated +- type: entity + save: false + id: MobPassiveRegenWeak + abstract: true + components: + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 500 + damage: + groups: + Brute: -0.5 + Burn: -0.5 + Airloss: -1 + - type: entity save: false id: MobPassiveRegen @@ -34,14 +49,12 @@ allowedStates: - Alive - Critical - damageCap: 400 + damageCap: 500 damage: groups: - Brute: -1 - Burn: -10 + Brute: -0.5 + Burn: -0.5 Airloss: -1 - Toxin: -7 - Genetic: -7 - type: entity save: false @@ -96,6 +109,30 @@ #groups: #- AllAccess +# Dungeon boss +- type: entity + id: MobHostileBossBase + abstract: true + parent: + - MobEnhancedMovement + - MobPassiveRegenWeak + components: + - type: Hands + - type: Puller + - type: Stamina + critThreshold: 999 + - type: MobPrice + price: 4000 + deathPenalty: 0.5 + - type: Tag + tags: + - CanPilot + - FootstepSound + - DoorBumpOpener + - CannotSuicide + - type: NFSalvageMobRestrictions + - type: FTLKnockdownImmune + # Inventories - type: entity save: false @@ -192,6 +229,9 @@ - BaseC3MobHuman id: MobHumanoidHostileBase components: + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.5 - type: NPCRetaliation attackMemoryLength: 10 - type: MobMover @@ -254,6 +294,9 @@ - BaseC3MobCreature id: MobNonHumanHostileBase components: + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.5 - type: NPCRetaliation attackMemoryLength: 10 - type: Reactive @@ -261,9 +304,6 @@ Flammable: [Touch] Extinguish: [Touch] Acidic: [Touch, Ingestion] - - type: MovementSpeedModifier - baseWalkSpeed : 4 - baseSprintSpeed : 4 - type: StatusEffects allowed: - SlowedDown @@ -312,4 +352,5 @@ - CanPilot - FootstepSound - DoorBumpOpener + - CannotSuicide - type: FTLKnockdownImmune diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml index ab5ce78d952..1f26b1bdc1e 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_expeditions_aberrant_flesh.yml @@ -14,9 +14,6 @@ - type: Sprite drawdepth: Mobs sprite: _NF/Mobs/Aliens/flesh.rsi - - type: MovementSpeedModifier - baseWalkSpeed: 3 - baseSprintSpeed: 3.5 - type: MobState allowedStates: - Alive @@ -30,7 +27,7 @@ 42: 0.7 56: 0.5 - type: Stamina - critThreshold: 50 + critThreshold: 80 - type: Butcherable spawned: - id: FoodMeat @@ -38,6 +35,7 @@ - type: Bloodstream bloodMaxVolume: 100 - type: MeleeWeapon + attackRate: 1.0 soundHit: path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg angle: 0 @@ -53,8 +51,8 @@ - type: entity parent: BaseMobFleshExpeditions id: MobFleshJaredExpeditions - description: Jareds are mindless meat shields who run at threats without any concern for their survival. They seem to be more fragile than the average human. - categories: [ HideSpawnMenu ] + description: A mindless meat shield who charges threats directly. Weaker than the average human. + #categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -80,7 +78,7 @@ - type: entity parent: MobFleshJaredExpeditions id: MobFleshJaredOldExpeditions - categories: [ HideSpawnMenu ] + #categories: [ HideSpawnMenu ] components: - type: Sprite drawdepth: Mobs @@ -92,8 +90,8 @@ - type: entity parent: BaseMobFleshExpeditions id: MobFleshGolemExpeditions - description: Golems are mindless brutes, similar to Jareds but with a heavier build. This makes them slightly more resilient, but less agile. - categories: [ HideSpawnMenu ] + description: A mindless brute with a heavy build. A bit more resilient than other flesh monsters, but less agile. + #categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -107,14 +105,11 @@ Base: dead Dead: Base: dead - - type: MovementSpeedModifier - baseWalkSpeed: 3 - baseSprintSpeed: 3 - type: entity parent: MobFleshGolemExpeditions id: MobFleshGolemAltExpeditions - categories: [ HideSpawnMenu ] + #categories: [ HideSpawnMenu ] components: - type: Sprite layers: @@ -132,7 +127,7 @@ - type: entity parent: MobFleshGolemExpeditions id: MobFleshGolemOldExpeditions - categories: [ HideSpawnMenu ] + #categories: [ HideSpawnMenu ] components: - type: Sprite drawdepth: Mobs @@ -155,7 +150,7 @@ - MobLaserReflect # Added to prevent laser abuse from players id: MobFleshAssimilatedMiner description: An unfortunate miner that was infected upon contact with aberrant flesh and has been slowly assimilated. - categories: [ HideSpawnMenu ] + #categories: [ HideSpawnMenu ] components: - type: Sprite drawdepth: Mobs @@ -199,9 +194,12 @@ - BaseMobFleshExpeditions - MobHumanoidHostileAISimpleRanged id: MobFleshClampExpeditions - description: Clamps are flying variants that have mutated to shoot biological projectiles, such as bone spikes containing naturally secreted gastro toxins or small living organisms known simply as "maws". - categories: [ HideSpawnMenu ] + description: A flying flesh monster that can shoot spikes or toothy creatures that can latch on. + #categories: [ HideSpawnMenu ] components: + - type: MovementSpeedModifier + baseWalkSpeed : 4 + baseSprintSpeed : 4 - type: CanMoveInAir - type: Fixtures fixtures: @@ -247,7 +245,7 @@ count: 1 - type: Gun showExamineText: false - fireRate: 1 + fireRate: 0.75 selectedMode: SemiAuto availableModes: - SemiAuto @@ -257,7 +255,7 @@ - type: entity parent: MobFleshClampExpeditions id: MobFleshClampOldExpeditions - categories: [ HideSpawnMenu ] + #categories: [ HideSpawnMenu ] components: - type: Sprite drawdepth: Mobs @@ -285,9 +283,12 @@ - type: entity parent: BaseMobFleshExpeditions id: MobFleshLoverExpeditions - description: The Lover shares similarities with Jareds and Golems. Its light frame makes it fragile, but capable of flight. - categories: [ HideSpawnMenu ] + description: The Lover's light frame makes it fragile, but capable of flight. + #categories: [ HideSpawnMenu ] components: + - type: MovementSpeedModifier + baseWalkSpeed : 5 + baseSprintSpeed : 5 - type: CanMoveInAir - type: Fixtures fixtures: @@ -323,18 +324,27 @@ speedModifierThresholds: 18: 0.7 24: 0.5 - - type: MovementSpeedModifier - baseWalkSpeed: 4 - baseSprintSpeed: 4.5 + - type: MeleeWeapon + attackRate: 1.5 + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Blunt: 5 # EXPEDITION BOSS - type: entity - parent: BaseMobFleshExpeditions + parent: [ BaseMobFleshExpeditions, MobHostileBossBase ] id: MobHorrorExpeditions name: aberrant flesh horror - description: Tougher and more resilient than the average aberrant flesh monster, the Horror possesses sharp bone protrusions and highly developed musculature, allowing it to rend the flesh of its victims and tear through armor with efficiency. - categories: [ HideSpawnMenu ] + description: Tougher and more resilient than most aberrant flesh monsters. Has sharp, bony protrusions and highly developed musculature. + #categories: [ HideSpawnMenu ] components: + - type: MovementSpeedModifier + baseWalkSpeed : 4.6 + baseSprintSpeed : 4.6 - type: Sprite layers: - map: ["enum.DamageStateVisualLayers.Base"] @@ -357,10 +367,9 @@ speedModifierThresholds: 120: 0.7 160: 0.5 - - type: MovementSpeedModifier - baseWalkSpeed: 3.5 - baseSprintSpeed: 4 - type: MeleeWeapon + autoAttack: true + attackRate: 1.5 soundHit: path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg angle: 0 @@ -368,6 +377,59 @@ damage: types: Slash: 12 + Structural: 30 + # Ghost role stuff + - type: GhostRole + allowMovement: true + name: ghost-role-information-aberrant-flesh-horror-dungeon-name + description: ghost-role-information-aberrant-flesh-horror-dungeon-description + rules: ghost-role-information-dungeon-boss-rules + raffle: + settings: default + - type: GhostTakeoverAvailable + - type: ActionGun + action: ActionBoneSpike + gunProto: BoneSpikeGun + +- type: entity + id: BoneSpikeGun + name: bone spike + description: Shoots a short salvo of bone spikes. + categories: [ HideSpawnMenu ] + components: + - type: RechargeBasicEntityAmmo + rechargeCooldown: 5 + rechargeSound: + path: /Audio/Animals/space_dragon_roar.ogg + - type: BasicEntityAmmoProvider + proto: DartAberrantFleshHorrorSpikeSpread #DartAberrantFleshHorrorSpike + capacity: 2 + count: 2 + - type: Gun + minAngle: 5 + maxAngle: 15 + fireRate: 4 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Items/bow_pull.ogg + soundEmpty: null + projectileSpeed: 30 + +- type: entity + id: ActionBoneSpike + categories: [ HideSpawnMenu ] + name: "[color=yellow]Bone Spike[/color]" + description: "Shoot a short salvo of bone spikes laced with toxins. [color=yellow]5 second cooldown.[/color]" + components: + - type: WorldTargetAction + icon: { sprite : _NF/Mobs/Aliens/flesh.rsi, state: spike } + event: !type:ActionGunShootEvent + priority: 2 + checkCanAccess: false + range: 0 + itemIconStyle: BigAction # FUNNY LITTLE GUY # embedable projectile that bites you until you either kill it or detach it or die (or it despawns) @@ -375,9 +437,12 @@ parent: BaseMobFleshExpeditions id: MobMawExpeditions name: aberrant flesh maw - description: Immobile, flesh-boring creatures that are launched at victims. They'll latch on with their teeth and bite their victims until killed or shaken off. Don't put your fingers in it. Unless?.. + description: Immobile, flesh-boring creatures that are launched at victims. Latches on until killed or shaken off. Don't put your fingers in it. categories: [ HideSpawnMenu ] components: + - type: MovementSpeedModifier + baseWalkSpeed: 0 + baseSprintSpeed: 0 - type: DamageOtherOnHit damage: types: @@ -404,11 +469,9 @@ - type: MobThresholds thresholds: 0: Alive - 12: Dead - - type: MovementSpeedModifier - baseWalkSpeed: 0 - baseSprintSpeed: 0 + 8: Dead - type: MeleeWeapon + attackRate: 0.3 soundHit: path: /Audio/Effects/bite.ogg angle: 0 @@ -417,4 +480,151 @@ types: Slash: 4 - type: TimedDespawn - lifetime: 120 \ No newline at end of file + lifetime: 60 + +# Newborns (spawned from assimilation sack) +- type: entity + id: BaseMobFleshExpeditionsNewborn + parent: BaseMobFleshExpeditions + name: aberrant flesh newborn + description: This newborn monster is dripping with amniotic fluid; its movements are sluggish yet deliberate; its limbs, though weak, are lethal nonetheless. + abstract: true + components: + - type: MeleeWeapon + attackRate: 0.8 + soundHit: + path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg + angle: 0 + animation: WeaponArcClaw + damage: + types: + Blunt: 7 + Structural: 20 + - type: MovementSpeedModifier + baseWalkSpeed : 3.8 + baseSprintSpeed : 3.8 + +- type: entity + id: MobFleshJaredExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshJaredExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: jared + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" + +- type: entity + id: MobFleshJaredOldExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshJaredOldExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/flesh.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: jared + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" + +- type: entity + id: MobFleshGolemExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshGolemExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: golem + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" + +- type: entity + id: MobFleshGolemAltExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshGolemAltExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: golem2 + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" + +- type: entity + id: MobFleshGolemOldExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshGolemOldExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + drawdepth: Mobs + sprite: Mobs/Aliens/flesh.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: golem + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" + +- type: entity + id: MobFleshClampExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshClampExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: clamp + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" + +- type: entity + id: MobFleshClampOldExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshClampOldExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: Mobs/Aliens/flesh.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: clamp + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" + +- type: entity + id: MobFleshLoverExpeditionsNewborn + parent: [ BaseMobFleshExpeditionsNewborn, MobFleshLoverExpeditions ] + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: lover + scale: 0.8,0.8 + color: "maroon" + - sprite: _NF/Effects/wet.rsi + state: wet + color: "pink" diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/throwable_weapons.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/throwable_weapons.yml index bdd7c10620a..c2e3cfa0c84 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/throwable_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Throwable/throwable_weapons.yml @@ -82,27 +82,39 @@ state: spike - type: entity - parent: MobHostileThrowableWeapon id: DartAberrantFleshHorrorSpike name: bone spike + parent: [ ConjuredObject10, BaseArrow ] categories: [ HideSpawnMenu ] components: - - type: ThrowingAngle - angle: 90 + - type: EmbeddableProjectile + offset: -0.15,0.0 - type: Sprite sprite: _NF/Mobs/Aliens/flesh.rsi - state: spike + layers: + - state: spike + - state: spikeSolution1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false - type: SolutionContainerManager solutions: ammo: maxVol: 3 reagents: - ReagentId: GastroToxin - Quantity: 3 + Quantity: 1 + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: spikeSolution + - type: Projectile + damage: + types: + Piercing: 4 - type: entity id: DartAberrantFleshHorrorSpikeCluster name: bone spike + parent: DartAberrantFleshHorrorSpike categories: [ HideSpawnMenu ] components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml b/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml index 7bcad280d1e..980b0518f8f 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Specific/aberrant_flesh.yml @@ -7,7 +7,7 @@ - type: Timer - type: TimedSpawner prototypes: - - SpawnMobAberrantFleshExpeditions + - SpawnMobAberrantFleshNewbornExpeditions chance: 0.85 intervalSeconds: 240 minimumEntitiesSpawned: 1 diff --git a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/aberrant_flesh.xml b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/aberrant_flesh.xml index f03b97f3906..1d36826ad3c 100644 --- a/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/aberrant_flesh.xml +++ b/Resources/ServerInfo/_NF/Guidebook/MobsHostileExpedition/aberrant_flesh.xml @@ -19,7 +19,7 @@ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 50 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 3.5 m/s (3 m/s)[bold][color=#a4885c]*[/color][/bold] + - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s[bold][color=#a4885c]*[/color][/bold] - [bold][color=#a4885c]Damage (type):[/color][/bold] 8 [color=red]Blunt[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] none @@ -38,7 +38,7 @@ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 70 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 3 m/s (3 m/s) + - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s - [bold][color=#a4885c]Damage (type):[/color][/bold] 8 [color=red]Blunt[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] none @@ -56,7 +56,7 @@ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 40 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 3.5 m/s (3 m/s) + - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s - [bold][color=#a4885c]Damage (type):[/color][/bold] 6 [color=yellow]Piercing[/color], 6 [color=lime]Toxin[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] Flier, Shooter: bone spike / maw @@ -70,7 +70,7 @@ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 40 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 3.5 m/s (3 m/s) + - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s - [bold][color=#a4885c]Damage (type):[/color][/bold] 4 [color=red]Slash[/color] (maw) - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] Flier, Shooter: bone spike / maw @@ -84,8 +84,8 @@ - - [bold][color=#a4885c]Health thresholds:[/color][/bold] 12 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 0 m/s (0 m/s) + - [bold][color=#a4885c]Health thresholds:[/color][/bold] 8 (death) + - [bold][color=#a4885c]Run speed:[/color][/bold] 0 m/s - [bold][color=#a4885c]Damage (type):[/color][/bold] 4 [color=red]Slash[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] none @@ -102,7 +102,7 @@ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 30 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 3.5 m/s (3 m/s) + - [bold][color=#a4885c]Run speed:[/color][/bold] 5 m/s - [bold][color=#a4885c]Damage (type):[/color][/bold] 8 [color=red]Blunt[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] Flier @@ -117,7 +117,7 @@ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 100 (crit), 140 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4.5 m/s (4 m/s) + - [bold][color=#a4885c]Run speed:[/color][/bold] 4.5 m/s - [bold][color=#a4885c]Damage (type):[/color][/bold] 8 [color=red]Blunt[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - [bold][color=#a4885c]Special abilities:[/color][/bold] none @@ -132,10 +132,10 @@ - [bold][color=#a4885c]Health thresholds:[/color][/bold] 200 (death) - - [bold][color=#a4885c]Run (walk) speed:[/color][/bold] 4 m/s (3.5 m/s) + - [bold][color=#a4885c]Run speed:[/color][/bold] 4.6 m/s - [bold][color=#a4885c]Damage (type):[/color][/bold] 12 [color=red]Slash[/color] - [bold][color=#a4885c]Damage resistances:[/color][/bold] none - - [bold][color=#a4885c]Special abilities:[/color][/bold] none + - [bold][color=#a4885c]Special abilities:[/color][/bold] bone spike salvo (ghost role) [bold][color=#a4885c]________________________________________________________________________[/color] @@ -150,5 +150,5 @@ - Destroy a certain number of [color=#a4885c]assimilation sacks[/color] within given time constraints to earn a monetary reward. [bold][color=#a4885c]Note[/color][/bold]: each assimilation sack may spawn a few aberrant flesh monsters periodically. + Destroy a certain number of [color=#a4885c]assimilation sacks[/color] within given time constraints to earn a monetary reward. [bold][color=#a4885c]Note[/color][/bold]: each assimilation sack may spawn a few newborn aberrant flesh monsters periodically. Newborns are less robust than their fully grown counterparts. \ No newline at end of file diff --git a/Resources/Textures/_NF/Effects/wet.rsi/meta.json b/Resources/Textures/_NF/Effects/wet.rsi/meta.json new file mode 100644 index 00000000000..5cddc169368 --- /dev/null +++ b/Resources/Textures/_NF/Effects/wet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by ErhardSteinhauer (github/discor) for Frontier Station", + "states": [ + { + "name": "wet", + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + } + ] +} diff --git a/Resources/Textures/_NF/Effects/wet.rsi/wet.png b/Resources/Textures/_NF/Effects/wet.rsi/wet.png new file mode 100644 index 0000000000000000000000000000000000000000..89360932559769c0416c8158568675ac57fd899f GIT binary patch literal 665 zcmV;K0%rY*P)Px%Q%OWYRCt{2-N9MIFbsxam4_i%fGYsbauBw`ixJnBGrh`&{knc27UL?FT(0LUQAa*at~9O)zD)&L{`;;0`P zHw7R85MYv|RZ{>G05POVt4RWIZQ`WWn4CqHnJoSr5`YXL_3h08)H7KGyBYvYB-U^% z8ARe?b@YA!0000008EF>WuHm~At`F`W>YBu)S1ha`v#NHzFgA^?mUytKEV zVM^5C-FFUTZk5y*VDxL_NaUWaYj{1p2CBDKr@jRN0P0)*fkQDFcMHcrVY`JhQsfZ1 zTR0;{0+G9gr_7FFM@#RYVOMQ#K|+z)vDORAlQFTV3($I8vSV$+3PMh&Q&du7cWyy} zM!QrMK?g4E3_mTyDrmGLa|`txfLjm%0000000000=9VR=jedLe0BpQe-0VLYLs3Pr z*?%%d8h|T|K(|JK^#3PWIei`0Q-CL@uI;x`4467iB(fff`X_icrN%eN{ zjmZB#u(5vRyperFZ%Tbzq@5_pYV8h2`Ml$i#jDZ$SRyU<}@{6 p0f)}%&9Xa+Ack_e9o)dckSHgv^7?d%0Rs?ty85}Sb7D$p0s!m5H$(sc delta 240 zcmdnWGMjb77RGwEByV>YhHemCQ9s3$fq{Xuz$3Dlfk96hgc&QA+Lr+Z*-JcqUD;o- zvasu!YVP{*2q+|3;u=xnoS&PUnpeW$T$GwvlA5AWo>`Ki;O^-g5Z=fq4pda^>Eaj? zaro^eMZRVS2A7Nb8-;>+&Z@0;{K|EEbpaDk#`J~DZoUrrqL*F3ArKwy&2{k1<;iC{ z7zG6dEoa^o;_LMfwtjr4RU&-d_pXOu4H?e=o0v0^`9g1g@rj1}g5BDTEAk~7ww*8+ l{jX|b_tHj5NvZlLQ%a%e7u%!FTY&a6c)I$ztaD0e0swC6R}cUI diff --git a/Resources/Textures/_NF/Mobs/Aliens/flesh.rsi/spikeSolution1.png b/Resources/Textures/_NF/Mobs/Aliens/flesh.rsi/spikeSolution1.png new file mode 100644 index 0000000000000000000000000000000000000000..1f7f982b6873df2c0aaf77113f8727611c2b1e0f GIT binary patch literal 543 zcmV+)0^t3LP)EX>4Tx04R}tkv&MmKpe$iTT4YM4n|OM$WWauh>AE$6^me@v=v%)FuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0scmXsb<#%plX(p zipRukZdDAuB8UJ43}HZGrk+SIX5cx#?&0I>U6f~epZjz4DtVIuK9P8i>4rtTK|Hf* z>74h81y+(2;&bA0gDyz?$aUG}H_ke3JS*_Gq>z@3D;k>qz<~q$0#Ib|~k`N)IhB7L!5T#Wk#YBqsV;=rt$DbsZOs+B* zITlcb3d!+<|H1EW&BD~An-q=#!57>97zIMRK(lV!-^aGyJOKjFz?IhaR~x|WC+YRJ z7C8d?wt Date: Sun, 6 Oct 2024 17:34:07 +0000 Subject: [PATCH 20/96] Automatic Changelog (#1985) --- Resources/Changelog/Frontier.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 5b20fa03577..d3454500805 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4295,3 +4295,13 @@ Entries: message: Artifact analyzers do not consume power when idle id: 5364 time: '2024-10-06T13:52:27.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Add + message: Aberrant flesh horror (expedition boss) is now a ghost role. + - type: Tweak + message: >- + Slightly rebalanced aberrant flesh mobs, updated guidebook entry on them + with new values. + id: 5365 + time: '2024-10-06T17:33:42.0000000+00:00' From 70ea8f64069d2fabb6bfa19e12f0cb82b9d5d9c6 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 7 Oct 2024 16:06:50 +0300 Subject: [PATCH 21/96] Sawn-off PKA Nerf (#2164) * Sawn-off PKA Nerf * delay --- .../_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml index 15ed900116d..421aeabc524 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Basic/sawn_pka.yml @@ -12,8 +12,12 @@ size: Small shape: - 0,0,1,0 + - type: UseDelay + delay: 1 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1 - type: Gun - fireRate: 8 + fireRate: 0.9 selectedMode: FullAuto availableModes: - FullAuto From 7e6db291a094a14e67d101c68a2fc87f34498b83 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 7 Oct 2024 13:07:16 +0000 Subject: [PATCH 22/96] Automatic Changelog (#2164) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index d3454500805..dafe7348c63 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4305,3 +4305,11 @@ Entries: with new values. id: 5365 time: '2024-10-06T17:33:42.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: >- + Nerfed sawn-off PKA dual wielding: firing more than 1 shot per second + shouldn't be possible now. + id: 5366 + time: '2024-10-07T13:06:50.0000000+00:00' From 1662d0f6368e15e6509c0635817618df7429cba8 Mon Sep 17 00:00:00 2001 From: VividPups <150621839+VividPups@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:03:56 -0500 Subject: [PATCH 23/96] Hotfix to the Acradia machine bug (#2162) * fix the machine error Hotfix to the acradia machine bug * consistent spacing --------- Co-authored-by: Whatstone --- .../_NF/Entities/Structures/Machines/vending_machines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index b4d7322a399..82e1b5f693d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -202,7 +202,7 @@ brokenState: broken normalState: normal-unshaded # ejectState: eject-unshaded No sprite, see chefvend/dinnerware/BODA/etc for expamples - denyState: deny-unshaded + # denyState: deny-unshaded ejectDelay: 3 - type: Advertise pack: ArcadiaDrobeAds From 8e5509e80a700d0ec5dcc47d445ee99137ca5f4b Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 7 Oct 2024 15:04:26 +0000 Subject: [PATCH 24/96] Automatic Changelog (#2162) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index dafe7348c63..24a7bbbd8d3 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4313,3 +4313,9 @@ Entries: shouldn't be possible now. id: 5366 time: '2024-10-07T13:06:50.0000000+00:00' +- author: VividPups + changes: + - type: Fix + message: The ArcadiaDrobe no longer shows an error when denying vending. + id: 5367 + time: '2024-10-07T15:03:56.0000000+00:00' From 1390c65f7425f932531e292ad330494a4f67c687 Mon Sep 17 00:00:00 2001 From: Tabitha <64847293+KyuPolaris@users.noreply.github.com> Date: Tue, 8 Oct 2024 03:38:08 +1100 Subject: [PATCH 25/96] Added much needed Air Alarms to the Crescent (#1945) * Crescent Air Alarms * Added fire alarms to firelocks * Replaced Tiny Fans with Directional ones + Replaced AME fuel with wall locker * Added the AI but left the rule not open (Need to fix issues) * Update crescent.yml * Update crescent.yml --------- Co-authored-by: KyuPolaris Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- Resources/Maps/_NF/Shuttles/crescent.yml | 1841 +++++++++++------ .../Prototypes/_NF/Shipyard/crescent.yml | 1 + 2 files changed, 1244 insertions(+), 598 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index 0b06692f79f..a2cef036782 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -37,7 +37,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: ZAAAAAADZAAAAAADZAAAAAADZAAAAAABZAAAAAADZAAAAAABegAAAAAAHgAAAAADHgAAAAAAHgAAAAAAOwAAAAAAOwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAZAAAAAADZAAAAAACZAAAAAAAZAAAAAACZAAAAAADZAAAAAABegAAAAAAHgAAAAACHgAAAAABHgAAAAADOwAAAAAAOwAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAADPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAHgAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAAAHgAAAAACegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAegAAAAAAdwAAAAABdwAAAAACegAAAAAAdwAAAAACdwAAAAAAegAAAAAAHgAAAAABHgAAAAACegAAAAAAHgAAAAACHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAADegAAAAAALgAAAAACHgAAAAAAegAAAAAAdwAAAAACdwAAAAAAdwAAAAABdwAAAAACdwAAAAAAegAAAAAAKQAAAAAAKQAAAAAAKQAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAALgAAAAAAHgAAAAAAaQAAAAAAdwAAAAAAdwAAAAABdwAAAAADdwAAAAACdwAAAAABegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADdwAAAAADegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAHgAAAAADHgAAAAABegAAAAAALgAAAAAAHgAAAAACHgAAAAAAdwAAAAAAdwAAAAACdwAAAAADdwAAAAACdwAAAAAAegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAC + tiles: ZAAAAAADZAAAAAADZAAAAAADZAAAAAABZAAAAAADZAAAAAABegAAAAAAHgAAAAADHgAAAAAAHgAAAAAAOwAAAAAAOwAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAZAAAAAADZAAAAAACZAAAAAAAZAAAAAACZAAAAAADZAAAAAABegAAAAAAHgAAAAACHgAAAAABHgAAAAADOwAAAAAAOwAAAAAAegAAAAAAHgAAAAABHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAADPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAHgAAAAACOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAPQAAAAAAegAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAOwAAAAAAegAAAAAAHgAAAAAAHgAAAAAAHgAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAADHgAAAAADHgAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAACHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAACHgAAAAACHgAAAAACHgAAAAAAHgAAAAACHgAAAAAAHgAAAAABHgAAAAADHgAAAAABHgAAAAADHgAAAAACHgAAAAACHgAAAAAAHgAAAAABHgAAAAABHgAAAAACHgAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAAAHgAAAAACegAAAAAAegAAAAAAHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAUQAAAAAAUQAAAAAAUQAAAAAAegAAAAAAdwAAAAABdwAAAAACegAAAAAAdwAAAAACdwAAAAAAegAAAAAAHgAAAAABHgAAAAACegAAAAAAHgAAAAACHgAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACHgAAAAADegAAAAAALgAAAAACHgAAAAAAegAAAAAAdwAAAAACdwAAAAAAdwAAAAABdwAAAAACdwAAAAAAegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAALgAAAAAAHgAAAAAAaQAAAAAAdwAAAAAAdwAAAAABdwAAAAADdwAAAAACdwAAAAABegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAdwAAAAADdwAAAAADdwAAAAACdwAAAAADdwAAAAADegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAADHgAAAAABegAAAAAALgAAAAAAHgAAAAACHgAAAAAAdwAAAAAAdwAAAAACdwAAAAADdwAAAAACdwAAAAAAegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAAAHgAAAAADHgAAAAAC version: 6 0,-1: ind: 0,-1 @@ -81,7 +81,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: LgAAAAABHgAAAAABHgAAAAACdwAAAAACdwAAAAABdwAAAAABdwAAAAAAdwAAAAADegAAAAAAMAAAAAAAMAAAAAAAMAAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAADLgAAAAADHgAAAAABegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAAAHgAAAAABegAAAAAAdwAAAAAAdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAdwAAAAACdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAABaQAAAAAAHgAAAAABHgAAAAAAHgAAAAACaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAABHgAAAAAAaQAAAAAAHgAAAAACHgAAAAAAHgAAAAADaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAACegAAAAAAegAAAAAAAAAAAAAAaQAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAACHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAABegAAAAAAaQAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAABHgAAAAACaQAAAAAAHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACegAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAALgAAAAADHgAAAAADHgAAAAACLgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAALgAAAAABLgAAAAADLgAAAAACLgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: LgAAAAABHgAAAAABHgAAAAACdwAAAAACdwAAAAABdwAAAAABdwAAAAAAdwAAAAADegAAAAAAEgAAAAAAEgAAAAAAEgAAAAAAegAAAAAAHgAAAAACHgAAAAABHgAAAAADLgAAAAADHgAAAAABegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAHgAAAAAAHgAAAAABegAAAAAAdwAAAAAAdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACaQAAAAAAegAAAAAAdwAAAAACdwAAAAADdwAAAAACegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAAHgAAAAACHgAAAAABaQAAAAAAHgAAAAABHgAAAAAAHgAAAAACaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAABHgAAAAAAaQAAAAAAHgAAAAACHgAAAAAAHgAAAAADaQAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAPwAAAAAAegAAAAAALgAAAAACHgAAAAADegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAABHgAAAAAAegAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAACegAAAAAAegAAAAAAAAAAAAAAaQAAAAAAHgAAAAAAHgAAAAADHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAADHgAAAAACHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAABegAAAAAAaQAAAAAAHgAAAAADaQAAAAAAHgAAAAACHgAAAAABHgAAAAACaQAAAAAAHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAACegAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAABHgAAAAABegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAaQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAAAHgAAAAACHgAAAAADHgAAAAACHgAAAAAAHgAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAALgAAAAADHgAAAAADHgAAAAACLgAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAALgAAAAABLgAAAAADLgAAAAACLgAAAAADegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,2: ind: -1,2 @@ -557,78 +557,6 @@ entities: 147: -16,13 148: -16,11 149: -16,10 - - node: - color: '#FFFFFFFF' - id: Flowersbr1 - decals: - 0: 9.389877,14.433586 - 1: 9.776596,15.593742 - 2: 10.409409,14.609367 - 3: 9.038315,12.921867 - - node: - color: '#FFFFFFFF' - id: Flowersbr2 - decals: - 277: 11.020526,12.88933 - - node: - color: '#FFFFFFFF' - id: Flowerspv2 - decals: - 4: 9.389877,14.39843 - 5: 10.479721,14.996086 - 6: 10.233627,15.066399 - 7: 10.725815,15.277336 - 8: 10.936752,14.11718 - - node: - color: '#FFFFFFFF' - id: Flowerspv3 - decals: - 278: 10.301776,13.26433 - 279: 9.447609,13.10808 - - node: - color: '#FFFFFFFF' - id: Flowersy1 - decals: - 276: 9.822609,13.243497 - - node: - color: '#FFFFFFFF' - id: Flowersy2 - decals: - 9: 9.189604,13.83593 - 10: 9.927885,14.996086 - 11: 10.490385,14.855461 - 12: 9.119291,15.417961 - 13: 9.330229,15.945305 - 14: 10.701323,15.80468 - 15: 11.19351,13.83593 - - node: - color: '#FFFFFFFF' - id: Flowersy3 - decals: - 266: 8.953577,14.003855 - 267: 10.328577,13.785105 - 268: 11.234827,15.035105 - 269: 11.031702,15.36323 - 270: 8.906702,15.878855 - 271: 9.797327,16.097605 - 272: 10.594202,15.878855 - 273: 9.172327,14.097605 - 274: 8.812952,13.503855 - 275: 11.187952,13.285105 - - node: - color: '#FFFFFFFF' - id: Flowersy4 - decals: - 16: 9.457235,14.082024 - 17: 9.633017,15.066399 - 18: 10.476767,14.503899 - 19: 10.336142,14.39843 - 20: 11.250204,15.80468 - 21: 10.476767,15.628899 - 22: 9.281454,13.83593 - 23: 8.648642,13.062492 - 24: 8.789267,14.820305 - 280: 10.166359,12.941414 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN @@ -688,7 +616,8 @@ entities: 0,4: 0: 43835 1,0: - 0: 63675 + 0: 63539 + 1: 136 1,1: 0: 61631 1,2: @@ -700,7 +629,8 @@ entities: 1,4: 0: 47903 2,0: - 0: 64733 + 1: 17 + 0: 64716 2,1: 0: 62207 2,2: @@ -726,9 +656,9 @@ entities: 4,2: 0: 4095 4,3: - 1: 17 + 2: 17 0: 61440 - 4: 68 + 5: 68 -1,-1: 0: 65024 -4,0: @@ -746,13 +676,12 @@ entities: -4,3: 0: 64733 -5,3: - 0: 61663 - 7: 32 + 0: 61695 -4,4: 0: 52431 - 1: 4096 + 2: 4096 -4,-1: - 2: 8192 + 3: 8192 0: 32768 -3,0: 0: 20667 @@ -762,11 +691,11 @@ entities: 0: 1615 -3,3: 0: 256 - 3: 61166 + 4: 61166 -3,-1: 0: 8192 -3,4: - 3: 14 + 4: 14 0: 26112 -2,0: 0: 62139 @@ -784,7 +713,7 @@ entities: 0: 48015 4,4: 0: 15 - 1: 4608 + 2: 4608 5,0: 0: 29440 5,1: @@ -792,48 +721,48 @@ entities: 5,2: 0: 4095 5,3: - 5: 17 + 6: 17 0: 61440 - 6: 68 + 7: 68 5,4: 0: 15 - 1: 16896 + 2: 16896 6,0: - 2: 4096 + 3: 4096 6,2: 0: 26230 6,3: 0: 63239 6,1: - 2: 32 + 3: 32 0: 8192 6,4: 0: 65319 7,2: - 1: 4096 + 2: 4096 7,3: 0: 12544 - 1: 2 - 2: 52416 + 2: 2 + 3: 52416 7,4: 0: 4353 - 2: 204 + 3: 204 -8,3: - 2: 26208 + 3: 26208 0: 32768 - 1: 8 + 2: 8 -8,4: - 2: 102 + 3: 102 -7,3: 0: 61900 -7,2: - 1: 4096 + 2: 4096 0: 49356 -7,4: 0: 49037 -7,1: 0: 32768 - 1: 8 + 2: 8 -6,2: 0: 28286 -6,3: @@ -842,12 +771,12 @@ entities: 0: 61166 -6,4: 0: 4383 - 1: 18432 + 2: 18432 -6,0: 0: 34816 -5,4: 0: 15 - 1: 2048 + 2: 2048 -8,5: 0: 34944 -8,6: @@ -879,8 +808,7 @@ entities: 6,7: 0: 28791 6,8: - 0: 639 - 1: 12288 + 0: 12927 7,5: 0: 9008 7,6: @@ -891,28 +819,28 @@ entities: 0: 4403 -7,9: 0: 204 - 2: 32768 + 3: 32768 -6,9: 0: 51 - 2: 28672 + 3: 28672 -6,10: - 2: 18039 + 3: 18039 -6,11: - 2: 68 + 3: 68 5,8: - 1: 32768 + 0: 32768 5,9: - 1: 136 - 2: 49152 + 0: 136 + 3: 49152 5,10: - 2: 19660 + 3: 19660 5,11: - 2: 68 + 3: 68 6,9: - 1: 51 - 2: 12288 + 0: 51 + 3: 12288 6,10: - 2: 17 + 3: 17 -4,5: 0: 3276 -3,5: @@ -933,9 +861,9 @@ entities: 0: 26191 -1,7: 0: 6 - 2: 28160 + 3: 28160 -1,8: - 2: 2 + 3: 2 0,5: 0: 16371 0,6: @@ -986,6 +914,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 235 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -1076,21 +1019,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 21.6852 - - 81.57766 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -1104,6 +1032,203 @@ entities: parent: 2230 - type: InstantAction container: 2230 +- proto: AirAlarm + entities: + - uid: 1229 + components: + - type: MetaData + name: Science Air Alarm + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,27.5 + parent: 1 + - type: DeviceList + devices: + - 2080 + - 2037 + - 2038 + - 2067 + - 2088 + - 2089 + - 2069 + - 2036 + - uid: 1237 + components: + - type: MetaData + name: Engineering Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,6.5 + parent: 1 + - type: DeviceList + devices: + - 2081 + - 2082 + - 2052 + - 2106 + - uid: 1239 + components: + - type: MetaData + name: Service Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-1.5 + parent: 1 + - type: DeviceList + devices: + - 2076 + - 2048 + - 2047 + - 2095 + - 2049 + - 2090 + - 2091 + - 2050 + - 2051 + - 2093 + - uid: 1240 + components: + - type: MetaData + name: Chem Lab Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,10.5 + parent: 1 + - type: DeviceList + devices: + - 2045 + - 2101 + - 2068 + - 2018 + - 2014 + - 2073 + - uid: 1241 + components: + - type: MetaData + name: Bio/Cryo Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.5,28.5 + parent: 1 + - type: DeviceList + devices: + - 2045 + - 2101 + - 2068 + - 2018 + - 2014 + - 2073 + - 2097 + - 2031 + - 2027 + - 2096 + - 2026 + - 2060 + - 2086 + - 2084 + - 2042 + - 2102 + - uid: 1278 + components: + - type: MetaData + name: Hallways Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,11.5 + parent: 1 + - type: DeviceList + devices: + - 2109 + - 2058 + - 2107 + - 2056 + - 2057 + - 2108 + - 2020 + - 2083 + - 2013 + - 1108 + - 2104 + - 2035 + - 2094 + - 2044 + - 2019 + - 2103 + - 2098 + - 2022 + - uid: 1281 + components: + - type: Transform + pos: 6.5,26.5 + parent: 1 + - type: DeviceList + devices: + - 2064 + - 2055 + - 2062 + - 2024 + - 2065 + - 2053 + - 897 + - 898 + - 2054 + - 2063 + - 2015 + - 2087 + - uid: 2253 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,35.5 + parent: 1 + - type: DeviceList + devices: + - 2041 + - 2099 + - uid: 2254 + components: + - type: MetaData + name: Dorms Air Alarm + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,11.5 + parent: 1 + - type: DeviceList + devices: + - 2079 + - 2032 + - 2077 + - 2016 + - 2078 + - 2030 + - 2074 + - 2025 + - 2075 + - 2017 + - 2066 + - 2029 + - 3685 + - 2070 + - 2033 + - 2071 + - 2034 + - 2072 + - uid: 2255 + components: + - type: MetaData + name: Misc. Air Alarm + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,23.5 + parent: 1 + - type: DeviceList + devices: + - 2085 + - 2021 + - 2061 + - 2028 + - 2023 + - 2100 - proto: Airlock entities: - uid: 2 @@ -1305,6 +1430,20 @@ entities: - type: Transform pos: 14.5,6.5 parent: 1 +- proto: AirlockExternal + entities: + - uid: 42 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,15.5 + parent: 1 + - uid: 119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,15.5 + parent: 1 - proto: AirlockExternalGlass entities: - uid: 37 @@ -1332,16 +1471,6 @@ entities: - type: Transform pos: 27.5,15.5 parent: 1 - - uid: 42 - components: - - type: Transform - pos: 29.5,15.5 - parent: 1 - - uid: 43 - components: - - type: Transform - pos: -28.5,15.5 - parent: 1 - proto: AirlockGlass entities: - uid: 44 @@ -1455,48 +1584,38 @@ entities: - uid: 66 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,38.5 + rot: -1.5707963267948966 rad + pos: -8.5,38.5 parent: 1 - uid: 67 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,40.5 + rot: -1.5707963267948966 rad + pos: -8.5,40.5 parent: 1 - uid: 68 components: - type: Transform rot: 3.141592653589793 rad - pos: -4.5,42.5 + pos: -6.5,42.5 parent: 1 - uid: 69 components: - type: Transform rot: 3.141592653589793 rad - pos: -6.5,42.5 + pos: -4.5,42.5 parent: 1 - uid: 70 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,40.5 + rot: 1.5707963267948966 rad + pos: -2.5,40.5 parent: 1 - uid: 71 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,38.5 - parent: 1 - - uid: 72 - components: - - type: Transform - pos: -12.5,-0.5 - parent: 1 - - uid: 73 - components: - - type: Transform - pos: -10.5,-0.5 + rot: 1.5707963267948966 rad + pos: -2.5,38.5 parent: 1 - proto: AirlockMedical entities: @@ -1599,6 +1718,18 @@ entities: - type: Transform pos: 29.5,23.5 parent: 1 +- proto: AirlockShuttle + entities: + - uid: 72 + components: + - type: Transform + pos: -10.5,-0.5 + parent: 1 + - uid: 73 + components: + - type: Transform + pos: -12.5,-0.5 + parent: 1 - proto: AmeController entities: - uid: 91 @@ -1627,16 +1758,6 @@ entities: parent: 91 - type: Physics canCollide: False - - uid: 184 - components: - - type: Transform - pos: 13.240746,2.67622 - parent: 1 - - uid: 442 - components: - - type: Transform - pos: 13.751163,2.6970534 - parent: 1 - uid: 1174 components: - type: Transform @@ -1782,130 +1903,94 @@ entities: - type: Transform pos: 5.5,28.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 119 + - uid: 43 components: - type: Transform - pos: -28.5,15.5 + rot: 1.5707963267948966 rad + pos: 29.5,15.5 parent: 1 - uid: 120 components: - type: Transform - pos: -8.5,38.5 + rot: 1.5707963267948966 rad + pos: -2.5,38.5 parent: 1 - uid: 121 components: - type: Transform - pos: -8.5,40.5 + rot: 1.5707963267948966 rad + pos: -2.5,40.5 parent: 1 - uid: 122 components: - type: Transform - pos: -6.5,42.5 + rot: 3.141592653589793 rad + pos: -4.5,42.5 parent: 1 - uid: 123 components: - type: Transform - pos: -4.5,42.5 + rot: 3.141592653589793 rad + pos: -6.5,42.5 parent: 1 - uid: 124 components: - type: Transform - pos: -2.5,40.5 + rot: -1.5707963267948966 rad + pos: -8.5,40.5 parent: 1 - uid: 125 components: - type: Transform - pos: -2.5,38.5 + rot: -1.5707963267948966 rad + pos: -8.5,38.5 parent: 1 - uid: 126 components: - type: Transform - pos: -12.5,-0.5 + pos: -10.5,-0.5 parent: 1 - uid: 127 components: - type: Transform - pos: -10.5,-0.5 + pos: -12.5,-0.5 parent: 1 - uid: 128 components: - type: Transform - pos: 29.5,15.5 + rot: -1.5707963267948966 rad + pos: -28.5,15.5 parent: 1 - uid: 129 components: - type: Transform + rot: 3.141592653589793 rad pos: 25.5,34.5 parent: 1 - uid: 130 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: -11.5,14.5 parent: 1 -- proto: AtmosFixBlockerMarker - entities: - - uid: 131 - components: - - type: Transform - pos: 16.5,13.5 - parent: 1 - - uid: 132 - components: - - type: Transform - pos: 16.5,12.5 - parent: 1 - - uid: 133 - components: - - type: Transform - pos: 23.5,37.5 - parent: 1 - - uid: 134 - components: - - type: Transform - pos: 23.5,36.5 - parent: 1 - - uid: 135 - components: - - type: Transform - pos: 23.5,35.5 - parent: 1 - - uid: 136 - components: - - type: Transform - pos: 24.5,37.5 - parent: 1 - - uid: 137 - components: - - type: Transform - pos: 24.5,36.5 - parent: 1 - - uid: 138 - components: - - type: Transform - pos: 24.5,35.5 - parent: 1 - - uid: 139 - components: - - type: Transform - pos: 25.5,37.5 - parent: 1 - - uid: 140 + - uid: 1931 components: - type: Transform - pos: 25.5,36.5 + pos: 7.5,2.5 parent: 1 - - uid: 141 +- proto: AtmosFixBlockerMarker + entities: + - uid: 131 components: - type: Transform - pos: 25.5,35.5 + pos: 16.5,13.5 parent: 1 - - uid: 142 + - uid: 132 components: - type: Transform - pos: 24.5,38.5 + pos: 16.5,12.5 parent: 1 - uid: 2220 components: @@ -2267,6 +2352,28 @@ entities: - type: Transform pos: -14.5,-0.5 parent: 1 +- proto: AtmosFixFreezerMarker + entities: + - uid: 1279 + components: + - type: Transform + pos: 8.5,1.5 + parent: 1 + - uid: 1282 + components: + - type: Transform + pos: 7.5,1.5 + parent: 1 + - uid: 1992 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 + - uid: 2008 + components: + - type: Transform + pos: 8.5,0.5 + parent: 1 - proto: AtmosFixSaunaMarker entities: - uid: 3428 @@ -2677,9 +2784,6 @@ entities: - type: Transform pos: 24.5,38.5 parent: 1 - - type: DeviceLinkSink - links: - - 2604 - proto: BlastDoorOpen entities: - uid: 197 @@ -2689,8 +2793,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 2600 - uid: 198 components: - type: Transform @@ -2698,8 +2800,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 2600 - uid: 199 components: - type: Transform @@ -2707,16 +2807,11 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 1 - links: - - 2600 - uid: 200 components: - type: Transform pos: 29.5,25.5 parent: 1 - - type: DeviceLinkSink - links: - - 2605 - proto: BluespaceBeaker entities: - uid: 202 @@ -2738,10 +2833,10 @@ entities: canCollide: False - proto: BookAtmosWaste entities: - - uid: 1441 + - uid: 136 components: - type: Transform - pos: 11.502059,15.687635 + pos: 9.501426,15.640311 parent: 1 - proto: BookshelfFilled entities: @@ -2762,6 +2857,18 @@ entities: - type: Transform pos: -6.5,5.5 parent: 1 +- proto: BorgCharger + entities: + - uid: 1226 + components: + - type: Transform + pos: 11.5,12.5 + parent: 1 + - uid: 1383 + components: + - type: Transform + pos: 9.5,12.5 + parent: 1 - proto: Bucket entities: - uid: 3520 @@ -2776,6 +2883,11 @@ entities: parent: 1 - proto: CableApcExtension entities: + - uid: 135 + components: + - type: Transform + pos: 9.5,15.5 + parent: 1 - uid: 152 components: - type: Transform @@ -5241,6 +5353,21 @@ entities: - type: Transform pos: -11.5,24.5 parent: 1 + - uid: 1071 + components: + - type: Transform + pos: 9.5,14.5 + parent: 1 + - uid: 1402 + components: + - type: Transform + pos: 10.5,14.5 + parent: 1 + - uid: 1675 + components: + - type: Transform + pos: 9.5,16.5 + parent: 1 - uid: 2818 components: - type: Transform @@ -7392,15 +7519,13 @@ entities: - type: Transform pos: -18.450588,5.9712296 parent: 1 -- proto: ClothingUnderSocksBee +- proto: ClothingUnderSocksCoder entities: - - uid: 1214 + - uid: 140 components: - type: Transform - pos: 11.630123,25.476461 + pos: 11.762692,25.400972 parent: 1 -- proto: ClothingUnderSocksCoder - entities: - uid: 1215 components: - type: Transform @@ -7602,52 +7727,16 @@ entities: parent: 1 - proto: CrateEngineeringSolar entities: - - uid: 1242 + - uid: 1271 components: - type: Transform - pos: 25.5,11.5 + pos: 24.5,12.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 1243 + - uid: 1274 components: - type: Transform - pos: 26.5,11.5 + pos: 26.5,12.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateFoodBarSupply entities: - uid: 1244 @@ -7838,6 +7927,18 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-1.5 parent: 1 + - uid: 1214 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,10.5 + parent: 1 + - uid: 1242 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,8.5 + parent: 1 - uid: 1254 components: - type: Transform @@ -7855,12 +7956,6 @@ entities: - type: Transform pos: -6.5,25.5 parent: 1 - - uid: 2796 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,8.5 - parent: 1 - uid: 3561 components: - type: Transform @@ -7999,12 +8094,24 @@ entities: parent: 1 - proto: DisposalJunctionFlipped entities: + - uid: 442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,14.5 + parent: 1 - uid: 981 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,16.5 parent: 1 + - uid: 2646 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,14.5 + parent: 1 - uid: 3509 components: - type: Transform @@ -8031,6 +8138,18 @@ entities: parent: 1 - proto: DisposalPipe entities: + - uid: 134 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,8.5 + parent: 1 + - uid: 850 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,19.5 + parent: 1 - uid: 976 components: - type: Transform @@ -8073,6 +8192,18 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-0.5 parent: 1 + - uid: 1209 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,20.5 + parent: 1 + - uid: 1243 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,9.5 + parent: 1 - uid: 1256 components: - type: Transform @@ -8094,6 +8225,24 @@ entities: - type: Transform pos: -23.5,17.5 parent: 1 + - uid: 1280 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,8.5 + parent: 1 + - uid: 1377 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,14.5 + parent: 1 + - uid: 1441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,8.5 + parent: 1 - uid: 2281 components: - type: Transform @@ -8105,6 +8254,23 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,25.5 parent: 1 + - uid: 2398 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,8.5 + parent: 1 + - uid: 2638 + components: + - type: Transform + pos: 11.5,15.5 + parent: 1 + - uid: 2639 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,14.5 + parent: 1 - uid: 2641 components: - type: Transform @@ -8913,12 +9079,6 @@ entities: rot: 3.141592653589793 rad pos: 13.5,13.5 parent: 1 - - uid: 3683 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,14.5 - parent: 1 - uid: 3684 components: - type: Transform @@ -8945,6 +9105,12 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,5.5 parent: 1 + - uid: 892 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,18.5 + parent: 1 - uid: 1053 components: - type: Transform @@ -8968,6 +9134,23 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,21.5 parent: 1 + - uid: 2399 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,10.5 + parent: 1 + - uid: 2644 + components: + - type: Transform + pos: 11.5,16.5 + parent: 1 + - uid: 2645 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,14.5 + parent: 1 - uid: 3504 components: - type: Transform @@ -8985,12 +9168,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,12.5 parent: 1 - - uid: 3529 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,20.5 - parent: 1 - uid: 3538 components: - type: Transform @@ -9064,15 +9241,20 @@ entities: - type: Transform pos: 2.5,5.5 parent: 1 - - uid: 3523 + - uid: 2267 components: - type: Transform - pos: 3.5,12.5 + pos: 7.5,18.5 parent: 1 - - uid: 3528 + - uid: 2400 components: - type: Transform - pos: 7.5,20.5 + pos: 11.5,16.5 + parent: 1 + - uid: 3523 + components: + - type: Transform + pos: 3.5,12.5 parent: 1 - uid: 3563 components: @@ -9111,6 +9293,12 @@ entities: parent: 1 - proto: DisposalYJunction entities: + - uid: 142 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,8.5 + parent: 1 - uid: 2640 components: - type: Transform @@ -9119,11 +9307,6 @@ entities: parent: 1 - proto: DogBed entities: - - uid: 892 - components: - - type: Transform - pos: 11.5,16.5 - parent: 1 - uid: 1056 components: - type: Transform @@ -9148,28 +9331,6 @@ entities: - type: Transform pos: 5.5478635,16.701803 parent: 1 -- proto: DrinkWaterCup - entities: - - uid: 1279 - components: - - type: Transform - pos: 7.390334,19.515562 - parent: 1 - - uid: 1280 - components: - - type: Transform - pos: 7.6012716,19.7265 - parent: 1 - - uid: 1282 - components: - - type: Transform - pos: 7.624709,19.421812 - parent: 1 - - uid: 1283 - components: - - type: Transform - pos: 7.7418966,19.562437 - parent: 1 - proto: ElectricGuitarInstrument entities: - uid: 1284 @@ -9223,6 +9384,38 @@ entities: - type: Transform pos: -26.5,19.5 parent: 1 +- proto: FireAlarm + entities: + - uid: 2453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 25.5,13.5 + parent: 1 + - type: DeviceList + devices: + - 1318 + - 1319 + - uid: 2514 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,14.5 + parent: 1 + - type: DeviceList + devices: + - 1351 + - 1350 + - uid: 2643 + components: + - type: Transform + pos: -3.5,25.5 + parent: 1 + - type: DeviceList + devices: + - 1347 + - 1348 + - 1349 - proto: FireAxeCabinetFilled entities: - uid: 1293 @@ -9367,11 +9560,17 @@ entities: - type: Transform pos: 23.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2453 - uid: 1319 components: - type: Transform pos: 23.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2453 - uid: 1320 components: - type: Transform @@ -9512,26 +9711,47 @@ entities: - type: Transform pos: -4.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2643 - uid: 1348 components: - type: Transform pos: -5.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2643 - uid: 1349 components: - type: Transform pos: -6.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2643 - uid: 1350 components: - type: Transform pos: -22.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2514 - uid: 1351 components: - type: Transform pos: -22.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2514 - uid: 1352 components: - type: Transform @@ -9715,21 +9935,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,16.5 parent: 1 - - uid: 1271 - components: - - type: Transform - pos: 10.5,12.5 - parent: 1 - - uid: 1274 - components: - - type: Transform - pos: 11.5,12.5 - parent: 1 - - uid: 1377 - components: - - type: Transform - pos: 9.5,12.5 - parent: 1 - proto: FloraTree05 entities: - uid: 3488 @@ -10767,18 +10972,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 1517 - components: - - type: Transform - anchored: False - rot: 1.5707963267948966 rad - pos: 15.5,7.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 1518 components: - type: Transform @@ -14552,6 +14745,9 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,14.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2013 @@ -14560,6 +14756,9 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,14.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2014 @@ -14568,6 +14767,10 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,12.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2015 @@ -14576,6 +14779,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2016 @@ -14583,6 +14789,9 @@ entities: - type: Transform pos: -7.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2017 @@ -14591,6 +14800,9 @@ entities: rot: 3.141592653589793 rad pos: -7.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2018 @@ -14599,6 +14811,10 @@ entities: rot: 3.141592653589793 rad pos: -17.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2019 @@ -14607,6 +14823,9 @@ entities: rot: 3.141592653589793 rad pos: -21.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2020 @@ -14615,6 +14834,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2021 @@ -14623,6 +14845,11 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,24.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2022 @@ -14631,6 +14858,9 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2023 @@ -14639,6 +14869,11 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,26.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2024 @@ -14647,6 +14882,9 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,24.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2025 @@ -14655,6 +14893,9 @@ entities: rot: 3.141592653589793 rad pos: -10.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2026 @@ -14663,6 +14904,9 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2027 @@ -14670,6 +14914,9 @@ entities: - type: Transform pos: -24.5,35.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2028 @@ -14678,6 +14925,11 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,26.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2029 @@ -14686,6 +14938,9 @@ entities: rot: 3.141592653589793 rad pos: -4.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2030 @@ -14693,6 +14948,9 @@ entities: - type: Transform pos: -10.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2031 @@ -14700,6 +14958,9 @@ entities: - type: Transform pos: -27.5,28.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2032 @@ -14707,6 +14968,9 @@ entities: - type: Transform pos: -4.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2033 @@ -14714,6 +14978,9 @@ entities: - type: Transform pos: 7.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2034 @@ -14721,6 +14988,9 @@ entities: - type: Transform pos: 10.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2035 @@ -14729,6 +14999,9 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2036 @@ -14737,6 +15010,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,21.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2037 @@ -14745,6 +15021,9 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,26.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2038 @@ -14753,6 +15032,9 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2039 @@ -14776,6 +15058,9 @@ entities: - type: Transform pos: -4.5,39.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2253 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2042 @@ -14784,6 +15069,9 @@ entities: rot: 1.5707963267948966 rad pos: -28.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2043 @@ -14800,6 +15088,9 @@ entities: rot: 3.141592653589793 rad pos: -16.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2045 @@ -14808,6 +15099,10 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2046 @@ -14824,6 +15119,9 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2048 @@ -14831,6 +15129,9 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2049 @@ -14839,6 +15140,9 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2050 @@ -14847,6 +15151,9 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2051 @@ -14855,6 +15162,9 @@ entities: rot: 3.141592653589793 rad pos: 7.5,1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2052 @@ -14863,6 +15173,9 @@ entities: rot: 3.141592653589793 rad pos: 13.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2053 @@ -14871,6 +15184,9 @@ entities: rot: 3.141592653589793 rad pos: 11.5,20.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2054 @@ -14879,6 +15195,9 @@ entities: rot: 3.141592653589793 rad pos: 3.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2055 @@ -14886,6 +15205,9 @@ entities: - type: Transform pos: 3.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2056 @@ -14894,6 +15216,9 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,17.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2057 @@ -14902,6 +15227,9 @@ entities: rot: 3.141592653589793 rad pos: -5.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 2058 @@ -14909,6 +15237,9 @@ entities: - type: Transform pos: -11.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#0055CCFF' - uid: 3685 @@ -14916,6 +15247,9 @@ entities: - type: Transform pos: 4.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -14926,6 +15260,9 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 1108 @@ -14933,6 +15270,9 @@ entities: - type: Transform pos: 15.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2060 @@ -14941,6 +15281,9 @@ entities: rot: 1.5707963267948966 rad pos: -23.5,28.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2061 @@ -14949,6 +15292,11 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,27.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#990000FF' - uid: 2062 @@ -14957,6 +15305,9 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2063 @@ -14965,6 +15316,9 @@ entities: rot: 3.141592653589793 rad pos: 4.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2064 @@ -14972,6 +15326,9 @@ entities: - type: Transform pos: 4.5,29.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2065 @@ -14980,6 +15337,9 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,20.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2066 @@ -14988,6 +15348,9 @@ entities: rot: 3.141592653589793 rad pos: -3.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2067 @@ -14996,6 +15359,9 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,26.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2068 @@ -15004,6 +15370,10 @@ entities: rot: 3.141592653589793 rad pos: -18.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2069 @@ -15012,6 +15382,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2070 @@ -15019,6 +15392,9 @@ entities: - type: Transform pos: 5.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2071 @@ -15026,6 +15402,9 @@ entities: - type: Transform pos: 8.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2072 @@ -15033,6 +15412,9 @@ entities: - type: Transform pos: 11.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2073 @@ -15041,6 +15423,10 @@ entities: rot: 3.141592653589793 rad pos: -24.5,13.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2074 @@ -15049,6 +15435,9 @@ entities: rot: 3.141592653589793 rad pos: -9.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2075 @@ -15057,6 +15446,9 @@ entities: rot: 3.141592653589793 rad pos: -6.5,19.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2076 @@ -15065,6 +15457,9 @@ entities: rot: 3.141592653589793 rad pos: -0.5,2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2077 @@ -15072,6 +15467,9 @@ entities: - type: Transform pos: -6.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2078 @@ -15079,6 +15477,9 @@ entities: - type: Transform pos: -9.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2079 @@ -15086,6 +15487,9 @@ entities: - type: Transform pos: -3.5,10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2254 - type: AtmosPipeColor color: '#990000FF' - uid: 2080 @@ -15094,6 +15498,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,27.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2081 @@ -15101,6 +15508,9 @@ entities: - type: Transform pos: 17.5,8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#990000FF' - uid: 2082 @@ -15109,6 +15519,9 @@ entities: rot: 3.141592653589793 rad pos: 14.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#990000FF' - uid: 2083 @@ -15117,6 +15530,9 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2084 @@ -15124,6 +15540,9 @@ entities: - type: Transform pos: -23.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2085 @@ -15131,6 +15550,11 @@ entities: - type: Transform pos: -9.5,24.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#990000FF' - uid: 2086 @@ -15138,6 +15562,9 @@ entities: - type: Transform pos: -25.5,25.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2087 @@ -15146,6 +15573,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,16.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1281 - type: AtmosPipeColor color: '#990000FF' - uid: 2088 @@ -15154,6 +15584,9 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,32.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2089 @@ -15162,6 +15595,9 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,32.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1229 - type: AtmosPipeColor color: '#990000FF' - uid: 2090 @@ -15170,6 +15606,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2091 @@ -15178,6 +15617,9 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2092 @@ -15194,6 +15636,9 @@ entities: rot: 3.141592653589793 rad pos: 8.5,1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2094 @@ -15202,6 +15647,9 @@ entities: rot: 3.141592653589793 rad pos: -15.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2095 @@ -15210,6 +15658,9 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1239 - type: AtmosPipeColor color: '#990000FF' - uid: 2096 @@ -15217,6 +15668,9 @@ entities: - type: Transform pos: -22.5,36.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2097 @@ -15224,6 +15678,9 @@ entities: - type: Transform pos: -28.5,28.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2098 @@ -15232,6 +15689,9 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,30.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2099 @@ -15239,6 +15699,9 @@ entities: - type: Transform pos: -6.5,39.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 2253 - type: AtmosPipeColor color: '#990000FF' - uid: 2100 @@ -15246,6 +15709,11 @@ entities: - type: Transform pos: 1.5,28.5 parent: 1 + - type: DeviceNetwork + configurators: + - invalid + deviceLists: + - 2255 - type: AtmosPipeColor color: '#990000FF' - uid: 2101 @@ -15254,6 +15722,10 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1240 + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2102 @@ -15262,6 +15734,9 @@ entities: rot: 3.141592653589793 rad pos: -25.5,22.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1241 - type: AtmosPipeColor color: '#990000FF' - uid: 2103 @@ -15270,6 +15745,9 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2104 @@ -15278,6 +15756,9 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,15.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2105 @@ -15294,6 +15775,9 @@ entities: rot: -1.5707963267948966 rad pos: 25.5,11.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1237 - type: AtmosPipeColor color: '#990000FF' - uid: 2107 @@ -15302,6 +15786,9 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,18.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2108 @@ -15309,6 +15796,9 @@ entities: - type: Transform pos: -4.5,8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - uid: 2109 @@ -15317,6 +15807,9 @@ entities: rot: 3.141592653589793 rad pos: -8.5,21.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 1278 - type: AtmosPipeColor color: '#990000FF' - proto: GasVolumePump @@ -15341,6 +15834,13 @@ entities: - type: Transform pos: 26.836712,33.432106 parent: 1 +- proto: GoldenPlunger + entities: + - uid: 133 + components: + - type: Transform + pos: 9.584759,14.754279 + parent: 1 - proto: GravityGeneratorMini entities: - uid: 2114 @@ -15929,11 +16429,6 @@ entities: - type: Transform pos: -24.5,25.5 parent: 1 - - uid: 2223 - components: - - type: Transform - pos: -11.5,-0.5 - parent: 1 - proto: IntercomScience entities: - uid: 2224 @@ -16002,6 +16497,13 @@ entities: - type: Physics canCollide: True - type: ActionsContainer +- proto: LeftHandHuman + entities: + - uid: 1238 + components: + - type: Transform + pos: 29.500807,26.554073 + parent: 1 - proto: LockerAtmosphericsFilledHardsuit entities: - uid: 444 @@ -16240,6 +16742,14 @@ entities: - 0 - 0 - 0 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 184 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,2.5 + parent: 1 - proto: MachineAnomalyGenerator entities: - uid: 2242 @@ -16388,6 +16898,33 @@ entities: - type: Transform pos: -22.698347,35.629475 parent: 1 +- proto: NapkinDrum5 + entities: + - uid: 1382 + components: + - type: Transform + pos: -0.73729867,-0.22818732 + parent: 1 + - uid: 2268 + components: + - type: Transform + pos: 0.35272866,5.6867924 + parent: 1 + - uid: 2272 + components: + - type: Transform + pos: -4.688938,0.762084 + parent: 1 + - uid: 2518 + components: + - type: Transform + pos: 9.2769,20.76033 + parent: 1 + - uid: 2637 + components: + - type: Transform + pos: 4.2787952,0.7933556 + parent: 1 - proto: NitrogenCanister entities: - uid: 2259 @@ -16442,18 +16979,6 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,19.5 parent: 1 -- proto: PartRodMetal - entities: - - uid: 2267 - components: - - type: Transform - pos: 26.415115,12.624596 - parent: 1 - - uid: 2268 - components: - - type: Transform - pos: 26.665115,12.515221 - parent: 1 - proto: PenCap entities: - uid: 2269 @@ -16477,12 +17002,13 @@ entities: - type: Transform pos: 18.5,13.5 parent: 1 -- proto: Plunger +- proto: PlayerStationAi entities: - - uid: 2272 + - uid: 139 components: - type: Transform - pos: 11.50988,14.843103 + rot: -1.5707963267948966 rad + pos: 11.5,14.5 parent: 1 - proto: PlushieAtmosian entities: @@ -17196,6 +17722,12 @@ entities: parent: 1 - proto: Rack entities: + - uid: 141 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,11.5 + parent: 1 - uid: 1378 components: - type: Transform @@ -17222,21 +17754,6 @@ entities: - type: Transform pos: -20.5,5.5 parent: 1 - - uid: 2398 - components: - - type: Transform - pos: 24.5,12.5 - parent: 1 - - uid: 2399 - components: - - type: Transform - pos: 25.5,12.5 - parent: 1 - - uid: 2400 - components: - - type: Transform - pos: 26.5,12.5 - parent: 1 - uid: 2401 components: - type: Transform @@ -17264,11 +17781,6 @@ entities: - type: Transform pos: -22.5,35.5 parent: 1 - - uid: 2409 - components: - - type: Transform - pos: 13.5,2.5 - parent: 1 - uid: 2410 components: - type: Transform @@ -17296,11 +17808,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,15.5 parent: 1 - - uid: 1071 - components: - - type: Transform - pos: 9.5,13.5 - parent: 1 - uid: 1262 components: - type: Transform @@ -17337,16 +17844,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,12.5 parent: 1 - - uid: 1382 - components: - - type: Transform - pos: 10.5,13.5 - parent: 1 - - uid: 1383 - components: - - type: Transform - pos: 11.5,13.5 - parent: 1 - uid: 2414 components: - type: Transform @@ -17789,6 +18286,20 @@ entities: - type: Transform pos: 24.5,22.5 parent: 1 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] - proto: SeedExtractor entities: - uid: 2515 @@ -17796,37 +18307,27 @@ entities: - type: Transform pos: 9.5,3.5 parent: 1 -- proto: SheetGlass - entities: - - uid: 2516 - components: - - type: Transform - pos: 25.321365,12.687096 - parent: 1 - - uid: 2517 - components: - - type: Transform - pos: 25.602615,12.515221 - parent: 1 -- proto: SheetPlasma - entities: - - uid: 2518 - components: - - type: Transform - pos: 24.50649,25.640497 - parent: 1 -- proto: SheetSteel +- proto: ServiceTechFab entities: - - uid: 2519 - components: - - type: Transform - pos: 24.258865,12.671471 - parent: 1 - - uid: 2520 + - uid: 2223 components: - type: Transform - pos: 24.571365,12.530846 + pos: 4.5,5.5 parent: 1 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] - proto: ShuttersNormal entities: - uid: 2521 @@ -17834,27 +18335,18 @@ entities: - type: Transform pos: 1.5,25.5 parent: 1 - - type: DeviceLinkSink - links: - - 2606 - uid: 2522 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - uid: 2523 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,16.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - proto: ShuttersNormalOpen entities: - uid: 2524 @@ -17863,54 +18355,36 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2525 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2526 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2527 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2528 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2529 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2530 components: - type: Transform @@ -17922,44 +18396,29 @@ entities: - type: Transform pos: 1.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2532 components: - type: Transform pos: 2.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2533 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2608 - uid: 2534 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,14.5 parent: 1 - - type: DeviceLinkSink - links: - - 2608 - uid: 2535 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,13.5 parent: 1 - - type: DeviceLinkSink - links: - - 2608 - proto: ShuttersWindowOpen entities: - uid: 2536 @@ -17967,73 +18426,46 @@ entities: - type: Transform pos: 3.5,31.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2537 components: - type: Transform pos: 3.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2538 components: - type: Transform pos: 4.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2539 components: - type: Transform pos: 5.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2540 components: - type: Transform pos: 6.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2541 components: - type: Transform pos: 7.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2542 components: - type: Transform pos: 8.5,32.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2543 components: - type: Transform pos: 8.5,31.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - uid: 2544 components: - type: Transform pos: 9.5,29.5 parent: 1 - - type: DeviceLinkSink - links: - - 2607 - proto: ShuttleWindow entities: - uid: 606 @@ -18576,7 +19008,7 @@ entities: - type: Transform pos: 6.5,28.5 parent: 1 -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 2613 components: @@ -18644,14 +19076,14 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,6.5 parent: 1 -- proto: SignHydro3 +- proto: SignHydro1 entities: - uid: 2623 components: - type: Transform pos: 10.5,6.5 parent: 1 -- proto: SignScience1 +- proto: SignScience entities: - uid: 2624 components: @@ -18665,7 +19097,7 @@ entities: - type: Transform pos: 6.5,0.5 parent: 1 -- proto: SignXenolab +- proto: SignXenobio entities: - uid: 2625 components: @@ -18752,40 +19184,6 @@ entities: - type: Transform pos: -5.5,5.5 parent: 1 -- proto: SpawnMobButterfly - entities: - - uid: 1158 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,16.5 - parent: 1 - - uid: 2637 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,13.5 - parent: 1 - - uid: 2638 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,14.5 - parent: 1 - - uid: 2639 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,15.5 - parent: 1 -- proto: SpawnMobParrot - entities: - - uid: 850 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,16.5 - parent: 1 - proto: SpawnPointLatejoin entities: - uid: 2651 @@ -18850,7 +19248,15 @@ entities: - uid: 1070 components: - type: Transform - pos: -8.5,15.5 + pos: -8.5,15.5 + parent: 1 +- proto: StationAiUploadComputer + entities: + - uid: 138 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,15.5 parent: 1 - proto: StoolBar entities: @@ -18956,8 +19362,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,17.5 parent: 1 - - type: Physics - canCollide: False - proto: SuitStorageWallmountMercenary entities: - uid: 2471 @@ -18966,10 +19370,69 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,4.5 parent: 1 - - type: Physics - canCollide: False - proto: SurveillanceCameraGeneral entities: + - uid: 1517 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,13.5 + parent: 1 + - uid: 2647 + components: + - type: Transform + pos: -21.5,39.5 + parent: 1 + - uid: 2648 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -29.5,16.5 + parent: 1 + - uid: 2649 + components: + - type: Transform + pos: 22.5,39.5 + parent: 1 + - uid: 2659 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,5.5 + parent: 1 + - uid: 2660 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - uid: 2661 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 1 + - uid: 2662 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,5.5 + parent: 1 + - uid: 2663 + components: + - type: Transform + pos: -7.5,0.5 + parent: 1 + - uid: 2664 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,4.5 + parent: 1 + - uid: 2666 + components: + - type: Transform + pos: -15.5,1.5 + parent: 1 - uid: 2681 components: - type: Transform @@ -19035,6 +19498,195 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Blastdoor Camera + - uid: 2743 + components: + - type: Transform + pos: -21.5,4.5 + parent: 1 + - uid: 2780 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,9.5 + parent: 1 + - uid: 2796 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,13.5 + parent: 1 + - uid: 3427 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,12.5 + parent: 1 + - uid: 3528 + components: + - type: Transform + pos: -26.5,18.5 + parent: 1 + - uid: 3529 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,23.5 + parent: 1 + - uid: 3683 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -28.5,30.5 + parent: 1 + - uid: 3693 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,28.5 + parent: 1 + - uid: 3694 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,36.5 + parent: 1 + - uid: 3695 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,25.5 + parent: 1 + - uid: 3696 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,14.5 + parent: 1 + - uid: 3697 + components: + - type: Transform + pos: 27.5,18.5 + parent: 1 + - uid: 3698 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,25.5 + parent: 1 + - uid: 3699 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,27.5 + parent: 1 + - uid: 3700 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,32.5 + parent: 1 + - uid: 3701 + components: + - type: Transform + pos: 29.5,21.5 + parent: 1 + - uid: 3702 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 29.5,33.5 + parent: 1 + - uid: 3703 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,15.5 + parent: 1 + - uid: 3704 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,22.5 + parent: 1 + - uid: 3705 + components: + - type: Transform + pos: 6.5,29.5 + parent: 1 + - uid: 3706 + components: + - type: Transform + pos: 6.5,24.5 + parent: 1 + - uid: 3707 + components: + - type: Transform + pos: -5.5,21.5 + parent: 1 + - uid: 3708 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,16.5 + parent: 1 + - uid: 3709 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,8.5 + parent: 1 + - uid: 3710 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,16.5 + parent: 1 + - uid: 3711 + components: + - type: Transform + pos: 0.5,7.5 + parent: 1 + - uid: 3712 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,14.5 + parent: 1 + - uid: 3713 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,9.5 + parent: 1 + - uid: 3714 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,5.5 + parent: 1 + - uid: 3715 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.5,10.5 + parent: 1 + - uid: 3716 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,35.5 + parent: 1 + - uid: 3717 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,13.5 + parent: 1 + - uid: 3718 + components: + - type: Transform + pos: 7.5,0.5 + parent: 1 - proto: SurveillanceCameraRouterGeneral entities: - uid: 2687 @@ -19225,10 +19877,11 @@ entities: parent: 1 - proto: TableCounterWood entities: - - uid: 1402 + - uid: 1283 components: - type: Transform - pos: 11.5,15.5 + rot: -1.5707963267948966 rad + pos: 9.5,15.5 parent: 1 - proto: TableGlass entities: @@ -19349,11 +20002,6 @@ entities: - type: Transform pos: 12.5,20.5 parent: 1 - - uid: 2743 - components: - - type: Transform - pos: 7.5,19.5 - parent: 1 - uid: 2744 components: - type: Transform @@ -19568,14 +20216,13 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,10.5 parent: 1 - - uid: 2780 +- proto: ToiletGoldenDirtyWater + entities: + - uid: 137 components: - - type: MetaData - desc: Gaze upon your crew and flex your muscles, from the comfort of your Porcelain Throne! - name: porcelain throne - type: Transform - rot: -1.5707963267948966 rad - pos: 11.5,14.5 + rot: 1.5707963267948966 rad + pos: 9.5,14.5 parent: 1 - proto: TomDrumsInstrument entities: @@ -19591,27 +20238,32 @@ entities: - type: Transform pos: 7.4858627,31.592508 parent: 1 -- proto: ToyRubberDuck +- proto: TrashNapkin entities: - - uid: 1675 + - uid: 2409 components: - type: Transform - pos: 9.481226,12.812635 + pos: 10.844567,14.360178 parent: 1 - - uid: 1931 + - uid: 2516 components: - type: Transform - pos: 9.991643,12.427218 + pos: 10.849197,14.809564 parent: 1 - - uid: 1992 + - uid: 2517 components: - type: Transform - pos: 10.741643,12.760551 + pos: 10.599329,14.953457 parent: 1 - - uid: 2008 + - uid: 2519 + components: + - type: Transform + pos: 10.636234,14.160965 + parent: 1 + - uid: 2520 components: - type: Transform - pos: 11.418726,12.448051 + pos: 10.6321535,14.659507 parent: 1 - proto: UniformShortsRed entities: @@ -19729,13 +20381,6 @@ entities: - type: Transform pos: 0.5,11.5 parent: 1 -- proto: VendingMachineDinnerware - entities: - - uid: 1209 - components: - - type: Transform - pos: 4.5,5.5 - parent: 1 - proto: VendingMachineEngiDrobe entities: - uid: 1131 @@ -23085,10 +23730,10 @@ entities: location: Crescent - proto: WaterCooler entities: - - uid: 3427 + - uid: 1158 components: - type: Transform - pos: 7.5,18.5 + pos: 7.5,19.5 parent: 1 - proto: WaterVaporCanister entities: diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index 7cc278a05ba..bceadd5f77a 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -41,3 +41,4 @@ Contractor: [ 0, 0 ] Pilot: [ 0, 0 ] Mercenary: [ 0, 0 ] +# StationAi: [ 0, 1 ] \ No newline at end of file From c6db297b120054b1bfc474ac7b7632beed77f483 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 7 Oct 2024 16:38:38 +0000 Subject: [PATCH 26/96] Automatic Changelog (#1945) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 24a7bbbd8d3..c726628aa71 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4319,3 +4319,9 @@ Entries: message: The ArcadiaDrobe no longer shows an error when denying vending. id: 5367 time: '2024-10-07T15:03:56.0000000+00:00' +- author: KyuPolaris + changes: + - type: Tweak + message: The Crescent now has been fitted with Air Alarms, engineers rejoice! + id: 5368 + time: '2024-10-07T16:38:08.0000000+00:00' From c1ecd9b4c702ba91d2d3c35efbdb10c9c6bbe7e5 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 7 Oct 2024 21:58:02 +0300 Subject: [PATCH 27/96] Update crescent.yml (#2165) --- Resources/Prototypes/_NF/Shipyard/crescent.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Shipyard/crescent.yml b/Resources/Prototypes/_NF/Shipyard/crescent.yml index bceadd5f77a..3c1dfd6eb2f 100644 --- a/Resources/Prototypes/_NF/Shipyard/crescent.yml +++ b/Resources/Prototypes/_NF/Shipyard/crescent.yml @@ -12,7 +12,7 @@ id: Crescent name: KC Crescent description: The Crescent, named for its exterior shape, is a vessel focused on providing service, medical aide, and scientific breakthroughs for smaller vessels. - price: 270000 # Appraises at 254471, ~6% markup - TODO: fix these values, getting tests to pass - Whatstone + price: 350020 # It do be like this. category: Large group: Shipyard shuttlePath: /Maps/_NF/Shuttles/crescent.yml From cb0aeb1c008e8016fa10d2192f95416fca24948f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Tue, 8 Oct 2024 00:24:09 +0300 Subject: [PATCH 28/96] Mapping Fixups (#2166) * Update crescent.yml * Help * Update disciple.yml * cad: ATM cash slot, floating pipe, ame jar * Fix ATM slot name * Indentation fix * Restore containers field --------- Co-authored-by: Whatstone --- Resources/Maps/_NF/Outpost/frontier.yml | 14 + Resources/Maps/_NF/Shuttles/caduceus.yml | 749 +++--------------- Resources/Maps/_NF/Shuttles/crescent.yml | 18 - Resources/Maps/_NF/Shuttles/sparrow.yml | 1 - Resources/Maps/_NF/Shuttles/stratos.yml | 21 - .../_NF/Shipyard/Scrap/disciple.yml | 2 +- 6 files changed, 106 insertions(+), 699 deletions(-) diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index 23ddc5471de..66bd5d2145f 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -31606,6 +31606,20 @@ entities: - type: Transform pos: 32.5,18.5 parent: 2173 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] - proto: SignAtmos entities: - uid: 785 diff --git a/Resources/Maps/_NF/Shuttles/caduceus.yml b/Resources/Maps/_NF/Shuttles/caduceus.yml index fd6518168c4..2a3a6e31050 100644 --- a/Resources/Maps/_NF/Shuttles/caduceus.yml +++ b/Resources/Maps/_NF/Shuttles/caduceus.yml @@ -947,8 +947,6 @@ entities: devices: - 852 - 936 - - type: AtmosDevice - joinedGrid: 1 - uid: 1170 components: - type: Transform @@ -959,8 +957,6 @@ entities: devices: - 851 - 938 - - type: AtmosDevice - joinedGrid: 1 - uid: 1172 components: - type: Transform @@ -971,8 +967,6 @@ entities: devices: - 857 - 995 - - type: AtmosDevice - joinedGrid: 1 - uid: 1173 components: - type: Transform @@ -985,8 +979,6 @@ entities: - 858 - 992 - 859 - - type: AtmosDevice - joinedGrid: 1 - uid: 1174 components: - type: Transform @@ -997,8 +989,6 @@ entities: devices: - 990 - 885 - - type: AtmosDevice - joinedGrid: 1 - uid: 1175 components: - type: Transform @@ -1009,8 +999,6 @@ entities: devices: - 886 - 993 - - type: AtmosDevice - joinedGrid: 1 - uid: 1176 components: - type: Transform @@ -1021,8 +1009,6 @@ entities: devices: - 887 - 994 - - type: AtmosDevice - joinedGrid: 1 - uid: 1177 components: - type: Transform @@ -1033,8 +1019,6 @@ entities: devices: - 849 - 937 - - type: AtmosDevice - joinedGrid: 1 - uid: 1178 components: - type: Transform @@ -1047,8 +1031,6 @@ entities: - 912 - 854 - 911 - - type: AtmosDevice - joinedGrid: 1 - uid: 1179 components: - type: Transform @@ -1058,8 +1040,6 @@ entities: - type: DeviceList devices: - 899 - - type: AtmosDevice - joinedGrid: 1 - uid: 1180 components: - type: Transform @@ -1070,8 +1050,6 @@ entities: devices: - 855 - 935 - - type: AtmosDevice - joinedGrid: 1 - uid: 1181 components: - type: Transform @@ -1082,8 +1060,6 @@ entities: devices: - 934 - 805 - - type: AtmosDevice - joinedGrid: 1 - uid: 1182 components: - type: Transform @@ -1094,8 +1070,6 @@ entities: devices: - 933 - 856 - - type: AtmosDevice - joinedGrid: 1 - proto: AirCanister entities: - uid: 895 @@ -1106,8 +1080,6 @@ entities: parent: 1 - type: Physics bodyType: Static - - type: AtmosDevice - joinedGrid: 1 - uid: 896 components: - type: Transform @@ -1116,21 +1088,15 @@ entities: parent: 1 - type: Physics bodyType: Static - - type: AtmosDevice - joinedGrid: 1 - uid: 1428 components: - type: Transform pos: 14.5,-14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: AirlockChemistry entities: - uid: 714 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-7.5 parent: 1 @@ -1152,15 +1118,11 @@ entities: entities: - uid: 114 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-18.5 parent: 1 - uid: 122 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 18.5,-18.5 parent: 1 @@ -1264,24 +1226,18 @@ entities: entities: - uid: 784 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -10.5,-14.5 parent: 1 - uid: 785 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -10.5,-13.5 parent: 1 - uid: 786 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 10.5,-15.5 @@ -1290,16 +1246,12 @@ entities: entities: - uid: 782 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-14.5 parent: 1 - uid: 783 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-13.5 @@ -1370,16 +1322,14 @@ entities: injecting: True - type: ContainerContainer containers: - AmeFuel: !type:ContainerSlot + fuelSlot: !type:ContainerSlot showEnts: False occludes: True - ent: 40 + ent: 113 - proto: AmeJar entities: - - uid: 40 + - uid: 113 components: - - type: MetaData - flags: InContainer - type: Transform parent: 314 - type: Physics @@ -1495,9 +1445,9 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-13.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 113 + - uid: 454 components: - type: Transform pos: 15.5,-17.5 @@ -1505,14 +1455,14 @@ entities: - uid: 1093 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,4.5 + rot: 1.5707963267948966 rad + pos: 9.5,6.5 parent: 1 - uid: 1094 components: - type: Transform rot: -1.5707963267948966 rad - pos: 9.5,6.5 + pos: -8.5,6.5 parent: 1 - uid: 1095 components: @@ -1523,25 +1473,23 @@ entities: - uid: 1096 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,6.5 + pos: -0.5,-17.5 parent: 1 - uid: 1097 components: - type: Transform - rot: -1.5707963267948966 rad pos: 1.5,-17.5 parent: 1 - uid: 1098 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-17.5 + pos: -14.5,-17.5 parent: 1 - - uid: 1381 + - uid: 1122 components: - type: Transform - pos: -14.5,-17.5 + rot: 1.5707963267948966 rad + pos: 9.5,4.5 parent: 1 - proto: BannerMedical entities: @@ -1563,8 +1511,6 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,-10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: BedsheetMedical entities: - uid: 696 @@ -3761,16 +3707,6 @@ entities: - type: Transform pos: -1.5,6.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: Chair entities: - uid: 739 @@ -3866,19 +3802,19 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,9.5 parent: 1 -- proto: chem_master +- proto: ChemistryHotplate entities: - - uid: 546 + - uid: 547 components: - type: Transform - pos: 3.5,-8.5 + pos: 3.5,-9.5 parent: 1 -- proto: ChemistryHotplate +- proto: ChemMaster entities: - - uid: 547 + - uid: 546 components: - type: Transform - pos: 3.5,-9.5 + pos: 3.5,-8.5 parent: 1 - proto: CloningPod entities: @@ -3887,12 +3823,12 @@ entities: - type: Transform pos: -4.5,-16.5 parent: 1 -- proto: ClosetBase +- proto: ClosetL3VirologyFilled entities: - - uid: 752 + - uid: 609 components: - type: Transform - pos: -6.5,-10.5 + pos: 3.5,-12.5 parent: 1 - type: EntityStorage air: @@ -3912,12 +3848,10 @@ entities: - 0 - 0 - 0 -- proto: ClosetL3VirologyFilled - entities: - - uid: 609 + - uid: 610 components: - type: Transform - pos: 3.5,-12.5 + pos: 4.5,-12.5 parent: 1 - type: EntityStorage air: @@ -3937,10 +3871,12 @@ entities: - 0 - 0 - 0 - - uid: 610 +- proto: ClosetSteelBase + entities: + - uid: 752 components: - type: Transform - pos: 4.5,-12.5 + pos: -6.5,-10.5 parent: 1 - type: EntityStorage air: @@ -4085,8 +4021,6 @@ entities: entities: - uid: 693 components: - - type: MetaData - flags: InContainer - type: Transform parent: 632 - type: Physics @@ -4094,20 +4028,11 @@ entities: - type: InsideEntityStorage - uid: 698 components: - - type: MetaData - flags: InContainer - type: Transform parent: 633 - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingHeadHelmetVoidParamed - entities: - - uid: 1147 - components: - - type: Transform - pos: 5.8327937,-5.3332853 - parent: 1 - proto: ClothingNeckStethoscope entities: - uid: 1394 @@ -4186,13 +4111,18 @@ entities: - type: Transform pos: 0.5,7.5 parent: 1 - - type: Physics - canCollide: False - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - type: Physics + canCollide: False - type: ItemSlots - proto: CrateFreezer entities: @@ -4265,15 +4195,11 @@ entities: - type: Transform pos: -3.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 691 components: - type: Transform pos: -2.5,2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: CryoxadoneBeakerSmall entities: - uid: 151 @@ -4657,8 +4583,6 @@ entities: - type: Transform pos: -1.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - proto: GasPassiveVent @@ -4669,8 +4593,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 913 @@ -4679,8 +4601,6 @@ entities: rot: 3.141592653589793 rad pos: 14.5,-18.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - proto: GasPipeBend @@ -5286,14 +5206,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0000FFFF' - - uid: 882 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,6.5 - parent: 1 - - type: AtmosPipeColor - color: '#0000FFFF' - uid: 883 components: - type: Transform @@ -6006,22 +5918,16 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 764 components: - type: Transform pos: 11.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 766 components: - type: Transform pos: 12.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasPressurePump entities: - uid: 774 @@ -6032,12 +5938,9 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - type: Label - originalName: gas pump currentLabel: Distro to Cryo - uid: 894 components: @@ -6047,12 +5950,9 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - type: Label - originalName: gas pump currentLabel: Port to Distro - proto: GasThermoMachineFreezer entities: @@ -6067,8 +5967,6 @@ entities: powerDisabled: False - type: AtmosPipeColor color: '#0000FFFF' - - type: AtmosDevice - joinedGrid: 1 - proto: GasVentPump entities: - uid: 805 @@ -6076,8 +5974,6 @@ entities: - type: Transform pos: -8.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 849 @@ -6086,8 +5982,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-7.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 850 @@ -6096,8 +5990,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 851 @@ -6106,8 +5998,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 852 @@ -6116,8 +6006,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 853 @@ -6125,8 +6013,6 @@ entities: - type: Transform pos: 4.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 854 @@ -6134,8 +6020,6 @@ entities: - type: Transform pos: 8.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 855 @@ -6144,8 +6028,6 @@ entities: rot: 1.5707963267948966 rad pos: -12.5,-14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 856 @@ -6153,8 +6035,6 @@ entities: - type: Transform pos: -4.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 857 @@ -6163,8 +6043,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 858 @@ -6172,8 +6050,6 @@ entities: - type: Transform pos: 4.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 859 @@ -6181,8 +6057,6 @@ entities: - type: Transform pos: -3.5,6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 885 @@ -6190,8 +6064,6 @@ entities: - type: Transform pos: 5.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 886 @@ -6199,8 +6071,6 @@ entities: - type: Transform pos: -4.5,9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - uid: 887 @@ -6208,8 +6078,6 @@ entities: - type: Transform pos: 1.5,8.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#0000FFFF' - proto: GasVentScrubber @@ -6220,8 +6088,6 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,-16.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 911 @@ -6229,8 +6095,6 @@ entities: - type: Transform pos: 7.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 912 @@ -6238,8 +6102,6 @@ entities: - type: Transform pos: 3.5,-12.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 933 @@ -6248,8 +6110,6 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 934 @@ -6258,8 +6118,6 @@ entities: rot: 3.141592653589793 rad pos: -9.5,-14.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 935 @@ -6268,8 +6126,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-13.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 936 @@ -6278,8 +6134,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 937 @@ -6288,8 +6142,6 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 938 @@ -6298,8 +6150,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 990 @@ -6307,8 +6157,6 @@ entities: - type: Transform pos: 6.5,8.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 991 @@ -6316,8 +6164,6 @@ entities: - type: Transform pos: 3.5,5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 992 @@ -6325,8 +6171,6 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 993 @@ -6334,8 +6178,6 @@ entities: - type: Transform pos: -5.5,8.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 994 @@ -6343,8 +6185,6 @@ entities: - type: Transform pos: -0.5,8.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 995 @@ -6353,8 +6193,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - uid: 996 @@ -6363,8 +6201,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-4.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - type: AtmosPipeColor color: '#FF0000FF' - proto: GravityGeneratorMini @@ -7109,6 +6945,14 @@ entities: - type: Transform pos: 2.5,8.5 parent: 1 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 1147 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-17.5 + parent: 1 - proto: LockerWallMedical entities: - uid: 781 @@ -7174,6 +7018,20 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] - proto: MedkitAdvancedFilled entities: - uid: 1118 @@ -7245,6 +7103,38 @@ entities: - type: Transform pos: -6.048698,-16.522701 parent: 1 +- proto: NFSignDock + entities: + - uid: 1362 + components: + - type: Transform + pos: -8.5,7.5 + parent: 1 + - uid: 1363 + components: + - type: Transform + pos: 9.5,3.5 + parent: 1 + - uid: 1364 + components: + - type: Transform + pos: 9.5,7.5 + parent: 1 + - uid: 1365 + components: + - type: Transform + pos: -8.5,3.5 + parent: 1 + - uid: 1366 + components: + - type: Transform + pos: 6.5,-19.5 + parent: 1 + - uid: 1367 + components: + - type: Transform + pos: -5.5,-19.5 + parent: 1 - proto: NitrousOxideCanister entities: - uid: 1375 @@ -7252,8 +7142,6 @@ entities: - type: Transform pos: -3.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: OperatingTable entities: - uid: 525 @@ -7353,132 +7241,98 @@ entities: entities: - uid: 52 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 8.5,-15.5 parent: 1 - uid: 1100 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-12.5 parent: 1 - uid: 1101 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 0.5,-14.5 parent: 1 - uid: 1102 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-9.5 parent: 1 - uid: 1103 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-6.5 parent: 1 - uid: 1104 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 5.5,-10.5 parent: 1 - uid: 1105 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,-3.5 parent: 1 - uid: 1106 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,1.5 parent: 1 - uid: 1107 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-0.5 parent: 1 - uid: 1110 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,12.5 parent: 1 - uid: 1111 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,12.5 parent: 1 - uid: 1112 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 0.5,8.5 parent: 1 - uid: 1136 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 16.5,-13.5 parent: 1 - uid: 1137 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -15.5,-13.5 parent: 1 - uid: 1326 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-9.5 parent: 1 - uid: 1327 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,4.5 parent: 1 - uid: 1328 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 3.5,4.5 @@ -7642,61 +7496,40 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - uid: 1437 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - uid: 1438 components: - type: Transform pos: -3.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - uid: 1439 components: - type: Transform pos: -4.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - uid: 1440 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - uid: 1441 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - uid: 1442 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - proto: ShuttleWindow entities: - uid: 21 @@ -8147,7 +7980,7 @@ entities: - type: Transform pos: 2.5,-12.5 parent: 1 -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 1432 components: @@ -8190,38 +8023,6 @@ entities: - type: Transform pos: -6.5,3.5 parent: 1 -- proto: NFSignDock - entities: - - uid: 1362 - components: - - type: Transform - pos: -8.5,7.5 - parent: 1 - - uid: 1363 - components: - - type: Transform - pos: 9.5,3.5 - parent: 1 - - uid: 1364 - components: - - type: Transform - pos: 9.5,7.5 - parent: 1 - - uid: 1365 - components: - - type: Transform - pos: -8.5,3.5 - parent: 1 - - uid: 1366 - components: - - type: Transform - pos: 6.5,-19.5 - parent: 1 - - uid: 1367 - components: - - type: Transform - pos: -5.5,-19.5 - parent: 1 - proto: SignSurgery entities: - uid: 748 @@ -8825,1409 +8626,1041 @@ entities: entities: - uid: 11 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,3.5 parent: 1 - uid: 12 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,3.5 parent: 1 - uid: 13 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,3.5 parent: 1 - uid: 14 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,3.5 parent: 1 - uid: 15 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,3.5 parent: 1 - uid: 16 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -8.5,3.5 parent: 1 - uid: 17 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -7.5,3.5 parent: 1 - uid: 18 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -8.5,7.5 parent: 1 - uid: 19 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -7.5,7.5 parent: 1 - uid: 20 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,7.5 parent: 1 - uid: 27 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 9.5,3.5 parent: 1 - uid: 28 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 8.5,3.5 parent: 1 - uid: 29 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,3.5 parent: 1 - uid: 31 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,3.5 parent: 1 - uid: 32 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,3.5 parent: 1 - uid: 33 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,3.5 parent: 1 - uid: 38 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,2.5 parent: 1 - uid: 39 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,1.5 parent: 1 - uid: 42 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-1.5 parent: 1 - uid: 43 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-2.5 parent: 1 - uid: 44 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,-2.5 parent: 1 - uid: 45 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-2.5 parent: 1 - uid: 46 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-2.5 parent: 1 - uid: 47 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,-2.5 parent: 1 - uid: 48 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-2.5 parent: 1 - uid: 49 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,2.5 parent: 1 - uid: 50 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,1.5 parent: 1 - uid: 53 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-1.5 parent: 1 - uid: 66 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 9.5,-10.5 parent: 1 - uid: 67 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 8.5,-7.5 parent: 1 - uid: 68 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 8.5,-9.5 parent: 1 - uid: 69 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 8.5,-10.5 parent: 1 - uid: 70 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 8.5,-11.5 parent: 1 - uid: 71 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-11.5 parent: 1 - uid: 72 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,-11.5 parent: 1 - uid: 73 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-11.5 parent: 1 - uid: 74 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,-11.5 parent: 1 - uid: 75 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-11.5 parent: 1 - uid: 76 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-11.5 parent: 1 - uid: 77 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-10.5 parent: 1 - uid: 80 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-5.5 parent: 1 - uid: 81 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-6.5 parent: 1 - uid: 82 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,-4.5 parent: 1 - uid: 84 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,-6.5 parent: 1 - uid: 85 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,-5.5 parent: 1 - uid: 86 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-6.5 parent: 1 - uid: 88 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 13.5,-10.5 parent: 1 - uid: 89 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 14.5,-10.5 parent: 1 - uid: 90 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 15.5,-10.5 parent: 1 - uid: 91 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 16.5,-10.5 parent: 1 - uid: 94 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 17.5,-11.5 parent: 1 - uid: 95 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-12.5 parent: 1 - uid: 96 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-13.5 parent: 1 - uid: 99 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-16.5 parent: 1 - uid: 100 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-17.5 parent: 1 - uid: 101 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 18.5,-19.5 parent: 1 - uid: 104 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-21.5 parent: 1 - uid: 105 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-22.5 parent: 1 - uid: 106 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 18.5,-23.5 parent: 1 - uid: 109 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-12.5 parent: 1 - uid: 110 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-22.5 parent: 1 - uid: 111 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-21.5 parent: 1 - uid: 115 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-17.5 parent: 1 - uid: 116 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-16.5 parent: 1 - uid: 119 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-13.5 parent: 1 - uid: 120 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-12.5 parent: 1 - uid: 121 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-10.5 parent: 1 - uid: 124 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -15.5,-10.5 parent: 1 - uid: 127 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -16.5,-11.5 parent: 1 - uid: 130 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -16.5,-16.5 parent: 1 - uid: 132 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-17.5 parent: 1 - uid: 134 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,-0.5 parent: 1 - uid: 136 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-16.5 parent: 1 - uid: 137 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-13.5 parent: 1 - uid: 148 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -17.5,-23.5 parent: 1 - uid: 149 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -16.5,-17.5 parent: 1 - uid: 150 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-19.5 parent: 1 - uid: 152 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -16.5,-20.5 parent: 1 - uid: 153 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -16.5,-21.5 parent: 1 - uid: 154 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -16.5,-22.5 parent: 1 - uid: 155 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 11.5,-16.5 parent: 1 - uid: 156 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 8.5,-16.5 parent: 1 - uid: 157 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 9.5,-16.5 parent: 1 - uid: 158 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 10.5,-16.5 parent: 1 - uid: 159 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 10.5,-14.5 parent: 1 - uid: 160 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 10.5,-13.5 parent: 1 - uid: 161 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 10.5,-12.5 parent: 1 - uid: 162 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 10.5,-11.5 parent: 1 - uid: 163 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 9.5,-11.5 parent: 1 - uid: 164 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 12.5,-11.5 parent: 1 - uid: 165 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 11.5,-11.5 parent: 1 - uid: 166 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,-6.5 parent: 1 - uid: 167 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,-7.5 parent: 1 - uid: 168 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,-7.5 parent: 1 - uid: 169 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -5.5,-7.5 parent: 1 - uid: 170 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,-5.5 parent: 1 - uid: 171 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,-6.5 parent: 1 - uid: 172 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,-7.5 parent: 1 - uid: 173 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -5.5,-4.5 parent: 1 - uid: 175 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-7.5 parent: 1 - uid: 177 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-9.5 parent: 1 - uid: 178 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -8.5,-10.5 parent: 1 - uid: 179 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-10.5 parent: 1 - uid: 180 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-11.5 parent: 1 - uid: 181 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,-11.5 parent: 1 - uid: 182 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-12.5 parent: 1 - uid: 183 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-15.5 parent: 1 - uid: 184 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -7.5,-16.5 parent: 1 - uid: 185 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -8.5,-16.5 parent: 1 - uid: 186 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -9.5,-16.5 parent: 1 - uid: 187 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -10.5,-16.5 parent: 1 - uid: 188 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -10.5,-15.5 parent: 1 - uid: 189 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -10.5,-12.5 parent: 1 - uid: 190 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -10.5,-11.5 parent: 1 - uid: 191 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -9.5,-11.5 parent: 1 - uid: 192 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -8.5,-11.5 parent: 1 - uid: 193 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -11.5,-11.5 parent: 1 - uid: 194 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -11.5,-17.5 parent: 1 - uid: 195 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -5.5,-18.5 parent: 1 - uid: 196 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -5.5,-19.5 parent: 1 - uid: 197 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -5.5,-17.5 parent: 1 - uid: 198 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -6.5,-17.5 parent: 1 - uid: 199 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 6.5,-19.5 parent: 1 - uid: 200 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 6.5,-18.5 parent: 1 - uid: 201 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 6.5,-17.5 parent: 1 - uid: 202 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 7.5,-17.5 parent: 1 - uid: 209 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 2.5,-17.5 parent: 1 - uid: 210 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,-17.5 parent: 1 - uid: 211 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 2.5,-15.5 parent: 1 - uid: 212 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,-15.5 parent: 1 - uid: 225 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 2.5,-14.5 parent: 1 - uid: 226 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 2.5,-12.5 parent: 1 - uid: 229 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,-8.5 parent: 1 - uid: 230 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,-9.5 parent: 1 - uid: 231 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -2.5,-11.5 parent: 1 - uid: 258 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,14.5 parent: 1 - uid: 259 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,14.5 parent: 1 - uid: 260 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,13.5 parent: 1 - uid: 261 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 6.5,13.5 parent: 1 - uid: 262 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 5.5,13.5 parent: 1 - uid: 263 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,12.5 parent: 1 - uid: 264 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,13.5 parent: 1 - uid: 265 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,12.5 parent: 1 - uid: 268 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,9.5 parent: 1 - uid: 269 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,8.5 parent: 1 - uid: 270 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 8.5,7.5 parent: 1 - uid: 271 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,7.5 parent: 1 - uid: 272 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 7.5,8.5 parent: 1 - uid: 274 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 9.5,7.5 parent: 1 - uid: 275 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,11.5 parent: 1 - uid: 276 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,10.5 parent: 1 - uid: 277 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,9.5 parent: 1 - uid: 278 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 3.5,7.5 parent: 1 - uid: 279 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 0.5,7.5 parent: 1 - uid: 280 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,11.5 parent: 1 - uid: 281 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,10.5 parent: 1 - uid: 282 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,9.5 parent: 1 - uid: 283 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,12.5 parent: 1 - uid: 284 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,13.5 parent: 1 - uid: 285 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,14.5 parent: 1 - uid: 286 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -5.5,13.5 parent: 1 - uid: 287 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,13.5 parent: 1 - uid: 288 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,14.5 parent: 1 - uid: 289 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,13.5 parent: 1 - uid: 293 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,9.5 parent: 1 - uid: 294 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -7.5,8.5 parent: 1 - uid: 295 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -6.5,8.5 parent: 1 - uid: 299 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,7.5 parent: 1 - uid: 300 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-12.5 parent: 1 - uid: 301 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,-11.5 parent: 1 - uid: 321 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -16.5,-13.5 parent: 1 - uid: 322 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -16.5,-12.5 parent: 1 - uid: 346 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 12.5,-17.5 parent: 1 - uid: 729 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 3.5,8.5 parent: 1 - uid: 730 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -2.5,8.5 parent: 1 - uid: 743 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,0.5 parent: 1 - uid: 779 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -8.5,2.5 parent: 1 - uid: 780 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 9.5,2.5 parent: 1 - uid: 1188 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-21.5 parent: 1 - uid: 1245 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 18.5,-20.5 parent: 1 - uid: 1246 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-20.5 parent: 1 - uid: 1280 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -7.5,12.5 parent: 1 - uid: 1377 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-22.5 parent: 1 - uid: 1400 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -17.5,-20.5 parent: 1 diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index a2cef036782..96bd6b9f386 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -9712,8 +9712,6 @@ entities: pos: -4.5,28.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2643 - uid: 1348 @@ -9722,8 +9720,6 @@ entities: pos: -5.5,28.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2643 - uid: 1349 @@ -9732,8 +9728,6 @@ entities: pos: -6.5,28.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2643 - uid: 1350 @@ -14846,8 +14840,6 @@ entities: pos: -8.5,24.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2255 - type: AtmosPipeColor @@ -14870,8 +14862,6 @@ entities: pos: 0.5,26.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2255 - type: AtmosPipeColor @@ -14926,8 +14916,6 @@ entities: pos: -1.5,26.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2255 - type: AtmosPipeColor @@ -15293,8 +15281,6 @@ entities: pos: -1.5,27.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2255 - type: AtmosPipeColor @@ -15551,8 +15537,6 @@ entities: pos: -9.5,24.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2255 - type: AtmosPipeColor @@ -15710,8 +15694,6 @@ entities: pos: 1.5,28.5 parent: 1 - type: DeviceNetwork - configurators: - - invalid deviceLists: - 2255 - type: AtmosPipeColor diff --git a/Resources/Maps/_NF/Shuttles/sparrow.yml b/Resources/Maps/_NF/Shuttles/sparrow.yml index 9a3a1e0856a..7804413c435 100644 --- a/Resources/Maps/_NF/Shuttles/sparrow.yml +++ b/Resources/Maps/_NF/Shuttles/sparrow.yml @@ -1758,7 +1758,6 @@ entities: - uid: 158 components: - type: Transform - rot: 1.5707963267948966 rad pos: -3.5,3.5 parent: 174 - proto: MachineFrame diff --git a/Resources/Maps/_NF/Shuttles/stratos.yml b/Resources/Maps/_NF/Shuttles/stratos.yml index 3ec708b9a17..83683a38036 100644 --- a/Resources/Maps/_NF/Shuttles/stratos.yml +++ b/Resources/Maps/_NF/Shuttles/stratos.yml @@ -729,7 +729,6 @@ entities: - uid: 983 components: - type: Transform - rot: -1.5707963267948966 rad pos: 8.5,16.5 parent: 1 - proto: AirlockCargo @@ -744,19 +743,16 @@ entities: - uid: 86 components: - type: Transform - rot: 3.141592653589793 rad pos: -7.5,21.5 parent: 1 - uid: 453 components: - type: Transform - rot: 3.141592653589793 rad pos: -3.5,16.5 parent: 1 - uid: 454 components: - type: Transform - rot: 3.141592653589793 rad pos: -3.5,17.5 parent: 1 - proto: AirlockCommandGlass @@ -764,7 +760,6 @@ entities: - uid: 266 components: - type: Transform - rot: 3.141592653589793 rad pos: 0.5,18.5 parent: 1 - proto: AirlockExternalGlass @@ -782,13 +777,11 @@ entities: - uid: 126 components: - type: Transform - rot: 3.141592653589793 rad pos: -10.5,4.5 parent: 1 - uid: 158 components: - type: Transform - rot: 3.141592653589793 rad pos: 11.5,4.5 parent: 1 - uid: 294 @@ -816,31 +809,26 @@ entities: - uid: 252 components: - type: Transform - rot: -1.5707963267948966 rad pos: 6.5,20.5 parent: 1 - uid: 437 components: - type: Transform - rot: 3.141592653589793 rad pos: 3.5,14.5 parent: 1 - uid: 438 components: - type: Transform - rot: 3.141592653589793 rad pos: 2.5,14.5 parent: 1 - uid: 441 components: - type: Transform - rot: 3.141592653589793 rad pos: 4.5,17.5 parent: 1 - uid: 446 components: - type: Transform - rot: 3.141592653589793 rad pos: 4.5,16.5 parent: 1 - proto: AirlockGlassShuttle @@ -858,25 +846,21 @@ entities: - uid: 1062 components: - type: Transform - rot: -1.5707963267948966 rad pos: -11.5,20.5 parent: 1 - uid: 1063 components: - type: Transform - rot: -1.5707963267948966 rad pos: -11.5,18.5 parent: 1 - uid: 1064 components: - type: Transform - rot: 1.5707963267948966 rad pos: 12.5,20.5 parent: 1 - uid: 1065 components: - type: Transform - rot: 1.5707963267948966 rad pos: 12.5,18.5 parent: 1 - proto: AirlockMaint @@ -884,7 +868,6 @@ entities: - uid: 507 components: - type: Transform - rot: -1.5707963267948966 rad pos: -1.5,12.5 parent: 1 - proto: AirlockScienceGlass @@ -912,25 +895,21 @@ entities: - uid: 455 components: - type: Transform - rot: 3.141592653589793 rad pos: -0.5,14.5 parent: 1 - uid: 457 components: - type: Transform - rot: 3.141592653589793 rad pos: -0.5,11.5 parent: 1 - uid: 458 components: - type: Transform - rot: 3.141592653589793 rad pos: -0.5,7.5 parent: 1 - uid: 1041 components: - type: Transform - rot: 3.141592653589793 rad pos: -8.5,7.5 parent: 1 - proto: AirSensor diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml index 26d53b1aab0..ca34fce2c05 100644 --- a/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml +++ b/Resources/Prototypes/_NF/Shipyard/Scrap/disciple.yml @@ -12,7 +12,7 @@ id: Disciple name: NSV Disciple description: A cheaply made amalgamation of religious ships. For the seasoned religious assistant. - price: 11300 + price: 15000 # Appraises at 12179, ~25% margin - TODO: fix this value, getting tests to pass - Whatstone category: Small group: Scrap shuttlePath: /Maps/_NF/Shuttles/Scrap/disciple.yml From 90ec949f61339b225b4f868a42c46bbea2d43d97 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Wed, 9 Oct 2024 01:01:01 +0300 Subject: [PATCH 29/96] Add ship tests and extra tests fixups (#2170) * Fixup all tests except integration and add the ship one * GitHub credits * update-credits repo comment * Remove my dupe, restore GITHUB_TOKEN * ATC email consistency --------- Co-authored-by: Whatstone --- .github/workflows/build-map-renderer.yml | 2 +- .github/workflows/build-test-debug.yml | 11 +++++- .github/workflows/conflict-labeler.yml | 2 +- .github/workflows/labeler-pr.yml | 14 +++++++ ...ntier-mapchecker.yml => nf-mapchecker.yml} | 0 .github/workflows/pr-labeler.yml | 24 ------------ .github/workflows/update-credits.yml | 37 ++++++------------- .github/workflows/validate-rgas.yml | 2 +- .github/workflows/validate_mapfiles.yml | 2 +- .github/workflows/yaml-linter.yml | 2 +- Resources/Credits/GitHub.txt | 2 +- .../Locale/en-US/credits/credits-window.ftl | 3 +- Tools/contribs_shared.ps1 | 2 + Tools/dump_github_contributors.ps1 | 2 +- 14 files changed, 47 insertions(+), 58 deletions(-) create mode 100644 .github/workflows/labeler-pr.yml rename .github/workflows/{frontier-mapchecker.yml => nf-mapchecker.yml} (100%) delete mode 100644 .github/workflows/pr-labeler.yml diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index 35aed1a7f7f..826bc59ab2b 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -10,7 +10,7 @@ on: jobs: build: - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier strategy: matrix: os: [ubuntu-latest] diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index ed7133ba41c..2cfe5094402 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -7,10 +7,13 @@ on: pull_request: types: [ opened, reopened, synchronize, ready_for_review ] branches: [ master ] + pull_request_target: # Frontier: only run tests on C# changes + paths: # Frontier + - "**/*.cs" # Frontier jobs: build: - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier strategy: matrix: os: [ubuntu-latest] @@ -46,6 +49,12 @@ jobs: - name: Run Content.Tests run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0 + + # - name: Run Content.IntegrationTests + # shell: pwsh + # run: | + # $env:DOTNET_gcServer=1 + # dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed ci-success: name: Build & Test Debug needs: diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 1e2125c30a2..adcc983123e 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -10,7 +10,7 @@ on: jobs: Label: - if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) + if: ( github.event.pull_request.draft == false ) && ( github.actor != 'PJBot' ) && ( github.actor != 'FrontierATC' ) # Frontier runs-on: ubuntu-latest steps: - name: Check for Merge Conflicts diff --git a/.github/workflows/labeler-pr.yml b/.github/workflows/labeler-pr.yml new file mode 100644 index 00000000000..d95704ef9ec --- /dev/null +++ b/.github/workflows/labeler-pr.yml @@ -0,0 +1,14 @@ +name: "Labels: PR" + +on: +- pull_request_target + +jobs: + labeler: + if: github.actor != 'PJBot' && github.actor != 'FrontierATC' # Frontier + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v5 \ No newline at end of file diff --git a/.github/workflows/frontier-mapchecker.yml b/.github/workflows/nf-mapchecker.yml similarity index 100% rename from .github/workflows/frontier-mapchecker.yml rename to .github/workflows/nf-mapchecker.yml diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml deleted file mode 100644 index 8700f52fc1c..00000000000 --- a/.github/workflows/pr-labeler.yml +++ /dev/null @@ -1,24 +0,0 @@ -# This workflow will triage pull requests and apply a label based on the -# paths that are modified in the pull request. -# -# To use this workflow, you will need to set up a .github/labeler.yml -# file with configuration. For more information, see: -# https://github.com/actions/labeler - -# This is entirely a github default file, except for this comment, but it should be fine. -Tsjip - -name: Labeler -on: [pull_request_target] - -jobs: - label: - - runs-on: ubuntu-latest - permissions: - contents: read - pull-requests: write - - steps: - - uses: actions/labeler@v4 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/update-credits.yml b/.github/workflows/update-credits.yml index 87babfa2a68..878173e5002 100644 --- a/.github/workflows/update-credits.yml +++ b/.github/workflows/update-credits.yml @@ -4,19 +4,19 @@ on: workflow_dispatch: schedule: - cron: 0 0 * * 0 - + jobs: get_credits: runs-on: ubuntu-latest # Hey there fork dev! If you like to include your own contributors in this then you can probably just change this to your own repo # Do this in dump_github_contributors.ps1 too into your own repo - if: github.repository == 'space-wizards/space-station-14' - + if: github.repository == 'new-frontiers-14/frontier-station-14' # Frontier: space-wizards/space-station-14 Resources/Credits/Patrons.yml - + # run: Tools/script2dumppatreons > Resources/Credits/Patrons.yml + # MAKE SURE YOU ENABLED "Allow GitHub Actions to create and approve pull requests" IN YOUR ACTIONS, OTHERWISE IT WILL MOST LIKELY FAIL - # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. + # For this you can use a pat token of an account with direct push access to the repo if you have protected branches. # Uncomment this and comment the other line if you do this. # https://github.com/stefanzweifel/git-auto-commit-action#push-to-protected-branches - - #- name: Commit new credit files - # uses: stefanzweifel/git-auto-commit-action@v4 - # with: - # commit_message: Update Credits - # commit_author: PJBot - - # This will make a PR - - name: Set current date as env variable - run: echo "NOW=$(date +'%Y-%m-%dT%H-%M-%S')" >> $GITHUB_ENV - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v5 + + - name: Commit new credit files + uses: stefanzweifel/git-auto-commit-action@v4 with: - commit-message: Update Credits - title: Update Credits - body: This is an automated Pull Request. This PR updates the github contributors in the credits section. - author: PJBot - branch: automated/credits-${{env.NOW}} + commit_message: Update Credits + commit_author: FrontierATC \ No newline at end of file diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml index 2c4bb40fdf3..5a302d612b8 100644 --- a/.github/workflows/validate-rgas.yml +++ b/.github/workflows/validate-rgas.yml @@ -9,7 +9,7 @@ on: jobs: yaml-schema-validation: name: YAML RGA schema validator - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/.github/workflows/validate_mapfiles.yml b/.github/workflows/validate_mapfiles.yml index fb11e1a4697..ccc3bffe88e 100644 --- a/.github/workflows/validate_mapfiles.yml +++ b/.github/workflows/validate_mapfiles.yml @@ -9,7 +9,7 @@ on: jobs: yaml-schema-validation: name: YAML map schema validator - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 691eb29f1de..e7e666508fc 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -10,7 +10,7 @@ on: jobs: build: name: YAML Linter - if: github.actor != 'PJBot' && github.event.pull_request.draft == false + if: github.actor != 'PJBot' && github.event.pull_request.draft == false && github.actor != 'FrontierATC' # Frontier runs-on: ubuntu-latest steps: - uses: actions/checkout@v3.6.0 diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 21d0f430bdf..da8b9d234ee 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, africalimedrop, Afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, BackeTako, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhenrich, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boiled-water-tsar, BombasterDS, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, Charlese2, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DakotaGay, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, DeathCamel58, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, Dutch-VanDerLinde, dvir001, Dynexust, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Henry, HerCoyote23, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, koteq, KrasnoshchekovPavel, Krunklehorn, Kukutis96513, Kupie, kxvvv, kyupolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, LetterN, lettern, Level10Cybermancer, LEVELcat, lever1209, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, localcc, lokachop, Lomcastar, LordCarve, LordEclipse, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, Magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, Mangohydra, marboww, Markek1, Matz05, max, MaxNox7, maylokana, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, moderatelyaware, modern-nm, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, NotSoDana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nyeogmi, Nylux, Nyranu, och-och, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, peccneck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, Phill101, phunnyguy, pigeonpeas, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, qwerltaz, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, rbertoche, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, saga3152, saintmuntzer, Salex08, sam, samgithubaccount, SaphireLattice, SapphicOverload, Sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, Shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, SpaceManiac, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, TemporalOroboros, tentekal, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, TyAshley, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, Unkn0wnGh0st333, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, VMSolidus, voidnull000, volotomite, volundr-, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, waylon531, weaversam8, wertanchik, whateverusername0, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, zerorulez, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem, zzylex +0x6273, 12rabbits, 13spacemen, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 3nderall, 4310v343k, 4dplanner, 612git, 778b, Ablankmann, abregado, Absolute-Potato, achookh, Acruid, actioninja, Actualcatmoment, actually-reb, ada-please, adamsong, Adeinitas, Admiral-Obvious-001, adrian, Adrian16199, Ady4ik, Aerocrux, Aeshus, Aexolott, Aexxie, AF-Buyrcsp2, africalimedrop, afrokada, Agoichi, Ahion, aiden, AJCM-git, AjexRose, Alekshhh, alexkar598, AlexMorgan3817, alexumandxgabriel08x, Alithsko, AlmondFlour, ALMv1, Alpha-Two, AlphaQwerty, Altoids1, amylizzle, ancientpower, Andre19926, AndrewEyeke, AndreyCamper, Anzarot121, Appiah, ar4ill, ArchPigeon, ArchRBX, areitpog, Arendian, arimah, Arkanic, ArkiveDev, armoks, Arteben, ArthurMousatov, ArtisticRoomba, artur, AruMoon, ArZarLordOfMango, as334, AsikKEsel, AsnDen, asperger-sind, aspiringLich, astriloqua, august-sun, AutoOtter, avghdev, Awlod, AzzyIsNotHere, backetako, BananaFlambe, Baptr0b0t, BasedUser, Batuh1n, beck-thompson, bellwetherlogic, benev0, benjamin-burges, BGare, bhespiritu, bibbly, BIGZi0348, bingojohnson, BismarckShuffle, Bixkitts, Blackern5000, Blackszedows, Blazeror, BlitzTheSquishy, bloodrizer, Bloody2372, blueDev2, Boaz1111, BobdaBiscuit, BobTheSleder, boettcherdasoriginal, boiled-water-tsar, BombasterDS, BorisTakerman, botanySupremist, brainfood1183, BramvanZijp, Brandon-Huu, BriBrooo, Bright0, brndd, bryce0110, BubblegumBlue, buletsponge, buntobaggins, bvelliquette, byondfuckery, c0rigin, c4llv07e, CaasGit, Caconym27, Calecute, Callmore, capnsockless, CaptainSqrBeard, Carbonhell, Carolyn3114, Carou02, carteblanche4me, CatTheSystem, Centronias, chairbender, CharcoalShipyard, Charlese2, ChaseFlorom, chavonadelal, Cheackraze, cheesePizza2, cheeseplated, Chief-Engineer, chillyconmor, christhirtle, chrome-cirrus, chromiumboy, Chronophylos, Chubbicous, Chubbygummibear, Ciac32, cite2000, civilCornball, Clement-O, clyf, Clyybber, CMDR-Piboy314, cohanna, Cohnway, Cojoke-dot, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, CookieMasterT, coolboy911, coolmankid12345, Coolsurf6, corentt, CormosLemming, crazybrain23, creadth, CrigCrag, croilbird, Crotalus, CrudeWax, crystalHex, CrzyPotato, Cu1r, Cyberboss, cynical24, d34d10cc, DadeKuma, Daemon, daerSeebaer, dahnte, dakamakat, DamianX, DangerRevolution, daniel-cr, DanSAussieITS, Daracke, Darkenson, DawBla, Daxxi3, dch-GH, de0rix, Deahaka, dean, DEATHB4DEFEAT, Deatherd, deathride58, DebugOk, Decappi, Decortex, Deeeeja, deepdarkdepths, degradka, Delete69, deltanedas, DenisShvalov, DerbyX, derek, dersheppard, Deserty0, Detintinto, DevilishMilk, dexlerxd, dffdff2423, DieselMohawk, digitalic, Dimastra, DinoWattz, DisposableCrewmember42, DjfjdfofdjfjD, doc-michael, docnite, Doctor-Cpu, DoctorBeard, DogZeroX, dolgovmi, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, dragonryan06, drakewill-CRL, Drayff, dreamlyjack, DrEnzyme, drhat, dribblydrone, DrMelon, drongood12, DrSingh, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, dukevanity, duskyjay, DustScoundrel, dustylens, Dutch-VanDerLinde, dvir001, Dynexust, Eagle0600, Easypoller, echo, eclips_e, eden077, EEASAS, Efruit, efzapa, Ekkosangen, ElectroSR, elsie, elthundercloud, Elysium206, Emisse, emmafornash, EmoGarbage404, Endecc, eoineoineoin, ErhardSteinhauer, eris, erohrs2, ERORR404V1, Errant-4, ertanic, esguard, estacaoespacialpirata, eugene, exincore, exp111, f0x-n3rd, FacePluslll, Fahasor, FairlySadPanda, FATFSAAM2, Feluk6174, ficcialfaint, Fiftyllama, Fildrance, FillerVK, FinnishPaladin, FirinMaLazors, Fishfish458, FL-OZ, Flareguy, flashgnash, FluffiestFloof, FluidRock, foboscheshir, FoLoKe, fooberticus, ForestNoises, forgotmyotheraccount, forkeyboards, forthbridge, Fortune117, Fouin, foxhorn, FoxxoTrystan, freeman2651, freeze2222, Froffy025, Fromoriss, froozigiusz, FrostMando, FungiFellow, FunTust, Futuristic-OK, GalacticChimp, Gaxeer, gbasood, Geekyhobo, genderGeometries, GeneralGaws, Genkail, geraeumig, Ghagliiarghii, Ghost-Prince, GingerAvalanche, Git-Nivrak, githubuser508, gituhabu, GlassEclipse, GNF54, godisdeadLOL, goet, Goldminermac, Golinth, GoodWheatley, Gorox221, graevy, GraniteSidewalk, Graugr, GreaseMonk, greenrock64, GreyMario, GTRsound, gusxyz, Gyrandola, h3half, Hamblinius, hamurlik, Hanzdegloker, HappyRoach, Hardly3D, harikattar, he1acdvv, Hebi, Helicaste, Henry, HerCoyote23, HighTechPuddle, hitomishirichan, hiucko, Hmeister-fake, Hmeister-real, Hobbitmax, hobnob, HoidC, Holinka4ever, holyssss, HoofedEar, Hoolny, hord-brayden, Houtblokje, Hreno, hubismal, Hugal31, Huxellberger, Hyenh, i-justuser-i, iacore, IamVelcroboy, Ian321, icekot8, icesickleone, iczero, IData-RedactedI, iglov, IgorAnt028, igorsaux, ike709, illersaver, Illiux, Ilushkins33, Ilya246, IlyaElDunaev, imrenq, imweax, indeano, Injazz, InsanityMoose, Insineer, IntegerTempest, Interrobang01, Iocanthos, IProduceWidgets, itsmethom, Itzbenz, iztokbajcar, Jackal298, Jackrost, jacksonzck, Jackw2As, jacob, jamessimo, janekvap, Jark255, Jaskanbe, JasperJRoth, jerryimmouse, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JimGamemaster, jimmy12or, JIPDawg, jjtParadox, jmcb, JoeHammad1844, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, justdie12, justin, justintether, JustinTrotter, justtne, K-Dynamic, k3yw, Kadeo64, Kaga-404, KaiShibaa, kalane15, kalanosh, Kanashi-Panda, Katarn1933, katzenminer, kbailey-git, Keelin, Keer-Sar, KEEYNy, keikiru, Kelrak, kennedy, kennedytcooper, kerisargit, keronshb, Kesiath, KIBORG04, Killerqu00, Kimpes, KingFroozy, kira-er, Kirillcas, Kirus59, Kistras, Kit0vras, KittenColony, klaypexx, Kmc2000, Ko4ergaPunk, kognise, kokoc9n, komunre, KonstantinAngelov, koteq, KrasnoshchekovPavel, Krunklehorn, Kupie, kxvvv, KyuPolaris, kzhanik, lajolico, Lamrr, LankLTE, laok233, lapatison, larryrussian, lawdog4817, Lazzi0706, Leander-0, leonardo-dabepis, leonsfriedrich, LeoSantich, letholldus, lettern, LetterN, Level10Cybermancer, LEVELcat, lever1209, lexs0sa, Lgibb18, lgruthes, LightVillet, liltenhead, LinkUyx, LittleBuilderJane, lizelive, localcc, lokachop, Lokey82, Lomcastar, LordCarve, LordEclipse, lucas, LucasTheDrgn, luckyshotpictures, LudwigVonChesterfield, luizwritescode, Lukasz825700516, luminight, lunarcomets, luringens, lvvova1, Lyndomen, lyroth001, lzimann, lzk228, M3739, mac6na6na, MACMAN2003, Macoron, magicalus, magmodius, MagnusCrowe, malchanceux, MaloTV, ManelNavola, manelnavola, Mangohydra, marboww, Markek1, MatthewBadger, Matz05, max, MaxNox7, maylokana, McBosserson, MehimoNemo, MeltedPixel, MemeProof, MendaxxDev, Menshin, Mephisto72, MerrytheManokit, Mervill, metalgearsloth, MetalSage, MFMessage, mhamsterr, michaelcu, micheel665, MilenVolf, milon, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MissKay1994, MisterMecky, Mith-randalf, MjrLandWhale, mkanke-real, MLGTASTICa, mnemosynium, Mnemotechnician, moderatelyaware, modern-nm, MoistBiscuits, mokiros, Moneyl, Moomoobeef, moony, Morb0, mr-bo-jangles, Mr0maks, MrFippik, mrrobdemo, MureixloI, musicmanvr, MWKane, Myakot, Myctai, Mygnol, Myzumi, N3X15, nails-n-tape, Nairodian, Naive817, NakataRin, namespace-Memory, Nannek, NazrinNya, neuPanda, neutrino-laser, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, NIXC, NkoKirkto, nmajask, No-Dad-Not-The-Belt, noctyrnal, nok-ko, NonchalantNoob, NoobyLegion, Nopey, not-gavnaed, notafet, notquitehadouken, notsodana, noudoit, noverd, NuclearWinter, nukashimika, nuke-haus, NULL882, nullarmo, nullwanderer, nyeogmi, Nylux, nyozzl, Nyranu, och-och, OCOtheOmega, OctoRocket, OldDanceJacket, OliverOtter, onoira, OnyxTheBrave, OrangeMoronage9622, osjarw, Ostaf, othymer, OttoMaticode, Owai-Seek, packmore, paigemaeforrest, pali6, Pangogie, panzer-iv1, partyaddict, patrikturi, PaulRitter, PeccNeck, Peptide90, peptron1, PeterFuto, PetMudstone, pewter-wiz, Pgriha, Phantom-Lily, Phill101, phunnyguy, PilgrimViis, Pill-U, Pireax, Pissachu, pissdemon, PixeltheAertistContrib, PixelTheKermit, PJB3005, Plasmaguy, plinyvic, Plykiya, poeMota, pofitlo, pointer-to-null, pok27, PolterTzi, PoorMansDreams, PopGamer45, portfiend, potato1234x, PotentiallyTom, ProfanedBane, ProPandaBear, PrPleGoo, ps3moira, Pspritechologist, Psychpsyo, psykzz, PuceTint, PuroSlavKing, PursuitInAshes, Putnam3145, quatre, QueerNB, QuietlyWhisper, Qulibly, qwerltaz, RadiantFlash7, RadioMull, Radosvik, Radrark, Rainbeon, Rainfey, Raitononai, Ramlik, RamZ, randy10122, Rane, Ranger6012, Rapidgame7, ravage123321, ray-boop, rbertoche, RealIHaveANameOfficial, RealJoesphStalin, Redfire1331, Redict, RedlineTriad, redmushie, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, Renlou, retequizzle, RiceMar1244, rich-dunne, RieBi, riggleprime, RIKELOLDABOSS, rinary1, Rinkashikachi, riolume, RobbyTheFish, Rockdtben, Rohesie, rok-povsic, rolfero, RomanNovo, rosieposieeee, Roudenn, router, RumiTiger, S1rFl0, S1ss3l, Saakra, SabatonShip, Sadie-silly, saga3152, saintmuntzer, Salex08, Salvantrix, sam, samgithubaccount, SaphireLattice, SapphicOverload, sarahon, sativaleanne, SaveliyM360, sBasalto, ScalyChimp, ScarKy0, scrato, Scribbles0, scruq445, scuffedjays, ScumbagDog, Segonist, sephtasm, Serkket, sewerpig, sh18rw, ShadeAware, ShadowCommander, shadowtheprotogen546, shaeone, shampunj, shariathotpatrol, Shodhans, Shroomerian, SignalWalker, siigiil, Simyon264, sirdragooon, Sirionaut, SirMcSlushers, Sk1tch, SkaldetSkaeg, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, Slyfox333, snebl, snicket, sniperchance, Snowni, snowsignal, SolidusSnek, SonicHDC, SoulFN, SoulSloth, Soundwavesghost, Soydium, spacedwarf14, SpaceLizardSky, SpaceManiac, SpaceyLady, spanky-spanky, spartak, SpartanKadence, SpeltIncorrectyl, Spessmann, SphiraI, SplinterGP, spoogemonster, sporekto, ssdaniel24, stalengd, stanberytrask, Stanislav4ix, StanTheCarpenter, Stealthbomber16, stellar-novas, sTiKyt, stopbreaking, stopka-html, StrawberryMoses, Stray-Pyramid, strO0pwafel, Strol20, StStevens, Subversionary, sunbear-dev, superjj18, Supernorn, SurfinNinja1, SweptWasTaken, Sybil, SYNCHRONIC, Szunti, tadjohnson00, Tainakov, takemysoult, TaralGit, Taran, taurie, Tayrtahn, tday93, TekuNut, telyonok, Temoffy, TemporalOroboros, tentekal, terezi-station, terezi4real, Terraspark4941, texcruize, TGODiamond, TGRCdev, tgrkzus, ThatOneGoblin25, thatrandomcanadianguy, TheArturZh, theashtronaut, thecopbennet, TheCze, TheDarkElites, thedraccx, TheEmber, TheIntoxicatedCat, thekilk, themias, Theomund, theOperand, TherapyGoth, TheShuEd, thetolbean, thevinter, TheWaffleJesus, Thinbug0, ThunderBear2006, timothyteakettle, TimrodDX, timurjavid, tin-man-tim, Titian3, tk-a369, tkdrg, tmtmtl30, TokenStyle, Tollhouse, tom-leys, tomasalves8, Tomeno, tonotom1, Tonydatguy, topy, Tornado-Technology, tosatur, TotallyLemon, tropicalhibi, truepaintgit, Truoizys, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, tyashley, Tych0theSynth, Tyler-IN, Tyzemol, UbaserB, ubis1, UBlueberry, UKNOWH, UltimateJester, Unbelievable-Salmon, underscorex5, UnicornOnLSD, Unisol, unusualcrow, Uriende, UristMcDorf, user424242420, Vaaankas, valentfingerov, Varen, Vasilis, VasilisThePikachu, veliebm, VelonacepsCalyxEggs, veprolet, veritable-calamity, Veritius, Vermidia, vero5123, Verslebas, VigersRay, violet754, Visne, vitalvitriol, VividPups, VMSolidus, voidnull000, volotomite, volundr-, Vonsant, Voomra, Vordenburg, vorkathbruh, vulppine, wafehling, Warentan, WarMechanic, Watermelon914, weaversam8, wertanchik, whateverusername0, whatston3, whatstone, Willhelm53, WilliamECrew, willicassi, Winkarst-cpu, wirdal, wixoaGit, WlarusFromDaSpace, Wolfhauler, Wolfking6116, wrexbe, wtcwr68, xkreksx, xprospero, xRiriq, YanehCheck, yathxyz, Ygg01, YotaXP, youarereadingthis, Yousifb26, youtissoum, YumiGumi, yunii, yuriykiss, YuriyKiss, zach-hill, Zadeon, zamp, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zero, ZeroDiamond, ZeWaka, zionnBE, ZNixian, ZoldorfTheWizard, zonespace27, Zumorica, Zylofan, Zymem, zzylex diff --git a/Resources/Locale/en-US/credits/credits-window.ftl b/Resources/Locale/en-US/credits/credits-window.ftl index 1b9636367b6..4c81c09ef16 100644 --- a/Resources/Locale/en-US/credits/credits-window.ftl +++ b/Resources/Locale/en-US/credits/credits-window.ftl @@ -5,7 +5,8 @@ credits-window-licenses-tab = Open Source Licenses credits-window-become-patron-button = Become a Patron credits-window-contributor-encouragement-label = Want to get on this list? credits-window-contribute-button = Contribute! -credits-window-contributors-section-title = Space Station 14 Contributors +# Frontier: "Space Station 14"<"Frontier Station" +credits-window-contributors-section-title = Frontier Station Contributors credits-window-codebases-section-title = Space Station 13 Codebases credits-window-original-remake-team-section-title = Original Space Station 13 Remake Team credits-window-special-thanks-section-title = Special Thanks \ No newline at end of file diff --git a/Tools/contribs_shared.ps1 b/Tools/contribs_shared.ps1 index 140a44a23e4..c20f306cf10 100644 --- a/Tools/contribs_shared.ps1 +++ b/Tools/contribs_shared.ps1 @@ -15,6 +15,8 @@ $ignore = @{ "paul" = $true # erroneously included -- presumably from PaulRitter, somehow, who is already credited "08a" = $true # erroneously included -- valid github account, but not an actual contributor, probably an alias of a contributor who does not own this github account and is already credited somewhere. "UristMcContributor" = $true # this was an account used to demonstrate how to create a valid PR, and is in actuality Willhelm53, who is already credited. + "FrontierATC" = $true # Frontier + "whatstone" = $true # Frontier: duped } $add = @("RamZ") diff --git a/Tools/dump_github_contributors.ps1 b/Tools/dump_github_contributors.ps1 index 9aeabbd52db..b13cb629fe5 100755 --- a/Tools/dump_github_contributors.ps1 +++ b/Tools/dump_github_contributors.ps1 @@ -113,7 +113,7 @@ function load_contribs([string] $repo) } $engineJson = load_contribs("space-wizards/RobustToolbox") -$contentJson = load_contribs("space-wizards/space-station-14") +$contentJson = load_contribs("new-frontiers-14/frontier-station-14") # Frontier: space-wizards/space-station-14 Date: Tue, 8 Oct 2024 18:23:44 -0400 Subject: [PATCH 30/96] Fix labeler (#2171) * Fix labeler * labeler: fix yaml labeler --- .github/labeler.yml | 68 ++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 22 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 17d1f5aea39..b2240bf6986 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,53 +1,77 @@ #"Map": -# - "Resources/Maps/**/*.yml" # All .yml files in the Resources/Maps directory, recursive. +# - changed-files: +# - any-glob-to-any-file: "Resources/Maps/**/*.yml" # All .yml files in the Resources/Maps directory, recursive. "Map-Admin": - - "Resources/Maps/_NF/Admin/**/*.yml" # Grid Files +- changed-files: + - any-glob-to-any-file: "Resources/Maps/_NF/Admin/**/*.yml" # Grid Files "Map-Bluespace": - - "Resources/Maps/_NF/Bluespace/**/*.yml" # Grid Files +- changed-files: + - any-glob-to-any-file: "Resources/Maps/_NF/Bluespace/**/*.yml" # Grid Files "Map-Dungeon": - - "Resources/Maps/_NF/Dungeon/**/*.yml" # Grid Files +- changed-files: + - any-glob-to-any-file: "Resources/Maps/_NF/Dungeon/**/*.yml" # Grid Files "Map-Outpost": - - "Resources/Maps/_NF/Outpost/*.yml" # Map Files - - "Resources/Prototypes/_MF/Maps/Outpost/*.yml" # Prototypes Files +- changed-files: + - any-glob-to-any-file: + - "Resources/Maps/_NF/Outpost/*.yml" # Map Files + - "Resources/Prototypes/_MF/Maps/Outpost/*.yml" # Prototypes Files "Map-Shuttle": - - "Resources/Maps/_NF/Shuttles/**/*.yml" # Grid Files - - "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Prototypes Files +- changed-files: + - any-glob-to-any-file: + - "Resources/Maps/_NF/Shuttles/**/*.yml" # Grid Files + - "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Prototypes Files "Map-POI": - - "Resources/Maps/_NF/POI/**/*.yml" # Grid Files - - "Resources/Prototypes/_MF/Maps/POI/**/*.yml" # Prototypes Files +- changed-files: + - any-glob-to-any-file: + - "Resources/Maps/_NF/POI/**/*.yml" # Grid Files + - "Resources/Prototypes/_MF/Maps/POI/**/*.yml" # Prototypes Files "Sprites": - - "**/*.rsi/*.png" - - "**/*.rsi/*.json" +- changed-files: + - any-glob-to-any-file: + - "**/*.rsi/*.png" + - "**/*.rsi/*.json" "UI": - - "**/*.xaml*" +- changed-files: + - any-glob-to-any-file: "**/*.xaml*" "C#": - - "**/*.cs" +- changed-files: + - any-glob-to-any-file: "**/*.cs" "Shaders": - - '**/*.swsl' +- changed-files: + - any-glob-to-any-file: '**/*.swsl' "No C#": - - all: ["!**/*.cs"] +- changed-files: + - all-globs-to-all-files: "!**/*.cs" "Docs": - - "**/*.xml" - - "**/*.md" +- changed-files: + - any-glob-to-any-file: + - "**/*.xml" + - "**/*.md" "FTL": - - "Resources/Locale/**/*.ftl" +- changed-files: + - any-glob-to-any-file: "Resources/Locale/**/*.ftl" "YML": - - any: ["**/*.yml"] - all: ["!Resources/Maps/_NF/**/*.yml", "!Resources/Prototypes/Maps/_NF/**/*.yml"] +- all: + - changed-files: + - any-glob-to-any-file: "**/*.yml" + - all-globs-to-all-files: + - "!Resources/Maps/_NF/**/*.yml" + - "!Resources/Prototypes/Maps/_NF/**/*.yml" "DB Migration": - - "Content.Server.Database/Migrations/**/*.cs" +- changed-files: + - any-glob-to-any-file: "Content.Server.Database/Migrations/**/*.cs" From 2b2d4fd956d9aa01eb707421c551635c8c03e24e Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Wed, 9 Oct 2024 01:36:30 +0300 Subject: [PATCH 31/96] Create nf-shipyard-tests.yml (#2172) --- .github/workflows/nf-shipyard-tests.yml | 57 +++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/nf-shipyard-tests.yml diff --git a/.github/workflows/nf-shipyard-tests.yml b/.github/workflows/nf-shipyard-tests.yml new file mode 100644 index 00000000000..f7bdc821de4 --- /dev/null +++ b/.github/workflows/nf-shipyard-tests.yml @@ -0,0 +1,57 @@ +name: Build & Run Shipyard Tests + +on: + pull_request: + branches: [ "master" ] + paths: + - "Resources/Maps/_NF/Shuttles/**/*.yml" # Ship grids + - "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Shipyard prototypes + - "Content.IntegrationTests/Tests/_NF/ShipyardTests.cs" # Shipyard tests + +jobs: + build: + if: github.event.pull_request.draft == false && github.actor != 'FrontierATC' + strategy: + matrix: + os: [ubuntu-latest] + + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout Master + uses: actions/checkout@v3.6.0 + + - name: Setup Submodule + run: | + git submodule update --init --recursive + - name: Pull engine updates + uses: space-wizards/submodule-dependency@v0.1.5 + + - name: Update Engine Submodules + run: | + cd RobustToolbox/ + git submodule update --init --recursive + - name: Setup .NET Core + uses: actions/setup-dotnet@v3.2.0 + with: + dotnet-version: 8.0.x + + - name: Install Dependencies + run: dotnet restore + + - name: Build Project + run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m + + - name: Run Shipyard Tests + shell: pwsh + run: | + $env:DOTNET_gcServer=1 + dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj --filter FullyQualifiedName~ShipyardTest -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed + ci-success: + name: Build & Run Shipyard Tests + needs: + - build + runs-on: ubuntu-latest + steps: + - name: CI succeeded + run: exit 0 \ No newline at end of file From 8735b546bddd797a9e1b82686959c8ae48419ed8 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Wed, 9 Oct 2024 03:07:30 -0400 Subject: [PATCH 32/96] Ship test fixes (#2174) --- .../Maps/_NF/Shuttles/BlackMarket/schooner.yml | 2 +- Resources/Maps/_NF/Shuttles/Expedition/anchor.yml | 2 +- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 1 - Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml | 2 +- .../Structures/Wallmounts/Signs/signs.yml | 9 +++++++++ .../_NF/Structures/Wallmounts/signs.rsi/meta.json | 5 ++++- .../Structures/Wallmounts/signs.rsi/shield.png | Bin 0 -> 347 bytes Resources/migration.yml | 2 +- 8 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index eed6dc98d7d..4aa4412037c 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml @@ -2933,7 +2933,7 @@ entities: - type: Transform pos: -0.5,9.5 parent: 1 -- proto: SignShield +- proto: NFSignShield entities: - uid: 359 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index a0c30104645..34592b38649 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -10574,7 +10574,7 @@ entities: - type: Transform pos: 2.5,-11.5 parent: 1 -- proto: SignShield +- proto: NFSignShield entities: - uid: 1261 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index e248424857a..534fc12bf27 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -11602,7 +11602,6 @@ entities: - Pressed: Toggle 2543: - Pressed: Toggle - 12: [] 2541: - Pressed: Toggle 2544: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml index a35b7687439..19e7aa5214e 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml @@ -5872,7 +5872,7 @@ entities: - type: Transform pos: 1.7114414,-8.847875 parent: 2 -- proto: SignShield +- proto: NFSignShield entities: - uid: 858 components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml index 031683c11cb..015054b38df 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml @@ -186,3 +186,12 @@ components: - type: Sprite state: bus + +- type: entity + parent: NFBaseSign + id: NFSignShield + name: shield sign + description: A sign with a shield. + components: + - type: Sprite + state: shield diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json index 3551fb249b8..7c60c0e4331 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station, bus/dock (edited from base signs.rsi/dock) made by Whatstone (Discord)", + "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station, bus/dock/shield (dock edited from base signs.rsi/dock) made by Whatstone (Discord)", "states": [ { "name": "direction_sr", @@ -71,6 +71,9 @@ }, { "name": "dock" + }, + { + "name": "shield" } ] } diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png new file mode 100644 index 0000000000000000000000000000000000000000..bf39213d4df5b9af25f986637a1c732a72f8426d GIT binary patch literal 347 zcmV-h0i^zkP)zH0UO;E!7(Ar;ch7%Lv>&&E}W8N0Uvy6 z-`NCG;Yk7<@Mr-pc$5GqoGic%Ckt@H$pYMPvH&-nEWiyX3vk2H0`?G+rz@(coi}%Q zkpuwxvmGO0$L)MJ0i)}QgnQ}m1?#uDlHKA~T;e?I2SkvPOe*mD2?002ovPDHLkV1g$Yk01a5 literal 0 HcmV?d00001 diff --git a/Resources/migration.yml b/Resources/migration.yml index 8f948d75bce..6aabefb387a 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -390,7 +390,7 @@ SignChemistry2: SignChem SignCourt: SignLawyer SignAtmosMinsky: SignAtmos SignDrones: SignMaterials -SignShield: null # what was this even for? +SignShield: NFSignShield # what was this even for? # Frontier: null Date: Thu, 10 Oct 2024 00:12:22 +0300 Subject: [PATCH 33/96] Small Cleanup (#2178) * My sins * Remove parent detective * Remove PAL from the pacified zone * Update pda.yml * Fix detective FTL refs --------- Co-authored-by: Whatstone --- .../Locale/en-US/_NF/job/job-description.ftl | 2 +- Resources/Locale/en-US/_NF/job/job-names.ftl | 2 +- .../Entities/Markers/Spawners/jobs.yml | 1 + .../Prototypes/Roles/Jobs/departments.yml | 2 +- .../VendingMachines/Inventories/cart.yml | 2 +- .../_NF/Entities/Markers/Spawners/jobs.yml | 5 +- .../_NF/Entities/Markers/pacified_zone.yml | 2 +- .../Devices/Misc/identification_cards.yml | 4 +- .../_NF/Entities/Objects/Devices/pda.yml | 8 +-- .../_NF/Loadouts/Jobs/DetectiveNF/pda.yml | 5 -- .../{DetectiveNF => NFDetective}/gloves.yml | 2 +- .../{DetectiveNF => NFDetective}/head.yml | 2 +- .../{DetectiveNF => NFDetective}/jumpsuit.yml | 4 +- .../{DetectiveNF => NFDetective}/neck.yml | 2 +- .../{DetectiveNF => NFDetective}/outer.yml | 8 +-- .../_NF/Loadouts/Jobs/NFDetective/pda.yml | 5 ++ .../Loadouts/detectivenf_loadout_groups.yml | 54 ------------------ .../Loadouts/nfdetective_loadout_groups.yml | 54 ++++++++++++++++++ .../Prototypes/_NF/Loadouts/role_loadouts.yml | 12 ++-- Resources/Prototypes/_NF/Maps/debug.yml | 18 +++--- .../Prototypes/_NF/PointsOfInterest/nfsd.yml | 2 +- .../Nfsd/{detectivenf.yml => nfdetective.yml} | 12 ++-- Resources/Prototypes/_NF/StatusIcon/job.yml | 2 +- .../_NF/Objects/Devices/pda.rsi/meta.json | 2 +- ...da-detectivenf.png => pda-nfdetective.png} | Bin Resources/migration.yml | 5 +- 26 files changed, 110 insertions(+), 107 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/pda.yml rename Resources/Prototypes/_NF/Loadouts/Jobs/{DetectiveNF => NFDetective}/gloves.yml (59%) rename Resources/Prototypes/_NF/Loadouts/Jobs/{DetectiveNF => NFDetective}/head.yml (60%) rename Resources/Prototypes/_NF/Loadouts/Jobs/{DetectiveNF => NFDetective}/jumpsuit.yml (67%) rename Resources/Prototypes/_NF/Loadouts/Jobs/{DetectiveNF => NFDetective}/neck.yml (61%) rename Resources/Prototypes/_NF/Loadouts/Jobs/{DetectiveNF => NFDetective}/outer.yml (62%) create mode 100644 Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/pda.yml delete mode 100644 Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml create mode 100644 Resources/Prototypes/_NF/Loadouts/nfdetective_loadout_groups.yml rename Resources/Prototypes/_NF/Roles/Jobs/Nfsd/{detectivenf.yml => nfdetective.yml} (85%) rename Resources/Textures/_NF/Objects/Devices/pda.rsi/{pda-detectivenf.png => pda-nfdetective.png} (100%) diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index 3d05a97f3ae..42ee802897a 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -3,7 +3,7 @@ job-description-brigmedic-nf = Fight in the rear of the sheriff's service, for t job-description-cadet-nf = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help. job-description-contractor = Fulfill any profitable contracts out on the frontier of NT space. job-description-deputy = Catch criminals and enemies of the corporation, enforce the law, and ensure that the sector does not fall into disarray. -job-description-detective-nf = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes. +job-description-nf-detective = Investigate crime scenes using forensic tools, ensure that the guilty party is found, and have a couple smokes. job-description-ertmailcarrier = Nothing stops the mail. job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law. job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar. diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index 1670fde69c3..0fb03ff35a5 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -4,7 +4,7 @@ job-name-brigmedic = Brigmedic job-name-cadet-nf = Cadet job-name-contractor = Contractor job-name-deputy = Deputy -job-name-detective-nf = Detective +job-name-nf-detective = Detective job-name-ertmailcarrier = ERT Mail Carrier job-name-mercenary = Mercenary job-name-pilot = Pilot diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index c06b4ce47ac..474cbc8a6ef 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -477,6 +477,7 @@ - type: entity id: SpawnPointDetective parent: SpawnPointJobBase + abstract: true # Frontier name: detective components: - type: SpawnPoint diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 80c081f680e..002a774a739 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -126,7 +126,7 @@ - PrisonGuard ##nyano - Brigmedic # Frontier # - SecurityGuard # Frontier - - DetectiveNF # Frontier + - NFDetective # Frontier - Cadet # Frontier - Deputy # Frontier - Bailiff # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml index 729e20396fb..c7c544ce837 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/cart.yml @@ -32,7 +32,7 @@ CadetPDA: 10 DeputyPDA: 10 BrigmedicNFPDA: 10 - DetectiveNFPDA: 10 + NFDetectivePDA: 10 SergeantPDA: 10 BailiffPDA: 10 ClothingHeadsetNfsdBrownCommon: 4294967295 #infinite diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml index 0d774a7d8ca..27b29c73b45 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/jobs.yml @@ -152,13 +152,12 @@ - state: warden - type: entity - id: SpawnPointDetectiveNF + id: NFSpawnPointDetective parent: SpawnPointDetective name: detective - suffix: Frontier components: - type: SpawnPoint - job_id: DetectiveNF + job_id: NFDetective - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml index b0468cd284f..186fbbd879d 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/pacified_zone.yml @@ -17,7 +17,7 @@ - Brigmedic - Cadet - Deputy - - DetectiveNF + - NFDetective - SeniorOfficer - Sheriff - SecurityGuard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index de91c3b9c2a..b1d81f47caa 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -144,11 +144,11 @@ - type: entity parent: CadetIDCard - id: DetectiveNFIDCard + id: NFDetectiveIDCard name: nfsd detective ID card components: - type: PresetIdCard - job: DetectiveNF + job: NFDetective - type: Sprite sprite: _NF/Objects/Misc/id_cards.rsi layers: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index fad0f7b6248..ffa6fefc78b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -332,13 +332,13 @@ - type: entity parent: BasePDA - id: DetectiveNFPDA + id: NFDetectivePDA name: detective PDA description: Smells like rain... pouring down the rooftops... components: - type: Pda - id: DetectiveNFIDCard - state: pda-detectivenf + id: NFDetectiveIDCard + state: pda-nfdetective bookSlot: # Frontier startingItem: HyperlinkBookNfsdSop priority: -2 @@ -362,7 +362,7 @@ visible: false - type: Icon sprite: _NF/Objects/Devices/pda.rsi - state: pda-detectivenf + state: pda-nfdetective - type: entity parent: BasePDA diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/pda.yml deleted file mode 100644 index f8bea3b9a2c..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/pda.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: loadout - id: DetectiveNFDetectiveNFPDA - equipment: - id: DetectiveNFPDA - \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/gloves.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/gloves.yml similarity index 59% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/gloves.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/gloves.yml index de192a10776..4a0de78c434 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/gloves.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/gloves.yml @@ -1,4 +1,4 @@ - type: loadout - id: DetectiveNFClothingHandsGlovesDetectiveNF + id: NFDetectiveClothingHandsGlovesNFDetective equipment: gloves: ClothingHandsGlovesForensicNF diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/head.yml similarity index 60% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/head.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/head.yml index 19feb721b07..a6ec1addbd2 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/head.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/head.yml @@ -1,4 +1,4 @@ - type: loadout - id: DetectiveNFClothingHeadHatDetectiveNF + id: NFDetectiveClothingHeadHatNFDetective equipment: head: ClothingHeadHatFedoraBrown diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/jumpsuit.yml similarity index 67% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/jumpsuit.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/jumpsuit.yml index 0a307277ae4..5c41427096b 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/jumpsuit.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/jumpsuit.yml @@ -1,5 +1,5 @@ - type: loadout - id: DetectiveNFClothingUniformJumpsuitDetectiveNF + id: NFDetectiveClothingUniformJumpsuitNFDetective hideEffects: - !type:GroupLoadoutEffect proto: PantsCapableNF @@ -7,6 +7,6 @@ jumpsuit: ClothingUniformJumpsuitDetective - type: loadout - id: DetectiveNFClothingUniformJumpskirtDetectiveNF + id: NFDetectiveClothingUniformJumpskirtNFDetective equipment: jumpsuit: ClothingUniformJumpskirtDetective \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/neck.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml similarity index 61% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/neck.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml index df2dbd06e1d..e75501c583f 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/neck.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/neck.yml @@ -1,5 +1,5 @@ #T0 - type: loadout - id: DetectiveNFClothingNeckBadgeDetectiveNF + id: NFDetectiveClothingNeckBadgeNFDetective equipment: neck: ClothingNeckNfsdBadgeSecurity diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/outer.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/outer.yml similarity index 62% rename from Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/outer.yml rename to Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/outer.yml index fa5d4e21ab3..bf258d8e67f 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/DetectiveNF/outer.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/outer.yml @@ -1,20 +1,20 @@ #T0 - type: loadout - id: DetectiveNFClothingOuterArmorBasic + id: NFDetectiveClothingOuterArmorBasic equipment: outerClothing: ClothingOuterArmorBasic - type: loadout - id: DetectiveNFClothingOuterCoatDetectiveLoadout + id: NFDetectiveClothingOuterCoatDetectiveLoadout equipment: outerClothing: ClothingOuterCoatDetectiveLoadout - type: loadout - id: DetectiveNFClothingOuterCoatDetectiveLoadoutGrey + id: NFDetectiveClothingOuterCoatDetectiveLoadoutGrey equipment: outerClothing: ClothingOuterCoatDetectiveLoadoutGrey - type: loadout - id: DetectiveNFClothingOuterCoatTrench + id: NFDetectiveClothingOuterCoatTrench equipment: outerClothing: ClothingOuterCoatTrench diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/pda.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/pda.yml new file mode 100644 index 00000000000..f6423805d8c --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/NFDetective/pda.yml @@ -0,0 +1,5 @@ +- type: loadout + id: NFNFDetectiveDetectivePDA + equipment: + id: NFDetectivePDA + \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml deleted file mode 100644 index f2652f5aeda..00000000000 --- a/Resources/Prototypes/_NF/Loadouts/detectivenf_loadout_groups.yml +++ /dev/null @@ -1,54 +0,0 @@ -- type: loadoutGroup - id: DetectiveNFJumpsuit - name: loadout-group-contractor-jumpsuit - loadouts: - - DetectiveNFClothingUniformJumpsuitDetectiveNF - - DetectiveNFClothingUniformJumpskirtDetectiveNF - fallbacks: - - DetectiveNFClothingUniformJumpsuitDetectiveNF - - DetectiveNFClothingUniformJumpskirtDetectiveNF - -- type: loadoutGroup - id: DetectiveNFOuterClothing - name: loadout-group-contractor-outerclothing - minLimit: 0 - loadouts: - - ContractorClothingOuterVestTank - - DetectiveNFClothingOuterArmorBasic - - DetectiveNFClothingOuterCoatDetectiveLoadout - - DetectiveNFClothingOuterCoatDetectiveLoadoutGrey - - DetectiveNFClothingOuterCoatTrench - fallbacks: - - ContractorClothingOuterVestTank - -- type: loadoutGroup - id: DetectiveNFHead - name: loadout-group-contractor-head - minLimit: 0 - loadouts: - - DetectiveNFClothingHeadHatDetectiveNF - -- type: loadoutGroup - id: DetectiveNFGloves - name: loadout-group-contractor-gloves - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - DetectiveNFClothingHandsGlovesDetectiveNF - fallbacks: - - DetectiveNFClothingHandsGlovesDetectiveNF - -- type: loadoutGroup - id: DetectiveNFNeck - name: loadout-group-contractor-neck - minLimit: 0 - loadouts: - - DetectiveNFClothingNeckBadgeDetectiveNF - -- type: loadoutGroup - id: DetectiveNFPDA - name: loadout-group-contractor-id - hidden: true # No point in showing this, it gets auto-selected. - loadouts: - - DetectiveNFDetectiveNFPDA - fallbacks: - - DetectiveNFDetectiveNFPDA diff --git a/Resources/Prototypes/_NF/Loadouts/nfdetective_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/nfdetective_loadout_groups.yml new file mode 100644 index 00000000000..55e1c75bc30 --- /dev/null +++ b/Resources/Prototypes/_NF/Loadouts/nfdetective_loadout_groups.yml @@ -0,0 +1,54 @@ +- type: loadoutGroup + id: NFDetectiveJumpsuit + name: loadout-group-contractor-jumpsuit + loadouts: + - NFDetectiveClothingUniformJumpsuitNFDetective + - NFDetectiveClothingUniformJumpskirtNFDetective + fallbacks: + - NFDetectiveClothingUniformJumpsuitNFDetective + - NFDetectiveClothingUniformJumpskirtNFDetective + +- type: loadoutGroup + id: NFDetectiveOuterClothing + name: loadout-group-contractor-outerclothing + minLimit: 0 + loadouts: + - ContractorClothingOuterVestTank + - NFDetectiveClothingOuterArmorBasic + - NFDetectiveClothingOuterCoatDetectiveLoadout + - NFDetectiveClothingOuterCoatDetectiveLoadoutGrey + - NFDetectiveClothingOuterCoatTrench + fallbacks: + - ContractorClothingOuterVestTank + +- type: loadoutGroup + id: NFDetectiveHead + name: loadout-group-contractor-head + minLimit: 0 + loadouts: + - NFDetectiveClothingHeadHatNFDetective + +- type: loadoutGroup + id: NFDetectiveGloves + name: loadout-group-contractor-gloves + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - NFDetectiveClothingHandsGlovesNFDetective + fallbacks: + - NFDetectiveClothingHandsGlovesNFDetective + +- type: loadoutGroup + id: NFDetectiveNeck + name: loadout-group-contractor-neck + minLimit: 0 + loadouts: + - NFDetectiveClothingNeckBadgeNFDetective + +- type: loadoutGroup + id: NFDetectivePDA + name: loadout-group-contractor-id + hidden: true # No point in showing this, it gets auto-selected. + loadouts: + - NFNFDetectiveDetectivePDA + fallbacks: + - NFNFDetectiveDetectivePDA diff --git a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml index 52956441ca3..c72f4d44b2b 100644 --- a/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_NF/Loadouts/role_loadouts.yml @@ -231,17 +231,17 @@ - ContractorTrinkets - type: roleLoadout - id: JobDetectiveNF + id: JobNFDetective groups: - - DetectiveNFHead - - DetectiveNFJumpsuit - - DetectiveNFGloves + - NFDetectiveHead + - NFDetectiveJumpsuit + - NFDetectiveGloves - NfsdBackpackBrown - - DetectiveNFOuterClothing + - NFDetectiveOuterClothing - NfsdShoesBrown - NfsdFace - NfsdGlasses - - DetectiveNFPDA + - NFDetectivePDA - NfsdBelt - NfsdEarsCream - NfsdBoxSurvival diff --git a/Resources/Prototypes/_NF/Maps/debug.yml b/Resources/Prototypes/_NF/Maps/debug.yml index 261027ff421..532057d4c98 100644 --- a/Resources/Prototypes/_NF/Maps/debug.yml +++ b/Resources/Prototypes/_NF/Maps/debug.yml @@ -20,18 +20,18 @@ Valet: [ -1, -1 ] Janitor: [ -1, -1 ] MailCarrier: [ -1, -1 ] - Sheriff: [ -1, -1 ] - Bailiff: [ -1, -1 ] - SeniorOfficer: [ -1, -1 ] - Brigmedic: [ -1, -1 ] - DetectiveNF: [ -1, -1 ] - Deputy: [ -1, -1 ] - Cadet: [ -1, -1 ] - Lawyer: [ -1, -1 ] + Sheriff: [ -1, -1] + Bailiff: [ -1, -1] + SeniorOfficer: [ -1, -1] + Brigmedic: [ -1, -1] + NFDetective: [ -1, -1] + Deputy: [ -1, -1] + Cadet: [ -1, -1] + PublicAffairsLiaison: [ -1, -1] PirateCaptain: [ -1, -1] PirateFirstMate: [ -1, -1] Pirate: [ -1, -1] Prisoner: [ -1, -1] - Borg: [ -1, -1] # For testing. + Borg: [ -1, -1] - type: StationDeadDrop maxDeadDrops: 20 # Testing \ No newline at end of file diff --git a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml index 4081562e86d..76e86c51d03 100644 --- a/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml +++ b/Resources/Prototypes/_NF/PointsOfInterest/nfsd.yml @@ -36,7 +36,7 @@ Bailiff: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Brigmedic: [ 0, 0 ] - DetectiveNF: [ 0, 0 ] + NFDetective: [ 0, 0 ] Deputy: [ 3, 3 ] Cadet: [ 0, 0 ] # Others: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml similarity index 85% rename from Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml rename to Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml index a8a5c676b3f..2ab12a7e83d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/detectivenf.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Nfsd/nfdetective.yml @@ -1,7 +1,7 @@ - type: job - id: DetectiveNF - name: job-name-detective-nf - description: job-description-detective-nf + id: NFDetective + name: job-name-nf-detective + description: job-description-nf-detective playTimeTracker: JobDetective requirements: - !type:OverallPlaytimeRequirement @@ -13,8 +13,8 @@ longerPlaytimeLessSec: - !type:OverallPlaytimeRequirement time: 360000 # 100 hours - startingGear: DetectiveNFGear - icon: JobIconDetectiveNF + startingGear: NFDetectiveGear + icon: JobIconNFDetective supervisors: job-supervisors-bailiff weight: 110 displayWeight: 20 @@ -31,7 +31,7 @@ prototype: FrontierBirthdayGift - type: startingGear - id: DetectiveNFGear + id: NFDetectiveGear equipment: pocket1: WeaponRevolverInspector pocket2: SpeedLoaderMagnum diff --git a/Resources/Prototypes/_NF/StatusIcon/job.yml b/Resources/Prototypes/_NF/StatusIcon/job.yml index 3ce4b16f1c1..0219f5593f3 100644 --- a/Resources/Prototypes/_NF/StatusIcon/job.yml +++ b/Resources/Prototypes/_NF/StatusIcon/job.yml @@ -105,7 +105,7 @@ - type: jobIcon parent: JobIcon - id: JobIconDetectiveNF + id: JobIconNFDetective icon: sprite: /Textures/_NF/Interface/Misc/job_icons.rsi state: nfsddetective diff --git a/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json index f270202f03f..31d61f0ffa8 100644 --- a/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json @@ -53,7 +53,7 @@ "name": "pda-deputy" }, { - "name": "pda-detectivenf" + "name": "pda-nfdetective" }, { "name": "pda-pal" diff --git a/Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-detectivenf.png b/Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-nfdetective.png similarity index 100% rename from Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-detectivenf.png rename to Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-nfdetective.png diff --git a/Resources/migration.yml b/Resources/migration.yml index 6aabefb387a..c5fd504deb0 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -535,4 +535,7 @@ WeaponRackWallmountedSecurity: StructureGunRackWallmountedNfsd WeaponRackMeleeSecurity: StructureMeleeWeaponRackNfsd WeaponRackMeleeWallmountedSecurity: StructureMeleeWeaponRackWallmountedNfsd WeaponRackPistolBaseSecurity: StructurePistolRackNfsd -WeaponRackPistolWallmountedSecurity: StructurePistolRackWallmountedNfsd \ No newline at end of file +WeaponRackPistolWallmountedSecurity: StructurePistolRackWallmountedNfsd + +# 2024-10-09 Frontier: Fixups +SpawnPointDetectiveNF: NFSpawnPointDetective \ No newline at end of file From 10208fbe89efec906a3c96245ace07341caa5857 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Wed, 9 Oct 2024 21:40:26 +0000 Subject: [PATCH 34/96] Adds FSB Spirit poster and two EMS signs. (#2102) * Adds FSB Spirit poster and two EMS signs. * Adds additional dead drop poster Adds new EMS Coords poster by request. From another user, credited. Small correction to dock and bus signs by request. * Update nf_poster8_contraband.png * Update posters.yml * Updates visuals and corrects classic dusty goofs * Move the mothroach up --------- Co-authored-by: Whatstone Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../_NF/Entities/Markers/Spawners/posters.yml | 2 ++ .../Wallmounts/Signs/contraband.yml | 10 +++++++++ .../Structures/Wallmounts/Signs/posters.yml | 20 ++++++++++++++++++ .../Structures/Wallmounts/Signs/signs.yml | 18 ++++++++++++++++ .../Wallmounts/posters.rsi/meta.json | 8 ++++++- .../posters.rsi/nf_poster7_contraband.png | Bin 0 -> 605 bytes .../posters.rsi/nf_poster8_contraband.png | Bin 0 -> 517 bytes .../Structures/Wallmounts/signs.rsi/bus.png | Bin 254 -> 271 bytes .../Structures/Wallmounts/signs.rsi/dock.png | Bin 257 -> 269 bytes .../Structures/Wallmounts/signs.rsi/ems1.png | Bin 0 -> 522 bytes .../Structures/Wallmounts/signs.rsi/ems2.png | Bin 0 -> 538 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 7 ++++++ 12 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster7_contraband.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster8_contraband.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems1.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems2.png diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml index 2d8eda8242f..0817e3e9e7d 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/posters.yml @@ -78,4 +78,6 @@ - NFPosterContrabandFsbStasisDD - NFPosterContrabandFsbApothecaryDD - NFPosterContrabandFsbLogoDD + - NFPosterContrabandFsbSpiritDD + - NFPosterContrabandEmsCoordsDD chance: 1 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml index a33a4a51d2f..7853f50073e 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/contraband.yml @@ -335,3 +335,13 @@ parent: [DeadDropBase, NFPosterContrabandFsbApothecary] id: NFPosterContrabandFsbApothecaryDD suffix: DeadDrop + +- type: entity + parent: [DeadDropBase, NFPosterContrabandFsbSpirit] + id: NFPosterContrabandFsbSpiritDD + suffix: DeadDrop + +- type: entity + parent: [DeadDropBase, NFPosterContrabandEmsCoords] + id: NFPosterContrabandEmsCoordsDD + suffix: DeadDrop diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml index 9415721be95..32db6578014 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml @@ -67,3 +67,23 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster6_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandFsbSpirit + name: "Far Star Biotech Spirit" + description: "The FSB Spirit! We know what your life is worth." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster7_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandEmsCoords + name: "EMS Suit Coordinates Reminder" + description: "Rosy the Medroach reminding you to turn your suit coordinates! Make sure your next death isn't your last!" + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster8_contraband diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml index 015054b38df..035d427bb96 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml @@ -195,3 +195,21 @@ components: - type: Sprite state: shield + +- type: entity + parent: NFBaseSign + id: NFSignEms1 + name: emergency medical service sign + description: A sign that indicates emergency medical services. + components: + - type: Sprite + state: ems1 + +- type: entity + parent: NFBaseSign + id: NFSignEms2 + name: emergency medical service sign + description: A sign that indicates emergency medical services. + components: + - type: Sprite + state: ems2 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json index 2f1bfa59a54..26b175e8ee2 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband by erhardsteinhauer (discord/github)", + "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)", "size": { "x": 32, "y": 32 @@ -27,6 +27,12 @@ }, { "name": "nf_poster6_contraband" + }, + { + "name": "nf_poster7_contraband" + }, + { + "name": "nf_poster8_contraband" } ] } diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster7_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster7_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..b57c5a5b7bfb972d2a3954f754514eb63a86bb99 GIT binary patch literal 605 zcmV-j0;2tiP)BjE7>3`-BG}M05Mg3rkZFb(VsPd{z+@_3LWcf>g8xKjEg4E@{|4{DQwSI`Bufkq z)Po_0Acvp~?%+_)N{9LjC+Y5dlI*E{r_-J9d!PHh(^&`n>)KEaZXF)Kt;*=v-KEgW zRGAm-J=jGnv$^-|1HhXILP$mC_<4suONo?FlVP`is zkIzPQP9gxJkG9ExO7QXPmsl3~7^wj$0Q>z4qkItR=gp(yK{91PCY3pW*oIU=Xak7S z&P!H?%q8FzHLo;}P-z}1Axx*Pgh*8aGIyN@T&JOg2p;d1akK%J)m>?_ian4-s@HNY z08|FP6eRxqNDUy`e6G`oLGb%QHw$YiK@zPEVA|;_|0PN4b8;az?xWz;G3|7PZ^7C4 z>b?DN(MtrX1)w9|Sa-Zz}ME@~wU zgNcuuAK!%@OV0r^mW>eziJtAEg<8o%DQ}`yl4n5*;63}&;JO-2d`w;$1{0s|1~Ex* rMytMB7%@Lr00000NkvXXu0mjf^n(rf literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster8_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster8_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..8592b55821c5fe1a6d07ce2a950e7f392659ff43 GIT binary patch literal 517 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dybpbvhu0Z(>mE!&n1?Sp9<7 zyo1=>fykTH*PGSLo6XsaL(iSv%!AF=lT+1=-6KRfyq?1*gi||^OD9CZuh?*E&XEPC zSJzu?pJpg&AN}S^+o{%;R~Opk6_wt$%|Ey-_;uU74;>2+F0k7=L1{s=>6LXBoF*ZM zR$H+-1^xg3|K9%`cc2TjN`m}?8GwA^fV%%15e5cE9#0p?5R2Zmlk2+=EAX_HZgU_ z3`*`7%RE|Nu^uX8c_b;Q@5Iql=P2WTMAsno@GaJE8>UkY{tOd>_OV~-_~aGdx%gGX zoWSi7%RTONy0n+y6gRd48DU=(uaKBH_V(?>iJND!zD^TO1M?7W54|ImkY0#UhQ8sYx{v3 z9)WqkW+sPZv2zsqu?8Mk5!G;=@2Q1M$%6wD&zX5{S|%U(&Bqfo>p6#YLbmcK<41Xfk-Z`njxgN@xNA_MPgs literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/bus.png index f338771b36f28e2a75146fec7e59f4e5840e8397..a3333cbf28414c67582135a61353eaf1602d5a4a 100644 GIT binary patch delta 192 zcmV;x06+i!0gnQZBnkm@Qb$4nuFf3kks&vKl}SWFR5*>TliL!2AP7XgE&u+-^sRI^J z{Wc(VVr^RF0FE$Q?0|mCGUp7mQ%Y@44d6aWyaJBz@ZfW2Uk)efwE*tROh8Ro{|}uj u-)h0m?1q)Fn<6C4O4DNO7w5csA9Mlb%n37{-?t6`0000>}z#s@j-G=)gxhiT@L`~aiKbr6umIh<~ zl9d|c&d+johzF^juzmq}2@qJM0ECjugaB%O^$3z@x;d}`%zVlXf00000NkvXXu0mjf9k)&W diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/dock.png index afb63e64a024b39b2175b8843871510d23af2ff6..65c437187d379393d206d5c5e4934f9a61dd5475 100644 GIT binary patch delta 190 zcmV;v073tO0*wNYBnkm@Qb$4nuFf3kks&vKlSxEDR5*>TlK~EZAPfTq*8Ts<3djPu zf{B)>Bt6I|?l}HZcxv=xnia#~%TqlOQfDAbMG^tBcfBb9`?!GOMhH-R4gh6+9_j(M z`#qU~=G$Zj6u@v2r$|MY#NrgyXE~rnMUu2qInaCpsQL6ZDUhqz^3=4QB-@Y|fPWV$ syB&5ltWOc^zuZfv##lGbzV$xn1a6TD0`X&Q(EtDd07*qoM6N<$g6$wu$p8QV delta 180 zcmV;l089Uk0)YaMB#|*Rf0Ri?K~y-6t&;%`g&+(=1=ijF$U2b)a0Qe9OQIxwlC8Mo z_?OaKqo2#HoCaUs>WNf3111$I1TgPM2=LRN%?vc(H#49B zhE9Sa67{a@`21|TLs<$X=ok7&_B_DwJDlT>>>}ptdk?X(Q iOQykC56*t{e$WYODG2@_x(z)50000igP)Px$#7RU!R9J=WS3yd{Koot7t_mt`x+n;CqazeNfW5*jdw?!_gIvN*S8fG!fUIOT z9v~M`x)|M95Q>B;p|x{LMb37@3CX!#GcEN=iyiy$4=y@=f&t@7F891_R#5(Sbt}K@#A(48yU^xmDF;^44C1BtqMYPkLv#y*LLz?{)wZ z^8H=l?Gu>4e_*-@ad~}%hsj;86&pji4%s?vY1ioxrt9}Fr@&q#A@@a~<*?3xiacAN zEU9Ey%hO z(t+o)+|}&4>}NV*)|oE?2w=V(=$C7+Wk+)#wEH5M*ws@6Rt5Uob#!lF2x2XCG zF?*fccS1ma+u6VrO09q>iqL7dYPs{{`BeCwKPG7rmD#_c`!)N=7fYSw%A9m(>i_@% M07*qoM6N<$f_Dz`ApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems2.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/ems2.png new file mode 100644 index 0000000000000000000000000000000000000000..1a85fd1b2b5dcdee5ac07d19ec4ed85f15cfbaba GIT binary patch literal 538 zcmV+#0_FXQP);q(y>kA0+0R)G0vLJLY z4MlLSLwjj@_vbEcQxWuALhirI_ucpZ_a_1VI<|@eN31=mlIV@!kzC~95o=GJ#vy98 zS|#LZnj#s#lOnVMN#1gg*CzIvhls}jfZ@jouP@JwCLa5tR$blXv^gOvKgY#m@+cc#Od~LAT$;&G`VM&o2zd32yHn$oV@}3jhG-CIB8Y za#@HJj1KtBL$Bka*Kq+LyGqD=bsjKx!bA>O9AIvOAQT#D5Q+sdb>2LlAmT=Tdkv_& z=E6a*I$8* zB9N{4q;-nMLEWUy3MopG7qw!e1GfB8kd_CbnAJq_?yUk$)|C;#ODx~WyFiKn>@F_d z3G)vu Date: Wed, 9 Oct 2024 21:40:56 +0000 Subject: [PATCH 35/96] Automatic Changelog (#2102) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index c726628aa71..c9cfe291472 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4325,3 +4325,9 @@ Entries: message: The Crescent now has been fitted with Air Alarms, engineers rejoice! id: 5368 time: '2024-10-07T16:38:08.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: New poster for the FSB Spirit and two new EMS signs. + id: 5369 + time: '2024-10-09T21:40:26.0000000+00:00' From f6f4f23fbdcbfb931c03a159ea45906a06a7568f Mon Sep 17 00:00:00 2001 From: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:54:59 -0400 Subject: [PATCH 36/96] Add magic crayon (#2157) * add magic crayon * Infinite crayons, smaller magic crayon, attribs * Copyright, description * Plasticmagic_crayon.rsi --------- Co-authored-by: Whatstone Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Content.Client/Crayon/CrayonSystem.cs | 11 +++++ Content.Server/Crayon/CrayonSystem.cs | 12 +++-- .../en-US/_NF/crayon/crayon-component.ftl | 1 + .../_NF/Entities/Objects/Fun/magic_crayon.yml | 28 +++++++++++ .../_NF/Loadouts/Jobs/Contractor/fun.yml | 9 ++++ .../Loadouts/contractor_loadout_groups.yml | 1 + .../_NF/Objects/Fun/catplushie.rsi/meta.json | 2 +- .../Objects/Fun/corgiplushie.rsi/meta.json | 2 +- .../_NF/Objects/Fun/foxplushie.rsi/meta.json | 2 +- .../Fun/magic_crayon.rsi/icon-inhand-left.png | Bin 0 -> 204 bytes .../magic_crayon.rsi/icon-inhand-right.png | Bin 0 -> 203 bytes .../_NF/Objects/Fun/magic_crayon.rsi/icon.png | Bin 0 -> 282 bytes .../Objects/Fun/magic_crayon.rsi/meta.json | 46 ++++++++++++++++++ .../_NF/Objects/Fun/petrock.rsi/meta.json | 2 +- .../_NF/Objects/Fun/prizeticket.rsi/meta.json | 2 +- .../_NF/Objects/Fun/toys.rsi/meta.json | 2 +- 16 files changed, 110 insertions(+), 10 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/crayon/crayon-component.ftl create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs index 2ed82b6a711..d489361afba 100644 --- a/Content.Client/Crayon/CrayonSystem.cs +++ b/Content.Client/Crayon/CrayonSystem.cs @@ -65,6 +65,17 @@ protected override void FrameUpdate(FrameEventArgs args) } _parent.UIUpdateNeeded = false; + + // Frontier: unlimited crayon + if (_parent.Capacity == int.MaxValue) + { + _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label-unlimited", + ("color", _parent.Color), + ("state", _parent.SelectedState))); + return; + } + // End Frontier + _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label", ("color",_parent.Color), ("state",_parent.SelectedState), diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs index a572ad96c85..771fef8d785 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -14,7 +14,6 @@ using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; -using Robust.Shared.Player; using Robust.Shared.Prototypes; namespace Content.Server.Crayon; @@ -74,9 +73,14 @@ private void OnCrayonAfterInteract(EntityUid uid, CrayonComponent component, Aft if (component.UseSound != null) _audio.PlayPvs(component.UseSound, uid, AudioParams.Default.WithVariation(0.125f)); - // Decrease "Ammo" - component.Charges--; - Dirty(uid, component); + // Frontier: check if crayon is infinite + if (component.Charges != int.MaxValue) + { + // Decrease "Ammo" + component.Charges--; + Dirty(uid, component); + } + // End Frontier _adminLogger.Add(LogType.CrayonDraw, LogImpact.Low, $"{EntityManager.ToPrettyString(args.User):user} drew a {component.Color:color} {component.SelectedState}"); args.Handled = true; diff --git a/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl new file mode 100644 index 00000000000..cb616f7aaef --- /dev/null +++ b/Resources/Locale/en-US/_NF/crayon/crayon-component.ftl @@ -0,0 +1 @@ +crayon-drawing-label-unlimited = Drawing: [color={$color}]{$state}[/color] diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml new file mode 100644 index 00000000000..eb4079fa67f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/magic_crayon.yml @@ -0,0 +1,28 @@ +- type: entity + parent: CrayonRainbow + id: CrayonMagic + name: magic crayon + description: Specially blended with bluespace crystals and certified non-toxic. + components: + - type: Sprite + sprite: _NF/Objects/Fun/magic_crayon.rsi + state: icon + - type: Item + sprite: _NF/Objects/Fun/magic_crayon.rsi + heldPrefix: icon + - type: Tag # Removing trash & recyclable + tags: + - Write + - Crayon + - type: Crayon + capacity: 2147483647 # int.MaxValue, infinite charges + - type: FlavorProfile + flavors: + - chewy + - magical + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nothing + Quantity: 40 diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml index ef9446d3939..35303378a52 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/fun.yml @@ -193,3 +193,12 @@ price: 10000 inhand: - PetCarrierNPCEmotionalSupportSafe + +- type: loadout + id: ContractorCrayonMagic + effects: + - !type:GroupLoadoutEffect + proto: ContractorT3 + price: 30000 + inhand: + - CrayonMagic diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index d5826b14f04..2b7d8008969 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -730,6 +730,7 @@ - ContractorDawInstrumentFlatpack - ContractorHoverbikeFlatpack - ContractorEmotionalPetCarrier + - ContractorCrayonMagic - type: loadoutGroup id: ContractorFace diff --git a/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json index 878f438f4ec..ce57dc29d3f 100644 --- a/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/catplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json index 06c0cf9ed4a..8c36a89ed2c 100644 --- a/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json index 5842b1ad07a..b60d4f5cae8 100644 --- a/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/foxplushie.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a88404f0b202b9e258fa00a6f96b8050115f52a9 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3-o1GtKD$QbGYfA+A9B7Q=srh5t(aG5jm$ z|IfsKP?W7C$S;`TzYY*S=}ia)iX?lwIEG|2zP-7T_kaNhi$l-bzv1VYChqUJ zq*AWCX(3CkD8q;B#pl27J@-}eUikUX{MtSjGMl2TeFg6IUjXX2TXk6PPsMe%Bv3hnr>mdKI;Vst08%nbKmY&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c337641453062383276b3656a5dc5c51dfa0db23 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^2|(Py!3-o1GtKD$QbGYfA+A80Vd1}94FCTX^OyW% z_|L?|Z5)vY6l5z2@(X6r`LFZ;zxCrhIiN_Ar;B4qM&sLCJ9!Tn@Gv|4yj}k^rE!Mq z1hswHyp3AE4xtPOJfrUK?-zZRK4ZS_ll}?&=da&7fBl4bMR^8>zH9dX`tSEDnKW&1 y^p@W9-ejRMBg29BFIlS?85pKWE1SE0c*8V3k>Tn5BWJ}xuJUyCb6Mw<&;$U=o=Ecm literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c520ae932500b2757cd8b4ced4aeb6d3e4ef40ac GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3-pya`gKGDct~{5LX~Q)A$U7@tK(n{}~ov zVqo~+wq2BA`}<=(Y%8A0Uayq-|A}E0P;@fGEe3`M@8_8UHSm`N`2{olM*&ZJ=Pd(D z^?JHEhGaCpy>$8$@nJHL#E$=kopU0tg)~^Lo?dq8lHa9hRnJT789y<9lKmw5 zsqmFFPx$=@7QfkkFV8pFf6UDPd-T2H*~@>gy?yD~%epUiFYEl@KhNCX^j-5s_=WWg z=Bs#4QmMUI)leGz_gB)(zwVEI^Dp_X>G^;EgfIWOft127`Ca)h)IBfNn;!~i;g#0a R1iGAo!PC{xWt~$(69CTof<6EM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json new file mode 100644 index 00000000000..643dce035ad --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, tweaked by Ubaser and whatston3 (GitHub)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "icon-inhand-left", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "icon-inhand-right", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2 ] + ] + } + ] +} + \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json index d39a58e623d..b00abc40de0 100644 --- a/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/petrock.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json index bf0f0d3224d..667aefdc223 100644 --- a/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/prizeticket.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise Station", + "copyright": "Taken from Paradise (arcade.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json index 15cfd9eb4c1..f52f9068543 100644 --- a/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise Station", + "copyright": "plushie_jester, plushie_trystan, plushie_vulp: gentlejester-148196053781315584 / plushie_slips: mintymoo-449394523089403905 / gnome/ipc/grey/loveable/abductor/abductor_agent/deer - Taken from Paradise (toy.dmi) at https://github.com/ParadiseSS13/Paradise/tree/dab6fc55044e4a86d2107629cf148229001c7cd2", "size": { "x": 32, "y": 32 From 76bc29c98cfbaa0851a811518326329261a0cbe6 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 9 Oct 2024 21:55:24 +0000 Subject: [PATCH 37/96] Automatic Changelog (#2157) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index c9cfe291472..13898015fde 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4331,3 +4331,11 @@ Entries: message: New poster for the FSB Spirit and two new EMS signs. id: 5369 time: '2024-10-09T21:40:26.0000000+00:00' +- author: Leander + changes: + - type: Add + message: >- + Added magic crayon and its selection on the Fun loadouts, paint the + world with it! + id: 5370 + time: '2024-10-09T21:54:59.0000000+00:00' From 2cf51318f365b3c7f7c31e02584fe563ae6def93 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 10 Oct 2024 19:35:05 +0300 Subject: [PATCH 38/96] Update phoenix.yml (#2180) --- Resources/Prototypes/_NF/Shipyard/phoenix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml index d91466a8b43..0c349212c47 100644 --- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml +++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml @@ -2,7 +2,7 @@ id: phoenix name: NR Phoenix description: A research and salvage vessel designed for deep space exploration - price: 60500 # TODO - fix this value, getting tests to pass - Whatstone + price: 62500 # TODO - fix this value, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/phoenix.yml From 534e1546c3ba6b2d5813e4f46ab4abe6562ea570 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 10 Oct 2024 21:15:13 +0300 Subject: [PATCH 39/96] Fix benches errors with the SimpleStation14 benches (#2181) * Fixups * Update benches.yml * Update PostMapInitTest.cs * Update PostMapInitTest.cs --- .../Prototypes/{_Park => SimpleStation14}/benches.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) rename Resources/Prototypes/{_Park => SimpleStation14}/benches.yml (98%) diff --git a/Resources/Prototypes/_Park/benches.yml b/Resources/Prototypes/SimpleStation14/benches.yml similarity index 98% rename from Resources/Prototypes/_Park/benches.yml rename to Resources/Prototypes/SimpleStation14/benches.yml index f515772c453..cbc3d0ceeed 100644 --- a/Resources/Prototypes/_Park/benches.yml +++ b/Resources/Prototypes/SimpleStation14/benches.yml @@ -7,6 +7,8 @@ parent: SeatBase description: Multiple seats spanning a single object. Truly a marvel of science. components: + - type: Physics + bodyType: Static - type: Transform anchored: true - type: Rotatable @@ -233,8 +235,6 @@ state: corner - type: Clickable - type: InteractionOutline - - type: Physics - bodyType: Dynamic - type: Pullable - type: Damageable damageContainer: Inorganic @@ -304,8 +304,6 @@ state: corner - type: Clickable - type: InteractionOutline - - type: Physics - bodyType: Dynamic - type: Pullable - type: Damageable damageContainer: Inorganic @@ -323,4 +321,4 @@ collection: MetalBreak - type: Construction # Frontier graph: SofasGraph # Frontier - node: BenchSofaCorpCornerNode # Frontier + node: BenchSofaCorpCornerNode # Frontier \ No newline at end of file From df3d862e5ab907d321fb072b99e051668b624452 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 10 Oct 2024 22:33:39 +0300 Subject: [PATCH 40/96] Unblood Your Blood (#2184) --- Resources/Prototypes/Recipes/Reactions/biological.yml | 6 +++--- Resources/Prototypes/Recipes/Reactions/food.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Recipes/Reactions/biological.yml b/Resources/Prototypes/Recipes/Reactions/biological.yml index 604211466f4..7d2eb37f1da 100644 --- a/Resources/Prototypes/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/Recipes/Reactions/biological.yml @@ -11,7 +11,7 @@ Iron: 0.5 Sugar: 2 CarbonDioxide: 3 - Protein: 4 +# Protein: 4 # Frontier - type: reaction id: SlimeBloodBreakdown @@ -51,7 +51,7 @@ Copper: 0.5 Sugar: 2 CarbonDioxide: 3 - Protein: 4 +# Protein: 4 # Frontier - type: reaction id: ZombieBloodBreakdown @@ -63,5 +63,5 @@ amount: 4 products: Mold: 2 - Protein: 1 +# Protein: 1 # Frontier Toxin: 1 diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 7d524a9c7ae..7974d82ed90 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -338,7 +338,7 @@ products: Fat: 6 Water: 3 - Protein: 1 #water & protein represent aqueous proteins +# Protein: 1 #water & protein represent aqueous proteins # Frontier #- type: reaction # id: SugarBreakdown From e0254f2a956a239437ba0e61bc15711eceda47ae Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Fri, 11 Oct 2024 19:54:36 +0000 Subject: [PATCH 41/96] Barge Directional Fan Update (#2066) * Update barge.yml * Updates waste pump and pacman to ship "on" versions * Barge price to 47k, ~10% margin --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/barge.yml | 705 ++++++-------------- Resources/Prototypes/_NF/Shipyard/barge.yml | 2 +- 2 files changed, 208 insertions(+), 499 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/barge.yml b/Resources/Maps/_NF/Shuttles/barge.yml index c14ee153a17..e5052ba37f1 100644 --- a/Resources/Maps/_NF/Shuttles/barge.yml +++ b/Resources/Maps/_NF/Shuttles/barge.yml @@ -42,11 +42,11 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAegAAAAAAegAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAegAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAegAAAAAAeQAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -224,6 +224,16 @@ entities: 118: 0,3 119: 0,2 120: 0,1 + - node: + color: '#3C44AAFF' + id: DeliveryGreyscale + decals: + 169: 0,-20 + - node: + color: '#B02E26FF' + id: DeliveryGreyscale + decals: + 168: -2,-20 - node: color: '#79150096' id: DiagonalCheckerBOverlay @@ -355,91 +365,80 @@ entities: version: 2 data: tiles: - -2,-1: - 0: 52462 - 1: 8704 - -1,-1: - 0: 65535 - 0,-1: - 0: 65535 - 1,-1: - 0: 13107 - -2,0: - 1: 26214 - 0: 34952 - -1,0: - 0: 65535 - 0,0: - 0: 65535 - 1,0: - 0: 13107 -2,-4: - 1: 26146 - 0: 34816 + 0: 26146 + -2,-5: + 0: 26342 -2,-3: - 0: 52872 - 1: 8260 + 0: 8260 + 1: 32768 -2,-2: - 0: 61166 + 1: 52424 + -2,-1: + 1: 2188 + 0: 8704 + -2,0: + 0: 26214 -1,-4: - 0: 65535 + 1: 65102 -1,-3: - 0: 65535 + 1: 65311 -1,-2: - 0: 65535 + 1: 65535 + -1,-1: + 1: 20479 + -1,0: + 1: 65535 + -1,-5: + 1: 61124 + 0: 1 0,-4: - 0: 65399 + 1: 29459 0,-3: - 0: 65535 + 1: 63303 + 0,-5: + 1: 13073 + 0: 132 0,-2: - 0: 65535 + 1: 61156 + 0,-1: + 1: 60942 + 0,0: + 1: 61166 1,-4: - 1: 13090 + 0: 13090 1,-3: - 1: 8209 - 0: 4864 + 0: 8209 1,-2: + 1: 4368 + 1,-1: + 1: 4353 + 1,0: + 1: 4883 + 1,-5: 0: 13107 -2,1: - 0: 35470 - 1: 17504 + 0: 17504 -1,1: - 0: 65535 + 1: 53236 -1,2: - 1: 1 - 0: 14 + 0: 1 0,1: - 0: 65535 + 1: 6094 0,2: - 0: 3 - 1: 4 + 0: 4 1,1: - 0: 787 - 1: 4128 + 0: 4128 -2,-6: - 1: 25668 - -2,-5: - 1: 26342 - -1,-5: - 1: 1 - 0: 65534 - -1,-6: - 0: 57344 - 0,-6: - 0: 12288 - 0,-5: - 0: 30579 - 1: 132 + 0: 25668 1,-6: - 1: 12561 - 1,-5: - 1: 13107 + 0: 12561 uniqueMixes: - volume: 2500 - temperature: 293.15 + immutable: True moles: - - 21.824879 - - 82.10312 + - 0 + - 0 - 0 - 0 - 0 @@ -453,8 +452,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -485,8 +484,6 @@ entities: devices: - 550 - 543 - - type: AtmosDevice - joinedGrid: 70 - uid: 742 components: - type: Transform @@ -501,8 +498,6 @@ entities: - 664 - 662 - 55 - - type: AtmosDevice - joinedGrid: 70 - uid: 743 components: - type: Transform @@ -517,20 +512,6 @@ entities: - 623 - 304 - 647 - - type: AtmosDevice - joinedGrid: 70 -- proto: AirCanister - entities: - - uid: 514 - components: - - type: Transform - anchored: True - pos: 1.5,-15.5 - parent: 70 - - type: Physics - bodyType: Static - - type: AtmosDevice - joinedGrid: 70 - proto: AirlockCargoGlass entities: - uid: 570 @@ -621,42 +602,48 @@ entities: - type: Transform pos: -3.4585743,-3.7488751 parent: 70 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 46 + - uid: 43 components: - type: Transform - pos: -4.5,3.5 + rot: 1.5707963267948966 rad + pos: 5.5,3.5 parent: 70 - uid: 52 components: - type: Transform + rot: 1.5707963267948966 rad pos: 5.5,-0.5 parent: 70 - uid: 81 components: - type: Transform rot: 1.5707963267948966 rad - pos: 5.5,0.5 + pos: 5.5,2.5 parent: 70 - uid: 149 components: - type: Transform + rot: -1.5707963267948966 rad pos: -4.5,2.5 parent: 70 - - uid: 519 + - uid: 222 components: - type: Transform - pos: 5.5,3.5 + rot: -1.5707963267948966 rad + pos: -4.5,3.5 parent: 70 - - uid: 520 + - uid: 274 components: - type: Transform - pos: 5.5,2.5 + rot: 1.5707963267948966 rad + pos: 5.5,0.5 parent: 70 - - uid: 740 + - uid: 601 components: - type: Transform + rot: -1.5707963267948966 rad pos: -4.5,1.5 parent: 70 - proto: AtmosFixBlockerMarker @@ -1069,54 +1056,29 @@ entities: entities: - uid: 83 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 529 - uid: 85 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 529 - uid: 285 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 521 - uid: 287 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,2.5 parent: 70 - - type: DeviceLinkSink - links: - - 521 - uid: 307 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 521 - proto: CableApcExtension entities: - uid: 10 @@ -2103,6 +2065,18 @@ entities: - type: Transform pos: 1.5,-16.5 parent: 70 + - uid: 520 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-18.5 + parent: 70 + - uid: 600 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-18.5 + parent: 70 - proto: ChairPilotSeat entities: - uid: 312 @@ -2171,139 +2145,90 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 78 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 169 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 172 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 361 - - 313 - uid: 204 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-3.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 216 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-2.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 217 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-1.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 218 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 220 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 221 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 230 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 247 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 248 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-0.5 parent: 70 - - type: DeviceLinkSink - links: - - 362 - uid: 249 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-4.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - uid: 250 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-5.5 parent: 70 - - type: DeviceLinkSink - links: - - 577 - proto: DefibrillatorCabinetFilled entities: - uid: 609 @@ -2411,8 +2336,6 @@ entities: - 584 - 342 - 140 - - type: AtmosDevice - joinedGrid: 70 - uid: 574 components: - type: Transform @@ -2426,8 +2349,6 @@ entities: - 283 - 168 - 140 - - type: AtmosDevice - joinedGrid: 70 - uid: 576 components: - type: Transform @@ -2442,8 +2363,6 @@ entities: - 266 - 318 - 328 - - type: AtmosDevice - joinedGrid: 70 - proto: Firelock entities: - uid: 584 @@ -2515,17 +2434,18 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-10.5 parent: 70 -- proto: GasMixerFlipped +- proto: GasMixerOnFlipped entities: - - uid: 274 + - uid: 282 components: - type: Transform pos: 0.5,-18.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 737 @@ -2534,8 +2454,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend @@ -2547,21 +2465,15 @@ entities: pos: 2.5,-12.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 264 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-18.5 parent: 70 - - uid: 282 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-16.5 - parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 552 components: - type: Transform @@ -2632,14 +2544,7 @@ entities: pos: -0.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' - - uid: 222 - components: - - type: Transform - pos: 0.5,-16.5 - parent: 70 - - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 628 components: - type: Transform @@ -2663,28 +2568,28 @@ entities: pos: 1.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 17 components: - type: Transform pos: -0.5,-7.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 19 components: - type: Transform pos: -0.5,0.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 47 components: - type: Transform pos: 0.5,-14.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 49 components: - type: Transform @@ -2692,21 +2597,21 @@ entities: pos: 2.5,-10.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 50 components: - type: Transform pos: -0.5,-5.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 51 components: - type: Transform pos: -0.5,-3.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 53 components: - type: Transform @@ -2714,7 +2619,7 @@ entities: pos: -2.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 54 components: - type: Transform @@ -2722,27 +2627,29 @@ entities: pos: 1.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 215 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-18.5 parent: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 223 components: - type: Transform pos: 0.5,-17.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 288 components: - type: Transform pos: 0.5,-13.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 289 components: - type: Transform @@ -2750,7 +2657,7 @@ entities: pos: 1.5,-12.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 290 components: - type: Transform @@ -2758,7 +2665,7 @@ entities: pos: 2.5,-11.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 291 components: - type: Transform @@ -2766,7 +2673,7 @@ entities: pos: 2.5,-9.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 293 components: - type: Transform @@ -2774,42 +2681,42 @@ entities: pos: 0.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 294 components: - type: Transform pos: -0.5,-6.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 295 components: - type: Transform pos: -0.5,-4.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 296 components: - type: Transform pos: -0.5,-2.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 297 components: - type: Transform pos: -0.5,-0.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 298 components: - type: Transform pos: -0.5,1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 300 components: - type: Transform @@ -2817,7 +2724,7 @@ entities: pos: -1.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 301 components: - type: Transform @@ -2825,7 +2732,7 @@ entities: pos: -3.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 302 components: - type: Transform @@ -2833,7 +2740,7 @@ entities: pos: 0.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 303 components: - type: Transform @@ -2841,21 +2748,29 @@ entities: pos: 2.5,-1.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' + - uid: 514 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-15.5 + parent: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 532 components: - type: Transform pos: -0.5,4.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 533 components: - type: Transform pos: -0.5,5.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 562 components: - type: Transform @@ -3001,7 +2916,7 @@ entities: pos: 2.5,-7.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 642 components: - type: Transform @@ -3049,7 +2964,7 @@ entities: pos: -0.5,3.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 653 components: - type: Transform @@ -3113,7 +3028,7 @@ entities: pos: -1.5,2.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasPipeTJunction entities: - uid: 14 @@ -3122,7 +3037,7 @@ entities: pos: 0.5,-12.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 15 components: - type: Transform @@ -3130,7 +3045,7 @@ entities: pos: 2.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 292 components: - type: Transform @@ -3138,7 +3053,7 @@ entities: pos: -0.5,-8.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 299 components: - type: Transform @@ -3147,6 +3062,14 @@ entities: parent: 70 - type: AtmosPipeColor color: '#990000FF' + - uid: 519 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-16.5 + parent: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 586 components: - type: Transform @@ -3170,54 +3093,31 @@ entities: pos: -0.5,2.5 parent: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasPort entities: - - uid: 42 - components: - - type: Transform - pos: 1.5,-15.5 - parent: 70 - - type: AtmosDevice - joinedGrid: 70 - - type: AtmosPipeColor - color: '#0000CCFF' - uid: 219 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-19.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 265 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-19.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 -- proto: GasPressurePump +- proto: GasPressurePumpOnMax entities: - - uid: 43 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-15.5 - parent: 70 - - type: AtmosDevice - joinedGrid: 70 - - type: AtmosPipeColor - color: '#0000CCFF' - - uid: 306 + - uid: 276 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - proto: GasVentPump @@ -3228,78 +3128,62 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-1.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 57 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-12.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 304 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-1.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 305 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-9.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 534 components: - type: Transform pos: -0.5,6.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 543 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-16.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 636 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,2.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - uid: 641 components: - type: Transform pos: 2.5,-6.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor - color: '#0000CCFF' + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 550 @@ -3308,8 +3192,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-17.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 594 @@ -3318,8 +3200,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-13.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 623 @@ -3328,8 +3208,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-9.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 639 @@ -3337,8 +3215,6 @@ entities: - type: Transform pos: -1.5,6.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 646 @@ -3346,8 +3222,6 @@ entities: - type: Transform pos: 2.5,-3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 647 @@ -3356,8 +3230,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-3.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 662 @@ -3365,8 +3237,6 @@ entities: - type: Transform pos: 3.5,4.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - uid: 664 @@ -3375,8 +3245,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,0.5 parent: 70 - - type: AtmosDevice - joinedGrid: 70 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3708,6 +3576,24 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 70 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 602 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-15.5 + parent: 70 +- proto: NitrogenCanister + entities: + - uid: 46 + components: + - type: Transform + anchored: True + pos: -1.5,-19.5 + parent: 70 + - type: Physics + bodyType: Static - proto: OreProcessor entities: - uid: 604 @@ -3715,6 +3601,16 @@ entities: - type: Transform pos: -0.5,0.5 parent: 70 +- proto: OxygenCanister + entities: + - uid: 42 + components: + - type: Transform + anchored: True + pos: 0.5,-19.5 + parent: 70 + - type: Physics + bodyType: Static - proto: Paper entities: - uid: 567 @@ -3734,20 +3630,27 @@ entities: - type: Transform pos: -4.5,1.5 parent: 70 -- proto: PortableGeneratorPacman + - uid: 603 + components: + - type: Transform + pos: 5.5,3.5 + parent: 70 + - uid: 605 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 70 +- proto: PortableGeneratorPacmanShuttle entities: - - uid: 276 + - uid: 306 components: - type: Transform - anchored: True pos: 1.5,-17.5 parent: 70 - - type: MaterialStorage - storage: - Plasma: 1500 + - type: FuelGenerator + on: False - type: Physics bodyType: Static - - type: InsertingMaterialStorage - proto: PowerCellRecharger entities: - uid: 126 @@ -3759,8 +3662,6 @@ entities: entities: - uid: 245 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,-18.5 @@ -3769,8 +3670,6 @@ entities: powerLoad: 0 - uid: 535 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -3.5,8.5 @@ -3779,8 +3678,6 @@ entities: powerLoad: 0 - uid: 537 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 2.5,8.5 @@ -3789,8 +3686,6 @@ entities: powerLoad: 0 - uid: 538 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,6.5 parent: 70 @@ -3798,8 +3693,6 @@ entities: powerLoad: 0 - uid: 545 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-2.5 @@ -3808,8 +3701,6 @@ entities: powerLoad: 0 - uid: 547 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-3.5 @@ -3818,8 +3709,6 @@ entities: powerLoad: 0 - uid: 551 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 1.5,0.5 @@ -3828,8 +3717,6 @@ entities: powerLoad: 0 - uid: 553 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -0.5,0.5 @@ -3838,8 +3725,6 @@ entities: powerLoad: 0 - uid: 554 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-18.5 @@ -3848,8 +3733,6 @@ entities: powerLoad: 0 - uid: 555 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-18.5 @@ -3858,8 +3741,6 @@ entities: powerLoad: 0 - uid: 558 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,-13.5 @@ -3868,8 +3749,6 @@ entities: powerLoad: 0 - uid: 559 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-9.5 @@ -3878,8 +3757,6 @@ entities: powerLoad: 0 - uid: 560 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-9.5 @@ -3890,8 +3767,6 @@ entities: entities: - uid: 556 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,3.5 parent: 70 @@ -3954,71 +3829,33 @@ entities: - type: Transform pos: -0.5,-14.5 parent: 70 -- proto: SheetPlasma - entities: - - uid: 605 - components: - - type: Transform - pos: 1.358752,-16.485178 - parent: 70 - - type: Stack - count: 15 - - type: Item - size: 15 - proto: ShuttersNormal entities: - uid: 251 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,1.5 parent: 70 - - type: DeviceLinkSink - links: - - 544 - uid: 252 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,2.5 parent: 70 - - type: DeviceLinkSink - links: - - 544 - uid: 253 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,3.5 parent: 70 - - type: DeviceLinkSink - links: - - 544 - uid: 261 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-2.5 parent: 70 - - type: DeviceLinkSink - links: - - 528 - - 539 - uid: 263 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-2.5 parent: 70 - - type: DeviceLinkSink - links: - - 528 - - 539 - proto: ShuttleWindow entities: - uid: 5 @@ -4260,7 +4097,7 @@ entities: - type: Transform pos: 1.5,-14.5 parent: 70 -- proto: SignMinerDock +- proto: SignShipDock entities: - uid: 610 components: @@ -4279,7 +4116,7 @@ entities: - type: Transform pos: -2.5,-17.5 parent: 70 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 596 components: @@ -4773,8 +4610,6 @@ entities: entities: - uid: 137 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: -5.5,-4.5 parent: 70 @@ -4782,8 +4617,6 @@ entities: entities: - uid: 111 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: 3.5,5.5 parent: 70 @@ -4791,8 +4624,6 @@ entities: entities: - uid: 389 components: - - type: MetaData - flags: SessionSpecific - type: Transform pos: -4.5,-1.5 parent: 70 @@ -4800,428 +4631,306 @@ entities: entities: - uid: 6 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,4.5 parent: 70 - uid: 7 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-0.5 parent: 70 - uid: 39 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-15.5 parent: 70 - uid: 40 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,-19.5 parent: 70 - uid: 60 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,0.5 parent: 70 - uid: 69 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-1.5 parent: 70 - uid: 72 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-2.5 parent: 70 - uid: 73 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,4.5 parent: 70 - uid: 76 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-6.5 parent: 70 - uid: 80 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,8.5 parent: 70 - uid: 86 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,4.5 parent: 70 - uid: 87 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-2.5 parent: 70 - uid: 88 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-2.5 parent: 70 - uid: 90 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-9.5 parent: 70 - uid: 91 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,4.5 parent: 70 - uid: 93 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,7.5 parent: 70 - uid: 94 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,6.5 parent: 70 - uid: 95 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-7.5 parent: 70 - uid: 98 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,8.5 parent: 70 - uid: 99 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,7.5 parent: 70 - uid: 100 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,6.5 parent: 70 - uid: 101 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,7.5 parent: 70 - uid: 103 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,6.5 parent: 70 - uid: 113 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,-2.5 parent: 70 - uid: 119 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-0.5 parent: 70 - uid: 120 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-7.5 parent: 70 - uid: 121 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,5.5 parent: 70 - uid: 125 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,-7.5 parent: 70 - uid: 127 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-0.5 parent: 70 - uid: 136 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,-7.5 parent: 70 - uid: 141 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-7.5 parent: 70 - uid: 144 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,-9.5 parent: 70 - uid: 151 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-19.5 parent: 70 - uid: 152 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,-9.5 parent: 70 - uid: 153 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-9.5 parent: 70 - uid: 154 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-10.5 parent: 70 - uid: 163 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,-0.5 parent: 70 - uid: 164 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,5.5 parent: 70 - uid: 181 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-20.5 parent: 70 - uid: 187 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-20.5 parent: 70 - uid: 188 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-15.5 parent: 70 - uid: 192 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-14.5 parent: 70 - uid: 193 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-18.5 parent: 70 - uid: 194 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-18.5 parent: 70 - uid: 195 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-19.5 parent: 70 - uid: 196 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,4.5 parent: 70 - uid: 197 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-18.5 parent: 70 - uid: 200 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,4.5 parent: 70 - uid: 201 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-7.5 parent: 70 - uid: 212 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-14.5 parent: 70 - uid: 213 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-14.5 parent: 70 - uid: 214 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-13.5 parent: 70 - uid: 238 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-13.5 parent: 70 - uid: 239 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-13.5 parent: 70 - uid: 240 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-13.5 parent: 70 - uid: 241 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,-14.5 parent: 70 - uid: 242 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,-18.5 parent: 70 - uid: 243 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -2.5,7.5 parent: 70 - uid: 244 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,-3.5 parent: 70 - uid: 286 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-10.5 parent: 70 - uid: 353 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,4.5 parent: 70 diff --git a/Resources/Prototypes/_NF/Shipyard/barge.yml b/Resources/Prototypes/_NF/Shipyard/barge.yml index 7ae441af9ad..9494e3ab19f 100644 --- a/Resources/Prototypes/_NF/Shipyard/barge.yml +++ b/Resources/Prototypes/_NF/Shipyard/barge.yml @@ -12,7 +12,7 @@ id: Barge name: NC Barge description: A medium shipping vessel repurposed into a salvage bar. - price: 45000 # Appraises for 42046, margin of ~5% - TODO: fix these values, getting tests to pass - Whatstone + price: 47000 # Appraises for 42901, margin of ~10% - TODO: fix these values, getting tests to pass - Whatstone category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/barge.yml From 9c5436af009440de501097bf58e5bde820a9d535 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 11 Oct 2024 19:55:05 +0000 Subject: [PATCH 42/96] Automatic Changelog (#2066) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 13898015fde..84c41534945 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4339,3 +4339,9 @@ Entries: world with it! id: 5370 time: '2024-10-09T21:54:59.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: updated barge with directional fans + id: 5371 + time: '2024-10-11T19:54:36.0000000+00:00' From 99a949c756d0d2fdcc1770c8c36064efda5bd3b5 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:05:13 +0000 Subject: [PATCH 43/96] Replaces Barnacle tiny fans with directional fans. (#2097) * Update barnacle.yml * Increase margin on Barnacle to ~10% --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- .../_NF/Shuttles/BlackMarket/barnacle.yml | 150 +++++++++--------- .../_NF/Shipyard/BlackMarket/barnacle.yml | 2 +- 2 files changed, 77 insertions(+), 75 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml index 9a245ab57d8..1308cd190c1 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/barnacle.yml @@ -171,16 +171,6 @@ entities: - 227 - 213 - 215 -- proto: AirCanister - entities: - - uid: 57 - components: - - type: Transform - anchored: True - pos: -5.5,-2.5 - parent: 201 - - type: Physics - bodyType: Static - proto: AirlockExternalGlass entities: - uid: 142 @@ -228,38 +218,43 @@ entities: - type: Transform pos: 1.3489224,-4.3157334 parent: 201 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 11 + - uid: 28 components: - type: Transform - pos: 0.5,-2.5 + rot: -1.5707963267948966 rad + pos: -6.5,0.5 parent: 201 - - uid: 12 + - uid: 57 components: - type: Transform - pos: 0.5,-1.5 + rot: -1.5707963267948966 rad + pos: -6.5,-1.5 parent: 201 - - uid: 13 + - uid: 62 components: - type: Transform - pos: 0.5,-0.5 + rot: -1.5707963267948966 rad + pos: -6.5,-0.5 parent: 201 - - uid: 27 + - uid: 122 components: - type: Transform - pos: -6.5,-1.5 + rot: 1.5707963267948966 rad + pos: 0.5,-0.5 parent: 201 - - uid: 28 + - uid: 166 components: - type: Transform - pos: -6.5,0.5 + rot: 1.5707963267948966 rad + pos: 0.5,-1.5 parent: 201 - - uid: 73 + - uid: 226 components: - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-0.5 + rot: 1.5707963267948966 rad + pos: 0.5,-2.5 parent: 201 - proto: AtmosFixBlockerMarker entities: @@ -341,27 +336,18 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-2.5 parent: 201 - - type: DeviceLinkSink - links: - - 103 - uid: 171 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-0.5 parent: 201 - - type: DeviceLinkSink - links: - - 103 - uid: 172 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,-1.5 parent: 201 - - type: DeviceLinkSink - links: - - 103 - proto: CableApcExtension entities: - uid: 69 @@ -755,6 +741,19 @@ entities: - type: Transform pos: -2.5,-3.5 parent: 201 +- proto: GasMixerOn + entities: + - uid: 67 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 201 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 123 @@ -809,6 +808,13 @@ entities: parent: 201 - type: AtmosPipeColor color: '#1010FFFF' + - uid: 11 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 201 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 119 components: - type: Transform @@ -918,14 +924,6 @@ entities: parent: 201 - type: AtmosPipeColor color: '#990000FF' - - uid: 225 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-3.5 - parent: 201 - - type: AtmosPipeColor - color: '#990000FF' - proto: GasPipeTJunction entities: - uid: 117 @@ -946,25 +944,25 @@ entities: color: '#990000FF' - proto: GasPort entities: - - uid: 42 + - uid: 12 components: - type: Transform rot: 3.141592653589793 rad - pos: -5.5,-2.5 + pos: -3.5,-2.5 parent: 201 - type: AtmosPipeColor - color: '#1010FFFF' -- proto: GasPressurePump - entities: - - uid: 120 + color: '#0055CCFF' + - uid: 42 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-0.5 + rot: 3.141592653589793 rad + pos: -5.5,-2.5 parent: 201 - type: AtmosPipeColor color: '#1010FFFF' - - uid: 122 +- proto: GasPressurePumpOnMax + entities: + - uid: 73 components: - type: Transform rot: -1.5707963267948966 rad @@ -1157,8 +1155,14 @@ entities: - type: Transform pos: -4.5,2.5 parent: 201 - - type: Thruster - originalPowerLoad: 1500 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-6.5 + parent: 201 - proto: MachineFrame entities: - uid: 41 @@ -1174,6 +1178,26 @@ entities: - type: Transform pos: 1.6783751,-4.3457556 parent: 201 +- proto: NitrogenCanister + entities: + - uid: 27 + components: + - type: Transform + anchored: True + pos: -3.5,-2.5 + parent: 201 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 13 + components: + - type: Transform + anchored: True + pos: -5.5,-2.5 + parent: 201 + - type: Physics + bodyType: Static - proto: PirateFlag entities: - uid: 14 @@ -1392,17 +1416,6 @@ entities: 23: - Pressed: Toggle - Pressed: Trigger -- proto: SheetPlasma - entities: - - uid: 166 - components: - - type: Transform - pos: 0.4796412,-5.530752 - parent: 201 - - type: Stack - count: 15 - - type: Item - size: 15 - proto: ShuttleGunPirateCannon entities: - uid: 23 @@ -1411,9 +1424,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-0.5 parent: 201 - - type: DeviceLinkSink - links: - - 252 - proto: SignalButtonDirectional entities: - uid: 103 @@ -1518,31 +1528,23 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-7.5 parent: 201 - - type: Thruster - originalPowerLoad: 1500 - uid: 137 components: - type: Transform pos: -4.5,3.5 parent: 201 - - type: Thruster - originalPowerLoad: 1500 - uid: 138 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-7.5 parent: 201 - - type: Thruster - originalPowerLoad: 1500 - uid: 150 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,2.5 parent: 201 - - type: Thruster - originalPowerLoad: 1500 - proto: WallWood entities: - uid: 10 diff --git a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml index 79612d86551..a6e0efe08c8 100644 --- a/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml +++ b/Resources/Prototypes/_NF/Shipyard/BlackMarket/barnacle.yml @@ -7,7 +7,7 @@ id: Barnacle name: Barnacle description: 'Nobody expects the lowly barnacle' - price: 16000 + price: 17000 # Appraises for 15445, price set to 17k, margin of ~10% - TODO: review ship values - Whatstone category: Small group: BlackMarket shuttlePath: /Maps/_NF/Shuttles/BlackMarket/barnacle.yml From ee2f0d20178a1a8c18795ff6279fc411eb831e14 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Fri, 11 Oct 2024 20:05:39 +0000 Subject: [PATCH 44/96] Automatic Changelog (#2097) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 84c41534945..85b3ec6d45e 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4345,3 +4345,9 @@ Entries: message: updated barge with directional fans id: 5371 time: '2024-10-11T19:54:36.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Updated Barnacle with directional fans. + id: 5372 + time: '2024-10-11T20:05:14.0000000+00:00' From 4a6c0b2f3e4a07ced89edc5e0853690ec1b317fd Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 00:34:19 +0000 Subject: [PATCH 45/96] Replace Empress tiny fans with directional fans. (#2104) * Update empress.yml * Rotate freezer door fan to face inside --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 328 ++++--------------- 1 file changed, 64 insertions(+), 264 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 534fc12bf27..1db1f256dc0 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -1568,9 +1568,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - proto: AirlockNfsdLocked entities: - uid: 13 @@ -1603,9 +1600,6 @@ entities: - type: Transform pos: 8.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - uid: 19 components: - type: Transform @@ -1812,7 +1806,7 @@ entities: - type: Transform pos: 18.5,4.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 456 components: @@ -1835,7 +1829,7 @@ entities: - uid: 459 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 24.5,-8.5 parent: 1 - uid: 460 @@ -1847,9 +1841,14 @@ entities: - uid: 461 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: -25.5,-8.5 parent: 1 + - uid: 614 + components: + - type: Transform + pos: -8.5,-3.5 + parent: 1 - uid: 630 components: - type: Transform @@ -1858,7 +1857,7 @@ entities: - uid: 631 components: - type: Transform - pos: -8.5,-3.5 + pos: 11.5,-3.5 parent: 1 - uid: 633 components: @@ -1868,12 +1867,7 @@ entities: - uid: 657 components: - type: Transform - pos: 11.5,-3.5 - parent: 1 - - uid: 735 - components: - - type: Transform - rot: -1.5707963267948966 rad + rot: 1.5707963267948966 rad pos: 16.5,5.5 parent: 1 - proto: AtmosFixBlockerMarker @@ -2765,65 +2759,41 @@ entities: - type: Transform pos: 23.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 689 - uid: 1782 components: - type: Transform pos: 22.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 601 - uid: 1783 components: - type: Transform pos: -24.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 581 - uid: 1784 components: - type: Transform pos: -23.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 527 - uid: 2367 components: - type: Transform pos: -14.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 497 - uid: 2368 components: - type: Transform pos: -8.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 490 - uid: 2369 components: - type: Transform pos: 5.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 1010 - uid: 2370 components: - type: Transform pos: 11.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 697 - proto: BlastDoorOpen entities: - uid: 2371 @@ -2831,17 +2801,11 @@ entities: - type: Transform pos: 5.5,9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - uid: 2372 components: - type: Transform pos: 7.5,9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - proto: BookChemicalCompendium entities: - uid: 1637 @@ -6428,13 +6392,18 @@ entities: - type: Transform pos: 6.5,8.5 parent: 1 - - type: Physics - canCollide: False - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - type: Physics + canCollide: False - type: ItemSlots - proto: ConveyorBelt entities: @@ -6443,9 +6412,6 @@ entities: - type: Transform pos: -21.5,-8.5 parent: 1 - - type: DeviceLinkSink - links: - - 532 - proto: CrateChemistrySupplies entities: - uid: 593 @@ -11442,13 +11408,6 @@ entities: - type: Transform pos: -2.7208433,-4.620925 parent: 1 -- proto: MachineFrame - entities: - - uid: 1161 - components: - - type: Transform - pos: 15.5,8.5 - parent: 1 - proto: KitchenReagentGrinder entities: - uid: 598 @@ -11720,6 +11679,13 @@ entities: - type: Transform pos: 29.692461,1.1016078 parent: 1 +- proto: MachineFrame + entities: + - uid: 1161 + components: + - type: Transform + pos: 15.5,8.5 + parent: 1 - proto: MaterialReclaimer entities: - uid: 529 @@ -12913,79 +12879,52 @@ entities: rot: 3.141592653589793 rad pos: 26.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 1766 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2598 - uid: 1767 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2599 - uid: 1768 components: - type: Transform pos: 24.5,-5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2600 - uid: 1769 components: - type: Transform pos: 27.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - uid: 1770 components: - type: Transform rot: 3.141592653589793 rad pos: 28.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 1771 components: - type: Transform rot: 3.141592653589793 rad pos: 27.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 1772 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - uid: 1774 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 1791 components: - type: Transform @@ -13049,18 +12988,12 @@ entities: - type: Transform pos: -21.5,6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2558 - uid: 2605 components: - type: Transform rot: 3.141592653589793 rad pos: -21.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 1707 - proto: Rack entities: - uid: 583 @@ -13530,25 +13463,16 @@ entities: - type: Transform pos: 0.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 654 components: - type: Transform pos: -3.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 655 components: - type: Transform pos: 2.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 694 components: - type: Transform @@ -13559,201 +13483,126 @@ entities: - type: Transform pos: -3.5,-17.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 696 components: - type: Transform pos: -2.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 1752 components: - type: Transform pos: 2.5,-16.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2574 components: - type: Transform pos: 27.5,6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2583 components: - type: Transform pos: 19.5,-10.5 parent: 1 - - type: DeviceLinkSink - links: - - 1058 - uid: 2584 components: - type: Transform pos: 18.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1058 - uid: 2585 components: - type: Transform pos: 27.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2600 - uid: 2586 components: - type: Transform pos: 25.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 2600 - uid: 2587 components: - type: Transform pos: 16.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2598 - uid: 2588 components: - type: Transform pos: 17.5,-7.5 parent: 1 - - type: DeviceLinkSink - links: - - 2598 - uid: 2589 components: - type: Transform pos: 16.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2599 - uid: 2590 components: - type: Transform pos: 28.5,-5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - uid: 2591 components: - type: Transform pos: 30.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 2601 - uid: 2592 components: - type: Transform pos: 30.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2593 components: - type: Transform pos: 30.5,0.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2594 components: - type: Transform pos: 30.5,1.5 parent: 1 - - type: DeviceLinkSink - links: - - 2602 - uid: 2595 components: - type: Transform pos: 29.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2596 components: - type: Transform pos: 29.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2597 components: - type: Transform pos: 26.5,6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2603 - uid: 2606 components: - type: Transform pos: -3.5,-16.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2611 components: - type: Transform pos: -3.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2612 components: - type: Transform pos: 2.5,-10.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2613 components: - type: Transform pos: -3.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2614 components: - type: Transform pos: 2.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2615 components: - type: Transform pos: 2.5,-6.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2616 components: - type: Transform @@ -13764,73 +13613,46 @@ entities: - type: Transform pos: 2.5,-5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2618 components: - type: Transform pos: 2.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2622 components: - type: Transform pos: 2.5,-17.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2623 components: - type: Transform pos: -1.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2624 components: - type: Transform pos: 2.5,-12.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2626 components: - type: Transform pos: -3.5,-12.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2627 components: - type: Transform pos: 1.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2629 components: - type: Transform pos: -3.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2630 components: - type: Transform pos: -3.5,-10.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2631 components: - type: Transform @@ -13841,9 +13663,6 @@ entities: - type: Transform pos: -0.5,-18.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - uid: 2634 components: - type: Transform @@ -13854,9 +13673,6 @@ entities: - type: Transform pos: -3.5,-5.5 parent: 1 - - type: DeviceLinkSink - links: - - 2643 - proto: ShuttersWindowOpen entities: - uid: 2540 @@ -13864,49 +13680,31 @@ entities: - type: Transform pos: 4.5,7.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - uid: 2541 components: - type: Transform pos: 4.5,6.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - uid: 2542 components: - type: Transform pos: 5.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - uid: 2543 components: - type: Transform pos: 6.5,5.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - uid: 2544 components: - type: Transform pos: 8.5,6.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - uid: 2545 components: - type: Transform pos: 8.5,7.5 parent: 1 - - type: DeviceLinkSink - links: - - 1099 - proto: SignalButtonDirectional entities: - uid: 1058 @@ -14299,6 +14097,45 @@ entities: rot: 3.141592653589793 rad pos: 14.5,3.5 parent: 1 +- proto: StructureGunRackNfsd + entities: + - uid: 250 + components: + - type: Transform + pos: 21.5,3.5 + parent: 1 + - type: Lock + lockingSound: !type:SoundPathSpecifier + params: + volume: -5 + path: /Audio/Machines/door_lock_on.ogg + unlockingSound: !type:SoundPathSpecifier + params: + volume: -5 + path: /Audio/Machines/door_lock_off.ogg +- proto: StructureMeleeWeaponRackWallmountedNfsd + entities: + - uid: 323 + components: + - type: Transform + pos: 20.5,1.5 + parent: 1 + - type: Lock + lockingSound: !type:SoundPathSpecifier + params: + volume: -5 + path: /Audio/Machines/door_lock_on.ogg + unlockingSound: !type:SoundPathSpecifier + params: + volume: -5 + path: /Audio/Machines/door_lock_off.ogg +- proto: StructurePistolRackWallmountedNfsd + entities: + - uid: 253 + components: + - type: Transform + pos: 28.5,5.5 + parent: 1 - proto: SubstationBasic entities: - uid: 95 @@ -14337,8 +14174,6 @@ entities: - type: Transform pos: 26.5,1.5 parent: 1 - - type: Physics - canCollide: False - proto: SuitStorageWallmountBrigmedic entities: - uid: 1000 @@ -14346,8 +14181,6 @@ entities: - type: Transform pos: 25.5,-4.5 parent: 1 - - type: Physics - canCollide: False - proto: SuitStorageWallmountCadet entities: - uid: 998 @@ -14355,8 +14188,6 @@ entities: - type: Transform pos: 18.5,-4.5 parent: 1 - - type: Physics - canCollide: False - proto: SuitStorageWallmountDeputy entities: - uid: 999 @@ -14364,8 +14195,6 @@ entities: - type: Transform pos: 18.5,-1.5 parent: 1 - - type: Physics - canCollide: False - proto: SuitStorageWallmountSergeant entities: - uid: 996 @@ -14374,8 +14203,6 @@ entities: rot: 3.141592653589793 rad pos: 27.5,-4.5 parent: 1 - - type: Physics - canCollide: False - proto: SuitStorageWallmountSheriff entities: - uid: 997 @@ -14384,8 +14211,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,4.5 parent: 1 - - type: Physics - canCollide: False - proto: SurveillanceCameraRouterSecurity entities: - uid: 1743 @@ -17236,31 +17061,6 @@ entities: - type: Transform pos: -2.485515,-4.420809 parent: 1 -- proto: StructureGunRackNfsd - entities: - - uid: 250 - components: - - type: Transform - pos: 21.5,3.5 - parent: 1 - - type: Lock - locked: True -- proto: StructureMeleeWeaponRackWallmountedNfsd - entities: - - uid: 323 - components: - - type: Transform - pos: 20.5,1.5 - parent: 1 - - type: Lock - locked: True -- proto: StructurePistolRackWallmountedNfsd - entities: - - uid: 253 - components: - - type: Transform - pos: 28.5,5.5 - parent: 1 - proto: WeldingFuelTankHighCapacity entities: - uid: 823 From fc45cc1e8cd30d9d62527cf7cbbddf27bb2d7ad0 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 00:34:42 +0000 Subject: [PATCH 46/96] Automatic Changelog (#2104) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 85b3ec6d45e..115b1ef9cf1 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4351,3 +4351,9 @@ Entries: message: Updated Barnacle with directional fans. id: 5372 time: '2024-10-11T20:05:14.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Update Empress tiny fans with directional fans. + id: 5373 + time: '2024-10-12T00:34:19.0000000+00:00' From ea77e77694219f367462a70b833fdc1c037b12b4 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 02:04:30 +0000 Subject: [PATCH 47/96] Update construct.yml (#2107) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/construct.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/construct.yml b/Resources/Maps/_NF/Shuttles/construct.yml index 4f49f94b28e..1cf15905d99 100644 --- a/Resources/Maps/_NF/Shuttles/construct.yml +++ b/Resources/Maps/_NF/Shuttles/construct.yml @@ -145,29 +145,29 @@ entities: rot: 3.141592653589793 rad pos: 2.5,2.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 2 components: - type: Transform - pos: -0.5,2.5 + pos: 1.5,-0.5 parent: 1 - uid: 3 components: - type: Transform + rot: 3.141592653589793 rad pos: 1.5,2.5 parent: 1 - uid: 21 components: - type: Transform - rot: 1.5707963267948966 rad pos: -0.5,-0.5 parent: 1 - uid: 22 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-0.5 + rot: 3.141592653589793 rad + pos: -0.5,2.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -576,8 +576,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,0.5 parent: 1 - - type: Physics - canCollide: False - proto: Thruster entities: - uid: 19 From d69f514fed85ff45e1d06cd2391b4ad6e129396f Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 02:04:56 +0000 Subject: [PATCH 48/96] Automatic Changelog (#2107) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 115b1ef9cf1..90710c5c5af 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4357,3 +4357,9 @@ Entries: message: Update Empress tiny fans with directional fans. id: 5373 time: '2024-10-12T00:34:19.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Replace tiny fans with directional fans. + id: 5374 + time: '2024-10-12T02:04:30.0000000+00:00' From 538bad8413b658975dab04aab0df7d48b2a9a12f Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sat, 12 Oct 2024 14:53:15 +0200 Subject: [PATCH 49/96] Replace tiny fans with directional in Anomalous Geode, also fix its grid name (#2135) Co-authored-by: eidolon <95361+eidolon-zz@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/anomalousgeode.yml | 50 +++++++++++------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/Resources/Maps/_NF/POI/anomalousgeode.yml b/Resources/Maps/_NF/POI/anomalousgeode.yml index 076d81ea9d5..7724b31c0dc 100644 --- a/Resources/Maps/_NF/POI/anomalousgeode.yml +++ b/Resources/Maps/_NF/POI/anomalousgeode.yml @@ -20,7 +20,7 @@ entities: - uid: 1 components: - type: MetaData - name: grid + name: Anomalous Geode - type: Transform pos: 0.14351851,0.09722221 parent: invalid @@ -1124,43 +1124,43 @@ entities: - type: Transform pos: 7.5,2.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 647 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,4.5 + rot: 1.5707963267948966 rad + pos: 15.5,-3.5 parent: 1 - uid: 648 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,3.5 + rot: 1.5707963267948966 rad + pos: 15.5,-2.5 parent: 1 - uid: 649 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,2.5 + rot: 1.5707963267948966 rad + pos: 15.5,-1.5 parent: 1 - uid: 650 components: - type: Transform rot: -1.5707963267948966 rad - pos: 15.5,-1.5 + pos: -10.5,2.5 parent: 1 - uid: 651 components: - type: Transform rot: -1.5707963267948966 rad - pos: 15.5,-2.5 + pos: -10.5,3.5 parent: 1 - uid: 652 components: - type: Transform rot: -1.5707963267948966 rad - pos: 15.5,-3.5 + pos: -10.5,4.5 parent: 1 - proto: BannerScience entities: @@ -3202,7 +3202,6 @@ entities: - type: GasMixer inletTwoConcentration: 0.78 inletOneConcentration: 0.22 - enabled: True - proto: GasPassiveVent entities: - uid: 730 @@ -3627,6 +3626,18 @@ entities: - type: Transform pos: -7.717414,-11.295385 parent: 1 +- proto: NFSignDock + entities: + - uid: 771 + components: + - type: Transform + pos: 15.5,-4.5 + parent: 1 + - uid: 772 + components: + - type: Transform + pos: -10.5,5.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 765 @@ -4107,9 +4118,6 @@ entities: - type: Transform pos: 3.5,-11.5 parent: 1 - - type: DeviceLinkSink - links: - - 763 - proto: SignalButton entities: - uid: 763 @@ -4163,18 +4171,6 @@ entities: - type: Transform pos: -2.5,-7.5 parent: 1 -- proto: NFSignDock - entities: - - uid: 771 - components: - - type: Transform - pos: 15.5,-4.5 - parent: 1 - - uid: 772 - components: - - type: Transform - pos: -10.5,5.5 - parent: 1 - proto: SMESBasic entities: - uid: 537 From 06c9a3183556f8987b10035e8c1a1bbe3565b502 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 12:53:45 +0000 Subject: [PATCH 50/96] Automatic Changelog (#2135) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 90710c5c5af..8a51ff009ba 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4363,3 +4363,9 @@ Entries: message: Replace tiny fans with directional fans. id: 5374 time: '2024-10-12T02:04:30.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: Updated Anomalous Geode docks to use directional fans + id: 5375 + time: '2024-10-12T12:53:16.0000000+00:00' From 78903b7f017b0983a9c79eeccecf00347668c360 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sat, 12 Oct 2024 15:15:09 +0200 Subject: [PATCH 51/96] Replace Arena (The Pit) POI tiny fans with directional fans (#2153) * Replace Arena (The Pit) POI tiny fans with directional fans * Remove dock sign rotation --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/POI/arena.yml | 214 ++++++++++++++++--------------- 1 file changed, 112 insertions(+), 102 deletions(-) diff --git a/Resources/Maps/_NF/POI/arena.yml b/Resources/Maps/_NF/POI/arena.yml index 2275d5b79cb..276f7332864 100644 --- a/Resources/Maps/_NF/POI/arena.yml +++ b/Resources/Maps/_NF/POI/arena.yml @@ -2735,49 +2735,49 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,-17.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 591 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 1.5707963267948966 rad pos: 23.5,11.5 parent: 2 - uid: 592 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,10.5 + rot: 1.5707963267948966 rad + pos: 23.5,12.5 parent: 2 - uid: 593 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-11.5 + rot: 1.5707963267948966 rad + pos: 23.5,-12.5 parent: 2 - uid: 594 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,12.5 + rot: 1.5707963267948966 rad + pos: 23.5,10.5 parent: 2 - uid: 595 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-12.5 + rot: 1.5707963267948966 rad + pos: 23.5,-11.5 parent: 2 - uid: 596 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 1.5707963267948966 rad pos: 9.5,15.5 parent: 2 - uid: 597 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,-10.5 + rot: 1.5707963267948966 rad + pos: 9.5,-15.5 parent: 2 - uid: 1370 components: @@ -2789,7 +2789,7 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: -21.5,12.5 + pos: -21.5,10.5 parent: 2 - uid: 1372 components: @@ -2801,13 +2801,13 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: -21.5,10.5 + pos: -21.5,12.5 parent: 2 - uid: 1374 components: - type: Transform rot: -1.5707963267948966 rad - pos: -21.5,-10.5 + pos: -21.5,-12.5 parent: 2 - uid: 1375 components: @@ -2819,7 +2819,7 @@ entities: components: - type: Transform rot: -1.5707963267948966 rad - pos: -21.5,-12.5 + pos: -21.5,-10.5 parent: 2 - uid: 1377 components: @@ -2830,13 +2830,13 @@ entities: - uid: 1378 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-15.5 + rot: 1.5707963267948966 rad + pos: 23.5,-10.5 parent: 2 - uid: 1432 components: - type: Transform - rot: 1.5707963267948966 rad + rot: 3.141592653589793 rad pos: -10.5,-6.5 parent: 2 - proto: AtmosFixFreezerMarker @@ -3494,7 +3494,7 @@ entities: pos: 10.5,-8.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: BoxCartridgeBB entities: - uid: 2641 @@ -10690,21 +10690,21 @@ entities: pos: -17.5,-6.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 2310 components: - type: Transform pos: 19.5,-6.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 2311 components: - type: Transform pos: 16.5,13.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: ComputerSolarControl entities: - uid: 708 @@ -10714,7 +10714,7 @@ entities: pos: -8.5,5.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: ComputerTelevision entities: - uid: 685 @@ -10753,8 +10753,13 @@ entities: - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - type: ItemSlots - uid: 2305 components: @@ -10765,8 +10770,13 @@ entities: - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - type: ItemSlots - uid: 2306 components: @@ -10777,8 +10787,13 @@ entities: - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - type: ItemSlots - uid: 2307 components: @@ -10789,8 +10804,13 @@ entities: - type: ContainerContainer containers: board: !type:Container + showEnts: False + occludes: True ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} + bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - type: ItemSlots - proto: CrateFunBoxing entities: @@ -14899,7 +14919,7 @@ entities: pos: -8.5,4.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: Grille entities: - uid: 3 @@ -15694,7 +15714,7 @@ entities: pos: -8.5,-8.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: KitchenReagentGrinder entities: - uid: 1664 @@ -15703,7 +15723,7 @@ entities: pos: -8.5,-7.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: KitchenSpike entities: - uid: 807 @@ -15753,6 +15773,48 @@ entities: - type: Transform pos: 4.433182,-7.4173126 parent: 2 +- proto: NFSignDock + entities: + - uid: 2976 + components: + - type: Transform + pos: -21.5,-13.5 + parent: 2 + - uid: 2977 + components: + - type: Transform + pos: -21.5,-9.5 + parent: 2 + - uid: 2978 + components: + - type: Transform + pos: -21.5,9.5 + parent: 2 + - uid: 2979 + components: + - type: Transform + pos: -21.5,13.5 + parent: 2 + - uid: 2980 + components: + - type: Transform + pos: 23.5,13.5 + parent: 2 + - uid: 2981 + components: + - type: Transform + pos: 23.5,9.5 + parent: 2 + - uid: 2982 + components: + - type: Transform + pos: 23.5,-13.5 + parent: 2 + - uid: 2983 + components: + - type: Transform + pos: 23.5,-9.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 172 @@ -15880,7 +15942,7 @@ entities: pos: -0.5,-11.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 2268 components: - type: Transform @@ -15888,14 +15950,14 @@ entities: pos: 2.5,11.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 2476 components: - type: Transform pos: -8.5,2.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: Poweredlight entities: - uid: 1614 @@ -16419,7 +16481,7 @@ entities: - type: Transform pos: 11.5,7.5 parent: 2 -- proto: RadioHandheld +- proto: RadioHandheldNF entities: - uid: 3010 components: @@ -18013,56 +18075,6 @@ entities: - type: Transform pos: -12.5,-1.5 parent: 2 -- proto: NFSignDock - entities: - - uid: 2976 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-13.5 - parent: 2 - - uid: 2977 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-9.5 - parent: 2 - - uid: 2978 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,9.5 - parent: 2 - - uid: 2979 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,13.5 - parent: 2 - - uid: 2980 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,13.5 - parent: 2 - - uid: 2981 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,9.5 - parent: 2 - - uid: 2982 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-13.5 - parent: 2 - - uid: 2983 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 23.5,-9.5 - parent: 2 - proto: SinkStemlessWater entities: - uid: 1117 @@ -18085,14 +18097,14 @@ entities: pos: -10.5,5.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 707 components: - type: Transform pos: -10.5,4.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: SodaDispenser entities: - uid: 815 @@ -18102,7 +18114,7 @@ entities: pos: 10.5,-7.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: SolarPanel entities: - uid: 1100 @@ -18880,7 +18892,7 @@ entities: pos: -9.5,-4.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: VendingMachineCigs entities: - uid: 2336 @@ -18888,6 +18900,13 @@ entities: - type: Transform pos: 10.5,7.5 parent: 2 +- proto: VendingMachineCiviMedPlus + entities: + - uid: 1551 + components: + - type: Transform + pos: -10.5,2.5 + parent: 2 - proto: VendingMachineCuddlyCritterVend entities: - uid: 2516 @@ -18903,16 +18922,7 @@ entities: pos: -10.5,-4.5 parent: 2 - type: DisableToolUse - anchoring: true -- proto: VendingMachineCiviMedPlus - entities: - - uid: 1551 - components: - - type: Transform - pos: -10.5,2.5 - parent: 2 - - type: DisableToolUse - anchoring: true + anchoring: True - proto: WallGold entities: - uid: 8 @@ -20860,7 +20870,7 @@ entities: pos: 2.5,-11.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 2267 components: - type: Transform @@ -20868,7 +20878,7 @@ entities: pos: -0.5,11.5 parent: 2 - type: DisableToolUse - anchoring: true + anchoring: True - proto: WeaponDisablerPractice entities: - uid: 1772 From 79b2beadde39fe9c8ae4b01325a71b8ba47935ee Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 13:15:35 +0000 Subject: [PATCH 52/96] Automatic Changelog (#2153) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 8a51ff009ba..3bfb52b61fe 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4369,3 +4369,9 @@ Entries: message: Updated Anomalous Geode docks to use directional fans id: 5375 time: '2024-10-12T12:53:16.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: 'Replace tiny fans in the The Pit/Arena with directional fans. ' + id: 5376 + time: '2024-10-12T13:15:10.0000000+00:00' From 4868d34249a7f9681e7418ad2e59f8209cab3d65 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sat, 12 Oct 2024 15:16:26 +0200 Subject: [PATCH 53/96] Replace cargo depot POI tiny fans with directional fans (#2155) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/cargodepot.yml | 17 ++++++++++------- Resources/Maps/_NF/POI/cargodepotalt.yml | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Resources/Maps/_NF/POI/cargodepot.yml b/Resources/Maps/_NF/POI/cargodepot.yml index c0c6f94a009..b01542eabc9 100644 --- a/Resources/Maps/_NF/POI/cargodepot.yml +++ b/Resources/Maps/_NF/POI/cargodepot.yml @@ -928,32 +928,35 @@ entities: - type: Transform pos: 7.5,7.5 parent: 10 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 225 components: - type: Transform - pos: -12.5,1.5 + rot: 1.5707963267948966 rad + pos: 13.5,-0.5 parent: 10 - uid: 226 components: - type: Transform - pos: -12.5,-0.5 + rot: 1.5707963267948966 rad + pos: 13.5,1.5 parent: 10 - uid: 227 components: - type: Transform - pos: 13.5,1.5 + rot: -1.5707963267948966 rad + pos: -12.5,-0.5 parent: 10 - uid: 228 components: - type: Transform - pos: 13.5,-0.5 + rot: -1.5707963267948966 rad + pos: -12.5,1.5 parent: 10 - - uid: 859 + - uid: 467 components: - type: Transform - rot: 1.5707963267948966 rad pos: 0.5,-15.5 parent: 10 - proto: BannerCargo diff --git a/Resources/Maps/_NF/POI/cargodepotalt.yml b/Resources/Maps/_NF/POI/cargodepotalt.yml index a8e877c3dea..ee61a255e90 100644 --- a/Resources/Maps/_NF/POI/cargodepotalt.yml +++ b/Resources/Maps/_NF/POI/cargodepotalt.yml @@ -998,32 +998,35 @@ entities: - type: Transform pos: 7.5,7.5 parent: 10 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 225 components: - type: Transform - pos: -12.5,1.5 + rot: 1.5707963267948966 rad + pos: 13.5,1.5 parent: 10 - uid: 226 components: - type: Transform - pos: -12.5,-0.5 + rot: 1.5707963267948966 rad + pos: 13.5,-0.5 parent: 10 - uid: 227 components: - type: Transform - pos: 13.5,1.5 + rot: -1.5707963267948966 rad + pos: -12.5,-0.5 parent: 10 - uid: 228 components: - type: Transform - pos: 13.5,-0.5 + rot: -1.5707963267948966 rad + pos: -12.5,1.5 parent: 10 - - uid: 859 + - uid: 485 components: - type: Transform - rot: 1.5707963267948966 rad pos: 0.5,-15.5 parent: 10 - proto: BannerCargo From ee10676012ec9ecad8379e0032b2b4b3ffcbce02 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 13:17:18 +0000 Subject: [PATCH 54/96] Automatic Changelog (#2155) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 3bfb52b61fe..d2be003312c 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4375,3 +4375,9 @@ Entries: message: 'Replace tiny fans in the The Pit/Arena with directional fans. ' id: 5376 time: '2024-10-12T13:15:10.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: Replace cargo depot POI tiny fans with directional fans + id: 5377 + time: '2024-10-12T13:16:26.0000000+00:00' From 194926917098678d5b05f2d92e7eff1f1462d0a7 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sat, 12 Oct 2024 16:11:34 +0200 Subject: [PATCH 55/96] Replace Anomalous Lab tiny fans with directional fans (#2136) Co-authored-by: eidolon <95361+eidolon-zz@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/anomalouslab.yml | 130 ++++++++++-------------- 1 file changed, 56 insertions(+), 74 deletions(-) diff --git a/Resources/Maps/_NF/POI/anomalouslab.yml b/Resources/Maps/_NF/POI/anomalouslab.yml index 21091f4a920..e275e6b82f1 100644 --- a/Resources/Maps/_NF/POI/anomalouslab.yml +++ b/Resources/Maps/_NF/POI/anomalouslab.yml @@ -1402,105 +1402,118 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,10.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 7 components: - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-4.5 + pos: 0.5,-7.5 parent: 1 - uid: 439 components: - type: Transform - pos: -9.5,7.5 + rot: 1.5707963267948966 rad + pos: 18.5,11.5 parent: 1 - uid: 641 components: - type: Transform - pos: -9.5,8.5 + pos: 11.5,-4.5 parent: 1 - uid: 642 components: - type: Transform - pos: -9.5,9.5 + pos: -10.5,-4.5 parent: 1 - uid: 643 components: - type: Transform - pos: -9.5,10.5 + rot: 1.5707963267948966 rad + pos: 19.5,1.5 parent: 1 - uid: 644 components: - type: Transform - pos: -9.5,11.5 + rot: 1.5707963267948966 rad + pos: 19.5,-0.5 parent: 1 - uid: 660 components: - type: Transform - pos: 0.5,-7.5 + rot: -1.5707963267948966 rad + pos: -9.5,7.5 parent: 1 - - uid: 716 + - uid: 668 components: - type: Transform - pos: -7.5,20.5 + rot: -1.5707963267948966 rad + pos: -9.5,8.5 parent: 1 - - uid: 717 + - uid: 669 components: - type: Transform - pos: -5.5,20.5 + rot: -1.5707963267948966 rad + pos: -9.5,9.5 parent: 1 - - uid: 1610 + - uid: 700 components: - type: Transform - pos: 18.5,11.5 + rot: -1.5707963267948966 rad + pos: -9.5,10.5 parent: 1 - - uid: 1611 + - uid: 715 components: - type: Transform - pos: 11.5,-4.5 + rot: -1.5707963267948966 rad + pos: -9.5,11.5 parent: 1 - - uid: 1631 + - uid: 716 components: - type: Transform - pos: -9.5,18.5 + rot: -1.5707963267948966 rad + pos: -9.5,16.5 parent: 1 - - uid: 1632 + - uid: 717 components: - type: Transform - pos: -9.5,16.5 + rot: -1.5707963267948966 rad + pos: -9.5,18.5 parent: 1 - - uid: 1633 + - uid: 722 components: - type: Transform - pos: -1.5,20.5 + rot: 3.141592653589793 rad + pos: -7.5,20.5 parent: 1 - - uid: 1636 + - uid: 723 components: - type: Transform - pos: 0.5,20.5 + rot: 3.141592653589793 rad + pos: -5.5,20.5 parent: 1 - - uid: 1639 + - uid: 724 components: - type: Transform - pos: 2.5,18.5 + rot: 3.141592653589793 rad + pos: -1.5,20.5 parent: 1 - - uid: 1640 + - uid: 728 components: - type: Transform - pos: 2.5,16.5 + rot: 3.141592653589793 rad + pos: 0.5,20.5 parent: 1 - - uid: 1739 + - uid: 1021 components: - type: Transform rot: 1.5707963267948966 rad - pos: 19.5,1.5 + pos: 2.5,18.5 parent: 1 - - uid: 1811 + - uid: 1041 components: - type: Transform rot: 1.5707963267948966 rad - pos: 19.5,-0.5 + pos: 2.5,16.5 parent: 1 - proto: Bed entities: @@ -4601,45 +4614,30 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 374 - uid: 343 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 375 - uid: 344 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 375 - uid: 345 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 375 - uid: 373 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 374 - proto: CrateChemistrySupplies entities: - uid: 1681 @@ -7420,10 +7418,10 @@ entities: parent: 1 - type: AtmosPipeColor color: '#03FCD3FF' - - type: DisableToolUse - anchoring: true - type: Physics bodyType: Dynamic + - type: DisableToolUse + anchoring: True - proto: GasVentPump entities: - uid: 124 @@ -7754,7 +7752,7 @@ entities: pos: 9.5,8.5 parent: 1 - type: DisableToolUse - anchoring: true + anchoring: True - proto: Grille entities: - uid: 21 @@ -8042,14 +8040,14 @@ entities: pos: 4.5,-3.5 parent: 1 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 6 components: - type: Transform pos: 4.5,-2.5 parent: 1 - type: DisableToolUse - anchoring: true + anchoring: True - proto: MachineAPE entities: - uid: 645 @@ -8146,14 +8144,14 @@ entities: pos: 12.5,4.5 parent: 1 - type: DisableToolUse - anchoring: true + anchoring: True - uid: 622 components: - type: Transform pos: 12.5,6.5 parent: 1 - type: DisableToolUse - anchoring: true + anchoring: True - proto: MedkitOxygenFilled entities: - uid: 1584 @@ -8854,36 +8852,24 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,9.5 parent: 1 - - type: DeviceLinkSink - links: - - 346 - uid: 170 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,10.5 parent: 1 - - type: DeviceLinkSink - links: - - 346 - uid: 171 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 346 - uid: 175 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,7.5 parent: 1 - - type: DeviceLinkSink - links: - - 346 - proto: ShuttersWindow entities: - uid: 1246 @@ -8893,8 +8879,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 2 - links: - - 1245 - uid: 1247 components: - type: Transform @@ -8902,8 +8886,6 @@ entities: parent: 1 - type: DeviceLinkSink invokeCounter: 2 - links: - - 1245 - proto: SignalButton entities: - uid: 346 @@ -9034,7 +9016,7 @@ entities: - type: Transform pos: 5.5,3.5 parent: 1 -- proto: SignScience1 +- proto: SignScience entities: - uid: 299 components: @@ -9859,7 +9841,7 @@ entities: pos: 18.5,-7.5 parent: 1 - type: DisableToolUse - anchoring: true + anchoring: True - proto: VendingMachineTankDispenserEVA entities: - uid: 664 @@ -9868,7 +9850,7 @@ entities: pos: 13.5,11.5 parent: 1 - type: DisableToolUse - anchoring: true + anchoring: True - proto: WallReinforced entities: - uid: 12 From 1dd8920ae4d1825b4771c5fa744065f11ce7e33e Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 14:11:58 +0000 Subject: [PATCH 56/96] Automatic Changelog (#2136) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index d2be003312c..0a4c1b06446 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4381,3 +4381,9 @@ Entries: message: Replace cargo depot POI tiny fans with directional fans id: 5377 time: '2024-10-12T13:16:26.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: Replaced Anomalous Lab tiny fans with directional fans + id: 5378 + time: '2024-10-12T14:11:34.0000000+00:00' From 029e1b753f6fd2c1747076b17a33ce8512ed2982 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sat, 12 Oct 2024 16:14:51 +0200 Subject: [PATCH 57/96] Replace Omnichurch Beacon tiny fans with directional fans (#2140) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/beacon.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Resources/Maps/_NF/POI/beacon.yml b/Resources/Maps/_NF/POI/beacon.yml index e5843279eb7..eab096447d2 100644 --- a/Resources/Maps/_NF/POI/beacon.yml +++ b/Resources/Maps/_NF/POI/beacon.yml @@ -1059,42 +1059,42 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-0.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 305 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: -2.5,21.5 parent: 1 - uid: 306 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: -2.5,20.5 parent: 1 - uid: 307 components: - type: Transform - rot: 3.141592653589793 rad + rot: -1.5707963267948966 rad pos: -2.5,19.5 parent: 1 - uid: 308 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 3.5,21.5 parent: 1 - uid: 309 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 3.5,20.5 parent: 1 - uid: 310 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad pos: 3.5,19.5 parent: 1 - uid: 311 @@ -1118,12 +1118,13 @@ entities: - uid: 323 components: - type: Transform - pos: -23.5,4.5 + pos: -23.5,-5.5 parent: 1 - uid: 373 components: - type: Transform - pos: -23.5,-5.5 + rot: 3.141592653589793 rad + pos: -23.5,4.5 parent: 1 - proto: Bed entities: From 40ab182f5eca9a23627053a6e37b4351551bd835 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 14:15:16 +0000 Subject: [PATCH 58/96] Automatic Changelog (#2140) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 0a4c1b06446..433000aa1eb 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4387,3 +4387,9 @@ Entries: message: Replaced Anomalous Lab tiny fans with directional fans id: 5378 time: '2024-10-12T14:11:34.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: Replaced Omnichurch Beacon tiny fans with directional fans + id: 5379 + time: '2024-10-12T14:14:51.0000000+00:00' From af9014ab45eb1b046fe38dac11875d5226be2739 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sat, 12 Oct 2024 16:22:20 +0200 Subject: [PATCH 59/96] Replace Tinnia's Rest POI tiny fans with directional fans (#2144) * Replace Tinnia POI tiny fans with directional fans * Flip around freezer directional fans to face into the freezer room --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- Resources/Maps/_NF/POI/tinnia.yml | 45 +++++++++++++++---------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/Resources/Maps/_NF/POI/tinnia.yml b/Resources/Maps/_NF/POI/tinnia.yml index 9543796c704..50f5b600b71 100644 --- a/Resources/Maps/_NF/POI/tinnia.yml +++ b/Resources/Maps/_NF/POI/tinnia.yml @@ -1110,79 +1110,76 @@ entities: - type: Transform pos: 0.5,-4.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 313 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 3.141592653589793 rad pos: 0.5,7.5 parent: 1 - uid: 314 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 1.5707963267948966 rad pos: -1.5,9.5 parent: 1 - uid: 315 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,0.5 + pos: 1.5,-15.5 parent: 1 - uid: 316 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-0.5 + rot: 1.5707963267948966 rad + pos: 14.5,-1.5 parent: 1 - uid: 317 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-1.5 + rot: 1.5707963267948966 rad + pos: 14.5,-0.5 parent: 1 - uid: 318 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,15.5 + rot: 1.5707963267948966 rad + pos: 14.5,0.5 parent: 1 - uid: 319 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,0.5 + rot: 3.141592653589793 rad + pos: 0.5,15.5 parent: 1 - uid: 320 components: - type: Transform rot: -1.5707963267948966 rad - pos: -13.5,-0.5 + pos: -13.5,-1.5 parent: 1 - uid: 321 components: - type: Transform rot: -1.5707963267948966 rad - pos: -13.5,-1.5 + pos: -13.5,-0.5 parent: 1 - uid: 322 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,-15.5 + pos: -13.5,0.5 parent: 1 - uid: 323 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-15.5 + pos: -0.5,-15.5 parent: 1 - uid: 324 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-15.5 + pos: 0.5,-15.5 parent: 1 - proto: AtmosFixFreezerMarker entities: @@ -11538,15 +11535,15 @@ entities: - type: Transform pos: -1.5,7.5 parent: 1 - - uid: 2176 + - uid: 2162 components: - type: Transform - pos: 7.5,11.5 + pos: -1.5,0.5 parent: 1 - - uid: 2162 + - uid: 2176 components: - type: Transform - pos: -1.5,0.5 + pos: 7.5,11.5 parent: 1 - proto: RandomSoap entities: From 25ce36df440769486220a4335d087fa4160af64e Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 14:22:51 +0000 Subject: [PATCH 60/96] Automatic Changelog (#2144) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 433000aa1eb..3da7e364838 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4393,3 +4393,9 @@ Entries: message: Replaced Omnichurch Beacon tiny fans with directional fans id: 5379 time: '2024-10-12T14:14:51.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: Replaced tiny fans with directional fans on Tinnia's Rest POI + id: 5380 + time: '2024-10-12T14:22:21.0000000+00:00' From 9af114c9323649074ba65fe5aaeb8797fb6147ca Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 14:47:24 +0000 Subject: [PATCH 61/96] Butter reagent can now be extracted from butter. (#2173) * Makes butter reagent accessible for recipes. Edit to make butter an extractable, as the reagent can otherwise only be accessed by grinding THC butter. * Update ingredients.yml * Remove olive oil comments --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- .../Entities/Objects/Consumable/Food/ingredients.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 25c4468eff8..22af0a5c093 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -212,8 +212,8 @@ - type: entity parent: ReagentPacketBase id: ReagentContainerOliveoil - name: olive oil #frontier for consolidating vegetable oils - description: Olive oil. From space olives presumably. #frontier + name: olive oil + description: Olive oil. From space olives presumably. components: - type: Sprite state: oliveoil @@ -562,6 +562,8 @@ - type: SliceableFood count: 3 slice: FoodButterSlice + - type: Extractable # Frontier + grindableSolutionName: food # Frontier - type: entity name: butter slice @@ -581,6 +583,8 @@ - type: Tag tags: - Slice + - type: Extractable # Frontier + grindableSolutionName: food # Frontier - type: entity name: stick of cannabis butter From 70b988a526c5bb2d190375afbdaea433f80e5f45 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 14:47:52 +0000 Subject: [PATCH 62/96] Automatic Changelog (#2173) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 3da7e364838..a3e1f7e07f0 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4399,3 +4399,9 @@ Entries: message: Replaced tiny fans with directional fans on Tinnia's Rest POI id: 5380 time: '2024-10-12T14:22:21.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Butter reagent can now be extracted from butter. + id: 5381 + time: '2024-10-12T14:47:24.0000000+00:00' From faa8c80897aade2a3a9035dfebcbfc6a95365542 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 16:29:51 +0000 Subject: [PATCH 63/96] Fill states for the Frontier chemistry and medicine wall lockers. (#2127) * Fill state additions for two custom lockers. * Update wall_lockers_department.yml * Filled wall lockers: inherit through parents * Move filled lockers to fills * Move chem locker --------- Co-authored-by: Whatstone --- .../Fills/Lockers/locker_wallmount.yml | 46 +++++++++++++++++-- .../Storage/Closets/wall_lockers.yml | 5 +- 2 files changed, 43 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml index b1dd9539c1e..d1dc11490a2 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/locker_wallmount.yml @@ -1,4 +1,4 @@ -#FUEL +# region Fuel - type: entity parent: [ LockerWallColorFuelPlasma, StorageFillMaterialsFuelPlasma ] id: LockerWallMaterialsFuelPlasmaFilled @@ -33,8 +33,9 @@ parent: [ LockerWallColorWelding, StorageFillMaterialsFuelWelding ] id: LockerWallMaterialsFuelWeldingFilled suffix: Filled, Welding Fuel (x2) +# endregion Fuel -#MATERIALS +# region Materials - type: entity parent: [ LockerWallColorMaterials, StorageFillMaterialsBasic ] id: LockerWallMaterialsBasicFilled @@ -44,8 +45,9 @@ parent: [ LockerWallColorMaterials, StorageFillMaterialsBasic10 ] id: LockerWallMaterialsBasic10Filled suffix: Filled, Basic Materials (10) +# endregion Materials -#SOFTSUITS +# region Softsuits - type: entity parent: [ LockerWallEVAColorGeneric, StorageFillEVASuitGoblin ] id: LockerWallEVAColorGoblinFilled @@ -187,8 +189,9 @@ parent: [ LockerWallEVAColorLvhi, StorageFillEVASuitLvhi ] id: LockerWallEVAColorLvhiFilled suffix: Frontier, Filled +# endregion -# Emergency +# region Emergency - type: entity parent: [ ClosetWallN2, StorageFillN2Random ] id: ClosetWallN2FilledRandom @@ -198,3 +201,38 @@ parent: [ ClosetWallO2N2, StorageFillO2N2Random ] id: ClosetWallO2N2FilledRandom suffix: Filled, Random +# endregion + +# region Medical +- type: entity + id: LockerWallColorMedicalDoctorFilled + parent: + - LockerWallColorMedical + - BaseWallmount + - LockerMedicalFilled + name: medical doctor's wall locker + suffix: Filled, Frontier + +- type: entity + id: LockerWallColorMedicalFilled + parent: + - LockerWallColorMedical + - LockerWallMedicalFilled + name: medicine wall locker + suffix: Filled, Frontier +# endregion + +# region Chemistry +- type: entity + id: LockerWallChemistryFilled + parent: [LockerWallChemistry, LockerChemistryFilled] + +- type: entity + id: LockerWallColorChemistryFilled + suffix: Filled, Frontier + parent: + - LockerWallColorChemistry + - BaseWallmount + - LockerChemistryFilled + name: chemistry wall locker +# endregion diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml index dd292939b9a..1292a8f8010 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/wall_lockers.yml @@ -28,7 +28,7 @@ - type: LockVisuals - type: Appearance - type: EntityStorageVisuals - stateBase: base + stateBaseClosed: base stateDoorOpen: open stateDoorClosed: door - type: GenericVisualizer @@ -210,9 +210,6 @@ stateDoorOpen: med_open stateDoorClosed: chem_door -- type: entity - id: LockerWallChemistryFilled - parent: [LockerWallChemistry, LockerChemistryFilled] - type: entity id: ClosetWallN2 From 0ad7d37304543ee842a38d6c219c69e00f7f5fd1 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 16:30:17 +0000 Subject: [PATCH 64/96] Automatic Changelog (#2127) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index a3e1f7e07f0..586033807c1 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4405,3 +4405,9 @@ Entries: message: Butter reagent can now be extracted from butter. id: 5381 time: '2024-10-12T14:47:24.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Added filled medicine and chemistry Frontier wall lockers. + id: 5382 + time: '2024-10-12T16:29:52.0000000+00:00' From 73424564402c5c0d40c712b5fd5161bfe80cb0e3 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 17:54:51 +0000 Subject: [PATCH 65/96] Opporozidone recipe tweak. (#2196) * Update medicine.yml * Reverts upstream recipe, adds alternative FO specific recipe. * Update medicine.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Prototypes/_NF/Recipes/Reactions/medicine.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml index 7c7984fdc86..27aad1e1cda 100644 --- a/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_NF/Recipes/Reactions/medicine.yml @@ -23,3 +23,16 @@ Stelloxadone: 5 Water: 3 Fiber: 2 + +- type: reaction + id: NFOpporozidone + minTemp: 400 #Maybe if a method of reducing reagent temp exists one day, this could be -50 + reactants: + Mannitol: + amount: 1 + Plasma: + amount: 2 + Doxarubixadone: + amount: 1 + products: + Opporozidone: 3 From 867e40ac0d31cbc070e8b7bde81efab2295b4785 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 17:55:19 +0000 Subject: [PATCH 66/96] Automatic Changelog (#2196) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 586033807c1..0c3df185563 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4411,3 +4411,9 @@ Entries: message: Added filled medicine and chemistry Frontier wall lockers. id: 5382 time: '2024-10-12T16:29:52.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Opporozidone recipe uses Mannitol instead of Cognizine. + id: 5383 + time: '2024-10-12T17:54:51.0000000+00:00' From f148c6b27a17d800e0d061e0a59d0a13b0b7cb9b Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 18:07:40 +0000 Subject: [PATCH 67/96] Replaced Beaker tiny fans with directional fans. (#2110) * Update beaker.yml * Duped pipe, door opening, pipe colour * Fix gas mixer ratio --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/beaker.yml | 202 +++++++++++++------------ 1 file changed, 108 insertions(+), 94 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/beaker.yml b/Resources/Maps/_NF/Shuttles/beaker.yml index be5e07780ca..ad04506bc1d 100644 --- a/Resources/Maps/_NF/Shuttles/beaker.yml +++ b/Resources/Maps/_NF/Shuttles/beaker.yml @@ -111,6 +111,16 @@ entities: 19: -2,-11 20: -3,-11 69: 4,-7 + - node: + color: '#1861D5FF' + id: DeliveryGreyscale + decals: + 77: -4,0 + - node: + color: '#951710FF' + id: DeliveryGreyscale + decals: + 76: -4,1 - node: color: '#FFFFFFFF' id: LoadingArea @@ -157,11 +167,6 @@ entities: id: WarnBox decals: 70: 4,-7 - - node: - color: '#002CFFFF' - id: WarnBoxGreyscale - decals: - 59: -4,1 - node: color: '#950000FF' id: WarnBoxGreyscale @@ -342,16 +347,6 @@ entities: - 228 - 224 - 229 -- proto: AirCanister - entities: - - uid: 393 - components: - - type: Transform - anchored: True - pos: -3.5,1.5 - parent: 1 - - type: Physics - bodyType: Static - proto: AirlockChemistry entities: - uid: 154 @@ -452,12 +447,6 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,1.5 parent: 1 - - type: DeviceLinkSource - lastSignals: - DoorStatus: True - - type: Door - secondsUntilStateChange: -2733.3945 - state: Opening - uid: 115 components: - type: Transform @@ -472,64 +461,63 @@ entities: parent: 1 - type: Apc hasAccess: True - lastExternalState: Good - lastChargeState: Full - uid: 350 components: - type: Transform pos: -5.5,-1.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 34 + - uid: 58 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-11.5 + pos: 5.5,-10.5 parent: 1 - uid: 74 components: - type: Transform - pos: -7.5,1.5 + rot: 3.141592653589793 rad + pos: 7.5,2.5 parent: 1 - uid: 78 components: - type: Transform + rot: 3.141592653589793 rad pos: -6.5,2.5 parent: 1 - uid: 81 components: - type: Transform - pos: 7.5,2.5 + pos: 0.5,-11.5 parent: 1 - uid: 82 components: - type: Transform - pos: 8.5,1.5 + rot: -1.5707963267948966 rad + pos: -7.5,1.5 parent: 1 - uid: 100 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,-9.5 + pos: 8.5,1.5 parent: 1 - uid: 101 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-10.5 + pos: 6.5,-9.5 parent: 1 - uid: 102 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-10.5 + rot: -1.5707963267948966 rad + pos: -5.5,-9.5 parent: 1 - uid: 103 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-9.5 + pos: -4.5,-10.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -1092,18 +1080,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-0.5 parent: 1 -- proto: chem_master - entities: - - uid: 163 - components: - - type: Transform - pos: 2.5,-5.5 - parent: 1 - - uid: 173 - components: - - type: Transform - pos: -1.5,-5.5 - parent: 1 - proto: ChemDispenser entities: - uid: 159 @@ -1123,6 +1099,18 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 1 +- proto: ChemMaster + entities: + - uid: 163 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 1 + - uid: 173 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 1 - proto: ClosetRadiationSuitFilled entities: - uid: 3 @@ -1315,6 +1303,19 @@ entities: parent: 1 - type: Fixtures fixtures: {} +- proto: GasMixerOnFlipped + entities: + - uid: 34 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,0.5 + parent: 1 + - type: GasMixer + inletOneConcentration: 0.79 + inletTwoConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 242 @@ -1323,6 +1324,8 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-0.5 parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeBend entities: - uid: 230 @@ -1340,11 +1343,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 254 + - uid: 255 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-0.5 + pos: -4.5,1.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -1457,6 +1460,8 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,-0.5 parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 243 components: - type: Transform @@ -1493,13 +1498,8 @@ entities: rot: 1.5707963267948966 rad pos: 6.5,-0.5 parent: 1 - - uid: 253 - components: - - type: Transform - pos: -4.5,-3.5 - parent: 1 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#990000FF' - uid: 257 components: - type: Transform @@ -1539,6 +1539,14 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 369 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPipeTJunction entities: - uid: 234 @@ -1549,11 +1557,11 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 255 + - uid: 251 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-0.5 + rot: 1.5707963267948966 rad + pos: -4.5,-0.5 parent: 1 - type: AtmosPipeColor color: '#0055CCFF' @@ -1569,11 +1577,22 @@ entities: - type: Transform pos: -3.5,-6.5 parent: 1 - - uid: 251 + - uid: 254 components: - type: Transform + rot: -1.5707963267948966 rad pos: -3.5,1.5 parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 286 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,0.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPressurePump entities: - uid: 57 @@ -1584,13 +1603,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 58 - components: - - type: Transform - pos: -3.5,0.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 75 components: - type: Transform @@ -1744,8 +1756,6 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-0.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: HandLabeler entities: - uid: 411 @@ -1858,6 +1868,14 @@ entities: - type: Transform pos: -1.5,-1.5 parent: 1 +- proto: LockerWallMaterialsFuelUraniumFilled + entities: + - uid: 368 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-9.5 + parent: 1 - proto: LuxuryPen entities: - uid: 89 @@ -1886,6 +1904,26 @@ entities: - type: Transform pos: -5.5501204,-3.5460114 parent: 1 +- proto: NitrogenCanister + entities: + - uid: 371 + components: + - type: Transform + anchored: True + pos: -3.5,1.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 370 + components: + - type: Transform + anchored: True + pos: -3.5,0.5 + parent: 1 + - type: Physics + bodyType: Static - proto: PaperBin10 entities: - uid: 64 @@ -2229,17 +2267,11 @@ entities: - type: Transform pos: 2.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 119 - uid: 262 components: - type: Transform pos: 3.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 119 - proto: SignalButton entities: - uid: 119 @@ -2254,7 +2286,7 @@ entities: - Pressed: Toggle 262: - Pressed: Toggle -- proto: SignChemistry1 +- proto: SignChem entities: - uid: 175 components: @@ -2304,12 +2336,6 @@ entities: parent: 1 - proto: SignRadiationMed entities: - - uid: 286 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-9.5 - parent: 1 - uid: 420 components: - type: Transform @@ -2474,47 +2500,35 @@ entities: - type: Transform pos: 7.5,3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 50 components: - type: Transform pos: -6.5,3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 110 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 111 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 112 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 113 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: VendingMachineChemDrobe entities: - uid: 417 From e33116f2caa4b5550632065f60efc8ead237e252 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 18:08:04 +0000 Subject: [PATCH 68/96] Automatic Changelog (#2110) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 0c3df185563..94b4f6d8565 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4417,3 +4417,9 @@ Entries: message: Opporozidone recipe uses Mannitol instead of Cognizine. id: 5383 time: '2024-10-12T17:54:51.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Replace Beaker tiny fans with directional fans. + id: 5384 + time: '2024-10-12T18:07:40.0000000+00:00' From 8cc038a18d2d4107ef54bceb708c08534d0fc058 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 18:10:44 +0000 Subject: [PATCH 69/96] Replace Honker tiny fans with directional fans. (#2108) * Update honker.yml * Replaces hydroponic tray with anchored variant. * Remove invalid entity references * Max waste pump pressure --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/honker.yml | 400 +++++++------------------ 1 file changed, 115 insertions(+), 285 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/honker.yml b/Resources/Maps/_NF/Shuttles/honker.yml index 892df3a6b5c..b7bbee69277 100644 --- a/Resources/Maps/_NF/Shuttles/honker.yml +++ b/Resources/Maps/_NF/Shuttles/honker.yml @@ -60,50 +60,47 @@ entities: version: 2 data: tiles: + 0,-1: + 0: 4096 + 1: 40960 0,0: - 0: 65535 + 1: 65450 + -1,0: + 0: 8 0,1: - 0: 61167 - 1: 4112 + 0: 4112 + 1: 17486 + -1,1: + 0: 136 0,2: - 0: 65535 + 1: 65534 + -1,2: + 0: 1032 + 1: 32768 + 0,3: + 1: 15 + -1,3: + 1: 8 1,0: - 0: 13105 - 1: 2 + 1: 4352 + 0: 2 1,1: - 0: 8193 - 1: 4146 + 0: 4146 1,2: - 0: 29553 - 1: 1026 - 0,-1: - 1: 4096 - 0: 57344 + 1: 12560 + 0: 1026 + 1,3: + 1: 3 1,-1: - 1: 12288 + 0: 12288 -1,-1: - 1: 32768 - -1,2: - 0: 51392 - 1: 1032 - -1,0: - 1: 8 - 0: 34944 - -1,1: - 1: 136 0: 32768 - 0,3: - 0: 255 - 1,3: - 0: 119 - -1,3: - 0: 204 uniqueMixes: - volume: 2500 - temperature: 293.15 + immutable: True moles: - - 21.824879 - - 82.10312 + - 0 + - 0 - 0 - 0 - 0 @@ -117,8 +114,8 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - - 0 + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -136,8 +133,6 @@ entities: entities: - uid: 3 components: - - type: MetaData - flags: InContainer - type: Transform parent: 1 - type: InstantAction @@ -152,37 +147,19 @@ entities: parent: 2 - type: DeviceList devices: - - 281 + - 161 - 104 - - 277 + - 163 - 95 - - type: AtmosDevice - joinedGrid: 2 -- proto: AirCanister - entities: - - uid: 290 - components: - - type: Transform - anchored: True - pos: 4.5,10.5 - parent: 2 - - type: Physics - bodyType: Static - - type: AtmosDevice - joinedGrid: 2 - proto: AirlockExternal entities: - uid: 146 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,1.5 parent: 2 - uid: 147 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,1.5 parent: 2 @@ -198,15 +175,11 @@ entities: entities: - uid: 144 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,-0.5 parent: 2 - uid: 145 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,-0.5 parent: 2 @@ -218,19 +191,17 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,6.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 68 + - uid: 69 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-0.5 + pos: 1.5,-0.5 parent: 2 - - uid: 69 + - uid: 72 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-0.5 + pos: 3.5,-0.5 parent: 2 - proto: AtmosFixBlockerMarker entities: @@ -344,8 +315,6 @@ entities: entities: - uid: 230 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -353,8 +322,6 @@ entities: - type: InsideEntityStorage - uid: 247 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -364,8 +331,6 @@ entities: entities: - uid: 224 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -373,8 +338,6 @@ entities: - type: InsideEntityStorage - uid: 228 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -382,8 +345,6 @@ entities: - type: InsideEntityStorage - uid: 250 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -391,8 +352,6 @@ entities: - type: InsideEntityStorage - uid: 254 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -595,8 +554,6 @@ entities: entities: - uid: 223 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -604,8 +561,6 @@ entities: - type: InsideEntityStorage - uid: 245 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -729,8 +684,6 @@ entities: entities: - uid: 225 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -738,8 +691,6 @@ entities: - type: InsideEntityStorage - uid: 227 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -747,8 +698,6 @@ entities: - type: InsideEntityStorage - uid: 246 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -756,8 +705,6 @@ entities: - type: InsideEntityStorage - uid: 249 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -787,11 +734,11 @@ entities: parent: 2 - proto: ExtinguisherCabinetFilled entities: - - uid: 82 + - uid: 182 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.5,10.5 + pos: 4.5,4.5 parent: 2 - proto: FaxMachineShip entities: @@ -808,6 +755,19 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,7.5 parent: 2 +- proto: GasMixerOnFlipped + entities: + - uid: 148 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,10.5 + parent: 2 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 108 @@ -815,8 +775,6 @@ entities: - type: Transform pos: -0.5,5.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend @@ -845,21 +803,22 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 271 + - uid: 102 components: - type: Transform - pos: 2.5,11.5 + rot: 3.141592653589793 rad + pos: 3.5,9.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 279 + - uid: 162 components: - type: Transform rot: 1.5707963267948966 rad - pos: 3.5,11.5 + pos: 2.5,10.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - proto: GasPipeStraight entities: - uid: 90 @@ -901,14 +860,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 265 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,8.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 266 components: - type: Transform @@ -933,21 +884,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 272 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,11.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 275 - components: - - type: Transform - pos: 3.5,10.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 284 components: - type: Transform @@ -972,24 +908,16 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 287 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,8.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 288 +- proto: GasPipeTJunction + entities: + - uid: 116 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,9.5 + rot: -1.5707963267948966 rad + pos: 2.5,8.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' -- proto: GasPipeTJunction - entities: + color: '#0055CCFF' - uid: 121 components: - type: Transform @@ -998,46 +926,32 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 263 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,10.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - proto: GasPort entities: - - uid: 289 + - uid: 68 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,10.5 + pos: 4.5,9.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasPressurePump - entities: - - uid: 100 + - uid: 289 components: - type: Transform rot: -1.5707963267948966 rad - pos: 3.5,10.5 + pos: 4.5,10.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 102 +- proto: GasPressurePumpOnMax + entities: + - uid: 164 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,4.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GasVentPump @@ -1051,21 +965,17 @@ entities: - type: DeviceNetwork deviceLists: - 160 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 277 + - uid: 163 components: - type: Transform rot: 1.5707963267948966 rad - pos: 0.5,11.5 + pos: 1.5,8.5 parent: 2 - type: DeviceNetwork deviceLists: - 160 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1079,21 +989,16 @@ entities: - type: DeviceNetwork deviceLists: - 160 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 281 + - uid: 161 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,11.5 + pos: 3.5,8.5 parent: 2 - type: DeviceNetwork deviceLists: - 160 - - type: AtmosDevice - joinedGrid: 2 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -1164,12 +1069,11 @@ entities: - type: Transform pos: 2.5,0.5 parent: 2 -- proto: hydroponicsTray +- proto: hydroponicsTrayAnchored entities: - uid: 75 components: - type: Transform - rot: -1.5707963267948966 rad pos: -0.5,11.5 parent: 2 - proto: LampBanana @@ -1177,7 +1081,7 @@ entities: - uid: 1 components: - type: Transform - pos: 4.787325,9.869072 + pos: 0.72970486,10.401932 parent: 2 - type: HandheldLight toggleActionEntity: 3 @@ -1202,6 +1106,24 @@ entities: - type: Transform pos: 1.5,8.5 parent: 2 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 82 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,10.5 + parent: 2 +- proto: NitrogenCanister + entities: + - uid: 143 + components: + - type: Transform + anchored: True + pos: 4.5,10.5 + parent: 2 + - type: Physics + bodyType: Static - proto: NitrousOxideCanister entities: - uid: 103 @@ -1209,8 +1131,16 @@ entities: - type: Transform pos: 4.5,12.5 parent: 2 - - type: AtmosDevice - joinedGrid: 2 +- proto: OxygenCanister + entities: + - uid: 100 + components: + - type: Transform + anchored: True + pos: 4.5,9.5 + parent: 2 + - type: Physics + bodyType: Static - proto: PaintingSadClown entities: - uid: 198 @@ -1223,34 +1153,29 @@ entities: - uid: 12 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.3622794,9.353447 + pos: 0.38595486,10.704016 parent: 2 - uid: 15 components: - type: Transform - pos: 4.36545,9.509697 + pos: 0.6880381,10.735266 parent: 2 - uid: 17 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.2216544,9.712822 + pos: 0.32345486,10.412349 parent: 2 -- proto: PortableGeneratorPacman +- proto: PortableGeneratorPacmanShuttle entities: - - uid: 72 + - uid: 180 components: - type: Transform - anchored: True pos: 5.5,11.5 parent: 2 - - type: MaterialStorage - storage: - Plasma: 3000 + - type: FuelGenerator + on: False - type: Physics bodyType: Static - - type: InsertingMaterialStorage - proto: PosterContrabandClown entities: - uid: 197 @@ -1262,24 +1187,18 @@ entities: entities: - uid: 109 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 4.5,10.5 parent: 2 - uid: 142 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 0.5,10.5 parent: 2 - uid: 203 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 2.5,2.5 @@ -1296,8 +1215,6 @@ entities: entities: - uid: 221 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -1305,22 +1222,11 @@ entities: - type: InsideEntityStorage - uid: 248 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics canCollide: False - type: InsideEntityStorage -- proto: SheetPlasma - entities: - - uid: 148 - components: - - type: Transform - pos: 5.5232024,11.547904 - parent: 2 - - type: Stack - count: 15 - proto: ShuttleWindow entities: - uid: 7 @@ -1397,8 +1303,6 @@ entities: entities: - uid: 229 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -1406,8 +1310,6 @@ entities: - type: InsideEntityStorage - uid: 252 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -1452,10 +1354,10 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,12.5 parent: 2 - - uid: 143 + - uid: 181 components: - type: Transform - pos: 4.5,9.5 + pos: 0.5,10.5 parent: 2 - proto: Thruster entities: @@ -1486,8 +1388,6 @@ entities: entities: - uid: 226 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -1495,8 +1395,6 @@ entities: - type: InsideEntityStorage - uid: 231 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -1504,8 +1402,6 @@ entities: - type: InsideEntityStorage - uid: 253 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -1513,8 +1409,6 @@ entities: - type: InsideEntityStorage - uid: 255 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics @@ -1543,219 +1437,159 @@ entities: entities: - uid: 4 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-0.5 parent: 2 - uid: 6 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,0.5 parent: 2 - uid: 9 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,0.5 parent: 2 - uid: 23 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,5.5 parent: 2 - uid: 24 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,5.5 parent: 2 - uid: 25 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,1.5 parent: 2 - uid: 26 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,1.5 parent: 2 - uid: 27 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,1.5 parent: 2 - uid: 28 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,6.5 parent: 2 - uid: 29 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,6.5 parent: 2 - uid: 30 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,7.5 parent: 2 - uid: 33 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 3.5,7.5 parent: 2 - uid: 38 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 5.5,9.5 parent: 2 - uid: 41 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -0.5,9.5 parent: 2 - uid: 42 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,12.5 parent: 2 - uid: 43 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 6.5,13.5 parent: 2 - uid: 45 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 6.5,11.5 parent: 2 - uid: 47 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -0.5,13.5 parent: 2 - uid: 48 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 6.5,12.5 parent: 2 - uid: 50 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,11.5 parent: 2 - uid: 51 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: -1.5,13.5 parent: 2 - uid: 52 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 1.5707963267948966 rad pos: 5.5,13.5 parent: 2 - uid: 114 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,1.5 parent: 2 - uid: 115 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,1.5 parent: 2 - uid: 124 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,4.5 parent: 2 - uid: 125 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,4.5 parent: 2 - uid: 126 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,10.5 parent: 2 - uid: 127 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 4.5,8.5 parent: 2 - uid: 128 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 0.5,8.5 parent: 2 - uid: 129 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,10.5 parent: 2 @@ -1863,8 +1697,6 @@ entities: entities: - uid: 222 components: - - type: MetaData - flags: InContainer - type: Transform parent: 220 - type: Physics @@ -1872,8 +1704,6 @@ entities: - type: InsideEntityStorage - uid: 251 components: - - type: MetaData - flags: InContainer - type: Transform parent: 244 - type: Physics From 659e3f6d4f9cab53a0a324466ad233720e5aeaf4 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 18:11:44 +0000 Subject: [PATCH 70/96] Automatic Changelog (#2108) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 94b4f6d8565..efc9abb1089 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4423,3 +4423,9 @@ Entries: message: Replace Beaker tiny fans with directional fans. id: 5384 time: '2024-10-12T18:07:40.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Updated Honker tiny fans with directional fans. + id: 5385 + time: '2024-10-12T18:10:44.0000000+00:00' From c339b6d2224ba7591c632eefbb3d2370ef88713b Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sat, 12 Oct 2024 18:16:44 +0000 Subject: [PATCH 71/96] Replace Sparrow tiny fans with directional fans (#2106) * Update sparrow.yml * Loose plasma to locker, invalid config, blue pipe --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/sparrow.yml | 385 +++++++++--------------- 1 file changed, 144 insertions(+), 241 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/sparrow.yml b/Resources/Maps/_NF/Shuttles/sparrow.yml index 7804413c435..d93cc0fa35a 100644 --- a/Resources/Maps/_NF/Shuttles/sparrow.yml +++ b/Resources/Maps/_NF/Shuttles/sparrow.yml @@ -37,7 +37,7 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAADegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAACWgAAAAABegAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAACegAAAAAAeQAAAAAAeQAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAHgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAHgAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWgAAAAAAWgAAAAADegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAACWgAAAAABegAAAAAAaQAAAAAAJwAAAAAAJwAAAAAAJwAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -171,11 +171,21 @@ entities: 47: -6,-1 48: -6,0 49: -6,1 + - node: + color: '#1861D5FF' + id: DeliveryGreyscale + decals: + 84: 3,-1 - node: color: '#52B4E996' id: DeliveryGreyscale decals: 66: 0,5 + - node: + color: '#951710FF' + id: DeliveryGreyscale + decals: + 85: 3,-2 - node: color: '#D381C996' id: DeliveryGreyscale @@ -215,48 +225,45 @@ entities: data: tiles: 0,0: - 0: 65535 - -1,0: - 0: 65535 - -1,-1: - 1: 3 - 0: 65532 + 0: 48063 0,-1: - 0: 65527 + 0: 47906 1: 8 + -1,0: + 0: 47551 0,1: - 0: 30591 + 0: 13075 1: 128 + -1,1: + 0: 34824 + 1: 48 0,2: - 0: 55 + 0: 1 1: 64 1,0: - 0: 32767 + 0: 13175 1: 32768 1,1: - 0: 7 1: 56 + 1,-1: + 0: 30528 + 1: 1 -2,0: - 0: 52974 + 0: 32972 1: 8192 -2,1: 1: 130 - 0: 12 - -1,1: - 0: 52431 - 1: 48 + -2,-1: + 0: 52288 + -1,-1: + 0: 48008 + 1: 3 -1,2: - 0: 140 1: 64 - -2,-1: - 0: 61166 -1,-2: - 0: 49152 + 0: 32768 0,-2: - 0: 28672 - 1,-1: - 1: 1 - 0: 65534 + 0: 8192 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -274,7 +281,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -304,10 +311,8 @@ entities: parent: 174 - type: DeviceList devices: - - 266 - 243 - - type: AtmosDevice - joinedGrid: 174 + - 323 - uid: 361 components: - type: Transform @@ -316,8 +321,6 @@ entities: - type: DeviceList devices: - 186 - - type: AtmosDevice - joinedGrid: 174 - uid: 362 components: - type: Transform @@ -331,20 +334,6 @@ entities: - 237 - 358 - 359 - - type: AtmosDevice - joinedGrid: 174 -- proto: AirCanister - entities: - - uid: 307 - components: - - type: Transform - anchored: True - pos: 3.5,-1.5 - parent: 174 - - type: Physics - bodyType: Static - - type: AtmosDevice - joinedGrid: 174 - proto: AirlockCommandGlass entities: - uid: 264 @@ -420,19 +409,19 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,2.5 parent: 174 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 20 + - uid: 21 components: - type: Transform - pos: -0.5,-4.5 + pos: 1.5,-4.5 parent: 174 - - uid: 21 + - uid: 163 components: - type: Transform - pos: 1.5,-4.5 + pos: -0.5,-4.5 parent: 174 - - uid: 293 + - uid: 169 components: - type: Transform pos: -3.5,2.5 @@ -530,8 +519,6 @@ entities: entities: - uid: 75 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -3.5,4.5 parent: 174 @@ -543,10 +530,6 @@ entities: canCollide: True - type: Airtight airBlocked: True - - type: DeviceLinkSink - links: - - 252 - - 251 - proto: BoxFolderBlue entities: - uid: 177 @@ -1079,6 +1062,18 @@ entities: - type: Transform pos: 3.6195195,1.6693814 parent: 174 +- proto: GasMixerOnFlipped + entities: + - uid: 20 + components: + - type: Transform + pos: 4.5,-0.5 + parent: 174 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 91 @@ -1086,41 +1081,43 @@ entities: - type: Transform pos: -4.5,3.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - uid: 93 components: - type: Transform pos: -2.5,3.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - uid: 287 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,-3.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 307 + components: + - type: Transform + pos: 4.5,5.5 + parent: 174 - type: AtmosPipeColor color: '#990000FF' - proto: GasPipeBend entities: - - uid: 218 + - uid: 213 components: - type: Transform - pos: 4.5,1.5 + pos: 4.5,0.5 parent: 174 - type: AtmosPipeColor - color: '#990000FF' - - uid: 269 + color: '#0055CCFF' + - uid: 274 components: - type: Transform - pos: 5.5,0.5 + rot: -1.5707963267948966 rad + pos: 4.5,-1.5 parent: 174 - type: AtmosPipeColor - color: '#990000FF' + color: '#0055CCFF' - uid: 356 components: - type: Transform @@ -1199,13 +1196,6 @@ entities: parent: 174 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 213 - components: - - type: Transform - pos: 4.5,-1.5 - parent: 174 - - type: AtmosPipeColor - color: '#990000FF' - uid: 215 components: - type: Transform @@ -1293,6 +1283,22 @@ entities: parent: 174 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 333 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,3.5 + parent: 174 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 334 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,4.5 + parent: 174 + - type: AtmosPipeColor + color: '#990000FF' - uid: 337 components: - type: Transform @@ -1349,11 +1355,11 @@ entities: parent: 174 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 219 + - uid: 179 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,0.5 + rot: 3.141592653589793 rad + pos: 4.5,1.5 parent: 174 - type: AtmosPipeColor color: '#990000FF' @@ -1373,10 +1379,10 @@ entities: parent: 174 - type: AtmosPipeColor color: '#990000FF' - - uid: 286 + - uid: 232 components: - type: Transform - rot: -1.5707963267948966 rad + rot: 3.141592653589793 rad pos: 3.5,0.5 parent: 174 - type: AtmosPipeColor @@ -1389,24 +1395,26 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - uid: 112 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - - uid: 179 + - uid: 249 components: - type: Transform - rot: 3.141592653589793 rad + rot: 1.5707963267948966 rad + pos: 3.5,-0.5 + parent: 174 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 266 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: 3.5,-1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPressurePump @@ -1416,33 +1424,20 @@ entities: - type: Transform pos: -4.5,1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - uid: 106 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - - uid: 169 +- proto: GasPressurePumpOnMax + entities: + - uid: 219 components: - type: Transform rot: 3.141592653589793 rad - pos: 3.5,-0.5 - parent: 174 - - type: AtmosDevice - joinedGrid: 174 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 232 - components: - - type: Transform - pos: 4.5,-0.5 + pos: 4.5,2.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#990000FF' - proto: GasVentPump @@ -1453,8 +1448,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-0.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#0055CCFF' - uid: 237 @@ -1463,8 +1456,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,0.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#0055CCFF' - uid: 243 @@ -1472,8 +1463,6 @@ entities: - type: Transform pos: 3.5,2.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#0055CCFF' - uid: 358 @@ -1481,8 +1470,6 @@ entities: - type: Transform pos: 0.5,6.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -1492,8 +1479,6 @@ entities: - type: Transform pos: 0.5,2.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#990000FF' - uid: 250 @@ -1502,18 +1487,17 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#990000FF' - - uid: 266 + - uid: 323 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-0.5 + rot: -1.5707963267948966 rad + pos: 5.5,1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 + - type: DeviceNetwork + deviceLists: + - 76 - type: AtmosPipeColor color: '#990000FF' - uid: 359 @@ -1521,8 +1505,6 @@ entities: - type: Transform pos: 1.5,6.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -1753,6 +1735,14 @@ entities: - type: Transform pos: -5.5,1.5 parent: 174 +- proto: LockerWallMaterialsFuelPlasmaFilled2 + entities: + - uid: 335 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,3.5 + parent: 174 - proto: MachineArtifactAnalyzer entities: - uid: 158 @@ -1768,6 +1758,26 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 174 +- proto: NitrogenCanister + entities: + - uid: 269 + components: + - type: Transform + anchored: True + pos: 3.5,-1.5 + parent: 174 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 218 + components: + - type: Transform + anchored: True + pos: 3.5,-0.5 + parent: 174 + - type: Physics + bodyType: Static - proto: PaperBin10 entities: - uid: 292 @@ -1776,32 +1786,26 @@ entities: rot: 3.141592653589793 rad pos: -0.5,2.5 parent: 174 -- proto: PortableGeneratorPacman +- proto: PortableGeneratorPacmanShuttle entities: - - uid: 163 + - uid: 286 components: - type: Transform - anchored: True - pos: 4.5,-1.5 + pos: 5.5,-1.5 parent: 174 - - type: MaterialStorage - storage: - Plasma: 3000 + - type: FuelGenerator + on: False - type: Physics bodyType: Static - - type: InsertingMaterialStorage - - uid: 274 + - uid: 293 components: - type: Transform - anchored: True - pos: 5.5,-1.5 + pos: 4.5,-1.5 parent: 174 - - type: MaterialStorage - storage: - Plasma: 3000 + - type: FuelGenerator + on: False - type: Physics bodyType: Static - - type: InsertingMaterialStorage - proto: PowerCellRecharger entities: - uid: 244 @@ -1814,16 +1818,12 @@ entities: entities: - uid: 239 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: -2.5,5.5 parent: 174 - uid: 297 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: -1.5707963267948966 rad pos: 1.5,2.5 @@ -1832,8 +1832,6 @@ entities: powerLoad: 0 - uid: 300 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 2.5,9.5 @@ -1842,8 +1840,6 @@ entities: powerLoad: 0 - uid: 301 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -1.5,9.5 @@ -1852,8 +1848,6 @@ entities: powerLoad: 0 - uid: 311 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -0.5,6.5 @@ -1864,16 +1858,12 @@ entities: entities: - uid: 270 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: 5.5,-1.5 parent: 174 - uid: 295 components: - - type: MetaData - flags: PvsPriority - type: Transform rot: 3.141592653589793 rad pos: -4.5,-1.5 @@ -1938,13 +1928,6 @@ entities: - type: Transform pos: -5.5,-2.5 parent: 174 -- proto: SheetPlasma - entities: - - uid: 167 - components: - - type: Transform - pos: 3.491716,1.719785 - parent: 174 - proto: ShuttleWindow entities: - uid: 6 @@ -2154,15 +2137,11 @@ entities: - type: Transform pos: -2.5,-1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - uid: 258 components: - type: Transform pos: -3.5,-1.5 parent: 174 - - type: AtmosDevice - joinedGrid: 174 - proto: SubstationBasic entities: - uid: 66 @@ -2295,267 +2274,191 @@ entities: entities: - uid: 1 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-3.5 parent: 174 - uid: 2 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,-4.5 parent: 174 - uid: 3 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-4.5 parent: 174 - uid: 4 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,-2.5 parent: 174 - uid: 5 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-2.5 parent: 174 - uid: 24 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,-3.5 parent: 174 - uid: 25 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,-2.5 parent: 174 - uid: 26 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -4.5,-2.5 parent: 174 - uid: 27 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-3.5 parent: 174 - uid: 28 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-3.5 parent: 174 - uid: 29 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,-2.5 parent: 174 - uid: 30 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 5.5,-2.5 parent: 174 - uid: 37 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,9.5 parent: 174 - uid: 38 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,9.5 parent: 174 - uid: 39 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,8.5 parent: 174 - uid: 40 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,8.5 parent: 174 - uid: 41 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,8.5 parent: 174 - uid: 42 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,8.5 parent: 174 - uid: 43 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,5.5 parent: 174 - uid: 44 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,4.5 parent: 174 - uid: 45 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,-1.5 parent: 174 - uid: 46 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,5.5 parent: 174 - uid: 47 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,4.5 parent: 174 - uid: 48 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,-1.5 parent: 174 - uid: 60 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,4.5 parent: 174 - uid: 61 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,4.5 parent: 174 - uid: 62 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,3.5 parent: 174 - uid: 64 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 7.5,2.5 parent: 174 - uid: 65 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,3.5 parent: 174 - uid: 68 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -6.5,2.5 parent: 174 - uid: 69 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,3.5 parent: 174 - uid: 70 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -1.5,2.5 parent: 174 - uid: 71 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,3.5 parent: 174 - uid: 73 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 1.5,5.5 parent: 174 - uid: 74 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -0.5,5.5 parent: 174 - uid: 78 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 2.5,2.5 parent: 174 - uid: 83 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: -5.5,2.5 parent: 174 - uid: 84 components: - - type: MetaData - flags: PvsPriority - type: Transform pos: 6.5,2.5 parent: 174 From 92768f17ded6f8e36b0ff7be0f4d5e4a24a2fbce Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 18:17:08 +0000 Subject: [PATCH 72/96] Automatic Changelog (#2106) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index efc9abb1089..26c9ee279cc 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4429,3 +4429,9 @@ Entries: message: Updated Honker tiny fans with directional fans. id: 5385 time: '2024-10-12T18:10:44.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Replace Sparrow tiny fans with directional fans. + id: 5386 + time: '2024-10-12T18:16:45.0000000+00:00' From 570caa981af2765f1f4bc1c39aa9c379efc3c69a Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sat, 12 Oct 2024 21:32:27 +0300 Subject: [PATCH 73/96] Change up (#2187) --- .../Singularity/Components/SharedEmitterComponent.cs | 4 ++-- .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 4 +++- .../Structures/Power/Generation/Singularity/emitter.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs index 426b991a751..83570244fc8 100644 --- a/Content.Shared/Singularity/Components/SharedEmitterComponent.cs +++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs @@ -1,4 +1,4 @@ -using System.Threading; +using System.Threading; using Content.Shared.Construction.Prototypes; using Content.Shared.DeviceLinking; using Robust.Shared.GameStates; @@ -39,7 +39,7 @@ public sealed partial class EmitterComponent : Component /// The current amount of power being used. /// [DataField("powerUseActive")] - public int PowerUseActive = 600; + public int PowerUseActive = 1500; // Frontier 600<1500 /// /// The amount of shots that are fired in a single "burst" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 4ea5dc3f3a7..f6b9b0d129c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -309,12 +309,14 @@ types: Heat: 14 # mining laser real - - type: GatheringProjectile +# - type: GatheringProjectile # Frontier - type: Tag tags: - EmitterBolt - type: TimedDespawn lifetime: 3 + - type: Reflective # Frontier + reflective: ShuttleKinetic # Frontier - type: entity name: watcher bolt diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index 298e238f018..1f0d00bb568 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml @@ -87,7 +87,7 @@ - type: LockedAnchorable - type: LockedWiresPanel - type: AccessReader - access: [[ "Engineering" ]] + # access: [[ "Engineering" ]] # Frontier - type: Machine board: EmitterCircuitboard - type: GuideHelp From 05da717188f043f8c157413ec82c0bebe7a4a2ba Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 18:32:56 +0000 Subject: [PATCH 74/96] Automatic Changelog (#2187) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 26c9ee279cc..0bd7674b246 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4435,3 +4435,11 @@ Entries: message: Replace Sparrow tiny fans with directional fans. id: 5386 time: '2024-10-12T18:16:45.0000000+00:00' +- author: dvir001 + changes: + - type: Tweak + message: >- + Removed the lock from emitters, fixed the emitters to no longer work + like the PTK-800 for mining. + id: 5387 + time: '2024-10-12T18:32:27.0000000+00:00' From 2479231c612d8b22236b1ef0821f78f7b04f17d2 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Sat, 12 Oct 2024 15:26:32 -0400 Subject: [PATCH 75/96] Separate microwave recipes into multiple machines (electric range, assembler, medical assembler) (#1935) * Oven, first pass * Fix oven range * Fix the oven range * EntityHeater: passive power draw * Add placeholder assembler * Microwave recipe types (machine restrictions) * Add canHeat/canIrradiate to Microwave * Port EE#783 (Thank you, Mnemotechnician) * Revert machine type changes to meal recipes * Unneeded dependencies, show search bar * Remove yet more microwave recipe machine types * Multiple devices per recipe * Food recipe guidebook: cleanup, style consistency * Frontier comment cleanup * Assembler UI proof of concept * Assembler UI rework, fix recipes, mediwave layer * Add machines to kitchen shuttles/POIs * NFSD POI microwave * Resolve GuideFoodSource merge conflicts * Assembler sounds * techs, "food-o-mat", minor fixes * Update mccargo.yml * Move this * Syndicate Oven Baseline * Donk co. range sprite * Syndicate Range * Update cove.yml * Update dungeon_items_kitchen.yml * Add syndicate texture --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Kitchen/UI/MicrowaveBoundUserInterface.cs | 21 + Content.Client/Kitchen/UI/MicrowaveMenu.xaml | 2 +- .../Guidebook/Controls/GuideFoodSource.xaml | 5 +- .../Controls/GuideFoodSource.xaml.cs | 58 +- .../Kitchen/UI/AssemblerBoundUserInterface.cs | 125 ++++ .../_NF/Kitchen/UI/AssemblerMenu.xaml | 95 +++ .../_NF/Kitchen/UI/AssemblerMenu.xaml.cs | 44 ++ Content.Server/Access/Systems/IdCardSystem.cs | 9 +- .../Kitchen/Components/MicrowaveComponent.cs | 50 +- .../Kitchen/EntitySystems/MicrowaveSystem.cs | 35 +- Content.Server/PAI/PAISystem.cs | 5 + .../Power/EntitySystems/RiggableSystem.cs | 5 + .../Components/EntityHeaterComponent.cs | 8 + .../Temperature/Systems/EntityHeaterSystem.cs | 4 +- .../Systems/ArtifactMicrowaveTriggerSystem.cs | 5 + .../MicrowaveSystem.Assembler.cs | 181 ++++++ .../Kitchen/Components/SharedMicrowave.cs | 5 +- .../Kitchen/MicrowaveMealRecipePrototype.cs | 20 + .../Placeable/ItemPlacerComponent.cs | 6 + Content.Shared/Placeable/ItemPlacerSystem.cs | 11 +- .../Components/SharedMicrowave.Assembler.cs | 9 + Resources/Audio/_NF/Effects/attributions.yml | 2 +- Resources/Audio/_NF/Machines/assembler.ogg | Bin 0 -> 30988 bytes Resources/Audio/_NF/Machines/attributions.yml | 14 + Resources/Audio/_NF/Machines/egg-timer.ogg | Bin 0 -> 12934 bytes .../Audio/_NF/Machines/medical-assembler.ogg | Bin 0 -> 48977 bytes Resources/Locale/en-US/_EE/guidebook/food.ftl | 11 +- .../components/microwave-component.ftl | 28 + .../en-US/_NF/research/technologies.ftl | 5 +- .../components/microwave-component.ftl | 1 - Resources/Maps/_NF/POI/bahama.yml | 45 +- Resources/Maps/_NF/POI/cove.yml | 17 +- Resources/Maps/_NF/POI/nfsd.yml | 2 +- Resources/Maps/_NF/POI/tinnia.yml | 50 +- Resources/Maps/_NF/POI/trade.yml | 106 ++-- Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 576 ++++++----------- Resources/Maps/_NF/Shuttles/bocadillo.yml | 72 +-- Resources/Maps/_NF/Shuttles/ceres.yml | 36 +- Resources/Maps/_NF/Shuttles/mccargo.yml | 37 +- Resources/Maps/_NF/Shuttles/piecrust.yml | 43 +- Resources/Maps/_NF/Shuttles/stellaris.yml | 581 ++++-------------- .../Entities/Objects/Materials/materials.yml | 14 +- .../Entities/Structures/Machines/lathe.yml | 7 +- .../Recipes/Cooking/meal_recipes.yml | 7 +- .../Recipes/Cooking/meal_recipes.yml | 225 ++++++- .../Recipes/Cooking/medical_recipes.yml | 3 + .../Prototypes/Research/civilianservices.yml | 2 - .../Spawners/Random/dungeon_items_kitchen.yml | 1 - .../Entities/Objects/Devices/production.yml | 70 +++ .../Machines/microwave_recipe_assemblers.yml | 327 ++++++++++ .../_NF/Recipes/Construction/furniture.yml | 2 +- .../_NF/Recipes/Cooking/meal_recipes.yml | 49 +- .../_NF/Recipes/Lathes/electronics.yml | 28 + .../Prototypes/_NF/Recipes/Lathes/medical.yml | 18 - .../_NF/Research/civilianservices.yml | 32 +- .../assembler.rsi/assembler-blinky-unlit.png | Bin 0 -> 125 bytes .../assembler.rsi/assembler-broken-unlit.png | Bin 0 -> 99 bytes .../assembler.rsi/assembler-invisible.png | Bin 0 -> 83 bytes .../assembler.rsi/assembler-on-unlit.png | Bin 0 -> 98 bytes .../assembler.rsi/assembler-running-unlit.png | Bin 0 -> 97 bytes .../assembler.rsi/assembler-scan-unlit.png | Bin 0 -> 169 bytes .../Machines/assembler.rsi/assembler.png | Bin 0 -> 664 bytes .../Machines/assembler.rsi/meta.json | 56 ++ .../Machines/medical_assembler.rsi/icon.png | Bin 0 -> 410 bytes .../medical_assembler.rsi/mediwave-base.png | Bin 0 -> 403 bytes .../mediwave-off-unlit.png | Bin 0 -> 218 bytes .../mediwave-on-unlit.png | Bin 0 -> 238 bytes .../Machines/medical_assembler.rsi/meta.json | 23 + .../Machines/oven.rsi/composite_off.png | Bin 0 -> 839 bytes .../Machines/oven.rsi/composite_on.png | Bin 0 -> 849 bytes .../Machines/oven.rsi/cooking_unlit.png | Bin 0 -> 212 bytes .../Structures/Machines/oven.rsi/meta.json | 38 ++ .../Machines/oven.rsi/off_no_door.png | Bin 0 -> 732 bytes .../Machines/oven.rsi/oven_door.png | Bin 0 -> 326 bytes .../Machines/oven.rsi/range_high.png | Bin 0 -> 181 bytes .../Machines/oven.rsi/range_low.png | Bin 0 -> 189 bytes .../Machines/oven.rsi/range_medium.png | Bin 0 -> 189 bytes .../Structures/Machines/oven.rsi/unlit.png | Bin 0 -> 93 bytes .../oven_syndie.rsi/composite_off.png | Bin 0 -> 808 bytes .../Machines/oven_syndie.rsi/composite_on.png | Bin 0 -> 817 bytes .../oven_syndie.rsi/cooking_unlit.png | Bin 0 -> 212 bytes .../Machines/oven_syndie.rsi/meta.json | 38 ++ .../Machines/oven_syndie.rsi/off_no_door.png | Bin 0 -> 404 bytes .../Machines/oven_syndie.rsi/oven_door.png | Bin 0 -> 326 bytes .../Machines/oven_syndie.rsi/range_high.png | Bin 0 -> 181 bytes .../Machines/oven_syndie.rsi/range_low.png | Bin 0 -> 189 bytes .../Machines/oven_syndie.rsi/range_medium.png | Bin 0 -> 189 bytes .../Machines/oven_syndie.rsi/unlit.png | Bin 0 -> 93 bytes .../meta.json | 0 .../normal.png | Bin .../off.png | Bin .../shredding-empty.png | Bin .../shredding-money.png | Bin .../shredding-paper.png | Bin 94 files changed, 2163 insertions(+), 1106 deletions(-) create mode 100644 Content.Client/_NF/Kitchen/UI/AssemblerBoundUserInterface.cs create mode 100644 Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml create mode 100644 Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml.cs create mode 100644 Content.Server/_NF/Kitchen/EntitySystems/MicrowaveSystem.Assembler.cs create mode 100644 Content.Shared/_NF/Kitchen/Components/SharedMicrowave.Assembler.cs create mode 100644 Resources/Audio/_NF/Machines/assembler.ogg create mode 100644 Resources/Audio/_NF/Machines/attributions.yml create mode 100644 Resources/Audio/_NF/Machines/egg-timer.ogg create mode 100644 Resources/Audio/_NF/Machines/medical-assembler.ogg create mode 100644 Resources/Locale/en-US/_NF/kitchen/components/microwave-component.ftl create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Machines/microwave_recipe_assemblers.yml delete mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/medical.yml create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-blinky-unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-broken-unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-invisible.png create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-on-unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-running-unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-scan-unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler.png create mode 100644 Resources/Textures/_NF/Structures/Machines/assembler.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-base.png create mode 100644 Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-off-unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-on-unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_on.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/cooking_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/off_no_door.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/oven_door.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/range_high.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/range_low.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/range_medium.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven.rsi/unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_on.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/cooking_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/off_no_door.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/oven_door.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_high.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_low.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_medium.png create mode 100644 Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/unlit.png rename Resources/Textures/_NF/Structures/Machines/{syndicate_shredder.rsi => shredder_syndie.rsi}/meta.json (100%) rename Resources/Textures/_NF/Structures/Machines/{syndicate_shredder.rsi => shredder_syndie.rsi}/normal.png (100%) rename Resources/Textures/_NF/Structures/Machines/{syndicate_shredder.rsi => shredder_syndie.rsi}/off.png (100%) rename Resources/Textures/_NF/Structures/Machines/{syndicate_shredder.rsi => shredder_syndie.rsi}/shredding-empty.png (100%) rename Resources/Textures/_NF/Structures/Machines/{syndicate_shredder.rsi => shredder_syndie.rsi}/shredding-money.png (100%) rename Resources/Textures/_NF/Structures/Machines/{syndicate_shredder.rsi => shredder_syndie.rsi}/shredding-paper.png (100%) diff --git a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs index 643ac47054b..0fa82d230d8 100644 --- a/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs +++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs @@ -21,8 +21,24 @@ public sealed class MicrowaveBoundUserInterface : BoundUserInterface [ViewVariables] private readonly Dictionary _reagents = new(); + // Frontier: UI parameters + private readonly string _menuTitle; + private readonly string _leftFlavorText; + public MicrowaveBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) { + // Frontier: switch UI params based on key + if ((MicrowaveUiKey)uiKey == MicrowaveUiKey.ElectricRangeKey) + { + _menuTitle = "microwave-menu-range-title"; + _leftFlavorText = "microwave-menu-range-footer-flavor-left"; + } + else + { + _menuTitle = "microwave-menu-title"; + _leftFlavorText = "microwave-menu-footer-flavor-left"; + } + // End Frontier } protected override void Open() @@ -60,6 +76,11 @@ protected override void Open() ("time", Loc.GetString("microwave-menu-instant-button"))); } }; + + // Frontier: UI customization + _menu.Title = Loc.GetString(_menuTitle); + _menu.LeftFooter.Text = Loc.GetString(_leftFlavorText); + // End Frontier } protected override void UpdateState(BoundUserInterfaceState state) diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml index cd81ea0a9bf..c99462d9e7a 100644 --- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml +++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml @@ -98,7 +98,7 @@ - - + + GetRsiTexture("/Textures/Objects/Weapons/Melee/kitchen_knife.rsi", "icon"), _ => GetRsiTexture("/Textures/Structures/meat_spike.rsi", "spike") }; + ProcessingTextures.AddChild(processingTexture); // Frontier } private void GenerateControl(FoodSlicingData entry) @@ -80,7 +83,9 @@ private void GenerateControl(FoodSlicingData entry) SetSource(ent); ProcessingLabel.Text = Loc.GetString("guidebook-food-processing-slicing"); - ProcessingTexture.Texture = GetRsiTexture("/Textures/Objects/Misc/utensils.rsi", "plastic_knife"); + var processingTexture = new TextureRect(); // Frontier + processingTexture.Texture = GetRsiTexture("/Textures/Objects/Misc/utensils.rsi", "plastic_knife"); + ProcessingTextures.AddChild(processingTexture); // Frontier } private void GenerateControl(FoodRecipeData entry) @@ -101,8 +106,49 @@ private void GenerateControl(FoodRecipeData entry) var combinedIngredients = string.Join("\n", combinedLiquids.Union(combinedSolids)); SourceLabel.Text = Loc.GetString("guidebook-food-processing-recipe", ("ingredients", combinedIngredients)); // Frontier: SetMessage processingTypes = new(); + if (recipeType.HasFlag(MicrowaveRecipeType.Microwave)) + { + processingTexture = new TextureRect(); + if (recipe.SecretRecipe) + processingTexture.Texture = GetRsiTexture("/Textures/Structures/Machines/microwave_syndie.rsi", "mw"); + else + processingTexture.Texture = GetRsiTexture("/Textures/Structures/Machines/microwave.rsi", "mw"); + ProcessingTextures.AddChild(processingTexture); + processingTypes.Add(Loc.GetString("guidebook-food-processing-type-microwave")); + } + if (recipeType.HasFlag(MicrowaveRecipeType.Oven)) + { + processingTexture = new TextureRect(); + if (recipe.SecretRecipe) + processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/oven_syndie.rsi", "composite_off"); + else + processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/oven.rsi", "composite_off"); + ProcessingTextures.AddChild(processingTexture); + processingTypes.Add(Loc.GetString("guidebook-food-processing-type-oven")); + } + if (recipeType.HasFlag(MicrowaveRecipeType.Assembler)) + { + processingTexture = new TextureRect(); + processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/assembler.rsi", "assembler"); + ProcessingTextures.AddChild(processingTexture); + processingTypes.Add(Loc.GetString("guidebook-food-processing-type-assembler")); + } + if (recipeType.HasFlag(MicrowaveRecipeType.MedicalAssembler)) + { + processingTexture = new TextureRect(); + processingTexture.Texture = GetRsiTexture("/Textures/_NF/Structures/Machines/medical_assembler.rsi", "mediwave-base"); + ProcessingTextures.AddChild(processingTexture); + processingTypes.Add(Loc.GetString("guidebook-food-processing-type-medical-assembler")); + } + if (processingTypes.Count <= 0) + processingTypes.Add(Loc.GetString("guidebook-food-processing-type-generic")); + var processingTypeString = string.Join('/', processingTypes); + // End Frontier + ProcessingLabel.Text = Loc.GetString("guidebook-food-processing-cooking", ("processingTypes", processingTypeString), ("time", recipe.CookTime)); } private void GenerateControl(FoodReactionData entry) @@ -118,7 +164,9 @@ private void GenerateControl(FoodReactionData entry) .Where(it => it.Length > 0); SourceLabel.Text = Loc.GetString("guidebook-food-processing-recipe", ("ingredients", string.Join("\n", combinedReagents))); // Frontier: SetMessage _solids = new(); + + [ViewVariables] + private readonly Dictionary _reagents = new(); + + private readonly string _menuTitle; + private readonly string _leftFlavorText; + + public AssemblerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + if ((MicrowaveUiKey)uiKey == MicrowaveUiKey.MedicalAssemblerKey) + { + _menuTitle = "assembler-menu-medical-title"; + _leftFlavorText = "assembler-menu-medical-footer-flavor-left"; + } + else + { + _menuTitle = "assembler-menu-title"; + _leftFlavorText = "assembler-menu-footer-flavor-left"; + } + } + + protected override void Open() + { + base.Open(); + _menu = this.CreateWindow(); + _menu.StartButton.OnPressed += _ => SendPredictedMessage(new AssemblerStartCookMessage()); + _menu.EjectButton.OnPressed += _ => SendPredictedMessage(new MicrowaveEjectMessage()); + _menu.IngredientsList.OnItemSelected += args => + { + SendPredictedMessage(new MicrowaveEjectSolidIndexedMessage(EntMan.GetNetEntity(_solids[args.ItemIndex]))); + }; + + _menu.Title = Loc.GetString(_menuTitle); + _menu.LeftFooter.Text = Loc.GetString(_leftFlavorText); + } + + protected override void UpdateState(BoundUserInterfaceState state) + { + base.UpdateState(state); + if (state is not MicrowaveUpdateUserInterfaceState cState || _menu == null) + { + return; + } + + _menu.IsBusy = cState.IsMicrowaveBusy; + _menu.CurrentCooktimeEnd = cState.CurrentCookTimeEnd; + + _menu.ToggleBusyDisableOverlayPanel(cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0); + // TODO move this to a component state and ensure the net ids. + RefreshContentsDisplay(EntMan.GetEntityArray(cState.ContainedSolids)); + + //Set the cook time info label + var cookTime = cState.CurrentCookTime.ToString(); + + _menu.CookTimeInfoLabel.Text = Loc.GetString("assembler-bound-user-interface-insert-ingredients"); + _menu.StartButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0; + _menu.EjectButton.Disabled = cState.IsMicrowaveBusy || cState.ContainedSolids.Length == 0; + + //Set the "micowave light" ui color to indicate if the microwave is busy or not + if (cState.IsMicrowaveBusy && cState.ContainedSolids.Length > 0) + { + _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#947300") }; + } + else + { + _menu.IngredientsPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = Color.FromHex("#1B1B1E") }; + } + } + + private void RefreshContentsDisplay(EntityUid[] containedSolids) + { + _reagents.Clear(); + + if (_menu == null) return; + + _solids.Clear(); + _menu.IngredientsList.Clear(); + foreach (var entity in containedSolids) + { + if (EntMan.Deleted(entity)) + { + return; + } + + // TODO just use sprite view + + Texture? texture; + if (EntMan.TryGetComponent(entity, out var iconComponent)) + { + texture = EntMan.System().GetIcon(iconComponent); + } + else if (EntMan.TryGetComponent(entity, out var spriteComponent)) + { + texture = spriteComponent.Icon?.Default; + } + else + { + continue; + } + + var solidItem = _menu.IngredientsList.AddItem(EntMan.GetComponent(entity).EntityName, texture); + var solidIndex = _menu.IngredientsList.IndexOf(solidItem); + _solids.Add(solidIndex, entity); + } + } + } +} diff --git a/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml b/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml new file mode 100644 index 00000000000..8de5f2643ee --- /dev/null +++ b/Content.Client/_NF/Kitchen/UI/AssemblerMenu.xaml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + [DataField, ViewVariables(VVAccess.ReadWrite)] public bool CanMicrowaveIdsSafely = true; + + // Frontier: recipe type + /// + /// the types of recipes that this "microwave" can handle. + /// + [DataField(customTypeSerializer: typeof(FlagSerializer)), ViewVariables(VVAccess.ReadWrite)] + public int ValidRecipeTypes = (int)MicrowaveRecipeType.Microwave; + + /// + /// If true, events sent off by the microwave will state that the object is being heated. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public bool CanHeat = true; + + /// + /// If true, events sent off by the microwave will state that the object is being irradiated. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public bool CanIrradiate = true; + + /// + /// The localization string to be displayed when something that's too large is inserted. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public string TooBigPopup = "microwave-component-interact-item-too-big"; + + /// + /// The sound that is played when a set of ingredients does not match an assembly recipe. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public SoundSpecifier NoRecipeSound = new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_sigh.ogg"); + + /// + /// The sound that is played when a set of ingredients does not match an assembly recipe. + /// + [DataField, ViewVariables(VVAccess.ReadOnly)] + public MicrowaveUiKey Key = MicrowaveUiKey.Key; + // End Frontier } public sealed class BeingMicrowavedEvent : HandledEntityEventArgs { public EntityUid Microwave; public EntityUid? User; + // Frontier: fields for whether or not the object is actually being heated or irradiated. + public bool BeingHeated; + public bool BeingIrradiated; + // End Frontier - public BeingMicrowavedEvent(EntityUid microwave, EntityUid? user) + public BeingMicrowavedEvent(EntityUid microwave, EntityUid? user, bool heating, bool irradiating) // Frontier: added heating, irradiating { Microwave = microwave; User = user; + BeingHeated = heating; + BeingIrradiated = irradiating; } } } diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 1c2b48ba8ef..ab0cb33bb0c 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -41,10 +41,11 @@ using Content.Shared.Chat; using Content.Shared.Damage; using Robust.Shared.Utility; +using Content.Shared._NF.Kitchen.Components; // Frontier namespace Content.Server.Kitchen.EntitySystems { - public sealed class MicrowaveSystem : EntitySystem + public sealed partial class MicrowaveSystem : EntitySystem // Frontier: add partial { [Dependency] private readonly BodySystem _bodySystem = default!; [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; @@ -102,10 +103,13 @@ public override void Initialize() SubscribeLocalEvent(OnActiveMicrowaveRemove); SubscribeLocalEvent(OnConstructionTemp); + SubscribeLocalEvent(OnGetSecretRecipes); - + SubscribeLocalEvent(OnRefreshParts); // Frontier SubscribeLocalEvent(OnUpgradeExamine); // Frontier + + SubscribeLocalEvent(TryStartAssembly); // Frontier } private void OnCookStart(Entity ent, ref ComponentStartup args) @@ -151,6 +155,11 @@ private void OnConstructionTemp(Entity ent, ref OnC /// The time on the microwave, in seconds. private void AddTemperature(MicrowaveComponent component, float time) { + // Frontier: temperature requires heat or irradiation + if (!component.CanHeat && !component.CanIrradiate) + return; + // End Frontier + var heatToAdd = time * component.BaseHeatMultiplier; foreach (var entity in component.Storage.ContainedEntities) { @@ -282,6 +291,11 @@ private void OnSuicideByEnvironment(Entity ent, ref SuicideB if (!TryComp(args.Victim, out var damageableComponent)) return; + // Frontier: suicide requires heat or irradiation + if (!ent.Comp.CanHeat && !ent.Comp.CanIrradiate) + return; + // Frontier + // The application of lethal damage is what kills you... _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Heat"); @@ -380,7 +394,7 @@ private void OnInteractUsing(Entity ent, ref InteractUsingEv // check if size of an item you're trying to put in is too big if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(ent.Comp.MaxItemSize)) { - _popupSystem.PopupEntity(Loc.GetString("microwave-component-interact-item-too-big", ("item", args.Used)), ent, args.User); + _popupSystem.PopupEntity(Loc.GetString(ent.Comp.TooBigPopup, ("item", args.Used)), ent, args.User); // Frontier: "microwave-component-interact-item-too-big" ent, ref SignalReceived public void UpdateUserInterfaceState(EntityUid uid, MicrowaveComponent component) { - _userInterface.SetUiState(uid, MicrowaveUiKey.Key, new MicrowaveUpdateUserInterfaceState( + _userInterface.SetUiState(uid, component.Key, new MicrowaveUpdateUserInterfaceState( GetNetEntityArray(component.Storage.ContainedEntities.ToArray()), HasComp(uid), component.CurrentCookTimeButtonIndex, @@ -534,7 +548,7 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user foreach (var item in component.Storage.ContainedEntities.ToArray()) { // special behavior when being microwaved ;) - var ev = new BeingMicrowavedEvent(uid, user); + var ev = new BeingMicrowavedEvent(uid, user, component.CanHeat, component.CanIrradiate); // Frontier: add CanHeat, CanIrradiate RaiseLocalEvent(item, ev); if (ev.Handled) @@ -543,12 +557,12 @@ public void Wzhzhzh(EntityUid uid, MicrowaveComponent component, EntityUid? user return; } - if (_tag.HasTag(item, "Metal")) + if (_tag.HasTag(item, "Metal") && component.CanIrradiate) // Frontier: add && !component.DisableMetalMalfunctions { malfunctioning = true; } - if (_tag.HasTag(item, "Plastic")) + if (_tag.HasTag(item, "Plastic") && (component.CanHeat || component.CanIrradiate)) // Frontier: add && !component.DisableRuiningPlastic { var junk = Spawn(component.BadRecipeEntityId, Transform(uid).Coordinates); _container.Insert(junk, component.Storage); @@ -645,6 +659,13 @@ public static (FoodRecipePrototype, int) CanSatisfyRecipe(MicrowaveComponent com return (recipe, 0); } + // Frontier: microwave recipe machine types + if ((recipe.RecipeType & component.ValidRecipeTypes) == 0) + { + return (recipe, 0); + } + // End Frontier + foreach (var solid in recipe.IngredientsSolids) { if (!solids.ContainsKey(solid.Key)) diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs index 0cdb0bc29a2..0d80f53bf35 100644 --- a/Content.Server/PAI/PAISystem.cs +++ b/Content.Server/PAI/PAISystem.cs @@ -65,6 +65,11 @@ private void OnMindRemoved(EntityUid uid, PAIComponent component, MindRemovedMes private void OnMicrowaved(EntityUid uid, PAIComponent comp, BeingMicrowavedEvent args) { + // Frontier: only scramble pAI names when irradiated + if (!args.BeingIrradiated) + return; + // End Frontier + // name will always be scrambled whether it gets bricked or not, this is the reward ScrambleName(uid, comp); diff --git a/Content.Server/Power/EntitySystems/RiggableSystem.cs b/Content.Server/Power/EntitySystems/RiggableSystem.cs index 26eaca80fe7..b40fc06718c 100644 --- a/Content.Server/Power/EntitySystems/RiggableSystem.cs +++ b/Content.Server/Power/EntitySystems/RiggableSystem.cs @@ -31,6 +31,11 @@ private void OnRejuvenate(Entity entity, ref RejuvenateEvent private void OnMicrowaved(Entity entity, ref BeingMicrowavedEvent args) { + // Frontier: don't do anything if machine doesn't heat or irradiate. + if (!args.BeingHeated && !args.BeingIrradiated) + return; + // End Frontier + if (TryComp(entity, out var batteryComponent)) { if (batteryComponent.CurrentCharge == 0) diff --git a/Content.Server/Temperature/Components/EntityHeaterComponent.cs b/Content.Server/Temperature/Components/EntityHeaterComponent.cs index 0b5acb421a8..34b3cc3a2d8 100644 --- a/Content.Server/Temperature/Components/EntityHeaterComponent.cs +++ b/Content.Server/Temperature/Components/EntityHeaterComponent.cs @@ -23,6 +23,14 @@ public sealed partial class EntityHeaterComponent : Component [DataField] public EntityHeaterSetting Setting = EntityHeaterSetting.Off; + // Frontier: ghost power + /// + /// Passive power draw. Takes this much while plugged in, even when off. + /// + [DataField, ViewVariables(VVAccess.ReadWrite)] + public float PassivePower = 0f; + // End Frontier + /// /// An optional sound that plays when the setting is changed. /// diff --git a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs index c4b5b72a9cb..62f0eb08eac 100644 --- a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs +++ b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs @@ -42,7 +42,7 @@ public override void Update(float deltaTime) // don't divide by total entities since its a big grill // excess would just be wasted in the air but that's not worth simulating // if you want a heater thermomachine just use that... - var energy = power.PowerReceived * deltaTime; + var energy = (power.PowerReceived - comp.PassivePower) * deltaTime; // Frontier: subtract PassivePower foreach (var ent in placer.PlacedEntities) { _temperature.ChangeHeat(ent, energy); @@ -93,7 +93,7 @@ private void ChangeSetting(EntityUid uid, EntityHeaterSetting setting, EntityHea return; comp.Setting = setting; - power.Load = SettingPower(setting, comp.Power); + power.Load = comp.PassivePower + SettingPower(setting, comp.Power); // Frontier: add PassivePower _appearance.SetData(uid, EntityHeaterVisuals.Setting, setting); _audio.PlayPvs(comp.SettingSound, uid); } diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs index ca61c8f8ab3..638a0f2603a 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactMicrowaveTriggerSystem.cs @@ -15,6 +15,11 @@ public override void Initialize() private void OnMicrowaved(EntityUid uid, ArtifactMicrowaveTriggerComponent component, BeingMicrowavedEvent args) { + // Frontier: microwave trigger requires radiation, check if this can irradiate + if (!args.BeingIrradiated) + return; + // End Frontier + _artifact.TryActivateArtifact(uid); } } diff --git a/Content.Server/_NF/Kitchen/EntitySystems/MicrowaveSystem.Assembler.cs b/Content.Server/_NF/Kitchen/EntitySystems/MicrowaveSystem.Assembler.cs new file mode 100644 index 00000000000..7eecc3eea4b --- /dev/null +++ b/Content.Server/_NF/Kitchen/EntitySystems/MicrowaveSystem.Assembler.cs @@ -0,0 +1,181 @@ + +// Overlaps with existing namespace. +using System.Linq; +using Content.Server.Kitchen.Components; +using Content.Server.Power.Components; +using Content.Shared._NF.Kitchen.Components; +using Content.Shared.Chemistry.Components.SolutionManager; +using Content.Shared.FixedPoint; +using Content.Shared.Kitchen; +using Content.Shared.Stacks; + +namespace Content.Server.Kitchen.EntitySystems; + +public sealed partial class MicrowaveSystem : EntitySystem +{ + /// + /// Runs a set of minimal pre-reqs to check the timing, needed to enable dummy-proof, one-button interface to Wzhzhzh + /// + public void TryStartAssembly(EntityUid uid, MicrowaveComponent component, AssemblerStartCookMessage args) + { + if (!HasContents(component) || HasComp(uid) || !(TryComp(uid, out var apc) && apc.Powered)) + return; + + var user = args.Actor; + + var solidsDict = new Dictionary(); + var reagentDict = new Dictionary(); + var malfunctioning = false; + // TODO use lists of Reagent quantities instead of reagent prototype ids. + foreach (var item in component.Storage.ContainedEntities.ToArray()) + { + string? solidID = null; + int amountToAdd = 1; + + // If a microwave recipe uses a stacked item, use the default stack prototype id instead of prototype id + if (TryComp(item, out var stackComp)) + { + solidID = _prototype.Index(stackComp.StackTypeId).Spawn; + amountToAdd = stackComp.Count; + } + else + { + var metaData = MetaData(item); //this simply begs for cooking refactor + if (metaData.EntityPrototype is not null) + solidID = metaData.EntityPrototype.ID; + } + + if (solidID is null) + { + continue; + } + + + if (solidsDict.ContainsKey(solidID)) + { + solidsDict[solidID] += amountToAdd; + } + else + { + solidsDict.Add(solidID, amountToAdd); + } + + if (!TryComp(item, out var solMan)) + continue; + + foreach (var (_, soln) in _solutionContainer.EnumerateSolutions((item, solMan))) + { + var solution = soln.Comp.Solution; + foreach (var (reagent, quantity) in solution.Contents) + { + if (reagentDict.ContainsKey(reagent.Prototype)) + reagentDict[reagent.Prototype] += quantity; + else + reagentDict.Add(reagent.Prototype, quantity); + } + } + } + + // Check recipes + var getRecipesEv = new GetSecretRecipesEvent(); + RaiseLocalEvent(uid, ref getRecipesEv); + + List recipes = getRecipesEv.Recipes; + recipes.AddRange(_recipeManager.Recipes); + var portionedRecipe = recipes.Select(r => + GetPortionsForRecipe(component, r, solidsDict, reagentDict)).FirstOrDefault(r => r.Item2 > 0); + + if (portionedRecipe.Item2 <= 0) + { + // Display popup + _popupSystem.PopupEntity(Loc.GetString("microwave-component-assembler-no-valid-recipe"), uid); + _audio.PlayPvs(component.NoRecipeSound, uid); + return; + } + + // We're actually microwaving things, run the wzhzhzh checks + foreach (var item in component.Storage.ContainedEntities.ToArray()) + { + var ev = new BeingMicrowavedEvent(uid, user, component.CanHeat, component.CanIrradiate); + RaiseLocalEvent(item, ev); + + if (ev.Handled) + { + UpdateUserInterfaceState(uid, component); + return; + } + + if (_tag.HasTag(item, "Metal") && component.CanIrradiate) + { + malfunctioning = true; + } + + if (_tag.HasTag(item, "Plastic") && (component.CanHeat || component.CanIrradiate)) + { + var junk = Spawn(component.BadRecipeEntityId, Transform(uid).Coordinates); + _container.Insert(junk, component.Storage); + Del(item); + continue; + } + + AddComp(item); + } + + _audio.PlayPvs(component.StartCookingSound, uid); + var activeComp = AddComp(uid); //microwave is now cooking + component.CurrentCookTimerTime = (uint)portionedRecipe.Item2 * portionedRecipe.Item1.CookTime; + activeComp.CookTimeRemaining = component.CurrentCookTimerTime * component.FinalCookTimeMultiplier; // Frontier: CookTimeMultiplier + /// Frontier: gets the largest number of portions + /// + public static (FoodRecipePrototype, int) GetPortionsForRecipe(MicrowaveComponent component, FoodRecipePrototype recipe, Dictionary solids, Dictionary reagents) + { + var portions = 0; + + // Frontier: microwave recipe machine types + if ((recipe.RecipeType & component.ValidRecipeTypes) == 0) + { + return (recipe, 0); + } + // End Frontier + + foreach (var solid in recipe.IngredientsSolids) + { + if (!solids.ContainsKey(solid.Key)) + return (recipe, 0); + + if (solids[solid.Key] < solid.Value) + return (recipe, 0); + + portions = portions == 0 + ? solids[solid.Key] / solid.Value.Int() + : Math.Min(portions, solids[solid.Key] / solid.Value.Int()); + } + + foreach (var reagent in recipe.IngredientsReagents) + { + // TODO Turn recipe.IngredientsReagents into a ReagentQuantity[] + if (!reagents.ContainsKey(reagent.Key)) + return (recipe, 0); + + if (reagents[reagent.Key] < reagent.Value) + return (recipe, 0); + + portions = portions == 0 + ? reagents[reagent.Key].Int() / reagent.Value.Int() + : Math.Min(portions, reagents[reagent.Key].Int() / reagent.Value.Int()); + } + + //Return as many portions as we can assemble with the given materials + return (recipe, portions); + } +} \ No newline at end of file diff --git a/Content.Shared/Kitchen/Components/SharedMicrowave.cs b/Content.Shared/Kitchen/Components/SharedMicrowave.cs index fa123689841..8c3405eea3c 100644 --- a/Content.Shared/Kitchen/Components/SharedMicrowave.cs +++ b/Content.Shared/Kitchen/Components/SharedMicrowave.cs @@ -80,7 +80,10 @@ public enum MicrowaveVisualState [NetSerializable, Serializable] public enum MicrowaveUiKey { - Key + Key, + ElectricRangeKey, // Frontier + AssemblerKey, // Frontier + MedicalAssemblerKey, // Frontier } } diff --git a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs index adb8867e30a..7d5d8661f92 100644 --- a/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs +++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs @@ -3,6 +3,8 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; +using Robust.Shared.Serialization; // Frontier namespace Content.Shared.Kitchen { @@ -36,6 +38,11 @@ public sealed partial class FoodRecipePrototype : IPrototype [DataField("time")] public uint CookTime { get; private set; } = 5; + // Frontier: separate microwave recipe types. + + [DataField("recipeType", customTypeSerializer: typeof(FlagSerializer))] + public int RecipeType = (int)MicrowaveRecipeType.Microwave; + public string Name => Loc.GetString(_name); // TODO Turn this into a ReagentQuantity[] @@ -64,4 +71,17 @@ public FixedPoint2 IngredientCount() return n; } } + + // Frontier: microwave recipe types, to limit certain recipes to certain machines + [Flags, FlagsFor(typeof(MicrowaveRecipeTypeFlags))] + [Serializable, NetSerializable] + public enum MicrowaveRecipeType : int + { + Microwave = 1, + Oven = 2, + Assembler = 4, + MedicalAssembler = 8, + } + + public sealed class MicrowaveRecipeTypeFlags { } } diff --git a/Content.Shared/Placeable/ItemPlacerComponent.cs b/Content.Shared/Placeable/ItemPlacerComponent.cs index 84df2e395a8..1897e033d5a 100644 --- a/Content.Shared/Placeable/ItemPlacerComponent.cs +++ b/Content.Shared/Placeable/ItemPlacerComponent.cs @@ -29,4 +29,10 @@ public sealed partial class ItemPlacerComponent : Component /// [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] public uint MaxEntities = 1; + + /// + /// Frontier: track old placeable status + /// + [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] + public bool? LastPlaceable; } diff --git a/Content.Shared/Placeable/ItemPlacerSystem.cs b/Content.Shared/Placeable/ItemPlacerSystem.cs index d1ea88b82a0..51d72eb88e4 100644 --- a/Content.Shared/Placeable/ItemPlacerSystem.cs +++ b/Content.Shared/Placeable/ItemPlacerSystem.cs @@ -42,6 +42,8 @@ private void OnStartCollide(EntityUid uid, ItemPlacerComponent comp, ref StartCo if (comp.MaxEntities > 0 && count >= (comp.MaxEntities - 1)) { // Don't let any more items be placed if it's reached its limit. + if (TryComp(uid, out var placeable)) // Frontier: cache last placeable status + comp.LastPlaceable = placeable.IsPlaceable; // Frontier _placeableSurface.SetPlaceable(uid, false); } } @@ -56,7 +58,14 @@ private void OnEndCollide(EntityUid uid, ItemPlacerComponent comp, ref EndCollid var ev = new ItemRemovedEvent(args.OtherEntity); RaiseLocalEvent(uid, ref ev); - _placeableSurface.SetPlaceable(uid, true); + // Frontier: reset placeable status to last known value + if (comp.LastPlaceable != null) + { + _placeableSurface.SetPlaceable(uid, comp.LastPlaceable.Value); + comp.LastPlaceable = null; + } + // End Frontier + //_placeableSurface.SetPlaceable(uid, true); // Frontier } } diff --git a/Content.Shared/_NF/Kitchen/Components/SharedMicrowave.Assembler.cs b/Content.Shared/_NF/Kitchen/Components/SharedMicrowave.Assembler.cs new file mode 100644 index 00000000000..7af57164ee9 --- /dev/null +++ b/Content.Shared/_NF/Kitchen/Components/SharedMicrowave.Assembler.cs @@ -0,0 +1,9 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared._NF.Kitchen.Components; + +[Serializable, NetSerializable] +public sealed class AssemblerStartCookMessage : BoundUserInterfaceMessage +{ +} + diff --git a/Resources/Audio/_NF/Effects/attributions.yml b/Resources/Audio/_NF/Effects/attributions.yml index 63a18dad616..e9dabb2bcd0 100644 --- a/Resources/Audio/_NF/Effects/attributions.yml +++ b/Resources/Audio/_NF/Effects/attributions.yml @@ -1,4 +1,4 @@ - files: ["splat.ogg"] license: "CC0-1.0" copyright: "Modified by 'dvir001' from 'pixabay' . The original audio was converted from WAV to OGG format" - source: "https://pixabay.com/sound-effects/cartoon-splat-6086/" \ No newline at end of file + source: "https://pixabay.com/sound-effects/cartoon-splat-6086/" diff --git a/Resources/Audio/_NF/Machines/assembler.ogg b/Resources/Audio/_NF/Machines/assembler.ogg new file mode 100644 index 0000000000000000000000000000000000000000..05e100888662274145d1bffc4891815f77e53cb0 GIT binary patch literal 30988 zcmc$_bzD_X@Bq4(ZjhF|AkwKIA#p(vq(zVp2?6PDxQG~ZcXvn#(o!OzA}tLU1?iHO ze&_1<_j~cj`@H|&`5X>=?(WR)%+Ait&g{{!wtfUKz<-ys(7!^KU@$3+3FhhKYHsU> z{t2VQ_+L$jF6?ii6sCcO{ND==`M2gt6)}nY)&J$n!~BOv7;39$>ukfX;c5-Hw>5wK z7diX^{FdM?K|xVLVK}Fjm8FM;t)n$u!O_#!)ydJp%F&$*-31K$9}YITdyioN0RXKW z88>!?MU=#6Dwc@rc{y@lxq2DphFJ31?!A`i5$UD1P;9acllu}p6r%&s00j)XnywG{ zRx;f3X?4H3tiqwv65RTm3;s>06eYeA=NcvSua?A>3*9c5QZdY>m=-D(FhHdebjd-e zAH@L7R6^H>KCzms9fs=%cu7&`727nCVLa7)_sq&7YZ8KLn)&~ND*>SSkh0sE68A5hB>;G4oMHK5QNQ%! z3iY#aU%Y&a0gwP-LG6eX-%+aVvJLJ@4(|Uy?|Bi7y3l>Jnes@}souxaue$slHpHwy3BZ&v2`f<+6wn>Y@EVA2f04RE_!$0?1y!Qg0)v7Uo1!b5VjSC-INk^Gl6|%4TkX5N8kNqNj>E)} zgXxjO{Fv4Jk=4wYm2r~QT%CjQxUuns$N&BQOF9w@AftXkT!(I@r~)N|zmpRK17rZ1 zFBZ0_1kFd(P5n4_+aznBq+*}6k~d6$n?Mr-aSghVd4H#kO+Tr~Hmevt*=1#6MWtnB z&(ex)|KD$nT$XYG@Bv`#bzx9+Vd!;1Q}vg_a7+LP;NC+91y|nQIAIlt#!>mf1EYs` zJRa#f{LdsnP0&}bn#t<*&dE1!cB>~P zJ}LYQt=!iK-)=toOpDD|9KmvrD1TC}H%3UwT$#%fkHzL)_hX4(__%?cYH0#3G8cVbbPf zC~nSB3>6GP34j@qxvJ39gg9;G2a#G@S`TitVy|jDMfCqq0h_1~JIZk2An;-@kAjt9(v?7G=7ixz=+B9B^yF0~g;Gyz$NQdHa z6^23D^hJVJ4_dD(b6E_CRovPxW`FLQCseg>8foUSYv^gHc)wGA-NEx+1NW z0_ZiOzivQQskDwZJ-#R*PRmZ{K9?HT&BAf>2(9Tf=(UHg@IbsU$^5N|GFM>)#A~|* zE#>Qm;qS&V02v(v=peDzWBgfQ!&^NRlL!z@khYG17~MnrLKAwpk;s)$T0}tnv_xC6 z5He`_x(&$UUAOoqz5;&%wM%g$lk3TVULmbIAhgT?DeV9SD2u+l4M>kG=TwBnHWG0xqZfyn`>{Kg&Y6!!SNp- z{xj7XZhwUfO%>WG-As%?3*0{&rKOztm)yUv1ql-WDso?FDL>%y_zR&4aUL4%`djv%b)zkeM; z&%Y(;aTERHe-(c_O3>o|@AYqMZ8QYb?(g$|@cje+4(m4-~RtY`48j2UjD=T|6>zi=Kd1X?BK;U z_qc~v*Y2b_|AhThI@FM}*#&tK;v6iADbL;}KyF=cPCnTq2a)^AXt^NM3M=i&2tlt3 z34)4G+J=#x=%taHkYFBBxAMba1rANR3S`PGoGRSNlpjEA)UF>|CXiE82QAOmak>{| zjPBZy=#FRjk;*kbR)z$d&aF}km&J%DGj#G|sH}89Q{GU5TQooD}`PW1a zkKS#k6PJYue2#Pm2qVF`7>T~>k=OJZ9c00jXczP~WN9GT) zs7D-40NI}xQIiowO$lMC8F;=0FAd&e-F^R@{sZ7et7`-f=n%xq4I%flj4}TvyFn%Q zT8NX+n&5f?L&BucOEPm!gPs&QB_Z2Pw+NO3xCfa;F{P_E^=#W1O^_%Gys^_Zc)%u%7uie0&nE&7y>{}L0L#>OeTl5#`<|7 zn2^I!(xnTZaT-#>(1id$Aa^Ghu;!(vmRC1+d>)$ovHJTDz`u6=+TR9n@CN`TCFED{DQZH?}$lAN+aat??c)c2B~N?5*QvHa9UbpkPI7;a~e~r8d)IR6w zog84nqt%3C(*e*J6s@;e@*}12aO~~N=Vyw=pOe7cC7qzRP`Sxg=$ETFr5ff|2LQ|^ z6W0-(K*Ea)lS+d{nBAam`?;rTw&k7d$y-KG)}{np{HFk zO`LX}nOd5|QMJx-&oWZqoUv<+i|`2=_3UvAJkEe2wZ95!p-05K8bH$iO+4dRBNHX# zI9ey;9Lb(hs4XgROa2CS2?hqLqUc8X4PeZ3@fd4b^(Q@B9{jQpc_(+*YQtIt5JYH1 zwNfhVe<23aUY&mVjtAeUzP1%7BKM|zB{FXx|xtP?m;8E_q$QGdT0}qbzk&RwQYAq~9rdVHk!q|0YC(b{6mdu)8=`xKl$u;(D$uej&2YJZR-H{Y0D;J*d4) z4}7GSyp5m6rM|dFXYWeNq+L=+V?6TCZZ+!RgEBZUdn^YVJ0zY)`>oPmx%7{nR6`rS zcY4s=GCX|Dv2s)7BXJ7*#jT#XG{XawO$EbDF zSVD&@)3D;L%UqegY#pi_fXu#%_G>^cMA@AAK1UskO(>` z-N?Gp-ACvwx~nJN8*7{wwBM4b(7k1Bf18o?OqJ@PL|}s-=EZOzZluTuVSj3>pM~VI zB|UQ!$UG7j#CztGj6_8Tej0#RQaw$Sa+f;r6+MIxqFz>ZoPPI-xvv*X}1c^A1cGDVc>fp#0X5RKrfc4?)1l^6r)Yyd{zOYr@^t^ zxPl5YTSAd2FyxrbU#tfR!xAh8(0pTpZ_oSqU)BAYvY$~MJ&yckDRD;!$1N zb!2ox7GtS&myz+-M|Fnjz>J`ABX(-))A!dM=?EDw0A?A#V@P|w!yjX2Vm7<&wdQ3h zL3P+My#OY~PnSljTu3r+91aH22*~sb!w}cp$P01MBQUF8Dw|HK(>F~jp1F+f>lEs< zzNC(>zyPDyPWB;V2#R4r%rmqw_qc6+iyG?WWnSbv4qZd?lKgGExk^?HK`A5*#k2_M(dGKR8brpRL+t6Sue5pcy=lF}>23|w|kmt^kl zgX%S$yMKUXje5Wx*z>li+T!y)S0zxC*po*IC-Sr9L<28;-}FUjABVay#q7Dfa*xHoHBP(3!4Ge>gN@^1~&JHUhq zftig3YIi^`PS}*Z5uboo5fM+p@59k;JL2OeAueLhtubALWMn^g|k!{%n^=bfB4?WDC=<>``*Z zmZ1s<78Jfiq!$?AE3qW*@6KLU8B97^-}v*AWv|2Bvx*mC z0mNyDi1uR?ugi9FlBda2Da#sqAf`ZKPEHHCMnH*LWyxAs?ckzajVTkdCE5O!7}je5 z{zS9&_?FU^K|KE=p&6VT`_22dPcz@*Ux$$zVq(>f_o)g6KKR~hyK{D_w>mdsqUMNLd1jbQQ{i4X?rK^KXF#_sR(=5Tzb6bh3+7FU6!r4 zBmg{>7_N*7r-Ec=()Da&H@$FWw`qaVV|c;dLwaQ3314d<6+nJ_cWeszSwC`Y3JXrC z7b^xP#onl_JrpJ@z(Np^CI5O@uNY``cv?Na0YwiG3?KH&TBJ)%Hbc%xz7YaMoT&Ak zX~V)iS`)9-qF;?`Q&Mx5%{%-Q-OK5f52)6zFM_RZ=P#W;Thg9;o=Gn4?x*$uslPP@ z)9S^ALk0)=B*AowwD6&o1P7sz|5EJ5GSSt$piL84*4JAQ|IPNr{a?&&5CKsA96K`H zzooSQD*FRw2MZmsZJS(l{VJvt=SUpb%j?=2_V|4?*8S87ao;W5woCLmv*^GVoS38X zmGPO4xdF_;SE)ElOML1xJDZYTQ|h1H%RNHoe_`$EtljlovFwpPquyVk0SF;sMJhPX z8;E5c&kan^A3bB7o;e%ceRWIp%Ynw-G3k~l5ji$oJWF-ueocLL${Agr{3key8b1i0 z)RG-D$&a~2$u!+2C;#y?Xpod7u6e5ASZzcb5DWIgkN`0ft)OB59_>{L%&6a+ksgN} zlT>og0QXj@%)R6juCIAJdyF$DY-(#S3h&M-yC>!k z&!7)iYy>};4Jd)*q+Y*-`$H-3giv#|4no|HA|ajcbTF}Admv3JtIkcjB{v|?*_*z+ z=$2c`3_dv!=l3GQ_nBIFmZM3PK#p*6C|SsN3>-ivi|zDL+|4M4t**mKD>J$wTq9^a zPr0zH(aD<&MImBvXST6}s7)-zquUsmWd7Ls;e%On zfLNZEkhJ+zLdi(dz zkG$jwd`nV1TVKOY*W5QbK&AQg({sF*A7yufq!KrdZKu1o>hZzQs{L1H$*aMbirSyr zdB>3Ia?ZPR`>9-NyZ{w4bt|_2arwK$U(@&>#LOz6k`f;UDPlppFhG=?j4?F0p{F=n z=g*^-)FMg@5oFZX_&pNfl`2TCvH#1xCkUJOM(?4$03kBgG1;-$2INrok(tM& zApjEl$R|MBO{@1ugE`|H?;VU0Gk>k%kiq@vn0pdUb)t;Hi<+~uNA)#=b-8b!r-dAK zxrqj_MiQN0Rki+bo%+OQ6WH3BM}V>Jm+dsbQkNooB7WV>hUaupeIn!MRmYL|0?)EM{y3&QO7+ z`7_Xo)CQ2U_?YG-Qs~ErOS&~xIA`@GmnJVDF-s=><700;Tg`0lQ&aw#;-Z3EFyR~) zr%N*)<9Qy>Ssd6X_6G4dY7UdPp`MZ#{%nL0)ELzjMSrhgdow(WwBXswgJFX=*!)Lg zWQ*cTu(o3TYkMBy!W!1imv<;w1R93=vUxuSKyP#Waw3xbBqWVW8J*kju(RR&su0CxD+pSFH!bn|a@hmF4I9$T6{Z z3o6x2k=w(=b4}z?k(`$vL>ox+db*y;l&Qvezq#J#;A6wUZD`+M27o31gd6*VyfP_C zjTjgc-n8S_rHZnj0!+yP={j9i(Ua-cd(B2Lj=5+hb>x_Y>*a1eKx#`M1Y_}_(FvBx zZl8VM%DPjgy||XWe-RXvHi7dvQVYul6PT&E&G2^_%V0`!t3EE&WGwXd#Pog6lxdFj zS?un&{HJL;x<$EYXa95Ft+ojYgU?lg41P|(iT6(kk*<*KNuTXEHk~E~lqPrvTkkjc zR;g9{CN^aHg?|b(h^Nh~oiCCO3DcO48hx4oK-DFd6hVo}idIZ_C#F2sB5k5jAy>o| zA3C?s@diEW7Ap&f3mjovNCNq_%`*h)!$~j^zwx6@ed55Asq#^=Fve^`KGAcW%y8~o zg(Er^Xcd6`l3FF>4hL9&Xz&5jv9AW?yDi-ZkivW9Db>$gy)M?reY482poybgr1R#n z^$g!J?MQ9!%?8N-v}I&-0zyiQco@KJlRrG`vX$|i{%GESdu!&9T(&fyeLJ*RhzzzJ z)s}$GC{SGUSDydyrp%cR-MLKtO0jj2k%^^ z`o-eMWRRnu1T5m3&TCm5X;+5*6#;^q=E*}MEea@_B$st%iW1rL*rAYFJ?DP>Oyb)! z@o4vH)@l~-Jh#(9@=O6;KXM&p&+Ayb9VZrx+Mwnw1Z?{Ac<+72Mk(4zQ6^yr6MBGj z5r+w9W&go(s#4dAUQJ^66MJys{SFrzKEnF3(6lxQ`wbsTpm|xmR{VA1fyZ(2msh&X zPuKtK;*F)MPQa47@ROw?rRPV?RnB(YFU4RW>^+Xl12|48lpR3szL8zZ@xQcd`IFft z-Z|{%zQNp);<|f2c^dZ_1e06I+eu6Z~Vbj!3Hd5>^OTVu- z|J)pfa9$28tCRZCyW*VHIfso$cUT60oZhZlpeDh%{-+{B^UJ-`XLLa?Fx08&q*>of zr7JB5U(Vv2zkq?teH#{92(e~g!@E_5GqjJM%6{(pD8RdHDcp0;DlKN?@jc9-YMk?c ziSqAG-@omgjl+Nk?q>hb~jei zKEf#0MC3CcCg}KRuw{dp5ap zw}KcHjl{~po=k?i&0w{cU-;-@0tEiT^yVA3_L+yDo3)E@;DqA>9hKoWut2%IrRjLl z$oo}wd#gII5=@YjjlCK&TFf^5`dk)=cKN4OGhmC?l(_v0ntel?xtNV)A(;y zhdn+o)!UvjU-{Mn1P|X4uCtOcAct0&S*nXmOnXLFeMSF3v0FQ{W1PXG+S)M{F*qj3 zoO6~U&71*443t_>^pVIS?b`Qq#Xl*qLa|vLHsH>Xn*10h5Y?NZZcXwkUhw`8TrjlN zH-Gff_U=(;(}Gz2{_QI4&2qt5dBqTI$S_#s1K-1s!u$VrIT%X$+RJf1ynGNGMV zs$DZIq6b!C49Tl~{}E0%%M zi`1B(HUtjRBOKpivV9JV9w4M@1pN;VIByQu5Bf1#ja@z+Gy&+isDAe;PXE;xs(#eo ze(xsHtE)RBX!k28Kul3|`vM&>co#JoPLjUpGSKn~QHi;`>*|k_hNzum1m(>1tr)5| zZ=j8@JOm>zxb~HeeP?5SqSg_2xSo26qh`X%NX9!qpeojHJ*w(y#udm+|8Qv`-|8fnySX5S==&-RB84T(*Xpn~Jp5|?S z7UPL);#Eq=pI(w47M0pU8Qe@H+isl5$S|~IzSHQBI?kD@Z6cjbY^9sv70_bar-Nf6_;@v;G+ic{_1 z?^JwY{Gk5|Wqf+0DNDQ6;fZMQ#_ERRP^2MU?Aga_z%0VnhzJjoeOg}sJ=?jZ)XaPS z$xkAa8wO9l*IrddLH>^><5wMAwdYsGR9M^tW^JZMJd~a#LHGeusG?)Ui?@)s2arXc z#J2h^9oVW(Rrt1XxZwGkf42|E{G23D^Z z+nzjVPlKYX_#v2XH?o#ayP$k9_2dD zs|;^#-Ey!>Tud;eeW1JwtMg{BoZw2mq77#OsZn=Tw48mZNQo*E^El z2fG&LVz8zDiIXSqHaBcfFI?BYQvl8{E_(E2P~UJbj`!uIL za}{Ix1=WW3@KM>W1YV~he}v_NtAhlh63cPai)X0?G|wvwJ*a z;G4|P6E_Wiyq9~ zJM$lZN-N&@WxViw5vN#9`?}__(2~%PTR{voAVyh%8i>Lnc3??usgv)_L>`_D+&ekr zFt6cN_vEO!>r&!Gc^L8x8<<(0wX!8cQ!@}D+sks-1KI9NgY_&pfoJyPCoRNJx8^kr zWZMTOOz>f_>D(j!pjrL+JUbP#XMtY9H}0yRI%ntGE%1B8A5r*?3|~v{5WBw1aE2nl zOP&RwFa>YpJ2rY0KZx$8c<&^uUnti2q<`ssTlG>#XE0fjzDUCrIK(UsvO?y&+6* ze=$hpY_ZZv@Yhl2gx~R{zj5`o!2kK7k*bWvQ1B3?Q0Oq)UUj^jzbCG7)%$cr9pxFT z!<%)aJoCPolz5T2_X-nBJ`%sw$!VdoNS5^NS#O=)Z1^I3+Ff!pN2)8&Th|#7K$7G| zYRfgEKbO-+&{Beo_>)Lx6}+y|*p!w@1)tWn>VP-njlq>)sV}gogbk3|1)b+FrBIC%4MX61HMetIf{~YtQ(^9D}_QLVg0!`miay9+dFYQaorbF&m?86r7JNlcaD72 z_{A}R77xjLWCtXKya6{yr7G4QwPl#4Hz-o2-FGqV(z^*cec<=zWlc#-vDAf)?W}h4 z+Xqy#CP$Tvz-yK;Ki6^mTL6@J&A zbG+uE;o$Uo=edBu%Cp-NB_6dCJ8cfg(1eJtai|Zlu$Av&+%{d{qpy3fCCN*|{pVu* z;jQRv8UgNvSNDQhHEiz9X>jnpzWQSssqXc(9@w}r<~j-O3);1WV?Z&Xw{wlHa-U*W zlG)JF{wMfvuzA^EdeCUsG%Ki6Kc??PIo$Qx@VlU|bp2-H8%;b(Sn!@2^5!5x@`||8 zy}vuqvQG3nz^0oS&!5Q&+}sgT4=gmxHe`Aa2fMk2$?2b zM(n*rhr3>Ntd3H%JE<{*al5>eG7E7 z8=U;s4?}C18!fYPPM5+$6)i(?MyU7F4(9$t_Ekr-9Q+mshTw)+vPbPsE0odGqM$%4 z-uhRoD}@fOY57CT*oj}uSzE70SqXV#3W1S9%ZbE(+Z4(3VZ-+*yfBNGEmf$w!@KIu zYvlzy4eU8)NZ5}{4ubR%!dG9qIJk)c5~6+hwuktMwq)P5^ESElo@=eNy#YP*QJnhx z-I>wVjWae1c<+N&4P-*ZJwZ>C86nYc!~ImKN&b%Uo}fT)5PtHx1ytbPQRan;e8Y zR8KAzHG*Q(;|Ief+dKv@>>kUI-rjD)HKPZo{HBE=B`M*`Fn|N~i^Jky6ViD-$(I(V#depZ1!@A+rm%4_0)&JD% zvzk$}3^2p&iZpn1J96RB<6d$S>#qT|OE(03fj@-!_*aCO!1W%lJq6utIPh^pJg_#^Q2Hr+3&36&!{ zi>Ci|uz77T<09)E8^pz0{L5L~Jm}Hh_92jIUueX&*_0O8$o%kuLkl|uq1USh;P$gO zC+ zf|rV2mIwW}h6bdso(5gq2FRt99!9tbz=9$RB>O9|CO`DaPuzA#{{+eGk<|2RC;v`g zvc*GhNVR1nH)qluOO?qXgviKMrzEQLK}B=tZD7~aoc%v$n}fAypS3AT%G zw8Yx$_K;vX9?>&E8w}E4zRw$|HW&DZV^0dka3>|f=IG?zqIn@A-@)OttbrgBfD~e9 zy@msIg&^T>m2BE2%g%qNCe>;p64+GJck}#%q!bQ5#FGBp?J!|}#ia6|@h*Br zOWBv@V=9HV>RI~`8^|V-BduO7Wa{|P)2Bo^%%v3G?1m4_wtuGne2YeSqQBdqmjn<1 z+6^fQci~sCw?R9&kj)eX9pXdo{}Z{Wfbc*UI&uN6N+3q=kxw5T{W>`-E334zzUggA zO-@{ROjJTnd{R<$*emJeDT9(eV$|d6)D~5G5BuN-k2`|06@exLfj-y$@)!pL*J$a1 z-WQhy3o>YT9P`evHF?IS#$~bPgDnTS?N{NC>FLu;N#fcT0QNC>xu!*4+L4}(EMRV~ zZ1v!3eZyYPB8PavNG#rn=E$p(f#eM*2+@a*cYu^AhNF$MYMbG=q@n|5kh_DpEE2}e zdNpOB>69q?sjRZ)t>@YL^k>IgGvA~ZKR#_TJE%5Li?e)uC7Jy9A}5I5&B zk$>EYK_Zsw7u@#1zWn~%nY;Xo>ssFfHgZ}!q=Mh7xaKdPuP=)37bIMR_n>e|+2_W6 z{fghEsK_{yfkwm9fLg7~hE&gU?@w!6sbaw&R2)7_s%DtQ<4&3k_x>o%xSxMGnLpE> zc~x>9m=%uTN$)AMk`cWYgElWetSa;SFa8{Un6H?xe-}Mbn-?zjO_?Pb6Y->X z8^P+qBOL|iBYDncCwS?3VWsJDT0-aq2}0r8v7yLK+^ZK#Oj}N!Qw2YNEXUO{I4)|! zkcM_&l44@pc+mzq73XK;n2$bHYGq?zS&l%%J@xX4V|n~ZDZhJ1PmES%YHP35MFFRk zNM#v<0H7mESsje@hfZ&!8HfhcPA(Tjf;`|JP9|EgNqE=SI=MOFaZBqxmRE~1kOlV^ znjP>oe0Yo0jy#Vr>ggJ@2?g<&B!mLW+j0B38GA~}QGTEON-|$*?Sx7zCcwOfyn-S2 zFYYLlm$Z?>K$}-7v3OuqABJD+D}A-egVn<$RfnlQ{NswqBAp20RqM-ny4vJok((Z`m*A-Gm|fmp_!ry9ULp0s_4tFyk#mS53lMcVWm>bD(D45h=?J zAhq#6u0`ZeZL-&6)0ZZZ5~as=HuYnx7oT;LUXr|(*M0s=Ui;bt&5mTG=rLXhz~$7w z!%c|0qu+5j{r(Wia9E32a+S76?IXC(VyMd_c0b*pUWQ2EM?fc!pw<^Gj?h*ft9`` z9gzDM&HO_(xcE(WO-9WeD|Kyc;lS&_KknmmYf9HShOG?u7d`1$Jgs@OHy^-XCnhsj zsopa3#rq(Eb#T`87lt()2RDHMg9wCwe5<&A@PRfbGdto}(sTeJe??`wg-JOubRaHw>LB(`I z`|ZnyL*V&{EG^i_eaa7=!zDn_L9Qth7eVzd>u9sReR*LloWHbfBfi1qNUNdtm|;Kr z9;F1tkdoiEfuvEt{ih3MX0WZYUfH8<7IbMywE+9!+8~jw(9o7c|4iL1?R2lUSy>tv0!vtR4;IQR6%=6;=!uio zVx)*NMymIHLVjK0qbfN|@pHb6y^kyC!6~+`A%$~$B9<81;$Fuk0&t(nqHoJrNf}udsMkMSrd4tEA zj*9}Sbq~e3kuK`)kh~v>r+L^HYo`m=3CA1jKgsx=XYfrTD=y|Gd}D2-YOlS74g<%G zRlqE}YM160&PqTIKv|ax>Cih@>v<$meTrf!!H{Gn1ujM9Uka^bGR0OlG>*%w?8C9y zDGHm``*i?C$LC9T-gNm-aJ3M+4q(=Kd!&7@spRC?$KEq~^cMSAdPwogE}zhnN`IdQAsYSSyqJdeDbE7#z&)B1c=ybL1uMaVJk9$_7!u#6w(VqN$i-m@Q>tEPw>fPQ=^&f7aJ;;oL^AYFSrHSdL}`W)MkgrXEI*%k zd@w#YcARAp_4qXUOYB2CuVDFMIm2W%cE#Yjo5ns%Q?e9h#x{;eipQ6$Z*+qsX5*70~4!-EvUv$-%G9ig=r9qqvA5cycWDWdWF0v^?%ifu)mKa0=obrkR^!TS-MyPkA?#&cM>;f3 zyYO~rz^_u&d`DfC-w{e>b(bQ`Utw|qHg*Wfq{WNCBuy=ieBX0p{-h_zmixM8VcZyD znlv;rs+9vl82jVTq|QZVAs-$fR;`Vr>jx4)i@%waF-?m^wG7BGxaR&E`iUw^E1$0y zx?GBD7t#ZG==qj00q_r=^-BA%&vdz~Fwi!^ar1PDS72g5jU@1~;?~lyCkjawp{iiF z^W%1QAS#un4muZrP!4y-iYWsz=yV0LyJLF!%YMt+jEL^BOiab)38_W{hmIxyaf3ZI zjn~&pgn!*9;e|$~)-FPU@9pKXFMa-wDr0=wl7P?iVC2Bl`;`z)k@Ha@ZeYsR_{R=t z<19r3oay&)kW4TWuT$7^aH9XYbR~sg#j{1f=>H|% zFRnYSa~l9kqj~0y-P(%}*-kX6PQd$MI3UxMC6FB8%u3B&NCy1KR9#JV=R z9DBxogV-58q@^;ZKq(70QXb8k=UO}P{o}p$gWpqY$Au<7X8{Dd(H(PJOXVE-vY^A4 z-S{a=dwPrA%HX}n;SC4?bPzaenTk0Hh}{)Ij_`Za<3G>1BqwIEdcWnf^u(@5ngD4J z_+?JH9Tipp6rRw}Oq_^kE^fDPC0Q0M4>^}ua`#OSVv8pAMv=4|D`67*f97IG_>UM(ArG*oA| zW;ei<=u~(q>b84-mL)jHu4o8cDWZl{IDWEj@M>tYi`=K%{G|v=ud!F+d@~ zRQJ6N%icAWzS3{Tyo*)$i2GE$BN;ljSAP9*Y@3+BPVN-2r+&OAhoh+<#sBJ{=n8_Q8u<h2YBLW@$KWi5P1N150bgT#8cKXaCPN3whoEsb?e1@BTJMWNC zy58}LN3X{dXux+cJJhX7O-v__2Hl-VFT~FKj0^!1mZM+(!4;dyYd5TQ7K1r^kD#Q5 z@@0Eg!euB2k5~@hoJY_dA6Fvx(=y|u#S&N#-r(;+JI`MPJ5y877bi;&P;rW1($0K!E9z1- z5kbBvc$lnGC8M?z1CZ?|4N#8dwMAWt!g~Xa*gk#O*GtZZk2<+ELVegjx^51-EvYYN zA#U$uZpYb4pTx_WE>32j0wiB0H=zQzwAar!lIjmLc^PEqLg_ChVfi2f3xmw^-ln>&e z;9&ds)OHyA0(LaXwxf#M_f|YfUNBTK^t+@JWB&=ZB5fA-C{csER-l5%Zr#!oTDrd&9efy-C0^}69 z;|ZbjQpnvC58f~CH+_mpuh(=K&4_F}T}V3KkfSOnQsNlbk%~x_Q?!sECM?L-!?c@x z-BTqnwqJ5^@5UHYK;e~QyWcc)lCr<1a>55ickbfOvjxShpiE+zDhy&w=25dkQgWX1 z+)bxneQz4iqe!H{_Q{zGDtq4acyjW3%gt7mV;#_)f+x=fAl|?cH9xl6N82ZqN&@tK z@h;1mkB@mUfnJ~kw8lUQWk3N~&hx{6Avi{$FN*2&z_EmT^Yir9a;PIo-NAL{jcnnANzmMaQ8xR8MLI)(!2{nvCop|P;KsWCoZ%+qrM;9+IC+`=p zLY}{VlO3I!n3|rJoK_y_6>I0ydM$mvzu9?v;dpbYpzP0x*3*v@G&h&6+^Lh_NA{hM zVt|x50z0&k2T8xGbc2TPZSAOe9>@ON-wAm8VxmIb5dnR5Oq9~LN&F3QQAcCr{ru^7 zkN0bX*;nJ;jE_EFP27%lc?iYTj|ZD;n73E5*!vTEvybgWpl$6tyRD`BVqK$JJmbbW zmKWOM`ZkI9$AKnid(*Fn=W1H|D=H^sadT*08qLuCw>V~9k<8UQ*lb+T7Twr4J-4O3 zdST}?g!W{9%+Qz-^rt*~x+6Dhv`1+BCo`<%TYu2e)9uJPpS&CehyX+jW}WmxyV6@8%uRiSA8;#3)To@76rXEMWFODxTKd5PCPp0b=y;H1G zV-SnXUCA)vS;t8mUqAF2Suy(wPr(->7TA!{aw+sYS$*=_X1qC^YstNgm-;cT&DYq$ zfYWCCAyz}BWV_RTX0tb};0G3(T===N@^sY~5u%{)ifhFQ$yt$+4dGj12tB=)WRuM| zLcq1aXO|;;D@M7V%saTugh#hu!RaWF;whce=xUDGRTblp!FRao)E@Ova={tW|JS(E zos^^dulH+vT?=;=4^7K@LxTEoAfz5W6NUNb={z=o7g7eJBb4BQqd}iXnUi{Aej=;n z_vL-t>@la=i`O?I0xW59)Y?V)HrWYgvC~oM49}Gxh8&Ua%4;5QXKl^U<7U}I3)9T) zE}cV}L&2-31n7R%Od2}$Zdyoq1=mSBCf3~jxPWx;+qj9^B{2$Cix4_%@&NGbgm^d6 zJ>$_V_&a`Q-~asuccC%yzFI;kF*!y=aF3+R?@C_rs`T(MVcNn@o{SOJum?Byg12W% zFAv9@hsU7sCk%*vFq4;Z=7SQO5VPOxHQUaxDB68D{%zilQmrsc4Hb1}4DfHaEe@lr zT?qt8%Yxu8be})An3jLZM?c-aJAZFvDWTloF%xpeyb-~8QrpiQWhx%UW9q)INpe|qKx0%? z%M2ZhA5wKeAFzN9b9Cmux@XOEd}!R8lCf2`yI?rBk2+9z(Qwo9YkD5Og-vv}y!;u? zR@3~)^ZQKVWCGI#>0*fe*UF?h8CDJUOYPl(^xxph=ajYWnH#0uYy5q-vidW*g5Bh|zoC~Ehz znb7dh(y)s_uNk({S>5-o3q2%Pj22;xGWRz@s5>NV$qw~>GeL}`n=#*a+J0Mgy{mWb z2I*Uy278DC021O9Tg68Wcu@@ zHa%I-bn4LA#-De6ru=JS44)M?5t=$@lrX8*l1zQJPnPtxYohm-IaIxR0N_-M2sU(| zPX{$P?rv?YU7QA;MJIY`_+IRkfAx1k%|dZ31lc)ua-Ybs9o73m3Gc#zD{DmNGaA8T zJ~fh}LP$3R&{__4Rd1Cmrl3>Gxtab=Yl0uXCUwp#cx}4g%Qms z-@HhnkGE_W&?4Kh=k@2EK+}T(vn&0^CGT_3E2p5daEp}%Yb-$d1AeaF*vGzGU-2B_ zGH~s~+qr{z>Q4jI2TufkOjQlp6PO`y;LWzpPsAxjP4_&(fcg#AQWuq}FAnG1=Ku72 zZF#@{<3jaNw^jSeX+xia7j@r)$bq!=2SBS-L^Uo1sdnHt#CE)Ne&yr>+b^}Am|PwB zKt!W66_+&!0`ZFtlUCb0^@Sdn1r+^co4f;0&{CAg(>c1#x^fl5KtK_+pGPj=&ra1W z#D6&-xuKOCI+Y!)1-UG3_ulBtDR5W@lFi?_=|B>5?XK~Gkgq67uX&SSe;_+9Q0is{ zziH8_9m3jq+NI-JwOcD*d`(mTM@`oqPxbfz&ox74LUxfTtBmZKl)YzG*?Wu2bty?^ zWY5fyoxN_EWs}XN$ljaF^?Un#AHVlM{&4R(uXEn#yvFnOe7)`zIyn|@U+V-0^|uQX zX1bx^Mbfmn*=pm_SOBp|nw+BsS%?71jBK-t4uS9CW)2Z3MZ7o`syFFx%gMq*o;d(7 zUQXaZ^@F&L89HXB&e;Wfync)0sYSH~sUp^7PZgv5$hGhv>`d3{lSxrfF+Ffgx@dEskW_}!f$vXZ0dKJpXGk1jIcq1n~l` zJsFEpLcB_6>omoX3_I5c7CAv&36WL6P8;|rj^K>&z1=7DS^Xl5CWFy$7$rY&wB(tb zl~>_a9+7uUZz>Rj;NQOW0v;#Gy9F{V7W_OJHWg|uY1!$Xxm)}rA78NCaY?m~^a4L5 zJYJv|TAZ{jg)x%wF(RPRZr7{WDhP71;3`BahhYYJ6Td`@tDM-Gu49_H79yPZk@K7b zjqn(zH@PDtNBLJ;qF*P+azy2Nt;(XcPe6QPH8Cvf;BX$t@4~&!rr|}zmN>v=r2&;o z1aY`hK3t3!l}~ECX!g95y*K=V34|+g`i2vK3MjHTz_d{dTGB9}v_^(xL;fa*i0J_I zDh6)*Rpt)O8DjKJ73>R5Y=8L0M)r;r92t2GI+HAZ(s|5`4F+61436o&p`maZ+j+xd>8hqAc7&b@qN8J}U}3T691%GqWTG z*Wg-)&+6SpzhS?|d-`58R#dKOpP1)=`2v!sY1pz$KS_f}?V@Z;%xM9Q0Qqv5i0KVv zNI_6vq5D~xaQ|)f7Hr0Dkx_OV#pFh2;xk3QjP%O7=%w&`v!yBip)d#)1lRt>-HrF8UQfTGPJG?9G!G`G8mzLFgQp(c%AK0i6>;dlG&47x;%p;+bwDc-Df=| zoGL%x6gk?tWnrMsnlytskGlq9@@Xu1|Emj<2}(Xw+y1F`mKL@+d61Ji-D)%K6kgs{ zdpY{6_4WvHHt0Pwu(WcwX`XG2x5giQhP|s_7Sm{jFYY)b)ps8NE`M}-Gs<^|;D5!de;||lCD=cRWJzB68o9j^%wc%G#9qegxnp`Y&esTR7j_VlL z#h?~N3VZa2ZgU@rF4bNl2?;WhXQv!WI%l4YOd^*r+b7Hy5P(c(-&^3AQQGe}2j-6# zlQ-pKXTC`2{%2JU8+10RPqP3hffmvzkx3N?%`&0z>}F# z(Y4XQ*GYh^(~`Bv{QVT{4rhhNb&+eV^zt0N|;zfzMo8ti(HxZRC2oXC|2?`qg;C@R~LZ9VuJ$%dI zC;G*f1Ax`FzMU2B2!ingthM3Y--mh_km_Z#Y9Y**u3%Ncq0@J7lWbC&tywQoO&jX9 zRBOxqh*bpzKm^I9W4%bmNNYu*iq}p??6(0s=|6|&)$PS93VTY%vQ0tt8~j-09guleIlDny$u6%0TKT@PV#oY4#WMo7SxO zJGa|aFgf7{I9NU;Wjo(X&%+ke@6ny-e(81^V*D}?*C6U2+t-;_c^2;Fpx=RbABu!u_Mq<n{Cr)# zyb%6KI0Aw2F;rOmmz#g!XRA2{7mjgS~|rkk5DA zCa`0K47$Hyq?OjvA`2q0;o->I^l)B^;c3j9@0Ezj7zr@%;)VJw2W=%}>oDss%@_JC zCqq1F1HKYYT)CUJ>_YI|$?q5jV7kU}(Q$V-`GxD)r2m2GbGGM7tvi#c%CM|UVd&^x z2M42UMFttglckrvaX3grd?-C(@vBGvu(|P;s!yhMc=v+pc$Yx6T^+|@-Gxz)TFq~& zf#l?}El(g)%%u4;ru|9;aTCSDDD?s|gK+I?xhB{3$-@E0rSgks~n;G+t`coqmqyu z)7PuV5J&}(fw8gnj)4=eso_rKFoeyj=9wGAKDWG~`y6FA5=#YqK zE58VK$7PN~^TKxPd29wi5g{$3%o={z=7f#<&%x!-|H{BJ5|gQp8roAzI|wgRt>Q=a zsdQk6XZ*-NfBn(w)BVho^}GSGQl>~NYUG@5ns)=5P5$7wDloi$4afvAZkBHMG;&8e zS3btJUcM3isWYdYeOw8(D~h?wTZ?`bVwn z=7XqM;|>Tz%LI2A$-Z*?dofZKSv~aa9U@IU@O*j*_DShFk{FzX75Bck@Zqw_aH9e- z9e@B?^;qI^)6*%%_u^9Q@q;_tC;pw&{h_^Lb9;mn|5$N?xHT@r8_3DTnz!J&ApFL<;J- zpghU$Tp_zcW@XVBoI=PIv=k)YIjTGyn+gA+Yhx&zM95!mpvsEbgz*mzJUm`LKBPlN zjf&xbmT-Zo*oYhb=t3pX{TB(7iE)sX;^OGRoF7@Rdc=6BAG(x((sZZi_hNLGY%Lca<0Em*n&rGeTo2KK8Jy6HUg+|fRsosZ6x(lUnX_2 zQa`8Xn*a0I^bBB&E~K5JBxQlQ@VGJ1^{ON{GLWDmG_l)!XaC)A;7q0=VWe97V`5;ZI%QDh$Y>0IBImiOJ*d z-)}&+191ywc)KlJ-A3LPZu*CxnFg73+8raW<>}jQdN3t zZvtxM+9IKsiv687+)pQujj7pDdL3WS#}nwS0SpG7uuM74(p^cjc3ATiwcPo&GeHzO(VS9H-Vg_+^g%)t;XGC82QsNJ9}oP11CC zb0wQ~ST@=0i(uYSgJ6lGD*#7cpkd4c?)}XU7pnD%+B+0n8X4)ciK$m+Pg0i+M13G* zbyI!Fw0zz2Nz0jgiw(A)53GEGE^R}4x!}%oEjgS5j>^VbB+)j>| z03fq$YGRL>jxwjW5js>dq}nSqhG6N<;9jm$WkKkiI=+U0Oerz)NIBQA?JaLajsDy+ zxrF@+6ifTVvK%CWeiA@&44!*H=`dct7cI+#Kgq5|_Bz3dwbaC~ToxRI4&1lb?x1XB zf+1vr?z7D7`go#6`(^`oGil+(K0ND83^#7N;QumWj0swvT7 zm79}aYHPEx!}4L%K#VszA2S9|NYJn zk)wsBIrr_AGi+nprl^lIDCf#&BQgILMghH|D%}CDW998-f15XDlt!6M%TvcMeNgY( zet35cynf>dvV=L2H~Zhpc4hEd{)imjJ{o#>I6Xmd4K;3gK~yu~p>Ae^*d*mgP70}Y z#Xa+;+xdzspbj_z9`GiF*yBWAj;=V3P0BM1?y+JsBVUznG@bfv(<58HD!btV>I(3` zmOJ7#!)`uqZeC~fv(|R6mx-UX1(K!sx1YSHQSr};jK_8<9-<7xvFj1ED-lWm&JfzuYpzUoZDDPdzb2-kZQQVm6R zzqdMN<37?)N_H8isvskbOXZhb7h zT)uckM=G1qwg0*};vFy0cYibcR^)mO=`h0F7UG*j*cn8F$n!k*tkO$rlu=wtjd~Lj zHDzFMxM?PxXh-O{CJCPB3brUC}N+-a}00rX)^}-SD7oS{hG{ z>U+Sm$z&e5zIR;q@R2RIYTC?&kjE(;0PVCNX;<^orS1eIw!At*llwPa_B>lKQQm{$ zB0>9Iku-R)z<}NN6&d4uS(HW0V>gUk{v4_1Xn;8&GiKFVz}radq4{6Bjw!lUij<7$ zp^t2MlhjL9v(Mp=+2_R7Ug)z0O`XT#0j*eEo2$7jKfIz@5FFdeuBuV--5vT>VY>cs zBt?=N=*CkT-FB@~{u?22!kPp01^mMtJ&N-kj=H^dNwXQ|;%|nE1J?#y^poMj#eH?y zRgN%nTrrdIMjyS8EL;7IBQHWxfW^Ek=b?1Z%odwxn(fqs?JDWbK^pT{w?zMIvIkr^ z*Ei2+*n0NKxzW+|07r^et43^CanB#zht-itSXWhkT7oIqf4*`{V1u@;b=`2R$MjN}g zK=7t*1w1`k#=@DHVqRq;`sW_P8@noCJ^4vm!B^cGzz_6=r2}bMy`auh!8MPB#m`*& zh-ju9N`vJIdd^|8=$x2m+I5thM>uZ2b~v>=v?HD@HRSnUw*xP+$`HL88X#2=US`97 zx_mGQ9k>i1O{Pp{NnSA{m#vrdnd%=cU%KMbVLk=0pKP&JEyn?F&ZlIISJ(7Oo?PSz z*WxH<<`Ml#Lb?h+_kd|2!sU3p_T4@nozn)dz>W5a&tHhAHN1q5)sNW*)y}pDhZw^K zo(zv+B{AbJr)U6X2XYt{?o1tqqIn_3wJRX1ra-D*J=W$%JMuFzkInSMDaa@bs7GsU z^^^~hQr14)@2{c-oN=O12Mg#y@1?2Q<-4ck`aVe()Uso{9kR*5! zPI19bLX4jOr!N>oN(y?e=nI6<-~I=|W(+~_H^FZs<5QA8#V4eH&Z?>_t4PhvNy(|L zDS%YHa2;>qJ6#78eV^NG($3X2t_p-IuPv}onT5ySuRP>cgQ(p)N^hcM&7t9p4P71w z{1v^ily;tXRzUmL=;vII!|Z*4yoN)A{L6Tms`Ow>H3`4;noALo>~2HY+cy4<{&`x{ zI-tag4|t=u0*qCcr!|`|PkN!z0HpUJrB70yrlRIkJ0|2q+c0G6{5j#7q6g!(0IR@; zo{ZY^+ZbWqfix~&Na;s0iu_k9wqt`=eX4J;R`&3Q-p_Sk2Z8ae9T(e5;II|Z0&aMFxfTV?J8v>~;enyPmUbG2& z*cGp;a?$eDwxU+d#mYGO!Ly38?Ndw*R2R%G1DP6tl<87icX5x*;Ocxi{WDo~)Tzk4 z%4oL!11l$z{3|*+E2XCceRJl{>671m#`->CQlTU#sXE7Vr8XpAqL1k}IQ$KWy9mj!Izq&o)^6~T}o22`0fODY-uaF*EI0AyoRPeE)`A{x#S$qCw*xOX zl`0H&V>Qgwr*YI3&HNnpm9YVh6M?7Mk zeUEJLN$UlPOR*t?Si$bTZOZ^DpmV!J(Q!4uIeesNkutD8e(8JBS;#Eq`bf@Tg?#~p ze~2vY?9{$aUHZ4d7w4cgVs&!!Y|`(83@myWD}mLDfCK=64gMG=o-EuiO)H72S5Xqb znKZs>sNrNxVqEBSLS9C9+u&PuV;yoPriVcpJyB+Js#S0wiII+$b&y3z3uAq42DtvK z)gmFv8TP%r7f1#hv1-Sj2!)JPl|eou9k6lP0k(Xnhbea#hycGJ^|{UIL?XLJM2Ubh7T(LV_gjCiH9oPYQM+*T-;AI z+R47KgiZi~Wjs;u1{Iwx0&B!NTk);!+6M%y6Yur%|3xG@90;{o3$ za@fdB15}m~ryfwr_5_e1LbBmM3(y5&(DpJ5>jmTq#`Q}-Xul|x@QyxNdL29`>L^1E z^(5yHn7l0Hn7Pzn2?MN?4e-R#QTFTd(LJj@EKrd#5@{uGW?Y%E>W5$C$-BYuU042n z#^WSYxj`x@C_KA{JZ|`l<4*zM{+@e&aXTm0m7nXCr9UqjlQMk$LUeF}6hq!Ct_cEN9GO!;)pbwevULxEpV z0VEw>lzkU3TPt5RNz*Tf5ETg1*KHMT^1%N9Hpoqsm$y=HML4+nxUoE@K$_c>cNP9!h?y%MZA5d46}6^ic>Cs$ik#}%{j;7I9rt-zX_xV|?MX!mh@gv& z6Xa4UT$7@%T3oBnw9pawW4xQmDUr#09|nADkJRL+9*FeGaqY1CUwl=tzNjGZpoURJ zku`S6laX1|6t@XN#zuqW@#aO1ZN}rooaAa@?Rp`|dH~l{-tw)aFc@^+xxBe=^YU*t zDm(Ez{oyn}Cr9?UEuCT3FQ;zxul}e*^Zg4L0Wn(PP!6sT`X+17(>~qQ?ZV5&<*J)n zEW~|x9Nu$ZYEpcD#0(?L)--5ZC7H^*fBFEK*!Nt2>}}m!x?GYVX5G49lkXYGgnxzM zyfuf4tI}SJvZfuNoDHM%lE)?-?7Y51LnE0TnewTkN1$71s9EQzOLJnoZE_aefL{A8 zkxnKUbXo29l5U_yF{z1<2}1ys+@o^Nk#y`=&P30HX2&XH>Bu7+y%eg+=#2J*N%7)O z;~^wJ>nR0=Kj*Z1BBXCb)lH-__h=J?%>G}DoEayOZ@%;0Ie)B#{qd)qSaZzhxKLAg8DG5_vE8RqxL~m!5M_jJ)5)lA`Uz! zA53q-`2LdIL@@_I2Da`pc|gqpbbRWjFrdWT&+a) zcO4fe=9`(6FiRj+AL3SUjcsf#0qz>&#&k&W-3vp3rGIRiDI7ej7NZ}J%bqX)aohKt zoEsz%&-NqaM|tA` zXwpNWF-z-`0)(iBk0a-NxPVhF$1TJ-4oAlRs%2l+SK&CUU}8a7Yvgr3(pR;MBWUh; zBV|gzd}2>Y80qsW znMW5dHgiunwsNRzaFEamMlm!qA{X~KYuS06m^*9Lz zOL4US{rZ>9o8k?9pKZyycWZXNtAm;%$-UO)daC*p{U8SjDP_)5_I27wurxsjo@5yR zbEY@Kznx}xD>R-ZOXFE%VD+RN=57klseS%>#d^~b84>aXXC4e-VF2CAyesb@fR!NSAH#6Plbn~HHf{WU}_wbN+RkU*^nOn%hu!kk}ql*cEz}YDPhgB;D zw~!fhQ$gz=x=fI(k&oVWu@<%O(K)XSSU&#Y)7fm@*rYw*Z8)^rS2wjR6;eZ*wzhMk zb<)bfPtMIUTzmCKwH#FAMXHD^RAf6+g}Xz7Mk!;s3G3kwh)G7mWMry+_W6AqIOkf^rc%uWwXQWB76u~rlUDwkdG=+{mc3DW z(H-9KXHZZ%_>cA<9da*byM9k~2t=Tm*k{OS_lmhJ%OQQsj$T3E8E9)FT2wh_TY8J6 z;f}IcqlQ>SL zpAKe^9Qt(Sf-c{P?yYg*K1=X>O|Tt!v?s8=W1()gZOQn8QPO2ykuOz@$H)Gr+3E9aH*&wZF*zeD_d1Be_pQjyp}I3yl73w#5(V}4NZ>)BXrS>&>=EIG+^P1&ejJ^eI#N<%CQpgT6aiO)Sd^bNcQ18#aYKAy|p&c}`7c*%iefNO8N?}s-NuV~D2_dW6c%sdFwgabwmVxtzq|)7A zEmMGs@fD=z=>RS=qGBe$YI{T=(mm?3{qR-wv^RH7%M;yh$2ae7&wrdzI`PjN(zVV# z_@kM0uD!}2vTiTFx9wSTvU zInbu*q%(xfP@$cpli)vI zbL*Z1x|shuUDf}Pr(YDGLEL<=tzFqHApXshG&Tsmilut^;3*^;zth)oF? z6qn*%}DLus#`va+MIGU<}J_0FK>{X7*L zX{x=}5uQQ5DM6p-(#*H}I0_73K?Mk<9x#6G zG|(@Mfk{h15j~*XbO>)9T?T@r`9rW! z9UMq(fEr%PWUc;~?O;;P66!mowKb=lveeABXv*B=wQ&K>;-C8^tGP*FbYLqyw>z+9 zF@>h-APil@SDQcg!n}kPS6CXp`e*-dLKJ*v>)a{ta}7*}j}TJy;qC1}VBuyD&8%D}Go6NB1T4Vio|&qsN2tkvr8c?Fhb#`#&lMhynw{I+5eDy(193mL0;cNtRu<$hLioV(wM{#tnZ-&epPk#m=B^qyQLn!-h2qn1>Oz`6ClSWtrKO@ zm2BphPN~Lvg4QVqnrypgW9G>`?qNv;alkQpIaZW7gIv2eH7u3k@Qsgb;~ zZ_&$qOL^jc1+|d0fF^f(B)hele_R4V0l0axNLLa9sW*IFMavYANn!I}n_PS>&F;DQ zPQMqzrvt=b+y4*Q6>qM$E+aRyyr!q|E4zqucx$7P-_xY|yoqIQ#^u)^qqR(6)JB$X zk7xn=Q4n7q@fD~rkx<(>JQC2b{l}^jV;KllC_SV>&l`+LlY=;agla{{L{HMs2uR$84hztZ5N; zRH-n1Tj8KTJJr>Zf99qxi*4-DlG_Wt)HlqtRh@y}TyhQ52u8vmL@XyA)%AF1PIYams+i$in(GM%n}sJ?27#rz9k3><*pfNlpqk#Xs;u4>4nA3U=D&;#t-lE@^%EKE^gi50=4HV-EQNjLEj7&z{zMVF+=TO#;z2bTr z4B~wQjnM{$g{Iv@tA^PA(wg%w=llnK+9tx>#GE?R$b%4;Z%3^sWrC4icX-gLX8Qd2 zf4UeQ4YS^%%GpyJ_ZY6DAYBLGkj3~1_bD1AzEBdkHWDYi%N?~YDY2Z5z@ znbaKo=+rX&xuh08I~%?P#M^?N${(sGX*{a$T*PLIomwwc^T|6aEqbj2DTai=4tupF zw6+f{rW68anX=ebTEch7?u4)7^e26Au#cj>`Ekszp!M4f|E%5|a0z?S29BE6Jk3dv5W5Sr&l0Ca#23ku&w1Q8=^dkRF>a7{=jLDo9z7^n-FxfZ3mjA)2t8 zaGzP8wZR4h0T4-GM!6Wj|q$E(BL!__|?g}!J1g;UPnl)Dwe^el3` zB%j-wbkwM>@n&;%^&MQR&-)46yV-fGtaM?1Pw88R7>IcI?!QK1a%m2G+pEK9aXvBp zTiYUZYEc&?SChFH#<^|~!%&*AwW}!Q*I<Ey%OC3K3eUN`_YMseQa{zX5`0TysHq>DM E2bD4;TL1t6 literal 0 HcmV?d00001 diff --git a/Resources/Audio/_NF/Machines/attributions.yml b/Resources/Audio/_NF/Machines/attributions.yml new file mode 100644 index 00000000000..b877c603c57 --- /dev/null +++ b/Resources/Audio/_NF/Machines/attributions.yml @@ -0,0 +1,14 @@ +- files: ["assembler.ogg"] + license: "CC-BY-4.0" + copyright: "Modified by whatston3 from 'Swirling EM Fields Loop' by nlux" + source: "https://freesound.org/people/nlux/sounds/620807/" + +- files: ["egg-timer.ogg"] + license: "CC0-1.0" + copyright: "Uploaded by 'xyzr_kx' to freesound.org, converted to OGG from MP3." + source: "https://freesound.org/people/xyzr_kx/sounds/14263/" + +- files: ["medical-assembler.ogg"] + license: "CC0-1.0" + copyright: "Composited by whatston3 from 'Paper Cutter 1.wav' from Brotherprovisional on freesound.org (see source) and '50Hz_Hum' from nicola_ariutti at https://freesound.org/people/nicola_ariutti/sounds/335365/" + source: "https://freesound.org/people/Brotherprovisional/sounds/38889/" \ No newline at end of file diff --git a/Resources/Audio/_NF/Machines/egg-timer.ogg b/Resources/Audio/_NF/Machines/egg-timer.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e8fe2d4a270ff69a0ffbcca47cbd591cd7240bb5 GIT binary patch literal 12934 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 z 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 UC}5flfS+Q49|Hoe14_XE0bA}=F#rGn literal 0 HcmV?d00001 diff --git a/Resources/Audio/_NF/Machines/medical-assembler.ogg b/Resources/Audio/_NF/Machines/medical-assembler.ogg new file mode 100644 index 0000000000000000000000000000000000000000..0c472ebf4c6c71701bfb2679f617a50b1305b8f2 GIT binary patch literal 48977 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 Mp00i_>zopr0PxNu6#xJL literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-broken-unlit.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-broken-unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..bb07c82289a592236ad5cbd4d764280805b36f77 GIT binary patch literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzEl(H6kcif|=L~rn3^*7Jo_u(C xpV!ZU>H4PSp%*w99$c7udFtoij0_*nF!i{y+?Ju bK+N}S0tyU_?u-jMfE)%-S3j3^P6gB1$e;F8lTxSaCWI5}uolpkU!{F)a=d#Wzp$Py&xf+cC literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-scan-unlit.png b/Resources/Textures/_NF/Structures/Machines/assembler.rsi/assembler-scan-unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..e8602d6233c56d7dad39d0151f0cecc3cecf99d4 GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3xL>xgAGW|?XFo5qzXJ;978JRyuEXf^MC;l^MMN| zjZ+ma@8E8+o7I%DL;Aoa=ltzJ<=n*~X9I0#+%L7*eE928!HUxiokk8o?WiE(erNrw rfABUMAL>p)h3L;go2SLyjjAB!& z+lw`}!HZCGkV zI;50@LqX}(VeIylkkWXX5c+T%%p8S7K^Z!69DwMEVi`Cx*sq#0913dsu8-e0{ZLZ@ zD$x;z^pnp3R8_B$&$)E=I!Zx=DqJNT3Q98(mI46WRa@2#3ALO51TMA#_@$ZCd-Np! zwstNJ4V3k5OF%LCoU8El#daxE_iowpXG=h1W2>&M+6}qvUmKP*{TGH~EWcW`6k;hL zGT3jr2;CdCeJHdLN+AKs=KX zV@~QoVlqix-B!l}5|c@K`}%aE{1+eo+b=jf^8kP=fx|qSeTLUm;z?Y|r5Msi)0N(%9HJu7* zQ+#vgu5QfGxzm=eZ3zgRKcj0i3Rp~hRMEUIth{r67QA@9D&nJx=7)E5?lIjNYc3C0 zuf?hHc$j;>WE#-60D$?0WzEsr(Yj6U-n9dO#B>UPBR$;!%%#)3TzO-96q}(h;w1ZMGYw761t9?4`}aD&KUfMd;zK55XyLTjl#V yEW*v%efi>LXOEwZ zoVu%K$K5HDrUdkCG&VFny)VGZ%v4`XGe0%SsZ&t`wys!eWolegS*5I~ zuCJ}dF>Rt4&>-=WAirRS|5(9>?&AAEC2u`l978O6*G_ob*P_7Vn%k`u^3UhV-}us~ z4K)^WfoajAYZt7R9{g7H{oaHmMPJ_L z2kZ~|c^M8%#lfRX)Lj%5Zcqw-biz|)-NB7XO^ZE#ZP)p7F!0;* z3oK>jKdv+-q-*30s~_e}aMGw1=9$bO&zpL`g{NT3{GdrC8Ryg<#I8sX5Ab@j@=J?v nL{ZrDMa#FX_u98SeGg+-xtP2A^9zT79%t}$^>bP0l+XkKOrE(1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-base.png b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-base.png new file mode 100644 index 0000000000000000000000000000000000000000..f66a2ea5aab784afeec9285ebee30e343ef92909 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyt^qzFu0T2>EW*v%efi>LXOEwZ zoVu%K$K5HDrUdkCG&VFny)VGZ%v4`XGe0%SsZ&t`wys!eWolegS*5I~ zuCJ}dF>Rt4&>-=WAirRS|5(9>?&AAECC@xv978O6*G|0H*P_7Vn%k{(aG%eU|MjKZ zH-hHOTr>O4O8)C#p0Jff$}z@YunqdKCOaZp;g3FJz2JliYTJ6Z&GYFH{w?=?UWkX` z6~VRxMt%#d4y{!zSKRsQa4~0{yyPUl&75nViz_n5DXVW{dp(8i?&-Vk%*oBm+0L^Srz-1r`S~zIS48ZwLzd#V^U}8{xI`+)|PyfR(Wvb|n2}gR*1AWZk>FVdQ&MBb@0F}wG@Bjb+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-off-unlit.png b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-off-unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..6c105c1b9ce3198b0fb0403261c3c64fb1f5adf0 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyt^qzFu0T2>EW*v%efi>LXOEwZ zoVu%K$K5HDrUdkCG&VFny)VGZ%v4`XGe0%SsZ&t`wys!eWolegS*5I~ zuCJ}dF>Rt4&>-=WAirRS|5(9>?&AAECAyw2jv*Gk$q5py6^!Bnm#*8L@_oR>T;ugY sTj3Ck6@#8d;~|I8gRO_8S+B4$#I0gf?qu^T0cvFMboFyt=akR{0Fh=?ZvX%Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-on-unlit.png b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/mediwave-on-unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..d6795963d4f5fa35c45fad3092304c35b869565d GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyt^qzFu0T2>EW*v%efi>LXOEwZ zoVu%K$K5HDrUdkCG&VFny)VGZ%v4`XGe0%SsZ&t`wys!eWolegS*5I~ zuCJ}dF>Rt4&>-=WAirRS|5(9>?&AAEC61mhjv*Gk$q5py6^!BnmpDFrJgm@F%W*(o zfupfzhfl*P?gg_Bu(DP7IA|zbXJOj6fbBt(um(?vXpF|5K!;oghWFoCvmSQ}JOvuY N;OXk;vd$@?2>{yHU6TL+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/meta.json new file mode 100644 index 00000000000..fdcaa1dd5c6 --- /dev/null +++ b/Resources/Textures/_NF/Structures/Machines/medical_assembler.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from chemmaster.dmi from NebulaSS13 at https://github.com/NebulaSS13/Nebula/commit/413dc17c9757bf33984534a4d9b3e3db538a6285 by Whatstone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "mediwave-base" + }, + { + "name": "mediwave-off-unlit" + }, + { + "name": "mediwave-on-unlit" + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_off.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/composite_off.png new file mode 100644 index 0000000000000000000000000000000000000000..8715e4cd1f0881037a28ca8e7b16c262743a7774 GIT binary patch literal 839 zcmV-N1GxN&P)E-VXKq2sNLC1>9~XTCn^Prpo}mqNT?7AWof=hJq7jVgKr5w*_%aR<;#eO zB!t234`eW1G_}}Oxxo;R+M=3i^|T(=x!!-f_s%x_!8rGP=lgx%@0|19b9R9(hJ!ui zayfMNL~^AFy8e4z)n8s*R`p+wy>>Vp`PAE)v9l+V>*|PrE-jTpgDL(^)S(i*$x7w}^xlR@R~N;v@gF|1@V@CE!3MG>MX z7R9j?KnOu=dmCnF=T$*jkd;gZt?g|fgveW9#9=%wM+@B+a2y9pDGt{k0RVi6zn90D zjZ&&=*>fQdAw>1om}1+ZK?0oD7f5ef%!{N$;!3y6-4=mmJa9ClXi!LF)G+`ad(B#EwH zYuDL+eESZscjIl41x&;z0RW+J5CCwdu@OMND7A%S2Qfjwf~4n7C8yGaqFQ3=Z73FCc%Ar~@*a7G^#zO@0gw zOU2cI>(9oYN@YN$-AJsF&!%ditNUs}LaE_Ub}luYD9OjE6{2HrT{Iyl&iJh-d1eoM{EYdRXUr|LxvQH~e7Sdw%D9-|su;{O&!wzz)O0 zZqn&A+B$>jLWpks-cYoc7MB$5_ro777E31eZWe6o45r&#gP@5-Av_r3|3obc0}N9W zUqC5EDwP5NL}%xuK9|Q0LP%EOY#aa}gn;8X_-l_UI2r?#Qg9rHiO~oEz-F~deN6bm z<%`ld01yNLJkOhQ^q?`2N~JI{8c~Qau-MScH*k5}(u`Rw7mj)bcBu)`**S@{zM(88 z*0x!#h|bP|=XvlvpBG0B%?ha9%LVmjxLuBB1za9CmXk@?_uC}__G4I1CgJk9AqWBl zLCA|^YJd=e=9X)ipN}a-naFZ7iRPATAcRO;pvPf6HAfB27H}K~N-3)AYXAU~k$3P*;Dyc7B)=TtHzOJ57R((?g+eKGT2rEk>Zry&gGX|OhnJwvPJ*V4mSOWmi-Wo(2 zKus-7uQkX#escKyUi9^Pv+A1~Pz!DaT|FT@xN~)D2G|S9$c)h#c@6aS-p$=W=0&0u zWHB|2#xw=o=pPXCs{z}e%|DfLL3v!ytlpR{)j)g4^{j+K!y<2737ja%$Eg`Y!yl!O b(;de@Az5W~%b!3#00000NkvXXu0mjf)vR~A literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/cooking_unlit.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/cooking_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..b87f8f1558c309ffb7138ec86968d0991d73b263 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ*`6+rArY;~2@6f_8wTlT=0x3*;S6Muu_pN znT>5zMwe{Cw}0Yo=f&dM!0q63|9Fi>?gup##26UTW=G_Idmu0c=u8Gr LS3j3^P6m-Pz4gch`Qfyq!1mz4y(`+u2=Uk0G#| zMx%kT$yCFMp!MH%UAwwo)wSO)yb}arEA@Wn9Ggrv#z#}2m5LJ@n&RI?1)Ttf)!Y|Q zN};MM0HByJXnm1b6oe4Vz*ZapAcQ~^MI`%<={TGKN-0E9L~c0?0O;~~v_2O2^0h14 zH~^4k8ImNmCO84%qhVJQmcEwE1#Fbdc=9w2(eHCr09~(Oqg>_%_yRth ziih!PZr)V^EEgvr5DXxZjHCbDdDjJG(rI3R-!I}|_YoZG_L`EM!ml4c;rDMp4Vr-W z*%bglA{ob{hmRdeHa>BS^L<+VtmV=PFk*4#o2}$$PlnnW$DM>uSt)oxOU`OwcIFYjduu%i;o@A}Cs~Rvn!`*_gvvGakj3Ym%t&mw*)P7F)9De~FtV24G`9O&P O0000lozI_fVNfOOl=&CiWz%$g}+^5V-%;{w|y414$zfZ)fe zb4LZH$GI689$ji|ppvTkM_lb>6&stH(A8jBo*m2_ZjMDUOouNDvv+8TPkJoWajwqA zx*>$wla)o5L3_dn%Qgv96>EmD2@293s|ys}cs=C^UT{ae3S&d%FzQczamv#`K> z=dagAUT2GxVTjlw&Fs+iFLcJD{G+~ozgVLS7M;9R95qKTxb3vZ<~*9&CgjAS d*dkygB3>hG&vJV&s{qg)44$rjF6*2UngA=6KO6u6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_low.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/range_low.png new file mode 100644 index 0000000000000000000000000000000000000000..bf1068ec77fe9e2876d45eb2bf2e943ea6c08df2 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7Ec$)kcigg1PNAUSp%V<4d>$j z+xN(B`KaXhb;+xPnw>cuRtHiwEURXGkSzK4)L*1fLVmXElNX5zKydJB5*rXW7nX@I z^B%qVQB&QU|D48(trvdudmFENpyJMd(4{p;V`JxrYfg{tnVFA#Kk`bFb#a17Pg9@) im)k)N2_WYQ6N6)>m1K$3=GQ>?FnGH9xvXDgn^z4&s>g2i^kR<$2Mtkai9v*@F!mHCodYS?axZDnE iNU$zW0CFaBGc;_mx_E-;-y5KN7(8A5T-G@yGywoBr9qYe literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven.rsi/unlit.png b/Resources/Textures/_NF/Structures/Machines/oven.rsi/unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..089bd05aeebfc9fef59bf2547e8723ba63d5af5f GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6;Bt(kcif|M;!$j7+4q#Zl+w^ q&lIoTbla|*f#JdKbFXX}Vwii4SUnHfES?8c&*16m=d#Wzp$P!%*%^ue literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_off.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/composite_off.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dd85a50fa0e42742daccfe1354d6d74650cbbc GIT binary patch literal 808 zcmV+@1K0eCP)w2zn7~ zksyW9EiIEBl?}$#t2P#FeiSA4Aa`~??tHB6)(@7u=iKu<=QnrGy)y&+XZZBSjoa6E z^O1Dx$CklfU0yZVqr-2sx+VJJ-JM;aD=YcX;E1Z~s@;Ky&wK^}4AY5Epp+t$$p8T6 zXOh}nI2r*V#5S=V2LK2m5Cj4Bji(G8ivUU~1VKPzOacG|{C;hYCBD*nRf_`vS(YJ+ zqAQ07i-1ffgT$C*NW#E;FNa8e(Sw08`RCZI1aUrG}CHx8o2( z47YE_<9HNyyzf=W1)fypvx=p^$uDEl!cCC<552r z3tB!~3rmVo0030hM$lAoprFOazy89vjqjRm>4BZ46r@{s^HMDK_<_}VsM28Co`e^g zn*r=KrMYpuU?d**6vq{yq!obai^!lHYS}iuFixsiC|6k$ek)ViH6^E+L)7oU`+&1pA6u9?3`1WR+w@0U`2Vw zT?GKZW~m>e)3dGuP`dZv338_T8e7qm7~;|_4D90;A>S~3oZc)h m&dbNC8~S&4eC|>I2!8;O=Tx}=51q6C0000h>-Wi5%zW8!v@1}gCB&v?WYXHYx|x{mayk*4ngP%A z;CVhLjuyHV(5hD^G`hmQa&#-;_4}}tPNS^6OisXl3`^-WynY`v_}93x07u^-o)sMecdVkI0_Z{tj=n*?fYOTNSbaEv zxq_D8sfBq-EdT&2Jw7y)A1r9`v2TCyef6ho>v~{wJ^|tOoxBtaKDw`W9SH!mF#+B13pcDMq*_ZQc^;2w*nZ( zg$dNwokmYrt7%L!pFw9Frj@keyk!pnKxbP!wgA)zU^~`Bzx{$6a|kBQ&sSRk+3sg6^an!diVp2g z06UPZ#8|~Bd*E*JL-qosq@+v8d|Ft=)J_X{<35^O54e8syi_U^D*Z-cjbe7y1D9S8 vn-cO3)yL_r;^Mq~oZ4YvbJJlT^`Gz$2LNBe<00K|00000NkvXXu0mjf@*8}# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/cooking_unlit.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/cooking_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..b87f8f1558c309ffb7138ec86968d0991d73b263 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ*`6+rArY;~2@6f_8wTlT=0x3*;S6Muu_pN znT>5zMwe{Cw}0Yo=f&dM!0q63|9Fi>?gup##26UTW=G_Idmu0c=u8Gr LS3j3^P6Mp0r%Ox^{bA!B#oG4Q6^f zEDiMZ%v+UA0s|9mtn6LgeBEDNv;dkbQxfDC%^rl>|&dZ0*d=pNZc{Y7e`f$j=kL7U!tLX#{^%v%ie207lSVIH3ybrQIZ2o$l z>#2L^p;_GCaanQOb%np}xw6K*R!_v%CpRvX|Ma}@tIm7RE^3eO|Me%;^vm~xr`P{8 YDIM2-b;&=p1n4~mPgg&ebxsLQ0R2#^RR910 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/oven_door.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/oven_door.png new file mode 100644 index 0000000000000000000000000000000000000000..62c6b74fe24e5c27cdbffe19fcf207423384dd89 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVF!Fl3IEF;DCMQU+E=~~XX$myp zay#h3-gATHb#(Us;KLt|y-Hj2Oqp3MMrfU%9}fslozI_fVNfOOl=&CiWz%$g}+^5V-%;{w|y414$zfZ)fe zb4LZH$GI689$ji|ppvTkM_lb>6&stH(A8jBo*m2_ZjMDUOouNDvv+8TPkJoWajwqA zx*>$wla)o5L3_dn%Qgv96>EmD2@293s|ys}cs=C^UT{ae3S&d%FzQczamv#`K> z=dagAUT2GxVTjlw&Fs+iFLcJD{G+~ozgVLS7M;9R95qKTxb3vZ<~*9&CgjAS d*dkygB3>hG&vJV&s{qg)44$rjF6*2UngA=6KO6u6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_low.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/range_low.png new file mode 100644 index 0000000000000000000000000000000000000000..bf1068ec77fe9e2876d45eb2bf2e943ea6c08df2 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7Ec$)kcigg1PNAUSp%V<4d>$j z+xN(B`KaXhb;+xPnw>cuRtHiwEURXGkSzK4)L*1fLVmXElNX5zKydJB5*rXW7nX@I z^B%qVQB&QU|D48(trvdudmFENpyJMd(4{p;V`JxrYfg{tnVFA#Kk`bFb#a17Pg9@) im)k)N2_WYQ6N6)>m1K$3=GQ>?FnGH9xvXDgn^z4&s>g2i^kR<$2Mtkai9v*@F!mHCodYS?axZDnE iNU$zW0CFaBGc;_mx_E-;-y5KN7(8A5T-G@yGywoBr9qYe literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/unlit.png b/Resources/Textures/_NF/Structures/Machines/oven_syndie.rsi/unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..089bd05aeebfc9fef59bf2547e8723ba63d5af5f GIT binary patch literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz6;Bt(kcif|M;!$j7+4q#Zl+w^ q&lIoTbla|*f#JdKbFXX}Vwii4SUnHfES?8c&*16m=d#Wzp$P!%*%^ue literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/meta.json similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/meta.json rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/meta.json diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/normal.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/normal.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/normal.png rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/normal.png diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/off.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/off.png rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/off.png diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-empty.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-empty.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-empty.png rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-empty.png diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-money.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-money.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-money.png rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-money.png diff --git a/Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-paper.png b/Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-paper.png similarity index 100% rename from Resources/Textures/_NF/Structures/Machines/syndicate_shredder.rsi/shredding-paper.png rename to Resources/Textures/_NF/Structures/Machines/shredder_syndie.rsi/shredding-paper.png From 6be5de17de92fd3b7ed821c2090061a4baff0cdd Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 12 Oct 2024 19:26:58 +0000 Subject: [PATCH 76/96] Automatic Changelog (#1935) --- Resources/Changelog/Frontier.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 0bd7674b246..9370118accb 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4443,3 +4443,22 @@ Entries: like the PTK-800 for mining. id: 5387 time: '2024-10-12T18:32:27.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: >- + The Food-O-Mat and electric range are now available to assemble and bake + food. A medical assembler has been added for aloe cream and topical + recipes. + - type: Add + message: >- + A tier 2 civilian research now unlocks the fryer, Food-O-Mat and range, + and another unlocks the medical assembler. + - type: Tweak + message: >- + Many microwave recipes now use the range and Food-O-Mat. Refer to the + Food Recipes Guidebook page for details. + - type: Remove + message: The medical techfab recipes for advanced topicals have been removed. + id: 5388 + time: '2024-10-12T19:26:32.0000000+00:00' From 16ac25fbf2f50a76763479f6fd6d4f6722110924 Mon Sep 17 00:00:00 2001 From: PECK <74548962+PeccNeck@users.noreply.github.com> Date: Sun, 13 Oct 2024 00:20:50 -0400 Subject: [PATCH 77/96] Personal Transport Shuttle Directional Fan Compliance Update (#2202) * Directional fan compliance * Move plasma into fuel locker --------- Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/pts.yml | 34 +++++++++++++---------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml index 631bf7be387..de3c00bc5d7 100644 --- a/Resources/Maps/_NF/Shuttles/pts.yml +++ b/Resources/Maps/_NF/Shuttles/pts.yml @@ -331,17 +331,19 @@ entities: - type: Transform pos: 0.5,-1.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 53 + - uid: 1 components: - type: Transform - pos: -3.5,1.5 + rot: -1.5707963267948966 rad + pos: -3.5,-0.5 parent: 2 - - uid: 188 + - uid: 53 components: - type: Transform - pos: -3.5,-0.5 + rot: -1.5707963267948966 rad + pos: -3.5,1.5 parent: 2 - proto: AtmosFixBlockerMarker entities: @@ -395,7 +397,6 @@ entities: parent: 2 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -406,8 +407,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-0.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 56 @@ -416,8 +415,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,0.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 54 @@ -426,8 +423,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,1.5 parent: 2 - - type: Physics - bodyType: Static - proto: CableApcExtension entities: - uid: 132 @@ -1112,6 +1107,14 @@ entities: - type: Transform pos: 1.5,3.5 parent: 2 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 184 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-4.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 80 @@ -1212,13 +1215,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,3.5 parent: 2 -- proto: SheetPlasma - entities: - - uid: 184 - components: - - type: Transform - pos: -0.5,-4.5 - parent: 2 - proto: ShuttleWindow entities: - uid: 57 From 89baf0517627f344359a5939a7da291ac2a37ec5 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 13 Oct 2024 04:21:03 +0000 Subject: [PATCH 78/96] Extractable crystal shard (#2197) * Update crystal_shard.yml * Update crystal_shard.yml * Update crystal_shard.yml * Update crystal_shard.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Entities/Objects/Materials/crystal_shard.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml index 47828ed8f58..991045d45f5 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml @@ -39,6 +39,16 @@ acts: [ "Destruction" ] - type: StaticPrice price: 50 + - type: Extractable # Frontier + grindableSolutionName: food # Frontier + - type: SolutionContainerManager # Frontier + solutions: # Frontier + food: # Frontier + reagents: # Frontier + - ReagentId: Ethanol # Frontier + Quantity: 5 # Frontier + - ReagentId: Sugar # Frontier + Quantity: 15 # Frontier - type: entity parent: ShardCrystalBase From 845cdf8c738b8d8b950fc7bad8598579bd3fdabc Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 13 Oct 2024 04:21:16 +0000 Subject: [PATCH 79/96] Update shelfs.yml (#2189) --- .../Construction/Graphs/furniture/shelfs.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml index 1a6492fd927..a7b2f64ea17 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml @@ -10,7 +10,7 @@ - to: ShelfWood completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: WoodPlank amount: 4 @@ -18,7 +18,7 @@ - to: ShelfMetal completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: Steel amount: 5 @@ -26,7 +26,7 @@ - to: ShelfGlass completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: Glass amount: 4 @@ -35,7 +35,7 @@ - to: ShelfRWood completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: WoodPlank amount: 8 @@ -46,7 +46,7 @@ - to: ShelfRMetal completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: Plasteel amount: 5 @@ -60,7 +60,7 @@ - to: ShelfRGlass completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: Plastic amount: 5 @@ -75,7 +75,7 @@ - to: ShelfBar completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: WoodPlank amount: 6 @@ -83,7 +83,7 @@ - to: ShelfKitchen completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: MetalRod amount: 2 @@ -96,7 +96,7 @@ - to: ShelfChemistry completed: - !type:SnapToGrid - southRotation: true + # southRotation: true Frontier steps: - material: Plasteel amount: 2 From 55a394d67c2ab89e35259f95d2a4f7e1a88418f4 Mon Sep 17 00:00:00 2001 From: Eagle0600 Date: Sun, 13 Oct 2024 14:32:19 +1000 Subject: [PATCH 80/96] Sprinter atmos rework (#2065) * Atmos rework Added fore and aft air alarm. Added vent and scrubber to bar. Linked atmos devices to air alarms. * Linked firelocks to air alarms. * Price change The Sprinter is appraised at significantly less than its original price. * Cosmetic change Medbay airlock changed to medical airlock from maintenance airlock. Sodium lights replaced with standard fluorescent lights. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- .../Maps/_NF/Shuttles/Expedition/sprinter.yml | 265 ++++++++++++++++-- .../_NF/Shipyard/Expedition/sprinter.yml | 2 +- 2 files changed, 250 insertions(+), 17 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index 28b3b9d3b19..d067a0318b2 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -874,6 +874,70 @@ entities: - type: RadiationGridResistance - type: BecomesStation id: Sprinter +- proto: AirAlarm + entities: + - uid: 602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-5.5 + parent: 1 + - type: DeviceList + devices: + - 89 + - 289 + - 299 + - 334 + - 431 + - 439 + - 285 + - 292 + - 138 + - 57 + - 361 + - 151 + - 286 + - 385 + - 332 + - 92 + - 335 + - 490 + - 481 + - 69 + - 492 + - 491 + - 489 + - 423 + - 421 + - 422 + - 420 + - 419 + - uid: 603 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + - type: DeviceList + devices: + - 94 + - 440 + - 123 + - 37 + - 120 + - 118 + - 291 + - 386 + - 600 + - 601 + - 489 + - 491 + - 427 + - 426 + - 424 + - 23 + - 495 + - 494 - proto: AirlockCargoGlass entities: - uid: 3 @@ -983,7 +1047,7 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-5.5 parent: 1 -- proto: AirlockMaintGlass +- proto: AirlockMedicalGlass entities: - uid: 22 components: @@ -2452,12 +2516,18 @@ entities: - type: Transform pos: 0.5,2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - uid: 495 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - proto: FirelockEdge entities: - uid: 419 @@ -2466,29 +2536,44 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 420 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 421 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 422 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 423 components: - type: Transform pos: -3.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - proto: FirelockGlass entities: - uid: 69 @@ -2497,57 +2582,89 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 424 components: - type: Transform pos: 1.5,0.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - uid: 426 components: - type: Transform pos: 1.5,-0.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - uid: 427 components: - type: Transform pos: 1.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - uid: 481 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 489 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 + - 603 - uid: 490 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 491 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 + - 603 - uid: 492 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - uid: 494 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - proto: FloorDrain entities: - uid: 401 @@ -2613,6 +2730,20 @@ entities: color: '#0055CCFF' - proto: GasPipeFourway entities: + - uid: 25 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 122 + components: + - type: Transform + pos: 2.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 268 components: - type: Transform @@ -2707,6 +2838,13 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' + - uid: 135 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - uid: 137 components: - type: Transform @@ -3117,6 +3255,20 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 395 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 415 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 432 components: - type: Transform @@ -3236,20 +3388,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' - - uid: 122 - components: - - type: Transform - pos: 2.5,-3.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 135 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 136 components: - type: Transform @@ -3371,6 +3509,9 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#0055CCFF' - uid: 57 @@ -3379,6 +3520,9 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-9.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#0055CCFF' - uid: 94 @@ -3386,6 +3530,9 @@ entities: - type: Transform pos: -0.5,9.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#0055CCFF' - uid: 120 @@ -3394,6 +3541,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#0055CCFF' - uid: 286 @@ -3402,6 +3552,9 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#0055CCFF' - uid: 289 @@ -3410,6 +3563,9 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#0055CCFF' - uid: 292 @@ -3417,6 +3573,9 @@ entities: - type: Transform pos: 1.5,-3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#0055CCFF' - uid: 332 @@ -3425,6 +3584,9 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#0055CCFF' - uid: 334 @@ -3433,6 +3595,9 @@ entities: rot: 3.141592653589793 rad pos: -7.5,-5.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#0055CCFF' - uid: 335 @@ -3441,6 +3606,9 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#0055CCFF' - uid: 386 @@ -3449,6 +3617,9 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#0055CCFF' - uid: 431 @@ -3456,6 +3627,19 @@ entities: - type: Transform pos: -4.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 601 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber @@ -3466,6 +3650,9 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 92 @@ -3474,6 +3661,9 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-3.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 118 @@ -3482,6 +3672,9 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#990000FF' - uid: 123 @@ -3490,6 +3683,9 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,7.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#990000FF' - uid: 138 @@ -3498,6 +3694,9 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-8.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 151 @@ -3506,6 +3705,9 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-6.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 285 @@ -3514,6 +3716,9 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-4.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 291 @@ -3522,6 +3727,9 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,0.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#990000FF' - uid: 299 @@ -3529,6 +3737,9 @@ entities: - type: Transform pos: -7.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 361 @@ -3537,6 +3748,9 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-10.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 385 @@ -3544,6 +3758,9 @@ entities: - type: Transform pos: 7.5,-2.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 439 @@ -3551,6 +3768,9 @@ entities: - type: Transform pos: -3.5,-1.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 602 - type: AtmosPipeColor color: '#990000FF' - uid: 440 @@ -3558,6 +3778,19 @@ entities: - type: Transform pos: 0.5,9.5 parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 600 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 1 + - type: DeviceNetwork + deviceLists: + - 603 - type: AtmosPipeColor color: '#990000FF' - proto: GravityGeneratorMini @@ -3864,7 +4097,7 @@ entities: - type: Transform pos: 1.5,10.5 parent: 1 -- proto: PoweredlightSodium +- proto: Poweredlight entities: - uid: 73 components: diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml index 0fea7b87305..fc1117d8511 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/sprinter.yml @@ -12,7 +12,7 @@ id: Sprinter name: KC Sprinter description: A light freighter often picked by bounty hunters due to its quick acceleration, expedition capable. - price: 66500 # ~51200$ on mapinit + ~15360$ from 30% markup + price: 56800 # ~$43700 on mapinit plus ~30% markup category: Medium group: Expedition shuttlePath: /Maps/_NF/Shuttles/Expedition/sprinter.yml From 8742f3180732a273f180cda59016adfe24007f14 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 13 Oct 2024 04:33:04 +0000 Subject: [PATCH 81/96] Replaces Anchor tiny fans with directional fans. (#2087) * Update anchor.yml * Update anchor.yml * Fixes wall light A small update correcting a wall light as requested by Daark. * anchor: ~30% markup --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- .../Maps/_NF/Shuttles/Expedition/anchor.yml | 92 ++++++++++--------- .../_NF/Shipyard/Expedition/anchor.yml | 2 +- 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index 34592b38649..fb22e288160 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -1632,43 +1632,53 @@ entities: - type: Transform pos: 9.5,-21.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 57 components: - type: Transform - pos: 20.5,-9.5 + rot: 1.5707963267948966 rad + pos: 20.5,-11.5 parent: 1 - uid: 58 components: - type: Transform - pos: -21.5,-11.5 + rot: -1.5707963267948966 rad + pos: -21.5,-9.5 parent: 1 - uid: 59 components: - type: Transform - pos: -1.5,-32.5 + pos: 0.5,-32.5 parent: 1 - uid: 60 components: - type: Transform - pos: -21.5,-9.5 + rot: -1.5707963267948966 rad + pos: -21.5,-11.5 parent: 1 - uid: 61 components: - type: Transform - pos: 0.5,-32.5 + pos: -1.5,-32.5 parent: 1 - uid: 62 components: - type: Transform - pos: 20.5,-11.5 + rot: 1.5707963267948966 rad + pos: 20.5,-9.5 parent: 1 - uid: 638 components: - type: Transform + rot: 3.141592653589793 rad pos: -14.5,-21.5 parent: 1 + - uid: 1261 + components: + - type: Transform + pos: -17.5,-22.5 + parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 175 @@ -9246,6 +9256,33 @@ entities: - type: Transform pos: -3.5,-25.5 parent: 1 +- proto: NFSignDock + entities: + - uid: 74 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-10.5 + parent: 1 + - uid: 554 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-10.5 + parent: 1 + - uid: 770 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-32.5 + parent: 1 +- proto: NFSignShield + entities: + - uid: 1904 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 487 @@ -9435,8 +9472,8 @@ entities: - uid: 23 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-14.5 + rot: -1.5707963267948966 rad + pos: 4.5,-14.5 parent: 1 - uid: 285 components: @@ -10398,17 +10435,15 @@ entities: parent: 1 - proto: SignAtmos entities: - - uid: 1195 + - uid: 555 components: - type: Transform - pos: 4.5,-21.5 + pos: 7.5,-21.5 parent: 1 -- proto: SignAtmosMinsky - entities: - - uid: 555 + - uid: 1195 components: - type: Transform - pos: 7.5,-21.5 + pos: 4.5,-21.5 parent: 1 - proto: SignBar entities: @@ -10574,33 +10609,6 @@ entities: - type: Transform pos: 2.5,-11.5 parent: 1 -- proto: NFSignShield - entities: - - uid: 1261 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 1 -- proto: NFSignDock - entities: - - uid: 74 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-10.5 - parent: 1 - - uid: 554 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-10.5 - parent: 1 - - uid: 770 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-32.5 - parent: 1 - proto: SignSurgery entities: - uid: 3 diff --git a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml index ab46bed3c86..66ad1510d1c 100644 --- a/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Expedition/anchor.yml @@ -12,7 +12,7 @@ id: Anchor name: KC Anchor description: A large luxury cruiser capable of long ranged travel acrossed the sector, expedition capable. - price: 115000 # $108432 after appraisal +5ish% (~7000) - TODO: fix this value, getting tests to pass - Whatstone + price: 140000 # $108432 after appraisal +30ish% (~32000) category: Large group: Expedition shuttlePath: /Maps/_NF/Shuttles/Expedition/anchor.yml From f839000f636b088fd50895668265a8152b31eb9b Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 13 Oct 2024 04:34:54 +0000 Subject: [PATCH 82/96] Automatic Changelog (#2087) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 9370118accb..fb9d6acfd46 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4462,3 +4462,9 @@ Entries: message: The medical techfab recipes for advanced topicals have been removed. id: 5388 time: '2024-10-12T19:26:32.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Replaces Anchor tiny fans with directional fans. + id: 5389 + time: '2024-10-13T04:33:04.0000000+00:00' From 39575aeb1313fd67f3c650fe875fab6d9e38a023 Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 13 Oct 2024 04:38:27 +0000 Subject: [PATCH 83/96] Replaces Falcon tiny fans with directional fans. (#2098) * Update falcon.yml * Update schooner.yml * Revert "Update schooner.yml" This reverts commit bdf56ac818cc28584c561ce6e007e35c8d8bab84. * Pipe colours, remove unanchored pipe, fix vent --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- .../Maps/_NF/Shuttles/BlackMarket/falcon.yml | 392 ++++++++---------- 1 file changed, 164 insertions(+), 228 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml index dee3dc64ce1..ec7d61daf66 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/falcon.yml @@ -39,7 +39,7 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAWgAAAAAAAwAAAAAAAwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAcgAAAAAAYgAAAAAAYgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAABQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABQAAAAAABQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAAAgAAAAAAAgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 @@ -266,7 +266,7 @@ entities: 0,-4: 0: 65535 -1,-4: - 0: 61015 + 0: 60503 0,-3: 0: 12287 -1,-3: @@ -346,13 +346,6 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance -- proto: AirCanister - entities: - - uid: 187 - components: - - type: Transform - pos: -2.5,-9.5 - parent: 3 - proto: AirlockCaptainGlassLocked entities: - uid: 271 @@ -446,7 +439,7 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-14.5 parent: 3 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 139 components: @@ -471,32 +464,37 @@ entities: - uid: 144 components: - type: Transform - pos: 4.5,-16.5 + rot: 1.5707963267948966 rad + pos: 9.5,-14.5 parent: 3 - uid: 145 components: - type: Transform + rot: 1.5707963267948966 rad pos: 9.5,-16.5 parent: 3 - uid: 146 components: - type: Transform - pos: 9.5,-14.5 + rot: -1.5707963267948966 rad + pos: -4.5,-16.5 parent: 3 - uid: 147 components: - type: Transform + rot: -1.5707963267948966 rad pos: -4.5,-14.5 parent: 3 - uid: 148 components: - type: Transform - pos: -4.5,-16.5 + rot: 1.5707963267948966 rad + pos: 3.5,-2.5 parent: 3 - - uid: 242 + - uid: 559 components: - type: Transform - pos: 3.5,-2.5 + pos: 4.5,-16.5 parent: 3 - proto: AtmosFixBlockerMarker entities: @@ -681,46 +679,26 @@ entities: - type: Transform pos: 2.5,-16.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 69 components: - type: Transform pos: 3.5,-16.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 70 components: - type: Transform pos: 0.5,-16.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 76 components: - type: Transform pos: 1.5,-16.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 528 components: - type: Transform pos: 4.5,-16.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - proto: BookHowToSurvive entities: - uid: 531 @@ -1611,6 +1589,11 @@ entities: - type: Transform pos: -1.5,-9.5 parent: 3 + - uid: 373 + components: + - type: Transform + pos: 0.5,-9.5 + parent: 3 - proto: ChairFolding entities: - uid: 214 @@ -1851,16 +1834,28 @@ entities: - type: Transform pos: 5.286945,-7.6460857 parent: 3 + - type: ItemSlots + - type: ContainerContainer + containers: + paper_label: !type:ContainerSlot {} - uid: 236 components: - type: Transform pos: 5.5473614,-7.3856688 parent: 3 + - type: ItemSlots + - type: ContainerContainer + containers: + paper_label: !type:ContainerSlot {} - uid: 239 components: - type: Transform pos: 5.7348614,-7.6669188 parent: 3 + - type: ItemSlots + - type: ContainerContainer + containers: + paper_label: !type:ContainerSlot {} - proto: DrinkRumBottleFull entities: - uid: 228 @@ -1948,6 +1943,19 @@ entities: - type: Transform pos: 5.5,-13.5 parent: 3 +- proto: GasMixerOnFlipped + entities: + - uid: 226 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-10.5 + parent: 3 + - type: GasMixer + inletTwoConcentration: 0.20999998 + inletOneConcentration: 0.79 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 448 @@ -1957,16 +1965,24 @@ entities: pos: 2.5,-17.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - proto: GasPipeBend entities: - - uid: 373 + - uid: 187 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-10.5 + parent: 3 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 242 components: - type: Transform pos: -0.5,-9.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 375 components: - type: Transform @@ -1974,14 +1990,14 @@ entities: pos: -1.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 419 components: - type: Transform pos: 2.5,-4.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 443 components: - type: Transform @@ -1989,7 +2005,7 @@ entities: pos: 0.5,-4.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - proto: GasPipeFourway entities: - uid: 383 @@ -1998,7 +2014,7 @@ entities: pos: 1.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - proto: GasPipeStraight entities: - uid: 374 @@ -2008,15 +2024,7 @@ entities: pos: -1.5,-9.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' - - uid: 377 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-10.5 - parent: 3 - - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 378 components: - type: Transform @@ -2024,7 +2032,7 @@ entities: pos: -1.5,-12.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 379 components: - type: Transform @@ -2032,7 +2040,7 @@ entities: pos: -1.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 380 components: - type: Transform @@ -2040,7 +2048,7 @@ entities: pos: -1.5,-14.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 381 components: - type: Transform @@ -2048,7 +2056,7 @@ entities: pos: -1.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 382 components: - type: Transform @@ -2056,7 +2064,7 @@ entities: pos: 0.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 384 components: - type: Transform @@ -2064,7 +2072,7 @@ entities: pos: 2.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 385 components: - type: Transform @@ -2072,7 +2080,7 @@ entities: pos: 3.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 386 components: - type: Transform @@ -2080,7 +2088,7 @@ entities: pos: 4.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 387 components: - type: Transform @@ -2088,7 +2096,7 @@ entities: pos: 5.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 389 components: - type: Transform @@ -2096,7 +2104,7 @@ entities: pos: 1.5,-10.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 390 components: - type: Transform @@ -2104,7 +2112,7 @@ entities: pos: 1.5,-9.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 391 components: - type: Transform @@ -2112,7 +2120,7 @@ entities: pos: 1.5,-8.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 392 components: - type: Transform @@ -2120,7 +2128,7 @@ entities: pos: 1.5,-7.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 394 components: - type: Transform @@ -2128,7 +2136,7 @@ entities: pos: 1.5,-5.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 395 components: - type: Transform @@ -2136,7 +2144,7 @@ entities: pos: 1.5,-4.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 396 components: - type: Transform @@ -2144,7 +2152,7 @@ entities: pos: 1.5,-3.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 397 components: - type: Transform @@ -2152,7 +2160,7 @@ entities: pos: 1.5,-2.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 398 components: - type: Transform @@ -2160,15 +2168,7 @@ entities: pos: 1.5,-1.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' - - uid: 399 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-0.5 - parent: 3 - - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 400 components: - type: Transform @@ -2176,84 +2176,84 @@ entities: pos: 2.5,-6.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 405 components: - type: Transform pos: 6.5,-12.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 406 components: - type: Transform pos: 6.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 407 components: - type: Transform pos: 6.5,-14.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 408 components: - type: Transform pos: 6.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 414 components: - type: Transform pos: 2.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 416 components: - type: Transform pos: 2.5,-9.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 417 components: - type: Transform pos: 2.5,-8.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 420 components: - type: Transform pos: 2.5,-5.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 421 components: - type: Transform pos: 2.5,-6.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 423 components: - type: Transform pos: 2.5,-14.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 425 components: - type: Transform pos: 2.5,-16.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 426 components: - type: Transform @@ -2261,7 +2261,7 @@ entities: pos: 1.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 427 components: - type: Transform @@ -2269,7 +2269,7 @@ entities: pos: 0.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 428 components: - type: Transform @@ -2277,7 +2277,7 @@ entities: pos: -0.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 429 components: - type: Transform @@ -2285,7 +2285,7 @@ entities: pos: -1.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 430 components: - type: Transform @@ -2293,7 +2293,7 @@ entities: pos: -2.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 431 components: - type: Transform @@ -2301,7 +2301,7 @@ entities: pos: 3.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 432 components: - type: Transform @@ -2309,7 +2309,7 @@ entities: pos: 4.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 433 components: - type: Transform @@ -2317,7 +2317,7 @@ entities: pos: 5.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 434 components: - type: Transform @@ -2325,7 +2325,7 @@ entities: pos: 6.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 435 components: - type: Transform @@ -2333,7 +2333,7 @@ entities: pos: 3.5,-10.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 436 components: - type: Transform @@ -2341,7 +2341,7 @@ entities: pos: 4.5,-10.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 437 components: - type: Transform @@ -2349,7 +2349,7 @@ entities: pos: 5.5,-10.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 438 components: - type: Transform @@ -2357,7 +2357,7 @@ entities: pos: 6.5,-10.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 444 components: - type: Transform @@ -2365,7 +2365,7 @@ entities: pos: 0.5,-1.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 445 components: - type: Transform @@ -2373,7 +2373,7 @@ entities: pos: 0.5,-2.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 446 components: - type: Transform @@ -2381,7 +2381,7 @@ entities: pos: 0.5,-3.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 447 components: - type: Transform @@ -2389,7 +2389,7 @@ entities: pos: 1.5,-4.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - proto: GasPipeTJunction entities: - uid: 376 @@ -2399,14 +2399,14 @@ entities: pos: -0.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 388 components: - type: Transform pos: 6.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 393 components: - type: Transform @@ -2414,7 +2414,7 @@ entities: pos: 1.5,-6.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 411 components: - type: Transform @@ -2422,7 +2422,7 @@ entities: pos: 2.5,-12.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 413 components: - type: Transform @@ -2430,7 +2430,7 @@ entities: pos: 2.5,-7.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 415 components: - type: Transform @@ -2438,7 +2438,7 @@ entities: pos: 2.5,-10.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 422 components: - type: Transform @@ -2446,7 +2446,7 @@ entities: pos: 2.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 424 components: - type: Transform @@ -2454,9 +2454,16 @@ entities: pos: 2.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - proto: GasPort entities: + - uid: 189 + components: + - type: Transform + pos: 0.5,-9.5 + parent: 3 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 372 components: - type: Transform @@ -2464,7 +2471,7 @@ entities: pos: -2.5,-9.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - proto: GasVentPump entities: - uid: 401 @@ -2474,14 +2481,14 @@ entities: pos: 3.5,-6.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 402 components: - type: Transform pos: 1.5,-0.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 403 components: - type: Transform @@ -2489,7 +2496,7 @@ entities: pos: -1.5,-16.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 404 components: - type: Transform @@ -2497,7 +2504,7 @@ entities: pos: 7.5,-11.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 409 components: - type: Transform @@ -2505,7 +2512,7 @@ entities: pos: 6.5,-16.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - uid: 410 components: - type: Transform @@ -2513,7 +2520,7 @@ entities: pos: 1.5,-12.5 parent: 3 - type: AtmosPipeColor - color: '#0000BBFF' + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 412 @@ -2523,7 +2530,7 @@ entities: pos: 3.5,-12.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 418 components: - type: Transform @@ -2531,7 +2538,7 @@ entities: pos: 3.5,-7.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 439 components: - type: Transform @@ -2539,14 +2546,14 @@ entities: pos: 7.5,-10.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 440 components: - type: Transform pos: 0.5,-0.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 441 components: - type: Transform @@ -2554,7 +2561,7 @@ entities: pos: 7.5,-13.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - uid: 442 components: - type: Transform @@ -2562,7 +2569,7 @@ entities: pos: -3.5,-15.5 parent: 3 - type: AtmosPipeColor - color: '#BB0000FF' + color: '#990000FF' - proto: GravityGeneratorMini entities: - uid: 120 @@ -2578,16 +2585,12 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,-10.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 77 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-10.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - proto: HarmonicaInstrument entities: - uid: 453 @@ -2595,12 +2598,12 @@ entities: - type: Transform pos: 6.464443,-9.590082 parent: 3 -- proto: SyndicateMicrowave +- proto: LockerWallMaterialsFuelPlasmaFilled2 entities: - - uid: 109 + - uid: 377 components: - type: Transform - pos: 6.5,-6.5 + pos: -2.5,-8.5 parent: 3 - proto: LockerWallMedicalFilled entities: @@ -2698,6 +2701,26 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 3 +- proto: NitrogenCanister + entities: + - uid: 98 + components: + - type: Transform + anchored: True + pos: -2.5,-9.5 + parent: 3 + - type: Physics + bodyType: Static +- proto: OxygenCanister + entities: + - uid: 251 + components: + - type: Transform + anchored: True + pos: 0.5,-9.5 + parent: 3 + - type: Physics + bodyType: Static - proto: Paper entities: - uid: 449 @@ -2877,11 +2900,6 @@ entities: - type: Transform pos: 2.5,-12.5 parent: 3 - - uid: 251 - components: - - type: Transform - pos: 0.5,-9.5 - parent: 3 - uid: 557 components: - type: Transform @@ -2942,13 +2960,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-4.5 parent: 3 -- proto: SheetPlasma - entities: - - uid: 98 - components: - - type: Transform - pos: 0.5504579,-9.491902 - parent: 3 - proto: ShuttersNormalOpen entities: - uid: 72 @@ -2956,110 +2967,66 @@ entities: - type: Transform pos: 0.5,-14.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 73 components: - type: Transform pos: 1.5,-14.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 136 components: - type: Transform pos: 2.5,-14.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 137 components: - type: Transform pos: 3.5,-14.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 138 components: - type: Transform pos: 4.5,-14.5 parent: 3 - - type: DeviceLinkSink - links: - - 153 - - 152 - uid: 243 components: - type: Transform pos: -0.5,1.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - uid: 244 components: - type: Transform pos: -0.5,0.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - uid: 245 components: - type: Transform pos: -0.5,-2.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - uid: 246 components: - type: Transform pos: 0.5,2.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - uid: 247 components: - type: Transform pos: 1.5,2.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - uid: 248 components: - type: Transform pos: 2.5,1.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - uid: 249 components: - type: Transform pos: 2.5,0.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - uid: 250 components: - type: Transform pos: 4.5,-3.5 parent: 3 - - type: DeviceLinkSink - links: - - 177 - proto: ShuttleGunPirateCannon entities: - uid: 191 @@ -3068,20 +3035,12 @@ entities: rot: 3.141592653589793 rad pos: 5.5,0.5 parent: 3 - - type: DeviceLinkSink - links: - - 155 - - 472 - uid: 192 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,0.5 parent: 3 - - type: DeviceLinkSink - links: - - 155 - - 472 - proto: SignalButtonDirectional entities: - uid: 152 @@ -3250,6 +3209,13 @@ entities: - type: Transform pos: -0.5,-6.5 parent: 3 +- proto: SyndicateMicrowave + entities: + - uid: 109 + components: + - type: Transform + pos: 6.5,-6.5 + parent: 3 - proto: TableCarpet entities: - uid: 89 @@ -3340,117 +3306,87 @@ entities: - type: Transform pos: 6.5,-3.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 37 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-12.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 38 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-18.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 39 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-18.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 40 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-18.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 41 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-11.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 42 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-18.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 46 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-12.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 58 components: - type: Transform pos: -2.5,-5.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 59 components: - type: Transform pos: 7.5,-4.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 82 components: - type: Transform pos: -1.5,-3.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 99 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-11.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 112 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-18.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 118 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-18.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - uid: 119 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-18.5 parent: 3 - - type: Thruster - originalPowerLoad: 1500 - proto: ToolboxElectrical entities: - uid: 481 From 4a4c908d5c5c280b106177c79ac382122f001125 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 13 Oct 2024 04:38:54 +0000 Subject: [PATCH 84/96] Automatic Changelog (#2098) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index fb9d6acfd46..6ec98710ef2 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4468,3 +4468,9 @@ Entries: message: Replaces Anchor tiny fans with directional fans. id: 5389 time: '2024-10-13T04:33:04.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Replaces Falcon tiny fan with directional fans. + id: 5390 + time: '2024-10-13T04:38:27.0000000+00:00' From a00dec46846dcfe2956e6ac69da9b2e57604543f Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 13 Oct 2024 04:43:31 +0000 Subject: [PATCH 85/96] Update schooner.yml (#2099) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- .../_NF/Shuttles/BlackMarket/schooner.yml | 210 ++++++------------ 1 file changed, 72 insertions(+), 138 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml index 4aa4412037c..83f7e001450 100644 --- a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml +++ b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml @@ -566,77 +566,89 @@ entities: - type: Transform pos: 1.5,-5.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 7 components: - type: Transform - pos: 4.5,4.5 + rot: -1.5707963267948966 rad + pos: -3.5,2.5 parent: 1 - uid: 8 components: - type: Transform - pos: 4.5,3.5 + rot: -1.5707963267948966 rad + pos: -3.5,3.5 parent: 1 - uid: 9 components: - type: Transform - pos: 4.5,2.5 + rot: -1.5707963267948966 rad + pos: -3.5,4.5 parent: 1 - uid: 10 components: - type: Transform - pos: -3.5,2.5 + rot: 1.5707963267948966 rad + pos: 4.5,4.5 parent: 1 - uid: 11 components: - type: Transform - pos: -3.5,3.5 + rot: 1.5707963267948966 rad + pos: 4.5,3.5 parent: 1 - uid: 12 components: - type: Transform - pos: -3.5,4.5 + rot: 1.5707963267948966 rad + pos: 4.5,2.5 parent: 1 - uid: 13 components: - type: Transform - pos: 4.5,-2.5 + rot: -1.5707963267948966 rad + pos: -3.5,-4.5 parent: 1 - uid: 14 components: - type: Transform - pos: 4.5,-3.5 + rot: -1.5707963267948966 rad + pos: -3.5,-3.5 parent: 1 - uid: 15 components: - type: Transform - pos: 4.5,-4.5 + rot: -1.5707963267948966 rad + pos: -3.5,-2.5 parent: 1 - uid: 16 components: - type: Transform - pos: -3.5,-4.5 + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 parent: 1 - uid: 17 components: - type: Transform - pos: -3.5,-3.5 + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 parent: 1 - uid: 18 components: - type: Transform - pos: -3.5,-2.5 + rot: 1.5707963267948966 rad + pos: 4.5,-4.5 parent: 1 - uid: 19 components: - type: Transform - pos: -0.5,-9.5 + pos: 1.5,-9.5 parent: 1 - uid: 20 components: - type: Transform - pos: 1.5,-9.5 + pos: -0.5,-9.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -1868,29 +1880,11 @@ entities: - 0 - proto: ClosetWallMaintenanceFilledRandom entities: - - uid: 209 + - uid: 276 components: - type: Transform - pos: -0.5,6.5 + pos: 0.5,6.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: ClothingEyesEyepatch entities: - uid: 211 @@ -2240,6 +2234,47 @@ entities: - type: Transform pos: -2.7120032,-0.473266 parent: 1 +- proto: LockerWallMaterialsFuelUraniumFilled + entities: + - uid: 208 + components: + - type: Transform + pos: -2.5,9.5 + parent: 1 +- proto: NFSignDock + entities: + - uid: 363 + components: + - type: Transform + pos: 2.5,-9.5 + parent: 1 + - uid: 364 + components: + - type: Transform + pos: -1.5,-9.5 + parent: 1 +- proto: NFSignShield + entities: + - uid: 359 + components: + - type: Transform + pos: 5.5,5.5 + parent: 1 + - uid: 360 + components: + - type: Transform + pos: -4.5,5.5 + parent: 1 + - uid: 361 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 1 + - uid: 362 + components: + - type: Transform + pos: 5.5,-5.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 207 @@ -2263,10 +2298,10 @@ entities: parent: 1 - proto: PaintingSkeletonCigarette entities: - - uid: 276 + - uid: 209 components: - type: Transform - pos: 0.5,6.5 + pos: -0.5,6.5 parent: 1 - proto: PaperCaptainsThoughts entities: @@ -2669,13 +2704,6 @@ entities: linkedPorts: 503: - Pressed: Trigger -- proto: SheetUranium - entities: - - uid: 208 - components: - - type: Transform - pos: -0.65123916,8.543868 - parent: 1 - proto: ShuttersNormal entities: - uid: 341 @@ -2683,97 +2711,61 @@ entities: - type: Transform pos: 4.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 356 - uid: 342 components: - type: Transform pos: 4.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 356 - uid: 343 components: - type: Transform pos: 4.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 356 - uid: 344 components: - type: Transform pos: -3.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 355 - uid: 345 components: - type: Transform pos: -3.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 355 - uid: 346 components: - type: Transform pos: -3.5,-2.5 parent: 1 - - type: DeviceLinkSink - links: - - 355 - uid: 347 components: - type: Transform pos: 4.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 353 - uid: 348 components: - type: Transform pos: 4.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 353 - uid: 349 components: - type: Transform pos: 4.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 353 - uid: 350 components: - type: Transform pos: -3.5,2.5 parent: 1 - - type: DeviceLinkSink - links: - - 354 - uid: 351 components: - type: Transform pos: -3.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 354 - uid: 352 components: - type: Transform pos: -3.5,4.5 parent: 1 - - type: DeviceLinkSink - links: - - 354 - proto: ShuttersRadiation entities: - uid: 206 @@ -2782,35 +2774,23 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,8.5 parent: 1 - - type: DeviceLinkSink - links: - - 274 - uid: 224 components: - type: Transform pos: -1.5,9.5 parent: 1 - - type: DeviceLinkSink - links: - - 274 - uid: 225 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,7.5 parent: 1 - - type: DeviceLinkSink - links: - - 274 - uid: 228 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,6.5 parent: 1 - - type: DeviceLinkSink - links: - - 274 - proto: ShuttleGunPirateCannon entities: - uid: 501 @@ -2819,36 +2799,24 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 506 - uid: 502 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 507 - uid: 503 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 508 - uid: 504 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 505 - proto: SignalButtonDirectional entities: - uid: 274 @@ -2933,40 +2901,6 @@ entities: - type: Transform pos: -0.5,9.5 parent: 1 -- proto: NFSignShield - entities: - - uid: 359 - components: - - type: Transform - pos: 5.5,5.5 - parent: 1 - - uid: 360 - components: - - type: Transform - pos: -4.5,5.5 - parent: 1 - - uid: 361 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 1 - - uid: 362 - components: - - type: Transform - pos: 5.5,-5.5 - parent: 1 -- proto: NFSignDock - entities: - - uid: 363 - components: - - type: Transform - pos: 2.5,-9.5 - parent: 1 - - uid: 364 - components: - - type: Transform - pos: -1.5,-9.5 - parent: 1 - proto: SMESBasic entities: - uid: 365 From 55c5b0da41a44c18363883af92cd0007a2032635 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 13 Oct 2024 04:43:56 +0000 Subject: [PATCH 86/96] Automatic Changelog (#2099) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 6ec98710ef2..55ffc98a75d 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4474,3 +4474,9 @@ Entries: message: Replaces Falcon tiny fan with directional fans. id: 5390 time: '2024-10-13T04:38:27.0000000+00:00' +- author: dustylens + changes: + - type: Tweak + message: Updated Schooner with directional fans. + id: 5391 + time: '2024-10-13T04:43:32.0000000+00:00' From d543a72fe7ea5329a832fcfcf39e76dab677d353 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sun, 13 Oct 2024 06:50:28 +0200 Subject: [PATCH 87/96] Add an item appraisal cartridge for PDAs (#2045) * Add an item appraisal cartridge for PDAs. * Move cartridge localization lines into their own file under _NF hierarchy. Add localizations for PDA UI labels * Add appraisal cartridge to Astro Vend --------- Co-authored-by: eidolon <95361+eidolon-zz@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../CartridgeLoader/Cartridges/AppraisalUi.cs | 29 +++++ .../Cartridges/AppraisalUiFragment.xaml | 17 +++ .../Cartridges/AppraisalUiFragment.xaml.cs | 65 +++++++++++ .../Cartridges/AppraisalCartridgeComponent.cs | 23 ++++ .../Cartridges/AppraisalCartridgeSystem.cs | 105 ++++++++++++++++++ .../Cartridges/AppraisalUiState.cs | 30 +++++ .../en-US/_NF/cartridge-loader/cartridges.ftl | 4 + .../VendingMachines/Inventories/astrovend.yml | 2 + .../Entities/Objects/Devices/cartridges.yml | 19 ++++ 9 files changed, 294 insertions(+) create mode 100644 Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUi.cs create mode 100644 Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml create mode 100644 Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml.cs create mode 100644 Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeComponent.cs create mode 100644 Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeSystem.cs create mode 100644 Content.Shared/_NF/CartridgeLoader/Cartridges/AppraisalUiState.cs create mode 100644 Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUi.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUi.cs new file mode 100644 index 00000000000..6300df87450 --- /dev/null +++ b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUi.cs @@ -0,0 +1,29 @@ +using Content.Client.UserInterface.Fragments; +using Content.Shared.CartridgeLoader.Cartridges; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface; + +namespace Content.Client._NF.CartridgeLoader.Cartridges; + +public sealed partial class AppraisalUi : UIFragment +{ + private AppraisalUiFragment? _fragment; + + public override Control GetUIFragmentRoot() + { + return _fragment!; + } + + public override void Setup(BoundUserInterface userInterface, EntityUid? fragmentOwner) + { + _fragment = new AppraisalUiFragment(); + } + + public override void UpdateState(BoundUserInterfaceState state) + { + if (state is not AppraisalUiState appraisalUiState) + return; + + _fragment?.UpdateState(appraisalUiState.AppraisedItems); + } +} diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml new file mode 100644 index 00000000000..50d478cdb34 --- /dev/null +++ b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml.cs new file mode 100644 index 00000000000..fbffdce9450 --- /dev/null +++ b/Content.Client/_NF/CartridgeLoader/Cartridges/AppraisalUiFragment.xaml.cs @@ -0,0 +1,65 @@ +using Content.Shared.CartridgeLoader.Cartridges; +using Robust.Client.AutoGenerated; +using Robust.Client.Graphics; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; + +namespace Content.Client._NF.CartridgeLoader.Cartridges; + +[GenerateTypedNameReferences] +public sealed partial class AppraisalUiFragment : BoxContainer +{ + private readonly StyleBoxFlat _styleBox = new() + { + BackgroundColor = Color.Transparent, + BorderColor = Color.FromHex("#5a5a5a"), + BorderThickness = new Thickness(0, 0, 0, 1) + }; + + public AppraisalUiFragment() + { + RobustXamlLoader.Load(this); + Orientation = LayoutOrientation.Vertical; + HorizontalExpand = true; + VerticalExpand = true; + HeaderPanel.PanelOverride = _styleBox; + } + + public void UpdateState(List items) + { + AppraisedItemContainer.RemoveAllChildren(); + + //Reverse the list so the oldest entries appear at the bottom + items.Reverse(); + + //Enable scrolling if there are more entries that can fit on the screen + ScrollContainer.HScrollEnabled = items.Count > 9; + + foreach (var item in items) + { + AddAppraisedItem(item); + } + } + + private void AddAppraisedItem(AppraisedItem item) + { + var row = new BoxContainer(); + row.HorizontalExpand = true; + row.Orientation = LayoutOrientation.Horizontal; + row.Margin = new Thickness(4); + + var nameLabel = new Label(); + nameLabel.Text = item.Name; + nameLabel.HorizontalExpand = true; + nameLabel.ClipText = true; + row.AddChild(nameLabel); + + var valueLabel = new Label(); + valueLabel.Text = item.AppraisedPrice; + valueLabel.HorizontalExpand = true; + valueLabel.ClipText = true; + row.AddChild(valueLabel); + + AppraisedItemContainer.AddChild(row); + } +} diff --git a/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeComponent.cs b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeComponent.cs new file mode 100644 index 00000000000..d0b99f29152 --- /dev/null +++ b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeComponent.cs @@ -0,0 +1,23 @@ +using Content.Shared.CartridgeLoader.Cartridges; +using Robust.Shared.Audio; + +namespace Content.Server.CartridgeLoader.Cartridges; + +[RegisterComponent] +public sealed partial class AppraisalCartridgeComponent : Component +{ + /// + /// The list of appraised items + /// + [DataField("appraisedItems")] + public List AppraisedItems = new(); + + /// + /// Limits the amount of items that can be saved + /// + [DataField("maxSavedItems")] + public int MaxSavedItems { get; set; } = 9; + + [DataField("soundScan")] + public SoundSpecifier SoundScan = new SoundPathSpecifier("/Audio/Machines/scan_finish.ogg"); +} diff --git a/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeSystem.cs b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeSystem.cs new file mode 100644 index 00000000000..0e9973aae97 --- /dev/null +++ b/Content.Server/_NF/CartridgeLoader/Cartridges/AppraisalCartridgeSystem.cs @@ -0,0 +1,105 @@ +using Content.Server.Cargo.Systems; +using Content.Shared.Audio; +using Content.Shared.CartridgeLoader; +using Content.Shared.CartridgeLoader.Cartridges; +using Content.Shared.Popups; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Player; +using Robust.Shared.Random; +using Content.Server.Cargo.Components; +using Content.Shared.Timing; + +namespace Content.Server.CartridgeLoader.Cartridges; + +public sealed class AppraisalCartridgeSystem : EntitySystem +{ + [Dependency] private readonly CargoSystem _bountySystem = default!; + [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly PricingSystem _pricingSystem = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnUiReady); + SubscribeLocalEvent(AfterInteract); + SubscribeLocalEvent(OnCartridgeActivated); + SubscribeLocalEvent(OnCartridgeDeactivated); + } + + // Kinda jank, but easiest way to get the right-click Appraisal verb to also work. + // I'd much rather pass the GetUtilityVerb event through to the AppraisalCartridgeSystem and have all of + // the functionality in there, rather than adding a PriceGunComponent to the PDA itself, but getting + // that passthrough to work is not a straightforward thing. + + // Because of this weird workaround, items appraised with the right-click utility verb don't get added + // to the history in the UI. That'll be something to revisit someday if anyone notices and complains :P + + // Doing this on cartridge activation and deactivation rather than install and remove so that the price + // gun functionality is only there when the program is active. + private void OnCartridgeActivated(Entity ent, ref CartridgeActivatedEvent args) + { + EnsureComp(args.Loader); + // PriceGunSystem methods exit early if a DelayComponent is not present + EnsureComp(args.Loader); + } + + private void OnCartridgeDeactivated(Entity ent, ref CartridgeDeactivatedEvent args) + { + var parent = Transform(args.Loader).ParentUid; + RemComp(parent); + RemComp(parent); + } + + /// + /// The gets relayed to this system if the cartridge loader is running + /// the Appraisal program and someone clicks on something with it.
+ ///
+ /// Does the thing... TODO + /// + private void AfterInteract(EntityUid uid, AppraisalCartridgeComponent component, CartridgeAfterInteractEvent args) + { + if (args.InteractEvent.Handled || !args.InteractEvent.CanReach || !args.InteractEvent.Target.HasValue) + return; + + var target = args.InteractEvent.Target; + var who = args.InteractEvent.User; + double price = 0.00; + + // All of the pop up display stuff is being handled by the PriceGunComponent addded to the PDA, + // all we're doing in here is getting the price and recording it to the PDA interface bit. + price = _pricingSystem.GetPrice(target.Value); + + //Limit the amount of saved probe results to 9 + //This is hardcoded because the UI doesn't support a dynamic number of results + if (component.AppraisedItems.Count >= component.MaxSavedItems) + component.AppraisedItems.RemoveAt(0); + + var item = new AppraisedItem( + Name(target.Value), + price.ToString("0.00") + ); + + component.AppraisedItems.Add(item); + UpdateUiState(uid, args.Loader, component); + } + + /// + /// This gets called when the ui fragment needs to be updated for the first time after activating + /// + private void OnUiReady(EntityUid uid, AppraisalCartridgeComponent component, CartridgeUiReadyEvent args) + { + UpdateUiState(uid, args.Loader, component); + } + + private void UpdateUiState(EntityUid uid, EntityUid loaderUid, AppraisalCartridgeComponent? component) + { + if (!Resolve(uid, ref component)) + return; + + var state = new AppraisalUiState(component.AppraisedItems); + _cartridgeLoaderSystem?.UpdateCartridgeUiState(loaderUid, state); + } +} diff --git a/Content.Shared/_NF/CartridgeLoader/Cartridges/AppraisalUiState.cs b/Content.Shared/_NF/CartridgeLoader/Cartridges/AppraisalUiState.cs new file mode 100644 index 00000000000..41b9ed09477 --- /dev/null +++ b/Content.Shared/_NF/CartridgeLoader/Cartridges/AppraisalUiState.cs @@ -0,0 +1,30 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared.CartridgeLoader.Cartridges; + +[Serializable, NetSerializable] +public sealed class AppraisalUiState : BoundUserInterfaceState +{ + /// + /// The list of appraised items + /// + public List AppraisedItems; + + public AppraisalUiState(List appraisedItems) + { + AppraisedItems = appraisedItems; + } +} + +[Serializable, NetSerializable, DataRecord] +public sealed class AppraisedItem +{ + public readonly string Name; + public readonly string AppraisedPrice; + + public AppraisedItem(string name, string appraisedPrice) + { + Name = name; + AppraisedPrice = appraisedPrice; + } +} diff --git a/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl new file mode 100644 index 00000000000..99a458e07a2 --- /dev/null +++ b/Resources/Locale/en-US/_NF/cartridge-loader/cartridges.ftl @@ -0,0 +1,4 @@ +# Appraisal cartridge +appraisal-program-name = Appraisal App Plus +appraisal-label-name = Item +appraisal-label-price = Appraised Price diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml index 75cfd619224..d339a11f15c 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/astrovend.yml @@ -13,6 +13,7 @@ JetpackMiniFilled: 10 JetpackBlue: 10 HandHeldMassScanner: 10 + AppraisalCartridge: 3 # Keys EncryptionKeyCommon: 3 EncryptionKeyTraffic: 3 @@ -53,6 +54,7 @@ JetpackMiniFilled: 4294967295 # Infinite JetpackBlue: 4294967295 # Infinite HandHeldMassScanner: 4294967295 # Infinite + AppraisalCartridge: 4294967295 # Infinite # Keys EncryptionKeyCommon: 4294967295 # Infinite EncryptionKeyTraffic: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml index 643d986aa27..065a9ac25fb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/cartridges.yml @@ -19,6 +19,25 @@ - type: AccessReader access: [["HeadOfSecurity"], ["HeadOfPersonnel"]] +- type: entity + parent: BaseItem + id: AppraisalCartridge + name: appraisal cartridge + description: A program for appraising the monetary value of items + components: + - type: Sprite + sprite: Objects/Devices/cartridge.rsi + state: cart-y + - type: Icon + sprite: Objects/Devices/cartridge.rsi + state: cart-y + - type: UIFragment + ui: !type:AppraisalUi + - type: Cartridge + programName: appraisal-program-name + icon: Interface/Actions/shop.png + - type: AppraisalCartridge + # Not a PDA cartridge (then why is this here) - type: entity parent: BaseItem From 2ed56d18766ad0d1e2d08fceac00f62a315789bf Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 13 Oct 2024 04:50:54 +0000 Subject: [PATCH 88/96] Automatic Changelog (#2045) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 55ffc98a75d..bf4624f69d5 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4480,3 +4480,9 @@ Entries: message: Updated Schooner with directional fans. id: 5391 time: '2024-10-13T04:43:32.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Add + message: Added an appraisal program cartridge for PDAs + id: 5392 + time: '2024-10-13T04:50:29.0000000+00:00' From e31f2f3a9405e77d61b0164cd78ba6cb076802e8 Mon Sep 17 00:00:00 2001 From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com> Date: Sun, 13 Oct 2024 06:51:01 +0200 Subject: [PATCH 89/96] Replace NSF Marauder tiny fans with directional fans (#2160) * Replace NFSD Marauder tiny fans with directional fans, also fix a missing one * Replace sec with NFSD signs --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml | 236 ++++-------------- 1 file changed, 47 insertions(+), 189 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml index 90d5ab3f1fa..4354ef2baed 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml @@ -875,69 +875,81 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,3.5 parent: 1 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 59 components: - type: Transform - pos: -15.5,-15.5 + rot: 1.5707963267948966 rad + pos: 10.5,-5.5 parent: 1 - uid: 60 components: - type: Transform - pos: -0.5,-12.5 + pos: 1.5,-12.5 parent: 1 - uid: 61 components: - type: Transform - pos: 1.5,-12.5 + pos: -0.5,-12.5 parent: 1 - uid: 62 components: - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-10.5 + rot: 1.5707963267948966 rad + pos: 16.5,-15.5 parent: 1 - uid: 63 components: - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-10.5 + rot: 1.5707963267948966 rad + pos: 16.5,-13.5 parent: 1 - uid: 64 components: - type: Transform - pos: -11.5,-16.5 + pos: 12.5,-16.5 parent: 1 - uid: 65 components: - type: Transform - pos: 12.5,-16.5 + rot: 1.5707963267948966 rad + pos: 2.5,-10.5 parent: 1 - uid: 66 components: - type: Transform - pos: -9.5,-5.5 + rot: -1.5707963267948966 rad + pos: -15.5,-13.5 parent: 1 - uid: 67 components: - type: Transform - pos: 10.5,-5.5 + rot: -1.5707963267948966 rad + pos: -15.5,-15.5 parent: 1 - uid: 68 components: - type: Transform - pos: 16.5,-15.5 + rot: -1.5707963267948966 rad + pos: -1.5,-10.5 parent: 1 - uid: 69 components: - type: Transform - pos: 16.5,-13.5 + pos: -11.5,-16.5 parent: 1 - uid: 70 components: - type: Transform - pos: -15.5,-13.5 + rot: -1.5707963267948966 rad + pos: -9.5,-5.5 + parent: 1 + - uid: 1016 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,11.5 parent: 1 - proto: AtmosFixBlockerMarker entities: @@ -2758,89 +2770,59 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 430 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 431 components: - type: Transform pos: -6.5,11.5 parent: 1 - - type: DeviceLinkSink - links: - - 1452 - uid: 432 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,23.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 433 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,23.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 434 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,23.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 435 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,23.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 436 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,23.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 437 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - uid: 438 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,22.5 parent: 1 - - type: DeviceLinkSink - links: - - 1453 - proto: BlastDoorOpen entities: - uid: 439 @@ -2848,60 +2830,39 @@ entities: - type: Transform pos: -13.5,-13.5 parent: 1 - - type: DeviceLinkSink - links: - - 1449 - uid: 440 components: - type: Transform pos: -13.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 1449 - uid: 441 components: - type: Transform pos: 14.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 1450 - uid: 442 components: - type: Transform pos: 14.5,-13.5 parent: 1 - - type: DeviceLinkSink - links: - - 1450 - uid: 443 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-11.5 parent: 1 - - type: DeviceLinkSink - links: - - 1451 - uid: 444 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-11.5 parent: 1 - - type: DeviceLinkSink - links: - - 1451 - uid: 445 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-11.5 parent: 1 - - type: DeviceLinkSink - links: - - 1451 - proto: BrigTimer entities: - uid: 446 @@ -5495,6 +5456,13 @@ entities: - type: Transform pos: 1.5,14.5 parent: 1 +- proto: GasAnalyzer + entities: + - uid: 1033 + components: + - type: Transform + pos: -6.641932,6.5611343 + parent: 1 - proto: GasDualPortVentPump entities: - uid: 961 @@ -7425,43 +7393,31 @@ entities: - type: Transform pos: 12.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1222 components: - type: Transform pos: 11.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1223 components: - type: Transform pos: 13.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1224 components: - type: Transform pos: -12.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1225 components: - type: Transform pos: -10.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1226 components: - type: Transform pos: -11.5,-6.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: HighSecArmoryLocked entities: - uid: 1227 @@ -7474,6 +7430,13 @@ entities: - type: Transform pos: -0.5,4.5 parent: 1 +- proto: HolofanProjector + entities: + - uid: 1027 + components: + - type: Transform + pos: -6.329432,6.310961 + parent: 1 - proto: HospitalCurtainsOpen entities: - uid: 1229 @@ -8205,6 +8168,11 @@ entities: parent: 1 - proto: Rack entities: + - uid: 1018 + components: + - type: Transform + pos: -6.5,6.5 + parent: 1 - uid: 1339 components: - type: Transform @@ -8830,113 +8798,71 @@ entities: - type: Transform pos: -9.5,-13.5 parent: 1 - - type: DeviceLinkSink - links: - - 1447 - uid: 1430 components: - type: Transform pos: 7.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1431 components: - type: Transform pos: 6.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1432 components: - type: Transform pos: 5.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1433 components: - type: Transform pos: 4.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1434 components: - type: Transform pos: -3.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1435 components: - type: Transform pos: -4.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1436 components: - type: Transform pos: -5.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1437 components: - type: Transform pos: -6.5,-9.5 parent: 1 - - type: DeviceLinkSink - links: - - 1446 - uid: 1438 components: - type: Transform pos: -9.5,-14.5 parent: 1 - - type: DeviceLinkSink - links: - - 1447 - uid: 1439 components: - type: Transform pos: -9.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 1447 - uid: 1440 components: - type: Transform pos: 10.5,-15.5 parent: 1 - - type: DeviceLinkSink - links: - - 1448 - uid: 1441 components: - type: Transform pos: 10.5,-14.5 parent: 1 - - type: DeviceLinkSink - links: - - 1448 - uid: 1442 components: - type: Transform pos: 10.5,-13.5 parent: 1 - - type: DeviceLinkSink - links: - - 1448 - proto: ShuttersNormalOpen entities: - uid: 1443 @@ -8945,18 +8871,12 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-4.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - uid: 1444 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-3.5 parent: 1 - - type: DeviceLinkSink - links: - - 1445 - proto: SignalButton entities: - uid: 1445 @@ -9125,7 +9045,7 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 1 -- proto: SignSecurity +- proto: SignNfsd entities: - uid: 1459 components: @@ -9512,218 +9432,162 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 969 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 970 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 971 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 976 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 993 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-3.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1517 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1522 components: - type: Transform pos: -11.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1523 components: - type: Transform rot: 3.141592653589793 rad pos: -11.5,0.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1524 components: - type: Transform pos: -12.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1525 components: - type: Transform pos: -10.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1530 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,0.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1531 components: - type: Transform pos: 11.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1532 components: - type: Transform pos: 12.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1533 components: - type: Transform pos: 13.5,-1.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1538 components: - type: Transform rot: 3.141592653589793 rad pos: -12.5,0.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1539 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,0.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1540 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,0.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1541 components: - type: Transform rot: 3.141592653589793 rad pos: 13.5,0.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1542 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1543 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-8.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1544 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-9.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1545 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-11.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1546 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1547 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-10.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1548 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-8.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1549 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,-7.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - uid: 1550 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-10.5 parent: 1 - - type: Thruster - originalPowerLoad: 1500 - proto: ToiletEmpty entities: - uid: 1551 @@ -11496,18 +11360,12 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,3.5 parent: 1 - - type: DeviceLinkSink - links: - - 446 - uid: 1872 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-0.5 parent: 1 - - type: DeviceLinkSink - links: - - 447 - proto: WindowFrostedDirectional entities: - uid: 1873 From e9739ed9630388fa2448c0b9bd54f2494e76cae9 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 13 Oct 2024 04:51:28 +0000 Subject: [PATCH 90/96] Automatic Changelog (#2160) --- Resources/Changelog/Frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index bf4624f69d5..0f9e998e017 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4486,3 +4486,11 @@ Entries: message: Added an appraisal program cartridge for PDAs id: 5392 time: '2024-10-13T04:50:29.0000000+00:00' +- author: chrome-cirrus + changes: + - type: Tweak + message: >- + Replaced Marauder tiny fans with directional fans. Added a fan to the + forward airlock. Added some atmos tools to the atmos room. + id: 5393 + time: '2024-10-13T04:51:02.0000000+00:00' From 60730ca66b6d82fea2fc4487592e6d336dc3a1c1 Mon Sep 17 00:00:00 2001 From: Long YM <40413261+Mygnol@users.noreply.github.com> Date: Sun, 13 Oct 2024 13:02:54 +0800 Subject: [PATCH 91/96] Add guidebook entry for skipper and placebo (#2128) Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Locale/en-US/_NF/guidebook/guides.ftl | 2 + .../Prototypes/_NF/Guidebook/shipyard.yml | 12 +++ .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 24 ++++++ Resources/Prototypes/_NF/Shipyard/placebo.yml | 14 +++- Resources/Prototypes/_NF/Shipyard/skipper.yml | 2 +- .../_NF/Guidebook/Shipyard/Placebo.xml | 77 +++++++++++++++++ .../_NF/Guidebook/Shipyard/Skipper.xml | 78 ++++++++++++++++++ .../shuttle_maps/128x96.rsi/meta.json | 8 +- .../shuttle_maps/128x96.rsi/placebo.png | Bin 0 -> 1133 bytes .../shuttle_maps/128x96.rsi/skipper.png | Bin 0 -> 1352 bytes 10 files changed, 213 insertions(+), 4 deletions(-) create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/placebo.png create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/skipper.png diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index f67b938ffd5..b40d6e4b2f0 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -55,8 +55,10 @@ guide-entry-shipyard-mccargo = McCargo guide-entry-shipyard-mcdelivery = McDelivery guide-entry-shipyard-pathfinder = Pathfinder guide-entry-shipyard-pioneer = Pioneer +guide-entry-shipyard-placebo = Placebo guide-entry-shipyard-prospector = Prospector guide-entry-shipyard-searchlight = Searchlight +guide-entry-shipyard-skipper = Skipper guide-entry-shipyard-spirit = Spirit guide-entry-shipyard-stasis = Stasis guide-entry-shipyard-vagabond = Vagabond diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 178aa6a5642..63092add988 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -35,8 +35,10 @@ - ShipyardMcDelivery - ShipyardPathfinder - ShipyardPioneer + - ShipyardPlacebo - ShipyardProspector - ShipyardSearchlight + - ShipyardSkipper - ShipyardSpirit - ShipyardStasis - ShipyardVagabond @@ -196,6 +198,11 @@ name: guide-entry-shipyard-pioneer text: "/ServerInfo/_NF/Guidebook/Shipyard/Pioneer.xml" +- type: guideEntry + id: ShipyardPlacebo + name: guide-entry-shipyard-placebo + text: "/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml" + - type: guideEntry id: ShipyardProspector name: guide-entry-shipyard-prospector @@ -206,6 +213,11 @@ name: guide-entry-shipyard-searchlight text: "/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml" +- type: guideEntry + id: ShipyardSkipper + name: guide-entry-shipyard-skipper + text: "/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml" + - type: guideEntry id: ShipyardSpirit name: guide-entry-shipyard-spirit diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml index 3c4b9fed4e9..4e167e87b15 100644 --- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml @@ -286,6 +286,18 @@ state: pioneer scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapPlacebo + name: "NC Placebo" + description: "Detailed map of a Placebo shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: placebo + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapProspector @@ -310,6 +322,18 @@ state: searchlight scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapSkipper + name: "NC Skipper" + description: "Detailed map of a Skipper shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: skipper + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapSpirit diff --git a/Resources/Prototypes/_NF/Shipyard/placebo.yml b/Resources/Prototypes/_NF/Shipyard/placebo.yml index bce170575e7..2d674a1a661 100644 --- a/Resources/Prototypes/_NF/Shipyard/placebo.yml +++ b/Resources/Prototypes/_NF/Shipyard/placebo.yml @@ -1,12 +1,22 @@ +# Author Info +# GitHub: ??? +# Discord: ??? + +# Maintainer Info +# GitHub: ??? +# Discord: ??? + +# Shuttle Notes: +# - type: vessel id: Placebo name: NC Placebo - description: A small psychology vessel. Named after the famous Placebo effect + description: A small psychology vessel. Named after the famous Placebo effect. price: 20000 category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/placebo.yml - guidebookPage: Null + guidebookPage: ShipyardPlacebo class: - Medical diff --git a/Resources/Prototypes/_NF/Shipyard/skipper.yml b/Resources/Prototypes/_NF/Shipyard/skipper.yml index 9ad872b8ae8..144de23f9d2 100644 --- a/Resources/Prototypes/_NF/Shipyard/skipper.yml +++ b/Resources/Prototypes/_NF/Shipyard/skipper.yml @@ -16,7 +16,7 @@ category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/skipper.yml - guidebookPage: Null + guidebookPage: ShipyardSkipper class: - Kitchen diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml new file mode 100644 index 00000000000..73c1cf2baea --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Placebo.xml @@ -0,0 +1,77 @@ + + # PLACEBO-CLASS PSYCHOLOGY SHUTTLE + + + + + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 1-2 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A small psychology vessel. Named after the famous Placebo effect." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator unit + + + + + + - Check that the P.A.C.M.A.N. generator units are anchored to the floor. + - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator units are set to HV output. + - Set Target Power to 10-11 [bold]kW[/bold]. + - Start the P.A.C.M.A.N. generator units. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + + - Check if the O2 canister and N2 canister are anchored to their connector ports. + - Check if the gas mixer has its mixing ratio and output pressure set correctly. + - Enable the gas mixer. + + ## 3. Other checks + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + + ## Sidenotes + + * - Placebo-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the P.A.C.M.A.N. generator units Target Power output: to keep substation and APCs fully charged, P.A.C.M.A.N. generator unit Target Power output should exceed the combined load of all APCs. Remember to check APC Loads and adjust the generator unit Target Power after connecting new power-consuming machines. The average combined load of all APCs on a stock model Placebo-class ship is 16'000W when idle. + + ** - Placebo-class service ships have low power demand meaning that the P.A.C.M.A.N. generator unit's Target Power value can be lowered as low as 10 kW. Please note, that recommended Target Power value to avoid blackouts during Gravity Generator charging sequence and extensive power use is 11 kW. + diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml new file mode 100644 index 00000000000..b77969d7bc1 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Skipper.xml @@ -0,0 +1,78 @@ + + # SKIPPER-CLASS SERVICE SHUTTLE + + + + + + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 2-3 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A small service ship with a full service kitchen and hydroponics garden." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator unit + + + + + + - Check that the P.A.C.M.A.N. generator units are anchored to the floor. + - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator units are set to HV output. + - Set Target Power to 8-9** [bold]kW[/bold]. + - Start the P.A.C.M.A.N. generator units. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + + - Check if the O2 canister and N2 canister are anchored to their connector ports. + - Check if the gas mixer has its mixing ratio and output pressure set correctly. + - Enable the gas mixer. + + ## 3. Other checks + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + + ## Sidenotes + + * - Skipper-class service ships are equipped with a single APC unit that can be used to appraise the ship's total power consumption. One can check the ship's total power consumption against the P.A.C.M.A.N. generator units Target Power output: to keep substation and APCs fully charged, P.A.C.M.A.N. generator unit Target Power output should exceed the combined load of all APCs. Remember to check APC Loads and adjust the generator unit Target Power after connecting new power-consuming machines. The average combined load of all APCs on a stock model Skipper-class ship is 16'000W when idle. + + ** - Skipper-class service ships have low power demand meaning that the P.A.C.M.A.N. generator unit's Target Power value can be lowered as low as 8 kW. Please note, that recommended Target Power value to avoid blackouts during Gravity Generator charging sequence and extensive power use is 9 kW. + diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json index 240a6812db6..6bf47f987de 100644 --- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json +++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, hauler by Mygnol (discord/github)", + "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, hauler, placebo, skipper by Mygnol (discord/github)", "size": { "x": 128, "y": 96 @@ -79,12 +79,18 @@ { "name": "pioneer" }, + { + "name": "placebo" + }, { "name": "prospector" }, { "name": "searchlight" }, + { + "name": "skipper" + }, { "name": "spirit" }, diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/placebo.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/placebo.png new file mode 100644 index 0000000000000000000000000000000000000000..cc86a38e33933d83480fcbe1a7b059240d0b2538 GIT binary patch literal 1133 zcmV-z1d{uSP)s3`a!m`+TH5D_g>SZJ$aXEcJA{sSp2Oz|xA!QQ^vz1_Xt+q;|Zr@1%xcK7yW z=Vs@2XD&nl00000000000000`V)!4M%$?WI4HcT|JBWZffFVb{9gv@Wz7>YU;jk!* z!X#JK3r6ooo?y6n@AZygYy+7`g2+(=1u%K<9@KxUlHFz(iRV9FCrn{OU( z9{}_VD1dPG=k7oX7Oq|nGPwuOZ90|v{q{;pUVrhjv-3MFfN;Dlfch+NTMXi4wT|g~ z&^*oxFdBS)fk!Q)%6eID0SN=2pITEu-A$f0KORY;mJ?X_j&9Nde7Nz)q11V&wq|Lf zB;S5ot;k#%-I*k6-l2510Ni@M4Sg$kRNod)0Gh|k0_bzR={ruYst@vj$3WqDJq4uf zNLx7e+RYD8`LX%gUSKf8mN`7>eW~a;D?pb_Hs^4?J7gc&pBLUF>rb2MCB87Ax^XPbASl zgEV+Y1)CB>^>cL-MNBfRNL-K?P?KEI#A7eBcoBAA^fE7iTM2Ya4t1w5c?5_D2&6B0 z1Xu|a4irE*m;y4Q?@$sEePf1X{^B+f5pBJij@}1Y0O3FZIzWm$e*_djIAVMNedo>f zt)LwG%bmEn+yyQwX_4G^1GyJWg#Zg694LTrpa8;w0tlxw8$3k#wK0AW_J9NhlO*&9X44H@KBFjJ#07UAvh##6yIl(ecS2McC#zXD@(Mz zvXr|UR-*d=RguCbU;*+FT>)(I{nB`F?@{h9RO0=A18sM>Dyvh1?Z~y$COF6N=HO^a z=2imlpZrclM5_a$!Ro(rcfXz}mEl$bP0n1ZzfrA_Fk2v}DTtH{?riJeO8`Nk0jzCQ zmsw5UjVSaoC^RN@r+~JDl|TTxK&mMi7C<;q0O15Z1*i)=T)MdayswtCEfkr`yIjxj zX9I6c8$VoDukCx+4JFs36k6c}xO5_<3@2j`p&7h)17lp&B^4Y4+YH_oz%(%W`o2#) zwsuYUTn~WGlgc7uF8}}l0000000000015mB_*fEPrq+uu00000NkvXXu0mjfz^v&W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/skipper.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/skipper.png new file mode 100644 index 0000000000000000000000000000000000000000..7cfad9d6ce40b8c70ce5e4c916c93050a1bb8d2d GIT binary patch literal 1352 zcmV-O1-JT%P)FPzi(#W%)Ao<000000Ejq_W8G`=o;pt3+I-&ceZRVZV@w24=c{X0`KYw%q<`!v zilR7<<0y)vJo_@A=aGCbX@^Z6c|ZUJMK6}_;@Dn%A!sq$)?C#zEoH@RFZCtTAckv9HK^8m!b07fbKmg3~*4N2>{?gl*iVfAb zQ~mbh#P8g5Eq8lj>*IY&`N-T_?K!FQb%u8gVz#IsGIh6&1r~%)z zjq1QnOt?EIJ$THXb9AhyntZzAt`UI)55ODv>7ycl zGP(#~6;RPainc}v;Q^Qf0Wb#wU=9Sp9B+|8Ir2wF{Q`g*h>ouCi4MX8Fb4u)4g|m) zt3Zayaxa;MT_23<9)Gn>DKl9XPC+gAGHD0Z1`0Vi)WpCLJU|8L(#_~n#PqXwkunAX zsF8H`4{QBp?-h{u0hqSSg!u=L3jdzz2_TzStA?h42WSZL1d*#yFa*#LeEn|#1P}n}J6d+{ zF5NwaRV2`6$@gBdT`7C|TDmJr&ca^fa^{U;(kF4FiMSG|VTV#T$ zEUga(`(SE1nFPvC2F2G!<&!~Wg#ZDR;N!`m%<+~R?;95ih5#(Mbm8ADpu==VwShq( zb87VfRKVrylG*+NTa-2b!>Y~9j(0|N%}8T_CjJGJR}Zk!*vAL1(=XLTDD=3soU-2dh$o6kpf7tiZOJvhf}1H z9N;mt^F0~lLj+a=kTY+PIrr0_uk^@l9sO)&h@ge{f~9B&=>Q24D^Z zz#IsGIZpNl=Ix2gd&HsA%vVjB9lb?n_@(m(QJ)t*?sp9u{S?p^`UQS;i6PSO zO#(@j2+#!tfG+fFvUA8blnem`fG+f#=K-jTTO^bW0W<)4O1S889^L~NF5=v_gT*GM zY^j<`1mOD|z#OG}sH-7GfCumg#sD>A(w|f1a#@_Bs Date: Sun, 13 Oct 2024 13:16:30 +0800 Subject: [PATCH 92/96] Added Honker and Sparrow to guidebook (#2150) Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> --- .../Locale/en-US/_NF/guidebook/guides.ftl | 2 + .../Prototypes/_NF/Guidebook/shipyard.yml | 12 +++ .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 24 +++++ Resources/Prototypes/_NF/Shipyard/honker.yml | 12 ++- Resources/Prototypes/_NF/Shipyard/sparrow.yml | 2 +- .../_NF/Guidebook/Shipyard/Honker.xml | 85 ++++++++++++++++ .../_NF/Guidebook/Shipyard/Sparrow.xml | 94 ++++++++++++++++++ .../shuttle_maps/128x96.rsi/honker.png | Bin 0 -> 1005 bytes .../shuttle_maps/128x96.rsi/meta.json | 8 +- .../shuttle_maps/128x96.rsi/sparrow.png | Bin 0 -> 1390 bytes 10 files changed, 236 insertions(+), 3 deletions(-) create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/honker.png create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/sparrow.png diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index b40d6e4b2f0..c41173ce9dc 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -44,6 +44,7 @@ guide-entry-shipyard-gourd = Gourd guide-entry-shipyard-hammer = Hammer guide-entry-shipyard-hauler = Hauler guide-entry-shipyard-harbormaster = Harbormaster +guide-entry-shipyard-honker = Honker guide-entry-shipyard-investigator = Investigator guide-entry-shipyard-kestrel = Kestrel guide-entry-shipyard-kilderkin = Kilderkin @@ -58,6 +59,7 @@ guide-entry-shipyard-pioneer = Pioneer guide-entry-shipyard-placebo = Placebo guide-entry-shipyard-prospector = Prospector guide-entry-shipyard-searchlight = Searchlight +guide-entry-shipyard-sparrow = Sparrow guide-entry-shipyard-skipper = Skipper guide-entry-shipyard-spirit = Spirit guide-entry-shipyard-stasis = Stasis diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml index 63092add988..b5c28706a5f 100644 --- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml +++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml @@ -24,6 +24,7 @@ - ShipyardHammer - ShipyardHauler - ShipyardHarbormaster + - ShipyardHonker - ShipyardInvestigator - ShipyardKestrel - ShipyardKilderkin @@ -38,6 +39,7 @@ - ShipyardPlacebo - ShipyardProspector - ShipyardSearchlight + - ShipyardSparrow - ShipyardSkipper - ShipyardSpirit - ShipyardStasis @@ -143,6 +145,11 @@ name: guide-entry-shipyard-hauler text: "/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml" +- type: guideEntry + id: ShipyardHonker + name: guide-entry-shipyard-honker + text: "/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml" + - type: guideEntry id: ShipyardInvestigator name: guide-entry-shipyard-investigator @@ -213,6 +220,11 @@ name: guide-entry-shipyard-searchlight text: "/ServerInfo/_NF/Guidebook/Shipyard/Searchlight.xml" +- type: guideEntry + id: ShipyardSparrow + name: guide-entry-shipyard-sparrow + text: "/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml" + - type: guideEntry id: ShipyardSkipper name: guide-entry-shipyard-skipper diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml index 4e167e87b15..65b01d5a8f5 100644 --- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml +++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml @@ -178,6 +178,18 @@ state: hauler scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapHonker + name: "NT Honker" + description: "Detailed map of a Honker shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: honker + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapInvestigator @@ -322,6 +334,18 @@ state: searchlight scale: 1.2, 1.2 +- type: entity + parent: PosterBase + id: ShuttleMapSparrow + name: "NR Sparrow" + description: "Detailed map of a Sparrow shuttle." + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: _NF/Guidebook/shuttle_maps/128x96.rsi + state: sparrow + scale: 1.2, 1.2 + - type: entity parent: PosterBase id: ShuttleMapSkipper diff --git a/Resources/Prototypes/_NF/Shipyard/honker.yml b/Resources/Prototypes/_NF/Shipyard/honker.yml index dd8f7b387a7..c2d2ec4342c 100644 --- a/Resources/Prototypes/_NF/Shipyard/honker.yml +++ b/Resources/Prototypes/_NF/Shipyard/honker.yml @@ -1,3 +1,13 @@ +# Author Info +# GitHub: ??? +# Discord: ??? + +# Maintainer Info +# GitHub: ??? +# Discord: ??? + +# Shuttle Notes: +# - type: vessel id: Honker name: NT Honker @@ -6,7 +16,7 @@ category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/honker.yml - guidebookPage: Null + guidebookPage: ShipyardHonker class: - Civilian diff --git a/Resources/Prototypes/_NF/Shipyard/sparrow.yml b/Resources/Prototypes/_NF/Shipyard/sparrow.yml index 63ab14ded26..2cbb753ee00 100644 --- a/Resources/Prototypes/_NF/Shipyard/sparrow.yml +++ b/Resources/Prototypes/_NF/Shipyard/sparrow.yml @@ -16,7 +16,7 @@ category: Small group: Shipyard shuttlePath: /Maps/_NF/Shuttles/sparrow.yml - guidebookPage: Null + guidebookPage: ShipyardSparrow class: - Science - Engineering diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml new file mode 100644 index 00000000000..28ede46efcf --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Honker.xml @@ -0,0 +1,85 @@ + + # HONKER-CLASS CLOWN SHUTTLE + + + + + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 1-2 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "HONK HONK HONK HONK HONK HONK" + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator unit + + + + + + - Check that the P.A.C.M.A.N. generator unit is anchored to the floor. + - Check that the P.A.C.M.A.N. generator unit has fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator unit is set to HV output. + - Set Target Power for 9-10** [bold]kW[/bold]. + - Ensure that the P.A.C.M.A.N. generator unit is enabled. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + - Check that the Air canister is anchored to connector port. + - Ensure that the distro loop pump is enabled. + + ## 2.2. Waste Loop + + + + + + - Ensure that the waste loop pump is enabled. + - Disable Auto Mode on any Air Alarms. + - Set the Air Alarms to Filtering (Wide). + + ## 3. Other checks + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + + ## Sidenotes + + * - Honker-class clown ships are equipped with an APC unit that can be used to appraise the ship's total power consumption. An unmodified Honker-class ship requires 8.4 kW of power to remain operational. + + ** - Honker-class clown ships have low power demand meaning that standard P.A.C.M.A.N. generator unit's Target Power value can be lowered as low as 9 kW. Please note, that recommended Target Power value to avoid blackouts during Gravity Generator charging sequence is 10 kW. + + diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml new file mode 100644 index 00000000000..c090d141a46 --- /dev/null +++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Sparrow.xml @@ -0,0 +1,94 @@ + + # SPARROW-CLASS RESEARCH SHUTTLE + + + + + + + + + + + [color=#a4885c]Ship Size:[/color] Small + + [color=#a4885c]Recommended Crew:[/color] 1-2 + + [color=#a4885c]Power Gen Type:[/color] Plasma + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "A small research and engineering vessel." + + # PREFLIGHT CHECKLIST + + ## 1. Power supply + + ## 1.1. Battery units + + + + + + + - Check that the SMES unit is anchored to the floor. + - Check that the substation unit is anchored to the floor. + - Check that the APC unit's Main Breaker is toggled on. + - Check the APC unit's current Load* (W). + + ## 1.2. P.A.C.M.A.N. generator units + + + + + + - Check that the P.A.C.M.A.N. generator units are anchored to the floor. + - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight. + - Check that the P.A.C.M.A.N. generator units are set to HV output. + - Set Target Power for 19** [bold]kW[/bold]. + - Ensure that the P.A.C.M.A.N. generator units are enabled. + + ## 2. Atmospherics + + ## 2.1. Distribution Loop + + + + + + + + - Check that the O2 canister is anchored to connector port. + - Check that the N2 canister is anchored to connector port. + - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen). + - Check that the gas mixer is set to 101kPa. + - Ensure that the gas mixer is enabled. + + ## 2.2. Waste Loop + + + + + + - Ensure that the waste loop pump is enabled. + - Disable Auto Mode on any Air Alarms. + - Set the Air Alarms to Filtering (Wide). + + ## 3. Other checks + + + + + + - Check that the gyroscope is anchored, powered, and enabled. + - Check that the mini gravity generator is anchored, powered, and enabled. + + ## Sidenotes + + * - Sparrow-class research ships are equipped with two APC units that can be used to appraise the ship's total power consumption. An unmodified Sparrow-class ship requires 36.1 kW of power to remain operational. + + ** - Sparrow-class research ships have higher power demand than standard P.A.C.M.A.N. generator units can provide at optimal settings. Unanchoring the artifact analyzer when not used will allow for the generator units to be set to as low as 13 kW. + + diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/honker.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/honker.png new file mode 100644 index 0000000000000000000000000000000000000000..1e28c20f6a8cfeebf12d1e751100f0fd073d3b9e GIT binary patch literal 1005 zcmeAS@N?(olHy`uVBq!ia0vp^4M3d0!3HF+R#kZdDb50q$YKTt(<>m%7?=8#gMop0 zzNd?0NX4ADclUN(br3o5arYu6?q5t-jBjXYF0`2u2 zhm<&?GBP#AvNravjas3fpt#6Y=Z?di{wGh)&Ggyy{D1bldp>HMvyJ6v`V^%b1MLNY z1A5zoeld9MD*IZb8kt}Ew(_0x%)d3Yu3PS1PS+1Pe^c&kZ(1j%{4eWO{y(p-?Nfqz8jPxbYcNstP|#>D)U3Rd0k3dvh_Y`n=<@{_kEn zKEqeylSCMT^><$S$?)*u!wvq^<8*6nR8`Cw&wktY@7|x=zN-tAz|NJ3H6PzY^YYyLh&2xy+*M>L2kR3mf+R<@la*iQhB$Pg%h$j|8um zd}r5B{>I(5!1lksOR0=P$=&bh2FA-Ha(U(3pulsv2d=G!a zCSXu>l`}0@F!8#cUf{85Z_oaUeba=Hl5uxml(+9{V^+LvVk|u|2gD_HVn8@=G;P@w6G^^Ze7zDLylVmZfB= z?st=iIt$`Bi*-yg3-5opJLl*2{H34&Kl#j(x?gsU?$6MTXTN`GwR_7W<{Mlj{9xZ| z^C^A;J=0IEZ_AY7I2Evx(S(mBbwwGI?%nJ6t#&-rjgH;@c>VXUbqe3xdEB?iOtoy> zn7U_u{huAOb1v2d{^HnGXnjL*u2|itBa-dXX^VD8mK6p#Hard*A53bZT&YpksaOFyN zhgT;HKO0Y)G5wUsg6Ldx|A^arn!TOt4e0000000000kOVbVLY8IOzf84Sjm!Bwvh*y=vi$yL8D7q3XMj8F zRSEf%nBUj@UzW!A$RqW)7Wl(S0cwBA%Q%s7qcj0BWLLlIblxsA0PN5zfXe>MWL18?Rh9J#xA~k8 zv#$ktbFZoVvWHgvhhIE0*~WpEIp(ftO+fwt&HrWlWa)W-Aup@aQ$uyI}z($x!e{mQMv{+0KywDsNC z@1-cO?_L$s`5Hf08*Vzj3DfaI@)0ltBn}iHai9Q+6ND`?t>ZuZb3|HhVt$;S9G)rc zpWiqq$W?uS<74lg%0GU(OOQi;&mh_vU}Ao}(@p3KqE!Ik2dDP}LP9q619yT@0Mk1D zr4ezuZ^i+d@HhZ1iatQ6Y4v*sRe%Xd94J8IKmigbi2Kn~_rCp1_%@&ai9R6Sa?y*OmvDM;sCzk zae|qRCo7eIcc3eWiHI-*Bu^9yFfl)lhd(VM3IzbIBO2r8^6-a08*q&S@baS+r-Nq$ zW`M+j0wfL;AaSDc0bJng^2u>cV4?h2#RdfoW`M+j0wfL;AaR250SY#kithpB*ZLdZ z)njV{$A3N)WPYE|WB-#R{$2oop3fN~@m&D^9zn5x;eZ(+ai9Q+0|iK&AbbE0U(+|i z(s^wE{JH0Xe1={M@{HkG0ADZAb4Xkhc< zeUGOOYZH)V>MwxFJ|3mgQdND;dQ|yi!B@L&l%ULK<~Y_0;Q9?fS-P%1-q2XRYTGY? zxz=Mdeq|^f3YJ~{Wxo*Cs?W!D0$smd`pN5Y8P77u3z}GbfEclw0b=f8yNF?oqMr$T z62l2=2i9=_-9GN|gLo(v32ZtR+-rvt#7F5+uGTnc?=(;V2XNQZMVR6kWqkluUJw{K wF>6HWwfmsm3J~iZ5&!@I00000006p&Kjo}%ZDQ$_I{*Lx07*qoM6N<$f;U}^^#A|> literal 0 HcmV?d00001 From 7c4801678c01710847851adbe41d0734261f8614 Mon Sep 17 00:00:00 2001 From: PECK <74548962+PeccNeck@users.noreply.github.com> Date: Sun, 13 Oct 2024 01:43:10 -0400 Subject: [PATCH 93/96] Shovel fixes (#2188) * fix weird-ass shovel * make shovel shovel again (oops) * fix the problem i created (snow yaml error) --- Content.Shared/Maps/ContentTileDefinition.cs | 4 +++- .../Prototypes/Entities/Objects/Tools/tools.yml | 4 +++- Resources/Prototypes/Tiles/floors.yml | 15 ++++++++++----- Resources/Prototypes/Tiles/planet.yml | 3 ++- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 32f5db0e821..098a5e8b4d9 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -15,6 +15,7 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto { [ValidatePrototypeId] public const string PryingToolQuality = "Prying"; + public const string DiggingToolQuality = "Digging"; // Frontier public const string SpaceID = "Space"; @@ -46,13 +47,14 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto public PrototypeFlags DeconstructTools { get; set; } = new(); // Delta V - [DataField("canShovel")] public bool CanShovel { get; private set; } + // [DataField("canShovel")] public bool CanShovel { get; private set; } //Delta V /// /// Legacy AF but nice to have. /// public bool CanCrowbar => DeconstructTools.Contains(PryingToolQuality); + public bool CanShovel => DeconstructTools.Contains(DiggingToolQuality); // Frontier /// /// These play when the mob has shoes on. diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 1431cfceb01..b89dd3c1891 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -485,10 +485,12 @@ - type: Tool qualities: - Digging + speedModifier: 0.5 # Frontier useSound: path: /Audio/Nyanotrasen/Items/shovel_dig.ogg - - type: EarthDigging + # - type: EarthDigging # Frontier - type: Shovel + - type: ToolTileCompatible # Frontier - type: entity parent: BaseItem diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 2ee0bb36316..adc2180f589 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -1452,7 +1452,8 @@ sprite: /Textures/Tiles/grass.png baseTurf: FloorDirt #canCrowbar: false # Come back - canShovel: true # Delta V + # canShovel: true # Delta V # nuh uh frontier now + deconstructTools: [ Digging ] # Frontier isSubfloor: true footstepSounds: collection: FootstepGrass @@ -1466,7 +1467,8 @@ sprite: /Textures/Tiles/grassjungle.png baseTurf: FloorDirt #canCrowbar: false # Come back - canShovel: true # Delta V + # canShovel: true # Delta V # Frontier + deconstructTools: [ Digging ] # Frontier isSubfloor: true footstepSounds: collection: FootstepGrass @@ -1486,7 +1488,8 @@ - 1.0 baseTurf: FloorDirt #canCrowbar: false # Come back - canShovel: true # Delta V + # canShovel: true # Delta V # Frontier + deconstructTools: [ Digging ] # Frontier isSubfloor: true footstepSounds: collection: FootstepGrass @@ -1506,7 +1509,8 @@ - 1.0 baseTurf: FloorDirt #canCrowbar: false # Come back - canShovel: true # Delta V + # canShovel: true # Delta V # Frontier + deconstructTools: [ Digging ] # Frontier isSubfloor: true footstepSounds: collection: FootstepGrass @@ -1526,7 +1530,8 @@ - 1.0 baseTurf: FloorBedrock # Delta V #canCrowbar: false # Come back - canShovel: true # Delta V + # canShovel: true # Delta V # Frontier + deconstructTools: [ Digging ] # Frontier footstepSounds: collection: FootstepAsteroid itemDrop: FloorTileItemDirt # Delta V diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml index 4c0b9b69e51..df211465a16 100644 --- a/Resources/Prototypes/Tiles/planet.yml +++ b/Resources/Prototypes/Tiles/planet.yml @@ -124,7 +124,8 @@ West: /Textures/Tiles/Planet/Snow/snow_double_edge_west.png baseTurf: FloorDirt itemDrop: FloorTileItemSnow # Delta V - canShovel: true # Delta V + deconstructTools: [ Digging ] # Frontier + # canShovel: true # Delta V # Frontier isSubfloor: true footstepSounds: collection: FootstepSnow From a38320e07e90b43a8a53faf3a3e523fcc3a6d9b9 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 13 Oct 2024 05:43:36 +0000 Subject: [PATCH 94/96] Automatic Changelog (#2188) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 0f9e998e017..775bf105ad9 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4494,3 +4494,9 @@ Entries: forward airlock. Added some atmos tools to the atmos room. id: 5393 time: '2024-10-13T04:51:02.0000000+00:00' +- author: PeccNeck + changes: + - type: Fix + message: Fixed Shovel instantly digging on cancel + id: 5394 + time: '2024-10-13T05:43:10.0000000+00:00' From 83e8731d64595cbd8ede874a0be853b1708ddc2a Mon Sep 17 00:00:00 2001 From: dustylens <54123313+dustylens@users.noreply.github.com> Date: Sun, 13 Oct 2024 05:45:27 +0000 Subject: [PATCH 95/96] Adds carpets to the tile cutter. (#2203) --- .../Entities/Structures/Machines/lathe.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 5267695bfc9..cb3e58ad6b1 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1528,6 +1528,22 @@ - FloorTileItemKitchen # Frontier - FloorTileItemLaundry # Frontier - SheetPaper # Frontier + - Carpet # Frontier + - CarpetBlack # Frontier + - CarpetPink # Frontier + - CarpetBlue # Frontier + - CarpetGreen # Frontier + - CarpetOrange # Frontier + - CarpetPurple # Frontier + - FloorCarpetItemSkyBlue # Frontier + - CarpetCyan # Frontier + - CarpetWhite # Frontier + - FloorTileItemCarpetClown # Frontier + - FloorTileItemCarpetOffice # Frontier + - FloorTileItemEighties # Frontier + - FloorTileItemArcadeBlue # Frontier + - FloorTileItemArcadeBlue2 # Frontier + - FloorTileItemArcadeRed # Frontier dynamicRecipes: - FauxTileAstroGrass # Frontier - FauxTileAstroIce # Frontier From b822f7dad66d3815e7989aebe672881887c34d06 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sun, 13 Oct 2024 05:45:52 +0000 Subject: [PATCH 96/96] Automatic Changelog (#2203) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 775bf105ad9..289e575c24c 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4500,3 +4500,9 @@ Entries: message: Fixed Shovel instantly digging on cancel id: 5394 time: '2024-10-13T05:43:10.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Adds carpets to the tile cutter. + id: 5395 + time: '2024-10-13T05:45:27.0000000+00:00'