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
..
ArrivalsBlacklistComponent.cs
ArrivalsShuttleComponent.cs
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	Fix prototypes so they pass analyzer checks (#35435)	2025-02-24 15:21:59 +11:00
IFFConsoleComponent.cs
PendingClockInComponent.cs
PriorityDockComponent.cs
ShuttleComponent.cs
ShuttleConsoleComponent.cs	Диверсионный отряд (#985)	2025-01-01 07:53:31 +03: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
StationEmergencyShuttleComponent.cs	Fix emergency shuttle initialization	2024-04-19 18:57:12 -04:00
ThrusterComponent.cs	Fix thrusters not dealing damage (#35088)	2025-02-13 20:27:33 +01:00