Vigers Ray 84c607c84a Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml # Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Server/Ghost/GhostSystem.cs # Resources/Locale/en-US/_strings/administration/antag.ftl # Resources/Locale/en-US/_strings/administration/commands/adminnotes.ftl # Resources/Locale/en-US/_strings/construction/components/block-anchor-component.ftl # Resources/Locale/en-US/_strings/power/commands.ftl # Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png		2025-03-27 20:37:49 +03:00
..
Commands	fix(Commands): Improve Localization of commands. Standardize some behaviors. (#30362)	2024-08-11 19:46:57 +10:00
Components	Sentry turrets - Part 3: Turret AI (#35058)	2025-03-01 18:42:33 +01:00
Events	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
HTN	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
Pathfinding	Cleanup PathfindingSystem (#36083)	2025-03-25 21:51:11 +01:00
Queries	Cleanup: Remove redundant prototype name specifications (#35793)	2025-03-19 19:30:31 +01:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-03-25 11:30:01 +03:00
UI	NPC refactor (#10122)	2022-09-06 00:28:23 +10:00
NPCBlackboard.cs	Goliath mob (#30839)	2024-08-18 12:22:36 -04:00
NPCBlackboardSerializer.cs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00