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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jabak
2024-06-28 11:45:35 +03:00
parent a92082f0b3 c28f5648d0
commit 8de3924481
346 changed files with 1792 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Kitchen/Components/KitchenSpikeComponent.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Shared.Kitchen.Components;
public sealed partial class KitchenSpikeComponent : Component
{
[DataField("delay")]
public float SpikeDelay = 7.0f;
public float SpikeDelay = 2.0f;
[ViewVariables(VVAccess.ReadWrite)]
[DataField("sound")]

1
Content.Shared/Projectiles/SharedProjectileSystem.cs
View File

@@ -285,6 +285,7 @@ public abstract partial class SharedProjectileSystem : EntitySystem
new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid)
{
DistanceThreshold = SharedInteractionSystem.InteractionRange,
CancelDuplicate = false
}, doAfter);
return true;

6
Content.Shared/_White/Cult/Components/CultBuffComponent.cs
View File

@@ -4,13 +4,13 @@ namespace Content.Shared._White.Cult.Components;
public sealed partial class CultBuffComponent : Component
{
[ViewVariables(VVAccess.ReadOnly), DataField]
public TimeSpan BuffTime = TimeSpan.FromSeconds(60);
public TimeSpan BuffTime = TimeSpan.FromSeconds(20);
[ViewVariables(VVAccess.ReadOnly), DataField]
public TimeSpan StartingBuffTime = TimeSpan.FromSeconds(60);
public TimeSpan StartingBuffTime = TimeSpan.FromSeconds(20);
[ViewVariables(VVAccess.ReadOnly), DataField]
public TimeSpan BuffLimit = TimeSpan.FromSeconds(55);
public TimeSpan BuffLimit = TimeSpan.FromSeconds(10);
public static float NearbyTilesBuffRadius = 1f;