Vigers Ray 252e81c728 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs # Content.Server/Mindshield/MindShieldSystem.cs # Content.Shared/Gravity/SharedGravitySystem.cs # Content.Shared/Implants/SharedSubdermalImplantSystem.cs # Resources/Locale/en-US/_strings/traits/traits.ftl # Resources/Prototypes/Entities/Clothing/Shoes/misc.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml # Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml # Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json		2025-08-23 23:10:05 +03:00
..
Commands	Command resolve killing and LEC conversions batch 2 (#38367)	2025-06-17 20:01:28 +02:00
Components	action refactor proper ecs edition (#27422)	2025-05-28 15:52:11 -04:00
Events	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
HTN	Merge remote-tracking branch 'space-wizards/master'	2025-08-10 01:49:23 +03:00
Pathfinding	Revert biome rework (#38724)	2025-07-03 20:48:04 +02:00
Queries	New Salvage Mob: Basilisk (#37135)	2025-05-12 19:42:51 -04:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-08-23 23:10:05 +03:00
UI
NPCBlackboard.cs	HandsSystem Refactor (#38438)	2025-06-25 15:13:03 +02:00
NPCBlackboardSerializer.cs	Make MappingDataNode use string keys (#36111)	2025-04-18 19:28:22 +10:00