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

7.4 KiB

Raw Blame History

View Raw