Ed 07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream ...

# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml

2025-02-23 23:07:55 +03:00

..

Marker

Proto-kinetic crusher (#16277)

2023-05-14 13:15:18 +10:00

Melee

Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream

2025-02-23 23:07:55 +03:00

Misc

Replace obsolete FromMap calls with ToCoordinates (#35304)

2025-02-20 23:03:42 +11:00

Ranged

Fix hitscan visuals (#34515)

2025-02-16 17:14:04 +01:00