diff --git a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs index 96792fb3eae..363fd004e3b 100644 --- a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs +++ b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs @@ -14,7 +14,7 @@ public sealed class LocalityLoaderSystem : BaseWorldSystem [Dependency] private readonly TransformSystem _xformSys = default!; // Duration to reset the despawn timer to when a debris is loaded into a player's view. - private const float DebrisActiveDuration = 360; // 10 минут Corvax + private const float DebrisActiveDuration = 420; // 7 минут Corvax, а то 5 было маловато людям. /// public override void Update(float frameTime) @@ -82,4 +82,4 @@ private void ResetTimedDespawn(EntityUid uid) /// /// An event fired on a loadable entity when a local loader enters its vicinity. /// -public record struct LocalStructureLoadedEvent; \ No newline at end of file +public record struct LocalStructureLoadedEvent; diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index aedfd262d80..f8f88818912 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -121,13 +121,13 @@ color: "#1e070e" castShadows: false - type: GravityAnomaly - - type: GravityWell +# - type: GravityWell # Оптимизацияи - type: RadiationSource - type: Physics bodyType: Dynamic bodyStatus: InAir - type: CanMoveInAir - - type: RandomWalk +# - type: RandomWalk # Оптимизация - type: SingularityDistortion intensity: 1000 falloffPower: 2.7 diff --git a/Resources/Prototypes/Entities/World/Debris/base_debris.yml b/Resources/Prototypes/Entities/World/Debris/base_debris.yml index b31e94f8639..3325336e350 100644 --- a/Resources/Prototypes/Entities/World/Debris/base_debris.yml +++ b/Resources/Prototypes/Entities/World/Debris/base_debris.yml @@ -5,4 +5,10 @@ - type: OwnedDebris - type: LocalityLoader - type: TimedDespawn - lifetime: 120 \ No newline at end of file + lifetime: 120 + - type: Physics + bodyStatus: InAir + angularDamping: 999999 + linearDamping: 999999 + fixedRotation: False + bodyType: Dynamic diff --git a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml index 49b173b2b41..ec54ff9e89d 100644 --- a/Resources/Prototypes/XenoArch/Effects/normal_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/normal_effects.yml @@ -266,26 +266,26 @@ effectHint: artifact-effect-hint-electrical-interference components: - type: KnockArtifact - -- type: artifactEffect - id: EffectMagnet - targetDepth: 1 - effectHint: artifact-effect-hint-magnet - components: - - type: GravityWell - maxRange: 3 - baseRadialAcceleration: 1 - baseTangentialAcceleration: 3 - -- type: artifactEffect - id: EffectAntiMagnet - targetDepth: 1 - effectHint: artifact-effect-hint-magnet - components: - - type: GravityWell - maxRange: 3 - baseRadialAcceleration: -1 - baseTangentialAcceleration: -3 +# Jgnbvbpfwbz +#- type: artifactEffect +# id: EffectMagnet +# targetDepth: 1 +# effectHint: artifact-effect-hint-magnet +# components: +# - type: GravityWell +# maxRange: 3 +# baseRadialAcceleration: 1 +# baseTangentialAcceleration: 3 + +#- type: artifactEffect +# id: EffectAntiMagnet +# targetDepth: 1 +# effectHint: artifact-effect-hint-magnet +# components: +# - type: GravityWell +# maxRange: 3 +# baseRadialAcceleration: -1 +# baseTangentialAcceleration: -3 - type: artifactEffect id: EffectInvisibility diff --git a/Resources/Prototypes/_NF/Maps/POI/cove.yml b/Resources/Prototypes/_NF/Maps/POI/cove.yml index d3657520692..b45734db320 100644 --- a/Resources/Prototypes/_NF/Maps/POI/cove.yml +++ b/Resources/Prototypes/_NF/Maps/POI/cove.yml @@ -13,4 +13,4 @@ overflowJobs: [] availableJobs: PirateCaptain: [ 1, 1 ] - PirateFirstMate: [ 2, 2 ] + PirateFirstMate: [ 0, 0 ] # нет спавнера у парней