Ed c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml

2024-08-19 19:06:38 +03:00

..

DamageOnHitSystem.cs

DamageOnHit only damages on successful hits. (#17758)

2023-07-01 12:01:50 -07:00

DamageOnLandSystem.cs

Only auto-enable internals when necessary (#28248)

2024-05-31 12:28:11 +10:00

DamageOnToolInteractSystem.cs

Welding tweaks (#27959)

2024-06-02 23:28:53 -04:00

DamageOtherOnHitSystem.cs

Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream

2024-08-19 19:06:38 +03:00

DamagePopupSystem.cs

Upstream suka (#45)

2024-04-06 13:13:22 +03:00

DamageRandomPopupSystem.cs

Added fun: Darts (#20582)

2023-10-18 23:55:30 -04:00

DamageUserOnTriggerSystem.cs

adds a source uid to most damage & mobstate events (#11559)

2022-10-08 12:15:27 +02:00

ExaminableDamageSystem.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00

GodmodeSystem.cs

Add moon boots (#29009)

2024-06-14 20:43:23 -07:00