[FIX] yml linter (#121)
* 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
This commit is contained in:
@@ -55,14 +55,12 @@ public sealed class MeatyOreStoreSystem : EntitySystem
|
|||||||
|
|
||||||
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnPostRoundCleanup);
|
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnPostRoundCleanup);
|
||||||
SubscribeNetworkEvent<MeatyOreShopRequestEvent>(OnShopRequested);
|
SubscribeNetworkEvent<MeatyOreShopRequestEvent>(OnShopRequested);
|
||||||
SubscribeLocalEvent<MindComponent, MeatyTraitorRequestActionEvent>(OnAntagPurchase);
|
|
||||||
SubscribeLocalEvent<GetVerbsEvent<Verb>>(MeatyOreVerbs);
|
SubscribeLocalEvent<GetVerbsEvent<Verb>>(MeatyOreVerbs);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MeatyOreVerbs(GetVerbsEvent<Verb> ev)
|
private void MeatyOreVerbs(GetVerbsEvent<Verb> ev)
|
||||||
{
|
{
|
||||||
if(ev.User == ev.Target) return;
|
|
||||||
if(!EntityManager.TryGetComponent<ActorComponent>(ev.User, out var actorComponent)) return;
|
if(!EntityManager.TryGetComponent<ActorComponent>(ev.User, out var actorComponent)) return;
|
||||||
if(!_sponsorsManager.TryGetInfo(actorComponent.PlayerSession.UserId, out _)) return;
|
if(!_sponsorsManager.TryGetInfo(actorComponent.PlayerSession.UserId, out _)) return;
|
||||||
if(!HasComp<HumanoidAppearanceComponent>(ev.Target)) return;
|
if(!HasComp<HumanoidAppearanceComponent>(ev.Target)) return;
|
||||||
@@ -112,15 +110,6 @@ public sealed class MeatyOreStoreSystem : EntitySystem
|
|||||||
}
|
}
|
||||||
MeatyOrePanelEnabled = newValue;
|
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)
|
private void OnShopRequested(MeatyOreShopRequestEvent msg, EntitySessionEventArgs args)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,12 @@
|
|||||||
using Robust.Shared.GameStates;
|
using Content.Shared.Actions.ActionTypes;
|
||||||
|
using Robust.Shared.GameStates;
|
||||||
using Robust.Shared.Serialization;
|
using Robust.Shared.Serialization;
|
||||||
using Component = Robust.Shared.GameObjects.Component;
|
using Component = Robust.Shared.GameObjects.Component;
|
||||||
|
|
||||||
namespace Content.Shared.White.MeatyOre;
|
namespace Content.Shared.White.MeatyOre;
|
||||||
|
|
||||||
[Serializable, NetSerializable]
|
|
||||||
public sealed class MeatyOreShopRequestEvent : EntityEventArgs {}
|
|
||||||
|
|
||||||
[Serializable, NetSerializable]
|
[Serializable, NetSerializable]
|
||||||
public sealed class MeatyTraitorRequestActionEvent
|
public sealed class MeatyOreShopRequestEvent : EntityEventArgs {}
|
||||||
{
|
|
||||||
public override bool Equals(object? obj)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[NetworkedComponent, RegisterComponent]
|
[NetworkedComponent, RegisterComponent]
|
||||||
public sealed partial class IgnorBUIInteractionRangeComponent : Component
|
public sealed partial class IgnorBUIInteractionRangeComponent : Component
|
||||||
|
|||||||
@@ -1478,22 +1478,6 @@
|
|||||||
categories:
|
categories:
|
||||||
- MeatyOreToys
|
- MeatyOreToys
|
||||||
|
|
||||||
# ANTAG
|
|
||||||
|
|
||||||
- type: listing
|
|
||||||
id: MeatyBecomeTraitor
|
|
||||||
name: Антажка
|
|
||||||
description: Выдать себе антажку
|
|
||||||
categories:
|
|
||||||
- MeatyOreAntag
|
|
||||||
cost:
|
|
||||||
MeatyOreCoin: 10
|
|
||||||
conditions:
|
|
||||||
- !type:BuyerBlockForAntagCondition
|
|
||||||
- !type:BuyerBlockForMindProtected
|
|
||||||
productEvent: !type:MeatyTraitorRequestActionEvent
|
|
||||||
|
|
||||||
|
|
||||||
# Special
|
# Special
|
||||||
|
|
||||||
- type: listing
|
- type: listing
|
||||||
|
|||||||
Reference in New Issue
Block a user