- fix: your devstvennost
* - fix: AntiTroopYablyaSystem * - add: command for penis * - fix: Я вам починил ширинку, не благодарите
This commit is contained in:
@@ -29,7 +29,7 @@ public sealed class HoleSystem : SharedHoleSystem
|
|||||||
|
|
||||||
if (component.Parent is not null)
|
if (component.Parent is not null)
|
||||||
{
|
{
|
||||||
UpdateVisual(GetEntity(component.Parent.Value),uid);
|
UpdateVisual(GetEntity(component.Parent.Value),uid,!HasAccessTo(GetEntity(component.Parent.Value),uid));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,14 @@
|
|||||||
using Content.Server.Chemistry.Containers.EntitySystems;
|
using Content.Server.Administration;
|
||||||
|
using Content.Server.Chemistry.Containers.EntitySystems;
|
||||||
using Content.Shared._Amour.Hole;
|
using Content.Shared._Amour.Hole;
|
||||||
|
using Content.Shared.Administration;
|
||||||
using Robust.Server.Containers;
|
using Robust.Server.Containers;
|
||||||
using Robust.Shared.Containers;
|
using Robust.Shared.Containers;
|
||||||
using Robust.Shared.GameStates;
|
using Robust.Shared.GameStates;
|
||||||
|
using Robust.Shared.Prototypes;
|
||||||
using Robust.Shared.Timing;
|
using Robust.Shared.Timing;
|
||||||
|
using Robust.Shared.Toolshed;
|
||||||
|
using Robust.Shared.Toolshed.TypeParsers;
|
||||||
|
|
||||||
namespace Content.Server._Amour.Hole;
|
namespace Content.Server._Amour.Hole;
|
||||||
|
|
||||||
@@ -29,3 +34,16 @@ public sealed partial class HoleSystem : SharedHoleSystem
|
|||||||
UpdateSolution(frameTime);
|
UpdateSolution(frameTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[ToolshedCommand, AdminCommand(AdminFlags.Fun)]
|
||||||
|
internal sealed class AddHoleCommand : ToolshedCommand
|
||||||
|
{
|
||||||
|
[CommandImplementation]
|
||||||
|
public void AddHole(
|
||||||
|
[CommandInvocationContext] IInvocationContext ctx,
|
||||||
|
[PipedArgument] EntityUid target,
|
||||||
|
[CommandArgument] Prototype<EntityPrototype> prototype)
|
||||||
|
{
|
||||||
|
GetSys<HoleSystem>().AddHole(target,prototype.Value.ID);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ using Content.Shared.Fluids;
|
|||||||
using Content.Shared.Humanoid;
|
using Content.Shared.Humanoid;
|
||||||
using Content.Shared.Interaction.Events;
|
using Content.Shared.Interaction.Events;
|
||||||
using Content.Shared.Mind;
|
using Content.Shared.Mind;
|
||||||
|
using Content.Shared.Mobs.Systems;
|
||||||
using Content.Shared.Movement.Events;
|
using Content.Shared.Movement.Events;
|
||||||
using Content.Shared.Random.Helpers;
|
using Content.Shared.Random.Helpers;
|
||||||
using Content.Shared.Verbs;
|
using Content.Shared.Verbs;
|
||||||
@@ -44,6 +45,7 @@ public sealed class InteractionPanelSystem : EntitySystem
|
|||||||
[Dependency] private readonly IChatManager _chatManager = default!;
|
[Dependency] private readonly IChatManager _chatManager = default!;
|
||||||
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
[Dependency] private readonly DoAfterSystem _doAfterSystem = default!;
|
||||||
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
||||||
|
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
|
||||||
|
|
||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
@@ -86,6 +88,8 @@ public sealed class InteractionPanelSystem : EntitySystem
|
|||||||
|
|
||||||
private void OnVerb(EntityUid uid, InteractionPanelComponent component, GetVerbsEvent<Verb> args)
|
private void OnVerb(EntityUid uid, InteractionPanelComponent component, GetVerbsEvent<Verb> args)
|
||||||
{
|
{
|
||||||
|
if (!_mobStateSystem.IsAlive(args.User) || !_mobStateSystem.IsAlive(uid))
|
||||||
|
return;
|
||||||
args.Verbs.Add(new Verb()
|
args.Verbs.Add(new Verb()
|
||||||
{
|
{
|
||||||
Text = Loc.GetString("interaction-open"),
|
Text = Loc.GetString("interaction-open"),
|
||||||
@@ -100,6 +104,9 @@ public sealed class InteractionPanelSystem : EntitySystem
|
|||||||
|| !_playerManager.TryGetSessionByEntity(panelOpener, out var session))
|
|| !_playerManager.TryGetSessionByEntity(panelOpener, out var session))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (!_mobStateSystem.IsAlive(user) || !_mobStateSystem.IsAlive(target))
|
||||||
|
return;
|
||||||
|
|
||||||
_eui.OpenEui(new InteractionPanelEui(
|
_eui.OpenEui(new InteractionPanelEui(
|
||||||
new Entity<InteractionPanelComponent>(user,user.Comp),
|
new Entity<InteractionPanelComponent>(user,user.Comp),
|
||||||
new Entity<InteractionPanelComponent>(target,target.Comp)),
|
new Entity<InteractionPanelComponent>(target,target.Comp)),
|
||||||
@@ -119,6 +126,9 @@ public sealed class InteractionPanelSystem : EntitySystem
|
|||||||
|| !_prototypeManager.TryIndex(protoId, out var prototype))
|
|| !_prototypeManager.TryIndex(protoId, out var prototype))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (!_mobStateSystem.IsAlive(user) || !_mobStateSystem.IsAlive(target))
|
||||||
|
return;
|
||||||
|
|
||||||
if(!Check(user!,target!,prototype, out var check))
|
if(!Check(user!,target!,prototype, out var check))
|
||||||
{
|
{
|
||||||
if(_playerManager.TryGetSessionByEntity(user,out var session) || session is null)
|
if(_playerManager.TryGetSessionByEntity(user,out var session) || session is null)
|
||||||
|
|||||||
Reference in New Issue
Block a user