VigersRay 0441b8b814 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Launcher/LauncherConnecting.cs # Content.Client/Launcher/LauncherConnectingGui.xaml # Content.Client/Launcher/LauncherConnectingGui.xaml.cs # Content.Server/Administration/Managers/BanManager.cs # Content.Server/Medical/Components/HealthAnalyzerComponent.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs # Content.Server/StationEvents/Events/RandomSentienceRule.cs # Content.Shared/Interaction/Components/BlockMovementComponent.cs # Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs # Content.Shared/Materials/SharedMaterialReclaimerSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Objectives/objectiveGroups.yml # Resources/Prototypes/Objectives/stealTargetGroups.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Species/human.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml # Resources/migration.yml		2024-08-22 06:50:04 +03:00
..
Events	Cursed Mask (#29659)	2024-08-10 11:14:58 -04:00
VirtualItem	Allow a specific hand to be passed into TrySpawnVirtualItemInHand (#31124)	2024-08-18 20:42:22 -06:00
InventoryComponent.cs	Displacement maps big update (#30093)	2024-07-23 12:04:09 +03:00
InventorySystem.cs	Reflection refactor (#19253)	2023-08-25 12:48:27 +10:00
InventorySystem.Equip.cs	Add BreakOnDropItem, update do afters, remove unnecessary declarations (#30361)	2024-08-08 13:39:46 +02:00
InventorySystem.Helpers.cs	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +10:00
InventorySystem.Relay.cs	Add a system for modifying entity names without causing conflicts (#27863)	2024-06-16 15:38:53 -04:00
InventorySystem.Slots.cs	Create Generic DamageOnInteract/Attacked Comps/Systems (#30244)	2024-08-09 15:32:41 +10:00
InventoryTemplatePrototype.cs	Make suit storage only available for hardsuits, softsuits, and armor (#27546)	2024-05-09 20:19:07 -06:00
SelfEquipOnlyComponent.cs	Cursed Mask (#29659)	2024-08-10 11:14:58 -04:00
SelfEquipOnlySystem.cs	Cursed Mask (#29659)	2024-08-10 11:14:58 -04:00
SlotFlags.cs	Нижнее белье (#42)	2024-06-07 20:12:45 +03:00