diff --git a/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs b/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs index 6725d0cc82..9df18283d3 100644 --- a/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs +++ b/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using JetBrains.Annotations; using Robust.Client.UserInterface; diff --git a/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs b/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs index 9dd352e2cb..77e1f65f3b 100644 --- a/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs +++ b/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs @@ -1,4 +1,4 @@ -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; using Robust.Client.UserInterface; diff --git a/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs b/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs index 00f7080119..b5cebc1f54 100644 --- a/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs +++ b/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs @@ -1,4 +1,4 @@ -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; diff --git a/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs b/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs index b05f45d2a0..ad11b611dd 100644 --- a/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs +++ b/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo.Prototype; using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index 7f0dce2104..3dd4995371 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -1,5 +1,3 @@ -using System.Linq; -using Content.Server._CP14.Shuttles; using Content.Server.Access.Systems; using Content.Server.DetailExaminable; using Content.Server.Humanoid; @@ -42,7 +40,6 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem [Dependency] private readonly SharedAccessSystem _accessSystem = default!; [Dependency] private readonly ActorSystem _actors = default!; [Dependency] private readonly ArrivalsSystem _arrivalsSystem = default!; - [Dependency] private readonly CP14ExpeditionSystem _CP14expedition = default!; [Dependency] private readonly IdCardSystem _cardSystem = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!; [Dependency] private readonly ContainerSpawnPointSystem _containerSpawnPointSystem = default!; diff --git a/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs b/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs index 60df0233ca..a759a1b493 100644 --- a/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs +++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs @@ -1,8 +1,8 @@ using System.Numerics; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; -using Content.Shared._CP14.TravelingStoreShip; -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo; +using Content.Shared._CP14.Cargo.Prototype; using Robust.Shared.Map; using Robust.Shared.Random; diff --git a/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs b/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs index 49bd2fc956..3afb297936 100644 --- a/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs +++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs @@ -1,5 +1,5 @@ using System.Text; -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Content.Shared.UserInterface; namespace Content.Server._CP14.Cargo; diff --git a/Content.Server/_CP14/Cargo/CP14CargoSystem.cs b/Content.Server/_CP14/Cargo/CP14CargoSystem.cs index 83fa2f3a25..341c0fdd84 100644 --- a/Content.Server/_CP14/Cargo/CP14CargoSystem.cs +++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.cs @@ -3,8 +3,8 @@ using Content.Server.Shuttles.Systems; using Content.Server.Station.Events; using Content.Server.Station.Systems; using Content.Shared._CP14.Currency; -using Content.Shared._CP14.TravelingStoreShip; -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo; +using Content.Shared._CP14.Cargo.Prototype; using Content.Shared.Maps; using Content.Shared.Paper; using Content.Shared.Physics; diff --git a/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs b/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs index 70d3ebb56d..e4ed6abfa3 100644 --- a/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs +++ b/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs @@ -1,6 +1,6 @@ using Content.Server._CP14.Objectives.Components; using Content.Server.Objectives.Components.Targets; -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Content.Shared.Objectives.Components; using Content.Shared.Objectives.Systems; using Content.Shared.Stacks; diff --git a/Content.Server/_CP14/Shuttles/CP14ExpeditionSystem.cs b/Content.Server/_CP14/Shuttles/CP14ExpeditionSystem.cs deleted file mode 100644 index 2b4172dfca..0000000000 --- a/Content.Server/_CP14/Shuttles/CP14ExpeditionSystem.cs +++ /dev/null @@ -1,155 +0,0 @@ -using Content.Server._CP14.Shuttles.Components; -using Content.Server.Shuttles.Components; -using Content.Server.Shuttles.Events; -using Content.Server.Shuttles.Systems; -using Content.Server.Spawners.Components; -using Content.Server.Spawners.EntitySystems; -using Content.Server.Station.Events; -using Content.Server.Station.Systems; -using Content.Shared.CCVar; -using Content.Shared.Movement.Components; -using Robust.Server.GameObjects; -using Robust.Shared.Configuration; -using Robust.Shared.Map; -using Robust.Shared.Random; - -namespace Content.Server._CP14.Shuttles; - -public sealed class CP14ExpeditionSystem : EntitySystem -{ - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly ShuttleSystem _shuttles = default!; - [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; - - /// - /// Flags if all players must arrive via the Arrivals system, or if they can spawn in other ways. - /// - public float ArrivalTime { get; private set; } - - /// - /// If enabled then spawns players on an expedition ship. - /// - public bool Enabled { get; private set; } - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnPostInitSetupExpeditionShip); - - SubscribeLocalEvent(OnExpeditionShipLanded); - - SubscribeLocalEvent(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem) }); - - ArrivalTime = _cfgManager.GetCVar(CCVars.CP14ExpeditionArrivalTime); - Enabled = _cfgManager.GetCVar(CCVars.CP14ExpeditionShip); - - _cfgManager.OnValueChanged(CCVars.CP14ExpeditionArrivalTime, time => ArrivalTime = time, true); - _cfgManager.OnValueChanged(CCVars.CP14ExpeditionShip, value => Enabled = value, true); - } - - private void OnPostInitSetupExpeditionShip(Entity station, ref StationPostInitEvent args) - { - if (!Enabled) - return; - - if (!Deleted(station.Comp.Shuttle)) - return; - - var dummyMap = _mapManager.CreateMap(); - - if (_loader.TryLoad(dummyMap, station.Comp.ShuttlePath.ToString(), out var shuttleUids)) - { - var shuttle = shuttleUids[0]; - station.Comp.Shuttle = shuttle; - var shuttleComp = Comp(station.Comp.Shuttle); - var expeditionShipComp = EnsureComp(station.Comp.Shuttle); - expeditionShipComp.Station = station; - - var targetPoints = new List(); - var targetEnumerator = EntityQueryEnumerator(); - while (targetEnumerator.MoveNext(out var uid, out _, out _)) - { - targetPoints.Add(uid); - } - var target = _random.Pick(targetPoints); - if (!HasComp(shuttle)) - return; - - var targetPos = _transform.GetWorldPosition(target); - var mapUid = _transform.GetMap(target); - if (mapUid == null) - return; - - _shuttles.FTLToCoordinates(shuttle, shuttleComp, new EntityCoordinates(mapUid.Value, targetPos), Angle.Zero, hyperspaceTime: ArrivalTime, startupTime: 0.5f); - } - } - - private void OnExpeditionShipLanded(Entity ent, ref FTLCompletedEvent args) - { - //Some announsement logic? - } - - public bool TryGetExpeditionShip(out EntityUid? uid) - { - uid = null; - var arrivalsQuery = EntityQueryEnumerator(); - - while (arrivalsQuery.MoveNext(out var tempUid, out _)) - { - uid = tempUid; - return true; - } - - return false; - } - - public void HandlePlayerSpawning(PlayerSpawningEvent ev) - { - if (!Enabled) - return; - - if (ev.SpawnResult != null) - return; - - if (!HasComp(ev.Station)) - return; - - TryGetExpeditionShip(out var ship); - - if (!TryComp(ship, out TransformComponent? shipXform)) - return; - - var gridUid = shipXform.GridUid; - - var points = EntityQueryEnumerator(); - var possiblePositions = new List(); - while (points.MoveNext(out var uid, out var spawnPoint, out var xform)) - { - if (ev.Job != null && spawnPoint.Job != ev.Job.Value) - continue; - - if (xform.GridUid != gridUid) - continue; - - possiblePositions.Add(xform.Coordinates); - } - - if (possiblePositions.Count <= 0) - return; - - var spawnLoc = _random.Pick(possiblePositions); - ev.SpawnResult = _stationSpawning.SpawnPlayerMob( - spawnLoc, - ev.Job, - ev.HumanoidCharacterProfile, - ev.Station); - - EnsureComp(ev.SpawnResult.Value); - EnsureComp(ev.SpawnResult.Value); - } -} diff --git a/Content.Server/_CP14/Shuttles/Components/CP14ExpeditionShipComponent.cs b/Content.Server/_CP14/Shuttles/Components/CP14ExpeditionShipComponent.cs deleted file mode 100644 index 322818cd7e..0000000000 --- a/Content.Server/_CP14/Shuttles/Components/CP14ExpeditionShipComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Content.Server._CP14.Shuttles.Components; - -[RegisterComponent, Access(typeof(CP14ExpeditionSystem)), AutoGenerateComponentPause] -public sealed partial class CP14ExpeditionShipComponent : Component -{ - [DataField] - public EntityUid Station; -} - diff --git a/Content.Server/_CP14/Shuttles/Components/CP14ExpeditionShipFTLTargetComponent.cs b/Content.Server/_CP14/Shuttles/Components/CP14ExpeditionShipFTLTargetComponent.cs deleted file mode 100644 index 22e30b757a..0000000000 --- a/Content.Server/_CP14/Shuttles/Components/CP14ExpeditionShipFTLTargetComponent.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Content.Server._CP14.Shuttles.Components; - -/// -/// One of the possible points where an elemental ship might land at the start of a round -/// -[RegisterComponent, Access(typeof(CP14ExpeditionSystem))] -public sealed partial class CP14ExpeditionShipFTLTargetComponent : Component -{ -} diff --git a/Content.Server/_CP14/Shuttles/Components/CP14StationExpeditionTargetComponent.cs b/Content.Server/_CP14/Shuttles/Components/CP14StationExpeditionTargetComponent.cs deleted file mode 100644 index c377231c8f..0000000000 --- a/Content.Server/_CP14/Shuttles/Components/CP14StationExpeditionTargetComponent.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Robust.Shared.Utility; - -namespace Content.Server._CP14.Shuttles.Components; - -/// -/// Added to a station to start the round with an elemental ship arriving on this map -/// -[RegisterComponent, Access(typeof(CP14ExpeditionSystem))] -public sealed partial class CP14StationExpeditionTargetComponent : Component -{ - [DataField] - public EntityUid Shuttle; - - [DataField] public ResPath ShuttlePath = new("/Maps/Shuttles/arrivals.yml"); -} diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index f75ea5c43e..2543c04f27 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -10,19 +10,6 @@ namespace Content.Shared.CCVar [CVarDefs] public sealed class CCVars : CVars { - #region CP14 - /// - /// how long does it take to fly an expedition ship to an expedition point? - /// - public static readonly CVarDef CP14ExpeditionArrivalTime = - CVarDef.Create("cp14.arrival_time", 180f, CVar.SERVERONLY); - - /// - /// is the expedition ship's system enabled? - /// - public static readonly CVarDef CP14ExpeditionShip = - CVarDef.Create("cp14.arrivals_ship", true, CVar.SERVERONLY); - #endregion /* * Server */ diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoMoneyBoxComponent.cs b/Content.Shared/_CP14/Cargo/CP14CargoMoneyBoxComponent.cs similarity index 81% rename from Content.Shared/_CP14/TravelingStoreShip/CP14CargoMoneyBoxComponent.cs rename to Content.Shared/_CP14/Cargo/CP14CargoMoneyBoxComponent.cs index 1fa6473692..a793f28730 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoMoneyBoxComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14CargoMoneyBoxComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// marks an entity into which trade with the city will put money when selling, or take it when buying. diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoStoreComponent.cs b/Content.Shared/_CP14/Cargo/CP14CargoStoreComponent.cs similarity index 84% rename from Content.Shared/_CP14/TravelingStoreShip/CP14CargoStoreComponent.cs rename to Content.Shared/_CP14/Cargo/CP14CargoStoreComponent.cs index 07bf641536..4a31906485 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoStoreComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14CargoStoreComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// Allows users to view information on city trading opportunities diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14SellingPalettComponent.cs b/Content.Shared/_CP14/Cargo/CP14SellingPalettComponent.cs similarity index 78% rename from Content.Shared/_CP14/TravelingStoreShip/CP14SellingPalettComponent.cs rename to Content.Shared/_CP14/Cargo/CP14SellingPalettComponent.cs index 89692e4c47..97f106298f 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14SellingPalettComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14SellingPalettComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; [RegisterComponent] public sealed partial class CP14SellingPalettComponent : Component diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14SharedCargoSystem.cs b/Content.Shared/_CP14/Cargo/CP14SharedCargoSystem.cs similarity index 89% rename from Content.Shared/_CP14/TravelingStoreShip/CP14SharedCargoSystem.cs rename to Content.Shared/_CP14/Cargo/CP14SharedCargoSystem.cs index 4a04188993..6243f76ed9 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14SharedCargoSystem.cs +++ b/Content.Shared/_CP14/Cargo/CP14SharedCargoSystem.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; public class CP14SharedCargoSystem : EntitySystem { diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs b/Content.Shared/_CP14/Cargo/CP14StationTravelingStoreShipTargetComponent.cs similarity index 92% rename from Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs rename to Content.Shared/_CP14/Cargo/CP14StationTravelingStoreShipTargetComponent.cs index 66a24d9f90..62e30eb775 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14StationTravelingStoreShipTargetComponent.cs @@ -1,9 +1,9 @@ -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo.Prototype; using Content.Shared.Destructible.Thresholds; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// Add to the station so that traveling store ship starts running on it diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14StoreUI.cs b/Content.Shared/_CP14/Cargo/CP14StoreUI.cs similarity index 97% rename from Content.Shared/_CP14/TravelingStoreShip/CP14StoreUI.cs rename to Content.Shared/_CP14/Cargo/CP14StoreUI.cs index c9081e98d9..cac6bf0cf5 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14StoreUI.cs +++ b/Content.Shared/_CP14/Cargo/CP14StoreUI.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; [Serializable, NetSerializable] public enum CP14StoreUiKey diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs b/Content.Shared/_CP14/Cargo/Prototype/BuyServices/CP14BuyItemsService.cs similarity index 93% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs rename to Content.Shared/_CP14/Cargo/Prototype/BuyServices/CP14BuyItemsService.cs index ea3b12eded..4edff18cb9 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/BuyServices/CP14BuyItemsService.cs @@ -1,7 +1,7 @@ using System.Text; using Robust.Shared.Prototypes; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype.BuyServices; +namespace Content.Shared._CP14.Cargo.Prototype.BuyServices; public sealed partial class CP14BuyItemsService : CP14StoreBuyService { diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs similarity index 96% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs rename to Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs index f34a006d5e..163a5d64b8 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype; +namespace Content.Shared._CP14.Cargo.Prototype; /// /// Stores the price and product/service pair that players can buy. diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreSellPositionPrototype.cs b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs similarity index 96% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreSellPositionPrototype.cs rename to Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs index aa5afda5bc..0b1d736f94 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreSellPositionPrototype.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// Stores the price and product/service pair that players can buy. diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellStackService.cs b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellStackService.cs similarity index 95% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellStackService.cs rename to Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellStackService.cs index 766b8714ad..79dc0dfed3 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellStackService.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellStackService.cs @@ -1,7 +1,7 @@ using Content.Shared.Stacks; using Robust.Shared.Prototypes; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype.SellServices; +namespace Content.Shared._CP14.Cargo.Prototype.SellServices; public sealed partial class CP14SellStackService : CP14StoreSellService { diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellWhitelistService.cs b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellWhitelistService.cs similarity index 94% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellWhitelistService.cs rename to Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellWhitelistService.cs index 6305f22256..0277f438a8 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellWhitelistService.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellWhitelistService.cs @@ -1,7 +1,7 @@ using Content.Shared.Whitelist; using Robust.Shared.Prototypes; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype.SellServices; +namespace Content.Shared._CP14.Cargo.Prototype.SellServices; public sealed partial class CP14SellWhitelistService : CP14StoreSellService { diff --git a/Resources/ConfigPresets/Build/debug.toml b/Resources/ConfigPresets/Build/debug.toml index ed8d37e545..3994c59c78 100644 --- a/Resources/ConfigPresets/Build/debug.toml +++ b/Resources/ConfigPresets/Build/debug.toml @@ -1,7 +1,4 @@ -[cp14] -arrivals_ship = false - -[events] +[events] # Annoying enabled = false diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml index 84fb44feb4..91be66c481 100644 --- a/Resources/ConfigPresets/Build/development.toml +++ b/Resources/ConfigPresets/Build/development.toml @@ -1,7 +1,4 @@ -[cp14] -arrivals_ship = false - -[game] +[game] # Straight in-game baby lobbyenabled = false # Dev map for faster loading & convenience diff --git a/Resources/Maps/_CP14/tavern.yml b/Resources/Maps/_CP14/tavern.yml index 98b93b561b..a9ba5340c0 100644 --- a/Resources/Maps/_CP14/tavern.yml +++ b/Resources/Maps/_CP14/tavern.yml @@ -77672,13 +77672,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: CP14ExpeditionShipTargetPoint - entities: - - uid: 8 - components: - - type: Transform - pos: -0.5,0.5 - parent: 1 - proto: CP14FenceIronGrilleCorner entities: - uid: 5386 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml index 336b31a362..9e4a4d1016 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml @@ -60,6 +60,10 @@ - type: Clothing sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi - type: SolutionScanner + - type: GuideHelp + guides: + - CP14_RU_Alchemy + - CP14_EN_Alchemy - type: entity parent: CP14ClothingEyesBase @@ -72,6 +76,10 @@ - type: Clothing sprite: _CP14/Clothing/Eyes/alchemy_monocle.rsi - type: SolutionScanner + - type: GuideHelp + guides: + - CP14_RU_Alchemy + - CP14_EN_Alchemy - type: entity parent: CP14ClothingEyesBase diff --git a/Resources/Prototypes/_CP14/Entities/Markers/misc.yml b/Resources/Prototypes/_CP14/Entities/Markers/misc.yml index dd0f7b8a84..51701eaa83 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/misc.yml @@ -1,14 +1,3 @@ -- type: entity - id: CP14ExpeditionShipTargetPoint - parent: MarkerBase - name: Expedition ship target point - description: One of the possible arrival points of a ship carrying players - categories: [ ForkFiltered ] - components: - - type: CP14ExpeditionShipFTLTarget - - type: Sprite - state: pink - - type: entity id: CP14BankStorageMarker parent: MarkerBase @@ -26,4 +15,4 @@ range: 2 - type: CP14StealAreaAutoJobConnect departments: - - CP14Bank \ No newline at end of file + - CP14Bank diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml index 3af4f8b6ee..ea997bdbad 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml @@ -90,6 +90,10 @@ fuckupChance: 0.05 requiredSkills: - Alchemy + - type: GuideHelp + guides: + - CP14_RU_Alchemy + - CP14_EN_Alchemy - type: entity id: CP14Mortar @@ -163,6 +167,10 @@ - type: CP14Mortar solution: mortar containerId: storagebase + - type: GuideHelp + guides: + - CP14_RU_Alchemy + - CP14_EN_Alchemy - type: entity parent: BaseItem