Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream

This commit is contained in:
Ed
2024-06-02 11:01:34 +03:00
518 changed files with 20010 additions and 13172 deletions

View File

@@ -66,7 +66,7 @@ public sealed class LockSystem : EntitySystem
private void OnActivated(EntityUid uid, LockComponent lockComp, ActivateInWorldEvent args)
{
if (args.Handled)
if (args.Handled || !args.Complex)
return;
//CrystallPunk LockSystem Adapt