VigersRay d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/Ghost/Roles/GhostRoleSystem.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml # Resources/Textures/Structures/Walls/mining.rsi/meta.json		2024-07-22 04:16:05 +03:00
..
Commands	Replace EntityUid parsing with NetEntity (#23474)	2024-01-04 11:04:31 +11:00
Components	Killer tomatoes (#26053)	2024-04-18 21:21:56 +10:00
Events	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
HTN	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-15 01:24:12 +03:00
Pathfinding	VGRoid support (#27659)	2024-07-03 22:23:11 +10:00
Queries	NPCs no longer consider anchored pipes as weapons (#30061)	2024-07-21 17:28:37 +10:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-22 04:16:05 +03:00
UI	NPC refactor (#10122)	2022-09-06 00:28:23 +10:00
NPCBlackboard.cs	Rat King Milsim + Buffs (#20190)	2023-09-22 15:01:05 -05:00
NPCBlackboardSerializer.cs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00