diff --git a/Content.Server/_Honk/RoundEndVote/RoundEndVoteSystem.cs b/Content.Server/_Honk/RoundEndVote/RoundEndVoteSystem.cs index c90471e490..91262846ba 100644 --- a/Content.Server/_Honk/RoundEndVote/RoundEndVoteSystem.cs +++ b/Content.Server/_Honk/RoundEndVote/RoundEndVoteSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.GameTicking; +using Content.Server.GameTicking; using Content.Server.RoundEnd; using Content.Server.Voting.Managers; using Content.Shared.Voting; diff --git a/Content.Shared/Clothing/Components/MaskComponent.cs b/Content.Shared/Clothing/Components/MaskComponent.cs index 5430417a8c..8948eaba77 100644 --- a/Content.Shared/Clothing/Components/MaskComponent.cs +++ b/Content.Shared/Clothing/Components/MaskComponent.cs @@ -22,4 +22,18 @@ public sealed partial class MaskComponent : Component [DataField, AutoNetworkedField] public string EquippedPrefix = "toggled"; + + /// + /// WD Ahead of wizden. + /// When will function normally, otherwise will not react to events + /// + [DataField("enabled"), AutoNetworkedField] + public bool IsEnabled = true; + + /// + /// WD Ahead of wizden. + /// When will disable when folded + /// + [DataField, AutoNetworkedField] + public bool DisableOnFolded; } diff --git a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs index 2a4383279a..d3e5458eaf 100644 --- a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs @@ -35,7 +35,7 @@ public sealed class MaskSystem : EntitySystem private void OnToggleMask(Entity ent, ref ToggleMaskEvent args) { var (uid, mask) = ent; - if (mask.ToggleActionEntity == null || !_timing.IsFirstTimePredicted) + if (mask.ToggleActionEntity == null || !_timing.IsFirstTimePredicted || !mask.IsEnabled) // WD Ahead of wizden return; if (!_inventorySystem.TryGetSlotEntity(args.Performer, "mask", out var existing) || !uid.Equals(existing)) @@ -53,7 +53,7 @@ public sealed class MaskSystem : EntitySystem // set to untoggled when unequipped, so it isn't left in a 'pulled down' state private void OnGotUnequipped(EntityUid uid, MaskComponent mask, GotUnequippedEvent args) { - if (!mask.IsToggled) + if (!mask.IsToggled || !mask.IsEnabled) // WD Ahead of wizden return; mask.IsToggled = false; @@ -66,7 +66,7 @@ public sealed class MaskSystem : EntitySystem private void ToggleMaskComponents(EntityUid uid, MaskComponent mask, EntityUid wearer, string? equippedPrefix = null, bool isEquip = false) { Dirty(uid, mask); - if (mask.ToggleActionEntity is {} action) + if (mask.ToggleActionEntity is { } action) _actionSystem.SetToggled(action, mask.IsToggled); var maskEv = new ItemMaskToggledEvent(wearer, equippedPrefix, mask.IsToggled, isEquip); @@ -78,6 +78,8 @@ public sealed class MaskSystem : EntitySystem private void OnFolded(Entity ent, ref FoldedEvent args) { + if (ent.Comp.DisableOnFolded) // WD Ahead of wizden + ent.Comp.IsEnabled = !args.IsFolded; ent.Comp.IsToggled = args.IsFolded; ToggleMaskComponents(ent.Owner, ent.Comp, ent.Owner); diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index d4c5d40af2..9f398c4fc1 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/Resources/Changelog/ChangelogWhite.yml @@ -1,26 +1,4 @@ Entries: -- author: RavMorgan - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0430\u0438\ - \ \u043D\u0430 \u043D\u0435\u0439\u0440\u043E\u0441\u0435\u0442\u044F\u0445!" - type: Add - id: 127 - time: '2023-04-08T06:06:22.0000000+00:00' -- author: HitPanda - changes: - - message: "\u0421\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0443 \u0433\u043B\u0430\ - \u0432\u044B \u0441\u043B\u0443\u0436\u0431\u044B \u0431\u0435\u0437\u043E\u043F\ - \u0430\u0441\u043D\u043E\u0441\u0442\u0438 \u0432\u0435\u0440\u043D\u0443\u043B\ - \u0438 \u043F\u0440\u0435\u0436\u043D\u044E\u044E \u0432\u0435\u0440\u0441\u0438\ - \u044E, \u0435\u0433\u043E \u0442\u0435\u043A\u0443\u0449\u0430\u044F \u0432\ - \u0435\u0440\u0441\u0438\u044F \u0437\u0430\u043C\u0435\u043D\u0438\u043B\u0430\ - \ \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440 \u0432\u0430\u0440\u0434\u0435\ - \u043D\u0430, \u043A\u0430\u043A \u0438 \u0434\u043E\u043B\u0436\u043D\u043E\ - \ \u0431\u044B\u043B\u043E \u0431\u044B\u0442\u044C \u0438\u0437\u043D\u0430\ - \u0447\u0430\u043B\u044C\u043D\u043E." - type: Fix - id: 128 - time: '2023-04-08T12:18:55.0000000+00:00' - author: HitPanda changes: - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0442\u0438\u043F\u043E\u0432\ @@ -8911,3 +8889,24 @@ id: 626 time: '2024-12-12T20:31:26.0000000+00:00' url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/817 +- author: BIG_Zi_348 + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043D\u0435\ + \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\u0435 \u043F\u043E\u0432\ + \u0435\u0434\u0435\u043D\u0438\u0435 \u0431\u0430\u043D\u0434\u0430\u043D\u044B\ + ." + type: Fix + id: 627 + time: '2024-12-13T18:18:04.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/818 +- author: BIG_Zi_348 + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u0430\u0432\u0442\ + \u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435 \u0433\u043E\ + \u043B\u043E\u0441\u043E\u0432\u0430\u043D\u0438\u0435 \u0437\u0430 \u0432\u044B\ + \u0431\u043E\u0440 \u0440\u0435\u0436\u0438\u043C\u0430 \u0438 \u043A\u0430\u0440\ + \u0442\u044B." + type: Add + id: 628 + time: '2024-12-13T18:43:45.0000000+00:00' + url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/819 diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 51a56f1f1d..007cba3f22 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -7,6 +7,8 @@ folded: true - type: Mask isToggled: true + enabled: false + disableOnFolded: true - type: IngestionBlocker enabled: false - type: IdentityBlocker @@ -20,6 +22,8 @@ - state: icon_mask map: [ "unfoldedLayer" ] visible: false + - type: HideLayerClothing # needed since head bandana inherits from mask bandana + slots: [] - type: Tag tags: - Bandana diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml index f5ad2fb6c8..a3a0348e73 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml @@ -12,6 +12,7 @@ unfoldedSlots: - MASK - type: Mask + disableOnFolded: true - type: IngestionBlocker - type: IdentityBlocker coverage: MOUTH diff --git a/Resources/Prototypes/Maps/DryDock.yml b/Resources/Prototypes/Maps/DryDock.yml index 71b7f9d6e3..dca46cdeb4 100644 --- a/Resources/Prototypes/Maps/DryDock.yml +++ b/Resources/Prototypes/Maps/DryDock.yml @@ -2,7 +2,7 @@ id: DryDock mapName: 'DryDock Station' mapPath: /Maps/_Honk/Stations/DryDock.yml - minPlayers: 0 # Amour + minPlayers: 0 stations: DryDockStation: stationProto: StandardNanotrasenStation diff --git a/Resources/Prototypes/Maps/WonderBox.yml b/Resources/Prototypes/Maps/WonderBox.yml index 57c17f2976..dbb7efd18e 100644 --- a/Resources/Prototypes/Maps/WonderBox.yml +++ b/Resources/Prototypes/Maps/WonderBox.yml @@ -2,7 +2,7 @@ id: WonderBox mapName: 'WonderBox Station' mapPath: /Maps/_Honk/Stations/WonderBox.yml - minPlayers: 0 # Amour + minPlayers: 0 stations: WonderBoxStation: stationProto: StandardNanotrasenStation diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index fcf33b54a5..11216b00f5 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -2,7 +2,7 @@ id: Meta mapName: 'Meta Station' mapPath: /Maps/_Honk/Stations/Meta.yml - minPlayers: 0 # Amour + minPlayers: 0 stations: Meta: stationProto: StandardNanotrasenStation diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 709135fa5c..3b89fd345f 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -33,7 +33,7 @@ - extended - shittersafari name: extended-title - showInVote: true # Amour EDIT + showInVote: true # WD EDIT description: extended-description rules: - BasicStationEventScheduler @@ -46,7 +46,7 @@ - greenshift - shittersafarideluxeedition name: greenshift-title - showInVote: true # Amour EDIT + showInVote: true # WD EDIT description: greenshift-description rules: - BasicRoundstartVariation