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

# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml

2024-07-28 20:58:48 +03:00

..

ActivatableUIRequiresLockComponent.cs

fix borg ui mispredict opening (#28305)

2024-05-26 13:07:16 -07:00

LockComponent.cs

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

2024-07-28 20:58:48 +03:00

LockedAnchorableComponent.cs

Upstream, Yay (#27)

2024-04-03 10:33:34 +03:00

LockedWiresPanelComponent.cs

Upstream, Yay (#27)

2024-04-03 10:33:34 +03:00

LockingWhitelistComponent.cs

prevent borgs unlocking eachother and robotics console (#27888)

2024-07-25 13:54:51 +10:00

LockingWhitelistSystem.cs

prevent borgs unlocking eachother and robotics console (#27888)

2024-07-25 13:54:51 +10:00

LockSystem.cs

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

2024-07-28 20:58:48 +03:00