Vigers Ray 8d0ab85920 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Construction/UI/ConstructionMenuPresenter.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Silicons/Laws/SiliconLawSystem.cs # Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl # Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl # Resources/Prototypes/Datasets/Names/borer.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml # Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml # Resources/migration.yml		2024-11-20 17:50:33 +03:00
..
ArrivalsBlacklistComponent.cs
ArrivalsShuttleComponent.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
ArrivalsSourceComponent.cs
DockingComponent.cs
DockingSignalControlComponent.cs	Dock device link port (#27646)	2024-05-06 13:59:01 +10:00
EmergencyShuttleComponent.cs
EmergencyShuttleConsoleComponent.cs
EscapePodComponent.cs	Coordinates Disks & Shuttle FTL Travel (#23240)	2024-04-01 15:50:00 +11:00
FTLBeaconComponent.cs	Планетарная тюрьма (#187)	2024-07-12 04:21:12 +03:00
FTLExclusionComponent.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
GridFillComponent.cs	Refactor antag rule code (#23445)	2024-02-29 17:25:10 +11:00
GridSpawnComponent.cs	Localize planet dataset names (#33398)	2024-11-20 11:57:43 +11:00
IFFConsoleComponent.cs
PendingClockInComponent.cs
PriorityDockComponent.cs
ShuttleComponent.cs	Fix thrusters (#24446)	2024-01-23 07:49:19 -05:00
ShuttleConsoleComponent.cs	Coordinates Disks & Shuttle FTL Travel (#23240)	2024-04-01 15:50:00 +11:00
SpaceGarbageComponent.cs
StationAnchorComponent.cs	Station Anchor (#26098)	2024-08-31 10:40:28 -04:00
StationArrivalsComponent.cs	фиксы апстрима	2024-08-05 21:54:07 +03:00
StationCargoShuttleComponent.cs	Split cargo shuttle to its own component (#23926)	2024-01-11 10:53:00 -05:00
StationEmergencyShuttleComponent.cs	Fix emergency shuttle initialization	2024-04-19 18:57:12 -04:00
ThrusterComponent.cs	Rip out remaining machine upgrades (#24413)	2024-01-23 09:13:04 +11:00