VigersRay a33b949c98 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs # Resources/Prototypes/Entities/Mobs/Player/human.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Loadouts/loadout_groups.yml # Resources/Prototypes/Maps/train.yml		2024-08-07 22:57:31 +03:00
..
BUIStates	Refactor FTL time tracking code to fix a UI bug (#26538)	2024-03-30 12:40:55 +11:00
Components	Replace IClickAlert with events (#30728)	2024-08-07 15:15:35 +10:00
Events	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Systems	Планетарная тюрьма (#187)	2024-07-12 04:21:12 +03:00
UI/MapObjects	Shuttle map IFF tweaks (#25897)	2024-03-11 13:11:46 +11:00