fish-station/Content.Client/Shuttles
Vigers Ray 10888fd269 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/GameTicking/Managers/ClientGameTicker.cs
#	Content.Server/Administration/Systems/BwoinkSystem.cs
#	Content.Server/Cargo/Systems/CargoSystem.Orders.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Power/EntitySystems/PowerNetSystem.cs
#	Content.Server/Shuttles/Systems/ArrivalsSystem.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Components/PowerGridCheckRuleComponent.cs
#	Content.Server/StationEvents/Events/PowerGridCheckRule.cs
#	Content.Server/Zombies/ZombieSystem.Transform.cs
#	Content.Shared/CCVar/CCVars.Game.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-wizard.ftl
#	Resources/Locale/en-US/_strings/guidebook/cooking.ftl
#	Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
#	Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/GameRules/roundstart.yml
#	Resources/Prototypes/Guidebook/antagonist.yml
#	Resources/ServerInfo/Guidebook/Jobs.xml
#	Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
#	Resources/migration.yml
2025-02-26 22:01:48 +03:00
..
BUI Fix window positions not saving (#35055) 2025-02-23 23:57:57 +11:00
Commands Evac shuttle (#8931) 2022-06-26 15:20:45 +10:00
Systems Purges uses of TransformComponent.WorldMatrix and TransformComponent.InvWorldMatrix (#34944) 2025-02-11 21:06:43 +11:00
UI Merge remote-tracking branch 'space-wizards/master' 2025-02-12 18:46:28 +03:00
FtlArrivalOverlay.cs Add FTL arrival visuals (#29402) 2024-07-01 16:11:30 +10:00
ShuttleConsoleComponent.cs Shuttle console + FTL rework (#24430) 2024-03-03 18:39:19 +11:00
ThrusterComponent.cs Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
ThrusterSystem.cs Resolves ThrusterVisualizer is Obsolete (#13904) 2023-05-07 23:37:28 +10:00