Morbo 5a14c570aa Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml # Resources/Prototypes/typing_indicator.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png # Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png # Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png # Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png # Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png		2023-04-15 19:12:31 +03:00
..
ArrivalsSystem.cs	Use string for arrivals map cvar (#15104)	2023-04-03 22:25:31 +10:00
DockingSystem.AutoDock.cs	Don't re-close closed doors (#15007)	2023-04-03 13:28:27 -05:00
DockingSystem.cs	Don't re-close closed doors (#15007)	2023-04-03 13:28:27 -05:00
DockingSystem.Shuttle.cs	Fix docking config in some instances (#15005)	2023-03-31 15:45:14 +11:00
EmergencyShuttleSystem.Console.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-04-02 09:15:19 +03:00
EmergencyShuttleSystem.cs	Fix emergency docking config (#15346)	2023-04-12 02:05:55 -07:00
RadarConsoleSystem.cs	"Fix" aghost mass scanner (#9438)	2022-07-06 14:33:54 +10:00
ShuttleConsoleSystem.cs	Escape pods (#14809)	2023-03-23 19:54:41 -06:00
ShuttleSystem.cs	Escape pods (#14809)	2023-03-23 19:54:41 -06:00
ShuttleSystem.FasterThanLight.cs	Don't re-close closed doors (#15007)	2023-04-03 13:28:27 -05:00
ShuttleSystem.GridFill.cs	Escape pods (#14809)	2023-03-23 19:54:41 -06:00
ShuttleSystem.IFF.cs	IFF console (#10504)	2022-08-11 11:58:44 -05:00
ShuttleSystem.Impact.cs	Misc audio and related changes for replays (#12578)	2022-11-22 11:49:48 +11:00
SpaceGarbageSystem.cs	Update for collision events by-ref (#10933)	2022-09-14 17:26:26 +10:00
ThrusterSystem.cs	Remove some obsolete AppearanceComponent method usages (#13726)	2023-02-02 12:34:53 -04:00