From 2e142536bbfea0c9f2c853512ebd4d7f9ce8ed09 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Tue, 27 May 2025 05:33:07 +0300 Subject: [PATCH] fix upstream --- .../Systems/ChameleonClothingSystem.cs | 2 +- .../Humanoid/HumanoidAppearanceSystem.cs | 52 +++++++++---------- Content.Client/Mech/MechSystem.cs | 6 +-- .../Ui/AnalysisConsoleMenu.xaml.cs | 2 +- .../SponsorTiers/SponsorTierEntry.xaml.cs | 3 +- Content.Server/Bed/BedSystem.cs | 29 +---------- .../Components/CargoPalletConsoleComponent.cs | 19 ++++++- .../Cargo/Systems/CargoSystem.Funds.cs | 4 +- .../Cargo/Systems/CargoSystem.Orders.cs | 29 +++++++---- .../Cargo/Systems/CargoSystem.Shuttle.cs | 2 +- Content.Server/Changeling/ChangelingSystem.cs | 1 + .../Fluids/EntitySystems/AbsorbentSystem.cs | 2 +- .../Cleaning/FoorprintAreaCleaningSystem.cs | 2 +- .../DontSellingGrid/DontSellingGridSystems.cs | 1 + .../_Sunrise/Fugitive/FugitiveSystem.cs | 2 +- .../HealthChangeReagentsJsonGenerator.cs | 2 +- .../MealsRecipesJsonGenerator.cs | 2 +- .../PlanetPrison/PlanetPrisonSystem.cs | 2 +- Content.Server/_Sunrise/Soil/SoilSystem.cs | 3 +- Content.Shared/Bed/SharedBedSystem.cs | 31 ++++++++--- .../SharedChameleonClothingSystem.cs | 6 +-- .../Bed}/CanSleepOnBuckleComponent.cs | 2 +- .../_Sunrise/BloodCult}/DeconvertCultist.cs | 17 +++--- .../_Sunrise/Disease/CureDiseaseInfection.cs | 8 +-- .../Systems/NightVisionDeviceSystem.cs | 1 - .../FleshCult/CauseFleshCultInfection.cs | 2 +- .../FleshCult/PendingFleshCultistComponent.cs | 0 .../objects/specific/medical/chemistry.ftl | 17 ------ .../weapons/guns/launchers/syringe_guns.ftl | 18 ------- .../_prototypes/_sunrise/reagents/fun.ftl | 4 +- .../clothing/outerclothing/hardsuits.ftl | 2 - .../objects/specific/medical/chemistry.ftl | 18 +------ .../weapons/guns/launchers/syringe_guns.ftl | 18 ------- .../_prototypes/_sunrise/reagents/fun.ftl | 2 + .../clothing/outerclothing/hardsuits.ftl | 2 - .../Maps/_Sunrise/Shuttles/pirate_medium.yml | 7 --- Resources/Maps/_Sunrise/Station/bagel.yml | 7 --- Resources/Maps/_Sunrise/Station/box.yml | 24 --------- Resources/Maps/_Sunrise/Station/convex.yml | 7 --- Resources/Maps/_Sunrise/Station/delta.yml | 36 +------------ Resources/Maps/_Sunrise/Station/loop.yml | 24 --------- Resources/Maps/_Sunrise/Station/meta.yml | 7 --- Resources/Maps/_Sunrise/Station/plasma.yml | 7 --- Resources/Maps/_Sunrise/event/void.yml | 8 --- .../Catalog/Fills/Lockers/security.yml | 8 --- .../VendingMachines/Inventories/medical.yml | 1 - .../VendingMachines/Inventories/wallmed.yml | 2 - .../Entities/Clothing/Head/helmets.yml | 1 - .../Entities/Objects/Specific/chemistry.yml | 4 -- .../Weapons/Guns/Shotguns/shotguns.yml | 6 +-- Resources/Prototypes/Tiles/floors.yml | 6 --- .../Clothing/OuterClothing/hardsuits.yml | 4 +- .../Entities/Markers/Spawners/mobs.yml | 14 ----- .../Entities/Mobs/Player/ghost_roles.yml | 1 - .../Objects/Weapons/Guns/HMGs/hmgs.yml | 1 + .../_Sunrise/Recipes/Lathes/Packs/medical.yml | 6 --- Resources/Prototypes/typing_indicator.yml | 2 + 57 files changed, 140 insertions(+), 356 deletions(-) rename {Content.Server/Bed/Components => Content.Shared/_Sunrise/Bed}/CanSleepOnBuckleComponent.cs (81%) rename {Content.Server/_Sunrise/BloodCult/HolyWater => Content.Shared/_Sunrise/BloodCult}/DeconvertCultist.cs (81%) rename {Content.Server => Content.Shared}/_Sunrise/Disease/CureDiseaseInfection.cs (93%) rename {Content.Server => Content.Shared}/_Sunrise/FleshCult/CauseFleshCultInfection.cs (93%) rename {Content.Server => Content.Shared}/_Sunrise/FleshCult/PendingFleshCultistComponent.cs (100%) delete mode 100644 Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl delete mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl diff --git a/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs index 9989096cf5..586d426a29 100644 --- a/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs +++ b/Content.Client/Clothing/Systems/ChameleonClothingSystem.cs @@ -53,7 +53,7 @@ public sealed class ChameleonClothingSystem : SharedChameleonClothingSystem } // Sunrise-start if (!TryComp(uid, out ToggleableClothingComponent? helmet) - || !proto.TryGetComponent(out ToggleableClothingComponent? protoHelmet, _factory)) + || !proto.TryGetComponent(out ToggleableClothingComponent? protoHelmet, Factory)) return; if (!_proto.TryIndex(protoHelmet.ClothingPrototype.Id, out var prototypeHelmetOther)) diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs index 01b5986ef7..f995cc9a9c 100644 --- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs +++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs @@ -313,33 +313,33 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem } } - private void AddUndergarments(Entity entity, bool undergarmentTop, bool undergarmentBottom) - { - var humanoid = entity.Comp1; + // private void AddUndergarments(Entity entity, bool undergarmentTop, bool undergarmentBottom) + // { + // var humanoid = entity.Comp1; + // + // if (undergarmentTop && humanoid.UndergarmentTop != null) + // { + // var marking = new Marking(humanoid.UndergarmentTop, new List { new Color() }); + // if (_markingManager.TryGetMarking(marking, out var prototype)) + // { + // // Markings are added to ClientOldMarkings because otherwise it causes issues when toggling the feature on/off. + // humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentTop, new List { marking }); + // ApplyMarking(prototype, null, true, entity); + // } + // } + // + // if (undergarmentBottom && humanoid.UndergarmentBottom != null) + // { + // var marking = new Marking(humanoid.UndergarmentBottom, new List { new Color() }); + // if (_markingManager.TryGetMarking(marking, out var prototype)) + // { + // humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentBottom, new List { marking }); + // ApplyMarking(prototype, null, true, entity); + // } + // } + // } - if (undergarmentTop && humanoid.UndergarmentTop != null) - { - var marking = new Marking(humanoid.UndergarmentTop, new List { new Color() }); - if (_markingManager.TryGetMarking(marking, out var prototype)) - { - // Markings are added to ClientOldMarkings because otherwise it causes issues when toggling the feature on/off. - humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentTop, new List { marking }); - ApplyMarking(prototype, null, true, entity); - } - } - - if (undergarmentBottom && humanoid.UndergarmentBottom != null) - { - var marking = new Marking(humanoid.UndergarmentBottom, new List { new Color() }); - if (_markingManager.TryGetMarking(marking, out var prototype)) - { - humanoid.ClientOldMarkings.Markings.Add(MarkingCategories.UndergarmentBottom, new List { marking }); - ApplyMarking(prototype, null, true, entity); - } - } - } - - private void ApplyMarking(MarkingPrototype markingPrototype, + public void ApplyMarking(MarkingPrototype markingPrototype, // Sunrise-Edit IReadOnlyList? colors, bool visible, Entity entity) diff --git a/Content.Client/Mech/MechSystem.cs b/Content.Client/Mech/MechSystem.cs index 69f3779ae2..ef41768c1b 100644 --- a/Content.Client/Mech/MechSystem.cs +++ b/Content.Client/Mech/MechSystem.cs @@ -40,7 +40,7 @@ public sealed class MechSystem : SharedMechSystem private void UpdateAppearance(EntityUid uid, MechComponent component, SpriteComponent sprite) { - if (!_sprite.LayerExists((uid, args.Sprite), MechVisualLayers.Base)) + if (!_sprite.LayerExists((uid, sprite), MechVisualLayers.Base)) return; var state = component.BaseState; @@ -61,7 +61,7 @@ public sealed class MechSystem : SharedMechSystem drawDepth = DrawDepth.SmallMobs; } - _sprite.LayerSetRsiState((uid, args.Sprite), MechVisualLayers.Base, state); - _sprite.SetDrawDepth((uid, args.Sprite), (int)drawDepth); + _sprite.LayerSetRsiState((uid, sprite), MechVisualLayers.Base, state); + _sprite.SetDrawDepth((uid, sprite), (int)drawDepth); } } diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs index 0a0885a3a2..97f7ecc7b7 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs @@ -204,7 +204,7 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow EffectValueLabel.SetMarkup(Loc.GetString("analysis-console-info-effect-value", ("state", hasInfo), - ("info", _ent.GetComponentOrNull(node.Value)?.EntityDescription ?? string.Empty))); + ("info", Loc.GetString("artifact-effect-hint-data-deleted")))); // _ent.GetComponentOrNull(node.Value)?.EntityDescription ?? string.Empty var predecessorNodes = _xenoArtifact.GetPredecessorNodes(artifact.Value.Owner, node.Value); if (!hasInfo) diff --git a/Content.Client/_Sunrise/SponsorTiers/SponsorTierEntry.xaml.cs b/Content.Client/_Sunrise/SponsorTiers/SponsorTierEntry.xaml.cs index 7672e6b2c3..a5309a5f75 100644 --- a/Content.Client/_Sunrise/SponsorTiers/SponsorTierEntry.xaml.cs +++ b/Content.Client/_Sunrise/SponsorTiers/SponsorTierEntry.xaml.cs @@ -337,7 +337,8 @@ public sealed partial class SponsorTierEntry : Control Scale = new Vector2(4, 4), }; - _entityManager.System().ApplyMarking(markingProto, null, true, humanoidAppearance, spriteComponent); + _entityManager.System().ApplyMarking(markingProto, null, true, + (dummyEnt, humanoidAppearance, spriteComponent)); view.SetEntity(dummyEnt); _spriteViews.Add(view); diff --git a/Content.Server/Bed/BedSystem.cs b/Content.Server/Bed/BedSystem.cs index feefe799bd..107842d547 100644 --- a/Content.Server/Bed/BedSystem.cs +++ b/Content.Server/Bed/BedSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Bed.Components; using Content.Server.Body.Systems; -using Content.Shared.Actions; +using Content.Server.Power.EntitySystems; using Content.Shared.Bed; using Content.Shared.Bed.Components; using Content.Shared.Bed.Sleep; @@ -10,7 +10,6 @@ using Content.Shared.Damage; using Content.Shared.Emag.Systems; using Content.Shared.Mobs.Systems; using Content.Shared.Power; -using Robust.Shared.Timing; namespace Content.Server.Bed { @@ -20,8 +19,6 @@ namespace Content.Server.Bed [Dependency] private readonly EmagSystem _emag = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; private EntityQuery _sleepingQuery; @@ -31,36 +28,12 @@ namespace Content.Server.Bed _sleepingQuery = GetEntityQuery(); - // Sunrise-Start - SubscribeLocalEvent(OnUnstrapped); - SubscribeLocalEvent(OnStrapped); - // Sunrise-End - SubscribeLocalEvent(OnStasisStrapped); SubscribeLocalEvent(OnStasisUnstrapped); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnEmagged); } - // Sunrise-Start - private void OnStrapped(Entity bed, ref StrappedEvent args) - { - var canSleep = EnsureComp(args.Buckle); - _actionsSystem.AddAction(args.Buckle.Owner, ref canSleep.SleepAction, SleepingSystem.SleepActionId, args.Buckle.Owner); - } - - private void OnUnstrapped(Entity bed, ref UnstrappedEvent args) - { - if (!TryComp(args.Buckle.Owner, out var canSleep)) - return; - - RemComp(args.Buckle.Owner); - _actionsSystem.RemoveAction(args.Buckle.Owner, canSleep.SleepAction); - if (canSleep.SleepAction != null) - _actionContainer.RemoveAction(canSleep.SleepAction.Value); - } - // Sunrise-End - public override void Update(float frameTime) { base.Update(frameTime); diff --git a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs index 4002a39a73..46a3b7864d 100644 --- a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs @@ -1,12 +1,27 @@ using Content.Server.Cargo.Systems; +using Content.Shared.Cargo; using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; namespace Content.Server.Cargo.Components; -[RegisterComponent] -[Access(typeof(CargoSystem))] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause] +[Access(typeof(SharedCargoSystem))] public sealed partial class CargoPalletConsoleComponent : Component { [DataField] public SoundSpecifier ErrorSound = new SoundCollectionSpecifier("CargoError"); + + /// + /// The time at which the console will be able to play the deny sound. + /// + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField] + public TimeSpan NextDenySoundTime = TimeSpan.Zero; + + /// + /// The time between playing the deny sound. + /// + [DataField] + public TimeSpan DenySoundDelay = TimeSpan.FromSeconds(2); } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Funds.cs b/Content.Server/Cargo/Systems/CargoSystem.Funds.cs index 665e449e09..4a3fa5330e 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Funds.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Funds.cs @@ -41,7 +41,7 @@ public sealed partial class CargoSystem if (!_accessReaderSystem.IsAllowed(args.Actor, ent)) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-order-not-allowed")); - PlayDenySound(ent, ent.Comp.ErrorSound); + PlayDenySound(ent, ent.Comp); return; } @@ -93,7 +93,7 @@ public sealed partial class CargoSystem if (!_accessReaderSystem.FindAccessTags(args.Actor).Intersect(ent.Comp.RemoveLimitAccess).Any()) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-order-not-allowed")); - PlayDenySound(ent, ent.Comp.ErrorSound); + PlayDenySound(ent, ent.Comp); return; } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index 2c19107216..8a665f3321 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -150,7 +150,7 @@ namespace Content.Server.Cargo.Systems if (!_accessReaderSystem.IsAllowed(player, uid)) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-order-not-allowed")); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } @@ -162,7 +162,7 @@ namespace Content.Server.Cargo.Systems !TryGetOrderDatabase(station, out var orderDatabase)) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-station-not-found")); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } @@ -177,7 +177,7 @@ namespace Content.Server.Cargo.Systems if (!_protoMan.HasIndex(order.ProductId)) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-invalid-product")); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } @@ -188,7 +188,7 @@ namespace Content.Server.Cargo.Systems if (amount >= capacity) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-too-many")); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } @@ -199,7 +199,7 @@ namespace Content.Server.Cargo.Systems { order.OrderQuantity = cappedAmount; ConsolePopup(args.Actor, Loc.GetString("cargo-console-snip-snip")); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); } var cost = order.Price * order.OrderQuantity; @@ -209,7 +209,7 @@ namespace Content.Server.Cargo.Systems if (cost > accountBalance) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-insufficient-funds", ("cost", cost))); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } @@ -224,7 +224,7 @@ namespace Content.Server.Cargo.Systems if (ev.FulfillmentEntity == null) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-unfulfilled")); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } } @@ -386,7 +386,7 @@ namespace Content.Server.Cargo.Systems if (!TryAddOrder(stationUid.Value, component.Account, data, orderDatabase)) { - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } @@ -433,12 +433,21 @@ namespace Content.Server.Cargo.Systems _popup.PopupCursor(text, actor); } - private void PlayDenySound(EntityUid uid, SoundSpecifier errorSound) // Sunrise-Edit + private void PlayDenySound(EntityUid uid, CargoOrderConsoleComponent component) { if (_timing.CurTime >= component.NextDenySoundTime) { component.NextDenySoundTime = _timing.CurTime + component.DenySoundDelay; - _audio.PlayPvs(_audio.ResolveSound(errorSound), uid); + _audio.PlayPvs(_audio.ResolveSound(component.ErrorSound), uid); + } + } + + private void PlayDenySound(EntityUid uid, CargoPalletConsoleComponent component) + { + if (_timing.CurTime >= component.NextDenySoundTime) + { + component.NextDenySoundTime = _timing.CurTime + component.DenySoundDelay; + _audio.PlayPvs(_audio.ResolveSound(component.ErrorSound), uid); } } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index fcfc7582d4..b1daea685d 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -219,7 +219,7 @@ public sealed partial class CargoSystem if (!_accessReaderSystem.IsAllowed(player, uid)) { ConsolePopup(args.Actor, Loc.GetString("cargo-console-order-not-allowed")); - PlayDenySound(uid, component.ErrorSound); + PlayDenySound(uid, component); return; } // Sunrise-End diff --git a/Content.Server/Changeling/ChangelingSystem.cs b/Content.Server/Changeling/ChangelingSystem.cs index 03bcc888c7..546e55a97b 100644 --- a/Content.Server/Changeling/ChangelingSystem.cs +++ b/Content.Server/Changeling/ChangelingSystem.cs @@ -55,6 +55,7 @@ using Content.Shared.Mobs.Components; using Content.Server.Stunnable; using Content.Shared.Jittering; using System.Linq; +using Content.Server.Damage.Systems; using Content.Shared._RMC14.Xenonids.Screech; using Content.Shared.Forensics.Components; using Content.Shared.Radio; diff --git a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs index 9673c0c3f7..8e10367bb8 100644 --- a/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs +++ b/Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs @@ -136,7 +136,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem if (footPrints.Count > 0) { - if (!_solutionContainerSystem.TryGetSolution(args.Used, AbsorbentComponent.SolutionName, out var absorberSoln)) + if (!_solutionContainerSystem.TryGetSolution(args.Used, component.SolutionName, out var absorberSoln)) return; var tileCenterPos = _mapSystem.GridTileToLocal(gridUid.Value, grid, tileRef.GridIndices); diff --git a/Content.Server/_Sunrise/Cleaning/FoorprintAreaCleaningSystem.cs b/Content.Server/_Sunrise/Cleaning/FoorprintAreaCleaningSystem.cs index 04d70b0723..1f5fb69d04 100644 --- a/Content.Server/_Sunrise/Cleaning/FoorprintAreaCleaningSystem.cs +++ b/Content.Server/_Sunrise/Cleaning/FoorprintAreaCleaningSystem.cs @@ -67,7 +67,7 @@ public sealed class FoorprintAreaCleaningSystem : EntitySystem if (footPrints.Count > 0) { - if (!_solutionContainerSystem.TryGetSolution(uid, AbsorbentComponent.SolutionName, out var absorberSoln)) + if (!_solutionContainerSystem.TryGetSolution(uid, absorbent.SolutionName, out var absorberSoln)) return; var tileCenterPos = _mapSystem.GridTileToLocal(gridUid, grid, tileRef.GridIndices); diff --git a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs index 7ea843dd57..84252b80ac 100644 --- a/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs +++ b/Content.Server/_Sunrise/DontSellingGrid/DontSellingGridSystems.cs @@ -2,6 +2,7 @@ using Content.Server.Cargo.Components; using Content.Server.Cargo.Systems; using Content.Server.Station.Events; using Content.Shared._Sunrise.Economy; +using Content.Shared.Cargo; using Content.Shared.GameTicking; using Robust.Shared.Containers; diff --git a/Content.Server/_Sunrise/Fugitive/FugitiveSystem.cs b/Content.Server/_Sunrise/Fugitive/FugitiveSystem.cs index a5273dcf6f..4da4132387 100644 --- a/Content.Server/_Sunrise/Fugitive/FugitiveSystem.cs +++ b/Content.Server/_Sunrise/Fugitive/FugitiveSystem.cs @@ -135,7 +135,7 @@ namespace Content.Server._Sunrise.Fugitive if (_roleSystem.MindHasRole(mindId)) { - _roleSystem.MindTryRemoveRole(mindId); + _roleSystem.MindRemoveRole(mindId); } _roleSystem.MindAddRole(mindId, MindRole); diff --git a/Content.Server/_Sunrise/GuideGenerator/HealthChangeReagentsJsonGenerator.cs b/Content.Server/_Sunrise/GuideGenerator/HealthChangeReagentsJsonGenerator.cs index 6387be3baf..2ae2c83982 100644 --- a/Content.Server/_Sunrise/GuideGenerator/HealthChangeReagentsJsonGenerator.cs +++ b/Content.Server/_Sunrise/GuideGenerator/HealthChangeReagentsJsonGenerator.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; using System.IO; using System.Linq; using System.Text.Json; -using Content.Server.EntityEffects.Effects; +using Content.Shared.EntityEffects.Effects; namespace Content.Server._Sunrise.GuideGenerator; public sealed class HealthChangeReagentsJsonGenerator diff --git a/Content.Server/_Sunrise/GuideGenerator/MealsRecipesJsonGenerator.cs b/Content.Server/_Sunrise/GuideGenerator/MealsRecipesJsonGenerator.cs index 1aad1514d8..9ae199f42b 100644 --- a/Content.Server/_Sunrise/GuideGenerator/MealsRecipesJsonGenerator.cs +++ b/Content.Server/_Sunrise/GuideGenerator/MealsRecipesJsonGenerator.cs @@ -7,7 +7,7 @@ using Content.Shared.Kitchen; using Robust.Shared.Prototypes; using Content.Shared.Construction.Prototypes; using Content.Server.Construction.Components; -using Content.Server.EntityEffects.Effects; +using Content.Shared.EntityEffects.Effects; namespace Content.Server.GuideGenerator; diff --git a/Content.Server/_Sunrise/PlanetPrison/PlanetPrisonSystem.cs b/Content.Server/_Sunrise/PlanetPrison/PlanetPrisonSystem.cs index c980e9f2f2..03976569ea 100644 --- a/Content.Server/_Sunrise/PlanetPrison/PlanetPrisonSystem.cs +++ b/Content.Server/_Sunrise/PlanetPrison/PlanetPrisonSystem.cs @@ -160,7 +160,7 @@ namespace Content.Server._Sunrise.PlanetPrison if (_roleSystem.MindHasRole(mindId)) { - _roleSystem.MindTryRemoveRole(mindId); + _roleSystem.MindRemoveRole(mindId); } _roleSystem.MindAddRole(mindId, MindRole); diff --git a/Content.Server/_Sunrise/Soil/SoilSystem.cs b/Content.Server/_Sunrise/Soil/SoilSystem.cs index a32d1d49b2..e38e615610 100644 --- a/Content.Server/_Sunrise/Soil/SoilSystem.cs +++ b/Content.Server/_Sunrise/Soil/SoilSystem.cs @@ -1,4 +1,5 @@ -using Content.Server.Movement.Systems; +using Content.Server.Damage.Systems; +using Content.Server.Movement.Systems; using Content.Server.Popups; using Content.Shared.Damage.Systems; using Content.Shared.Interaction.Events; diff --git a/Content.Shared/Bed/SharedBedSystem.cs b/Content.Shared/Bed/SharedBedSystem.cs index 903bfefc20..40992570ea 100644 --- a/Content.Shared/Bed/SharedBedSystem.cs +++ b/Content.Shared/Bed/SharedBedSystem.cs @@ -3,7 +3,6 @@ using Content.Shared.Bed.Components; using Content.Shared.Bed.Sleep; using Content.Shared.Buckle.Components; using Robust.Shared.Timing; -using Robust.Shared.Utility; namespace Content.Shared.Bed; @@ -18,11 +17,35 @@ public abstract class SharedBedSystem : EntitySystem { base.Initialize(); + // Sunrise-Start + SubscribeLocalEvent<_Sunrise.Bed.CanSleepOnBuckleComponent, UnstrappedEvent>(OnUnstrapped); + SubscribeLocalEvent<_Sunrise.Bed.CanSleepOnBuckleComponent, StrappedEvent>(OnStrapped); + // Sunrise-End + SubscribeLocalEvent(OnHealMapInit); SubscribeLocalEvent(OnStrapped); SubscribeLocalEvent(OnUnstrapped); } + // Sunrise-Start + private void OnStrapped(Entity<_Sunrise.Bed.CanSleepOnBuckleComponent> bed, ref StrappedEvent args) + { + var canSleep = EnsureComp(args.Buckle); + _actionsSystem.AddAction(args.Buckle.Owner, ref canSleep.SleepAction, SleepingSystem.SleepActionId, args.Buckle.Owner); + } + + private void OnUnstrapped(Entity<_Sunrise.Bed.CanSleepOnBuckleComponent> bed, ref UnstrappedEvent args) + { + if (!TryComp(args.Buckle.Owner, out var canSleep)) + return; + + RemComp(args.Buckle.Owner); + _actionsSystem.RemoveAction(args.Buckle.Owner, canSleep.SleepAction); + if (canSleep.SleepAction != null) + _actConts.RemoveAction(canSleep.SleepAction.Value); + } + // Sunrise-End + private void OnHealMapInit(Entity ent, ref MapInitEvent args) { _actConts.EnsureAction(ent.Owner, ref ent.Comp.SleepAction, SleepingSystem.SleepActionId); @@ -33,16 +56,10 @@ public abstract class SharedBedSystem : EntitySystem { EnsureComp(bed); bed.Comp.NextHealTime = Timing.CurTime + TimeSpan.FromSeconds(bed.Comp.HealTime); - _actionsSystem.AddAction(args.Buckle, ref bed.Comp.SleepAction, SleepingSystem.SleepActionId, bed); - Dirty(bed); - - // Single action entity, cannot strap multiple entities to the same bed. - DebugTools.AssertEqual(args.Strap.Comp.BuckledEntities.Count, 1); } private void OnUnstrapped(Entity bed, ref UnstrappedEvent args) { - _actionsSystem.RemoveAction(args.Buckle, bed.Comp.SleepAction); _sleepingSystem.TryWaking(args.Buckle.Owner); RemComp(bed); } diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs index 60c4a674e3..42136bf632 100644 --- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs @@ -110,19 +110,19 @@ public abstract class SharedChameleonClothingSystem : EntitySystem if (helmet.ClothingUid == null) return; - if (!proto.TryGetComponent(out ToggleableClothingComponent? protoHelmet, _factory)) + if (!proto.TryGetComponent(out ToggleableClothingComponent? protoHelmet, Factory)) return; if (!_proto.TryIndex(protoHelmet.ClothingPrototype.Id, out var prototypeHelmetOther)) return; if (TryComp(helmet.ClothingUid, out ClothingComponent? helmetClothing) - && prototypeHelmetOther.TryGetComponent(out ClothingComponent? otherHelmetClothing, _factory)) + && prototypeHelmetOther.TryGetComponent(out ClothingComponent? otherHelmetClothing, Factory)) { _clothingSystem.CopyVisuals(helmet.ClothingUid.Value, otherHelmetClothing, helmetClothing); } if (TryComp(helmet.ClothingUid, out AppearanceComponent? helmetApperance) - && prototypeHelmetOther.TryGetComponent(out AppearanceComponent? otherHelmetApperance, _factory)) + && prototypeHelmetOther.TryGetComponent(out AppearanceComponent? otherHelmetApperance, Factory)) { _appearance.AppendData(otherHelmetApperance, helmet.ClothingUid.Value); Dirty(uid, helmetApperance); diff --git a/Content.Server/Bed/Components/CanSleepOnBuckleComponent.cs b/Content.Shared/_Sunrise/Bed/CanSleepOnBuckleComponent.cs similarity index 81% rename from Content.Server/Bed/Components/CanSleepOnBuckleComponent.cs rename to Content.Shared/_Sunrise/Bed/CanSleepOnBuckleComponent.cs index b1877fcfeb..8bcdfc7df7 100644 --- a/Content.Server/Bed/Components/CanSleepOnBuckleComponent.cs +++ b/Content.Shared/_Sunrise/Bed/CanSleepOnBuckleComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Bed.Components +namespace Content.Shared._Sunrise.Bed { [RegisterComponent] public sealed partial class CanSleepOnBuckleComponent : Component diff --git a/Content.Server/_Sunrise/BloodCult/HolyWater/DeconvertCultist.cs b/Content.Shared/_Sunrise/BloodCult/DeconvertCultist.cs similarity index 81% rename from Content.Server/_Sunrise/BloodCult/HolyWater/DeconvertCultist.cs rename to Content.Shared/_Sunrise/BloodCult/DeconvertCultist.cs index a2bd21f43f..9230dd2387 100644 --- a/Content.Server/_Sunrise/BloodCult/HolyWater/DeconvertCultist.cs +++ b/Content.Shared/_Sunrise/BloodCult/DeconvertCultist.cs @@ -1,15 +1,16 @@ using System.Threading; -using Content.Server.Popups; -using Content.Server.Stunnable; using Content.Shared._Sunrise.BloodCult.Components; +using Content.Shared._Sunrise.BloodCult.Pentagram; using Content.Shared.EntityEffects; using Content.Shared.IdentityManagement; +using Content.Shared.Popups; +using Content.Shared.Stunnable; using Content.Shared.Tag; using JetBrains.Annotations; using Robust.Shared.Prototypes; using Timer = Robust.Shared.Timing.Timer; -namespace Content.Server._Sunrise.BloodCult.HolyWater; +namespace Content.Shared._Sunrise.BloodCult; [ImplicitDataDefinitionForInheritors] [MeansImplicitUse] @@ -32,15 +33,15 @@ public sealed partial class DeconvertCultist : EntityEffect if (component.HolyConvertToken != null) return; - var random = new Random(); + var random = new System.Random(); var convert = random.Next(1, 101) <= component.HolyConvertChance; if (!convert) return; - args.EntityManager.System() + args.EntityManager.System() .TryParalyze(uid, TimeSpan.FromSeconds(5f), true); var target = Identity.Name(uid, args.EntityManager); - args.EntityManager.System() + args.EntityManager.System() .PopupEntity(Loc.GetString("holy-water-started-converting", ("target", target)), uid); component.HolyConvertToken = new CancellationTokenSource(); @@ -56,8 +57,8 @@ public sealed partial class DeconvertCultist : EntityEffect cultist.HolyConvertToken = null; entityManager.RemoveComponent(uid); - if (entityManager.HasComponent(uid)) - entityManager.RemoveComponent(uid); + if (entityManager.HasComponent(uid)) + entityManager.RemoveComponent(uid); if (entityManager.HasComponent(uid)) entityManager.RemoveComponent(uid); entityManager.System().RemoveTag(uid, "Cultist"); diff --git a/Content.Server/_Sunrise/Disease/CureDiseaseInfection.cs b/Content.Shared/_Sunrise/Disease/CureDiseaseInfection.cs similarity index 93% rename from Content.Server/_Sunrise/Disease/CureDiseaseInfection.cs rename to Content.Shared/_Sunrise/Disease/CureDiseaseInfection.cs index 082747bc85..e0c5c249a5 100644 --- a/Content.Server/_Sunrise/Disease/CureDiseaseInfection.cs +++ b/Content.Shared/_Sunrise/Disease/CureDiseaseInfection.cs @@ -1,8 +1,10 @@ // © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt -using Content.Shared.Chemistry.Reagent; -using Robust.Shared.Prototypes; -using Content.Shared._Sunrise.Disease; + using Content.Shared.EntityEffects; +using Robust.Shared.Prototypes; + +namespace Content.Shared._Sunrise.Disease; + public sealed partial class CureDiseaseInfection : EntityEffect { [DataField] diff --git a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs index febd3103a6..6b0c5251b4 100644 --- a/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs +++ b/Content.Shared/_Sunrise/Eye/NightVision/Systems/NightVisionDeviceSystem.cs @@ -143,7 +143,6 @@ public sealed class NightVisionDeviceSystem : EntitySystem if (ent.Comp.IsPowered) { var draw = Comp(ent.Owner); - _cell.QueueUpdate((ent.Owner, draw)); _cell.SetDrawEnabled((ent.Owner, draw), ent.Comp.Activated); } diff --git a/Content.Server/_Sunrise/FleshCult/CauseFleshCultInfection.cs b/Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs similarity index 93% rename from Content.Server/_Sunrise/FleshCult/CauseFleshCultInfection.cs rename to Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs index 5c8cbc0f2c..803ccbc908 100644 --- a/Content.Server/_Sunrise/FleshCult/CauseFleshCultInfection.cs +++ b/Content.Shared/_Sunrise/FleshCult/CauseFleshCultInfection.cs @@ -2,7 +2,7 @@ using Content.Server.Sunrise.FleshCult; using Content.Shared.EntityEffects; using Robust.Shared.Prototypes; -namespace Content.Server._Sunrise.FleshCult; +namespace Content.Shared._Sunrise.FleshCult; public sealed partial class CauseFleshCultInfection : EntityEffect { diff --git a/Content.Server/_Sunrise/FleshCult/PendingFleshCultistComponent.cs b/Content.Shared/_Sunrise/FleshCult/PendingFleshCultistComponent.cs similarity index 100% rename from Content.Server/_Sunrise/FleshCult/PendingFleshCultistComponent.cs rename to Content.Shared/_Sunrise/FleshCult/PendingFleshCultistComponent.cs diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl index 18f4861e54..e69de29bb2 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl @@ -1,17 +0,0 @@ -ent-MiniSyringeCryostasis = cryostasis mini syringe - .desc = A cryostasis syringe, reshaped to fit inside of a gun. - .suffix = Cryostasis, MiniSyringe -ent-MiniSyringeBluespace = bluespace mini syringe - .desc = A Bluespace syringe, reshaped to fit inside of a gun. - .suffix = Bluespace, MiniSyringe -ent-PrefilledMiniSyringe = { ent-MiniSyringe } - .desc = { ent-MiniSyringe.desc } -ent-MiniSyringeMuteToxin = { ent-PrefilledMiniSyringe } - .suffix = MuteToxin, MiniSyringe - .desc = { ent-PrefilledMiniSyringe.desc } -ent-MiniSyringeFresium = { ent-PrefilledMiniSyringe } - .suffix = Fresium, MiniSyringe - .desc = { ent-PrefilledMiniSyringe.desc } -ent-MiniSyringeCarpoToxin = { ent-PrefilledMiniSyringe } - .suffix = CarpoToxin, MiniSyringe - .desc = { ent-PrefilledMiniSyringe.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl deleted file mode 100644 index f270d1e862..0000000000 --- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl +++ /dev/null @@ -1,18 +0,0 @@ -ent-LauncherSyringeMed = syringe gun - .suffix = Standart - .desc = { ent-LauncherSyringe.desc } -ent-LauncherSyringePistol = syringe pistol - .suffix = Compact - .desc = { ent-LauncherSyringe.desc } -ent-LauncherSyringePistolFilled = syringe pistol - .suffix = Compact, Filled - .desc = { ent-LauncherSyringe.desc } -ent-LauncherSyringeRapid = Rapid syringe gun - .suffix = Auto - .desc = { ent-LauncherSyringe.desc } -ent-LauncherSyringeRapidFilled = Rapid syringe gun - .suffix = Auto, Filled - .desc = { ent-LauncherSyringeRapid.desc } -ent-LauncherSyringeSMG = Syringe SMG - .suffix = Admeme - .desc = { ent-LauncherSyringe.desc } diff --git a/Resources/Locale/en-US/_prototypes/_sunrise/reagents/fun.ftl b/Resources/Locale/en-US/_prototypes/_sunrise/reagents/fun.ftl index 0ceaeb6214..a477bd822c 100644 --- a/Resources/Locale/en-US/_prototypes/_sunrise/reagents/fun.ftl +++ b/Resources/Locale/en-US/_prototypes/_sunrise/reagents/fun.ftl @@ -4,4 +4,6 @@ reagent-physical-desc-aphrodesiac = Shimmering, ruby-red liquid that glows softl reagent-name-celliminol = celliminol reagent-desc-celliminol = A cryogenics chemical. A powerful chemical developed by Qillu. reagent-name-h-32 = H-32 -reagent-desc-h-32 = A reagent developed in the field with increased radiation \ No newline at end of file +reagent-desc-h-32 = A reagent developed in the field with increased radiation +reagent-name-inc = inc +reagent-desc-inc = inc diff --git a/Resources/Locale/en-US/_prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/en-US/_prototypes/entities/clothing/outerclothing/hardsuits.ftl index 4a086779f9..0f76fd8d70 100644 --- a/Resources/Locale/en-US/_prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/en-US/_prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -1,5 +1,3 @@ -ent-ClothingOuterHardsuitBasic = basic hardsuit - .desc = A basic, universal hardsuit that protects the wearer against the horrors of life in space. Beats not having a hardsuit, at least. ent-ClothingOuterHardsuitAtmos = atmos hardsuit .desc = A special suit that protects against hazardous, low pressure environments. Has thermal shielding. ent-ClothingOuterHardsuitEngineering = engineering hardsuit diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl index ce41f9b63a..8b13789179 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/chemistry.ftl @@ -1,17 +1 @@ -ent-MiniSyringeCryostasis = мини криостазис шприц - .desc = криостазис шприц, переделанный под пистолет. - .suffix = Блюспейс, Минишприц -ent-MiniSyringeBluespace = мини блюспейс шприц - .desc = блюспейс шприц, переделанный под пистолет. - .suffix = Блюспейс, Минишприц -ent-PrefilledMiniSyringe = { ent-MiniSyringe } - .desc = { ent-MiniSyringe.desc } -ent-MiniSyringeMuteToxin = { ent-PrefilledMiniSyringe } - .suffix = МутТоксин, Минишприц - .desc = { ent-PrefilledMiniSyringe.desc } -ent-MiniSyringeFresium = { ent-PrefilledMiniSyringe } - .suffix = Фрезиум, Минишприц - .desc = { ent-PrefilledMiniSyringe.desc } -ent-MiniSyringeCarpoToxin = { ent-PrefilledMiniSyringe } - .suffix = КарпТоксин, Минишприц - .desc = { ent-PrefilledMiniSyringe.desc } + diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl deleted file mode 100644 index e783c41229..0000000000 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/launchers/syringe_guns.ftl +++ /dev/null @@ -1,18 +0,0 @@ -ent-LauncherSyringeMed = шприцемёт - .suffix = Стандартный - .desc = Зарядите отравленными шприцами, чтобы получить максимальное удовольствие. -ent-LauncherSyringePistol = Компактный шприцемёт - .suffix = Компактный - .desc = Зарядите отравленными шприцами, чтобы получить максимальное удовольствие. теперь в смешном размере. -ent-LauncherSyringePistolFilled = Компактный шприцемёт - .suffix = Компактный, Заполнен - .desc = { ent-LauncherSyringePistol.desc } -ent-LauncherSyringeRapid = Авто-шприцемёт - .suffix = Автоматический - .desc = Зарядите в пациента до 6-и шприцов с Ипекаком, чтобы получить максимальное удовольствие. -ent-LauncherSyringeRapidFilled = Авто-шприцемёт - .suffix = Автоматический, Заполнен - .desc = Зарядите в пациента до 10-ми шприцов с Ипекаком, чтобы получить максимальное удовольствие. -ent-LauncherSyringeSMG = Шприцемёт ПП - .suffix = Адмеме - .desc = Зарядите в членов экипажа до 20-ми шприцов с соком WEH, чтобы получить максимальное удовольствие. diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/fun.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/fun.ftl index 2ac956531c..11d195cc67 100644 --- a/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/fun.ftl +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/reagents/fun.ftl @@ -15,3 +15,5 @@ reagent-desc-celliminol = Химикат криогенного действия reagent-name-grcoffee = Измельченный кофе reagent-desc-grcoffee = Измельченные зерна кофе. reagent-physical-desc-grcoffee = Коричневая жидкость, слегка густоватая. +reagent-name-inc = чернила +reagent-desc-inc = чернила diff --git a/Resources/Locale/ru-RU/_prototypes/entities/clothing/outerclothing/hardsuits.ftl b/Resources/Locale/ru-RU/_prototypes/entities/clothing/outerclothing/hardsuits.ftl index 6e0bc2b5cd..96fda00726 100644 --- a/Resources/Locale/ru-RU/_prototypes/entities/clothing/outerclothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/_prototypes/entities/clothing/outerclothing/hardsuits.ftl @@ -1,5 +1,3 @@ -ent-ClothingOuterHardsuitBasic = базовый скафандр - .desc = Базовый, универсальный скафандр, защищающий владельца от ужасов пребывания в космосе. По крайней мере, это лучше, чем отсутствие скафандра. ent-ClothingOuterHardsuitAtmos = скафандр атмос-техника .desc = Специальный костюм, защищающий от опасной среды с низким давлением. Имеет тепловую защиту. ent-ClothingOuterHardsuitEngineering = скафандр инженера diff --git a/Resources/Maps/_Sunrise/Shuttles/pirate_medium.yml b/Resources/Maps/_Sunrise/Shuttles/pirate_medium.yml index a79a0fd77e..c82c132c08 100644 --- a/Resources/Maps/_Sunrise/Shuttles/pirate_medium.yml +++ b/Resources/Maps/_Sunrise/Shuttles/pirate_medium.yml @@ -1090,13 +1090,6 @@ entities: - type: Transform pos: -7.2017837,-9.2111435 parent: 1 -- proto: BoxMiniSyringe - entities: - - uid: 391 - components: - - type: Transform - pos: 0.5902469,-11.434221 - parent: 1 - proto: BoxShotgunIncendiary entities: - uid: 753 diff --git a/Resources/Maps/_Sunrise/Station/bagel.yml b/Resources/Maps/_Sunrise/Station/bagel.yml index f2012009f1..ec1d0bdbac 100644 --- a/Resources/Maps/_Sunrise/Station/bagel.yml +++ b/Resources/Maps/_Sunrise/Station/bagel.yml @@ -17475,13 +17475,6 @@ entities: - type: Transform pos: 0.97444147,20.461615 parent: 2 -- proto: BoxMiniSyringe - entities: - - uid: 1102 - components: - - type: Transform - pos: -10.317339,5.7388086 - parent: 2 - proto: BoxMouthSwab entities: - uid: 1103 diff --git a/Resources/Maps/_Sunrise/Station/box.yml b/Resources/Maps/_Sunrise/Station/box.yml index c9909e811f..3135f1f0e8 100644 --- a/Resources/Maps/_Sunrise/Station/box.yml +++ b/Resources/Maps/_Sunrise/Station/box.yml @@ -24992,18 +24992,6 @@ entities: - type: Transform pos: -20.536755,-5.462179 parent: 2 -- proto: BoxMiniSyringe - entities: - - uid: 11194 - components: - - type: Transform - pos: 36.64888,-38.499374 - parent: 2 - - uid: 31353 - components: - - type: Transform - pos: 19.224562,-20.718649 - parent: 2 - proto: BoxMouthSwab entities: - uid: 1348 @@ -143568,18 +143556,6 @@ entities: - type: Transform pos: 42.737797,-10.2649 parent: 2 -- proto: LauncherSyringeMed - entities: - - uid: 11208 - components: - - type: Transform - pos: 36.537766,-38.2434 - parent: 2 - - uid: 31855 - components: - - type: Transform - pos: 19.00234,-20.505686 - parent: 2 - proto: LeavesCannabis entities: - uid: 30564 diff --git a/Resources/Maps/_Sunrise/Station/convex.yml b/Resources/Maps/_Sunrise/Station/convex.yml index 5a036a2e7e..07fa173534 100644 --- a/Resources/Maps/_Sunrise/Station/convex.yml +++ b/Resources/Maps/_Sunrise/Station/convex.yml @@ -28944,13 +28944,6 @@ entities: - type: Transform pos: 159.67625,127.97202 parent: 2 -- proto: BoxMiniSyringe - entities: - - uid: 1609 - components: - - type: Transform - pos: 115.09472,47.53215 - parent: 2 - proto: BoxMouthSwab entities: - uid: 1610 diff --git a/Resources/Maps/_Sunrise/Station/delta.yml b/Resources/Maps/_Sunrise/Station/delta.yml index b3abe902fb..eb907fefbf 100644 --- a/Resources/Maps/_Sunrise/Station/delta.yml +++ b/Resources/Maps/_Sunrise/Station/delta.yml @@ -112517,40 +112517,6 @@ entities: - type: Transform pos: -55.49862,-48.5602 parent: 2 -- proto: ClothingOuterHardsuitBasic - entities: - - uid: 16053 - components: - - type: Transform - pos: -114.51022,21.647438 - parent: 2 - - type: GroupExamine - group: - - hoverMessage: "" - contextText: verb-examine-group-other - icon: /Textures/Interface/examine-star.png - components: - - Armor - - ClothingSpeedModifier - entries: - - message: Понижает вашу скорость на [color=yellow]20%[/color]. - priority: 0 - component: ClothingSpeedModifier - - message: >- - Обеспечивает следующую защиту: - - - [color=yellow]Ударный[/color] урон снижается на [color=lightblue]10%[/color]. - - - [color=yellow]Режущий[/color] урон снижается на [color=lightblue]10%[/color]. - - - [color=yellow]Колющий[/color] урон снижается на [color=lightblue]10%[/color]. - - - [color=yellow]Кислотный[/color] урон снижается на [color=lightblue]10%[/color]. - - - [color=orange]Взрывной[/color] урон снижается на [color=lightblue]10%[/color]. - priority: 0 - component: Armor - title: null - proto: ClothingOuterHardsuitBlueShield entities: - uid: 38617 @@ -186531,7 +186497,7 @@ entities: parent: 1666 - type: Paper content: >- - Поиск в NTсети: + Поиск в NTсети: Хештеги: diff --git a/Resources/Maps/_Sunrise/Station/loop.yml b/Resources/Maps/_Sunrise/Station/loop.yml index 99dc69c7ab..f65c19c54f 100644 --- a/Resources/Maps/_Sunrise/Station/loop.yml +++ b/Resources/Maps/_Sunrise/Station/loop.yml @@ -82299,13 +82299,6 @@ entities: - type: Transform pos: -59.509956,65.62154 parent: 2 -- proto: LauncherSyringeMed - entities: - - uid: 18198 - components: - - type: Transform - pos: -73.429146,23.364283 - parent: 2 - proto: Lighter entities: - uid: 11815 @@ -84174,23 +84167,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: MiniSyringeFresium - entities: - - uid: 18199 - components: - - type: Transform - pos: -73.780716,22.991907 - parent: 2 - - uid: 18200 - components: - - type: Transform - pos: -73.54445,22.922464 - parent: 2 - - uid: 18201 - components: - - type: Transform - pos: -73.28039,22.922464 - parent: 2 - proto: Mirror entities: - uid: 12041 diff --git a/Resources/Maps/_Sunrise/Station/meta.yml b/Resources/Maps/_Sunrise/Station/meta.yml index 638245633f..2cb6a56b52 100644 --- a/Resources/Maps/_Sunrise/Station/meta.yml +++ b/Resources/Maps/_Sunrise/Station/meta.yml @@ -16483,13 +16483,6 @@ entities: - type: Transform pos: 50.376198,30.620008 parent: 2 -- proto: BoxMiniSyringe - entities: - - uid: 1140 - components: - - type: Transform - pos: -0.71074677,52.50585 - parent: 2 - proto: BoxMouthSwab entities: - uid: 1141 diff --git a/Resources/Maps/_Sunrise/Station/plasma.yml b/Resources/Maps/_Sunrise/Station/plasma.yml index 32a43c1a2f..71de2e5406 100644 --- a/Resources/Maps/_Sunrise/Station/plasma.yml +++ b/Resources/Maps/_Sunrise/Station/plasma.yml @@ -26478,13 +26478,6 @@ entities: - type: Transform pos: -17.356392,-5.218974 parent: 2 -- proto: BoxMiniSyringe - entities: - - uid: 2477 - components: - - type: Transform - pos: -44.943584,-58.48645 - parent: 2 - proto: BoxMouthSwab entities: - uid: 2478 diff --git a/Resources/Maps/_Sunrise/event/void.yml b/Resources/Maps/_Sunrise/event/void.yml index 667275a808..f1fff574a5 100644 --- a/Resources/Maps/_Sunrise/event/void.yml +++ b/Resources/Maps/_Sunrise/event/void.yml @@ -29470,14 +29470,6 @@ entities: rot: 3.141592653589793 rad pos: 100.71605,9.692456 parent: 1 -- proto: ClothingOuterHardsuitBasic - entities: - - uid: 10661 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 101.575424,16.473705 - parent: 1 - proto: ClothingOuterHardsuitBlueShield entities: - uid: 10659 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 6bcb49e544..2401ed9832 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -118,14 +118,6 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 - - id: BoxMiniSyringe - prob: 0.75 - - id: BoxMiniSyringe - prob: 0.25 - - id: LauncherSyringeMed - prob: 0.45 - - id: LauncherSyringePistol - prob: 0.15 - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 - id: ClothingHeadHelmetSecurityMedic diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml index 34134d5fa0..bf9dc9d2a9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml @@ -16,4 +16,3 @@ MiniSyringe: 3 # Sunrise Edit emaggedInventory: Stimpack: 1 # Sunrise Edit - BoxMiniSyringe: 1 # Sunrise Edit diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml index f0904149d4..54e822b980 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml @@ -11,5 +11,3 @@ AntiPoisonMedipen: 1 # Sunrise Edit emaggedInventory: StimpackMini: 1 # Sunrise Edit - MiniSyringeFresium: 1 # Sunrise Edit - MiniSyringeMuteToxin: 2 # Sunrise Edit diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 90f28065ab..553a6e4820 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -79,7 +79,6 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - Piercing: 0.80 Radiation: 0.80 Caustic: 0.95 - type: ExplosionResistance diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index 4cdf5d7b8f..08c0b6d772 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -484,10 +484,6 @@ - type: SolutionInjectOnEmbed transferAmount: 1 solution: injector - - type: SolutionContainerManager #BALANCE PR-START - solutions: - injector: - maxVol: 10 #BALANCE PR-END - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 4557cb3ea7..5f79f90774 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -195,15 +195,13 @@ - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 1 + soundGunshot: + collection: m3 # Sunrise-Edit - type: GunSpreadModifier spread: 0.6 - type: Tag tags: - WeaponShotgunKammerer - - type: Gun - fireRate: 1 - soundGunshot: - collection: m3 # Sunrise-Edit - type: entity name: sawn-off shotgun diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index d34a9ccdf5..20fe8951f9 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -664,12 +664,6 @@ id: FloorSteelDirty name: tiles-dirty-steel-floor sprite: /Textures/Tiles/steel_dirty.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml index e8e94c4e33..a02d5234d7 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -443,7 +443,7 @@ price: 0 - type: entity - parent: ClothingOuterHardsuitBasic + parent: ClothingOuterHardsuitEVA id: ClothingOuterHardsuitChameleon name: syndicate chameleon description: Looking at his material, Sci-fi images inadvertently pop up in your head. @@ -463,7 +463,7 @@ - Thief - type: ChameleonClothing slot: [outerClothing] - default: ClothingOuterHardsuitBasic + default: ClothingOuterHardsuitEVA requireTag: WhitelistChameleonSuit - type: UserInterface interfaces: diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/mobs.yml index 553f1044ad..83dc22c9d3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/mobs.yml @@ -29,17 +29,3 @@ - type: ConditionalSpawner prototypes: - MobSnowManEvil - -- type: entity - name: xeno lone praetorian spawner - id: SpawnMobXenoPraetorian - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: running - sprite: Mobs/Aliens/Xenos/praetorian.rsi - - type: ConditionalSpawner - prototypes: - - MobXenoLonePraetorianNoGhost diff --git a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml index 613d3a2f3e..fe6917602b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml @@ -249,7 +249,6 @@ ears: ClothingHeadsetAltCentCom belt: ClothingBeltMedicalFilled pocket1: MedipenCombatInjector - pocket2: LauncherSyringePistol inhand: - MedkitAdvancedFilled - DefibrillatorCompact diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index d5bd35bd2d..d3a61eddde 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -20,6 +20,7 @@ soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/HMGs/minigun_shot.ogg - type: ClothingSlotAmmoProvider + - type: SlotBasedConnectedContainer targetSlot: BACK providerWhitelist: tags: diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml index ae6a40f41a..586043b5d9 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/Packs/medical.yml @@ -18,12 +18,6 @@ - BluespaceBeaker - SyringeBluespace - SyringeCryostasis - - LauncherSyringeMed - - LauncherSyringePistol - - LauncherSyringeRapid - - MiniSyringeCryostasis - - MiniSyringeBluespace - - MiniSyringe - LeftArmCyber - RightArmCyber - LeftHandCyber diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml index 91d9640951..1b02d5f468 100644 --- a/Resources/Prototypes/typing_indicator.yml +++ b/Resources/Prototypes/typing_indicator.yml @@ -86,11 +86,13 @@ # Sunrise-Start - type: typingIndicator id: sun + idleState: sunrise0 typingState: sunrise0 offset: 0, 0.125 - type: typingIndicator id: syndibot + idleState: syndibot0 typingState: syndibot0 offset: 0, 0.125 # Sunrise-End