From a4db634a559716383fb99964cb344263c156ed7a Mon Sep 17 00:00:00 2001 From: RavMorgan <48182970+RavMorgan@users.noreply.github.com> Date: Fri, 26 May 2023 09:52:47 +0300 Subject: [PATCH] [FIX] yml linter (#121) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Felinid linter * Мб пофиксится * сука? * Revert "сука?" This reverts commit daea319b5b1100981357ec76156da18e2767a39f. * А щас.... * Короче насрано * Дебил --------- Co-authored-by: Mona Hmiza <> # Conflicts: # Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs # Resources/Prototypes/Damage/modifier_sets.yml --- .../White/MeatyOre/MeatyOreStoreSystem.cs | 11 ----------- Content.Shared/White/MeatyOre/SharedMeatyOre.cs | 14 +++----------- .../Catalog/MeatyOrePanel/meatyore_catalog.yml | 16 ---------------- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs b/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs index 09db4c2993..dba83227b7 100644 --- a/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs +++ b/Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs @@ -55,14 +55,12 @@ public sealed class MeatyOreStoreSystem : EntitySystem SubscribeLocalEvent(OnPostRoundCleanup); SubscribeNetworkEvent(OnShopRequested); - SubscribeLocalEvent(OnAntagPurchase); SubscribeLocalEvent>(MeatyOreVerbs); } private void MeatyOreVerbs(GetVerbsEvent ev) { - if(ev.User == ev.Target) return; if(!EntityManager.TryGetComponent(ev.User, out var actorComponent)) return; if(!_sponsorsManager.TryGetInfo(actorComponent.PlayerSession.UserId, out _)) return; if(!HasComp(ev.Target)) return; @@ -112,15 +110,6 @@ public sealed class MeatyOreStoreSystem : EntitySystem } MeatyOrePanelEnabled = newValue; } - - - private void OnAntagPurchase(EntityUid uid, MindComponent component, MeatyTraitorRequestActionEvent args) - { - if(component.Session == null) return; - - _traitorRuleSystem.MakeTraitor(component.Session!); - } - private void OnShopRequested(MeatyOreShopRequestEvent msg, EntitySessionEventArgs args) { diff --git a/Content.Shared/White/MeatyOre/SharedMeatyOre.cs b/Content.Shared/White/MeatyOre/SharedMeatyOre.cs index 0ee10e94b4..d88fb75e2c 100644 --- a/Content.Shared/White/MeatyOre/SharedMeatyOre.cs +++ b/Content.Shared/White/MeatyOre/SharedMeatyOre.cs @@ -1,20 +1,12 @@ -using Robust.Shared.GameStates; +using Content.Shared.Actions.ActionTypes; +using Robust.Shared.GameStates; using Robust.Shared.Serialization; using Component = Robust.Shared.GameObjects.Component; namespace Content.Shared.White.MeatyOre; - [Serializable, NetSerializable] - public sealed class MeatyOreShopRequestEvent : EntityEventArgs {} - [Serializable, NetSerializable] -public sealed class MeatyTraitorRequestActionEvent -{ - public override bool Equals(object? obj) - { - return true; - } -} +public sealed class MeatyOreShopRequestEvent : EntityEventArgs {} [NetworkedComponent, RegisterComponent] public sealed partial class IgnorBUIInteractionRangeComponent : Component diff --git a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml index 9a86646620..2a79df3ed0 100644 --- a/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml +++ b/Resources/Prototypes/Catalog/MeatyOrePanel/meatyore_catalog.yml @@ -1478,22 +1478,6 @@ categories: - MeatyOreToys -# ANTAG - -- type: listing - id: MeatyBecomeTraitor - name: Антажка - description: Выдать себе антажку - categories: - - MeatyOreAntag - cost: - MeatyOreCoin: 10 - conditions: - - !type:BuyerBlockForAntagCondition - - !type:BuyerBlockForMindProtected - productEvent: !type:MeatyTraitorRequestActionEvent - - # Special - type: listing