diff --git a/.github/mapchecker/config.py b/.github/mapchecker/config.py index 3f795f474f5..d63ff51b81f 100644 --- a/.github/mapchecker/config.py +++ b/.github/mapchecker/config.py @@ -19,19 +19,21 @@ "SalvageShuttleMarker", "FTLPoint" ] +# List of specific legal entities that override the above. Does not check suffixes. +LEGAL_OVERRIDES = [ + "ButtonFrameCautionSecurity", # red button + "PosterLegitPDAAd", + "ShowcaseRobot" # decoration +] # List of matchers that are illegal to use, unless the map is a ship and the ship belongs to the keyed shipyard. CONDITIONALLY_ILLEGAL_MATCHES = { "Shipyard": [ - "ButtonFrameCautionSecurity", # Decal. ], "Scrap": [ - "ButtonFrameCautionSecurity", # Decal. ], "Expedition": [ - "ButtonFrameCautionSecurity", # Decal. ], "Custom": [ - "ButtonFrameCautionSecurity", # Decal. ], "Security": [ # These matchers are illegal unless the ship is part of the security shipyard. "Security", # Anything with the word security in it should also only be appearing on security ships. @@ -42,18 +44,20 @@ ], "Syndicate": [ "Plastitanium", # And also on blackmarket ships cause syndicate. - "ButtonFrameCautionSecurity", # Decal. "ShuttleGun", ], "BlackMarket": [ "Plastitanium", # And also on blackmarket ships cause syndicate. - "ButtonFrameCautionSecurity", # Decal. "ShuttleGun", ], "Sr": [ - "ButtonFrameCautionSecurity", # Decal. ], "Medical": [ - "ButtonFrameCautionSecurity", # Decal. + ], + # It is assumed that mapped instances of plastitanium, security gear, etc. are deemed acceptable + "PointOfInterest": [ + "Plastitanium", + "Security", + "HighSecDoor" ] } diff --git a/.github/mapchecker/mapchecker.py b/.github/mapchecker/mapchecker.py index e57606487ec..bdfe2687d86 100755 --- a/.github/mapchecker/mapchecker.py +++ b/.github/mapchecker/mapchecker.py @@ -25,9 +25,8 @@ default=[ "Resources/Prototypes/Entities", # Upstream "Resources/Prototypes/_NF/Entities", # NF - "Resources/Prototypes/_Nyano/Entities", # Nyanotrasen - "Resources/Prototypes/Nyanotrasen/Entities", # Nyanotrasen, again - "Resources/Prototypes/DeltaV/Entities", # DeltaV + "Resources/Prototypes/Nyanotrasen/Entities", # Nyanotrasen + "Resources/Prototypes/_DV/Entities", # DeltaV ] ) parser.add_argument( @@ -39,7 +38,7 @@ required=False, default=[ "Resources/Prototypes/_NF/Maps/Outpost", # Frontier Outpost - "Resources/Prototypes/_NF/Maps/POI", # Points of interest + "Resources/Prototypes/_NF/PointsOfInterest", # Points of interest "Resources/Prototypes/_NF/Shipyard", # Shipyard ships. ] ) @@ -168,16 +167,20 @@ # specific group. shipyard_override = None + # FIXME: this breaks down with multiple descriptions in one file. for item in file_data: if item["type"] == "gameMap": # This yaml entry is the map descriptor. Collect its file location and map name. if "id" in item.keys(): map_name = item["id"] map_file_location = item["mapPath"] if "mapPath" in item.keys() else None - if item["type"] == "vessel": + elif item["type"] == "vessel": # This yaml entry is a vessel descriptor! shipyard_group = item["group"] if "group" in item.keys() else None shipyard_override = item["mapchecker_group_override"] if "mapchecker_group_override" in item.keys() else None + elif item["type"] == "pointOfInterest": + shipyard_group = "PointOfInterest" + shipyard_override = item["mapchecker_group_override"] if "mapchecker_group_override" in item.keys() else None if map_file_location is None: # Silently skip. If the map doesn't have a mapPath, it won't appear in game anyways. diff --git a/.github/mapchecker/util.py b/.github/mapchecker/util.py index bfa9036cddc..6d2efe03a4f 100644 --- a/.github/mapchecker/util.py +++ b/.github/mapchecker/util.py @@ -4,7 +4,7 @@ from typing import List, Union from logging import Logger, getLogger -from config import ILLEGAL_MATCHES, CONDITIONALLY_ILLEGAL_MATCHES +from config import ILLEGAL_MATCHES, LEGAL_OVERRIDES, CONDITIONALLY_ILLEGAL_MATCHES def get_logger(debug: bool = False) -> Logger: @@ -49,6 +49,13 @@ def check_prototype(proto_id: str, proto_name: str, proto_suffixes: List[str]) - - False if the prototype is globally illegal (matched by ILLEGAL_MATCHES) - A list of shipyard keys if the prototype is conditionally illegal (matched by CONDITIONALLY_ILLEGAL_MATCHES) """ + # Check against LEGAL_OVERRIDES (no suffix!) + for legal_match in LEGAL_OVERRIDES: + if legal_match.lower() in proto_name.lower(): + return True + + if legal_match.lower() in proto_id.lower(): + return True # Check against ILLEGAL_MATCHES. for illegal_match in ILLEGAL_MATCHES: diff --git a/.github/mapchecker/whitelist.yml b/.github/mapchecker/whitelist.yml index 49adaa457c7..21146c8723b 100644 --- a/.github/mapchecker/whitelist.yml +++ b/.github/mapchecker/whitelist.yml @@ -3,19 +3,8 @@ Frontier: true Nfsd: true LPBravo: true Cove: true -Lodge: true -Trade: true # TECHNICAL DEBT BELOW. These ones were added to this list to ensure other PR's would not break upon merging. It is # the intention for this list to become empty in separate PR's. -Paladin: -- ShuttleGunDuster -Rogue: -- ShuttleGunFriendship -Bottleneck: -- PosterLegitPDAAd -Watchdog: -- WindoorSecureSecurityLocked -- AirlockSecurityGlassLocked -- ThrusterSecurity -- SmallGyroscopeSecurity +Tinnia: +- RubberStampSyndicate # existing meme diff --git a/.github/workflows/nf-mapchecker.yml b/.github/workflows/nf-mapchecker.yml index e25ba676533..e83ba431961 100644 --- a/.github/workflows/nf-mapchecker.yml +++ b/.github/workflows/nf-mapchecker.yml @@ -8,8 +8,7 @@ on: - "Resources/Prototypes/Entities/**/*.yml" - "Resources/Prototypes/_NF/Entities/**/*.yml" - "Resources/Prototypes/Nyanotrasen/Entities/**/*.yml" - - "Resources/Prototypes/_Nyano/Entities/**/*.yml" - - "Resources/Prototypes/DeltaV/Entities/**/*.yml" + - "Resources/Prototypes/_DV/Entities/**/*.yml" # Map pathspecs - If any maps are changed, this should run. - "Resources/Maps/**/*.yml" # Also the mapchecker itself diff --git a/.vscode/launch.json b/.vscode/launch.json index ef75c5b0f9e..0deb7c78080 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -59,6 +59,13 @@ "Client" ], "preLaunchTask": "build-release" + }, + { + "name": "Server/Client (No Build)", + "configurations": [ + "Server", + "Client" + ] } // Frontier end ] diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs index 4a72c149e32..2f7b29a51dc 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs +++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs @@ -9,7 +9,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; using static Content.Shared.Access.Components.IdCardConsoleComponent; -using static Content.Shared.Shipyard.Components.ShuttleDeedComponent; +using Content.Shared._NF.Shipyard.Components; // Frontier namespace Content.Client.Access.UI { @@ -243,7 +243,7 @@ private void EnsureValidShuttleName() var suffix = ShipSuffixLineEdit.Text; // We skip suffix validation because it's immutable and is ignored by the server - var valid = name.Length <= MaxNameLength + var valid = name.Length <= ShuttleDeedComponent.MaxNameLength && name.Trim().Length >= 3; // Arbitrary client-side number, should hopefully be long enough. ShipNameSaveButton.Disabled = !_interfaceEnabled || !valid; diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs index 6f91a0b3f60..8a5e0044334 100644 --- a/Content.Client/Ghost/GhostSystem.cs +++ b/Content.Client/Ghost/GhostSystem.cs @@ -11,7 +11,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Timing; using Robust.Shared.Player; -using Content.Server.Corvax.Respawn; +using Content.Client._Corvax.Respawn; // Frontier namespace Content.Client.Ghost { diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index 639f326f7f4..240d2f5ff76 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -56,6 +56,7 @@ public static void SetupContexts(IInputContextContainer contexts) human.AddFunction(EngineKeyFunctions.MoveRight); human.AddFunction(EngineKeyFunctions.Walk); human.AddFunction(ContentKeyFunctions.SwapHands); + human.AddFunction(ContentKeyFunctions.SwapHandsPrevious); // Frontier human.AddFunction(ContentKeyFunctions.Drop); human.AddFunction(ContentKeyFunctions.UseItemInHand); human.AddFunction(ContentKeyFunctions.AltUseItemInHand); @@ -100,6 +101,7 @@ public static void SetupContexts(IInputContextContainer contexts) aghost.AddFunction(EngineKeyFunctions.MoveRight); aghost.AddFunction(EngineKeyFunctions.Walk); aghost.AddFunction(ContentKeyFunctions.SwapHands); + aghost.AddFunction(ContentKeyFunctions.SwapHandsPrevious); // Frontier aghost.AddFunction(ContentKeyFunctions.Drop); aghost.AddFunction(ContentKeyFunctions.UseItemInHand); aghost.AddFunction(ContentKeyFunctions.AltUseItemInHand); diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index 5b99ae084ff..c574d4a63d3 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -216,20 +216,25 @@ public void UpdateCategories() /// Populates the build queue list with all queued items /// /// - public void PopulateQueueList(List queue) + public void PopulateQueueList(List queue) // Frontier: LatheRecipePrototype 1) + queuedRecipeLabel.Text = $"{idx}. {_lathe.GetRecipeName(batch.Recipe)} ({batch.ItemsPrinted}/{batch.ItemsRequested})"; + else + queuedRecipeLabel.Text = $"{idx}. {_lathe.GetRecipeName(batch.Recipe)}"; + // End Frontier queuedRecipeBox.AddChild(queuedRecipeLabel); QueueList.AddChild(queuedRecipeBox); idx++; diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 24be904e061..897ad52e344 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -181,6 +181,7 @@ void AddCheckBox(string checkBoxName, bool currentState, Action GhostRespawnPressed?.Invoke(); MouseFilter = MouseFilterMode.Ignore; diff --git a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs index 025bde5b64d..a34ae9ae798 100644 --- a/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs +++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs @@ -1,7 +1,7 @@ using Content.Client.UserInterface.Controls; using Content.Client.VendingMachines.UI; using Content.Shared.VendingMachines; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Robust.Client.UserInterface; using Robust.Shared.Input; using System.Linq; diff --git a/Content.Client/Corvax/Respawn/RespawnSystem.cs b/Content.Client/_Corvax/Respawn/RespawnSystem.cs similarity index 83% rename from Content.Client/Corvax/Respawn/RespawnSystem.cs rename to Content.Client/_Corvax/Respawn/RespawnSystem.cs index bbdfdc88b6a..6eb31028c6f 100644 --- a/Content.Client/Corvax/Respawn/RespawnSystem.cs +++ b/Content.Client/_Corvax/Respawn/RespawnSystem.cs @@ -1,6 +1,6 @@ -using Content.Shared.Corvax.Respawn; +using Content.Shared._Corvax.Respawn; -namespace Content.Server.Corvax.Respawn; +namespace Content.Client._Corvax.Respawn; public sealed class RespawnSystem : EntitySystem { diff --git a/Content.Client/Bank/BUI/BankATMMenuBoundUserInterface.cs b/Content.Client/_NF/Bank/BUI/BankATMMenuBoundUserInterface.cs similarity index 90% rename from Content.Client/Bank/BUI/BankATMMenuBoundUserInterface.cs rename to Content.Client/_NF/Bank/BUI/BankATMMenuBoundUserInterface.cs index 455388fd4ef..c3e428fc8c8 100644 --- a/Content.Client/Bank/BUI/BankATMMenuBoundUserInterface.cs +++ b/Content.Client/_NF/Bank/BUI/BankATMMenuBoundUserInterface.cs @@ -1,7 +1,6 @@ -using Content.Client.Bank.UI; -using Content.Shared.Bank.BUI; -using Content.Shared.Bank.Events; -using Robust.Client.GameObjects; +using Content.Client._NF.Bank.UI; +using Content.Shared._NF.Bank.BUI; +using Content.Shared._NF.Bank.Events; namespace Content.Client.Cargo.BUI; diff --git a/Content.Client/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs b/Content.Client/_NF/Bank/BUI/BankATMWithdrawOnlyMenuBoundUserInterface.cs similarity index 74% rename from Content.Client/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs rename to Content.Client/_NF/Bank/BUI/BankATMWithdrawOnlyMenuBoundUserInterface.cs index 54fabcf7d70..debcd158ed5 100644 --- a/Content.Client/Bank/BUI/WithdrawlBankATMMenuBoundUserInterface.cs +++ b/Content.Client/_NF/Bank/BUI/BankATMWithdrawOnlyMenuBoundUserInterface.cs @@ -1,14 +1,13 @@ -using Content.Client.Bank.UI; -using Content.Shared.Bank.BUI; -using Content.Shared.Bank.Events; +using Content.Shared._NF.Bank.BUI; +using Content.Shared._NF.Bank.Events; -namespace Content.Client.Cargo.BUI; +namespace Content.Client._NF.Bank.UI; -public sealed class WithdrawBankATMMenuBoundUserInterface : BoundUserInterface +public sealed class BankATMWithdrawOnlyMenuBoundUserInterface : BoundUserInterface { private WithdrawBankATMMenu? _menu; - public WithdrawBankATMMenuBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) {} + public BankATMWithdrawOnlyMenuBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) {} protected override void Open() { diff --git a/Content.Client/Bank/BUI/StationBankATMMenuBoundUserInterface.cs b/Content.Client/_NF/Bank/BUI/StationAdminConsoleBoundUserInterface.cs similarity index 75% rename from Content.Client/Bank/BUI/StationBankATMMenuBoundUserInterface.cs rename to Content.Client/_NF/Bank/BUI/StationAdminConsoleBoundUserInterface.cs index e3d7fb3fc77..c3a49b4a483 100644 --- a/Content.Client/Bank/BUI/StationBankATMMenuBoundUserInterface.cs +++ b/Content.Client/_NF/Bank/BUI/StationAdminConsoleBoundUserInterface.cs @@ -1,20 +1,19 @@ -using Content.Client.Bank.UI; -using Content.Shared.Bank.BUI; -using Content.Shared.Bank.Events; +using Content.Shared._NF.Bank.BUI; +using Content.Shared._NF.Bank.Events; -namespace Content.Client.Cargo.BUI; +namespace Content.Client._NF.Bank.UI; -public sealed class StationBankATMMenuBoundUserInterface : BoundUserInterface +public sealed class StationAdminConsoleBoundUserInterface : BoundUserInterface { - private StationBankATMMenu? _menu; + private StationAdminConsoleMenu? _menu; - public StationBankATMMenuBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) {} + public StationAdminConsoleBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) {} protected override void Open() { base.Open(); - _menu = new StationBankATMMenu(); + _menu = new StationAdminConsoleMenu(); _menu.WithdrawRequest += OnWithdraw; _menu.DepositRequest += OnDeposit; _menu.OnClose += Close; diff --git a/Content.Client/_NF/Bank/BankSystem.cs b/Content.Client/_NF/Bank/BankSystem.cs index 699d3b258a6..b4121947a1a 100644 --- a/Content.Client/_NF/Bank/BankSystem.cs +++ b/Content.Client/_NF/Bank/BankSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Bank; +using Content.Shared._NF.Bank; namespace Content.Client.Bank; diff --git a/Content.Client/Bank/UI/BankATMMenu.xaml b/Content.Client/_NF/Bank/UI/BankATMMenu.xaml similarity index 100% rename from Content.Client/Bank/UI/BankATMMenu.xaml rename to Content.Client/_NF/Bank/UI/BankATMMenu.xaml diff --git a/Content.Client/Bank/UI/BankATMMenu.xaml.cs b/Content.Client/_NF/Bank/UI/BankATMMenu.xaml.cs similarity index 90% rename from Content.Client/Bank/UI/BankATMMenu.xaml.cs rename to Content.Client/_NF/Bank/UI/BankATMMenu.xaml.cs index d72ab5315d9..b9426a1fea6 100644 --- a/Content.Client/Bank/UI/BankATMMenu.xaml.cs +++ b/Content.Client/_NF/Bank/UI/BankATMMenu.xaml.cs @@ -1,15 +1,10 @@ -/* - * New Frontiers - This file is licensed under AGPLv3 - * Copyright (c) 2024 New Frontiers Contributors - * See AGPLv3.txt for details. - */ using Content.Client.UserInterface.Controls; using Content.Shared._NF.Bank; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -namespace Content.Client.Bank.UI; +namespace Content.Client._NF.Bank.UI; [GenerateTypedNameReferences] public sealed partial class BankATMMenu : FancyWindow diff --git a/Content.Client/Bank/UI/StationBankATMMenu.xaml b/Content.Client/_NF/Bank/UI/StationAdminConsoleMenu.xaml similarity index 100% rename from Content.Client/Bank/UI/StationBankATMMenu.xaml rename to Content.Client/_NF/Bank/UI/StationAdminConsoleMenu.xaml diff --git a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs b/Content.Client/_NF/Bank/UI/StationAdminConsoleMenu.xaml.cs similarity index 95% rename from Content.Client/Bank/UI/StationBankATMMenu.xaml.cs rename to Content.Client/_NF/Bank/UI/StationAdminConsoleMenu.xaml.cs index 20c3246818d..789d2b9c80b 100644 --- a/Content.Client/Bank/UI/StationBankATMMenu.xaml.cs +++ b/Content.Client/_NF/Bank/UI/StationAdminConsoleMenu.xaml.cs @@ -1,18 +1,13 @@ -/* - * New Frontiers - This file is licensed under AGPLv3 - * Copyright (c) 2024 New Frontiers Contributors - * See AGPLv3.txt for details. - */ using Content.Client.UserInterface.Controls; using Content.Shared._NF.Bank; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -namespace Content.Client.Bank.UI; +namespace Content.Client._NF.Bank.UI; [GenerateTypedNameReferences] -public sealed partial class StationBankATMMenu : FancyWindow +public sealed partial class StationAdminConsoleMenu : FancyWindow { // TODO: reduce redundancy public Action? WithdrawRequest; @@ -43,7 +38,7 @@ public static (string, string)[] DepositReasonArray = { ("assetssold", Loc.GetString("station-bank-assets-sold")), ("other", Loc.GetString("station-bank-other")) }; - public StationBankATMMenu() + public StationAdminConsoleMenu() { RobustXamlLoader.Load(this); DepositButton.OnPressed += OnDepositPressed; diff --git a/Content.Client/Bank/UI/WithdrawBankATMMenu.xaml b/Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.xaml similarity index 100% rename from Content.Client/Bank/UI/WithdrawBankATMMenu.xaml rename to Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.xaml diff --git a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs b/Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.xaml.cs similarity index 86% rename from Content.Client/Bank/UI/WithdrawBankATMMenu.cs rename to Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.xaml.cs index 78f61ec94e5..cd7415eb006 100644 --- a/Content.Client/Bank/UI/WithdrawBankATMMenu.cs +++ b/Content.Client/_NF/Bank/UI/WithdrawBankATMMenu.xaml.cs @@ -1,15 +1,10 @@ -/* - * New Frontiers - This file is licensed under AGPLv3 - * Copyright (c) 2024 New Frontiers Contributors - * See AGPLv3.txt for details. - */ using Content.Client.UserInterface.Controls; using Content.Shared._NF.Bank; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -namespace Content.Client.Bank.UI; +namespace Content.Client._NF.Bank.UI; [GenerateTypedNameReferences] public sealed partial class WithdrawBankATMMenu : FancyWindow diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs index 40908330089..f94bc7413b1 100644 --- a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs +++ b/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerTab.xaml.cs @@ -1,6 +1,6 @@ using Content.Shared._NF.Bank; using Content.Shared._NF.Bank.BUI; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface; using Robust.Client.UserInterface.XAML; diff --git a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs b/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs index cf7aec5a1cd..8f30a21581a 100644 --- a/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs +++ b/Content.Client/_NF/CartridgeLoader/Cartridges/LedgerUiFragment.xaml.cs @@ -1,5 +1,5 @@ using Content.Shared._NF.Bank.BUI; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; diff --git a/Content.Client/_NF/Market/Systems/SharedMarketSystem.CrateMachine.cs b/Content.Client/_NF/CrateMachine/CrateMachineSystem.cs similarity index 95% rename from Content.Client/_NF/Market/Systems/SharedMarketSystem.CrateMachine.cs rename to Content.Client/_NF/CrateMachine/CrateMachineSystem.cs index 87b3067f290..56c71509072 100644 --- a/Content.Client/_NF/Market/Systems/SharedMarketSystem.CrateMachine.cs +++ b/Content.Client/_NF/CrateMachine/CrateMachineSystem.cs @@ -1,14 +1,13 @@ -using Content.Shared._NF.Market; +using Content.Shared._NF.CrateMachine; +using Content.Shared._NF.CrateMachine.Components; using Robust.Client.Animations; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Shared.Audio.Systems; -using static Content.Shared._NF.Market.Components.CrateMachineComponent; -using CrateMachineComponent = Content.Shared._NF.Market.Components.CrateMachineComponent; -namespace Content.Client._NF.Market.Systems; +namespace Content.Client._NF.CrateMachine; -public sealed class MarketSystem : SharedMarketSystem +public sealed class CrateMachineSystem : SharedCrateMachineSystem { [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!; diff --git a/Content.Client/CryoSleep/AcceptCryoWindow.cs b/Content.Client/_NF/CryoSleep/AcceptCryoWindow.cs similarity index 98% rename from Content.Client/CryoSleep/AcceptCryoWindow.cs rename to Content.Client/_NF/CryoSleep/AcceptCryoWindow.cs index bc5f55e0c6d..77885c0016a 100644 --- a/Content.Client/CryoSleep/AcceptCryoWindow.cs +++ b/Content.Client/_NF/CryoSleep/AcceptCryoWindow.cs @@ -4,7 +4,7 @@ using Robust.Shared.Localization; using static Robust.Client.UserInterface.Controls.BoxContainer; -namespace Content.Client.CryoSleep; +namespace Content.Client._NF.CryoSleep; public sealed class AcceptCryoWindow : DefaultWindow { public readonly Button DenyButton; diff --git a/Content.Client/CryoSleep/CryoSleepEui.cs b/Content.Client/_NF/CryoSleep/CryoSleepEui.cs similarity index 91% rename from Content.Client/CryoSleep/CryoSleepEui.cs rename to Content.Client/_NF/CryoSleep/CryoSleepEui.cs index a223aafe014..a57fb225646 100644 --- a/Content.Client/CryoSleep/CryoSleepEui.cs +++ b/Content.Client/_NF/CryoSleep/CryoSleepEui.cs @@ -1,9 +1,9 @@ using Content.Client.Eui; -using Content.Shared.CryoSleep; +using Content.Shared._NF.CryoSleep; using JetBrains.Annotations; using Robust.Client.Graphics; -namespace Content.Client.CryoSleep; +namespace Content.Client._NF.CryoSleep; [UsedImplicitly] public sealed class CryoSleepEui : BaseEui diff --git a/Content.Client/CryoSleep/CryosleepWakeupWindow.cs b/Content.Client/_NF/CryoSleep/CryosleepWakeupWindow.cs similarity index 97% rename from Content.Client/CryoSleep/CryosleepWakeupWindow.cs rename to Content.Client/_NF/CryoSleep/CryosleepWakeupWindow.cs index 205676d1833..ea39967546e 100644 --- a/Content.Client/CryoSleep/CryosleepWakeupWindow.cs +++ b/Content.Client/_NF/CryoSleep/CryosleepWakeupWindow.cs @@ -2,9 +2,9 @@ using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Configuration; -using static Content.Shared.CryoSleep.SharedCryoSleepSystem; +using static Content.Shared._NF.CryoSleep.SharedCryoSleepSystem; -namespace Content.Client.CryoSleep; +namespace Content.Client._NF.CryoSleep; public sealed class CryosleepWakeupWindow : DefaultWindow, IEntityEventSubscriber { diff --git a/Content.Client/_NF/Market/BUI/MarketConsoleBoundUserInterface.cs b/Content.Client/_NF/Market/BUI/MarketConsoleBoundUserInterface.cs index 588f6ccd7b5..9819607a43b 100644 --- a/Content.Client/_NF/Market/BUI/MarketConsoleBoundUserInterface.cs +++ b/Content.Client/_NF/Market/BUI/MarketConsoleBoundUserInterface.cs @@ -69,7 +69,7 @@ private void Return(ButtonEventArgs args) private void PurchaseCrate(ButtonEventArgs args) { - SendMessage(new CrateMachinePurchaseMessage()); + SendMessage(new MarketPurchaseMessage()); Close(); } diff --git a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs b/Content.Client/_NF/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs similarity index 92% rename from Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs rename to Content.Client/_NF/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs index 9365d8fe94c..f4c251223bd 100644 --- a/Content.Client/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs +++ b/Content.Client/_NF/Shipyard/BUI/ShipyardConsoleBoundUserInterface.cs @@ -1,13 +1,10 @@ -using Content.Client.Shipyard.UI; +using Content.Client._NF.Shipyard.UI; using Content.Shared.Containers.ItemSlots; -using Content.Shared.Shipyard; -using Content.Shared.Shipyard.BUI; -using Content.Shared.Shipyard.Events; -using Robust.Client.GameObjects; -using Robust.Shared.Utility; +using Content.Shared._NF.Shipyard.BUI; +using Content.Shared._NF.Shipyard.Events; using static Robust.Client.UserInterface.Controls.BaseButton; -namespace Content.Client.Shipyard.BUI; +namespace Content.Client._NF.Shipyard.BUI; public sealed class ShipyardConsoleBoundUserInterface : BoundUserInterface { diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml b/Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml similarity index 100% rename from Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml rename to Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml.cs similarity index 98% rename from Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs rename to Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml.cs index 8322279d0d4..7bda8d25458 100644 --- a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs +++ b/Content.Client/_NF/Shipyard/UI/ShipyardConsoleMenu.xaml.cs @@ -1,16 +1,16 @@ using System.Linq; using Content.Client.UserInterface.Controls; -using Content.Client.Shipyard.BUI; +using Content.Client._NF.Shipyard.BUI; using Content.Shared._NF.Bank; -using Content.Shared.Shipyard.BUI; -using Content.Shared.Shipyard.Prototypes; +using Content.Shared._NF.Shipyard.BUI; +using Content.Shared._NF.Shipyard.Prototypes; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; using static Robust.Client.UserInterface.Controls.BaseButton; -namespace Content.Client.Shipyard.UI; +namespace Content.Client._NF.Shipyard.UI; [GenerateTypedNameReferences] public sealed partial class ShipyardConsoleMenu : FancyWindow diff --git a/Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml b/Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml similarity index 100% rename from Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml rename to Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml diff --git a/Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml.cs b/Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml.cs similarity index 90% rename from Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml.cs rename to Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml.cs index d908ebc5c36..e962e072b67 100644 --- a/Content.Client/Shipyard/UI/ShipyardRulesPopup.xaml.cs +++ b/Content.Client/_NF/Shipyard/UI/ShipyardRulesPopup.xaml.cs @@ -1,11 +1,11 @@ using Content.Client.UserInterface.Controls; -using Content.Client.Shipyard.BUI; +using Content.Client._NF.Shipyard.BUI; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.XAML; using static Robust.Client.UserInterface.Controls.BaseButton; using Content.Client.UserInterface.Systems.Actions.Controls; -namespace Content.Client.Shipyard.UI +namespace Content.Client._NF.Shipyard.UI { [GenerateTypedNameReferences] sealed partial class ShipyardRulesPopup : FancyWindow diff --git a/Content.Client/Shipyard/UI/VesselRow.xaml b/Content.Client/_NF/Shipyard/UI/VesselRow.xaml similarity index 100% rename from Content.Client/Shipyard/UI/VesselRow.xaml rename to Content.Client/_NF/Shipyard/UI/VesselRow.xaml diff --git a/Content.Client/Shipyard/UI/VesselRow.xaml.cs b/Content.Client/_NF/Shipyard/UI/VesselRow.xaml.cs similarity index 90% rename from Content.Client/Shipyard/UI/VesselRow.xaml.cs rename to Content.Client/_NF/Shipyard/UI/VesselRow.xaml.cs index 4e34aa66ca2..03e8cf57eab 100644 --- a/Content.Client/Shipyard/UI/VesselRow.xaml.cs +++ b/Content.Client/_NF/Shipyard/UI/VesselRow.xaml.cs @@ -1,13 +1,12 @@ -using Content.Shared.Shipyard; using Content.Shared.Guidebook; -using Content.Shared.Shipyard.Prototypes; +using Content.Shared._NF.Shipyard.Prototypes; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Content.Client.Guidebook; using Robust.Shared.Prototypes; -namespace Content.Client.Shipyard.UI; +namespace Content.Client._NF.Shipyard.UI; [GenerateTypedNameReferences] public sealed partial class VesselRow : PanelContainer diff --git a/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs b/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs index d222b042145..15876b24dbb 100644 --- a/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs +++ b/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs @@ -1,6 +1,6 @@ using System.Linq; using Content.Server.Cargo.Systems; -using Content.Shared.Shipyard.Prototypes; +using Content.Shared._NF.Shipyard.Prototypes; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; using Robust.Shared.Map; diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs index 2bfe8e163b2..78c62dae85c 100644 --- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs +++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs @@ -11,10 +11,10 @@ using Robust.Shared.Containers; using Robust.Shared.Prototypes; using System.Linq; -using Content.Server.Shipyard.Systems; -using Content.Shared.Shipyard.Components; +using Content.Server._NF.Shipyard.Systems; // Frontier +using Content.Shared._NF.Shipyard.Components; // Frontier using static Content.Shared.Access.Components.IdCardConsoleComponent; -using static Content.Shared.Shipyard.Components.ShuttleDeedComponent; +using static Content.Shared._NF.Shipyard.Components.ShuttleDeedComponent; // Frontier using Content.Shared.Access; namespace Content.Server.Access.Systems; diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index 70df786b800..66555cec07e 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -2,7 +2,7 @@ using Content.Server._NF.Bank; // Frontier using Content.Server.Cargo.Components; using Content.Server.Labels.Components; -using Content.Shared.Bank.Components; // Frontier +using Content.Shared._NF.Bank.Components; // Frontier using Content.Server.Station.Components; using Content.Shared.Cargo; using Content.Shared.Cargo.BUI; diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index 2270374fb86..9b5899af79c 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -1,6 +1,6 @@ using Content.Server.Cargo.Components; using Content.Shared.Stacks; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Content.Shared.Cargo; using Content.Shared.Cargo.BUI; using Content.Shared.Cargo.Components; diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index cc51e003e2e..e748c38a31d 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -38,9 +38,10 @@ using Content.Shared.Emag.Systems; using Content.Server.Popups; using Content.Server.Traits.Assorted; -using Content.Shared._NF.Cloning; -using Content.Shared.Bank.Components; using Robust.Shared.Serialization.Manager; +using Content.Shared._NF.Cloning; // Frontier +using Content.Shared._NF.Bank.Components; // Frontier +using Content.Server._NF.Traits.Assorted; // Frontier namespace Content.Server.Cloning { diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs index 381c138919e..047bae7aba1 100644 --- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs @@ -27,7 +27,7 @@ using Robust.Shared.Configuration; // Frontier using Content.Shared._NF.CCVar; // Frontier using Content.Shared._NF.Bank; // Frontier -using Content.Shared.Bank.Components; // Frontier +using Content.Shared._NF.Bank.Components; // Frontier using Content.Server._NF.Bank; // Frontier using Content.Shared._NF.Bank.BUI; // Frontier diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 049e2b76c72..4af997a56de 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -21,7 +21,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Utility; -using Content.Server.Corvax.Respawn; // Frontier +using Content.Server._Corvax.Respawn; // Frontier namespace Content.Server.GameTicking { diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs index 17cde762c2e..78de33f3b6d 100644 --- a/Content.Server/Lathe/LatheSystem.cs +++ b/Content.Server/Lathe/LatheSystem.cs @@ -176,12 +176,17 @@ public static List> GetAllBaseRecipes(LatheCompone return component.StaticRecipes.Union(component.DynamicRecipes).ToList(); } - public bool TryAddToQueue(EntityUid uid, LatheRecipePrototype recipe, LatheComponent? component = null) + public bool TryAddToQueue(EntityUid uid, LatheRecipePrototype recipe, int quantity, LatheComponent? component = null) // Frontier: add quantity { if (!Resolve(uid, ref component)) return false; - if (!CanProduce(uid, recipe, 1, component)) + // Frontier: argument check + if (quantity <= 0) + return false; + // Frontier: argument check + + if (!CanProduce(uid, recipe, quantity, component)) // Frontier: 1 0 && component.Queue[^1].Recipe.ID == recipe.ID) + component.Queue[^1].ItemsRequested += quantity; + else + component.Queue.Add(new LatheRecipeBatch(recipe, 0, quantity)); + // End Frontier + // component.Queue.Add(recipe); // Frontier return true; } @@ -204,8 +217,13 @@ public bool TryStartProducing(EntityUid uid, LatheComponent? component = null) if (component.CurrentRecipe != null || component.Queue.Count <= 0 || !this.IsPowered(uid, EntityManager)) return false; - var recipe = component.Queue.First(); - component.Queue.RemoveAt(0); + // Frontier: handle batches + var batch = component.Queue.First(); + batch.ItemsPrinted++; + if (batch.ItemsPrinted >= batch.ItemsRequested || batch.ItemsPrinted < 0) // Rollover sanity check + component.Queue.RemoveAt(0); + var recipe = batch.Recipe; + // End Frontier var time = _reagentSpeed.ApplySpeed(uid, recipe.CompleteTime) * component.TimeMultiplier; @@ -288,7 +306,7 @@ public void UpdateUserInterfaceState(EntityUid uid, LatheComponent? component = if (!Resolve(uid, ref component)) return; - var producing = component.CurrentRecipe ?? component.Queue.FirstOrDefault(); + var producing = component.CurrentRecipe ?? component.Queue.FirstOrDefault()?.Recipe; // Frontier: add ?.Recipe var state = new LatheUpdateState(GetAvailableRecipes(uid, component), component.Queue, producing); _uiSys.SetUiState(uid, LatheUiKey.Key, state); @@ -396,20 +414,14 @@ private void OnLatheQueueRecipeMessage(EntityUid uid, LatheComponent component, { if (_proto.TryIndex(args.ID, out LatheRecipePrototype? recipe)) { - var count = 0; - for (var i = 0; i < args.Quantity; i++) - { - if (TryAddToQueue(uid, recipe, component)) - count++; - else - break; - } - if (count > 0) + // Frontier: batching recipes + if (TryAddToQueue(uid, recipe, args.Quantity, component)) { _adminLogger.Add(LogType.Action, LogImpact.Low, - $"{ToPrettyString(args.Actor):player} queued {count} {GetRecipeName(recipe)} at {ToPrettyString(uid):lathe}"); + $"{ToPrettyString(args.Actor):player} queued {args.Quantity} {GetRecipeName(recipe)} at {ToPrettyString(uid):lathe}"); } + // End Frontier } TryStartProducing(uid, component); UpdateUserInterfaceState(uid, component); diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs index 2fd14dc32c2..eafb269848b 100644 --- a/Content.Server/PDA/PdaSystem.cs +++ b/Content.Server/PDA/PdaSystem.cs @@ -23,9 +23,9 @@ using Robust.Shared.Containers; using Robust.Shared.Player; using Robust.Shared.Utility; -using Content.Shared.Bank.Components; // Frontier -using Content.Shared.Shipyard.Components; // Frontier -using Content.Server.Shipyard.Systems; // Frontier +using Content.Shared._NF.Bank.Components; // Frontier +using Content.Shared._NF.Shipyard.Components; // Frontier +using Content.Server._NF.Shipyard.Systems; // Frontier using Content.Server._NF.SectorServices; // Frontier namespace Content.Server.PDA diff --git a/Content.Server/Power/Components/ChargingComponent.cs b/Content.Server/Power/Components/ChargingComponent.cs deleted file mode 100644 index 184e2a15ff3..00000000000 --- a/Content.Server/Power/Components/ChargingComponent.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Content.Shared.Containers.ItemSlots; -using Content.Shared.Power; - -namespace Content.Server.Power.Components -{ - [RegisterComponent] - public sealed partial class ChargingComponent : Component // Frontier: Upstream - #28984 - { - /// - ///References the entity of the charger that is currently powering this battery - /// - public EntityUid ChargerUid; - - /// - ///References the component of the charger that is currently powering this battery - /// - public ChargerComponent ChargerComponent; - } -} diff --git a/Content.Server/Power/Components/UpgradeBatteryComponent.cs b/Content.Server/Power/Components/UpgradeBatteryComponent.cs deleted file mode 100644 index ff91cfa7559..00000000000 --- a/Content.Server/Power/Components/UpgradeBatteryComponent.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Power.Components -{ - - [RegisterComponent] - public sealed partial class UpgradeBatteryComponent : Component - { - /// - /// The machine part that affects the power capacity. - /// - [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartPowerCapacity = "PowerCell"; - - /// - /// The machine part rating is raised to this power when calculating power gain - /// - [DataField("maxChargeMultiplier")] - public float MaxChargeMultiplier = 2f; - - /// - /// Power gain scaling - /// - [DataField("baseMaxCharge")] - public float BaseMaxCharge = 8000000; - } -} diff --git a/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs b/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs deleted file mode 100644 index 7bd29f2de71..00000000000 --- a/Content.Server/Power/Components/UpgradePowerSupplyRampingComponent.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Content.Server.Construction.Components; -using Content.Shared.Construction.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Power.Components -{ - - [RegisterComponent] - public sealed partial class UpgradePowerSupplyRampingComponent : Component - { - [ViewVariables(VVAccess.ReadWrite)] - public float BaseRampRate; - - /// - /// The machine part that affects the power supply ramping - /// - [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartRampRate = "Capacitor"; - - /// - /// The multiplier used for scaling the power supply ramping - /// - [DataField("supplyRampingMultiplier")] - public float SupplyRampingMultiplier = 1f; - - /// - /// What type of scaling is being used? - /// - [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] - public MachineUpgradeScalingType Scaling; - - /// - /// The current value that the power supply is being scaled by - /// - [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)] - public float ActualScalar = 1f; - } -} diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index 4a00247a68e..b9a1a753ddf 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -8,6 +8,7 @@ using JetBrains.Annotations; using Robust.Shared.Utility; using Robust.Shared.Timing; +using Content.Server._NF.Power.Components; // Frontier namespace Content.Server.Power.EntitySystems { diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index a5fd72477a1..be867d99cc8 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -11,6 +11,7 @@ using Content.Shared.Storage.Components; using Robust.Server.Containers; using Content.Shared.Whitelist; +using Content.Server._NF.Power.Components; // Frontier namespace Content.Server.Power.EntitySystems; diff --git a/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs b/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs deleted file mode 100644 index 734cf9d89ce..00000000000 --- a/Content.Server/Power/EntitySystems/UpgradeBatterySystem.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Content.Server.Construction; -using Content.Server.Power.Components; -using JetBrains.Annotations; - -namespace Content.Server.Power.EntitySystems -{ - [UsedImplicitly] - public sealed class UpgradeBatterySystem : EntitySystem - { - [Dependency] private readonly BatterySystem _batterySystem = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnRefreshParts); - SubscribeLocalEvent(OnUpgradeExamine); - } - - public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args) - { - var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity]; - - if (TryComp(uid, out var batteryComp)) - { - _batterySystem.SetMaxCharge(uid, MathF.Pow(component.MaxChargeMultiplier, powerCellRating - 1) * component.BaseMaxCharge, batteryComp); - } - } - - private void OnUpgradeExamine(EntityUid uid, UpgradeBatteryComponent component, UpgradeExamineEvent args) - { - // UpgradeBatteryComponent.MaxChargeMultiplier is not the actual multiplier, so we have to do this. - if (TryComp(uid, out var batteryComp)) - { - args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge); - } - } - } -} diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs index 111cf363636..8e2fc0441c1 100644 --- a/Content.Server/Power/Generator/GeneratorSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSystem.cs @@ -12,6 +12,7 @@ using Content.Shared.Radiation.Components; // Frontier using Content.Shared.Audio; // Frontier using Content.Shared.Materials; // Frontier +using Content.Server._NF.Power.Components; // Frontier namespace Content.Server.Power.Generator; @@ -28,14 +29,14 @@ public sealed class GeneratorSystem : SharedGeneratorSystem [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly PointLightSystem _pointLight = default!; // Frontier - Rads glow - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; // Frontier - Rads sound + [Dependency] private readonly PointLightSystem _pointLight = default!; // Frontier: Rads glow + [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; // Frontier: Rads sound - private EntityQuery _upgradeQuery; + private EntityQuery _upgradeQuery; // Frontier: keeping upgradeable power supplies public override void Initialize() { - _upgradeQuery = GetEntityQuery(); + _upgradeQuery = GetEntityQuery(); // Frontier: keeping upgradeable power supplies UpdatesBefore.Add(typeof(PowerNetSystem)); diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs index 259aa42f9a3..47f66261869 100644 --- a/Content.Server/Species/Systems/NymphSystem.cs +++ b/Content.Server/Species/Systems/NymphSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Cargo.Components; using Content.Server.Mind; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Content.Shared.Species.Components; using Content.Shared.Body.Events; using Content.Shared.Zombies; @@ -48,14 +48,12 @@ private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemo _mindSystem.TransferTo(mindId, nymph, mind: mind); - // Frontier + // Frontier: bank account transfer, mob setup EnsureComp(nymph); - // Frontier: bank account transfer if (HasComp(args.OldBody)) - { EnsureComp(nymph); - } + // End Frontier } // Delete the old organ diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 12cd4d2b1d2..e2450dae57d 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -28,7 +28,7 @@ using Robust.Shared.Random; using Robust.Shared.Utility; using Content.Server.Spawners.Components; -using Content.Shared.Bank.Components; // DeltaV +using Content.Shared._NF.Bank.Components; // DeltaV using Content.Server._NF.Bank; // Frontier using Content.Server.Preferences.Managers; // Frontier using System.Linq; // Frontier diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index c121a87ecd5..1f2ee6a20ce 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -13,7 +13,7 @@ using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Actions; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Content.Shared.Damage; using Content.Shared.Destructible; using Content.Shared.DoAfter; diff --git a/Content.Server/Corvax/Respawn/RespawnSystem.cs b/Content.Server/_Corvax/Respawn/RespawnSystem.cs similarity index 98% rename from Content.Server/Corvax/Respawn/RespawnSystem.cs rename to Content.Server/_Corvax/Respawn/RespawnSystem.cs index 6bd0d975c2e..3fecd2ed480 100644 --- a/Content.Server/Corvax/Respawn/RespawnSystem.cs +++ b/Content.Server/_Corvax/Respawn/RespawnSystem.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; using Content.Server.Ghost.Roles.Components; -using Content.Shared.Corvax.Respawn; +using Content.Shared._Corvax.Respawn; using Content.Shared.Mind.Components; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; @@ -9,14 +9,14 @@ using Robust.Shared.Timing; using Content.Shared._NF.CCVar; // Frontier using Robust.Shared.Configuration; // Frontier -using Content.Server.CryoSleep; // Frontier +using Content.Server._NF.CryoSleep; // Frontier using Robust.Shared.Player; // Frontier using Content.Shared.Ghost; // Frontier using Content.Server.Administration.Managers; // Frontier using Content.Server.Administration; // Frontier using Content.Shared.GameTicking; // Frontier -namespace Content.Server.Corvax.Respawn; +namespace Content.Server._Corvax.Respawn; public sealed class RespawnSystem : EntitySystem { diff --git a/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs index 3e96a168bcb..ea9897f4342 100644 --- a/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs +++ b/Content.Server/_DV/Mail/EntitySystems/MailSystem.cs @@ -48,7 +48,7 @@ using Content.Server._NF.SectorServices; // Frontier using Content.Server.Station.Components; // Frontier using Robust.Shared.Enums; // Frontier -using Content.Shared.Bank.Components; // Frontier +using Content.Shared._NF.Bank.Components; // Frontier using Content.Shared._NF.Bank.BUI; // Frontier namespace Content.Server._DV.Mail.EntitySystems diff --git a/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs b/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs index 6b37613a404..7aad2c72f6d 100644 --- a/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs +++ b/Content.Server/_NF/Atmos/Systems/GasDepositSystem.cs @@ -17,7 +17,7 @@ using Content.Shared._NF.Atmos.Visuals; using Content.Shared.Atmos; using Content.Shared.Atmos.Piping.Binary.Components; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.Database; using Content.Shared.Power; using Robust.Server.Audio; diff --git a/Content.Server/_NF/Bank/ATMSystem.cs b/Content.Server/_NF/Bank/ATMSystem.cs index a284f2bc0f1..5f9baeec314 100644 --- a/Content.Server/_NF/Bank/ATMSystem.cs +++ b/Content.Server/_NF/Bank/ATMSystem.cs @@ -5,9 +5,9 @@ */ using Content.Server.Popups; using Content.Server.Stack; -using Content.Shared.Bank.BUI; -using Content.Shared.Bank.Components; -using Content.Shared.Bank.Events; +using Content.Shared._NF.Bank.BUI; +using Content.Shared._NF.Bank.Components; +using Content.Shared._NF.Bank.Events; using Content.Shared.Coordinates; using Content.Shared.Stacks; using Content.Shared.UserInterface; diff --git a/Content.Server/_NF/Bank/BankSystem.Ledger.cs b/Content.Server/_NF/Bank/BankSystem.Ledger.cs index bd57197a0b8..4f060c49ddc 100644 --- a/Content.Server/_NF/Bank/BankSystem.Ledger.cs +++ b/Content.Server/_NF/Bank/BankSystem.Ledger.cs @@ -1,8 +1,8 @@ using System.Text; using Content.Shared._NF.Bank; using Content.Shared._NF.Bank.BUI; -using Content.Shared.Bank; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank; +using Content.Shared._NF.Bank.Components; namespace Content.Server._NF.Bank; diff --git a/Content.Server/_NF/Bank/BankSystem.Sector.cs b/Content.Server/_NF/Bank/BankSystem.Sector.cs index 6f3c6ba39ed..6460912541e 100644 --- a/Content.Server/_NF/Bank/BankSystem.Sector.cs +++ b/Content.Server/_NF/Bank/BankSystem.Sector.cs @@ -1,8 +1,8 @@ using System.Runtime.InteropServices; using Content.Server._NF.SectorServices; using Content.Shared._NF.Bank.BUI; -using Content.Shared.Bank; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank; +using Content.Shared._NF.Bank.Components; using JetBrains.Annotations; namespace Content.Server._NF.Bank; diff --git a/Content.Server/_NF/Bank/BankSystem.cs b/Content.Server/_NF/Bank/BankSystem.cs index b2591195e29..feba4217374 100644 --- a/Content.Server/_NF/Bank/BankSystem.cs +++ b/Content.Server/_NF/Bank/BankSystem.cs @@ -1,8 +1,8 @@ using System.Threading; using Content.Server.Preferences.Managers; using Content.Server.GameTicking; -using Content.Shared.Bank; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank; +using Content.Shared._NF.Bank.Components; using Content.Shared.Preferences; using Robust.Shared.Player; using System.Diagnostics.CodeAnalysis; diff --git a/Content.Server/_NF/Bank/SectorBankComponent.cs b/Content.Server/_NF/Bank/SectorBankComponent.cs index 8caa521c51e..26512424363 100644 --- a/Content.Server/_NF/Bank/SectorBankComponent.cs +++ b/Content.Server/_NF/Bank/SectorBankComponent.cs @@ -1,5 +1,5 @@ using Content.Shared._NF.Bank.BUI; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; namespace Content.Server._NF.Bank; diff --git a/Content.Server/_NF/Bank/StationATMSystem.cs b/Content.Server/_NF/Bank/StationATMSystem.cs index cbce9951f1d..fbfbfabc1a6 100644 --- a/Content.Server/_NF/Bank/StationATMSystem.cs +++ b/Content.Server/_NF/Bank/StationATMSystem.cs @@ -3,14 +3,14 @@ * Copyright (c) 2024 New Frontiers Contributors * See AGPLv3.txt for details. */ -using Content.Shared.Bank; -using Content.Shared.Bank.Components; -using Content.Shared.Bank.Events; +using Content.Shared._NF.Bank; +using Content.Shared._NF.Bank.Components; +using Content.Shared._NF.Bank.Events; using Content.Shared.Coordinates; using Content.Shared.Stacks; using Content.Server.Station.Systems; using Content.Server.Cargo.Systems; -using Content.Shared.Bank.BUI; +using Content.Shared._NF.Bank.BUI; using Content.Shared.Access.Systems; using Content.Shared.Database; using Robust.Shared.Containers; diff --git a/Content.Server/_NF/Commands/GhostRespawnCommand.cs b/Content.Server/_NF/Commands/GhostRespawnCommand.cs index 62557844370..7a7aeed1fdb 100644 --- a/Content.Server/_NF/Commands/GhostRespawnCommand.cs +++ b/Content.Server/_NF/Commands/GhostRespawnCommand.cs @@ -1,4 +1,4 @@ -using Content.Server.Corvax.Respawn; +using Content.Server._Corvax.Respawn; using Content.Server.GameTicking; using Content.Server.Mind; using Content.Shared.Administration; @@ -13,7 +13,7 @@ using Robust.Shared.Player; using Robust.Shared.Timing; -namespace Content.Server.NF14.Commands; +namespace Content.Server._NF.Commands; [AnyCommand()] public sealed class GhostRespawnCommand : IConsoleCommand diff --git a/Content.Server/_NF/Commands/SpawnRefundCommand.cs b/Content.Server/_NF/Commands/SpawnRefundCommand.cs index 8f00577351a..d6046ef5860 100644 --- a/Content.Server/_NF/Commands/SpawnRefundCommand.cs +++ b/Content.Server/_NF/Commands/SpawnRefundCommand.cs @@ -11,7 +11,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Server.NF14.Commands; +namespace Content.Server._NF.Commands; [AdminCommand(AdminFlags.Admin)] public sealed class SpawnRefundCommand : IConsoleCommand diff --git a/Content.Server/_NF/CrateMachine/CrateMachineOpenedEvent.cs b/Content.Server/_NF/CrateMachine/CrateMachineOpenedEvent.cs new file mode 100644 index 00000000000..769b4174122 --- /dev/null +++ b/Content.Server/_NF/CrateMachine/CrateMachineOpenedEvent.cs @@ -0,0 +1,15 @@ +namespace Content.Server._NF.CrateMachine; + +/// +/// Raised whenever a crate machine state changes. +/// Only used on server side. +/// +public sealed class CrateMachineOpenedEvent : EntityEventArgs +{ + public EntityUid EntityUid { get; } + + public CrateMachineOpenedEvent(EntityUid uid) + { + EntityUid = uid; + } +} diff --git a/Content.Server/_NF/CrateMachine/CrateMachineSystem.Animation.cs b/Content.Server/_NF/CrateMachine/CrateMachineSystem.Animation.cs new file mode 100644 index 00000000000..bb3aacc01c2 --- /dev/null +++ b/Content.Server/_NF/CrateMachine/CrateMachineSystem.Animation.cs @@ -0,0 +1,107 @@ +using Content.Server.Power.Components; +using Content.Shared._NF.CrateMachine; +using AppearanceSystem = Robust.Server.GameObjects.AppearanceSystem; +using CrateMachineComponent = Content.Shared._NF.CrateMachine.Components.CrateMachineComponent; + +namespace Content.Server._NF.CrateMachine; + +/// +/// Handles starting the opening animation. +/// Updates the time remaining on the component. +/// +public sealed partial class CrateMachineSystem : SharedCrateMachineSystem +{ + [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; + + /// + /// Keep track of time in this function, in order to process the animation. + /// + /// The current frame time + public override void Update(float frameTime) + { + base.Update(frameTime); + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var crateMachine, out var receiver)) + { + if (!receiver.Powered) + continue; + + ProcessOpeningAnimation(uid, frameTime, crateMachine); + ProcessClosingAnimation(uid, frameTime, crateMachine); + } + } + + /// + /// Updates the time remaining for the opening animation, calls the delegate when the animation finishes, and updates the visual state. + /// + /// The Uid of the crate machine + /// The current frame time + /// The crate machine component + private void ProcessOpeningAnimation(EntityUid uid, float frameTime, CrateMachineComponent comp) + { + if (comp.OpeningTimeRemaining <= 0) + return; + + comp.OpeningTimeRemaining -= frameTime; + + // Automatically start closing after it finishes open animation. + if (comp.OpeningTimeRemaining <= 0) + { + comp.DidTakeCrate = false; + RaiseLocalEvent(uid, new CrateMachineOpenedEvent(uid)); + } + + // Update at the end so the closing animation can start automatically. + UpdateVisualState(uid, comp); + } + + /// + /// Updates the time remaining for the closing animation, calls the delegate when the animation finishes, and updates the visual state. + /// + /// The Uid of the crate machine + /// The current frame time + /// The crate machine component + private void ProcessClosingAnimation(EntityUid uid, float frameTime, CrateMachineComponent comp) + { + if (!comp.DidTakeCrate && !IsOccupied(uid, comp, true)) + { + comp.DidTakeCrate = true; + comp.ClosingTimeRemaining = comp.ClosingTime; + } + + comp.ClosingTimeRemaining -= frameTime; + UpdateVisualState(uid, comp); + } + + /// + /// Updates the visual state of the crate machine by setting the visual state using the appearance system. + /// + /// The Uid of the crate machine + /// The crate machine component + private void UpdateVisualState(EntityUid uid, CrateMachineComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + if (component.OpeningTimeRemaining > 0) + _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Opening); + else if (component.ClosingTimeRemaining > 0) + _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Closing); + else if (!component.DidTakeCrate) + _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Open); + else + _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Closed); + } + + /// + /// Starts the opening animation of the crate machine and calls the delegate when the animation finishes. + /// + /// The Uid of the crate machine + /// The crate machine component + public void OpenFor(EntityUid crateMachineUid, CrateMachineComponent component) + { + component.OpeningTimeRemaining = component.OpeningTime; + UpdateVisualState(crateMachineUid, component); + } +} diff --git a/Content.Server/_NF/CrateMachine/CrateMachineSystem.cs b/Content.Server/_NF/CrateMachine/CrateMachineSystem.cs new file mode 100644 index 00000000000..9eb250dc0f4 --- /dev/null +++ b/Content.Server/_NF/CrateMachine/CrateMachineSystem.cs @@ -0,0 +1,111 @@ +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using Content.Server.Storage.EntitySystems; +using Content.Shared._NF.CrateMachine; +using Content.Shared._NF.CrateMachine.Components; +using Content.Shared.Maps; +using Robust.Server.GameObjects; +using Robust.Shared.Map; + +namespace Content.Server._NF.CrateMachine; + +/// +/// The crate machine system can be used to make a crate machine open and spawn crates. +/// When calling , the machine will open the door and give a callback to the given +/// +public sealed partial class CrateMachineSystem : SharedCrateMachineSystem +{ + [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private readonly EntityStorageSystem _storage = default!; + [Dependency] private readonly TransformSystem _transform = default!; + + /// + /// Checks if there is a crate on the crate machine. + /// + /// The Uid of the crate machine + /// The crate machine component + /// Ignores animation checks + /// False if not occupied, true if it is. + public bool IsOccupied(EntityUid crateMachineUid, CrateMachineComponent component, bool ignoreAnimation = false) + { + if (!TryComp(crateMachineUid, out TransformComponent? crateMachineTransform)) + return true; + var tileRef = crateMachineTransform.Coordinates.GetTileRef(EntityManager, _mapManager); + if (tileRef == null) + return true; + + if (!ignoreAnimation && (component.OpeningTimeRemaining > 0 || component.ClosingTimeRemaining > 0f)) + return true; + + // Finally check if there is a crate intersecting the crate machine. + return _lookup.GetLocalEntitiesIntersecting(tileRef.Value, flags: LookupFlags.All | LookupFlags.Approximate) + .Any(entity => MetaData(entity).EntityPrototype?.ID == + component.CratePrototype); + } + + /// + /// Find the nearest unoccupied anchored crate machine on the same grid. + /// + /// The Uid of the entity to find the nearest crate machine from + /// The maximum distance to search for a crate machine + /// The Uid of the nearest unoccupied crate machine, or null if none found + /// True if a crate machine was found, false if not + public bool FindNearestUnoccupied(EntityUid from, int maxDistance, [NotNullWhen(true)] out EntityUid? machineUid) + { + machineUid = null; + + if (maxDistance < 0) + return false; + + var fromXform = Transform(from); + if (fromXform.GridUid == null) + return false; + + var crateMachineQuery = AllEntityQuery(); + while (crateMachineQuery.MoveNext(out var crateMachineUid, out var comp, out var compXform)) + { + // Skip crate machines that aren't mounted on a grid. + if (compXform.GridUid == null) + continue; + // Skip crate machines that are not on the same grid. + if (compXform.GridUid != fromXform.GridUid) + continue; + + var isTooFarAway = !_transform.InRange(compXform.Coordinates, fromXform.Coordinates, maxDistance); + var isBusy = IsOccupied(crateMachineUid, comp); + + if (!compXform.Anchored || isTooFarAway || isBusy) + { + continue; + } + + machineUid = crateMachineUid; + return true; + } + return false; + } + + + /// + /// Convenience function that simply spawns a crate and returns the uid. + /// + /// The Uid of the crate machine + /// The crate machine component + /// The Uid of the spawned crate + public EntityUid SpawnCrate(EntityUid uid, CrateMachineComponent component) + { + return Spawn(component.CratePrototype, Transform(uid).Coordinates); + } + + /// + /// Convenience function that simply inserts a entity into the container entity and relieve the caller of + /// using the storage system reference. + /// + /// The Uid of the crate machine + /// The Uid of the container + public void InsertIntoCrate(EntityUid uid, EntityUid container) + { + _storage.Insert(uid, container); + } +} diff --git a/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs b/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs index 942b5b8b318..09d471a0000 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Audio; using Robust.Shared.Containers; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; [RegisterComponent] public sealed partial class CryoSleepComponent : Component { diff --git a/Content.Server/_NF/CryoSleep/CryoSleepEui.cs b/Content.Server/_NF/CryoSleep/CryoSleepEui.cs index 46f2a4f3e43..e59f057fa5c 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepEui.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepEui.cs @@ -1,8 +1,8 @@ using Content.Server.EUI; -using Content.Shared.CryoSleep; +using Content.Shared._NF.CryoSleep; using Content.Shared.Eui; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; public sealed class CryoSleepEui : BaseEui { diff --git a/Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs b/Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs index 93d026e62e6..f3f14fb5230 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepFallbackComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; // In the case a user's body cannot be revived in a cryopod, this component denotes an entity as being // a fallback to revive them at. diff --git a/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs b/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs index 776e9f877d2..ad4fc87401b 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepSystem.Returning.cs @@ -11,7 +11,7 @@ using Robust.Shared.Configuration; using Robust.Shared.Network; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; public sealed partial class CryoSleepSystem { diff --git a/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs b/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs index 2b51ec97829..7e8126d33cc 100644 --- a/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs +++ b/Content.Server/_NF/CryoSleep/CryoSleepSystem.cs @@ -5,10 +5,10 @@ using Content.Server.Interaction; using Content.Server.Mind; using Content.Server.Popups; -using Content.Server.Shipyard.Systems; +using Content.Server._NF.Shipyard.Systems; using Content.Shared.ActionBlocker; using Content.Shared.Climbing.Systems; -using Content.Shared.CryoSleep; +using Content.Shared._NF.CryoSleep; using Content.Shared.Destructible; using Content.Shared.DoAfter; using Content.Shared.DragDrop; @@ -30,7 +30,7 @@ using Robust.Shared.Timing; using Content.Server.Ghost; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; public sealed partial class CryoSleepSystem : SharedCryoSleepSystem { diff --git a/Content.Server/_NF/CryoSleep/CryosleepEvents.cs b/Content.Server/_NF/CryoSleep/CryosleepEvents.cs index 0519d2b3b2d..e746451acb4 100644 --- a/Content.Server/_NF/CryoSleep/CryosleepEvents.cs +++ b/Content.Server/_NF/CryoSleep/CryosleepEvents.cs @@ -1,6 +1,6 @@ using Robust.Shared.Network; -namespace Content.Server.CryoSleep; +namespace Content.Server._NF.CryoSleep; public abstract class BaseCryosleepEvent : EntityEventArgs { diff --git a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs index f9a910027f9..f8e926bd31d 100644 --- a/Content.Server/_NF/GameRule/PointOfInterestSystem.cs +++ b/Content.Server/_NF/GameRule/PointOfInterestSystem.cs @@ -11,6 +11,7 @@ using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Content.Server._NF.Station.Systems; namespace Content.Server._NF.GameRule; diff --git a/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs b/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs index 7f476596ac4..cf68a2bff85 100644 --- a/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs +++ b/Content.Server/_NF/Market/Systems/MarketSystem.CrateMachine.cs @@ -1,144 +1,44 @@ -using System.Linq; +using Content.Server._NF.CrateMachine; using Content.Server._NF.Market.Components; using Content.Server._NF.Market.Extensions; -using Content.Server.Power.Components; using Content.Shared._NF.Market; using Content.Shared._NF.Market.Components; using Content.Shared._NF.Market.Events; -using Content.Shared.Bank.Components; -using Content.Shared.Maps; -using Content.Shared.Popups; -using Content.Shared.Prototypes; -using Content.Shared.Stacks; +using Content.Shared._NF.Bank.Components; using Robust.Shared.Audio; -using Robust.Shared.Map; using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using static Content.Shared._NF.Market.Components.CrateMachineComponent; +using Content.Shared._NF.CrateMachine.Components; namespace Content.Server._NF.Market.Systems; public sealed partial class MarketSystem { - private void InitializeCrateMachine() - { - SubscribeLocalEvent(OnMarketConsolePurchaseCrateMessage); - } - - public override void Update(float frameTime) - { - base.Update(frameTime); - - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var crateMachine, out var receiver)) - { - if (!receiver.Powered) - continue; - - ProcessOpeningAnimation(uid, frameTime, crateMachine); - ProcessClosingAnimation(uid, frameTime, crateMachine); - } - } - - private void ProcessOpeningAnimation(EntityUid uid, float frameTime, CrateMachineComponent comp) - { - if (comp.OpeningTimeRemaining <= 0) - return; - - comp.OpeningTimeRemaining -= frameTime; - - // Automatically start closing after it finishes open animation. - // Also spawns the crate. - if (comp.OpeningTimeRemaining <= 0) - { - var targetCrate = Spawn(comp.CratePrototype, Transform(uid).Coordinates); - SpawnCrateItems(comp.ItemsToSpawn, targetCrate); - comp.DidTakeCrate = false; - comp.ItemsToSpawn = []; - } + [Dependency] private readonly CrateMachineSystem _crateMachine = default!; - // Update at the end so the closing animation can start automatically. - UpdateVisualState(uid, comp); - } - - private void ProcessClosingAnimation(EntityUid uid, float frameTime, CrateMachineComponent comp) - { - if (!comp.DidTakeCrate && !IsCrateMachineOccupied(uid, comp, true)) - { - comp.DidTakeCrate = true; - comp.ClosingTimeRemaining = comp.ClosingTime; - } - if (comp.ClosingTimeRemaining <= 0) - return; - - comp.ClosingTimeRemaining -= frameTime; - UpdateVisualState(uid, comp); - } - - /// - /// Calculates distance between two EntityCoordinates on the same grid. - /// Used to check for cargo pallets around the console instead of on the grid. - /// - /// the first point - /// the second point - /// - private static double CalculateDistance(EntityCoordinates point1, EntityCoordinates point2) + private void InitializeCrateMachine() { - var xDifference = point2.X - point1.X; - var yDifference = point2.Y - point1.Y; - - return Math.Sqrt(xDifference * xDifference + yDifference * yDifference); + SubscribeLocalEvent(OnMarketConsolePurchaseCrateMessage); + SubscribeLocalEvent(OnCrateMachineOpened); } private void OnMarketConsolePurchaseCrateMessage(EntityUid consoleUid, MarketConsoleComponent component, - ref CrateMachinePurchaseMessage args) + ref MarketPurchaseMessage args) { - var crateMachineQuery = AllEntityQuery(); - var marketMod = 1f; if (TryComp(consoleUid, out var marketModComponent)) { marketMod = marketModComponent.Mod; } - // Stop here if we dont have a grid. - if (Transform(consoleUid).GridUid == null) - return; - - var consoleGridUid = Transform(consoleUid).GridUid!.Value; - while (crateMachineQuery.MoveNext(out var crateMachineUid, out var comp, out var compXform)) + if (!_crateMachine.FindNearestUnoccupied(consoleUid, component.MaxCrateMachineDistance, out var machineUid) || !_entityManager.TryGetComponent (machineUid, out var comp)) { - // Skip crate machines that aren't mounted on a grid. - if (Transform(crateMachineUid).GridUid == null) - continue; - // Skip crate machines that are not on the same grid. - if (Transform(crateMachineUid).GridUid!.Value != consoleGridUid) - continue; - var distance = CalculateDistance(compXform.Coordinates, Transform(consoleUid).Coordinates); - var maxCrateMachineDistance = component.MaxCrateMachineDistance; - - // Get the mapped checking distance from the console - if (TryComp(consoleUid, out var cargoShuttleComponent)) - { - maxCrateMachineDistance = cargoShuttleComponent.MaxCrateMachineDistance; - } - - var isTooFarAway = distance > maxCrateMachineDistance; - var isBusy = IsCrateMachineOccupied(crateMachineUid, comp); - - if (!compXform.Anchored || isTooFarAway || isBusy) - { - continue; - } - - // We found the first nearby compatible crate machine. - OnPurchaseCrateMessage(crateMachineUid, consoleUid, comp, component, marketMod, args); + _popup.PopupEntity(Loc.GetString("market-no-crate-machine-available"), consoleUid, Filter.PvsExcept(consoleUid), true); + _audio.PlayPredicted(component.ErrorSound, consoleUid, null, AudioParams.Default.WithMaxDistance(5f)); return; } - _popup.PopupEntity(Loc.GetString("market-no-crate-machine-available"), consoleUid, Filter.PvsExcept(consoleUid), true); - _audio.PlayPredicted(component.ErrorSound, consoleUid, null, AudioParams.Default.WithMaxDistance(5f)); + OnPurchaseCrateMessage(machineUid.Value, consoleUid, comp, component, marketMod, args); } private void OnPurchaseCrateMessage(EntityUid crateMachineUid, @@ -146,7 +46,7 @@ private void OnPurchaseCrateMessage(EntityUid crateMachineUid, CrateMachineComponent component, MarketConsoleComponent consoleComponent, float marketMod, - CrateMachinePurchaseMessage args) + MarketPurchaseMessage args) { if (args.Actor is not { Valid: true } player) return; @@ -157,30 +57,6 @@ private void OnPurchaseCrateMessage(EntityUid crateMachineUid, TrySpawnCrate(crateMachineUid, player, consoleUid, component, consoleComponent, marketMod, bankAccount); } - /// - /// Checks if there is a crate on the crate machine - /// - /// The Uid of the crate machine - /// The crate machine component - /// Ignores animation checks - /// False if not occupied, true if it is. - private bool IsCrateMachineOccupied(EntityUid crateMachineUid, CrateMachineComponent component, bool ignoreAnimation = false) - { - if (!TryComp(crateMachineUid, out var crateMachineTransform)) - return true; - var tileRef = crateMachineTransform.Coordinates.GetTileRef(EntityManager, _mapManager); - if (tileRef == null) - return true; - - if (!ignoreAnimation && (component.OpeningTimeRemaining > 0 || component.ClosingTimeRemaining > 0f)) - return true; - - // Finally check if there is a crate intersecting the crate machine. - return _lookup.GetLocalEntitiesIntersecting(tileRef.Value, flags: LookupFlags.All | LookupFlags.Approximate) - .Any(entity => _entityManager.GetComponent(entity).EntityPrototype?.ID == - component.CratePrototype); - } - private void TrySpawnCrate(EntityUid crateMachineUid, EntityUid player, EntityUid consoleUid, @@ -189,6 +65,9 @@ private void TrySpawnCrate(EntityUid crateMachineUid, float marketMod, BankAccountComponent playerBank) { + if (!TryComp(crateMachineUid, out var itemSpawner)) + return; + var cartBalance = MarketDataExtensions.GetMarketValue(consoleComponent.CartDataList, marketMod); if (playerBank.Balance < cartBalance) return; @@ -203,10 +82,9 @@ private void TrySpawnCrate(EntityUid crateMachineUid, } _audio.PlayPredicted(consoleComponent.SuccessSound, consoleUid, null, AudioParams.Default.WithMaxDistance(5f)); - component.OpeningTimeRemaining = component.OpeningTime; - component.ItemsToSpawn = consoleComponent.CartDataList; + itemSpawner.ItemsToSpawn = consoleComponent.CartDataList; consoleComponent.CartDataList = []; - UpdateVisualState(crateMachineUid, component); + _crateMachine.OpenFor(crateMachineUid, component); } private void SpawnCrateItems(List spawnList, EntityUid targetCrate) @@ -219,29 +97,24 @@ private void SpawnCrateItems(List spawnList, EntityUid targetCrate) var entityList = _stackSystem.SpawnMultiple(stackPrototype.Spawn, data.Quantity, coordinates); foreach (var entity in entityList) { - _storage.Insert(entity, targetCrate); + _crateMachine.InsertIntoCrate(entity, targetCrate); } } else { var spawn = Spawn(data.Prototype, coordinates); - _storage.Insert(spawn, targetCrate); + _crateMachine.InsertIntoCrate(spawn, targetCrate); } } } - private void UpdateVisualState(EntityUid uid, CrateMachineComponent? component = null) + private void OnCrateMachineOpened(EntityUid uid, CrateMachineComponent component, CrateMachineOpenedEvent args) { - if (!Resolve(uid, ref component)) + if (!TryComp(uid, out var itemSpawner)) return; - if (component.OpeningTimeRemaining > 0) - _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Opening); - else if (component.ClosingTimeRemaining > 0) - _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Closing); - else if (!component.DidTakeCrate) - _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Open); - else - _appearanceSystem.SetData(uid, CrateMachineVisuals.VisualState, CrateMachineVisualState.Closed); + var targetCrate = _crateMachine.SpawnCrate(uid, component); + SpawnCrateItems(itemSpawner.ItemsToSpawn, targetCrate); + itemSpawner.ItemsToSpawn = []; } } diff --git a/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs b/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs index 59d2595bf82..bd8a9724902 100644 --- a/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs +++ b/Content.Server/_NF/Market/Systems/MarketSystem.MarketConsole.cs @@ -1,20 +1,16 @@ using System.Linq; using Content.Server._NF.Market.Components; using Content.Server._NF.Market.Extensions; -using Content.Server._NF.SectorServices; using Content.Server.Cargo.Systems; -using Content.Server.Power.Components; using Content.Server.Storage.Components; using Content.Shared._NF.Market; using Content.Shared._NF.Market.BUI; using Content.Shared._NF.Market.Events; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.Containers.ItemSlots; using Content.Shared.Power; -using Content.Shared.Prototypes; using Content.Shared.Stacks; using Content.Shared.Storage; -using Content.Shared.Whitelist; using Robust.Shared.Prototypes; namespace Content.Server._NF.Market.Systems; diff --git a/Content.Server/_NF/Market/Systems/MarketSystem.cs b/Content.Server/_NF/Market/Systems/MarketSystem.cs index 26ca1bb6615..ee5e689adea 100644 --- a/Content.Server/_NF/Market/Systems/MarketSystem.cs +++ b/Content.Server/_NF/Market/Systems/MarketSystem.cs @@ -1,26 +1,19 @@ -using Content.Server._NF.SectorServices; using Content.Server._NF.Bank; using Content.Server.Cargo.Systems; using Content.Server.Stack; using Content.Server.Station.Systems; using Content.Shared._NF.Market; using Content.Shared.Popups; -using Content.Shared.Storage.EntitySystems; using Content.Shared.Whitelist; using Robust.Server.GameObjects; using Robust.Shared.Audio.Systems; -using Robust.Shared.Map; using Robust.Shared.Prototypes; namespace Content.Server._NF.Market.Systems; public sealed partial class MarketSystem: SharedMarketSystem { - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; [Dependency] private readonly BankSystem _bankSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly SharedEntityStorageSystem _storage = default!; [Dependency] private readonly UserInterfaceSystem _ui = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; diff --git a/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs b/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs index 1eb39feaa84..a7d9c8073e2 100644 --- a/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs +++ b/Content.Server/_NF/Medical/MedicalBountyRedemptionComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Robust.Shared.Audio; namespace Content.Server._NF.Medical; diff --git a/Content.Server/_NF/Medical/MedicalBountySystem.cs b/Content.Server/_NF/Medical/MedicalBountySystem.cs index 1bd54f01db6..a6a7e0c9fd6 100644 --- a/Content.Server/_NF/Medical/MedicalBountySystem.cs +++ b/Content.Server/_NF/Medical/MedicalBountySystem.cs @@ -7,7 +7,6 @@ using Content.Server.Popups; using Content.Server.Power.EntitySystems; using Content.Server.Stack; -using Content.Server.Traits.Assorted; using Content.Shared._NF.Bank.BUI; using Content.Shared._NF.Medical; using Content.Shared._NF.Medical.Prototypes; @@ -18,13 +17,13 @@ using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Power; -using Content.Shared.Stacks; using Content.Shared.UserInterface; using Robust.Server.Audio; using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.Prototypes; using Robust.Shared.Random; +using Content.Server._NF.Traits.Assorted; namespace Content.Server._NF.Medical; diff --git a/Content.Server/_NF/Power/Components/ChargingComponent.cs b/Content.Server/_NF/Power/Components/ChargingComponent.cs new file mode 100644 index 00000000000..af31920dfa2 --- /dev/null +++ b/Content.Server/_NF/Power/Components/ChargingComponent.cs @@ -0,0 +1,17 @@ +using Content.Server.Power.Components; + +namespace Content.Server._NF.Power.Components; + +[RegisterComponent] +public sealed partial class ChargingComponent : Component // Frontier: Upstream - #28984 +{ + /// + ///References the entity of the charger that is currently powering this battery + /// + public EntityUid ChargerUid; + + /// + ///References the component of the charger that is currently powering this battery + /// + public ChargerComponent ChargerComponent; +} diff --git a/Content.Server/_NF/Power/Components/UpgradeBatteryComponent.cs b/Content.Server/_NF/Power/Components/UpgradeBatteryComponent.cs new file mode 100644 index 00000000000..ce108e68053 --- /dev/null +++ b/Content.Server/_NF/Power/Components/UpgradeBatteryComponent.cs @@ -0,0 +1,26 @@ +using Content.Shared.Construction.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Server._NF.Power.Components; + +[RegisterComponent] +public sealed partial class UpgradeBatteryComponent : Component +{ + /// + /// The machine part that affects the power capacity. + /// + [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string MachinePartPowerCapacity = "PowerCell"; + + /// + /// The machine part rating is raised to this power when calculating power gain + /// + [DataField("maxChargeMultiplier")] + public float MaxChargeMultiplier = 2f; + + /// + /// Power gain scaling + /// + [DataField("baseMaxCharge")] + public float BaseMaxCharge = 8000000; +} diff --git a/Content.Server/Power/Components/UpgradePowerDrawComponent.cs b/Content.Server/_NF/Power/Components/UpgradePowerDrawComponent.cs similarity index 96% rename from Content.Server/Power/Components/UpgradePowerDrawComponent.cs rename to Content.Server/_NF/Power/Components/UpgradePowerDrawComponent.cs index 02a6c57b9bf..57c1203739a 100644 --- a/Content.Server/Power/Components/UpgradePowerDrawComponent.cs +++ b/Content.Server/_NF/Power/Components/UpgradePowerDrawComponent.cs @@ -2,7 +2,7 @@ using Content.Shared.Construction.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Server.Power.Components; +namespace Content.Server._NF.Power.Components; /// /// This is used for machines whose power draw @@ -37,5 +37,3 @@ public sealed partial class UpgradePowerDrawComponent : Component [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] public MachineUpgradeScalingType Scaling; } - - diff --git a/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs b/Content.Server/_NF/Power/Components/UpgradePowerSupplierComponent.cs similarity index 96% rename from Content.Server/Power/Components/UpgradePowerSupplierComponent.cs rename to Content.Server/_NF/Power/Components/UpgradePowerSupplierComponent.cs index 35b43867d2f..98bd45bf437 100644 --- a/Content.Server/Power/Components/UpgradePowerSupplierComponent.cs +++ b/Content.Server/_NF/Power/Components/UpgradePowerSupplierComponent.cs @@ -2,7 +2,7 @@ using Content.Shared.Construction.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Server.Power.Components; +namespace Content.Server._NF.Power.Components; [RegisterComponent] public sealed partial class UpgradePowerSupplierComponent : Component diff --git a/Content.Server/_NF/Power/Components/UpgradePowerSupplyRampingComponent.cs b/Content.Server/_NF/Power/Components/UpgradePowerSupplyRampingComponent.cs new file mode 100644 index 00000000000..d26ece0c6b9 --- /dev/null +++ b/Content.Server/_NF/Power/Components/UpgradePowerSupplyRampingComponent.cs @@ -0,0 +1,36 @@ +using Content.Server.Construction.Components; +using Content.Shared.Construction.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Server._NF.Power.Components; + +[RegisterComponent] +public sealed partial class UpgradePowerSupplyRampingComponent : Component +{ + [ViewVariables(VVAccess.ReadWrite)] + public float BaseRampRate; + + /// + /// The machine part that affects the power supply ramping + /// + [DataField("machinePartPowerCapacity", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string MachinePartRampRate = "Capacitor"; + + /// + /// The multiplier used for scaling the power supply ramping + /// + [DataField("supplyRampingMultiplier")] + public float SupplyRampingMultiplier = 1f; + + /// + /// What type of scaling is being used? + /// + [DataField("scaling", required: true), ViewVariables(VVAccess.ReadWrite)] + public MachineUpgradeScalingType Scaling; + + /// + /// The current value that the power supply is being scaled by + /// + [DataField("actualScalar"), ViewVariables(VVAccess.ReadWrite)] + public float ActualScalar = 1f; +} diff --git a/Content.Server/_NF/Power/EntitySystems/UpgradeBatterySystem.cs b/Content.Server/_NF/Power/EntitySystems/UpgradeBatterySystem.cs new file mode 100644 index 00000000000..bc41c4aa962 --- /dev/null +++ b/Content.Server/_NF/Power/EntitySystems/UpgradeBatterySystem.cs @@ -0,0 +1,40 @@ +using Content.Server.Construction; +using Content.Server.Power.Components; +using JetBrains.Annotations; +using Content.Server._NF.Power.Components; +using Content.Server.Power.EntitySystems; + +namespace Content.Server._NF.Power.EntitySystems; + +[UsedImplicitly] +public sealed class UpgradeBatterySystem : EntitySystem +{ + [Dependency] private readonly BatterySystem _batterySystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnRefreshParts); + SubscribeLocalEvent(OnUpgradeExamine); + } + + public void OnRefreshParts(EntityUid uid, UpgradeBatteryComponent component, RefreshPartsEvent args) + { + var powerCellRating = args.PartRatings[component.MachinePartPowerCapacity]; + + if (TryComp(uid, out var batteryComp)) + { + _batterySystem.SetMaxCharge(uid, MathF.Pow(component.MaxChargeMultiplier, powerCellRating - 1) * component.BaseMaxCharge, batteryComp); + } + } + + private void OnUpgradeExamine(EntityUid uid, UpgradeBatteryComponent component, UpgradeExamineEvent args) + { + // UpgradeBatteryComponent.MaxChargeMultiplier is not the actual multiplier, so we have to do this. + if (TryComp(uid, out var batteryComp)) + { + args.AddPercentageUpgrade("upgrade-max-charge", batteryComp.MaxCharge / component.BaseMaxCharge); + } + } +} diff --git a/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs b/Content.Server/_NF/Power/EntitySystems/UpgradePowerSystem.cs similarity index 98% rename from Content.Server/Power/EntitySystems/UpgradePowerSystem.cs rename to Content.Server/_NF/Power/EntitySystems/UpgradePowerSystem.cs index 9cf28c386a6..51c8c76d549 100644 --- a/Content.Server/Power/EntitySystems/UpgradePowerSystem.cs +++ b/Content.Server/_NF/Power/EntitySystems/UpgradePowerSystem.cs @@ -1,8 +1,9 @@ using Content.Server.Construction; using Content.Server.Construction.Components; using Content.Server.Power.Components; +using Content.Server._NF.Power.Components; -namespace Content.Server.Power.EntitySystems; +namespace Content.Server._NF.Power.EntitySystems; /// /// This handles using upgraded machine parts diff --git a/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs b/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs index 21eb4d17d00..d662b953abb 100644 --- a/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs +++ b/Content.Server/_NF/PublicTransit/PublicTransitSystem.cs @@ -13,8 +13,7 @@ using Robust.Shared.Map; using Robust.Shared.Timing; using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent; -using Content.Server.Warps; -using Content.Server.Station.Systems; +using Content.Server._NF.Station.Systems; namespace Content.Server._NF.PublicTransit; diff --git a/Content.Server/Shipyard/Commands/PurchaseShuttleCommand.cs b/Content.Server/_NF/Shipyard/Commands/PurchaseShuttleCommand.cs similarity index 92% rename from Content.Server/Shipyard/Commands/PurchaseShuttleCommand.cs rename to Content.Server/_NF/Shipyard/Commands/PurchaseShuttleCommand.cs index 6dca2bcc1f6..4273294d188 100644 --- a/Content.Server/Shipyard/Commands/PurchaseShuttleCommand.cs +++ b/Content.Server/_NF/Shipyard/Commands/PurchaseShuttleCommand.cs @@ -1,10 +1,9 @@ using Content.Server.Administration; -using Content.Server.Maps; -using Content.Server.Shipyard.Systems; +using Content.Server._NF.Shipyard.Systems; using Content.Shared.Administration; using Robust.Shared.Console; -namespace Content.Server.Shipyard.Commands; +namespace Content.Server._NF.Shipyard.Commands; /// /// Purchases a shuttle and docks it to a station. diff --git a/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs b/Content.Server/_NF/Shipyard/Components/ShipyardVoucherComponent.cs similarity index 93% rename from Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs rename to Content.Server/_NF/Shipyard/Components/ShipyardVoucherComponent.cs index 9a90ce503e6..e9bfe71b29e 100644 --- a/Content.Server/Shipyard/Components/ShipyardVoucherComponent.cs +++ b/Content.Server/_NF/Shipyard/Components/ShipyardVoucherComponent.cs @@ -1,8 +1,8 @@ using Content.Shared.Access; -using Content.Shared.Shipyard; +using Content.Shared._NF.Shipyard; using Robust.Shared.Prototypes; -namespace Content.Server.Shipyard.Components; +namespace Content.Server._NF.Shipyard.Components; [RegisterComponent, AutoGenerateComponentPause] public sealed partial class ShipyardVoucherComponent : Component diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs similarity index 98% rename from Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs rename to Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs index 2d1e7eb2358..2776654a40f 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.Consoles.cs +++ b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs @@ -2,15 +2,15 @@ using Content.Server.Popups; using Content.Server.Radio.EntitySystems; using Content.Server._NF.Bank; -using Content.Server.Shipyard.Components; -using Content.Shared.Bank.Components; -using Content.Shared.Shipyard.Events; -using Content.Shared.Shipyard.BUI; -using Content.Shared.Shipyard.Prototypes; -using Content.Shared.Shipyard.Components; +using Content.Server._NF.Shipyard.Components; +using Content.Shared._NF.Bank.Components; +using Content.Shared._NF.Shipyard.Events; +using Content.Shared._NF.Shipyard.BUI; +using Content.Shared._NF.Shipyard.Prototypes; +using Content.Shared._NF.Shipyard.Components; using Content.Shared.Access.Systems; using Content.Shared.Access.Components; -using Content.Shared.Shipyard; +using Content.Shared._NF.Shipyard; using Robust.Server.GameObjects; using Robust.Shared.Containers; using Robust.Shared.Prototypes; @@ -29,9 +29,9 @@ using Content.Server.StationRecords.Systems; using Content.Shared.Database; using Content.Shared.Preferences; -using static Content.Shared.Shipyard.Components.ShuttleDeedComponent; +using static Content.Shared._NF.Shipyard.Components.ShuttleDeedComponent; using Content.Server.Shuttles.Components; -using Content.Server.Station.Components; +using Content.Server._NF.Station.Components; using System.Text.RegularExpressions; using Content.Server._NF.ShuttleRecords; using Content.Shared.UserInterface; @@ -42,7 +42,7 @@ using Content.Server.StationEvents.Components; using Content.Shared._NF.Bank.BUI; -namespace Content.Server.Shipyard.Systems; +namespace Content.Server._NF.Shipyard.Systems; public sealed partial class ShipyardSystem : SharedShipyardSystem { diff --git a/Content.Server/Shipyard/Systems/ShipyardSystem.cs b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.cs similarity index 97% rename from Content.Server/Shipyard/Systems/ShipyardSystem.cs rename to Content.Server/_NF/Shipyard/Systems/ShipyardSystem.cs index a4b7e405300..982789f031f 100644 --- a/Content.Server/Shipyard/Systems/ShipyardSystem.cs +++ b/Content.Server/_NF/Shipyard/Systems/ShipyardSystem.cs @@ -3,26 +3,24 @@ using Content.Server.Station.Components; using Content.Server.Cargo.Systems; using Content.Server.Station.Systems; -using Content.Shared.Shipyard.Components; -using Content.Shared.Shipyard; +using Content.Shared._NF.Shipyard.Components; +using Content.Shared._NF.Shipyard; using Content.Shared.GameTicking; using Robust.Server.GameObjects; using Robust.Server.Maps; using Robust.Shared.Map; -using Content.Shared.CCVar; using Content.Shared._NF.CCVar; using Robust.Shared.Configuration; using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Numerics; -using Content.Shared.Coordinates; -using Content.Shared.Shipyard.Events; +using Content.Shared._NF.Shipyard.Events; using Content.Shared.Mobs.Components; using Robust.Shared.Containers; -using Content.Server._NF.Smuggling.Components; using Robust.Shared.Map.Components; +using Content.Server._NF.Station.Components; -namespace Content.Server.Shipyard.Systems; +namespace Content.Server._NF.Shipyard.Systems; public sealed partial class ShipyardSystem : SharedShipyardSystem { diff --git a/Content.Server/Shipyard/Systems/ShuttleDeedSystem.cs b/Content.Server/_NF/Shipyard/Systems/ShuttleDeedSystem.cs similarity index 82% rename from Content.Server/Shipyard/Systems/ShuttleDeedSystem.cs rename to Content.Server/_NF/Shipyard/Systems/ShuttleDeedSystem.cs index eb47ab54cab..6053158915c 100644 --- a/Content.Server/Shipyard/Systems/ShuttleDeedSystem.cs +++ b/Content.Server/_NF/Shipyard/Systems/ShuttleDeedSystem.cs @@ -1,8 +1,8 @@ -using Content.Shared.Shipyard.Components; +using Content.Shared._NF.Shipyard.Components; using Content.Shared.Examine; -using Content.Server.Shipyard.Systems; +using Content.Server._NF.Shipyard.Systems; -namespace Content.Shared.Shipyard; +namespace Content.Shared._NF.Shipyard; public sealed partial class ShuttleDeedSystem : EntitySystem { diff --git a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs index bbd0c906675..0d497b8e19a 100644 --- a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs +++ b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.Console.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Server._NF.Bank; using Content.Server.Cargo.Components; using Content.Shared._NF.Bank.BUI; @@ -7,7 +7,7 @@ using Content.Shared._NF.ShuttleRecords.Events; using Content.Shared.Access.Components; using Content.Shared.Database; -using Content.Shared.Shipyard.Components; +using Content.Shared._NF.Shipyard.Components; using Robust.Shared.Audio; using Robust.Shared.Containers; diff --git a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs index f3b9242d422..dae89c7caf4 100644 --- a/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs +++ b/Content.Server/_NF/ShuttleRecords/ShuttleRecordsSystem.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using Content.Server._NF.SectorServices; using Content.Server._NF.ShuttleRecords.Components; using Content.Server.Administration.Logs; @@ -7,7 +7,7 @@ using Content.Server.Station.Systems; using Content.Shared._NF.ShuttleRecords; using Content.Shared.Access.Systems; -using Content.Shared.Shipyard.Components; +using Content.Shared._NF.Shipyard.Components; using Robust.Server.GameObjects; using Robust.Shared.Timing; diff --git a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs index f8a11aa3993..4781b75a905 100644 --- a/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/_NF/Shuttles/Systems/ShuttleSystem.cs @@ -4,7 +4,7 @@ using Content.Server._NF.Station.Components; using Content.Server.Shuttles.Components; using Content.Shared._NF.Shuttles.Events; -using Content.Shared.Shipyard.Components; +using Content.Shared._NF.Shipyard.Components; using Robust.Shared.Physics.Components; namespace Content.Server.Shuttles.Systems; diff --git a/Content.Server/_NF/Smuggling/DeadDropSystem.cs b/Content.Server/_NF/Smuggling/DeadDropSystem.cs index 6c658e2a661..5a67566e07f 100644 --- a/Content.Server/_NF/Smuggling/DeadDropSystem.cs +++ b/Content.Server/_NF/Smuggling/DeadDropSystem.cs @@ -5,7 +5,7 @@ using Content.Server._NF.Smuggling.Components; using Content.Server.Administration.Logs; using Content.Server.Radio.EntitySystems; -using Content.Server.Shipyard.Systems; +using Content.Server._NF.Shipyard.Systems; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Systems; using Content.Server.Station.Components; @@ -28,6 +28,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; +using Content.Server._NF.Station.Systems; namespace Content.Server._NF.Smuggling; diff --git a/Content.Server/_NF/Goblin/Components/GoblinComponent.cs b/Content.Server/_NF/Species/Components/GoblinComponent.cs similarity index 62% rename from Content.Server/_NF/Goblin/Components/GoblinComponent.cs rename to Content.Server/_NF/Species/Components/GoblinComponent.cs index 35533e98cc3..37db3aeeab7 100644 --- a/Content.Server/_NF/Goblin/Components/GoblinComponent.cs +++ b/Content.Server/_NF/Species/Components/GoblinComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server._NF.Goblin.Components; +namespace Content.Server._NF.Species.Components; [RegisterComponent] public sealed partial class GoblinComponent : Component diff --git a/Content.Server/Station/Components/StationDeedSpawnerComponent.cs b/Content.Server/_NF/Station/Components/StationDeedSpawnerComponent.cs similarity index 76% rename from Content.Server/Station/Components/StationDeedSpawnerComponent.cs rename to Content.Server/_NF/Station/Components/StationDeedSpawnerComponent.cs index 81ff6d64187..196b99ea066 100644 --- a/Content.Server/Station/Components/StationDeedSpawnerComponent.cs +++ b/Content.Server/_NF/Station/Components/StationDeedSpawnerComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Station.Components; +namespace Content.Server._NF.Station.Components; /// /// Copy deep of a ship to a new card diff --git a/Content.Server/Station/Systems/StationRenameWarpsSystems.cs b/Content.Server/_NF/Station/Systems/StationRenameWarpsSystems.cs similarity index 98% rename from Content.Server/Station/Systems/StationRenameWarpsSystems.cs rename to Content.Server/_NF/Station/Systems/StationRenameWarpsSystems.cs index 7ec387cb2ac..0a1e8e5862e 100644 --- a/Content.Server/Station/Systems/StationRenameWarpsSystems.cs +++ b/Content.Server/_NF/Station/Systems/StationRenameWarpsSystems.cs @@ -1,9 +1,10 @@ using System.Linq; using Content.Server.Station.Components; using Content.Server.Station.Events; +using Content.Server.Station.Systems; using Content.Server.Warps; -namespace Content.Server.Station.Systems; +namespace Content.Server._NF.Station.Systems; public sealed class StationRenameWarpsSystems : EntitySystem { diff --git a/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs b/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs index 927e7591a63..520f63fc761 100644 --- a/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs +++ b/Content.Server/_NF/StationEvents/Components/BluespaceErrorRuleComponent.cs @@ -4,10 +4,11 @@ using Content.Shared.Procedural; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Robust.Shared.Map; +using Content.Server._NF.StationEvents.Events; -namespace Content.Server.StationEvents.Components; +namespace Content.Server._NF.StationEvents.Components; [RegisterComponent, Access(typeof(BluespaceErrorRule), typeof(ShuttleSystem))] public sealed partial class BluespaceErrorRuleComponent : Component diff --git a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs index eb1fc5c7159..66c52913ce2 100644 --- a/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs +++ b/Content.Server/_NF/StationEvents/EventSystems/LinkedLifecycleGridSystem.cs @@ -1,6 +1,6 @@ using System.Numerics; using Content.Server.StationEvents.Components; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.Humanoid; using Content.Shared.Mech.Components; using Content.Shared.Mind; diff --git a/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs b/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs index 1073ea56e15..db199d039ab 100644 --- a/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs +++ b/Content.Server/_NF/StationEvents/Events/BluespaceErrorRule.cs @@ -14,12 +14,12 @@ using Content.Server.Procedural; using Robust.Shared.Prototypes; using Content.Shared.Salvage; -using Content.Server.Warps; -using Content.Server.Station.Systems; using Content.Server.Maps.NameGenerators; -using Content.Shared.Dataset; +using Content.Server.StationEvents.Events; +using Content.Server._NF.Station.Systems; +using Content.Server._NF.StationEvents.Components; -namespace Content.Server.StationEvents.Events; +namespace Content.Server._NF.StationEvents.Events; public sealed class BluespaceErrorRule : StationEventSystem { diff --git a/Content.Server/Traits/Assorted/FriedTraitComponent.cs b/Content.Server/_NF/Traits/Assorted/FriedTraitComponent.cs similarity index 92% rename from Content.Server/Traits/Assorted/FriedTraitComponent.cs rename to Content.Server/_NF/Traits/Assorted/FriedTraitComponent.cs index f0a3f38af90..33bf7a132b6 100644 --- a/Content.Server/Traits/Assorted/FriedTraitComponent.cs +++ b/Content.Server/_NF/Traits/Assorted/FriedTraitComponent.cs @@ -2,7 +2,7 @@ using Content.Shared.Nyanotrasen.Kitchen.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Server.Traits.Assorted; +namespace Content.Server._NF.Traits.Assorted; /// /// This is used for the fried trait. diff --git a/Content.Server/Traits/Assorted/FriedTraitSystem.cs b/Content.Server/_NF/Traits/Assorted/FriedTraitSystem.cs similarity index 93% rename from Content.Server/Traits/Assorted/FriedTraitSystem.cs rename to Content.Server/_NF/Traits/Assorted/FriedTraitSystem.cs index 4e6fc19af9e..fd8c3bda548 100644 --- a/Content.Server/Traits/Assorted/FriedTraitSystem.cs +++ b/Content.Server/_NF/Traits/Assorted/FriedTraitSystem.cs @@ -1,7 +1,7 @@ using Content.Server.Kitchen.EntitySystems; using Content.Server.Nyanotrasen.Kitchen.EntitySystems; -namespace Content.Server.Traits.Assorted; +namespace Content.Server._NF.Traits.Assorted; /// /// This handles fried trait, causing the affected to look crispy. diff --git a/Content.Server/Traits/Assorted/StinkyTraitComponent.cs b/Content.Server/_NF/Traits/Assorted/StinkyTraitComponent.cs similarity index 87% rename from Content.Server/Traits/Assorted/StinkyTraitComponent.cs rename to Content.Server/_NF/Traits/Assorted/StinkyTraitComponent.cs index bd5d5f681b8..34cac1aad9b 100644 --- a/Content.Server/Traits/Assorted/StinkyTraitComponent.cs +++ b/Content.Server/_NF/Traits/Assorted/StinkyTraitComponent.cs @@ -1,7 +1,6 @@ using System.Numerics; -using Content.Shared.Atmos; -namespace Content.Server.Traits.Assorted; +namespace Content.Server._NF.Traits.Assorted; /// /// This is used for the stinky trait. diff --git a/Content.Server/Traits/Assorted/StinkyTraitSystem.cs b/Content.Server/_NF/Traits/Assorted/StinkyTraitSystem.cs similarity index 98% rename from Content.Server/Traits/Assorted/StinkyTraitSystem.cs rename to Content.Server/_NF/Traits/Assorted/StinkyTraitSystem.cs index 51ca17b656c..83b485789b7 100644 --- a/Content.Server/Traits/Assorted/StinkyTraitSystem.cs +++ b/Content.Server/_NF/Traits/Assorted/StinkyTraitSystem.cs @@ -13,7 +13,7 @@ using Content.Shared.Popups; using Robust.Shared.Player; -namespace Content.Server.Traits.Assorted; +namespace Content.Server._NF.Traits.Assorted; /// /// This handles stink, causing the affected to stink uncontrollably at a random interval. diff --git a/Content.Server/Traits/Assorted/UncloneableComponent.cs b/Content.Server/_NF/Traits/Assorted/UncloneableComponent.cs similarity index 77% rename from Content.Server/Traits/Assorted/UncloneableComponent.cs rename to Content.Server/_NF/Traits/Assorted/UncloneableComponent.cs index 650b78cd0f2..91fae96fb8f 100644 --- a/Content.Server/Traits/Assorted/UncloneableComponent.cs +++ b/Content.Server/_NF/Traits/Assorted/UncloneableComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Traits.Assorted; +namespace Content.Server._NF.Traits.Assorted; /// /// This is used for the uncloneable trait. diff --git a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs index 59380c46c47..2192a9caa73 100644 --- a/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs +++ b/Content.Shared/Cargo/Components/CargoOrderConsoleComponent.cs @@ -3,7 +3,7 @@ using Robust.Shared.GameStates; using Content.Shared.Radio; using Robust.Shared.Prototypes; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; namespace Content.Shared.Cargo.Components; diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs index fc5adfaf15a..6d8c927ec98 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs @@ -30,6 +30,7 @@ private void InitializeInteractions() CommandBinds.Builder .Bind(ContentKeyFunctions.UseItemInHand, InputCmdHandler.FromDelegate(HandleUseItem, handle: false, outsidePrediction: false)) .Bind(ContentKeyFunctions.AltUseItemInHand, InputCmdHandler.FromDelegate(HandleAltUseInHand, handle: false, outsidePrediction: false)) + .Bind(ContentKeyFunctions.SwapHandsPrevious, InputCmdHandler.FromDelegate(SwapHandsPreviousPressed, handle: false, outsidePrediction: false)) // Frontier .Bind(ContentKeyFunctions.SwapHands, InputCmdHandler.FromDelegate(SwapHandsPressed, handle: false, outsidePrediction: false)) .Bind(ContentKeyFunctions.Drop, new PointerInputCmdHandler(DropPressed)) .Register(); @@ -95,6 +96,25 @@ private void SwapHandsPressed(ICommonSession? session) TrySetActiveHand(session.AttachedEntity.Value, nextHand, component); } + // Frontier: swap hands + private void SwapHandsPreviousPressed(ICommonSession? session) + { + if (!TryComp(session?.AttachedEntity, out HandsComponent? component)) + return; + + if (!_actionBlocker.CanInteract(session.AttachedEntity.Value, null)) + return; + + if (component.ActiveHand == null || component.Hands.Count < 2) + return; + + var newActiveIndex = component.SortedHands.IndexOf(component.ActiveHand.Name) + component.Hands.Count - 1; // Ensure no negatives + var nextHand = component.SortedHands[newActiveIndex % component.Hands.Count]; + + TrySetActiveHand(session.AttachedEntity.Value, nextHand, component); + } + // End Frontier: swap hands + private bool DropPressed(ICommonSession? session, EntityCoordinates coords, EntityUid netEntity) { if (TryComp(session?.AttachedEntity, out HandsComponent? hands) && hands.ActiveHand != null) diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index 863d9da970f..20dd64047fb 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -35,6 +35,7 @@ public static class ContentKeyFunctions public static readonly BoundKeyFunction OpenBelt = "OpenBelt"; public static readonly BoundKeyFunction OpenAHelp = "OpenAHelp"; public static readonly BoundKeyFunction SwapHands = "SwapHands"; + public static readonly BoundKeyFunction SwapHandsPrevious = "SwapHandsPrevious"; // Frontier public static readonly BoundKeyFunction MoveStoredItem = "MoveStoredItem"; public static readonly BoundKeyFunction RotateStoredItem = "RotateStoredItem"; public static readonly BoundKeyFunction SaveItemLocation = "SaveItemLocation"; diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs index 34e9552c3bc..63da1ef4385 100644 --- a/Content.Shared/Lathe/LatheComponent.cs +++ b/Content.Shared/Lathe/LatheComponent.cs @@ -25,7 +25,7 @@ public sealed partial class LatheComponent : Component /// The lathe's construction queue /// [DataField] - public List Queue = new(); + public List Queue = new(); // Frontier: LatheRecipePrototype /// The sound that plays when the lathe is producing an item, if any @@ -141,6 +141,23 @@ public LatheGetRecipesEvent(EntityUid lathe, bool forced) } } + // Frontier: batch lathe recipes + [Serializable] + public sealed partial class LatheRecipeBatch : EntityEventArgs + { + public LatheRecipePrototype Recipe; + public int ItemsPrinted; + public int ItemsRequested; + + public LatheRecipeBatch(LatheRecipePrototype recipe, int itemsPrinted, int itemsRequested) + { + Recipe = recipe; + ItemsPrinted = itemsPrinted; + ItemsRequested = itemsRequested; + } + } + // End Frontier + /// /// Event raised on a lathe when it starts producing a recipe. /// diff --git a/Content.Shared/Lathe/LatheMessages.cs b/Content.Shared/Lathe/LatheMessages.cs index 820c496d30c..6933dbf7b6f 100644 --- a/Content.Shared/Lathe/LatheMessages.cs +++ b/Content.Shared/Lathe/LatheMessages.cs @@ -9,11 +9,11 @@ public sealed class LatheUpdateState : BoundUserInterfaceState { public List> Recipes; - public List Queue; + public List Queue; // Frontier: LatheRecipePrototype> recipes, List queue, LatheRecipePrototype? currentlyProducing = null) + public LatheUpdateState(List> recipes, List queue, LatheRecipePrototype? currentlyProducing = null) // Frontier: change queue type { Recipes = recipes; Queue = queue; diff --git a/Content.Shared/Mind/MindComponent.cs b/Content.Shared/Mind/MindComponent.cs index 544ac40f68f..865c45f0c83 100644 --- a/Content.Shared/Mind/MindComponent.cs +++ b/Content.Shared/Mind/MindComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.Network; using Robust.Shared.Player; using Robust.Shared.Prototypes; -using Content.Shared.Corvax.Respawn; // Frontier +using Content.Shared._Corvax.Respawn; // Frontier namespace Content.Shared.Mind; diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs index 9bf79f5188e..c95566292a0 100644 --- a/Content.Shared/RCD/Systems/RCDSystem.cs +++ b/Content.Shared/RCD/Systems/RCDSystem.cs @@ -12,7 +12,7 @@ using Content.Shared.Physics; using Content.Shared.Popups; using Content.Shared.RCD.Components; -using Content.Shared.Shipyard.Components; +using Content.Shared._NF.Shipyard.Components; // Frontier using Content.Shared.Tag; using Content.Shared.Tiles; using Robust.Shared.Audio.Systems; diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs index d18a5abb5e3..503ee2863f2 100644 --- a/Content.Shared/Species/Systems/ReformSystem.cs +++ b/Content.Shared/Species/Systems/ReformSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Species.Components; using Content.Shared.Actions; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Content.Shared.DoAfter; using Content.Shared.Popups; using Content.Shared.Stunnable; diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index e5b14924391..1d3493ba3c4 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; // Frontier using Robust.Shared.Audio; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Corvax/Respawn/RespawnResetEvent.cs b/Content.Shared/_Corvax/Respawn/RespawnResetEvent.cs similarity index 81% rename from Content.Shared/Corvax/Respawn/RespawnResetEvent.cs rename to Content.Shared/_Corvax/Respawn/RespawnResetEvent.cs index 81fc4b9ec67..ee090458e4f 100644 --- a/Content.Shared/Corvax/Respawn/RespawnResetEvent.cs +++ b/Content.Shared/_Corvax/Respawn/RespawnResetEvent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Corvax.Respawn; +namespace Content.Shared._Corvax.Respawn; [Serializable, NetSerializable] public sealed class RespawnResetEvent(TimeSpan? time) : EntityEventArgs diff --git a/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs b/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs index 5da333d5fe2..211ec01785d 100644 --- a/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs +++ b/Content.Shared/_NF/Bank/BUI/BankATMMenuInterfaceState.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.BUI; +namespace Content.Shared._NF.Bank.BUI; [NetSerializable, Serializable] public sealed class BankATMMenuInterfaceState : BoundUserInterfaceState diff --git a/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs b/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs index 35669bf7157..8936af7ea6e 100644 --- a/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs +++ b/Content.Shared/_NF/Bank/BUI/NFLedgerState.cs @@ -1,4 +1,4 @@ -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Robust.Shared.Serialization; namespace Content.Shared._NF.Bank.BUI; diff --git a/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs b/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs index 9fe203f6896..c895996a472 100644 --- a/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs +++ b/Content.Shared/_NF/Bank/BUI/StationBankATMMenuInterfaceState.cs @@ -5,7 +5,7 @@ */ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.BUI; +namespace Content.Shared._NF.Bank.BUI; [NetSerializable, Serializable] public sealed class StationBankATMMenuInterfaceState : BoundUserInterfaceState diff --git a/Content.Shared/_NF/Bank/Components/BankATMComponent.cs b/Content.Shared/_NF/Bank/Components/BankATMComponent.cs index 90fe3d91ee9..390c2222c87 100644 --- a/Content.Shared/_NF/Bank/Components/BankATMComponent.cs +++ b/Content.Shared/_NF/Bank/Components/BankATMComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; [RegisterComponent, NetworkedComponent] diff --git a/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs b/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs index ebe379b0cee..ce7f4d25259 100644 --- a/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs +++ b/Content.Shared/_NF/Bank/Components/BankAccountComponent.cs @@ -1,7 +1,6 @@ using Robust.Shared.GameStates; -using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; [RegisterComponent, NetworkedComponent] [AutoGenerateComponentState] @@ -9,7 +8,7 @@ public sealed partial class BankAccountComponent : Component { // The amount of money this entity has in their bank account. // Should not be modified directly, may be out-of-date. - [DataField("balance"), Access(typeof(SharedBankSystem))] + [DataField, Access(typeof(SharedBankSystem))] [AutoNetworkedField] public int Balance; } diff --git a/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs b/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs index aad7a124bcc..e2abef8e63e 100644 --- a/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs +++ b/Content.Shared/_NF/Bank/Components/MarketModifierComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; /// /// This is used for applying a pricing modifier to things like vending machines. diff --git a/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs b/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs index 022fd3d5d29..282aa5de667 100644 --- a/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs +++ b/Content.Shared/_NF/Bank/Components/StationBankATMComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Bank.Components; +namespace Content.Shared._NF.Bank.Components; [RegisterComponent, NetworkedComponent] diff --git a/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs b/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs index 02b500d97b6..b4df842a652 100644 --- a/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs +++ b/Content.Shared/_NF/Bank/Events/BankDepositMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank deposit diff --git a/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs b/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs index 9b4b76bfd16..30c5a8d30b5 100644 --- a/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs +++ b/Content.Shared/_NF/Bank/Events/BankWithdrawMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank withdrawl diff --git a/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs b/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs index ddbc074449d..b171dca674e 100644 --- a/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs +++ b/Content.Shared/_NF/Bank/Events/StationBankDepositMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank deposit diff --git a/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs b/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs index 22cac8ab656..931b821eb0a 100644 --- a/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs +++ b/Content.Shared/_NF/Bank/Events/StationBankWithdrawMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Bank.Events; +namespace Content.Shared._NF.Bank.Events; /// /// Raised on a client bank withdrawl diff --git a/Content.Shared/_NF/Bank/MarketModifierSystem.cs b/Content.Shared/_NF/Bank/MarketModifierSystem.cs index 4e1ec313228..41d99628eaf 100644 --- a/Content.Shared/_NF/Bank/MarketModifierSystem.cs +++ b/Content.Shared/_NF/Bank/MarketModifierSystem.cs @@ -1,8 +1,8 @@ using Content.Shared.Examine; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.VendingMachines; -namespace Content.Shared.Bank; +namespace Content.Shared._NF.Bank; public sealed partial class MarketModifierSystem : EntitySystem { diff --git a/Content.Shared/_NF/Bank/SharedBankSystem.cs b/Content.Shared/_NF/Bank/SharedBankSystem.cs index 8961f5f1483..cc86d65c44b 100644 --- a/Content.Shared/_NF/Bank/SharedBankSystem.cs +++ b/Content.Shared/_NF/Bank/SharedBankSystem.cs @@ -1,9 +1,9 @@ -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.Containers.ItemSlots; using Robust.Shared.GameStates; using Robust.Shared.Serialization; -namespace Content.Shared.Bank; +namespace Content.Shared._NF.Bank; [NetSerializable, Serializable] public enum BankATMMenuUiKey : byte diff --git a/Content.Shared/_NF/Market/Components/CrateMachineComponent.cs b/Content.Shared/_NF/CrateMachine/Components/CrateMachineComponent.cs similarity index 81% rename from Content.Shared/_NF/Market/Components/CrateMachineComponent.cs rename to Content.Shared/_NF/CrateMachine/Components/CrateMachineComponent.cs index dedfb2d15ac..639d2619aaa 100644 --- a/Content.Shared/_NF/Market/Components/CrateMachineComponent.cs +++ b/Content.Shared/_NF/CrateMachine/Components/CrateMachineComponent.cs @@ -1,24 +1,19 @@ using Robust.Shared.Audio; using Robust.Shared.GameStates; -using Robust.Shared.Serialization; -namespace Content.Shared._NF.Market.Components; +namespace Content.Shared._NF.CrateMachine.Components; [RegisterComponent] [NetworkedComponent] -[Access(typeof(SharedMarketSystem))] +[Access(typeof(SharedCrateMachineSystem))] public sealed partial class CrateMachineComponent: Component { - - [NonSerialized] - public List ItemsToSpawn; - + /// + /// Used by the animation code to determine whether the next action is opening or closing + /// [NonSerialized] public bool DidTakeCrate = true; - [ViewVariables, DataField] - public bool Powered; - /// /// Sounds played when the door is opening and crate coming out. /// @@ -90,20 +85,5 @@ public sealed partial class CrateMachineComponent: Component [DataField] public string ClosedSpriteState = "opening"; - [Serializable, NetSerializable] - public enum CrateMachineVisuals : byte - { - VisualState - } - - [Serializable, NetSerializable] - public enum CrateMachineVisualState : byte - { - Open, - Closed, - Opening, - Closing - } - #endregion } diff --git a/Content.Shared/_NF/CrateMachine/CrateMachineVisuals.cs b/Content.Shared/_NF/CrateMachine/CrateMachineVisuals.cs new file mode 100644 index 00000000000..d503562ac99 --- /dev/null +++ b/Content.Shared/_NF/CrateMachine/CrateMachineVisuals.cs @@ -0,0 +1,18 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared._NF.CrateMachine; + +[Serializable, NetSerializable] +public enum CrateMachineVisualState : byte +{ + Open, + Closed, + Opening, + Closing, +} + +[Serializable, NetSerializable] +public enum CrateMachineVisuals : byte +{ + VisualState, +} diff --git a/Content.Shared/_NF/CrateMachine/SharedCrateMachineSystem.cs b/Content.Shared/_NF/CrateMachine/SharedCrateMachineSystem.cs new file mode 100644 index 00000000000..9d2cffc6e2e --- /dev/null +++ b/Content.Shared/_NF/CrateMachine/SharedCrateMachineSystem.cs @@ -0,0 +1,5 @@ +namespace Content.Shared._NF.CrateMachine; + +public abstract class SharedCrateMachineSystem : EntitySystem +{ +}; diff --git a/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs b/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs index 081b36b12e3..51ac998c132 100644 --- a/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs +++ b/Content.Shared/_NF/CryoSleep/AcceptCryoSleepEuiMessage.cs @@ -1,7 +1,7 @@ using Content.Shared.Eui; using Robust.Shared.Serialization; -namespace Content.Shared.CryoSleep; +namespace Content.Shared._NF.CryoSleep; [Serializable, NetSerializable] public enum AcceptCryoUiButton diff --git a/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs b/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs index 109c25225c7..d3459ab55e8 100644 --- a/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs +++ b/Content.Shared/_NF/CryoSleep/SharedCryoSleepSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.DoAfter; using Robust.Shared.Serialization; -namespace Content.Shared.CryoSleep; +namespace Content.Shared._NF.CryoSleep; public abstract partial class SharedCryoSleepSystem : EntitySystem { diff --git a/Content.Shared/_NF/Market/Components/MarketItemSpawnerComponent.cs b/Content.Shared/_NF/Market/Components/MarketItemSpawnerComponent.cs new file mode 100644 index 00000000000..b09aad6e50f --- /dev/null +++ b/Content.Shared/_NF/Market/Components/MarketItemSpawnerComponent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._NF.Market.Components; + +[RegisterComponent] +[NetworkedComponent] +public sealed partial class MarketItemSpawnerComponent : Component +{ + + [NonSerialized] + public List ItemsToSpawn; +} diff --git a/Content.Shared/_NF/Market/Events/CrateMachinePurchaseMessage.cs b/Content.Shared/_NF/Market/Events/CrateMachinePurchaseMessage.cs deleted file mode 100644 index 2e403822c65..00000000000 --- a/Content.Shared/_NF/Market/Events/CrateMachinePurchaseMessage.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Robust.Shared.Serialization; - -namespace Content.Shared._NF.Market.Events; - -/// -/// Purchase a crate message. -/// -[Serializable, NetSerializable] -public sealed class CrateMachinePurchaseMessage : BoundUserInterfaceMessage -{ - -} - diff --git a/Content.Shared/_NF/Market/Events/MarketPurchaseMessage.cs b/Content.Shared/_NF/Market/Events/MarketPurchaseMessage.cs new file mode 100644 index 00000000000..a0dabffa295 --- /dev/null +++ b/Content.Shared/_NF/Market/Events/MarketPurchaseMessage.cs @@ -0,0 +1,12 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared._NF.Market.Events; + +/// +/// When the player purchases an item from the market, this message is sent. +/// +[Serializable, NetSerializable] +public sealed class MarketPurchaseMessage : BoundUserInterfaceMessage +{ +}; + diff --git a/Content.Shared/_NF/Market/SharedMarketSystem.cs b/Content.Shared/_NF/Market/SharedMarketSystem.cs index 25c939eacc7..28e55d66a39 100644 --- a/Content.Shared/_NF/Market/SharedMarketSystem.cs +++ b/Content.Shared/_NF/Market/SharedMarketSystem.cs @@ -2,7 +2,9 @@ namespace Content.Shared._NF.Market; -public abstract class SharedMarketSystem : EntitySystem {} +public abstract class SharedMarketSystem : EntitySystem +{ +}; [NetSerializable, Serializable] public enum MarketConsoleUiKey : byte diff --git a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs b/Content.Shared/_NF/Shipyard/BUI/ShipyardConsoleInterfaceState.cs similarity index 96% rename from Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs rename to Content.Shared/_NF/Shipyard/BUI/ShipyardConsoleInterfaceState.cs index b2262a4041f..c01f50dc965 100644 --- a/Content.Shared/Shipyard/BUI/ShipyardConsoleInterfaceState.cs +++ b/Content.Shared/_NF/Shipyard/BUI/ShipyardConsoleInterfaceState.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Shipyard.BUI; +namespace Content.Shared._NF.Shipyard.BUI; [NetSerializable, Serializable] public sealed class ShipyardConsoleInterfaceState : BoundUserInterfaceState diff --git a/Content.Shared/Shipyard/Components/DisableShipyardSaleComponent.cs b/Content.Shared/_NF/Shipyard/Components/DisableShipyardSaleComponent.cs similarity index 94% rename from Content.Shared/Shipyard/Components/DisableShipyardSaleComponent.cs rename to Content.Shared/_NF/Shipyard/Components/DisableShipyardSaleComponent.cs index ff6f89d6dbf..e2d151f1b6b 100644 --- a/Content.Shared/Shipyard/Components/DisableShipyardSaleComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/DisableShipyardSaleComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Shipyard; +using Content.Shared._NF.Shipyard; namespace Content.Server._NF.Smuggling.Components; diff --git a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs b/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs similarity index 95% rename from Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs rename to Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs index 6b42793eb48..401a7e0b1a8 100644 --- a/Content.Shared/Shipyard/Components/SharedShipyardConsoleComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/SharedShipyardConsoleComponent.cs @@ -4,9 +4,9 @@ using Robust.Shared.Prototypes; using Content.Shared.Radio; using Content.Shared.Access; -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; -namespace Content.Shared.Shipyard.Components; +namespace Content.Shared._NF.Shipyard.Components; [RegisterComponent, NetworkedComponent, Access(typeof(SharedShipyardSystem))] public sealed partial class ShipyardConsoleComponent : Component diff --git a/Content.Shared/Shipyard/Components/ShipyardListingComponent.cs b/Content.Shared/_NF/Shipyard/Components/ShipyardListingComponent.cs similarity index 85% rename from Content.Shared/Shipyard/Components/ShipyardListingComponent.cs rename to Content.Shared/_NF/Shipyard/Components/ShipyardListingComponent.cs index 2aa1df67534..87eb0c2ed48 100644 --- a/Content.Shared/Shipyard/Components/ShipyardListingComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/ShipyardListingComponent.cs @@ -1,7 +1,7 @@ -using Content.Shared.Shipyard.Prototypes; +using Content.Shared._NF.Shipyard.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; -namespace Content.Shared.Shipyard.Components; +namespace Content.Shared._NF.Shipyard.Components; /// /// When applied to a shipyard console, adds all specified shuttles to the list of sold shuttles. diff --git a/Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs b/Content.Shared/_NF/Shipyard/Components/ShuttleDeedComponent.cs similarity index 94% rename from Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs rename to Content.Shared/_NF/Shipyard/Components/ShuttleDeedComponent.cs index 8f9c3cb942e..ca208931093 100644 --- a/Content.Shared/Shipyard/Components/ShuttleDeedComponent.cs +++ b/Content.Shared/_NF/Shipyard/Components/ShuttleDeedComponent.cs @@ -1,7 +1,7 @@ using Content.Shared._NF.ShuttleRecords; using Robust.Shared.GameStates; -namespace Content.Shared.Shipyard.Components; +namespace Content.Shared._NF.Shipyard.Components; /// /// Tied to an ID card when a ship is purchased. 1 ship per captain. diff --git a/Content.Shared/Shipyard/Events/ShipyardConsolePurchaseMessage.cs b/Content.Shared/_NF/Shipyard/Events/ShipyardConsolePurchaseMessage.cs similarity index 88% rename from Content.Shared/Shipyard/Events/ShipyardConsolePurchaseMessage.cs rename to Content.Shared/_NF/Shipyard/Events/ShipyardConsolePurchaseMessage.cs index dd2a6e7649e..1722e9652de 100644 --- a/Content.Shared/Shipyard/Events/ShipyardConsolePurchaseMessage.cs +++ b/Content.Shared/_NF/Shipyard/Events/ShipyardConsolePurchaseMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Shipyard.Events; +namespace Content.Shared._NF.Shipyard.Events; /// /// Purchase a Vessel from the console diff --git a/Content.Shared/Shipyard/Events/ShipyardConsoleSellMessage.cs b/Content.Shared/_NF/Shipyard/Events/ShipyardConsoleSellMessage.cs similarity index 89% rename from Content.Shared/Shipyard/Events/ShipyardConsoleSellMessage.cs rename to Content.Shared/_NF/Shipyard/Events/ShipyardConsoleSellMessage.cs index f5218ba797b..afb13cf1336 100644 --- a/Content.Shared/Shipyard/Events/ShipyardConsoleSellMessage.cs +++ b/Content.Shared/_NF/Shipyard/Events/ShipyardConsoleSellMessage.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Shipyard.Events; +namespace Content.Shared._NF.Shipyard.Events; /// /// Sell a Vessel from the console. The button holds no info and is doing a validation check for a deed client side, but we will still check on the server. diff --git a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs b/Content.Shared/_NF/Shipyard/Prototypes/VesselPrototype.cs similarity index 98% rename from Content.Shared/Shipyard/Prototypes/VesselPrototype.cs rename to Content.Shared/_NF/Shipyard/Prototypes/VesselPrototype.cs index d822331ac20..73afcbf4bc3 100644 --- a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs +++ b/Content.Shared/_NF/Shipyard/Prototypes/VesselPrototype.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Array; using Robust.Shared.Utility; -namespace Content.Shared.Shipyard.Prototypes; +namespace Content.Shared._NF.Shipyard.Prototypes; [Prototype] public sealed class VesselPrototype : IPrototype, IInheritingPrototype diff --git a/Content.Shared/Shipyard/SharedShipyardSystem.cs b/Content.Shared/_NF/Shipyard/SharedShipyardSystem.cs similarity index 94% rename from Content.Shared/Shipyard/SharedShipyardSystem.cs rename to Content.Shared/_NF/Shipyard/SharedShipyardSystem.cs index 215b54cc2d0..168511efc05 100644 --- a/Content.Shared/Shipyard/SharedShipyardSystem.cs +++ b/Content.Shared/_NF/Shipyard/SharedShipyardSystem.cs @@ -1,11 +1,11 @@ using Content.Shared.Containers.ItemSlots; -using Content.Shared.Shipyard; +using Content.Shared._NF.Shipyard; using JetBrains.Annotations; using Robust.Shared.GameStates; using Robust.Shared.Serialization; -using Content.Shared.Shipyard.Components; +using Content.Shared._NF.Shipyard.Components; -namespace Content.Shared.Shipyard; +namespace Content.Shared._NF.Shipyard; // Note: when adding a new ui key, don't forget to modify the dictionary in SharedShipyardSystem [NetSerializable, Serializable] diff --git a/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs b/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs index d32f021ce11..a39a9c375b2 100644 --- a/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs +++ b/Content.Shared/_NF/ShuttleRecords/Components/ShuttleRecordsConsoleComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Bank.Components; +using Content.Shared._NF.Bank.Components; using Content.Shared.Containers.ItemSlots; using Robust.Shared.Audio; using Robust.Shared.GameStates; diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 78ddcb433ee..d2ffa07e67c 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -6688,3 +6688,109 @@ Entries: message: Lathes can now eject materials in stacks of 30. id: 5697 time: '2025-01-31T17:44:42.0000000+00:00' +- author: Havaren + changes: + - type: Tweak + message: >- + VIM can now take two small clamps so our little friends can carry around + their favorite plushies. + id: 5698 + time: '2025-01-31T17:47:05.0000000+00:00' +- author: KieueCaprie + changes: + - type: Fix + message: >- + Advanced SMESes can now be properly constructed. (Recipe suggested by + Alkheemist!) + id: 5699 + time: '2025-01-31T17:53:29.0000000+00:00' +- author: Cheackraze + changes: + - type: Tweak + message: Added long-range holopads to most civillian ships + id: 5700 + time: '2025-01-31T19:54:27.0000000+00:00' +- author: Tych0theSynth + changes: + - type: Tweak + message: Updated the SBB Bodkin and gave it a guidebook entry. + id: 5701 + time: '2025-01-31T21:28:29.0000000+00:00' +- author: whatston3 + changes: + - type: Fix + message: Scrap asteroids no longer spawn with gas deposits. + id: 5702 + time: '2025-01-31T21:51:22.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: A keybind is available to swap to the previous hand (default Shift+X). + id: 5703 + time: '2025-01-31T23:45:13.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Tweak + message: Renamed Wendigo to Hypnos. + id: 5704 + time: '2025-02-01T00:06:36.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Medical forms can now be purchased from the CiviMed. + id: 5705 + time: '2025-02-01T02:17:38.0000000+00:00' +- author: Havaren + changes: + - type: Add + message: 'Added cloth footwraps to the crafting menu. ' + id: 5706 + time: '2025-02-01T02:18:59.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: 'Simple hydroponic wall locker w/ fills. ' + id: 5707 + time: '2025-02-01T02:19:55.0000000+00:00' +- author: the-hivequeen + changes: + - type: Add + message: Added rings to the PietyVend and player loadout. + id: 5708 + time: '2025-02-01T02:21:19.0000000+00:00' +- author: dustylens + changes: + - type: Add + message: Holopads to the SR/Frontier support craft. + id: 5709 + time: '2025-02-01T21:22:03.0000000+00:00' +- author: Cheackraze + changes: + - type: Tweak + message: added holopads to NFSD and Exped ships + id: 5710 + time: '2025-02-01T21:28:42.0000000+00:00' +- author: Cheackraze + changes: + - type: Tweak + message: added holo-pads to scrap ships and POIs + id: 5711 + time: '2025-02-01T22:04:11.0000000+00:00' +- author: whatston3 + changes: + - type: Add + message: Lathes now batch jobs of the same type. + - type: Fix + message: >- + Lathes should behave better when queueing large batches of the same + item. + - type: Tweak + message: Printing material sheets now takes about 60 ms a sheet. + id: 5712 + time: '2025-02-01T23:55:14.0000000+00:00' +- author: dustylens + changes: + - type: Fix + message: Poly medipen recipe corrected. + id: 5713 + time: '2025-02-02T15:18:27.0000000+00:00' diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl index d148045ecac..324fb4acb9c 100644 --- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl +++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl @@ -38,6 +38,7 @@ guide-entry-shipyard-apothecary = Apothecary guide-entry-shipyard-barge = Barge guide-entry-shipyard-bazaar = Bazaar guide-entry-shipyard-bocadillo = Bocadillo +guide-entry-shipyard-bodkin = Bodkin guide-entry-shipyard-bookworm = Bookworm guide-entry-shipyard-brigand = Brigand guide-entry-shipyard-bulker = Bulker diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl index bcc5a994b8b..e25a2c4ceec 100644 --- a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl @@ -143,7 +143,10 @@ ui-options-function-activate-item-in-world = Activate item in world ui-options-function-alt-activate-item-in-world = Alternative activate item in world ui-options-function-drop = Drop item ui-options-function-examine-entity = Examine -ui-options-function-swap-hands = Swap hands +# Frontier: add (next) +ui-options-function-swap-hands = Swap hands (next) +# Frontier +ui-options-function-swap-hands-previous = Swap hands (previous) ui-options-function-move-stored-item = Move stored item ui-options-function-rotate-stored-item = Rotate stored item ui-options-function-save-item-location = Save item location diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index e27d130daf6..ed88e1e34aa 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -3962,13 +3962,15 @@ entities: id: Frontier - type: StationTransit - type: ProtectedGrid + hostileMobKillSound: !type:SoundPathSpecifier + path: /Audio/Effects/holy.ogg + killHostileMobs: True preventArtifactTriggers: True preventExplosions: True preventEmpEvents: True preventRCDUse: True preventFloorPlacement: True preventFloorRemoval: True - killHostileMobs: True - type: SpreaderGrid - type: IFF readOnly: True @@ -27891,6 +27893,27 @@ entities: - type: Transform pos: 27.744509,16.401314 parent: 2173 +- proto: NFHolopadFrontierOutpostLobby + entities: + - uid: 1234 + components: + - type: Transform + pos: -0.5,12.5 + parent: 2173 +- proto: NFHolopadFrontierOutpostSR + entities: + - uid: 2197 + components: + - type: Transform + pos: 6.5,19.5 + parent: 2173 +- proto: NFHolopadFrontierOutpostSTC + entities: + - uid: 2133 + components: + - type: Transform + pos: 15.5,13.5 + parent: 2173 - proto: NFSignBus entities: - uid: 2096 @@ -29008,7 +29031,7 @@ entities: rot: 3.141592653589793 rad pos: 39.5,22.5 parent: 2173 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 2064 components: diff --git a/Resources/Maps/_NF/POI/anomalousgeode.yml b/Resources/Maps/_NF/POI/anomalousgeode.yml index 1d633f08edf..c2905eb0d7a 100644 --- a/Resources/Maps/_NF/POI/anomalousgeode.yml +++ b/Resources/Maps/_NF/POI/anomalousgeode.yml @@ -21,6 +21,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -3616,6 +3617,13 @@ entities: - type: Transform pos: -7.717414,-11.295385 parent: 1 +- proto: NFHolopadLaboratory + entities: + - uid: 665 + components: + - type: Transform + pos: -2.5,-8.5 + parent: 1 - proto: NFSignDock entities: - uid: 771 @@ -3727,7 +3735,7 @@ entities: - type: Transform pos: -7.5,-12.5 parent: 1 -- proto: RandomPosterContrabandDeadDrop +- proto: RandomPosterContraband entities: - uid: 800 components: @@ -4532,6 +4540,32 @@ entities: - type: Transform pos: -1.5,25.5 parent: 1 +- proto: SpawnMobXenoT1 + entities: + - uid: 777 + components: + - type: Transform + pos: -1.5,0.5 + parent: 1 + - uid: 778 + components: + - type: Transform + pos: -1.5,-9.5 + parent: 1 +- proto: SpawnMobXenoT2 + entities: + - uid: 780 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 +- proto: SpawnMobXenoT3 + entities: + - uid: 779 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 - proto: SubstationBasic entities: - uid: 532 @@ -4769,30 +4803,4 @@ entities: - type: Transform pos: -7.154914,-11.451635 parent: 1 -- proto: XenoAISpawnerEasy - entities: - - uid: 777 - components: - - type: Transform - pos: -1.5,0.5 - parent: 1 - - uid: 778 - components: - - type: Transform - pos: -1.5,-9.5 - parent: 1 -- proto: XenoAISpawnerHard - entities: - - uid: 779 - components: - - type: Transform - pos: -1.5,2.5 - parent: 1 -- proto: XenoAISpawnerMedium - entities: - - uid: 780 - components: - - type: Transform - pos: 0.5,2.5 - parent: 1 ... diff --git a/Resources/Maps/_NF/POI/anomalouslab.yml b/Resources/Maps/_NF/POI/anomalouslab.yml index d8f298b5177..6ae99a44e1f 100644 --- a/Resources/Maps/_NF/POI/anomalouslab.yml +++ b/Resources/Maps/_NF/POI/anomalouslab.yml @@ -18,6 +18,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -1619,16 +1620,12 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,17.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1764 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,14.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelMiddle entities: - uid: 96 @@ -1637,32 +1634,24 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,16.5 parent: 1 - - type: Physics - bodyType: Static - uid: 98 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,15.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1765 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,15.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1812 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,16.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelRight entities: - uid: 97 @@ -1671,16 +1660,12 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,14.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1813 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,17.5 parent: 1 - - type: Physics - bodyType: Static - proto: BoxEncryptionKeyScience entities: - uid: 650 @@ -4399,13 +4384,6 @@ entities: - type: Transform pos: 15.5,-13.5 parent: 1 -- proto: NFClosetBombFilled - entities: - - uid: 335 - components: - - type: Transform - pos: 4.5,4.5 - parent: 1 - proto: ClosetEmergencyFilledRandom entities: - uid: 529 @@ -8170,6 +8148,20 @@ entities: - type: Transform pos: 13.938791,8.600368 parent: 1 +- proto: NFClosetBombFilled + entities: + - uid: 335 + components: + - type: Transform + pos: 4.5,4.5 + parent: 1 +- proto: NFHolopadLaboratory + entities: + - uid: 1050 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 78 @@ -9571,6 +9563,62 @@ entities: - type: Transform pos: 16.5,-11.5 parent: 1 +- proto: SpawnMobXenoT1 + entities: + - uid: 323 + components: + - type: Transform + pos: 6.5,-5.5 + parent: 1 + - uid: 334 + components: + - type: Transform + pos: -11.5,-3.5 + parent: 1 + - uid: 337 + components: + - type: Transform + pos: 16.5,-13.5 + parent: 1 + - uid: 351 + components: + - type: Transform + pos: -14.5,-14.5 + parent: 1 + - uid: 651 + components: + - type: Transform + pos: -14.5,-6.5 + parent: 1 +- proto: SpawnMobXenoT2 + entities: + - uid: 339 + components: + - type: Transform + pos: 7.5,6.5 + parent: 1 + - uid: 352 + components: + - type: Transform + pos: 15.5,10.5 + parent: 1 +- proto: SpawnMobXenoT3 + entities: + - uid: 295 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 338 + components: + - type: Transform + pos: -5.5,16.5 + parent: 1 + - uid: 665 + components: + - type: Transform + pos: 16.5,-15.5 + parent: 1 - proto: SpawnVehicleJanicart entities: - uid: 1817 @@ -11523,60 +11571,4 @@ entities: - type: Transform pos: 16.5,-1.5 parent: 1 -- proto: XenoAISpawnerEasy - entities: - - uid: 323 - components: - - type: Transform - pos: 6.5,-5.5 - parent: 1 - - uid: 334 - components: - - type: Transform - pos: -11.5,-3.5 - parent: 1 - - uid: 337 - components: - - type: Transform - pos: 16.5,-13.5 - parent: 1 - - uid: 351 - components: - - type: Transform - pos: -14.5,-14.5 - parent: 1 - - uid: 651 - components: - - type: Transform - pos: -14.5,-6.5 - parent: 1 -- proto: XenoAISpawnerHard - entities: - - uid: 295 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 1 - - uid: 338 - components: - - type: Transform - pos: -5.5,16.5 - parent: 1 - - uid: 665 - components: - - type: Transform - pos: 16.5,-15.5 - parent: 1 -- proto: XenoAISpawnerMedium - entities: - - uid: 339 - components: - - type: Transform - pos: 7.5,6.5 - parent: 1 - - uid: 352 - components: - - type: Transform - pos: 15.5,10.5 - parent: 1 ... diff --git a/Resources/Maps/_NF/POI/bahama.yml b/Resources/Maps/_NF/POI/bahama.yml index fa4eba05593..4cdd44268f7 100644 --- a/Resources/Maps/_NF/POI/bahama.yml +++ b/Resources/Maps/_NF/POI/bahama.yml @@ -30,11 +30,12 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: ind: 0,0 - tiles: EAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAADBQAAAAAAAgAAAAADAgAAAAABBQAAAAABBQAAAAABfwAAAAACAwAAAAACfwAAAAADgwAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAADBQAAAAACBQAAAAADBQAAAAABBQAAAAABBQAAAAADfwAAAAAAAwAAAAAAfwAAAAADgwAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAAABQAAAAADgwAAAAAADQAAAAACgwAAAAAAgwAAAAAAfwAAAAACfwAAAAADfwAAAAACgwAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAACBQAAAAAAgwAAAAAAfwAAAAABfwAAAAAAfwAAAAADfwAAAAAAfwAAAAACfwAAAAADgwAAAAAAAAAAAAAAAAAAAAAADQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAADQAAAAADgwAAAAAAfwAAAAABfwAAAAAAfwAAAAACfwAAAAACfwAAAAADfwAAAAACgwAAAAAAAAAAAAAAAAAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAADgwAAAAAAgwAAAAAADQAAAAACDQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAwAAAAACAwAAAAABAgAAAAAAAgAAAAABAgAAAAADAgAAAAABDQAAAAAAAgAAAAACAgAAAAABAgAAAAABAgAAAAAADQAAAAADBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAwAAAAADAwAAAAABAwAAAAAAAwAAAAAAAwAAAAACAgAAAAAADQAAAAACAgAAAAADAwAAAAACAwAAAAAAAgAAAAABDQAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAACAgAAAAACAgAAAAADAgAAAAACAgAAAAAADQAAAAADAgAAAAACAgAAAAABAgAAAAACAgAAAAACDQAAAAADBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAADQAAAAADDQAAAAABDQAAAAACDQAAAAADDQAAAAACDQAAAAACgwAAAAAAAgAAAAABAwAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAwAAAAAAAgAAAAABgwAAAAAACAAAAAAACAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAAgAAAAADAwAAAAADAgAAAAACDQAAAAACCAAAAAACgwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAADQAAAAABAgAAAAADAgAAAAABAgAAAAABgwAAAAAACAAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAADQAAAAACDQAAAAADgwAAAAAAgwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAABwAAAAAABwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABwAAAAAABwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: EAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAADBQAAAAAAAgAAAAADAgAAAAABBQAAAAABBQAAAAABfwAAAAACAwAAAAACfwAAAAADgwAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAADBQAAAAACBQAAAAADBQAAAAABBQAAAAABBQAAAAADfwAAAAAAAwAAAAAAfwAAAAADgwAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAAABQAAAAADgwAAAAAADQAAAAACgwAAAAAAgwAAAAAAfwAAAAACfwAAAAADfwAAAAACgwAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAEAAAAAAAEAAAAAAAgwAAAAAABQAAAAACBQAAAAAAgwAAAAAAfwAAAAABfwAAAAAAfwAAAAADfwAAAAAAfwAAAAACfwAAAAADgwAAAAAAAAAAAAAAAAAAAAAADQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAADQAAAAADgwAAAAAAfwAAAAABfwAAAAAAfwAAAAACfwAAAAACfwAAAAADfwAAAAACgwAAAAAAAAAAAAAAAAAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAADgwAAAAAAgwAAAAAADQAAAAACDQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAwAAAAACAwAAAAABAgAAAAAAAgAAAAABAgAAAAADAgAAAAABDQAAAAAAAgAAAAACAgAAAAABAgAAAAABAgAAAAAADQAAAAADBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAwAAAAABAwAAAAAAAwAAAAAAAwAAAAACAgAAAAAADQAAAAACAgAAAAADAwAAAAACAwAAAAAAAgAAAAABDQAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAACAgAAAAACAgAAAAADAgAAAAACAgAAAAAADQAAAAADAgAAAAACAgAAAAABAgAAAAACAgAAAAACDQAAAAADBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAADQAAAAADDQAAAAABDQAAAAACDQAAAAADDQAAAAACDQAAAAACgwAAAAAAAgAAAAABAwAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAwAAAAAAAgAAAAABgwAAAAAACAAAAAAACAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAAAgAAAAADAwAAAAADAgAAAAACDQAAAAACCAAAAAACgwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAADQAAAAABAgAAAAADAgAAAAABAgAAAAABgwAAAAAACAAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAADQAAAAACDQAAAAADgwAAAAAAgwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAgwAAAAAABwAAAAAABwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABwAAAAAABwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,0: ind: -1,0 @@ -170,11 +171,6 @@ entities: id: BrickTileDarkLineW decals: 279: -1,7 - - node: - color: '#D58C18A5' - id: BrickTileWhiteBox - decals: - 287: 0,7 - node: color: '#D58C18A5' id: BrickTileWhiteEndE @@ -299,6 +295,11 @@ entities: 112: -11,11 113: -11,10 114: -12,10 + - node: + color: '#D58C18A5' + id: FullTileOverlayGreyscale + decals: + 323: 0,7 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -9696,16 +9697,6 @@ entities: - type: Transform pos: -1.5,9.5 parent: 2 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ComputerPowerMonitoring entities: - uid: 1205 @@ -9767,36 +9758,12 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,2.5 parent: 2 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - - type: Physics - canCollide: False - uid: 2436 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,2.5 parent: 2 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - - type: Physics - canCollide: False - proto: ConveyorBelt entities: - uid: 774 @@ -15358,6 +15325,13 @@ entities: - type: Transform pos: -6.0781217,-8.490014 parent: 2 +- proto: NFHolopadBahama + entities: + - uid: 2326 + components: + - type: Transform + pos: 0.5,7.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 129 @@ -17047,7 +17021,7 @@ entities: - type: Transform pos: 3.5,4.5 parent: 2 -- proto: RandomPosterContrabandDeadDrop +- proto: RandomPosterContraband entities: - uid: 733 components: @@ -17422,16 +17396,6 @@ entities: - type: Transform pos: 0.5,9.5 parent: 2 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: SignalButtonDirectional entities: - uid: 2158 diff --git a/Resources/Maps/_NF/POI/courthouse.yml b/Resources/Maps/_NF/POI/courthouse.yml index 0baeb12540e..3586b96488f 100644 --- a/Resources/Maps/_NF/POI/courthouse.yml +++ b/Resources/Maps/_NF/POI/courthouse.yml @@ -20,6 +20,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -3628,11 +3629,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,4.5 parent: 1 - - uid: 579 - components: - - type: Transform - pos: -3.5,8.5 - parent: 1 - uid: 690 components: - type: Transform @@ -3685,11 +3681,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-11.5 parent: 1 - - uid: 1160 - components: - - type: Transform - pos: 1.5,8.5 - parent: 1 - proto: ChairBrass entities: - uid: 1249 @@ -8857,6 +8848,20 @@ entities: - type: Transform pos: 8.5,-8.5 parent: 1 +- proto: NFHolopadCourthouseDefendant + entities: + - uid: 579 + components: + - type: Transform + pos: -3.5,8.5 + parent: 1 +- proto: NFHolopadCourthouseWitness + entities: + - uid: 1160 + components: + - type: Transform + pos: 1.5,8.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 1456 diff --git a/Resources/Maps/_NF/POI/edison.yml b/Resources/Maps/_NF/POI/edison.yml index 7193fcebbdb..572f7ee87b8 100644 --- a/Resources/Maps/_NF/POI/edison.yml +++ b/Resources/Maps/_NF/POI/edison.yml @@ -2003,7 +2003,7 @@ entities: 0: 65535 -3,8: 0: 13105 - 4: 34944 + 2: 34944 -2,5: 0: 30579 -2,6: @@ -2054,7 +2054,7 @@ entities: 0: 65407 3,8: 0: 15 - 4: 65280 + 2: 65280 4,4: 0: 61183 4,5: @@ -2085,10 +2085,10 @@ entities: 1: 3840 -6,2: 1: 15 - 2: 28672 + 3: 28672 -6,3: - 2: 7 - 3: 30464 + 3: 7 + 4: 30464 -6,-1: 0: 65280 1: 15 @@ -2147,17 +2147,17 @@ entities: 9,0: 0: 3 -4,8: - 4: 13104 + 2: 13104 0: 34944 -5,8: - 4: 52416 + 2: 52416 0: 1 1: 4368 -4,9: - 4: 51 + 2: 51 1: 63616 -5,9: - 4: 204 + 2: 204 1: 61713 -4,10: 1: 15 @@ -2166,13 +2166,13 @@ entities: -3,9: 0: 1 1: 62256 - 4: 136 + 2: 136 -3,10: 1: 15 -2,8: - 4: 30576 + 2: 30576 -2,9: - 4: 119 + 2: 119 1: 61440 -2,10: 1: 15 @@ -2197,29 +2197,29 @@ entities: 2,11: 1: 15 3,9: - 4: 255 + 2: 255 1: 61440 3,10: 1: 15 4,8: 0: 139 - 4: 13056 + 2: 13056 1: 34816 4,9: - 4: 51 + 2: 51 1: 63624 4,10: 1: 15 -6,4: - 4: 1904 + 2: 1904 -6,5: - 4: 119 + 2: 119 5: 28672 -6,6: 5: 7 - 4: 30464 + 2: 30464 -6,7: - 4: 1904 + 2: 1904 5,5: 0: 56792 5,6: @@ -2317,7 +2317,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -2332,7 +2332,6 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 - 6666.982 - 0 - 0 @@ -2344,11 +2343,12 @@ entities: - 0 - 0 - 0 + - 0 - volume: 2500 temperature: 293.15 moles: - 0 - - 0 + - 6666.982 - 0 - 0 - 0 @@ -21447,6 +21447,13 @@ entities: - type: Transform pos: 11.61501,9.490756 parent: 2 +- proto: NFHolopadEdisonReception + entities: + - uid: 4321 + components: + - type: Transform + pos: 0.5,-4.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 2109 diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index ca88fdb0f4c..7fb28bccbb8 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -25,6 +25,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -7766,102 +7767,36 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,12.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - uid: 2518 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,12.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - uid: 2519 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,-1.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - uid: 2520 components: - type: Transform rot: 3.141592653589793 rad pos: -24.5,-1.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - uid: 2521 components: - type: Transform rot: -1.5707963267948966 rad pos: 19.5,20.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - uid: 2522 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,20.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 701 @@ -14304,6 +14239,13 @@ entities: - type: Transform pos: 6.535731,10.07715 parent: 1 +- proto: NFHolopadExpeditionLodge + entities: + - uid: 2576 + components: + - type: Transform + pos: 6.5,8.5 + parent: 1 - proto: NFSignDock entities: - uid: 360 @@ -14913,8 +14855,6 @@ entities: - type: Transform pos: -2.5,11.5 parent: 1 -- proto: RandomPosterContrabandDeadDrop - entities: - uid: 2510 components: - type: Transform diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml index 53718e31bce..868742df7a3 100644 --- a/Resources/Maps/_NF/POI/nfsd.yml +++ b/Resources/Maps/_NF/POI/nfsd.yml @@ -13909,6 +13909,27 @@ entities: - type: Transform pos: 13.5,24.5 parent: 1 +- proto: NFHolopadNFSDLobby + entities: + - uid: 2793 + components: + - type: Transform + pos: 0.5,-3.5 + parent: 1 +- proto: NFHolopadNFSDReception + entities: + - uid: 2794 + components: + - type: Transform + pos: -4.5,3.5 + parent: 1 +- proto: NFHolopadNFSDSheriff + entities: + - uid: 980 + components: + - type: Transform + pos: -3.5,7.5 + parent: 1 - proto: NFSpawnPointDetective entities: - uid: 2699 @@ -14804,11 +14825,6 @@ entities: - type: Transform pos: -15.5,0.5 parent: 1 - - uid: 980 - components: - - type: Transform - pos: -3.5,7.5 - parent: 1 - uid: 1005 components: - type: Transform diff --git a/Resources/Maps/_NF/POI/tinnia.yml b/Resources/Maps/_NF/POI/tinnia.yml index 7602765409a..f7553ad1c38 100644 --- a/Resources/Maps/_NF/POI/tinnia.yml +++ b/Resources/Maps/_NF/POI/tinnia.yml @@ -23,6 +23,7 @@ entities: components: - type: MetaData - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -864,7 +865,7 @@ entities: pos: 14.5,-0.5 parent: 1 - type: Door - secondsUntilStateChange: -2634.3037 + secondsUntilStateChange: -2677.8772 state: Opening - uid: 196 components: @@ -1263,8 +1264,6 @@ entities: - type: Transform pos: 5.5,-10.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaMiddle entities: - uid: 657 @@ -1272,8 +1271,6 @@ entities: - type: Transform pos: 4.5,-10.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 1521 @@ -1281,8 +1278,6 @@ entities: - type: Transform pos: 3.5,-10.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelLeft entities: - uid: 1761 @@ -1291,16 +1286,12 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1962 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,3.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelMiddle entities: - uid: 1762 @@ -1309,16 +1300,12 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-4.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1963 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,2.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSteelRight entities: - uid: 1760 @@ -1327,16 +1314,12 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 1964 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BookHowToCookForFortySpaceman entities: - uid: 1790 @@ -6684,46 +6667,16 @@ entities: - type: Transform pos: 11.5,6.5 parent: 1 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 394 components: - type: Transform pos: 6.5,-8.5 parent: 1 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - uid: 396 components: - type: Transform pos: -10.5,-5.5 parent: 1 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: ComputerRadar entities: - uid: 266 @@ -10649,6 +10602,13 @@ entities: - type: Transform pos: 1.5,11.5 parent: 1 +- proto: NFHolopadTinnia + entities: + - uid: 2249 + components: + - type: Transform + pos: -5.5,-8.5 + parent: 1 - proto: OilJarCorn entities: - uid: 2173 @@ -10730,10 +10690,6 @@ entities: - type: Transform pos: -0.5,13.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandAtmosiaDeclarationIndependence entities: - uid: 1982 @@ -11493,7 +11449,7 @@ entities: - type: Transform pos: 3.5,-12.5 parent: 1 -- proto: RandomPosterContrabandDeadDrop +- proto: RandomPosterContraband entities: - uid: 1984 components: diff --git a/Resources/Maps/_NF/POI/trade.yml b/Resources/Maps/_NF/POI/trade.yml index 27b2a1d9789..39bc36e286a 100644 --- a/Resources/Maps/_NF/POI/trade.yml +++ b/Resources/Maps/_NF/POI/trade.yml @@ -3157,7 +3157,7 @@ entities: pos: 27.5,0.5 parent: 1 - type: Door - secondsUntilStateChange: -168.75337 + secondsUntilStateChange: -268.54382 state: Opening - type: DeviceLinkSource lastSignals: @@ -22729,6 +22729,20 @@ entities: - type: Transform pos: 53.396393,-14.43357 parent: 1 +- proto: NFHolopadTradeStationCafeteria + entities: + - uid: 6429 + components: + - type: Transform + pos: 54.5,-15.5 + parent: 1 +- proto: NFHolopadTradeStationSTC + entities: + - uid: 6430 + components: + - type: Transform + pos: 24.5,0.5 + parent: 1 - proto: NFSignBus entities: - uid: 6379 diff --git a/Resources/Maps/_NF/POI/trademall.yml b/Resources/Maps/_NF/POI/trademall.yml index eb143ac91d3..69117b4baaa 100644 --- a/Resources/Maps/_NF/POI/trademall.yml +++ b/Resources/Maps/_NF/POI/trademall.yml @@ -20,9 +20,8 @@ tilemap: 12: FloorOldConcrete 11: FloorShuttleBlue 2: FloorSteel - 22: FloorSteelBurnt 8: FloorSteelCheckerLight - 23: FloorSteelDamaged + 22: FloorSteelDamaged 21: FloorSteelDirty 17: FloorSteelMono 20: FloorSteelOffset @@ -73,7 +72,7 @@ entities: version: 6 0,1: ind: 0,1 - tiles: AgAAAAABAgAAAAABBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAADBQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAACBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAADBQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAADBQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAAAAgAAAAAABQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAFQAAAAAAFgAAAAABFwAAAAADFgAAAAAAFQAAAAAAgwAAAAAAHAAAAAAAHAAAAAABHAAAAAACAgAAAAABAgAAAAADBQAAAAADgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAFwAAAAAEFgAAAAABgwAAAAAAHAAAAAAAHAAAAAADHAAAAAAAAgAAAAADAgAAAAABBQAAAAABgwAAAAAAEAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAgwAAAAAAHAAAAAADHAAAAAACHAAAAAAAAgAAAAABAgAAAAADBQAAAAADBAAAAAAAEAAAAAABgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADAgAAAAAAAgAAAAACgwAAAAAAAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAAAgAAAAADAgAAAAACAgAAAAACAgAAAAADAgAAAAADAgAAAAABBAAAAAAAAwAAAAADAwAAAAADAwAAAAAAAwAAAAABgwAAAAAAAAAAAAAAAgAAAAACAgAAAAAABAAAAAAAAgAAAAAAAgAAAAADgwAAAAAABQAAAAAAgwAAAAAABQAAAAAAgwAAAAAAAwAAAAACAwAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAACAgAAAAABBAAAAAAAAgAAAAABAgAAAAADgwAAAAAABQAAAAACgwAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADAgAAAAACgwAAAAAAAgAAAAACAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAA + tiles: AgAAAAABAgAAAAABBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAADBQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAACBQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAADBQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAADBQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAAAAgAAAAAABQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAFQAAAAAAFgAAAAABFgAAAAADFgAAAAAAFQAAAAAAgwAAAAAAHAAAAAAAHAAAAAABHAAAAAACAgAAAAABAgAAAAADBQAAAAADgwAAAAAAEAAAAAADgwAAAAAAgwAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAFgAAAAAEFgAAAAABgwAAAAAAHAAAAAAAHAAAAAADHAAAAAAAAgAAAAADAgAAAAABBQAAAAABgwAAAAAAEAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAFQAAAAAAgwAAAAAAHAAAAAADHAAAAAACHAAAAAAAAgAAAAABAgAAAAADBQAAAAADBAAAAAAAEAAAAAABgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAEAAAAAADAgAAAAAAAgAAAAACgwAAAAAAAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAADgwAAAAAAAgAAAAADAgAAAAACAgAAAAACAgAAAAADAgAAAAADAgAAAAABBAAAAAAAAwAAAAADAwAAAAADAwAAAAAAAwAAAAABgwAAAAAAAAAAAAAAAgAAAAACAgAAAAAABAAAAAAAAgAAAAAAAgAAAAADgwAAAAAABQAAAAAAgwAAAAAABQAAAAAAgwAAAAAAAwAAAAACAwAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAACAgAAAAABBAAAAAAAAgAAAAABAgAAAAADgwAAAAAABQAAAAACgwAAAAAABQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAADAgAAAAACgwAAAAAAAgAAAAACAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAgAAAAAAAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAA version: 6 1,0: ind: 1,0 @@ -85,15 +84,15 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAgAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAAgAAAAACAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAABFgAAAAABAgAAAAADgwAAAAAAgwAAAAAAAgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAgAAAAABAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAAgAAAAABAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAAgAAAAADAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAgAAAAACgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAAgAAAAACAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAAAgwAAAAAAgwAAAAAAAgAAAAABgwAAAAAAAgAAAAABAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAABFgAAAAABAgAAAAADgwAAAAAAgwAAAAAAAgAAAAAA version: 6 0,-2: ind: 0,-2 - tiles: AgAAAAABAgAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAABgwAAAAAAgwAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAABAgAAAAADgwAAAAAAgwAAAAAAAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAADBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAACAgAAAAACgwAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAAgAAAAAAAgAAAAACgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAAAAgAAAAABBAAAAAAAAgAAAAABFwAAAAAEBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAAABAAAAAAAFgAAAAAAFwAAAAABBAAAAAAAFgAAAAABAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAAAFwAAAAACAgAAAAABAgAAAAAABAAAAAAAAgAAAAADFgAAAAABBAAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADFgAAAAAAgwAAAAAAgwAAAAAAFgAAAAABAgAAAAACAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAABgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACgwAAAAAAAgAAAAADAgAAAAADgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAA + tiles: AgAAAAABAgAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAABgwAAAAAAgwAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAABAgAAAAADgwAAAAAAgwAAAAAAAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAABAgAAAAADBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABgwAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAgAAAAACAgAAAAACgwAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAAAAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAABAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAAAAgAAAAAAAgAAAAACgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAABAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAAAAgAAAAABBAAAAAAAAgAAAAABFgAAAAAEBAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACAgAAAAAABAAAAAAAFgAAAAAAFgAAAAABBAAAAAAAFgAAAAABAgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAAAFgAAAAACAgAAAAABAgAAAAAABAAAAAAAAgAAAAADFgAAAAABBAAAAAAAAgAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADFgAAAAAAgwAAAAAAgwAAAAAAFgAAAAABAgAAAAACAgAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAFgAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAADAgAAAAABgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAgAAAAACgwAAAAAAAgAAAAADAgAAAAADgwAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAA version: 6 1,-2: ind: 1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFwAAAAABgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAAAABgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,-2: ind: -2,-2 @@ -31832,6 +31831,20 @@ entities: - type: Transform pos: 3.3859274,30.44452 parent: 1 +- proto: NFHolopadTradeStationCafeteria + entities: + - uid: 6305 + components: + - type: Transform + pos: -8.5,9.5 + parent: 1 +- proto: NFHolopadTradeStationSTC + entities: + - uid: 637 + components: + - type: Transform + pos: 13.5,-8.5 + parent: 1 - proto: NfsdDeployableBarrier entities: - uid: 2548 @@ -43302,6 +43315,12 @@ entities: - type: Transform pos: 13.5,-5.5 parent: 1 + - uid: 6304 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-8.5 + parent: 1 - proto: WindowReinforcedDirectional entities: - uid: 2001 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml index 416bff708ec..a71d1f7b9c5 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml @@ -12473,6 +12473,13 @@ entities: - type: Transform pos: 4.6353407,-0.39717972 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 2157 + components: + - type: Transform + pos: -0.5,-2.5 + parent: 1 - proto: NFSignDock entities: - uid: 2518 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml index 4faea90a58d..15942a2fe15 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml @@ -2177,24 +2177,18 @@ entities: - type: Transform pos: 0.5,-16.5 parent: 1 - - type: Physics - bodyType: Static - uid: 78 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-17.5 parent: 1 - - type: Physics - bodyType: Static - uid: 79 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-18.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 80 @@ -2202,8 +2196,6 @@ entities: - type: Transform pos: -0.5,-16.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 81 @@ -2211,24 +2203,18 @@ entities: - type: Transform pos: -1.5,-16.5 parent: 1 - - type: Physics - bodyType: Static - uid: 82 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-18.5 parent: 1 - - type: Physics - bodyType: Static - uid: 83 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-17.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 872 @@ -5446,13 +5432,6 @@ entities: - type: Transform pos: 3.5,1.5 parent: 1 -- proto: filingCabinetDrawerRandom - entities: - - uid: 719 - components: - - type: Transform - pos: 5.5,1.5 - parent: 1 - proto: filingCabinetRandom entities: - uid: 634 @@ -9100,6 +9079,8 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-22.5 parent: 1 + - type: Fixtures + fixtures: {} - proto: IntercomMedical entities: - uid: 676 @@ -9108,6 +9089,8 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-15.5 parent: 1 + - type: Fixtures + fixtures: {} - proto: LampGold entities: - uid: 692 @@ -9242,6 +9225,13 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,-22.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 719 + components: + - type: Transform + pos: 5.5,1.5 + parent: 1 - proto: NFPosterLegitMagnusWatching entities: - uid: 699 @@ -10754,6 +10744,20 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-14.5 parent: 1 +- proto: StructureGunRack + entities: + - uid: 1811 + components: + - type: Transform + pos: -5.5,-1.5 + parent: 1 +- proto: StructurePistolRack + entities: + - uid: 1376 + components: + - type: Transform + pos: -4.5,-0.5 + parent: 1 - proto: SubstationBasic entities: - uid: 1106 @@ -12879,7 +12883,7 @@ entities: - type: Transform pos: 11.5,-25.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 1767 components: @@ -12905,20 +12909,6 @@ entities: - type: Transform pos: -3.5,-3.5 parent: 1 -- proto: StructureGunRack - entities: - - uid: 1811 - components: - - type: Transform - pos: -5.5,-1.5 - parent: 1 -- proto: StructurePistolRack - entities: - - uid: 1376 - components: - - type: Transform - pos: -4.5,-0.5 - parent: 1 - proto: Windoor entities: - uid: 630 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml index da59aa0587d..99e2d8e7212 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml @@ -302,6 +302,7 @@ entities: 23: 5,-2 24: 4,-2 176: -5,-6 + 218: -2,-9 - node: color: '#D4D4D428' id: FullTileOverlayGreyscale @@ -622,27 +623,27 @@ entities: 0: 18288 -1,2: 0: 19656 - 2: 16 + 1: 16 0,3: - 1: 10 + 2: 10 1,0: 0: 12305 - 1: 1024 + 2: 1024 1,1: 0: 4355 - 1: 64 + 2: 64 1,2: - 2: 16 - 1: 2 + 1: 16 + 2: 2 0,-4: 0: 1808 - 2: 4 + 1: 4 0,-5: - 2: 12288 - 1: 32768 + 1: 12288 + 2: 32768 -1,-4: 0: 3072 - 2: 276 + 1: 276 0,-3: 0: 8191 -1,-3: @@ -654,37 +655,37 @@ entities: -1,-1: 0: 36831 1,-4: - 2: 272 + 1: 272 1,-3: 0: 272 - 1: 2 + 2: 2 1,-2: 0: 13073 - 1: 64 + 2: 64 1,-1: 0: 819 - 1: 16384 + 2: 16384 -2,-2: - 1: 64 + 2: 64 0: 2048 -2,-1: 0: 3084 - 1: 16384 + 2: 16384 -2,-3: - 1: 8 + 2: 8 -1,-5: - 1: 8192 - 2: 32768 + 2: 8192 + 1: 32768 -2,0: - 1: 1024 + 2: 1024 0: 32768 -2,1: - 1: 64 + 2: 64 0: 8 -2,2: - 1: 8 + 2: 8 -1,3: - 1: 10 + 2: 10 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -702,7 +703,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -717,7 +718,7 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 @@ -777,7 +778,6 @@ entities: - 422 - 323 - 379 - - 133 - proto: Airlock entities: - uid: 305 @@ -1208,7 +1208,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -1219,8 +1218,6 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 468 @@ -1229,8 +1226,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 445 @@ -1239,8 +1234,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 153 @@ -1891,11 +1884,6 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 1 - - uid: 668 - components: - - type: Transform - pos: -1.5,-8.5 - parent: 1 - proto: CarpetBlack entities: - uid: 622 @@ -2200,19 +2188,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-2.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefaultStationBeaconAME entities: - uid: 738 @@ -3250,14 +3225,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 382 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,9.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 403 components: - type: Transform @@ -3457,13 +3424,8 @@ entities: - uid: 133 components: - type: Transform - pos: 0.5,10.5 + pos: 0.5,9.5 parent: 1 - - type: DeviceNetwork - deviceLists: - - 516 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 323 components: - type: Transform @@ -3757,17 +3719,17 @@ entities: parent: 1 - proto: Gyroscope entities: - - uid: 128 - components: - - type: Transform - pos: 0.5,10.5 - parent: 1 - uid: 511 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-1.5 parent: 1 + - uid: 644 + components: + - type: Transform + pos: 2.5,-2.5 + parent: 1 - proto: HighSecCaptainLocked entities: - uid: 326 @@ -3848,6 +3810,13 @@ entities: - type: Transform pos: 3.5,-0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 382 + components: + - type: Transform + pos: 0.5,10.5 + parent: 1 - proto: NFSignDock entities: - uid: 655 @@ -3901,7 +3870,7 @@ entities: rot: 3.141592653589793 rad pos: -2.5,6.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 102 components: @@ -4079,10 +4048,10 @@ entities: parent: 1 - proto: SalvageTechfabNF entities: - - uid: 644 + - uid: 128 components: - type: Transform - pos: 2.5,-2.5 + pos: -1.5,-8.5 parent: 1 - proto: ShipyardBrigandInfo entities: @@ -5421,7 +5390,7 @@ entities: - type: Transform pos: 6.5,-3.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 642 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml index a99fbffc6dc..ab208c1fbe0 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml @@ -5851,6 +5851,13 @@ entities: rot: 1.5707963267948966 rad pos: -5.511345,11.336839 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 1135 + components: + - type: Transform + pos: -10.5,11.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 949 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml b/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml index 2440877b4f6..826ca763ccd 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml @@ -1349,7 +1349,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -1360,8 +1359,6 @@ entities: rot: 3.141592653589793 rad pos: 1.5,6.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 564 @@ -1370,8 +1367,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,6.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 133 @@ -1380,8 +1375,6 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BorgCharger entities: - uid: 101 @@ -4725,6 +4718,10 @@ entities: showEnts: False occludes: True ent: 508 + item_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: MopItem entities: - uid: 221 @@ -4749,6 +4746,13 @@ entities: parent: 1 - type: NetworkConfigurator linkModeActive: False +- proto: NFHolopadShip + entities: + - uid: 297 + components: + - type: Transform + pos: 13.5,3.5 + parent: 1 - proto: NFPosterLegitMagnusWatching entities: - uid: 212 @@ -4984,11 +4988,6 @@ entities: - type: Transform pos: 8.5,0.5 parent: 1 - - uid: 297 - components: - - type: Transform - pos: 13.5,3.5 - parent: 1 - uid: 752 components: - type: Transform @@ -6744,7 +6743,7 @@ entities: rot: 3.141592653589793 rad pos: 7.5,9.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 71 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml b/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml index 54f75bbf9d2..b21ceb834bf 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/dragonfly.yml @@ -1185,7 +1185,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -1195,8 +1194,6 @@ entities: - type: Transform pos: -1.5,3.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 533 @@ -1205,8 +1202,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,2.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 614 @@ -1215,8 +1210,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 110 @@ -4309,20 +4302,16 @@ entities: rot: 1.5707963267948966 rad pos: -3.5,-8.5 parent: 1 + - type: Fixtures + fixtures: {} - uid: 699 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,8.5 parent: 1 -- proto: Lamp - entities: - - uid: 853 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.521994,8.151886 - parent: 1 + - type: Fixtures + fixtures: {} - proto: LockerCaptainFilled entities: - uid: 241 @@ -4382,6 +4371,10 @@ entities: showEnts: False occludes: True ent: 374 + item_slot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: MopItem entities: - uid: 369 @@ -4397,6 +4390,13 @@ entities: rot: 1.5707963267948966 rad pos: -1.4935539,-0.73429143 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 489 + components: + - type: Transform + pos: 7.5,7.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 969 @@ -4453,14 +4453,6 @@ entities: - type: Transform pos: 1.5,-5.5 parent: 1 -- proto: PaperCaptainsThoughts - entities: - - uid: 489 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.615744,7.386261 - parent: 1 - proto: PaperCargoInvoice entities: - uid: 513 @@ -4490,11 +4482,11 @@ entities: parent: 1 - proto: PenCap entities: - - uid: 839 + - uid: 183 components: - type: Transform rot: -1.5707963267948966 rad - pos: 7.740744,7.526886 + pos: 7.826565,8.205877 parent: 1 - proto: PinpointerUniversal entities: @@ -5364,12 +5356,6 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 183 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,7.5 - parent: 1 - uid: 385 components: - type: Transform @@ -6472,7 +6458,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,5.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 454 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml index 50cc32c18b1..c7ea52a3cf1 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gasbender.yml @@ -6080,6 +6080,13 @@ entities: - type: Transform pos: -2.5,4.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 1029 + components: + - type: Transform + pos: -6.5,12.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 855 diff --git a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml index 0f1d8a98ca9..50b09d6d758 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/gourd.yml @@ -1259,7 +1259,7 @@ entities: chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance - - type: BecomesStation + - type: BecomesStation id: Gourd - proto: AcousticGuitarInstrument entities: @@ -3427,63 +3427,47 @@ entities: - type: Transform pos: 6.5,13.5 parent: 1 - - type: Physics - bodyType: Static - uid: 119 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,11.5 parent: 1 - - type: Physics - bodyType: Static - uid: 120 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,11.5 parent: 1 - - type: Physics - bodyType: Static - uid: 121 components: - type: Transform pos: -5.5,13.5 parent: 1 - - type: Physics - bodyType: Static - uid: 122 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,10.5 parent: 1 - - type: Physics - bodyType: Static - uid: 123 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,10.5 parent: 1 - - type: Physics - bodyType: Static - uid: 124 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,10.5 parent: 1 - - type: Physics - bodyType: Static - uid: 125 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,10.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoorExterior3 entities: - uid: 117 @@ -6639,19 +6623,6 @@ entities: - type: Transform pos: 2.5,19.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateArtifactContainer entities: - uid: 44 @@ -10863,6 +10834,13 @@ entities: - type: Transform pos: 8.5,24.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 1976 + components: + - type: Transform + pos: 0.5,26.5 + parent: 1 - proto: NFSignDock entities: - uid: 1526 @@ -11745,13 +11723,6 @@ entities: - type: Transform pos: -1.6577635,13.688023 parent: 1 -- proto: ScienceTechFab - entities: - - uid: 58 - components: - - type: Transform - pos: -9.5,3.5 - parent: 1 - proto: ShuttleWindow entities: - uid: 1471 @@ -12894,6 +12865,13 @@ entities: - type: Transform pos: 2.4507494,15.01433 parent: 1 +- proto: UnfinishedMachineFrame + entities: + - uid: 58 + components: + - type: Transform + pos: -9.5,3.5 + parent: 1 - proto: VendingMachineBooze entities: - uid: 1637 @@ -14193,7 +14171,7 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-12.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 1871 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/pathfinder.yml b/Resources/Maps/_NF/Shuttles/Expedition/pathfinder.yml index c77cd5c4fef..f6d00143fb7 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/pathfinder.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/pathfinder.yml @@ -2277,6 +2277,13 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-1.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 2 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 11 @@ -3166,7 +3173,7 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 485 components: diff --git a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml index d067a0318b2..13a0f3973cd 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/sprinter.yml @@ -20,6 +20,8 @@ entities: components: - type: MetaData name: Sprinter + - type: Transform + parent: invalid - type: MapGrid chunks: 0,0: @@ -1660,8 +1662,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 359 @@ -1670,8 +1670,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 64 @@ -4056,6 +4054,13 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-8.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 604 + components: + - type: Transform + pos: -1.5,9.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 113 @@ -5669,7 +5674,7 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 923 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml index a7c213b8f49..649be60d375 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml @@ -26,10 +26,10 @@ entities: components: - type: MetaData name: Broadhead - - type: BecomesStation - id: Broadhead - type: Transform parent: invalid + - type: BecomesStation + id: Broadhead - type: MapGrid chunks: 0,0: @@ -3661,13 +3661,6 @@ entities: - Pressed: Toggle 3: - Pressed: DoorBolt -- proto: LockerNfsdSilverDetectiveFilled - entities: - - uid: 439 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 2 - proto: LockerNfsdEvidence entities: - uid: 31 @@ -3685,6 +3678,13 @@ entities: - type: Transform pos: 7.5,-9.5 parent: 2 +- proto: LockerNfsdSilverDetectiveFilled + entities: + - uid: 439 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 2 - proto: LockerWallEVAColorNfsdFilled entities: - uid: 435 @@ -3734,6 +3734,13 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-18.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 743 + components: + - type: Transform + pos: 7.5,-1.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 166 @@ -3804,9 +3811,6 @@ entities: parent: 2 - type: FuelGenerator targetPower: 21000 - on: False - - type: Physics - bodyType: Static - uid: 389 components: - type: Transform @@ -3814,9 +3818,6 @@ entities: parent: 2 - type: FuelGenerator targetPower: 21000 - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandMissingGloves entities: - uid: 748 @@ -4313,13 +4314,6 @@ entities: - type: Transform pos: -0.5,-13.5 parent: 2 -- proto: SignNfsdInterrogation - entities: - - uid: 742 - components: - - type: Transform - pos: 3.5,-7.5 - parent: 2 - proto: SignMorgue entities: - uid: 510 @@ -4351,6 +4345,13 @@ entities: - type: Transform pos: 4.5,-11.5 parent: 2 +- proto: SignNfsdInterrogation + entities: + - uid: 742 + components: + - type: Transform + pos: 3.5,-7.5 + parent: 2 - proto: SignSpace entities: - uid: 513 @@ -4398,6 +4399,13 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-10.5 parent: 2 +- proto: StructurePistolRackNfsd + entities: + - uid: 260 + components: + - type: Transform + pos: 7.5,-3.5 + parent: 2 - proto: SubstationBasic entities: - uid: 172 @@ -5518,7 +5526,7 @@ entities: - type: Transform pos: -0.5,-5.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 700 components: @@ -5545,13 +5553,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-13.5 parent: 2 -- proto: StructurePistolRackNfsd - entities: - - uid: 260 - components: - - type: Transform - pos: 7.5,-3.5 - parent: 2 - proto: WindoorSecureBrigLocked entities: - uid: 703 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml index 09f2cf5c487..965b10bcbe8 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml @@ -13,11 +13,11 @@ entities: components: - type: MetaData name: Cleric - - type: BecomesStation - id: Cleric - type: Transform pos: 0.84375,0.34375 parent: invalid + - type: BecomesStation + id: Cleric - type: MapGrid chunks: 0,0: @@ -568,6 +568,13 @@ entities: - type: Transform pos: -1.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 113 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 - proto: PlastitaniumWindow entities: - uid: 11 @@ -814,7 +821,7 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 104 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 526c473fd93..0c6d6d33c0f 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -11651,6 +11651,13 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,-4.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 846 + components: + - type: Transform + pos: -0.5,-13.5 + parent: 1 - proto: NfsdDeployableBarrier entities: - uid: 611 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml index c8ae0b31e1f..8b411fa5126 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml @@ -13,11 +13,11 @@ entities: components: - type: MetaData name: Fighter - - type: BecomesStation - id: Fighter - type: Transform pos: -0.15940452,-1.515625 parent: invalid + - type: BecomesStation + id: Fighter - type: MapGrid chunks: 0,0: @@ -537,6 +537,13 @@ entities: - type: Transform pos: 1.5,-0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 107 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 - proto: PlastitaniumWindow entities: - uid: 17 @@ -787,7 +794,7 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 101 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml index d991dda3e0e..af6b01ae0ee 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml @@ -865,6 +865,13 @@ entities: - type: Transform pos: -0.5030305,-3.2284198 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 121 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 69 @@ -925,7 +932,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: PoweredlightRed entities: - uid: 123 components: @@ -1272,7 +1279,7 @@ entities: - type: Transform pos: -2.5,2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 159 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hypnos.yml similarity index 99% rename from Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml rename to Resources/Maps/_NF/Shuttles/Nfsd/hypnos.yml index 8c16363977d..101790192c9 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wendigo.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/hypnos.yml @@ -18,9 +18,9 @@ entities: - uid: 1 components: - type: MetaData - name: Wendigo + name: Hypnos - type: BecomesStation - id: Wendigo + id: Hypnos - type: Transform parent: invalid - type: MapGrid @@ -770,20 +770,6 @@ entities: - type: Transform pos: 9.5,4.5 parent: 1 -- proto: Pen - entities: - - uid: 471 - components: - - type: Transform - rot: -28.27433388230815 rad - pos: -1.3030288,-3.779652 - parent: 1 - - uid: 472 - components: - - type: Transform - rot: -21.991148575128555 rad - pos: 2.3636386,-3.758803 - parent: 1 - proto: Bed entities: - uid: 148 @@ -2207,6 +2193,13 @@ entities: - type: Transform pos: -0.5,9.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 473 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 220 @@ -2256,6 +2249,20 @@ entities: - type: Transform pos: -0.5,7.5 parent: 1 +- proto: Pen + entities: + - uid: 471 + components: + - type: Transform + rot: -28.27433388230815 rad + pos: -1.3030288,-3.779652 + parent: 1 + - uid: 472 + components: + - type: Transform + rot: -21.991148575128555 rad + pos: 2.3636386,-3.758803 + parent: 1 - proto: PlastitaniumWindow entities: - uid: 39 @@ -2337,10 +2344,6 @@ entities: - type: Transform pos: 6.5,-0.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandHackingGuide entities: - uid: 258 @@ -3268,7 +3271,7 @@ entities: rot: 3.141592653589793 rad pos: 0.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 365 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml index d4d70be3993..a725140085c 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml @@ -1203,6 +1203,13 @@ entities: - type: Transform pos: -2.4866343,-1.9206845 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 273 + components: + - type: Transform + pos: -9.5,-1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 177 @@ -1971,7 +1978,7 @@ entities: - type: Transform pos: -1.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 219 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml index 532367138ca..38bd2d0688a 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/paladin.yml @@ -20,11 +20,11 @@ entities: components: - type: MetaData name: Paladin - - type: BecomesStation - id: Paladin - type: Transform pos: -0.4917612,-0.4486041 parent: invalid + - type: BecomesStation + id: Paladin - type: MapGrid chunks: 0,0: @@ -1047,6 +1047,13 @@ entities: - type: Transform pos: 0.5,5.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 189 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 - proto: PlastitaniumWindow entities: - uid: 8 @@ -1093,7 +1100,7 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-1.5 parent: 1 -- proto: PoweredlightColoredFrostyBlue +- proto: PoweredlightCyan entities: - uid: 36 components: @@ -1365,7 +1372,7 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 188 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml index 83684879683..9f0697439a8 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml @@ -2800,6 +2800,13 @@ entities: - type: Transform pos: 3.5,-4.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 355 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 370 @@ -2820,13 +2827,6 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: PaperBin10 - entities: - - uid: 355 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - proto: PlastitaniumWindow entities: - uid: 356 @@ -3400,11 +3400,6 @@ entities: - type: Transform pos: 2.5,8.5 parent: 1 - - uid: 426 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - proto: TableReinforcedGlass entities: - uid: 250 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml index cc6182e0bc1..61397be6937 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml @@ -14,11 +14,11 @@ entities: components: - type: MetaData name: Rogue - - type: BecomesStation - id: Rogue - type: Transform pos: 2.2425354,-3.692793 parent: invalid + - type: BecomesStation + id: Rogue - type: MapGrid chunks: 0,0: @@ -650,6 +650,13 @@ entities: - type: Transform pos: 0.48425126,3.4548554 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 128 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 - proto: PlastitaniumWindow entities: - uid: 14 @@ -690,7 +697,7 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-0.5 parent: 1 -- proto: PoweredlightColoredFrostyBlue +- proto: PoweredlightCyan entities: - uid: 94 components: @@ -889,7 +896,7 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 122 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml index 4ae04e10a28..3592cee455c 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml @@ -19,11 +19,11 @@ entities: components: - type: MetaData name: Templar - - type: BecomesStation - id: Templar - type: Transform pos: -0.4761362,-0.4642291 parent: invalid + - type: BecomesStation + id: Templar - type: MapGrid chunks: 0,0: @@ -927,6 +927,13 @@ entities: - type: Transform pos: 2.5,-0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 172 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 54 @@ -1028,7 +1035,7 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,5.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: PoweredlightRed entities: - uid: 28 components: @@ -1326,7 +1333,7 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 98 components: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 6d74c147d02..92093c29169 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -5109,10 +5109,10 @@ entities: parent: 1 - proto: FaxMachineShip entities: - - uid: 751 + - uid: 61 components: - type: Transform - pos: 0.5,14.5 + pos: 0.5,15.5 parent: 1 - proto: FireAxeCabinetFilled entities: @@ -5996,14 +5996,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 882 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,13.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 883 components: - type: Transform @@ -7143,6 +7135,11 @@ entities: color: '#990000FF' - proto: GasVentPump entities: + - uid: 60 + components: + - type: Transform + pos: 0.5,13.5 + parent: 1 - uid: 1030 components: - type: Transform @@ -7182,13 +7179,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 1035 - components: - - type: Transform - pos: 0.5,14.5 - parent: 1 - - type: AtmosPipeColor - color: '#0055CCFF' - uid: 1036 components: - type: Transform @@ -8378,6 +8368,13 @@ entities: - type: Transform pos: -6.358609,-8.515163 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 62 + components: + - type: Transform + pos: 0.5,14.5 + parent: 1 - proto: NfsdTechFab entities: - uid: 1215 @@ -9666,10 +9663,10 @@ entities: parent: 1 - proto: SpacemenFigureSpawner entities: - - uid: 1428 + - uid: 63 components: - type: Transform - pos: 0.5,15.5 + pos: -3.5,11.5 parent: 1 - proto: SpawnPointLatejoin entities: @@ -10161,11 +10158,6 @@ entities: - type: Transform pos: 0.5,15.5 parent: 1 - - uid: 1492 - components: - - type: Transform - pos: 0.5,14.5 - parent: 1 - uid: 1493 components: - type: Transform diff --git a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml index 853422e4845..77d21ddc539 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/bison.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/bison.yml @@ -13282,6 +13282,13 @@ entities: - type: Transform pos: 2.043075,-32.621098 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 1611 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 1 - proto: NFSignDock entities: - uid: 1976 @@ -13696,26 +13703,6 @@ entities: - type: Transform pos: -5.5,-13.5 parent: 1 -- proto: PoweredlightColoredRed - entities: - - uid: 1738 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-32.5 - parent: 1 - - uid: 2016 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-6.5 - parent: 1 - - uid: 2123 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-2.5 - parent: 1 - proto: PoweredlightLED entities: - uid: 25 @@ -13892,6 +13879,26 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,5.5 parent: 1 +- proto: PoweredlightRed + entities: + - uid: 1738 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-32.5 + parent: 1 + - uid: 2016 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-6.5 + parent: 1 + - uid: 2123 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-2.5 + parent: 1 - proto: PoweredSmallLight entities: - uid: 1895 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/canister.yml b/Resources/Maps/_NF/Shuttles/Scrap/canister.yml index 586b878ebc1..635d49a9531 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/canister.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/canister.yml @@ -540,6 +540,13 @@ entities: - type: Transform pos: -1.5,3.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 29 + components: + - type: Transform + pos: -0.5,0.5 + parent: 1 - proto: PortableGeneratorPacmanShuttle entities: - uid: 50 @@ -547,10 +554,6 @@ entities: - type: Transform pos: -1.5,0.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: Poweredlight entities: - uid: 33 @@ -719,7 +722,7 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 10 components: diff --git a/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml b/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml index 8acde65cd28..fee06dac93d 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/disciple.yml @@ -15,11 +15,11 @@ entities: components: - type: MetaData name: Disciple - - type: BecomesStation - id: Disciple - type: Transform pos: -0.47058776,-0.52941173 parent: invalid + - type: BecomesStation + id: Disciple - type: MapGrid chunks: 0,0: @@ -1008,6 +1008,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 103 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 - proto: PlushieRatvar entities: - uid: 94 @@ -1022,10 +1029,6 @@ entities: - type: Transform pos: 4.5,-0.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandBreadLies entities: - uid: 190 @@ -1052,7 +1055,7 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-1.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: PoweredlightRed entities: - uid: 109 components: @@ -1489,7 +1492,7 @@ entities: - type: Transform pos: 4.5,0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 139 components: diff --git a/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml b/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml index 73ed6a2b1be..cbf209f6b51 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/nugget.yml @@ -1148,17 +1148,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-6.5 parent: 1 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - - type: ItemSlots - proto: DefibrillatorEmpty entities: - uid: 96 @@ -1226,15 +1215,13 @@ entities: - type: Transform pos: 12.5,-1.5 parent: 1 -- proto: FloraTree05 +- proto: FloraTree entities: - uid: 86 components: - type: Transform pos: 4.5,-1.5 parent: 1 -- proto: FloraTree06 - entities: - uid: 87 components: - type: Transform @@ -1573,6 +1560,13 @@ entities: pos: 9.402631,-7.5150394 parent: 1 - type: StepTriggerActive +- proto: NFHolopadShip + entities: + - uid: 97 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 1 - proto: PortableGeneratorPacman entities: - uid: 152 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/orange.yml b/Resources/Maps/_NF/Shuttles/Scrap/orange.yml index a6cd98673eb..f8e71fe6f5d 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/orange.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/orange.yml @@ -1522,6 +1522,13 @@ entities: pos: 2.5,3.5 parent: 1 - uid: 171 + components: + - type: Transform + pos: 8.5,6.5 + parent: 1 +- proto: NFHolopadShip + entities: + - uid: 163 components: - type: Transform pos: 13.5,5.5 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml index 614d4a09140..a4df771be6e 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/point.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/point.yml @@ -19,11 +19,11 @@ entities: components: - type: MetaData name: Point - - type: BecomesStation - id: Point - type: Transform pos: -0.39584857,-0.47913614 parent: invalid + - type: BecomesStation + id: Point - type: MapGrid chunks: 0,0: @@ -1754,6 +1754,13 @@ entities: parent: 1 - type: NetworkConfigurator linkModeActive: False +- proto: NFHolopadShip + entities: + - uid: 157 + components: + - type: Transform + pos: 1.5,9.5 + parent: 1 - proto: NFSignDock entities: - uid: 101 diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml index ff708046030..50e21b8c397 100644 --- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml +++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml @@ -1026,6 +1026,13 @@ entities: - type: Transform pos: -2.5,7.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 139 + components: + - type: Transform + pos: -0.5,9.5 + parent: 2 - proto: OreBag entities: - uid: 134 diff --git a/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml b/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml index 26b3f06d3e6..821cd2352b1 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/bottleneck.yml @@ -18,11 +18,11 @@ entities: components: - type: MetaData name: bottleneck - - type: BecomesStation - id: Bottleneck - type: Transform pos: -0.53125,-0.5 parent: invalid + - type: BecomesStation + id: Bottleneck - type: MapGrid chunks: 0,0: @@ -1160,6 +1160,13 @@ entities: - type: Transform pos: -1.2964802,2.453908 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 236 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 223 @@ -1215,10 +1222,7 @@ entities: pos: 1.5,5.5 parent: 2 - type: FuelGenerator - on: False targetPower: 10000 - - type: Physics - bodyType: Static - proto: PosterLegitNanotrasenLogo entities: - uid: 123 @@ -1760,7 +1764,7 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,4.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 226 components: diff --git a/Resources/Maps/_NF/Shuttles/Sr/broom.yml b/Resources/Maps/_NF/Shuttles/Sr/broom.yml index e6ef334db05..6aea6841795 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/broom.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/broom.yml @@ -363,18 +363,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-2.5 parent: 1 - - type: ContainerContainer - containers: - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - - type: Physics - canCollide: False - proto: DefibrillatorCabinetFilled entities: - uid: 71 @@ -589,6 +577,13 @@ entities: - type: Transform pos: -0.5,-1.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 61 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 94 @@ -616,10 +611,6 @@ entities: - type: Transform pos: -0.5,-0.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PoweredlightLED entities: - uid: 53 @@ -885,7 +876,7 @@ entities: - type: Transform pos: 2.5,0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 2 components: diff --git a/Resources/Maps/_NF/Shuttles/Sr/chauffeur.yml b/Resources/Maps/_NF/Shuttles/Sr/chauffeur.yml index 433941883b9..a77014fe39e 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/chauffeur.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/chauffeur.yml @@ -227,12 +227,12 @@ entities: tiles: 0,0: 0: 12799 - 1: 32768 + 2: 32768 0,-1: 0: 63094 -1,0: 0: 33018 - 1: 8192 + 2: 8192 0,1: 0: 3 1: 64 @@ -241,7 +241,7 @@ entities: 1: 64 -1,-1: 0: 61644 - 1: 16 + 2: 16 -1,-2: 1: 512 0: 49152 @@ -249,7 +249,7 @@ entities: 0: 24576 1: 2048 1,-1: - 1: 16 + 2: 16 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -266,6 +266,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 immutable: True moles: @@ -562,6 +577,20 @@ entities: rot: 3.141592653589793 rad pos: 0.5,3.5 parent: 2 +- proto: ClothingBeltPilotFilled + entities: + - uid: 188 + components: + - type: Transform + pos: -0.054038495,4.7225556 + parent: 2 +- proto: ClothingNeckScarfPilot + entities: + - uid: 197 + components: + - type: Transform + pos: -0.03320512,4.6704726 + parent: 2 - proto: ComputerTabletopShuttle entities: - uid: 157 @@ -591,19 +620,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-1.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezer entities: - uid: 61 @@ -754,6 +770,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' + - uid: 105 + components: + - type: Transform + pos: 1.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 108 components: - type: Transform @@ -945,10 +968,11 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 105 + - uid: 198 components: - type: Transform - pos: 1.5,3.5 + rot: 1.5707963267948966 rad + pos: 0.5,3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' @@ -1102,12 +1126,13 @@ entities: - type: Transform pos: 3.5,2.5 parent: 2 -- proto: LockerPilotFilled +- proto: LockerWallColorGenericBlack entities: - uid: 119 components: - type: Transform - pos: 1.5,3.5 + rot: -1.5707963267948966 rad + pos: 2.5,3.5 parent: 2 - proto: LockerWallMaterialsFuelPlasmaFilled entities: @@ -1117,6 +1142,13 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-4.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 199 + components: + - type: Transform + pos: 1.5,3.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 80 @@ -1156,10 +1188,6 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 195 @@ -1537,7 +1565,7 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-5.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 164 components: diff --git a/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml b/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml index 56d87723d88..571b5619f50 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/mailpod.yml @@ -14,11 +14,11 @@ entities: components: - type: MetaData name: MailPod - - type: BecomesStation - id: MailPod - type: Transform pos: -0.48958334,-0.5208333 parent: invalid + - type: BecomesStation + id: MailPod - type: MapGrid chunks: 0,0: @@ -342,19 +342,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 25 @@ -576,6 +563,13 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 86 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 109 @@ -617,12 +611,8 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 106 @@ -886,7 +876,7 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 90 components: diff --git a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml index 77b085556cd..9b62e74b63d 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/parcel.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/parcel.yml @@ -14,11 +14,11 @@ entities: components: - type: MetaData name: Parcel - - type: BecomesStation - id: Parcel - type: Transform pos: -0.48958334,-0.5208333 parent: invalid + - type: BecomesStation + id: Parcel - type: MapGrid chunks: 0,0: @@ -795,38 +795,12 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 26 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 89 @@ -1149,6 +1123,13 @@ entities: - type: Transform pos: 6.5,2.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 91 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 100 @@ -1188,12 +1169,8 @@ entities: - type: Transform pos: 6.5,1.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 202 @@ -1665,7 +1642,7 @@ entities: - type: Transform pos: -2.5,-1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 149 components: diff --git a/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml b/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml index f5d638cb100..3705f25b283 100644 --- a/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml +++ b/Resources/Maps/_NF/Shuttles/Sr/watchdog.yml @@ -1000,6 +1000,13 @@ entities: - type: Transform pos: -1.5,1.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 163 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 - proto: NFLockerSecurityFilled entities: - uid: 114 @@ -1373,7 +1380,7 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 159 components: diff --git a/Resources/Maps/_NF/Shuttles/apothecary.yml b/Resources/Maps/_NF/Shuttles/apothecary.yml index 31779efd92e..08dc21a5b01 100644 --- a/Resources/Maps/_NF/Shuttles/apothecary.yml +++ b/Resources/Maps/_NF/Shuttles/apothecary.yml @@ -791,8 +791,6 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-0.5 parent: 1 - - type: Apc - hasAccess: True - proto: AtmosDeviceFanDirectional entities: - uid: 63 @@ -1473,11 +1471,11 @@ entities: parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 228 + - uid: 191 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,8.5 + rot: 3.141592653589793 rad + pos: -0.5,1.5 parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: @@ -1487,17 +1485,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-0.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - proto: CrateChemistryD entities: - uid: 163 @@ -2303,16 +2290,6 @@ entities: - type: Transform pos: -2.5,7.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerWallColorMedicalDoctorFilled entities: - uid: 245 @@ -2321,16 +2298,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,2.5 parent: 1 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerWallEVAColorParamedicFilled entities: - uid: 141 @@ -2364,7 +2331,7 @@ entities: - uid: 251 components: - type: Transform - pos: -2.3657346,9.161771 + pos: -2.1803885,9.500854 parent: 1 - proto: MachineCentrifuge entities: @@ -2387,20 +2354,6 @@ entities: - type: Transform pos: 3.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: [] - microwave_entity_container: !type:Container - showEnts: False - occludes: True - ents: [] - proto: MedicalBed entities: - uid: 178 @@ -2420,20 +2373,13 @@ entities: - type: Transform pos: 2.5,2.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: NFHolopadShip + entities: + - uid: 228 + components: + - type: Transform + pos: -2.5,8.5 + parent: 1 - proto: NFPosterContrabandFsbApothecary entities: - uid: 289 @@ -2494,14 +2440,6 @@ entities: parent: 1 - type: Physics bodyType: Static -- proto: PaperBin10 - entities: - - uid: 191 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.7045135,9.029007 - parent: 1 - proto: PaperBin20 entities: - uid: 218 @@ -3086,11 +3024,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,9.5 parent: 1 - - uid: 302 - components: - - type: Transform - pos: -2.5,8.5 - parent: 1 - uid: 320 components: - type: Transform @@ -3144,10 +3077,10 @@ entities: parent: 1 - proto: ToyFigurineLawyer entities: - - uid: 318 + - uid: 302 components: - type: Transform - pos: -2.324068,9.276354 + pos: -2.0553885,9.797729 parent: 1 - proto: VendingMachineMedical entities: @@ -3506,7 +3439,7 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 304 components: diff --git a/Resources/Maps/_NF/Shuttles/bazaar.yml b/Resources/Maps/_NF/Shuttles/bazaar.yml index a5c7f044603..7345d29a3f0 100644 --- a/Resources/Maps/_NF/Shuttles/bazaar.yml +++ b/Resources/Maps/_NF/Shuttles/bazaar.yml @@ -1367,7 +1367,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -1377,8 +1376,6 @@ entities: - type: Transform pos: 9.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpMiddle entities: - uid: 597 @@ -1386,8 +1383,6 @@ entities: - type: Transform pos: 8.5,9.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 596 @@ -1396,8 +1391,6 @@ entities: rot: 1.5707963267948966 rad pos: 7.5,8.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 82 @@ -2872,37 +2865,11 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 387 components: - type: Transform pos: -3.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 348 @@ -5115,6 +5082,13 @@ entities: - type: Transform pos: 3.280076,1.401608 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 531 + components: + - type: Transform + pos: 1.5,10.5 + parent: 1 - proto: NFSignDock entities: - uid: 604 @@ -5189,23 +5163,15 @@ entities: - type: Transform pos: -10.5,9.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - uid: 961 components: - type: Transform pos: -10.5,7.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: PosterLegitCarpMount entities: - uid: 522 @@ -7064,7 +7030,7 @@ entities: - type: Transform pos: -6.5,10.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 475 components: diff --git a/Resources/Maps/_NF/Shuttles/beaker.yml b/Resources/Maps/_NF/Shuttles/beaker.yml index ad04506bc1d..9b0a5797637 100644 --- a/Resources/Maps/_NF/Shuttles/beaker.yml +++ b/Resources/Maps/_NF/Shuttles/beaker.yml @@ -459,8 +459,6 @@ entities: - type: Transform pos: 3.5,-2.5 parent: 1 - - type: Apc - hasAccess: True - uid: 350 components: - type: Transform @@ -1312,8 +1310,8 @@ entities: pos: -4.5,0.5 parent: 1 - type: GasMixer - inletOneConcentration: 0.79 inletTwoConcentration: 0.21 + inletOneConcentration: 0.79 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -1904,6 +1902,13 @@ entities: - type: Transform pos: -5.5501204,-3.5460114 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 253 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 371 @@ -1939,10 +1944,6 @@ entities: - type: Transform pos: 2.5,-10.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitSafetyMothEpi entities: - uid: 219 @@ -1965,7 +1966,7 @@ entities: - type: Transform pos: -6.5,-3.5 parent: 1 -- proto: PoweredlightColoredFrostyBlue +- proto: PoweredlightCyan entities: - uid: 210 components: @@ -2961,7 +2962,7 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 378 components: diff --git a/Resources/Maps/_NF/Shuttles/bocadillo.yml b/Resources/Maps/_NF/Shuttles/bocadillo.yml index 654bd71dc50..5393ed68720 100644 --- a/Resources/Maps/_NF/Shuttles/bocadillo.yml +++ b/Resources/Maps/_NF/Shuttles/bocadillo.yml @@ -17,11 +17,11 @@ entities: components: - type: MetaData name: Bocadillo - - type: BecomesStation - id: Bocadillo - type: Transform pos: -0.4375,-1.703125 parent: invalid + - type: BecomesStation + id: Bocadillo - type: MapGrid chunks: 0,0: @@ -620,19 +620,6 @@ entities: rot: 3.141592653589793 rad pos: 2.5,1.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 132 @@ -1233,6 +1220,13 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,4.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 86 + components: + - type: Transform + pos: -7.5,6.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 141 @@ -1260,10 +1254,6 @@ entities: - type: Transform pos: -8.5,3.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: Poweredlight entities: - uid: 38 @@ -1309,20 +1299,6 @@ entities: - type: Transform pos: 0.5,6.5 parent: 2 - - 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: SheetSteel entities: - uid: 201 @@ -1561,13 +1537,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,0.5 parent: 2 -- proto: VendingMachineChefDrobe - entities: - - uid: 146 - components: - - type: Transform - pos: -7.5,6.5 - parent: 2 - proto: VendingMachineChefvend entities: - uid: 100 @@ -1802,7 +1771,7 @@ entities: - type: Transform pos: -6.5,3.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 139 components: diff --git a/Resources/Maps/_NF/Shuttles/bodkin.yml b/Resources/Maps/_NF/Shuttles/bodkin.yml index 4f0e9f72557..63d9f56645b 100644 --- a/Resources/Maps/_NF/Shuttles/bodkin.yml +++ b/Resources/Maps/_NF/Shuttles/bodkin.yml @@ -976,8 +976,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-2.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 206 @@ -986,8 +984,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-1.5 parent: 2 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 10 @@ -1042,6 +1038,17 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-6.5 parent: 2 + - uid: 452 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 2 + - uid: 453 + components: + - type: Transform + pos: 1.5,6.5 + parent: 2 - proto: ButtonFrameCautionSecurity entities: - uid: 362 @@ -1490,26 +1497,20 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,4.5 parent: 2 -- proto: ComputerWallmountWithdrawBankATM +- proto: ComputerWallmountRadar entities: - uid: 163 components: - type: Transform pos: -3.5,-4.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 440 + components: + - type: Transform + pos: 4.5,-4.5 + parent: 2 - proto: ConveyorBelt entities: - uid: 65 @@ -1657,13 +1658,6 @@ entities: - type: Transform pos: -0.5,3.5 parent: 2 -- proto: filingCabinetDrawerRandom - entities: - - uid: 145 - components: - - type: Transform - pos: 1.5,5.5 - parent: 2 - proto: FirelockEdge entities: - uid: 438 @@ -1700,6 +1694,13 @@ entities: - type: DeviceNetwork deviceLists: - 83 +- proto: FolderSpawner + entities: + - uid: 456 + components: + - type: Transform + pos: 1.3455672,4.655131 + parent: 2 - proto: GasMixerOn entities: - uid: 272 @@ -2470,6 +2471,13 @@ entities: rot: -1.5707963267948966 rad pos: 1.6934373,4.4512644 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 145 + components: + - type: Transform + pos: 1.5,5.5 + parent: 2 - proto: NFSignDock entities: - uid: 410 @@ -2552,10 +2560,6 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitCarpMount entities: - uid: 426 @@ -2739,6 +2743,73 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-9.5 parent: 2 +- proto: ShuttersNormalOpen + entities: + - uid: 441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,3.5 + parent: 2 + - uid: 442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,4.5 + parent: 2 + - uid: 443 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 2 + - uid: 444 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 2 + - uid: 445 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 2 + - uid: 446 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,8.5 + parent: 2 + - uid: 447 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 2 + - uid: 448 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,8.5 + parent: 2 + - uid: 449 + components: + - type: Transform + pos: 0.5,9.5 + parent: 2 + - uid: 450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 2 + - uid: 451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-2.5 + parent: 2 - proto: ShuttleWindow entities: - uid: 51 @@ -2822,6 +2893,33 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,9.5 parent: 2 +- proto: SignalButton + entities: + - uid: 455 + components: + - type: Transform + pos: 1.5,6.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 443: + - Pressed: Toggle + 444: + - Pressed: Toggle + 442: + - Pressed: Toggle + 441: + - Pressed: Toggle + 445: + - Pressed: Toggle + 446: + - Pressed: Toggle + 449: + - Pressed: Toggle + 448: + - Pressed: Toggle + 447: + - Pressed: Toggle - proto: SignalButtonDirectional entities: - uid: 68 @@ -2862,6 +2960,18 @@ entities: - Pressed: Toggle 13: - Pressed: Toggle + - uid: 454 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-3.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 451: + - Pressed: Toggle + 450: + - Pressed: Toggle - proto: SignAtmos entities: - uid: 279 @@ -3474,7 +3584,7 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-10.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 402 components: diff --git a/Resources/Maps/_NF/Shuttles/bookworm.yml b/Resources/Maps/_NF/Shuttles/bookworm.yml index ebf39f77c36..e2322e8144c 100644 --- a/Resources/Maps/_NF/Shuttles/bookworm.yml +++ b/Resources/Maps/_NF/Shuttles/bookworm.yml @@ -22,11 +22,11 @@ entities: components: - type: MetaData name: Bookworm - - type: BecomesStation - id: Bookworm - type: Transform pos: -0.53125,-0.55733174 parent: invalid + - type: BecomesStation + id: Bookworm - type: MapGrid chunks: 0,0: @@ -1470,19 +1470,6 @@ entities: - type: Transform pos: -4.5,-4.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateServiceGuidebooks entities: - uid: 73 @@ -1585,13 +1572,6 @@ entities: - type: Transform pos: -5.5,2.5 parent: 2 -- proto: filingCabinetDrawerRandom - entities: - - uid: 296 - components: - - type: Transform - pos: -5.5,4.5 - parent: 2 - proto: Firelock entities: - uid: 23 @@ -2535,6 +2515,13 @@ entities: - type: Transform pos: 6.2763557,-3.4680002 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 296 + components: + - type: Transform + pos: -5.5,4.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 80 @@ -2658,10 +2645,6 @@ entities: - type: Transform pos: -3.5,-2.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandWehWatches entities: - uid: 524 @@ -3823,7 +3806,7 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-5.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 411 components: diff --git a/Resources/Maps/_NF/Shuttles/bulker.yml b/Resources/Maps/_NF/Shuttles/bulker.yml index 3030b2d0ef1..5d6e6545434 100644 --- a/Resources/Maps/_NF/Shuttles/bulker.yml +++ b/Resources/Maps/_NF/Shuttles/bulker.yml @@ -1599,10 +1599,11 @@ entities: parent: 1 - proto: ComputerTabletopStationRecords entities: - - uid: 361 + - uid: 62 components: - type: Transform - pos: 1.5,3.5 + rot: 3.141592653589793 rad + pos: 0.5,-1.5 parent: 1 - proto: ConveyorBelt entities: @@ -2918,6 +2919,13 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 361 + components: + - type: Transform + pos: 1.5,3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 477 @@ -3142,7 +3150,7 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,-2.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 351 components: @@ -3156,19 +3164,6 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,-3.5 parent: 1 -- proto: PoweredlightColoredRed - entities: - - uid: 442 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,0.5 - parent: 1 - - uid: 657 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 1 - proto: PoweredlightGreen entities: - uid: 418 @@ -3185,6 +3180,17 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,3.5 parent: 1 + - uid: 442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,0.5 + parent: 1 + - uid: 657 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 1 - proto: PoweredSmallLight entities: - uid: 194 @@ -3427,16 +3433,6 @@ entities: - type: Transform pos: -0.41324377,-1.3236005 parent: 1 - - uid: 434 - components: - - type: Transform - pos: 0.05550623,-1.4329755 - parent: 1 - - uid: 435 - components: - - type: Transform - pos: 0.6180062,-1.3079755 - parent: 1 - uid: 438 components: - type: Transform @@ -3534,11 +3530,6 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 62 - components: - - type: Transform - pos: 1.5,3.5 - parent: 1 - uid: 292 components: - type: Transform diff --git a/Resources/Maps/_NF/Shuttles/camper.yml b/Resources/Maps/_NF/Shuttles/camper.yml index 3bb338fbae7..9bb13aa1556 100644 --- a/Resources/Maps/_NF/Shuttles/camper.yml +++ b/Resources/Maps/_NF/Shuttles/camper.yml @@ -18,10 +18,10 @@ entities: components: - type: MetaData name: Camper - - type: BecomesStation - id: Camper - type: Transform parent: invalid + - type: BecomesStation + id: Camper - type: MapGrid chunks: 0,0: @@ -968,6 +968,13 @@ entities: - 0 - 0 - 0 +- proto: NFHolopadShip + entities: + - uid: 192 + components: + - type: Transform + pos: -1.5,4.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 106 diff --git a/Resources/Maps/_NF/Shuttles/ceres.yml b/Resources/Maps/_NF/Shuttles/ceres.yml index e55bb843d9e..75478331c32 100644 --- a/Resources/Maps/_NF/Shuttles/ceres.yml +++ b/Resources/Maps/_NF/Shuttles/ceres.yml @@ -1190,8 +1190,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-22.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 286 @@ -1200,8 +1198,6 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-21.5 parent: 2 - - type: Physics - bodyType: Static - proto: BoozeDispenser entities: - uid: 229 @@ -2120,11 +2116,11 @@ entities: parent: 2 - proto: ComputerStationRecords entities: - - uid: 170 + - uid: 804 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-8.5 + rot: -1.5707963267948966 rad + pos: 7.5,-13.5 parent: 2 - proto: ComputerWallmountWithdrawBankATM entities: @@ -2133,19 +2129,6 @@ entities: - type: Transform pos: 1.5,-15.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 147 @@ -3903,6 +3886,13 @@ entities: - type: Transform pos: -7.7678905,-9.159548 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 170 + components: + - type: Transform + pos: 6.5,-8.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 666 @@ -3967,9 +3957,6 @@ entities: parent: 2 - type: FuelGenerator targetPower: 24000 - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 103 @@ -4215,20 +4202,6 @@ entities: - type: Transform pos: 7.5,-12.5 parent: 2 - - 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: SheetUranium entities: - uid: 205 @@ -5762,7 +5735,7 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-23.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 584 components: diff --git a/Resources/Maps/_NF/Shuttles/chisel.yml b/Resources/Maps/_NF/Shuttles/chisel.yml index e59efd0523f..2428a00f9cb 100644 --- a/Resources/Maps/_NF/Shuttles/chisel.yml +++ b/Resources/Maps/_NF/Shuttles/chisel.yml @@ -18,11 +18,11 @@ entities: components: - type: MetaData name: Chisel - - type: BecomesStation - id: Chisel - type: Transform pos: -0.5,-0.5000076 parent: invalid + - type: BecomesStation + id: Chisel - type: MapGrid chunks: 0,0: @@ -1145,19 +1145,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-4.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 97 @@ -1872,6 +1859,13 @@ entities: - type: Transform pos: 6.5,2.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 350 + components: + - type: Transform + pos: -3.5,3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 240 @@ -1932,19 +1926,11 @@ entities: - type: Transform pos: 4.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 254 components: - type: Transform pos: 5.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 38 @@ -1977,7 +1963,7 @@ entities: - type: Transform pos: -2.5,0.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 169 components: @@ -2686,7 +2672,7 @@ entities: rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 40 components: diff --git a/Resources/Maps/_NF/Shuttles/comet.yml b/Resources/Maps/_NF/Shuttles/comet.yml index 34398becbec..baf5c3d5a54 100644 --- a/Resources/Maps/_NF/Shuttles/comet.yml +++ b/Resources/Maps/_NF/Shuttles/comet.yml @@ -2687,6 +2687,13 @@ entities: - type: Transform pos: 1.7263477,7.4463973 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 438 + components: + - type: Transform + pos: -1.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 379 @@ -3932,7 +3939,7 @@ entities: - type: Transform pos: 1.5,-2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 543 components: diff --git a/Resources/Maps/_NF/Shuttles/crescent.yml b/Resources/Maps/_NF/Shuttles/crescent.yml index 566b958bdf5..0c53e2c9bd7 100644 --- a/Resources/Maps/_NF/Shuttles/crescent.yml +++ b/Resources/Maps/_NF/Shuttles/crescent.yml @@ -658,7 +658,7 @@ entities: 4,3: 2: 17 0: 61440 - 5: 68 + 3: 68 -1,-1: 0: 65024 -4,0: @@ -681,7 +681,7 @@ entities: 0: 52431 2: 4096 -4,-1: - 3: 8192 + 4: 8192 0: 32768 -3,0: 0: 20667 @@ -691,11 +691,11 @@ entities: 0: 1615 -3,3: 0: 256 - 4: 61166 + 5: 61166 -3,-1: 0: 8192 -3,4: - 4: 14 + 5: 14 0: 26112 -2,0: 0: 62139 @@ -728,13 +728,13 @@ entities: 0: 15 2: 16896 6,0: - 3: 4096 + 4: 4096 6,2: 0: 26230 6,3: 0: 63239 6,1: - 3: 32 + 4: 32 0: 8192 6,4: 0: 65319 @@ -743,16 +743,16 @@ entities: 7,3: 0: 12544 2: 2 - 3: 52416 + 4: 52416 7,4: 0: 4353 - 3: 204 + 4: 204 -8,3: - 3: 26208 + 4: 26208 0: 32768 2: 8 -8,4: - 3: 102 + 4: 102 -7,3: 0: 61900 -7,2: @@ -819,28 +819,28 @@ entities: 0: 4403 -7,9: 0: 204 - 3: 32768 + 4: 32768 -6,9: 0: 51 - 3: 28672 + 4: 28672 -6,10: - 3: 18039 + 4: 18039 -6,11: - 3: 68 + 4: 68 5,8: 0: 32768 5,9: 0: 136 - 3: 49152 + 4: 49152 5,10: - 3: 19660 + 4: 19660 5,11: - 3: 68 + 4: 68 6,9: 0: 51 - 3: 12288 + 4: 12288 6,10: - 3: 17 + 4: 17 -4,5: 0: 3276 -3,5: @@ -861,9 +861,9 @@ entities: 0: 26191 -1,7: 0: 6 - 3: 28160 + 4: 28160 -1,8: - 3: 2 + 4: 2 0,5: 0: 16371 0,6: @@ -945,12 +945,12 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 - 0 - - 0 + - 2500 - 0 - 0 - 0 @@ -960,30 +960,30 @@ entities: - 0 - 0 - volume: 2500 - temperature: 340 + immutable: True moles: - - 21.824879 - - 82.10312 - 0 - 0 - 0 - - 82.10312 - 0 - 0 - 0 - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - 0 - 0 - 0 - - 2500 + - volume: 2500 + temperature: 340 + moles: + - 21.824879 + - 82.10312 - 0 - 0 - 0 + - 82.10312 + - 0 - 0 - 0 - 0 @@ -9808,7 +9808,7 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,16.5 parent: 1 -- proto: FloraTree05 +- proto: FloraTree entities: - uid: 3488 components: @@ -16779,6 +16779,13 @@ entities: - type: Transform pos: 4.2787952,0.7933556 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 202 + components: + - type: Transform + pos: 3.5,29.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 2259 @@ -17414,7 +17421,7 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,20.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 1151 components: @@ -17427,13 +17434,6 @@ entities: - type: Transform pos: 10.5,16.5 parent: 1 -- proto: PoweredlightColoredRed - entities: - - uid: 2370 - components: - - type: Transform - pos: -5.5,16.5 - parent: 1 - proto: PoweredlightExterior entities: - uid: 2371 @@ -17442,6 +17442,13 @@ entities: rot: 3.141592653589793 rad pos: -5.5,12.5 parent: 1 +- proto: PoweredlightRed + entities: + - uid: 2370 + components: + - type: Transform + pos: -5.5,16.5 + parent: 1 - proto: PoweredSmallLight entities: - uid: 2372 @@ -18133,13 +18140,6 @@ entities: - type: Transform pos: 5.469994,13.032564 parent: 1 -- proto: ScienceTechFab - entities: - - uid: 1232 - components: - - type: Transform - pos: 24.5,22.5 - parent: 1 - proto: SeedExtractor entities: - uid: 2515 @@ -19779,11 +19779,6 @@ entities: - type: Transform pos: 3.5,16.5 parent: 1 - - uid: 2734 - components: - - type: Transform - pos: 3.5,29.5 - parent: 1 - uid: 2735 components: - type: Transform @@ -20091,6 +20086,13 @@ entities: - type: Transform pos: 10.6321535,14.659507 parent: 1 +- proto: UnfinishedMachineFrame + entities: + - uid: 1232 + components: + - type: Transform + pos: 24.5,22.5 + parent: 1 - proto: UniformShortsRed entities: - uid: 1380 diff --git a/Resources/Maps/_NF/Shuttles/eagle.yml b/Resources/Maps/_NF/Shuttles/eagle.yml index cd2d5577f1e..cb505baf523 100644 --- a/Resources/Maps/_NF/Shuttles/eagle.yml +++ b/Resources/Maps/_NF/Shuttles/eagle.yml @@ -13,7 +13,7 @@ tilemap: 114: FloorWhiteMono 121: Lattice 122: Plating - 3: PlatingBurnt + 3: PlatingDamaged entities: - proto: "" entities: @@ -2088,13 +2088,6 @@ entities: - type: Transform pos: 2.5,9.5 parent: 1 -- proto: filingCabinetRandom - entities: - - uid: 678 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - proto: FireAlarm entities: - uid: 576 @@ -3553,6 +3546,13 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-5.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 678 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 - proto: NFSignDock entities: - uid: 632 diff --git a/Resources/Maps/_NF/Shuttles/garden.yml b/Resources/Maps/_NF/Shuttles/garden.yml index 090ddde1090..56098b13d3b 100644 --- a/Resources/Maps/_NF/Shuttles/garden.yml +++ b/Resources/Maps/_NF/Shuttles/garden.yml @@ -795,7 +795,7 @@ entities: - uid: 259 components: - type: Transform - pos: 0.5,6.5 + pos: -0.5,4.5 parent: 1 - proto: FirelockGlass entities: @@ -1533,6 +1533,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,4.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 189 + components: + - type: Transform + pos: 0.5,6.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 282 @@ -1560,10 +1567,6 @@ entities: - type: Transform pos: 3.5,5.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitBotanyFood entities: - uid: 257 @@ -1794,11 +1797,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-2.5 parent: 1 - - uid: 189 - components: - - type: Transform - pos: 0.5,6.5 - parent: 1 - proto: TableGlass entities: - uid: 182 @@ -2115,7 +2113,7 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 263 components: diff --git a/Resources/Maps/_NF/Shuttles/hammer.yml b/Resources/Maps/_NF/Shuttles/hammer.yml index 84156083707..5367e8fabca 100644 --- a/Resources/Maps/_NF/Shuttles/hammer.yml +++ b/Resources/Maps/_NF/Shuttles/hammer.yml @@ -1318,7 +1318,7 @@ entities: - type: Transform pos: -3.5,0.5 parent: 2 -- proto: CrateMaterials +- proto: CrateMaterialsBasicFilled entities: - uid: 272 components: @@ -2127,6 +2127,13 @@ entities: - type: Transform pos: 7.374843,0.8089867 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 263 + components: + - type: Transform + pos: 7.5,5.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 93 @@ -2225,13 +2232,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,1.5 parent: 2 -- proto: PottedPlantRandom - entities: - - uid: 263 - components: - - type: Transform - pos: 7.5,5.5 - parent: 2 - proto: PowerCellRecharger entities: - uid: 318 @@ -3027,7 +3027,7 @@ entities: - type: Transform pos: -3.5,-4.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 421 components: diff --git a/Resources/Maps/_NF/Shuttles/harbormaster.yml b/Resources/Maps/_NF/Shuttles/harbormaster.yml index e730cad5f22..3b28de57cb0 100644 --- a/Resources/Maps/_NF/Shuttles/harbormaster.yml +++ b/Resources/Maps/_NF/Shuttles/harbormaster.yml @@ -678,10 +678,10 @@ entities: parent: 1 - proto: BoxFolderBlue entities: - - uid: 7 + - uid: 254 components: - type: Transform - pos: -5.657484,3.1305754 + pos: -5.8715925,3.5784767 parent: 1 - proto: ButtonFrameCaution entities: @@ -1009,14 +1009,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,0.5 parent: 1 -- proto: ComputerTabletopRadar - entities: - - uid: 273 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,2.5 - parent: 1 - proto: ComputerTabletopShuttle entities: - uid: 272 @@ -1435,6 +1427,13 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-3.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 7 + components: + - type: Transform + pos: -5.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 118 @@ -1462,19 +1461,11 @@ entities: - type: Transform pos: -3.5,-3.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 163 components: - type: Transform pos: -2.5,-3.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PoweredlightLED entities: - uid: 203 @@ -1724,12 +1715,6 @@ entities: parent: 1 - proto: TableReinforced entities: - - uid: 254 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,2.5 - parent: 1 - uid: 255 components: - type: Transform @@ -2085,7 +2070,7 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-1.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 249 components: diff --git a/Resources/Maps/_NF/Shuttles/hauler.yml b/Resources/Maps/_NF/Shuttles/hauler.yml index c446cf4e149..1948366a167 100644 --- a/Resources/Maps/_NF/Shuttles/hauler.yml +++ b/Resources/Maps/_NF/Shuttles/hauler.yml @@ -711,7 +711,7 @@ entities: pos: -5.5,14.5 parent: 1 - type: Door - secondsUntilStateChange: -319.50586 + secondsUntilStateChange: -489.1448 state: Opening - type: DeviceLinkSource lastSignals: @@ -932,8 +932,6 @@ entities: - type: Transform pos: 4.5,26.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 509 @@ -941,8 +939,6 @@ entities: - type: Transform pos: 3.5,26.5 parent: 1 - - type: Physics - bodyType: Static - proto: BoozeDispenser entities: - uid: 527 @@ -4032,6 +4028,13 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 725 + components: + - type: Transform + pos: 0.5,28.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 214 @@ -4140,10 +4143,6 @@ entities: - type: Transform pos: 3.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterLegitAnatomyPoster entities: - uid: 522 @@ -4346,7 +4345,29 @@ entities: rot: 3.141592653589793 rad pos: 7.5,9.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: PoweredLightPostSmallRed + entities: + - uid: 144 + components: + - type: Transform + pos: 6.5,29.5 + parent: 1 + - uid: 474 + components: + - type: Transform + pos: -5.5,29.5 + parent: 1 + - uid: 689 + components: + - type: Transform + pos: -2.5,33.5 + parent: 1 + - uid: 696 + components: + - type: Transform + pos: 3.5,33.5 + parent: 1 +- proto: PoweredlightRed entities: - uid: 203 components: @@ -4404,28 +4425,6 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 1 -- proto: PoweredLightPostSmallRed - entities: - - uid: 144 - components: - - type: Transform - pos: 6.5,29.5 - parent: 1 - - uid: 474 - components: - - type: Transform - pos: -5.5,29.5 - parent: 1 - - uid: 689 - components: - - type: Transform - pos: -2.5,33.5 - parent: 1 - - uid: 696 - components: - - type: Transform - pos: 3.5,33.5 - parent: 1 - proto: Rack entities: - uid: 698 @@ -6361,7 +6360,7 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,6.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 191 components: diff --git a/Resources/Maps/_NF/Shuttles/honker.yml b/Resources/Maps/_NF/Shuttles/honker.yml index 49639fb3491..6bab7dbcfdf 100644 --- a/Resources/Maps/_NF/Shuttles/honker.yml +++ b/Resources/Maps/_NF/Shuttles/honker.yml @@ -15,11 +15,11 @@ entities: components: - type: MetaData name: Honker - - type: BecomesStation - id: Honker - type: Transform pos: -0.6250305,0.875 parent: invalid + - type: BecomesStation + id: Honker - type: MapGrid chunks: 0,0: @@ -1116,6 +1116,13 @@ entities: rot: 3.141592653589793 rad pos: 5.5,10.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 183 + components: + - type: Transform + pos: 2.5,10.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 143 @@ -1174,10 +1181,6 @@ entities: - type: Transform pos: 5.5,11.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandClown entities: - uid: 197 @@ -1679,7 +1682,7 @@ entities: - type: Transform pos: -0.5,4.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 209 components: diff --git a/Resources/Maps/_NF/Shuttles/investigator.yml b/Resources/Maps/_NF/Shuttles/investigator.yml index 6c1a60f694c..2014e5edcbe 100644 --- a/Resources/Maps/_NF/Shuttles/investigator.yml +++ b/Resources/Maps/_NF/Shuttles/investigator.yml @@ -10,7 +10,7 @@ tilemap: 2: FloorGlass 78: FloorReinforced 90: FloorSteel - 91: FloorSteelBurnt + 91: FloorSteelDamaged 97: FloorSteelDirty 101: FloorSteelMono 1: FloorTechMaint @@ -24,11 +24,11 @@ entities: components: - type: MetaData name: Investigator - - type: BecomesStation - id: Investigator - type: Transform pos: -2.6107569,3.2554395 parent: invalid + - type: BecomesStation + id: Investigator - type: MapGrid chunks: 0,0: @@ -1232,8 +1232,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-2.5 parent: 2 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 296 @@ -1242,8 +1240,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-2.5 parent: 2 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 47 @@ -2714,19 +2710,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,0.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 3 @@ -3785,6 +3768,8 @@ entities: rot: -1.5707963267948966 rad pos: 6.5,0.5 parent: 2 + - type: Fixtures + fixtures: {} - proto: LockerPilot entities: - uid: 537 @@ -3813,6 +3798,13 @@ entities: - type: Transform pos: 10.5,-2.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 458 + components: + - type: Transform + pos: -2.5,-6.5 + parent: 2 - proto: NFSignDock entities: - uid: 481 @@ -3881,19 +3873,11 @@ entities: - type: Transform pos: -2.5,2.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 519 components: - type: Transform pos: -1.5,2.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 281 @@ -5281,7 +5265,7 @@ entities: - type: Transform pos: -5.5,0.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 328 components: diff --git a/Resources/Maps/_NF/Shuttles/kestrel.yml b/Resources/Maps/_NF/Shuttles/kestrel.yml index 112b56774b3..cbf41f37a2f 100644 --- a/Resources/Maps/_NF/Shuttles/kestrel.yml +++ b/Resources/Maps/_NF/Shuttles/kestrel.yml @@ -24,11 +24,11 @@ entities: components: - type: MetaData name: Kestrel - - type: BecomesStation - id: Kestrel - type: Transform pos: -1.078125,-0.46875 parent: invalid + - type: BecomesStation + id: Kestrel - type: MapGrid chunks: 0,0: @@ -2818,10 +2818,10 @@ entities: parent: 3 - proto: LockerQuarterMasterFilledHardsuit entities: - - uid: 261 + - uid: 483 components: - type: Transform - pos: 1.5,-0.5 + pos: 0.5,-3.5 parent: 3 - proto: LockerSalvageSpecialistFilled entities: @@ -2888,6 +2888,13 @@ entities: - type: Transform pos: -2.5,-8.5 parent: 3 +- proto: NFHolopadShip + entities: + - uid: 261 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 3 - proto: NitrogenCanister entities: - uid: 345 @@ -2946,10 +2953,6 @@ entities: - type: Transform pos: -1.5,-7.5 parent: 3 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandVoteWeh entities: - uid: 297 @@ -3017,14 +3020,6 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-10.5 parent: 3 -- proto: PoweredlightColoredRed - entities: - - uid: 11 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,0.5 - parent: 3 - proto: PoweredlightGreen entities: - uid: 530 @@ -3035,6 +3030,12 @@ entities: parent: 3 - proto: PoweredlightRed entities: + - uid: 11 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,0.5 + parent: 3 - uid: 12 components: - type: Transform @@ -4073,7 +4074,7 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-10.5 parent: 3 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 276 components: diff --git a/Resources/Maps/_NF/Shuttles/kilderkin.yml b/Resources/Maps/_NF/Shuttles/kilderkin.yml index 257ac1814bb..3807fbb7267 100644 --- a/Resources/Maps/_NF/Shuttles/kilderkin.yml +++ b/Resources/Maps/_NF/Shuttles/kilderkin.yml @@ -3167,6 +3167,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,3.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 622 + components: + - type: Transform + pos: 5.5,5.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 290 @@ -3420,7 +3427,7 @@ entities: - type: Transform pos: -1.5,5.5 parent: 1 -- proto: ShadowTree01 +- proto: ShadowTree entities: - uid: 189 components: diff --git a/Resources/Maps/_NF/Shuttles/lantern.yml b/Resources/Maps/_NF/Shuttles/lantern.yml index 91a146d57be..1339fd1aa7b 100644 --- a/Resources/Maps/_NF/Shuttles/lantern.yml +++ b/Resources/Maps/_NF/Shuttles/lantern.yml @@ -976,48 +976,36 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 490 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 495 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - uid: 504 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 505 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 506 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchPewMiddle entities: - uid: 496 @@ -1026,16 +1014,12 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 497 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchPewRight entities: - uid: 498 @@ -1044,48 +1028,36 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 499 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - uid: 500 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - uid: 501 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-7.5 parent: 1 - - type: Physics - bodyType: Static - uid: 502 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-5.5 parent: 1 - - type: Physics - bodyType: Static - uid: 503 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-3.5 parent: 1 - - type: Physics - bodyType: Static - proto: Bible entities: - uid: 100 @@ -3078,19 +3050,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-16.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 186 @@ -4198,6 +4157,13 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-16.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 694 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 616 @@ -4241,10 +4207,6 @@ entities: - type: Transform pos: -1.5,-16.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 719 @@ -5873,7 +5835,7 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-16.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 418 components: diff --git a/Resources/Maps/_NF/Shuttles/legman.yml b/Resources/Maps/_NF/Shuttles/legman.yml index 2a3e0e84f05..ac2f08dde99 100644 --- a/Resources/Maps/_NF/Shuttles/legman.yml +++ b/Resources/Maps/_NF/Shuttles/legman.yml @@ -564,19 +564,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-2.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 75 @@ -879,6 +866,13 @@ entities: - type: Transform pos: 2.911514,1.3323524 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 145 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 51 @@ -1026,17 +1020,6 @@ entities: - type: Transform pos: 0.5,-1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PottedPlantRandom - entities: - - uid: 162 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 1 - proto: PoweredlightLED entities: - uid: 81 @@ -1333,7 +1316,7 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-0.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 143 components: diff --git a/Resources/Maps/_NF/Shuttles/liquidator.yml b/Resources/Maps/_NF/Shuttles/liquidator.yml index b2a84834063..fca8c614a30 100644 --- a/Resources/Maps/_NF/Shuttles/liquidator.yml +++ b/Resources/Maps/_NF/Shuttles/liquidator.yml @@ -1286,6 +1286,13 @@ entities: rot: 3.141592653589793 rad pos: -2.5,1.5 parent: 1 +- proto: ChemicalBarrelSpaceCleaner + entities: + - uid: 97 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 - proto: ClosetRadiationSuitFilled entities: - uid: 188 @@ -1336,19 +1343,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-6.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 139 @@ -1357,13 +1351,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-2.5 parent: 1 -- proto: CrateSpaceCleaner - entities: - - uid: 97 - components: - - type: Transform - pos: 2.5,2.5 - parent: 1 - proto: DefibrillatorCabinetFilled entities: - uid: 26 @@ -2290,6 +2277,13 @@ entities: - type: Transform pos: 5.5,-1.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 287 + components: + - type: Transform + pos: -2.5,0.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 202 @@ -2332,12 +2326,8 @@ entities: - type: Transform pos: 2.5,-5.5 parent: 1 - - type: FuelGenerator - on: False - type: MaterialStorageMagnetPickup magnetEnabled: True - - type: Physics - bodyType: Static - proto: PosterLegitCleanliness entities: - uid: 296 @@ -3130,7 +3120,7 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 228 components: diff --git a/Resources/Maps/_NF/Shuttles/loader.yml b/Resources/Maps/_NF/Shuttles/loader.yml index 8c9be500304..dc06a31f0c3 100644 --- a/Resources/Maps/_NF/Shuttles/loader.yml +++ b/Resources/Maps/_NF/Shuttles/loader.yml @@ -15,11 +15,11 @@ entities: components: - type: MetaData name: Loader - - type: BecomesStation - id: Loader - type: Transform pos: -0.48958334,-0.53125 parent: invalid + - type: BecomesStation + id: Loader - type: MapGrid chunks: 0,0: @@ -1409,10 +1409,10 @@ entities: parent: 1 - proto: LockerQuarterMasterFilled entities: - - uid: 132 + - uid: 256 components: - type: Transform - pos: -0.5,5.5 + pos: 0.5,0.5 parent: 1 - proto: LockerWallMaterialsFuelPlasmaFilled entities: @@ -1422,6 +1422,13 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-4.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 132 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 222 diff --git a/Resources/Maps/_NF/Shuttles/lyrae.yml b/Resources/Maps/_NF/Shuttles/lyrae.yml index 4de1788a6b1..650e0123add 100644 --- a/Resources/Maps/_NF/Shuttles/lyrae.yml +++ b/Resources/Maps/_NF/Shuttles/lyrae.yml @@ -2205,19 +2205,6 @@ entities: - type: Transform pos: -1.5,1.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateArtifactContainer entities: - uid: 511 @@ -2225,7 +2212,7 @@ entities: - type: Transform pos: 7.5,-2.5 parent: 2 -- proto: CrateMaterials +- proto: CrateMaterialsBasicFilled entities: - uid: 512 components: @@ -3575,10 +3562,10 @@ entities: parent: 2 - proto: LuxuryPen entities: - - uid: 78 + - uid: 565 components: - type: Transform - pos: -3.4731827,6.151365 + pos: 3.3493137,4.5289598 parent: 2 - proto: MachineArtifactAnalyzer entities: @@ -3618,6 +3605,13 @@ entities: - type: Transform pos: 5.362302,2.1461782 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 78 + components: + - type: Transform + pos: -3.5,6.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 648 @@ -3640,11 +3634,10 @@ entities: bodyType: Static - proto: PaperBin5 entities: - - uid: 188 + - uid: 421 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,6.5 + pos: 3.5,4.5 parent: 2 - proto: PosterContrabandHackingGuide entities: @@ -4267,10 +4260,10 @@ entities: parent: 2 - proto: TableReinforcedGlass entities: - - uid: 421 + - uid: 188 components: - type: Transform - pos: -3.5,6.5 + pos: 3.5,4.5 parent: 2 - uid: 433 components: @@ -5107,7 +5100,7 @@ entities: - type: Transform pos: -10.5,12.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 479 components: diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index ceb61f267d4..451ab3aea26 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -17,11 +17,11 @@ entities: components: - type: MetaData name: McCargo - - type: BecomesStation - id: McCargo - type: Transform pos: -0.5,-0.6875 parent: invalid + - type: BecomesStation + id: McCargo - type: MapGrid chunks: 0,0: @@ -5141,6 +5141,13 @@ entities: - type: Transform pos: 6.500013,-1.9953516 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 774 + components: + - type: Transform + pos: -1.5,16.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 819 @@ -5401,7 +5408,7 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,11.5 parent: 1 -- proto: PoweredlightColoredBlack +- proto: PoweredlightBlack entities: - uid: 227 components: diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml index 7d791e5fcf2..f6780cff9c7 100644 --- a/Resources/Maps/_NF/Shuttles/mcdelivery.yml +++ b/Resources/Maps/_NF/Shuttles/mcdelivery.yml @@ -14,11 +14,11 @@ entities: components: - type: MetaData name: McDelivery - - type: BecomesStation - id: McDelivery - type: Transform pos: -0.48958334,-0.5208333 parent: invalid + - type: BecomesStation + id: McDelivery - type: MapGrid chunks: 0,0: @@ -284,14 +284,6 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 -- proto: ComputerTabletopStationRecords - entities: - - uid: 41 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,2.5 - parent: 1 - proto: ComputerWallmountWithdrawBankATM entities: - uid: 68 @@ -300,19 +292,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezerMcCargo entities: - uid: 72 @@ -538,6 +517,13 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 41 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 45 @@ -587,10 +573,6 @@ entities: - type: Transform pos: -0.5,1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 43 @@ -756,12 +738,6 @@ entities: - type: Transform pos: 0.5,-3.5 parent: 1 - - uid: 66 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,2.5 - parent: 1 - proto: Thruster entities: - uid: 3 @@ -833,7 +809,7 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,2.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 90 components: diff --git a/Resources/Maps/_NF/Shuttles/phoenix.yml b/Resources/Maps/_NF/Shuttles/phoenix.yml index 8065ef2d018..e89dbe98a91 100644 --- a/Resources/Maps/_NF/Shuttles/phoenix.yml +++ b/Resources/Maps/_NF/Shuttles/phoenix.yml @@ -4478,18 +4478,24 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,11.5 parent: 1 + - type: Fixtures + fixtures: {} - uid: 388 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,10.5 parent: 1 + - type: Fixtures + fixtures: {} - uid: 677 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-1.5 parent: 1 + - type: Fixtures + fixtures: {} - proto: KitchenReagentGrinder entities: - uid: 643 @@ -4599,6 +4605,13 @@ entities: - type: Transform pos: 1.633827,4.46507 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 267 + components: + - type: Transform + pos: 12.5,11.5 + parent: 1 - proto: NFSignDock entities: - uid: 665 @@ -4648,13 +4661,6 @@ entities: - type: Transform pos: 9.5,10.5 parent: 1 -- proto: PaperBin5 - entities: - - uid: 642 - components: - - type: Transform - pos: 12.5,11.5 - parent: 1 - proto: PinpointerUniversal entities: - uid: 312 @@ -4669,19 +4675,11 @@ entities: - type: Transform pos: 5.5,2.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 153 components: - type: Transform pos: 4.5,2.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PortableScrubber entities: - uid: 623 @@ -4955,13 +4953,6 @@ entities: - type: Transform pos: 5.5,4.5 parent: 1 -- proto: StorageCanister - entities: - - uid: 648 - components: - - type: Transform - pos: 2.5,7.5 - parent: 1 - proto: Saw entities: - uid: 659 @@ -5502,6 +5493,11 @@ entities: parent: 1 - proto: StorageCanister entities: + - uid: 648 + components: + - type: Transform + pos: 2.5,7.5 + parent: 1 - uid: 702 components: - type: Transform @@ -5605,11 +5601,6 @@ entities: - type: Transform pos: 12.5,12.5 parent: 1 - - uid: 267 - components: - - type: Transform - pos: 12.5,11.5 - parent: 1 - uid: 268 components: - type: Transform @@ -6379,7 +6370,7 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,8.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 679 components: diff --git a/Resources/Maps/_NF/Shuttles/piecrust.yml b/Resources/Maps/_NF/Shuttles/piecrust.yml index 30b55192195..6640c912816 100644 --- a/Resources/Maps/_NF/Shuttles/piecrust.yml +++ b/Resources/Maps/_NF/Shuttles/piecrust.yml @@ -291,30 +291,30 @@ entities: 0: 32768 0,-1: 0: 30464 - 3: 6 + 1: 6 -1,1: 0: 46 - 1: 26112 + 2: 26112 -1,2: - 2: 129 - 3: 96 + 3: 129 + 1: 96 0,0: 0: 63359 0,1: 0: 65287 0,2: 0: 7 - 2: 128 + 3: 128 1,0: 0: 30583 1,1: 0: 30503 1,2: - 3: 48 - 2: 8 + 1: 48 + 3: 8 1,-1: 0: 30576 - 2: 8 + 3: 8 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -332,10 +332,8 @@ entities: - 0 - 0 - volume: 2500 - temperature: 235 + immutable: True moles: - - 21.824879 - - 82.10312 - 0 - 0 - 0 @@ -346,11 +344,13 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - 0 - 0 + - volume: 2500 + temperature: 235 + moles: + - 21.824879 + - 82.10312 - 0 - 0 - 0 @@ -362,7 +362,7 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 @@ -1865,6 +1865,13 @@ entities: - type: Transform pos: 1.0368968,1.5472217 parent: 8756 +- proto: NFHolopadShip + entities: + - uid: 359 + components: + - type: Transform + pos: 2.5,7.5 + parent: 8756 - proto: NitrogenCanister entities: - uid: 116 diff --git a/Resources/Maps/_NF/Shuttles/placebo.yml b/Resources/Maps/_NF/Shuttles/placebo.yml index bcb4b89c921..9b8c14d982a 100644 --- a/Resources/Maps/_NF/Shuttles/placebo.yml +++ b/Resources/Maps/_NF/Shuttles/placebo.yml @@ -212,7 +212,7 @@ entities: pos: -1.5,6.5 parent: 1 - type: Door - secondsUntilStateChange: -1460.9032 + secondsUntilStateChange: -1496.2726 state: Opening - proto: AirlockEngineering entities: @@ -229,7 +229,7 @@ entities: pos: -0.5,1.5 parent: 1 - type: Door - secondsUntilStateChange: -1770.7686 + secondsUntilStateChange: -1806.138 state: Opening - uid: 12 components: @@ -774,7 +774,7 @@ entities: pos: -2.5,4.5 parent: 1 - type: Door - secondsUntilStateChange: -756.28406 + secondsUntilStateChange: -791.65344 state: Closing - type: DeviceNetwork deviceLists: @@ -1419,6 +1419,13 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,1.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 274 + components: + - type: Transform + pos: 1.5,6.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 246 @@ -1468,10 +1475,6 @@ entities: - type: Transform pos: 3.5,1.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 137 @@ -2042,7 +2045,7 @@ entities: - type: Transform pos: -1.5,8.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 264 components: diff --git a/Resources/Maps/_NF/Shuttles/prospector.yml b/Resources/Maps/_NF/Shuttles/prospector.yml index f728b079784..0c14ea42819 100644 --- a/Resources/Maps/_NF/Shuttles/prospector.yml +++ b/Resources/Maps/_NF/Shuttles/prospector.yml @@ -1153,18 +1153,24 @@ entities: rot: 3.141592653589793 rad pos: 0.5,0.5 parent: 201 + - type: Fixtures + fixtures: {} - uid: 129 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-3.5 parent: 201 + - type: Fixtures + fixtures: {} - uid: 130 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,1.5 parent: 201 + - type: Fixtures + fixtures: {} - proto: LockerQuarterMasterFilled entities: - uid: 8 @@ -1194,6 +1200,13 @@ entities: - type: Transform pos: 1.6783751,-4.3457556 parent: 201 +- proto: NFHolopadShip + entities: + - uid: 164 + components: + - type: Transform + pos: 0.5,1.5 + parent: 201 - proto: NFSignDock entities: - uid: 151 @@ -1257,11 +1270,7 @@ entities: - type: Transform pos: 0.5,-6.5 parent: 201 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PottedPlantRandomPlastic +- proto: PottedPlantRandom entities: - uid: 167 components: @@ -1723,7 +1732,7 @@ entities: rot: 3.141592653589793 rad pos: -4.5,0.5 parent: 201 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 199 components: diff --git a/Resources/Maps/_NF/Shuttles/pts.yml b/Resources/Maps/_NF/Shuttles/pts.yml index 9b07da07086..0266386e3a7 100644 --- a/Resources/Maps/_NF/Shuttles/pts.yml +++ b/Resources/Maps/_NF/Shuttles/pts.yml @@ -591,19 +591,6 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-1.5 parent: 2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezer entities: - uid: 61 @@ -1117,6 +1104,13 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-4.5 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 188 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 2 - proto: NitrogenCanister entities: - uid: 80 @@ -1156,10 +1150,6 @@ entities: - type: Transform pos: -0.5,-4.5 parent: 2 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 195 @@ -1537,7 +1527,7 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-5.5 parent: 2 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 164 components: diff --git a/Resources/Maps/_NF/Shuttles/searchlight.yml b/Resources/Maps/_NF/Shuttles/searchlight.yml index 2a979fbf9bb..43107b0f131 100644 --- a/Resources/Maps/_NF/Shuttles/searchlight.yml +++ b/Resources/Maps/_NF/Shuttles/searchlight.yml @@ -350,25 +350,25 @@ entities: 0: 275 0,-1: 0: 13079 - 2: 2048 + 1: 2048 -1,0: 0: 8 0,1: - 1: 16 + 2: 16 1,0: - 2: 13107 + 1: 13107 1,-1: - 2: 14080 + 1: 14080 0: 3 1,1: - 2: 4371 + 1: 4371 -1,-3: 0: 60552 - 2: 2 + 1: 2 -1,-2: 0: 52974 -1,-1: - 2: 1 + 1: 1 0: 34828 -1,-4: 0: 32768 @@ -376,13 +376,13 @@ entities: 0: 4096 0,-3: 0: 29459 - 2: 8 + 1: 8 3: 34816 0,-2: 0: 32755 1,-3: 3: 4096 - 2: 16384 + 1: 16384 1,-2: 0: 13104 uniqueMixes: @@ -402,7 +402,7 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.15 + immutable: True moles: - 0 - 0 @@ -417,7 +417,7 @@ entities: - 0 - 0 - volume: 2500 - immutable: True + temperature: 293.15 moles: - 0 - 0 @@ -1138,19 +1138,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-11.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 221 @@ -1696,7 +1683,7 @@ entities: - uid: 134 components: - type: Transform - pos: 1.5,-1.5 + pos: -1.5,-7.5 parent: 1 - proto: HandheldHealthAnalyzer entities: @@ -1707,10 +1694,10 @@ entities: parent: 1 - proto: LockerEngineerFilled entities: - - uid: 106 + - uid: 214 components: - type: Transform - pos: -1.5,-7.5 + pos: 1.5,-9.5 parent: 1 - proto: LockerWallMaterialsFuelPlasmaFilled entities: @@ -1754,6 +1741,13 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-9.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 106 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 102 @@ -1795,17 +1789,6 @@ entities: - type: Transform pos: -2.5,-7.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static -- proto: PottedPlantRandom - entities: - - uid: 214 - components: - - type: Transform - pos: 1.5,-9.5 - parent: 1 - proto: PowerCellRecharger entities: - uid: 131 @@ -2483,7 +2466,7 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-6.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 133 components: diff --git a/Resources/Maps/_NF/Shuttles/skipper.yml b/Resources/Maps/_NF/Shuttles/skipper.yml index 2945c51c5ee..4033bc8bbc0 100644 --- a/Resources/Maps/_NF/Shuttles/skipper.yml +++ b/Resources/Maps/_NF/Shuttles/skipper.yml @@ -1273,17 +1273,6 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-1.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - proto: CrateNPCCow entities: - uid: 267 @@ -2142,6 +2131,13 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,6.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 428 + components: + - type: Transform + pos: -4.5,3.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 400 @@ -2194,7 +2190,6 @@ entities: parent: 1 - type: FuelGenerator targetPower: 10000 - on: False - uid: 149 components: - type: Transform @@ -2202,7 +2197,6 @@ entities: parent: 1 - type: FuelGenerator targetPower: 10000 - on: False - proto: Poweredlight entities: - uid: 244 @@ -2343,20 +2337,6 @@ entities: - type: Transform pos: -6.5,2.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: ShelfKitchen entities: - uid: 37 @@ -3146,7 +3126,7 @@ entities: rot: 3.141592653589793 rad pos: -3.5,4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 363 components: diff --git a/Resources/Maps/_NF/Shuttles/sparrow.yml b/Resources/Maps/_NF/Shuttles/sparrow.yml index d93cc0fa35a..375feadffba 100644 --- a/Resources/Maps/_NF/Shuttles/sparrow.yml +++ b/Resources/Maps/_NF/Shuttles/sparrow.yml @@ -756,6 +756,11 @@ entities: - type: Transform pos: 4.5,1.5 parent: 174 + - uid: 336 + components: + - type: Transform + pos: -4.5,-2.5 + parent: 174 - proto: CableHV entities: - uid: 92 @@ -1062,6 +1067,14 @@ entities: - type: Transform pos: 3.6195195,1.6693814 parent: 174 +- proto: GasMiningDrill + entities: + - uid: 338 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 174 - proto: GasMixerOnFlipped entities: - uid: 20 @@ -1705,8 +1718,7 @@ entities: - uid: 182 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,7.5 + pos: -3.5,-3.5 parent: 174 - proto: IntercomScience entities: @@ -1715,12 +1727,16 @@ entities: - type: Transform pos: 1.5,8.5 parent: 174 + - type: Fixtures + fixtures: {} - uid: 285 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-2.5 parent: 174 + - type: Fixtures + fixtures: {} - proto: LockerResearchDirectorFilled entities: - uid: 253 @@ -1758,6 +1774,13 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,2.5 parent: 174 +- proto: NFHolopadShip + entities: + - uid: 167 + components: + - type: Transform + pos: 1.5,7.5 + parent: 174 - proto: NitrogenCanister entities: - uid: 269 @@ -1793,19 +1816,11 @@ entities: - type: Transform pos: 5.5,-1.5 parent: 174 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 293 components: - type: Transform pos: 4.5,-1.5 parent: 174 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PowerCellRecharger entities: - uid: 244 @@ -2462,7 +2477,7 @@ entities: - type: Transform pos: 6.5,2.5 parent: 174 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 319 components: diff --git a/Resources/Maps/_NF/Shuttles/spectre.yml b/Resources/Maps/_NF/Shuttles/spectre.yml index bb485f8a521..a2ea8931bdf 100644 --- a/Resources/Maps/_NF/Shuttles/spectre.yml +++ b/Resources/Maps/_NF/Shuttles/spectre.yml @@ -5983,6 +5983,13 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-3.5 parent: 3 +- proto: NFHolopadShip + entities: + - uid: 910 + components: + - type: Transform + pos: -0.5,25.5 + parent: 3 - proto: NitrogenCanister entities: - uid: 492 @@ -6258,7 +6265,7 @@ entities: - type: Transform pos: 11.5,0.5 parent: 3 -- proto: PoweredlightColoredRed +- proto: PoweredlightRed entities: - uid: 151 components: @@ -6641,13 +6648,6 @@ entities: - type: Transform pos: -6.5,9.5 parent: 3 -- proto: ScienceTechFab - entities: - - uid: 646 - components: - - type: Transform - pos: 5.5,-3.5 - parent: 3 - proto: SignalButton entities: - uid: 762 @@ -7261,6 +7261,13 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-9.5 parent: 3 +- proto: UnfinishedMachineFrame + entities: + - uid: 646 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 3 - proto: VendingMachineBooze entities: - uid: 552 diff --git a/Resources/Maps/_NF/Shuttles/spirit.yml b/Resources/Maps/_NF/Shuttles/spirit.yml index 112b0d4601e..fa3c365a72a 100644 --- a/Resources/Maps/_NF/Shuttles/spirit.yml +++ b/Resources/Maps/_NF/Shuttles/spirit.yml @@ -493,17 +493,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-3.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: ItemSlots - proto: DefibrillatorCabinetFilled entities: - uid: 87 @@ -813,20 +802,13 @@ entities: - type: Transform pos: 2.5,1.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: NFHolopadShip + entities: + - uid: 144 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 - proto: NFPosterContrabandFsbSpirit entities: - uid: 89 @@ -1217,7 +1199,7 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-4.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 106 components: diff --git a/Resources/Maps/_NF/Shuttles/stasis.yml b/Resources/Maps/_NF/Shuttles/stasis.yml index bcfb97388ce..9915de4ecc5 100644 --- a/Resources/Maps/_NF/Shuttles/stasis.yml +++ b/Resources/Maps/_NF/Shuttles/stasis.yml @@ -828,7 +828,8 @@ entities: 6,-1: 0: 4096 5,1: - 1: 29559 + 1: 29495 + 2: 64 5,2: 1: 1906 0: 32768 @@ -863,6 +864,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14996 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -1991,6 +2007,24 @@ entities: parent: 1 - type: Physics bodyType: Static + - 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 - uid: 445 components: - type: Transform @@ -3534,10 +3568,10 @@ entities: parent: 1 - proto: LockerChiefMedicalOfficerFilledHardsuit entities: - - uid: 351 + - uid: 578 components: - type: Transform - pos: 20.5,7.5 + pos: 18.5,-0.5 parent: 1 - proto: LockerMedicineFilled entities: @@ -3656,6 +3690,13 @@ entities: - type: Transform pos: 20.5,-3.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 351 + components: + - type: Transform + pos: 20.5,7.5 + parent: 1 - proto: NFPosterContrabandEmsCoords entities: - uid: 287 @@ -5192,7 +5233,7 @@ entities: rot: 3.141592653589793 rad pos: 23.5,-9.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 82 components: diff --git a/Resources/Maps/_NF/Shuttles/stellaris.yml b/Resources/Maps/_NF/Shuttles/stellaris.yml index 63e934dedd2..283120c3801 100644 --- a/Resources/Maps/_NF/Shuttles/stellaris.yml +++ b/Resources/Maps/_NF/Shuttles/stellaris.yml @@ -654,7 +654,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaCorpLeft @@ -665,8 +664,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,7.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaCorpRight entities: - uid: 249 @@ -674,8 +671,6 @@ entities: - type: Transform pos: 1.5,8.5 parent: 1 - - type: Physics - bodyType: Static - proto: BikeHorn entities: - uid: 442 @@ -1568,56 +1563,17 @@ entities: - type: Transform pos: 7.5,-0.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 239 components: - type: Transform pos: -6.5,-0.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - uid: 241 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-4.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: CrateFreezer entities: - uid: 209 @@ -2944,6 +2900,13 @@ entities: rot: 1.5707963267948966 rad pos: 0.3989902,0.9814253 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 217 + components: + - type: Transform + pos: 0.5,11.5 + parent: 1 - proto: OilJarCorn entities: - uid: 219 @@ -2973,19 +2936,11 @@ entities: - type: Transform pos: -3.5,-7.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 447 components: - type: Transform pos: -3.5,-8.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PottedPlantRandom entities: - uid: 626 @@ -3470,10 +3425,10 @@ entities: parent: 1 - proto: SpacemenFigureSpawner entities: - - uid: 409 + - uid: 218 components: - type: Transform - pos: 0.5,11.5 + pos: 2.5,12.5 parent: 1 - proto: SpawnPointLatejoin entities: @@ -3609,11 +3564,6 @@ entities: - type: Transform pos: 0.5,12.5 parent: 1 - - uid: 380 - components: - - type: Transform - pos: 0.5,11.5 - parent: 1 - uid: 385 components: - type: Transform @@ -4372,7 +4322,7 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,13.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 410 components: diff --git a/Resources/Maps/_NF/Shuttles/tyne.yml b/Resources/Maps/_NF/Shuttles/tyne.yml index 78688103579..0072892f2f1 100644 --- a/Resources/Maps/_NF/Shuttles/tyne.yml +++ b/Resources/Maps/_NF/Shuttles/tyne.yml @@ -19,11 +19,11 @@ entities: components: - type: MetaData name: grid - - type: BecomesStation - id: Tyne - type: Transform pos: -0.5,-0.5 parent: invalid + - type: BecomesStation + id: Tyne - type: MapGrid chunks: 0,0: @@ -1436,6 +1436,13 @@ entities: - type: Transform pos: -0.3407581,-2.3656425 parent: 2 +- proto: NFHolopadShip + entities: + - uid: 201 + components: + - type: Transform + pos: -0.5,4.5 + parent: 2 - proto: NFPosterContrabandEmsCoords entities: - uid: 8 diff --git a/Resources/Maps/_NF/Shuttles/vagabond.yml b/Resources/Maps/_NF/Shuttles/vagabond.yml index 657e1ae2bf0..7c005f531a2 100644 --- a/Resources/Maps/_NF/Shuttles/vagabond.yml +++ b/Resources/Maps/_NF/Shuttles/vagabond.yml @@ -925,8 +925,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,6.5 parent: 1 - - type: Apc - hasAccess: True - uid: 164 components: - type: MetaData @@ -1280,7 +1278,6 @@ entities: parent: 1 - type: Physics canCollide: False - bodyType: Static - type: Fixtures fixtures: {} - proto: BenchSofaLeft @@ -1291,8 +1288,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,1.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaMiddle entities: - uid: 227 @@ -1301,8 +1296,6 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BenchSofaRight entities: - uid: 656 @@ -1311,8 +1304,6 @@ entities: rot: 3.141592653589793 rad pos: -10.5,-0.5 parent: 1 - - type: Physics - bodyType: Static - proto: BlastDoor entities: - uid: 176 @@ -4339,6 +4330,13 @@ entities: - type: Transform pos: -10.5,0.5 parent: 1 +- proto: NFHolopadShip + entities: + - uid: 823 + components: + - type: Transform + pos: -4.5,17.5 + parent: 1 - proto: NitrogenCanister entities: - uid: 795 @@ -4446,19 +4444,11 @@ entities: - type: Transform pos: 0.5,10.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - uid: 571 components: - type: Transform pos: 1.5,10.5 parent: 1 - - type: FuelGenerator - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandHighEffectEngineering entities: - uid: 695 @@ -4511,7 +4501,7 @@ entities: rot: 3.141592653589793 rad pos: -9.5,-0.5 parent: 1 -- proto: PoweredlightColoredFrostyBlue +- proto: PoweredlightCyan entities: - uid: 678 components: @@ -4519,7 +4509,21 @@ entities: rot: 3.141592653589793 rad pos: -5.5,17.5 parent: 1 -- proto: PoweredlightColoredRed +- proto: PoweredlightLED + entities: + - uid: 677 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,18.5 + parent: 1 + - uid: 684 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,6.5 + parent: 1 +- proto: PoweredlightRed entities: - uid: 680 components: @@ -4556,20 +4560,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-9.5 parent: 1 -- proto: PoweredlightLED - entities: - - uid: 677 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,18.5 - parent: 1 - - uid: 684 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,6.5 - parent: 1 - proto: PoweredlightSodium entities: - uid: 676 @@ -6041,7 +6031,7 @@ entities: - type: Transform pos: -4.5,16.5 parent: 1 -- proto: WarpPointShip +- proto: WarpPoint entities: - uid: 713 components: diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index a0841be90e4..91fb18838ed 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -36,6 +36,8 @@ Urn: 5 UrnMortuary: 4 # Frontier Censer: 2 # Frontier + SilverRing: 2 # Frontier + GoldRing: 2 # Frontier ClothingNeckCrucifix: 3 # Frontier ClothingOuterEVASuitChaplain: 3 # Frontier emaggedInventory: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 841b10287ea..0a3aade29cc 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -679,13 +679,11 @@ state: power_mod - type: MachineBoard prototype: SMESAdvancedEmpty + requirements: # Frontier + Capacitor: 2 # Frontier stackRequirements + # BODKIN-CLASS SALVAGE SHUTTLE + + + + + + + + [color=#a4885c]Ship Size:[/color] Medium + + [color=#a4885c]Recommended Crew:[/color] 1-3 + + [color=#a4885c]Power Gen Type:[/color] Uranium + + [color=#a4885c]Expeditions:[/color] None + + [color=#a4885c]IFF Console:[/color] None + + "The smaller sibling to the Broadhead, the SBB Bodkin is designed for rockhopping and salvage recovery." + + [italic]Brought to you by BlueBird Starship Design & Construction.[/italic] + + # GETTING THE MOST OUT OF THE BODKIN + + - The consider using the blast doors at the rear of the vessel for boarding wrecks and asteroids. This is the quickest way to get your loot into the cargo bay! + - The Bodkin comes with three hardsuits. Hire some people to work with you and make a team! + - The Bodkin comes with a withdraw-only ATM so you can sell your salvage to others who might need it, such as scientists. + diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json deleted file mode 100644 index 415e7e7d2bf..00000000000 --- a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from Paradise", "size": {"x": 32, "y": 32}, "states": [{"name": "icon"}, {"name": "equipped-FEET", "directions": 4}]} diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Misc/clothwrap.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/equipped-FEET.png rename to Resources/Textures/_NF/Clothing/Shoes/Misc/clothwrap.rsi/equipped-FEET.png diff --git a/Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Misc/clothwrap.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Shoes/Misc/clothwarp.rsi/icon.png rename to Resources/Textures/_NF/Clothing/Shoes/Misc/clothwrap.rsi/icon.png diff --git a/Resources/Textures/_NF/Clothing/Shoes/Misc/clothwrap.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Misc/clothwrap.rsi/meta.json new file mode 100644 index 00000000000..ab46230c8c2 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Shoes/Misc/clothwrap.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise", + "size": + { + "x": 32, + "y": 32 + }, + "states": + [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-hydro.png b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-hydro.png new file mode 100644 index 00000000000..1d518aa783a Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/door-decal-hydro.png differ diff --git a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json index acccdbc8c54..a61ec3ec80f 100644 --- a/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/meta.json @@ -61,6 +61,9 @@ { "name": "door-decal-eva-02" }, + { + "name": "door-decal-hydro" + }, { "name": "door-decal-med-01" }, @@ -92,4 +95,4 @@ "name": "door-decal-null" } ] -} \ No newline at end of file +} diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index 3b8158b7c7a..69330251229 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -584,3 +584,9 @@ binds: type: State key: MouseRight canFocus: true +# region Frontier +- function: SwapHandsPrevious + type: State + key: X + mod1: Shift +# endregion Frontier