juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
This commit is contained in:
Ed
2024-07-28 20:58:48 +03:00
parent 0d345c33b9 fce5269fc0
commit fb40f8cd25
302 changed files with 7542 additions and 4673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
View File

@@ -206,9 +206,9 @@ public sealed class InjectorSystem : SharedInjectorSystem
BreakOnMove = true,
BreakOnWeightlessMove = false,
BreakOnDamage = true,
NeedHand = true,
BreakOnHandChange = true,
MovementThreshold = 0.1f,
NeedHand = injector.Comp.NeedHand,
BreakOnHandChange = injector.Comp.BreakOnHandChange,
MovementThreshold = injector.Comp.MovementThreshold,
});
}