faint 44dbc63ebc Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/ServerInfo/Guidebook/Controls/Controls.xml # Resources/ServerInfo/Guidebook/Controls/Radio.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Security/DNA.xml # Resources/ServerInfo/Guidebook/Security/Security.xml # Resources/ServerInfo/Guidebook/SpaceStation14.xml # Resources/ServerInfo/Guidebook/Survival.xml # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/cargotech.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/cargotech.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/salvage.rsi/icon.png		2023-06-26 17:34:49 +03:00
..
AutoLinkSystem.cs	Device Linking and better linking ui (#13645)	2023-05-07 16:07:24 +10:00
DeviceLinkOverloadSystem.cs	Prevent infinite loops in device linking (#16856)	2023-05-29 02:14:06 +10:00
DeviceLinkSystem.cs	Prevent infinite loops in device linking (#16856)	2023-05-29 02:14:06 +10:00
DoorSignalControlSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-06-19 21:06:28 +03:00
EdgeDetectorSystem.cs	logic gate stuff (#16943)	2023-06-07 16:48:42 -07:00
LogicGateSystem.cs	logic gate momentary pulse, switch status port (#17198)	2023-06-12 15:43:59 -07:00
SignallerSystem.cs	add signaler logs (#17556)	2023-06-23 22:26:37 +10:00
SignalSwitchSystem.cs	logic gate momentary pulse, switch status port (#17198)	2023-06-12 15:43:59 -07:00
SignalTimerSystem.cs	Blast door/shutter, timer and or gate device linking fixes (#16347)	2023-05-11 18:16:02 -04:00
TwoWayLeverSystem.cs	Device Linking and better linking ui (#13645)	2023-05-07 16:07:24 +10:00