Ed 5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml

2025-09-08 13:12:50 +03:00

..

damage-command.ftl

Add completions to the damage command (#8510)

2022-05-28 21:52:18 -07:00

damage-examine.ftl

Add no damage phrase and logic

2024-10-29 22:25:42 -05:00

damage-force-say.ftl

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

damage-groups.ftl

Add Holy damage (#32755)

2024-12-16 16:33:32 +01:00

damage-popup-component.ftl

Predict DamagePopup (#36547)

2025-04-14 21:10:09 +02:00

damage-types.ftl

Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream

2024-12-22 15:48:30 +03:00

radiation.ftl

New Feature: Symptoms of radiation poisoning (#39805)

2025-08-27 14:56:09 -07:00

rejuvenate-verb.ftl

…

stamina.ftl

The long overdue downfall of stun meta - Stamina resists on Nukie & ERT Suits. (#35580)

2025-04-14 17:27:26 +02:00