Vigers Ray ed0a30bb64 Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/Weapons/Ranged/Systems/GunSystem.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Entry/EntryPoint.cs # Content.Server/Ghost/GhostSystem.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Server/Shuttles/Systems/ArrivalsSystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs # Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.cs # Content.Shared/Damage/Systems/DamageableSystem.cs # Content.Shared/Follower/FollowerSystem.cs # Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl # Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl # Resources/Locale/en-US/discord/vote-notifications.ftl # Resources/Prototypes/Catalog/Fills/Crates/armory.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml # Resources/Prototypes/Voice/speech_emotes.yml		2025-02-19 13:16:37 +03:00
..
DamageableSystem.cs	Merge remote-tracking branch 'space-wizards/master'	2025-02-19 13:16:37 +03:00
DamageContactsSystem.cs	Damaged by contact fix (#31921)	2024-09-07 17:46:24 -06:00
DamageExamineSystem.cs	Фикс осмотра урона боеприпасов и указание типа модификатора	2024-12-07 07:38:35 +03:00
DamageOnAttackedSystem.cs	Remove unused IoC dependency references. (#31704)	2024-09-01 23:22:50 +02:00
DamageOnHighSpeedImpactSystem.cs	Add some tests and fix some miscellaneous bugs (#22836)	2023-12-28 10:05:20 +11:00
DamageOnHoldingSystem.cs	replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)	2024-08-04 15:38:53 +10:00
DamageOnInteractSystem.cs	Remove unused IoC dependency references. (#31704)	2024-09-01 23:22:50 +02:00
DamageProtectionBuffSystem.cs	Add haloperidol, potassium iodide (#27454)	2024-08-03 03:12:08 +10:00
PassiveDamageSystem.cs	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
RequireProjectileTargetSystem.cs	Cluster grenade refactor and contra markings (#31108)	2024-12-16 13:08:07 +01:00
SharedGodmodeSystem.cs	Add Galoshes slowdown over slippery surfaces (#30967)	2024-08-23 19:59:51 +10:00
SlowOnDamageSystem.cs	Hivelord mob (#31322)	2024-09-11 09:52:27 -04:00
StaminaSystem.cs	Fix stun batons using excess charges when thrown (#30136)	2024-07-18 10:48:08 +10:00
StaminaSystem.Modifier.cs	stimulants increase stamina (#18754)	2023-08-06 21:06:23 +10:00