VigersRay 31b2d24e30 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Shared/MagicMirror/MagicMirrorComponent.cs # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/migration.yml		2024-07-31 03:54:09 +03:00
..
Preconditions	Replace obsolete EntityCoordiates.InRange() with TransformSystem.InRange() (#29993)	2024-07-13 23:25:51 +02:00
PrimitiveTasks	NPC exits MeleeOperator on invalid EntityUid (#30005)	2024-07-14 13:26:38 +10:00
HTNBranch.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
HTNComponent.cs	Remove HTN ComponentReference (#19480)	2023-08-25 17:05:21 +10:00
HTNCompoundPrototype.cs	Allow the creation of recursive HTNs (#30138)	2024-07-30 12:18:53 +10:00
HTNCompoundTask.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
HTNPlan.cs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
HTNPlanJob.cs	Allow the creation of recursive HTNs (#30138)	2024-07-30 12:18:53 +10:00
HTNPlanState.cs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
HTNSystem.cs	Оптимизация NPC	2024-06-09 17:28:42 +03:00
HTNTask.cs	Allow the creation of recursive HTNs (#30138)	2024-07-30 12:18:53 +10:00
IHTNCompound.cs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00
IHtnConditionalShutdown.cs	Shooting NPCs and more (#18042)	2023-08-01 19:48:56 -05:00