From 81db940b707312828109c63217ffa63f762ac73e Mon Sep 17 00:00:00 2001 From: Schrodinger71 Date: Tue, 10 Sep 2024 12:02:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D0=B8=D1=80=D0=B0=D0=B5=D0=BC=20?= =?UTF-8?q?=D1=89=D0=B8=D1=82=D0=BA=D0=BE=D0=B4=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PointLightColorBlueSystem.cs | 65 ------------------- .../PointLightColorBlueComponent.cs | 37 ----------- .../ADT/_TimePatrol/time_sesurity.yml | 9 --- 3 files changed, 111 deletions(-) delete mode 100644 Content.Server/ADT/PointLightColorBlue/PointLightColorBlueSystem.cs delete mode 100644 Content.Shared/ADT/PointLightColorBlue/PointLightColorBlueComponent.cs diff --git a/Content.Server/ADT/PointLightColorBlue/PointLightColorBlueSystem.cs b/Content.Server/ADT/PointLightColorBlue/PointLightColorBlueSystem.cs deleted file mode 100644 index d4315b2e3e2..00000000000 --- a/Content.Server/ADT/PointLightColorBlue/PointLightColorBlueSystem.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Content.Server.Administration.Commands; -using Content.Server.Popups; -using Content.Shared.Popups; -using Content.Shared.Mobs; -using Content.Server.Chat; -using Content.Server.Chat.Systems; -using Content.Shared.Chat.Prototypes; -using Robust.Shared.Random; -using Content.Shared.Stunnable; -using Content.Shared.Damage.Prototypes; -using Content.Shared.Damage; -using Robust.Shared.Prototypes; -using Content.Server.Emoting.Systems; -using Content.Server.Speech.EntitySystems; -using Content.Shared.ADT.PointLightColorBlue; -using Content.Shared.Interaction.Components; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; -using System.Timers; -using System.ComponentModel; -using System.Linq; -using Robust.Shared.Timing; -using Robust.Shared.Utility; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; - -public sealed class PointLightColorBlueSystem : EntitySystem -{ - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly PointLightSystem _light = default!; - - //[Dependency] private readonly PointLightComponent _lightCom = = default!; - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnComponentStartup); - //SubscribeLocalEvent(OnMobState); - } - // /// - // /// On death removes active comps. - // /// - // private void OnMobState(EntityUid uid, PointLightColorBlueComponent component, MobStateChangedEvent args) - // { - // if (args.NewMobState == MobState.Dead || component == null) - // { - // RemComp(uid); - // //var damageSpec = new DamageSpecifier(_prototypeManager.Index("Genetic"), 300); - // //_damageableSystem.TryChangeDamage(uid, damageSpec); - // } - // } - private void OnComponentStartup(EntityUid uid, PointLightColorBlueComponent component, ComponentStartup args) - { - AddComp(uid); - _light.SetEnabled(uid, true); - _light.SetColor(uid, Color.FromHex("#005f9e")); - _light.SetRadius(uid, 1.2f); - _light.SetEnergy(uid, 160f); - _audioSystem.PlayPvs(component.Sound, uid); //, AudioParams.Default.WithVolume(component.Sound)); - //_light. - } -} diff --git a/Content.Shared/ADT/PointLightColorBlue/PointLightColorBlueComponent.cs b/Content.Shared/ADT/PointLightColorBlue/PointLightColorBlueComponent.cs deleted file mode 100644 index c59d46c1db0..00000000000 --- a/Content.Shared/ADT/PointLightColorBlue/PointLightColorBlueComponent.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Robust.Shared.Audio; -using Content.Shared.Chat.Prototypes; -using Robust.Shared.GameStates; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.ADT.PointLightColorBlue; -[RegisterComponent] -[NetworkedComponent] -public sealed partial class PointLightColorBlueComponent : Component -{ - [DataField] - public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/ADT/Weapons/Guns/Gunshots/nakop_energii.ogg"); - - - - - /// - /// timings for giggles and knocks. - /// - //[ViewVariables(VVAccess.ReadWrite)] - //public TimeSpan DamageGiggleCooldown = TimeSpan.FromSeconds(2); - //[ViewVariables(VVAccess.ReadWrite)] - //public float KnockChance = 0.05f; - //[ViewVariables(VVAccess.ReadWrite)] - //public float GiggleRandomChance = 0.3f; - - // [ViewVariables(VVAccess.ReadWrite)] - // public int SpeakTimerRead = 8000; - - // [ViewVariables(VVAccess.ReadWrite)] - // public int EmoteTimerRead = 9000; - - // [DataField("speakMessage")] - // public string? PostingMessageSpeak = "Вульп-вульп!"; - - // [DataField("emoteMessage")] - // public string? PostingMessageEmote = "Кхе"; -} diff --git a/Resources/Prototypes/ADT/_TimePatrol/time_sesurity.yml b/Resources/Prototypes/ADT/_TimePatrol/time_sesurity.yml index 80bf04252a6..91e9a5b0795 100644 --- a/Resources/Prototypes/ADT/_TimePatrol/time_sesurity.yml +++ b/Resources/Prototypes/ADT/_TimePatrol/time_sesurity.yml @@ -347,15 +347,6 @@ component: SingularityDistortion type: Add refresh: false - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: ADTChloralHydrate - min: 15 - key: ForcedSleep - component: PointLightColorBlue #Эту штуку менять - type: Add - refresh: false - !type:GenericStatusEffect conditions: - !type:ReagentThreshold