From 1d571f78e673f2f8096b8bfd7f7caf3c114e78c1 Mon Sep 17 00:00:00 2001 From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com> Date: Sat, 21 Sep 2024 18:09:12 +0300 Subject: [PATCH] Yes (#8) (cherry picked from commit 3d083befca212455cffcae56b84ee55050ad62be) --- Content.Server/Strip/StrippableSystem.cs | 2 +- .../_White/BucketHelmet/BucketHelmetSystem.cs | 4 ++-- .../_White/Other/Suhariki/SuharikiComponent.cs | 10 +++++++--- Content.Server/_White/Other/Suhariki/SuharikiSystem.cs | 7 +++++-- .../_White/BucketHelmet/BucketHelmetComponent.cs | 2 +- .../BucketHelmet/PreventStrippingFromEarsComponent.cs | 2 +- .../Components/DamageableClothingComponent.cs | 3 ++- .../Components/DamageableClothingUserComponent.cs | 4 ++-- .../DamageableClothing/DamageableClothingSystem.cs | 5 ++++- .../DamageableClothing/DamageableClothingUserSystem.cs | 5 ++++- .../ClothingOuterArmorReflectiveGhetto.yml | 3 ++- .../Entities/Objects/Consumable/Food/suhariki.yml | 3 ++- .../Entities/Objects/Shields/MirrorShieldGhetto.yml | 3 ++- 13 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Content.Server/Strip/StrippableSystem.cs b/Content.Server/Strip/StrippableSystem.cs index 3bb3050eed..1c95a69389 100644 --- a/Content.Server/Strip/StrippableSystem.cs +++ b/Content.Server/Strip/StrippableSystem.cs @@ -136,7 +136,7 @@ namespace Content.Server.Strip } // WD EDIT END - // WD ENGI EXCLUSIVE START EDIT + // WD ENGI EXCLUSIVE EDIT START if (args.Slot == "ears" && TryComp(strippable, out PreventStrippingFromEarsComponent? _)) { var message = Loc.GetString("buckethelmet-cant-strip"); diff --git a/Content.Server/_White/BucketHelmet/BucketHelmetSystem.cs b/Content.Server/_White/BucketHelmet/BucketHelmetSystem.cs index c5a1d51b4f..d37bba310f 100644 --- a/Content.Server/_White/BucketHelmet/BucketHelmetSystem.cs +++ b/Content.Server/_White/BucketHelmet/BucketHelmetSystem.cs @@ -1,14 +1,14 @@ using Content.Shared.Inventory.Events; using Content.Shared._White.BucketHelmet; -// WD Engi Exclusive + namespace Content.Server._White.BucketHelmet; /// /// This handles placemet of PreventStrippingFromEarsComponent when bucket helmet is in use. +/// WD Engi Exclusive. /// public sealed class BucketHelmetSystem : EntitySystem { - /// public override void Initialize() { SubscribeLocalEvent(OnGotEquipped); diff --git a/Content.Server/_White/Other/Suhariki/SuharikiComponent.cs b/Content.Server/_White/Other/Suhariki/SuharikiComponent.cs index f98ad74000..ec72d12478 100644 --- a/Content.Server/_White/Other/Suhariki/SuharikiComponent.cs +++ b/Content.Server/_White/Other/Suhariki/SuharikiComponent.cs @@ -3,9 +3,13 @@ using Content.Shared.Damage; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Content.Shared.Chat.Prototypes; using Robust.Shared.Audio; -// WD Engi Exclusive + namespace Content.Server._White.Other.Suhariki; +/// +/// Makes you loose your tooth and have funny accent. +/// WD Engi Exclusive. +/// [RegisterComponent, Access(typeof(SuharikiSystem))] public sealed partial class SuharikiComponent : Component @@ -32,13 +36,13 @@ public sealed partial class SuharikiComponent : Component /// /// The prototype that will be spawned on event. /// - [DataField("holdingPrototype", customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] + [DataField(customTypeSerializer: typeof(PrototypeIdSerializer)), ViewVariables(VVAccess.ReadWrite)] public string HoldingPrototype = "SuharikiTooth"; /// /// Emote triggered on event. /// - [DataField("emote", customTypeSerializer: typeof(PrototypeIdSerializer))] + [DataField(customTypeSerializer: typeof(PrototypeIdSerializer))] public string EmoteId = "Scream"; /// diff --git a/Content.Server/_White/Other/Suhariki/SuharikiSystem.cs b/Content.Server/_White/Other/Suhariki/SuharikiSystem.cs index 53fa8d5c9b..4a8e3f5178 100644 --- a/Content.Server/_White/Other/Suhariki/SuharikiSystem.cs +++ b/Content.Server/_White/Other/Suhariki/SuharikiSystem.cs @@ -19,10 +19,13 @@ using Robust.Shared.Utility; using Content.Shared.Body.Components; using Content.Server.Body.Systems; using Content.Server.Body.Components; -using Content.Server.Speech.EntitySystems; using Content.Server.Speech.Components; -// WD Engi Exclusive + namespace Content.Server._White.Other.Suhariki; + +/// +/// WD Engi Exclusive. +/// public sealed class SuharikiSystem : EntitySystem { [Dependency] private readonly PopupSystem _popup = default!; diff --git a/Content.Shared/_White/BucketHelmet/BucketHelmetComponent.cs b/Content.Shared/_White/BucketHelmet/BucketHelmetComponent.cs index c16a638539..b7f94bed69 100644 --- a/Content.Shared/_White/BucketHelmet/BucketHelmetComponent.cs +++ b/Content.Shared/_White/BucketHelmet/BucketHelmetComponent.cs @@ -1,8 +1,8 @@ -// WD Engi Exclusive namespace Content.Shared._White.BucketHelmet; /// /// This is used for bucket helmet. +/// WD Engi Exclusive. /// [RegisterComponent] public sealed partial class BucketHelmetComponent : Component diff --git a/Content.Shared/_White/BucketHelmet/PreventStrippingFromEarsComponent.cs b/Content.Shared/_White/BucketHelmet/PreventStrippingFromEarsComponent.cs index 681c344430..0d71b9fd2e 100644 --- a/Content.Shared/_White/BucketHelmet/PreventStrippingFromEarsComponent.cs +++ b/Content.Shared/_White/BucketHelmet/PreventStrippingFromEarsComponent.cs @@ -1,8 +1,8 @@ -// WD Engi Exclusive namespace Content.Shared._White.BucketHelmet; /// /// This is used to block stripping headsets when bucket helmet is on. +/// WD Engi Exclusive. /// [RegisterComponent] public sealed partial class PreventStrippingFromEarsComponent : Component diff --git a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingComponent.cs b/Content.Shared/_White/DamageableClothing/Components/DamageableClothingComponent.cs index ea7dd2c437..e213bcd7f7 100644 --- a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingComponent.cs +++ b/Content.Shared/_White/DamageableClothing/Components/DamageableClothingComponent.cs @@ -1,10 +1,11 @@ using Content.Shared.Damage; using Robust.Shared.GameStates; -// WD Engi Exclusive + namespace Content.Shared.DamageableClothing; /// /// This component goes on an equippable item that should take damage while in use. +/// WD Engi Exclusive. /// [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class DamageableClothingComponent : Component diff --git a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingUserComponent.cs b/Content.Shared/_White/DamageableClothing/Components/DamageableClothingUserComponent.cs index ef78a0b308..079f4c2173 100644 --- a/Content.Shared/_White/DamageableClothing/Components/DamageableClothingUserComponent.cs +++ b/Content.Shared/_White/DamageableClothing/Components/DamageableClothingUserComponent.cs @@ -1,8 +1,8 @@ -// WD Engi Exclusive namespace Content.Shared.DamageableClothing; /// -/// This component gets dynamically added to an Entity via the +/// This component gets dynamically added to an Entity via the . +/// WD Engi Exclusive. /// [RegisterComponent] public sealed partial class DamageableClothingUserComponent : Component diff --git a/Content.Shared/_White/DamageableClothing/DamageableClothingSystem.cs b/Content.Shared/_White/DamageableClothing/DamageableClothingSystem.cs index c32ed9614b..9b32b03706 100644 --- a/Content.Shared/_White/DamageableClothing/DamageableClothingSystem.cs +++ b/Content.Shared/_White/DamageableClothing/DamageableClothingSystem.cs @@ -1,8 +1,11 @@ using Robust.Shared.Timing; using Content.Shared.Inventory.Events; -// WD Engi Exclusive + namespace Content.Shared.DamageableClothing; +/// +/// WD Engi Exclusive. +/// public sealed partial class DamageableClothingSystem : EntitySystem { [Dependency] private readonly IGameTiming _gameTiming = default!; diff --git a/Content.Shared/_White/DamageableClothing/DamageableClothingUserSystem.cs b/Content.Shared/_White/DamageableClothing/DamageableClothingUserSystem.cs index 7d1f031725..b8ec9a78b6 100644 --- a/Content.Shared/_White/DamageableClothing/DamageableClothingUserSystem.cs +++ b/Content.Shared/_White/DamageableClothing/DamageableClothingUserSystem.cs @@ -1,7 +1,10 @@ using Content.Shared.Damage; -// WD Engi Exclusive + namespace Content.Shared.DamageableClothing; +/// +/// WD Engi Exclusive. +/// public sealed partial class DamageableClothingSystem { [Dependency] private readonly DamageableSystem _damageable = default!; diff --git a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml index 310aeb1f84..65920157f6 100644 --- a/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml +++ b/Resources/Prototypes/_White/Entities/Clothing/OuterClothing/ClothingOuterArmorReflectiveGhetto.yml @@ -1,4 +1,5 @@ -- type: entity # WD Engi Exclusive +# WD Engi Exclusive +- type: entity parent: ClothingOuterArmorBasic id: ClothingOuterArmorReflectiveGhetto name: makeshift reflective vest diff --git a/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/suhariki.yml b/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/suhariki.yml index 6e698e20d4..f154e15c0b 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/suhariki.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Consumable/Food/suhariki.yml @@ -1,4 +1,5 @@ -- type: entity # WD Engi Exclusive +# WD Engi Exclusive +- type: entity parent: BaseItem id: FoodSnackSuhariki name: suhariki diff --git a/Resources/Prototypes/_White/Entities/Objects/Shields/MirrorShieldGhetto.yml b/Resources/Prototypes/_White/Entities/Objects/Shields/MirrorShieldGhetto.yml index 0b30b8833b..f7f60383a6 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Shields/MirrorShieldGhetto.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Shields/MirrorShieldGhetto.yml @@ -1,4 +1,5 @@ -- type: entity # WD Engi Exclusive +# WD Engi Exclusive +- type: entity name: makeshift mirror shield parent: BaseItem id: MirrorShieldGhetto