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
..
ActionGunSystem.cs	make dragons breathe fire (#26746)	2024-05-07 17:25:41 -07:00
BatteryWeaponFireModesSystem.cs	Rework the HoS's Energy Shotgun (Varying energy consumption depending on fire-mode + re-adds a toned down self recharge.) (#32104)	2024-12-11 17:21:04 +01:00
RechargeBasicEntityAmmoSystem.cs	Hivelord mob (#31322)	2024-09-11 09:52:27 -04:00
RechargeCycleAmmoSystem.cs	Decouple interactions from hands, cleanup old events, add new fears (#28393)	2024-05-31 13:26:19 -07:00
SharedFlyBySoundSystem.cs
SharedGunSystem.AutoFire.cs	Star Wars 14: Shuttle weapon update (#23644)	2024-01-21 19:58:40 +11:00
SharedGunSystem.Ballistic.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-05 13:12:51 +03:00
SharedGunSystem.BasicEntity.cs	Grappling fixes (#23709)	2024-01-08 12:15:46 +11:00
SharedGunSystem.Battery.cs	Fix battery self-recharge mispredicts (#33384)	2024-12-11 16:58:02 +01:00
SharedGunSystem.Cartridges.cs
SharedGunSystem.ChamberMagazine.cs	Смена клавиши для взаимодействия с затвором и магазинами	2024-12-07 07:40:41 +03:00
SharedGunSystem.Clothing.cs	replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)	2024-08-04 15:38:53 +10:00
SharedGunSystem.Container.cs	Content ecs containers (#22484)	2023-12-28 01:30:03 -04:00
SharedGunSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-02-26 22:01:48 +03:00
SharedGunSystem.Interactions.cs	Fix gun cooldown timespan overflow exception (#28136)	2024-05-19 16:07:45 -06:00
SharedGunSystem.Magazine.cs	Merge remote-tracking branch 'space-wizards/master'	2025-02-19 13:16:37 +03:00
SharedGunSystem.Revolver.cs	Фикс револьверов и еще больше трассеров.	2024-12-07 07:28:15 +03:00
SharedGunSystem.Solution.cs
UseDelayOnShootSystem.cs	UseDelay + ItemCooldown merge (#22502)	2024-01-03 21:33:09 -04:00