Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Я починил дилдо блять... (#165)

Browse Source
This commit is contained in:
BIGZi0348
2024-11-08 20:56:26 +03:00
committed by GitHub
parent 0f35e94fa2
commit e4fbe81aa7
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/_Amour/Vibrator/VibratorSystem.cs
View File

@@ -20,16 +20,16 @@ public sealed class VibratorSystem : SharedVibratorSystem
private void OnAnimationCompleted(EntityUid uid, VibratorComponent component, AnimationCompletedEvent args) private void OnAnimationCompleted(EntityUid uid, VibratorComponent component, AnimationCompletedEvent args)
{ {
if(args.Key != _vibration || !component.IsVibrating) if (args.Key != _vibration || !component.IsVibrating)
return; return;
_animationSystem.Play(uid,GetAnimation(), _vibration); _animationSystem.Play(uid, GetAnimation(), _vibration);
} }
public override void ToggleVibrate(EntityUid uid, VibratorComponent component) public override void ToggleVibrate(EntityUid uid, VibratorComponent component)
{ {
if (component.IsVibrating) if (component.IsVibrating)
_animationSystem.Play(uid,GetAnimation(), _vibration); _animationSystem.Play(uid, GetAnimation(), _vibration);
} }

20
Content.Server/_Amour/Vibrator/VibratorSystem.cs
View File

@@ -13,26 +13,30 @@ public sealed class VibratorSystem : SharedVibratorSystem
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<VibratorComponent,UseInHandEvent>(OnUseInHand); SubscribeLocalEvent<VibratorComponent, UseInHandEvent>(OnUseInHand);
SubscribeLocalEvent<VibratorComponent,ComponentInit>(OnInit); SubscribeLocalEvent<VibratorComponent, ComponentInit>(OnInit);
SubscribeLocalEvent<VibratorComponent,SignalReceivedEvent>(OnsignalReceived); SubscribeLocalEvent<VibratorComponent, SignalReceivedEvent>(OnsignalReceived);
} }
private void OnsignalReceived(EntityUid uid, VibratorComponent component,ref SignalReceivedEvent args) private void OnsignalReceived(EntityUid uid, VibratorComponent component, ref SignalReceivedEvent args)
{ {
if(args.Port != component.TogglePort) if (args.Port != component.TogglePort)
return; return;
ToggleVibration(uid,component); ToggleVibration(uid, component);
} }
private void OnInit(EntityUid uid, VibratorComponent component, ComponentInit args) private void OnInit(EntityUid uid, VibratorComponent component, ComponentInit args)
{ {
_signalSystem.EnsureSinkPorts(uid,component.TogglePort); _signalSystem.EnsureSinkPorts(uid, component.TogglePort);
} }
private void OnUseInHand(EntityUid uid, VibratorComponent component, UseInHandEvent args) private void OnUseInHand(EntityUid uid, VibratorComponent component, UseInHandEvent args)
{ {
ToggleVibration(uid,component); if (args.Handled)
return;
ToggleVibration(uid, component);
args.Handled = true;
} }
} }

14
Content.Shared/_Amour/Vibrator/VibratorSystem.cs
View File

@@ -6,31 +6,31 @@ public abstract class SharedVibratorSystem : EntitySystem
{ {
public override void Initialize() public override void Initialize()
{ {
SubscribeLocalEvent<VibratorComponent,ComponentGetState>(OnGetState); SubscribeLocalEvent<VibratorComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<VibratorComponent,ComponentHandleState>(OnHandleState); SubscribeLocalEvent<VibratorComponent, ComponentHandleState>(OnHandleState);
} }
private void OnHandleState(EntityUid uid, VibratorComponent component, ref ComponentHandleState args) private void OnHandleState(EntityUid uid, VibratorComponent component, ref ComponentHandleState args)
{ {
if(args.Current is not VibratorComponentState state) if (args.Current is not VibratorComponentState state)
return; return;
component.IsVibrating = state.IsVibrating; component.IsVibrating = state.IsVibrating;
ToggleVibrate(uid,component); ToggleVibrate(uid, component);
} }
private void OnGetState(EntityUid uid, VibratorComponent component,ref ComponentGetState args) private void OnGetState(EntityUid uid, VibratorComponent component, ref ComponentGetState args)
{ {
args.State = new VibratorComponentState(component.IsVibrating); args.State = new VibratorComponentState(component.IsVibrating);
} }
public void ToggleVibration(EntityUid uid, VibratorComponent? component = null) public void ToggleVibration(EntityUid uid, VibratorComponent? component = null)
{ {
if(!Resolve(uid,ref component)) if (!Resolve(uid, ref component))
return; return;
component.IsVibrating = !component.IsVibrating; component.IsVibrating = !component.IsVibrating;
Dirty(uid,component); Dirty(uid, component);
} }
public virtual void ToggleVibrate(EntityUid uid, VibratorComponent component) public virtual void ToggleVibrate(EntityUid uid, VibratorComponent component)