From 1b07a035cecd6e32c0fe059e726633d7a5503daf Mon Sep 17 00:00:00 2001 From: ThereDrD <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 25 Aug 2024 01:37:24 +0300 Subject: [PATCH 1/5] Upstream fixes (#664) * fix weird name saving * fix item status * Fix single-user BUIs erroneously closing (#28375) (cherry picked from commit 08952b467d9b2b2db85cb9ebb4e8b628c0145716) * fix meatyore shop * possible playtime fix * fixes --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Lathe/UI/LatheBoundUserInterface.cs | 7 ++--- .../_White/MeatyOre/MeatyOreUIController.cs | 20 +++++++++----- .../Changeling/ChangelingSystem.Shop.cs | 2 +- .../PlayTimeTrackingManager.cs | 2 +- .../_White/MeatyOre/MeatyOreStoreSystem.cs | 21 ++++++++------- .../Prototypes/Entities/Mobs/Species/base.yml | 9 +++++++ .../Prototypes/Recipes/Lathes/security.yml | 26 ++++++++++++++++++- .../Store/meatyore_store_presset.yml | 2 +- 8 files changed, 67 insertions(+), 22 deletions(-) diff --git a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs index 6e6d1b9176..84bd8e5fde 100644 --- a/Content.Client/Lathe/UI/LatheBoundUserInterface.cs +++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs @@ -20,15 +20,14 @@ namespace Content.Client.Lathe.UI _menu = new LatheMenu(this); _menu.OnClose += Close; - _menu.OnServerListButtonPressed += _ => { - SendMessage(new ConsoleServerSelectionMessage()); + SendPredictedMessage(new ConsoleServerSelectionMessage()); }; _menu.RecipeQueueAction += (recipe, amount) => { - SendMessage(new LatheQueueRecipeMessage(recipe, amount)); + SendPredictedMessage(new LatheQueueRecipeMessage(recipe, amount)); }; _menu.OpenCenteredRight(); @@ -54,8 +53,10 @@ namespace Content.Client.Lathe.UI protected override void Dispose(bool disposing) { base.Dispose(disposing); + if (!disposing) return; + _menu?.Dispose(); } } diff --git a/Content.Client/_White/MeatyOre/MeatyOreUIController.cs b/Content.Client/_White/MeatyOre/MeatyOreUIController.cs index 5c366174f7..0833003f1f 100644 --- a/Content.Client/_White/MeatyOre/MeatyOreUIController.cs +++ b/Content.Client/_White/MeatyOre/MeatyOreUIController.cs @@ -43,7 +43,9 @@ public sealed class MeatyOreUIController : UIController { base.FrameUpdate(args); - if(!_buttonLoaded) return; + if (!_buttonLoaded) + return; + var shouldBeVisible = CheckButtonVisibility(); MeatyOreButton!.Visible = shouldBeVisible; } @@ -51,13 +53,19 @@ public sealed class MeatyOreUIController : UIController private bool CheckButtonVisibility() { - if(!_sponsorsManager.TryGetInfo(out var sponsor)) return false; - if(sponsor?.Tier == null || sponsor?.MeatyOreCoin == 0) return false; + if (!_sponsorsManager.TryGetInfo(out var sponsor)) + return false; - var controlledEntity = _playerManager!.LocalPlayer!.ControlledEntity; - if(controlledEntity == null) return false; + if (sponsor.Tier == null || sponsor.MeatyOreCoin == 0) + return false; - if (!_entityManager.HasComponent(controlledEntity)) return false; + var controlledEntity = _playerManager.LocalPlayer!.ControlledEntity; + + if (controlledEntity == null) + return false; + + if (!_entityManager.HasComponent(controlledEntity)) + return false; return true; } diff --git a/Content.Server/Changeling/ChangelingSystem.Shop.cs b/Content.Server/Changeling/ChangelingSystem.Shop.cs index 9dbc95fc55..f26ffeb32d 100644 --- a/Content.Server/Changeling/ChangelingSystem.Shop.cs +++ b/Content.Server/Changeling/ChangelingSystem.Shop.cs @@ -45,7 +45,7 @@ public sealed partial class ChangelingSystem private void OnShop(EntityUid uid, SubdermalImplantComponent component, ChangelingShopActionEvent args) { - if(!TryComp(uid, out var store)) + if (!TryComp(uid, out var store)) return; _storeSystem.ToggleUi(args.Performer, uid, store); diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs index 7a47bdd810..574ad33d34 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs @@ -309,7 +309,7 @@ public sealed class PlayTimeTrackingManager : IPlayTimeTrackingManager, ISharedP var data = new PlayTimeData(); _playTimeData.Add(session, data); - var playTimes = await _db.GetPlayTimes(session.UserId, cancel); + var playTimes = await _db.GetPlayTimes(session.UserId); cancel.ThrowIfCancellationRequested(); foreach (var timer in playTimes) diff --git a/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs b/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs index 6eb85dab67..2eb9b7722a 100644 --- a/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs +++ b/Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs @@ -1,4 +1,5 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Server.Chat.Managers; using System.Net.Http; @@ -29,6 +30,7 @@ using Robust.Shared.Configuration; using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Player; +using Robust.Shared.Prototypes; namespace Content.Server._White.MeatyOre; @@ -46,6 +48,7 @@ public sealed class MeatyOreStoreSystem : EntitySystem [Dependency] private readonly SharedJobSystem _jobSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private HttpClient _httpClient = default!; private string _apiUrl = default!; @@ -149,7 +152,7 @@ public sealed class MeatyOreStoreSystem : EntitySystem return; _pvsOverrideSystem.AddSessionOverride(storeEntity.Value, playerSession); - _storeSystem.ToggleUi(playerEntity.Value, storeEntity.Value, storeComponent); + _storeSystem.ToggleUi(playerEntity.Value, storeEntity.Value); } private bool TryGetStore(ICommonSession session, out StoreComponent store, [NotNullWhen(true)] out EntityUid? storeEntity) @@ -187,19 +190,19 @@ public sealed class MeatyOreStoreSystem : EntitySystem private (EntityUid, StoreComponent) CreateStore(NetUserId userId, int balance) { var session = _playerManager.GetSessionById(userId); - var storeEntity = _entityManager.SpawnEntity("StoreMeatyOreEntity", MapCoordinates.Nullspace); - var storeComponent = Comp(storeEntity); + var user = session.AttachedEntity!; - _storeSystem.InitializeFromPreset(StorePresetPrototype, storeEntity, storeComponent); + var storeComponent = Comp(user.Value); + + _storeSystem.InitializeFromPreset(StorePresetPrototype, user.Value, storeComponent); storeComponent.Balance.Clear(); _storeSystem.TryAddCurrency(new Dictionary { { MeatyOreCurrencyPrototype, balance } }, - storeEntity, storeComponent); + user.Value, storeComponent); - _meatyOreStores[userId] = (storeEntity, storeComponent); - _pvsOverrideSystem.AddSessionOverride(storeEntity, session); + _meatyOreStores[userId] = (user.Value, storeComponent); - return (storeEntity, storeComponent); + return (user.Value, storeComponent); } private async void TryAddRole(EntityUid user, EntityUid target, StoreComponent store, EntityUid storeEntity) diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index af674a618d..0466cfd26d 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -221,8 +221,17 @@ type: SpellSelectorBUI enum.CultEmpowerRemoveUiKey.Key: type: SpellRemoverBUI + enum.StoreUiKey.Key: + type: StoreBoundUserInterface # WD-EDIT END - type: Puller + # WD edit start + - type: Store + preset: StorePresetMeatyOre + balance: + MeatyOreCoin: 0 + - type: IgnorBUIInteractionRange # Oleg kryt + # WD edit end - type: Butcherable butcheringType: Spike # TODO human. spawned: diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index baf21783d9..defebd8052 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -38,7 +38,7 @@ materials: Steel: 250 Plastic: 100 - + - type: latheRecipe id: WeaponLaserCarbine result: WeaponLaserCarbine @@ -390,6 +390,30 @@ materials: Steel: 120 +- type: latheRecipe # WD + id: MagazineShotgun + result: MagazineShotgun + category: Ammo + completetime: 5 + materials: + Steel: 300 + +- type: latheRecipe # WD + id: MagazineShotgunSlug + result: MagazineShotgunSlug + category: Ammo + completetime: 5 + materials: + Steel: 300 + +- type: latheRecipe # WD + id: MagazinePistolCaselessRifle + result: MagazinePistolCaselessRifle + category: Ammo + completetime: 5 + materials: + Steel: 300 + - type: latheRecipe id: ShellShotgunIncendiary result: ShellShotgunIncendiary diff --git a/Resources/Prototypes/Store/meatyore_store_presset.yml b/Resources/Prototypes/Store/meatyore_store_presset.yml index 9a49a24504..c73ab3a8e4 100644 --- a/Resources/Prototypes/Store/meatyore_store_presset.yml +++ b/Resources/Prototypes/Store/meatyore_store_presset.yml @@ -19,6 +19,7 @@ currencyWhitelist: - MeatyOreCoin +# This is unused now - type: entity id: StoreMeatyOreEntity name: ThisIsDumb @@ -32,5 +33,4 @@ interfaces: enum.StoreUiKey.Key: type: StoreBoundUserInterface - range: -1 - type: IgnorBUIInteractionRange From 1747c7bcecc28d2a1a61ed20fa38552bdcd6bf22 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sat, 24 Aug 2024 22:38:27 +0000 Subject: [PATCH 2/5] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 66 ++++++++++++++++---------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 8c56da27f4..eb44ced837 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,28 +1,4 @@ Entries: -- author: EnefFlow - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043F\u0440\u043E\ - \u0432\u0435\u0440\u043A\u0430 \u043F\u0440\u0438 \u043D\u0430\u0436\u0430\u0442\ - \u0438\u0438 \u043A\u043D\u043E\u043F\u043A\u0438 \u0432\u044B\u0437\u043E\u0432\ - \u0430 \u0441\u0442\u0430\u043D\u0446\u0438\u0438. \u0415\u0441\u043B\u0438\ - \ \u043A\u043E\u043D\u0441\u043E\u043B\u044C \u043D\u0430\u0445\u043E\u0434\u0438\ - \u0442\u0441\u044F \u043D\u0435 \u043D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\ - \u0438, \u0442\u043E \u0432\u044B\u0434\u0430\u0451\u0442 \u043F\u043E\u043F\ - \u0430\u043F \"\u041E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435\ - \ \u0441\u0432\u044F\u0437\u0438\"." - type: Add - id: 19 - time: '2023-01-06T17:33:46.0000000+00:00' -- author: NCast-Hops - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0432\u0435\u0441\ - \u0435\u043B\u044C\u0435!" - type: Add - - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\ - \u0435!" - type: Remove - id: 20 - time: '2023-01-12T11:08:53.0000000+00:00' - author: HitPanda changes: - message: "\u041D\u043E\u0432\u044B\u0439 \u043F\u0440\u0435\u0441\u0435\u0442\ @@ -8555,3 +8531,45 @@ id: 518 time: '2024-08-23T08:38:47.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/660 +- author: ThereDrD0 + changes: + - message: "\u041C\u0435\u0442\u0435\u043E\u0440 \u043C\u0435\u043D\u044E \u0441\ + \u043D\u043E\u0432\u0430 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0435\u0442\ + \u0441\u044F" + type: Fix + - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u044B\u0445 \u0444\u0438\u043A\ + \u0441 \u0442\u0430\u0439\u043C\u0435\u0440\u043E\u0432" + type: Fix + - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u044B\u0439 \u0444\u0438\u043A\ + \u0441 \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430 \u0442\u0435\ + \u0445\u0444\u0430\u0431\u0430 \u0421\u0411" + type: Fix + id: 519 + time: '2024-08-24T22:37:24.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/664 +- author: ThereDrD0 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0431\ + \u0440\u0430\u0441\u044B\u0432\u0430\u044E\u0449\u0438\u0435\u0441\u044F \u0438\ + \u043C\u0435\u043D\u0430" + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u0435\ + \u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043F\u043E\ + \u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0442\u043E\u0447\u043A\u0438 \u0432\ + \ \u0438\u043C\u0435\u043D\u0438 \u0431\u043E\u0440\u0433\u043E\u0432" + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0430\u0432\ + \u0442\u043E\u0437\u0430\u043C\u0435\u043D\u0430 \u0431\u0443\u043A\u0432 \u043D\ + \u0430 \u0431\u043E\u043B\u044C\u0448\u0438\u0435 \u0432 \u0438\u043C\u0435\u043D\ + \u0430\u0445 \u043C\u0438\u043C\u043E\u0432, \u043A\u043B\u043E\u0443\u043D\u043E\ + \u0432 \u0438 \u0431\u043E\u0440\u0433\u043E\u0432" + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\ + \u0440\u0435\u043F\u0443\u0442\u0430\u043D\u043D\u044B\u0435 \u0440\u0443\u043A\ + \u0438 \u0443 \u0444\u0435\u043B\u0438\u043D\u0438\u0434\u043E\u0432, \u0433\ + \u0430\u0440\u043F\u0438\u0439 \u0438 \u0442\u0435\u0440\u043C\u0438\u043D\u0430\ + \u0442\u043E\u0440\u0430" + type: Fix + id: 520 + time: '2024-08-24T09:36:44.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/663 From fa7b02fa33ad6e67285933f31c29ce7d55648b5a Mon Sep 17 00:00:00 2001 From: ThereDrD <88589686+ThereDrD0@users.noreply.github.com> Date: Sun, 25 Aug 2024 10:37:38 +0300 Subject: [PATCH 3/5] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B0?= =?UTF-8?q?=D0=BF=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0=202=20(#665)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * increase radiation effect cost for artifacts * less points for singulo and tesla spawn effect * fix playtime * fix slime storage * fix wrong arms position --- Content.Server/Database/UserDbDataManager.cs | 2 +- Resources/Prototypes/Entities/Mobs/Species/slime.yml | 1 + Resources/Prototypes/XenoArch/Effects/normal_effects.yml | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs index c58c594dba..a82d72a299 100644 --- a/Content.Server/Database/UserDbDataManager.cs +++ b/Content.Server/Database/UserDbDataManager.cs @@ -21,7 +21,7 @@ public sealed class UserDbDataManager : IPostInjectInit { [Dependency] private readonly IServerPreferencesManager _prefs = default!; [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private readonly IPlayTimeTrackingManager _playTimeTracking = default!; private readonly Dictionary _users = new(); diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index 9ffa388e54..1a42e56761 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -17,6 +17,7 @@ grid: - 0,0,1,2 maxItemSize: Large + clickInsert: false storageInsertSound: path: /Audio/Voice/Slime/slime_squish.ogg - type: ContainerContainer diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index eccb6d92c7..493f6dd840 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -253,7 +253,7 @@ - type: artifactEffect id: EffectRadiate - targetDepth: 1 + targetDepth: 4 effectHint: artifact-effect-hint-release components: - type: RadiationSource @@ -713,7 +713,7 @@ - type: artifactEffect id: EffectSingulo - targetDepth: 10 + targetDepth: 8 effectHint: artifact-effect-hint-destruction components: - type: SpawnArtifact @@ -723,7 +723,7 @@ - type: artifactEffect id: EffectTesla - targetDepth: 10 + targetDepth: 8 effectHint: artifact-effect-hint-destruction components: - type: SpawnArtifact From ee498d3718101b624ca51f4356ed635180ea51df Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Sun, 25 Aug 2024 07:38:41 +0000 Subject: [PATCH 4/5] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 69 ++++++++++++++++++-------- 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index eb44ced837..1a401d423f 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,26 +1,4 @@ Entries: -- author: HitPanda - changes: - - message: "\u041D\u043E\u0432\u044B\u0439 \u043F\u0440\u0435\u0441\u0435\u0442\ - \ \u0438 \u043F\u0440\u0430\u0432\u0438\u043B\u043E \u0434\u043B\u044F \u043D\ - \u0435\u0433\u043E." - type: Add - - message: "\u0415\u0441\u043B\u0438 \u0437\u0430\u043F\u0443\u0449\u0435\u043D\u043E\ - \ \u043F\u0440\u0430\u0432\u0438\u043B\u043E, \u0442\u043E \u043A\u043E\u043D\ - \u0441\u043E\u043B\u044C \u043A\u043E\u043C\u043C\u0443\u043D\u0438\u043A\u0430\ - \u0446\u0438\u0438 \u043D\u0435 \u0434\u0430\u0451\u0442 \u0432\u044B\u0437\u0432\ - \u0430\u0442\u044C \u0448\u0430\u0442\u0442\u043B, \u043F\u043E\u043A\u0430\ - \ \u043D\u0435 \"\u0443\u0441\u0442\u0430\u043D\u043E\u0432\u0438\u0442\u0441\ - \u044F \u0441\u0432\u044F\u0437\u044C\"." - type: Add - - message: "\u0414\u043B\u044F \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043F\ - \u0440\u043E\u043F\u0438\u0441\u0430\u043D\u044B \u043C\u0435\u0442\u043E\u0434\ - \u044B \u0434\u043B\u044F \u043F\u043E\u0438\u0441\u043A\u0430 \u043A\u043E\u043D\ - \u043A\u0440\u0435\u0442\u043D\u043E\u0433\u043E \u0438\u0432\u0435\u043D\u0442\ - \u0430." - type: Add - id: 21 - time: '2023-01-12T12:56:46.0000000+00:00' - author: HitPanda changes: - message: "\u0423\u0431\u0440\u0430\u043B \u0438\u0437 \u0433\u043E\u043B\u043E\ @@ -8573,3 +8551,50 @@ id: 520 time: '2024-08-24T09:36:44.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/663 +- author: ThereDrD0 + changes: + - message: "\u0421\u043A\u043E\u0440\u0435\u0435 \u0432\u0441\u0435\u0433\u043E\ + \ \u0442\u0430\u0439\u043C\u0435\u0440\u044B \u0442\u0435\u043F\u0435\u0440\u044C\ + \ \u0442\u043E\u0447\u043D\u043E \u0434\u043E\u043B\u0436\u043D\u044B \u0437\ + \u0430\u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C" + type: Fix + - message: "\u0420\u0443\u043A\u0438 \u0443 \u0444\u0435\u043B\u0438\u043D\u0438\ + \u0434\u043E\u0432, \u0433\u0430\u0440\u043F\u0438\u0439 \u0438 \u0442\u0435\ + \u0440\u043C\u0438\u043D\u0430\u0442\u043E\u0440\u0430 \u0442\u0435\u043F\u0435\ + \u0440\u044C \u0432 \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E\u043C\ + \ \u043F\u043E\u0440\u044F\u0434\u043A\u0435." + type: Fix + - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0445\u0440\u0430\u043D\u0438\u043B\ + \u0438\u0449\u0435 \u0432\u043D\u0443\u0442\u0440\u0438 \u0442\u0435\u043B\u0430\ + \ \u0441\u043B\u0438\u0437\u043D\u0435\u043B\u044E\u0434\u043E\u0432 \u043D\u0435\ + \ \u043C\u0435\u0448\u0430\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\ + \u043E\u0432\u0430\u0442\u044C \u043D\u0430 \u043D\u0435\u043C \u043F\u0440\u0435\ + \u0434\u043C\u0435\u0442\u044B \u0438 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\ + \u0435\u0442\u0441\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u043F\u0440\u0438\ + \ \u043D\u0430\u0436\u0430\u0442\u0438\u0438 \u043F\u0443\u0441\u0442\u043E\u0439\ + \ \u0440\u0443\u043A\u0438 \u0438\u043B\u0438 \u0447\u0435\u0440\u0435\u0437\ + \ \u041F\u041A\u041C \u043C\u0435\u043D\u044E." + type: Fix + - message: "\u042D\u0444\u0444\u0435\u043A\u0442 \u0440\u0430\u0434\u0438\u0430\u0446\ + \u0438\u0438 \u0443 \u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u0430 \u043F\ + \u043E\u0432\u044B\u0448\u0435\u043D \u0432 \u0446\u0435\u043D\u0435 \u0441\ + \ 1 \u0434\u043E 4 \u043E\u0447\u043A\u043E\u0432. \u0412\u0441\u0435\u0433\u043E\ + \ \u0438\u0445 \u043C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u043C\u043E\ + \u0436\u0435\u0442 \u0431\u044B\u0442\u044C 10 \u0443 \u0430\u0440\u0442\u0435\ + \u0444\u0430\u043A\u0442\u0430" + type: Tweak + - message: "\u042D\u0444\u0444\u0435\u043A\u0442 \u0441\u043F\u0430\u0432\u043D\u0430\ + \ \u0441\u0438\u043D\u0433\u0443\u043B\u044F\u0440\u043D\u043E\u0441\u0442\u0438\ + \ \u043F\u043E\u043D\u0438\u0436\u0435\u043D \u0432 \u0446\u0435\u043D\u0435\ + \ \u0441 10 \u0434\u043E 8 \u043E\u0447\u043A\u043E\u0432, \u0442\u0430\u043A\ + \ \u043A\u0430\u043A \u043A\u0430\u0436\u0435\u0442\u0441\u044F, \u0447\u0442\ + \u043E \u0432\u044B\u0431\u0440\u0430\u0442\u044C \u0432\u0441\u0435\u0433\u043E\ + \ 1 \u044D\u0444\u0444\u0435\u043A\u0442 \u0434\u043B\u044F \u0430\u0440\u0442\ + \u0435\u0444\u0430\u043A\u0442\u0430 \u0438\u0433\u0440\u0430 \u043D\u0435 \u0441\ + \u043F\u043E\u0441\u043E\u0431\u043D\u0430 \u0438 \u0442\u0440\u0430\u0442\u0438\ + \u0442 \u043E\u0447\u043A\u0438 \u043D\u0430 \u0440\u0430\u0437\u043D\u0443\u044E\ + \ \u0445\u0443\u0439\u043D\u044E." + type: Tweak + id: 521 + time: '2024-08-25T07:37:38.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/665 From 3f297594a9ef071867f44fbbbe8279b2ac9e3bca Mon Sep 17 00:00:00 2001 From: Jabak <163307958+Jabaks@users.noreply.github.com> Date: Sun, 25 Aug 2024 15:35:43 +0300 Subject: [PATCH 5/5] game role timers true --- Content.Shared/CCVar/CCVars.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 9031a9fb95..a8211480fd 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -236,7 +236,7 @@ namespace Content.Shared.CCVar /// If roles should be restricted based on time. /// public static readonly CVarDef - GameRoleTimers = CVarDef.Create("game.role_timers", false, CVar.SERVER | CVar.REPLICATED); + GameRoleTimers = CVarDef.Create("game.role_timers", true, CVar.SERVER | CVar.REPLICATED); /// /// Override default role requirements using a