Vigers Ray 6844adcc9e Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Shared/Doors/Systems/SharedDoorSystem.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs		2025-04-19 05:02:40 +03:00
..
Pacification	Let Pacifists Use Certain Guns(Foam Weapons) (#29835)	2024-07-09 23:46:21 +10:00
CombatModeComponent.cs	cleanup: remove TargetingDoll-related code (#20866)	2023-10-09 16:40:17 -07:00
DisarmedEvent.cs	Refactor disarms (#36546)	2025-04-19 11:38:22 +10:00
DisarmMalusComponent.cs	Refactor disarms (#36546)	2025-04-19 11:38:22 +10:00
SharedCombatModeSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 00:07:59 +03:00