Commit graph

7 commits

Author SHA1 Message Date
faint
69ddbdd9f4 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Resources/Prototypes/secret_weights.yml
2023-05-31 03:26:01 +03:00
Sailor
ccda80f31d
Allow remote signallers to toggle bolt on doors (#16909) 2023-05-29 19:51:31 -07:00
Julian Giebel
49cb9d0e1e
Prevent infinite loops in device linking (#16856) 2023-05-29 02:14:06 +10:00
Morb
5bb841dc1f
Fixed door connection crash bug (#1097)
Co-authored-by: Canvas123 <lunarfury6@gmail.com>
2023-05-26 13:41:42 +03:00
Julian Giebel
5e0a96dfc7
Blast door/shutter, timer and or gate device linking fixes (#16347) 2023-05-11 18:16:02 -04:00
Kevin Zheng
4e5adc2b86
Add interlocking airlocks (#14177)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-07 16:49:11 +10:00
Julian Giebel
6ebd784cb6
Device Linking and better linking ui (#13645)
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-05-07 16:07:24 +10:00
Renamed from Content.Server/MachineLinking/System/DoorSignalControlSystem.cs (Browse further)