Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

EntityHeaterSystem.cs

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

TemperatureSystem.cs

Великая жарка мяса (#788)

2025-01-21 23:03:50 +03:00