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

..

_CP14

Fools day end (#1115)

2025-04-01 21:40:43 +03:00

Guidebook

Clarify "purple text" characters in rules & readd Space Law non-restricted item seizure (#36414)

2025-04-14 16:12:03 +02:00

Gameplay.txt

Fix tiny grammar/spelling issues (#23534)

2024-01-04 23:35:31 +01:00

Intro.txt

Rename "Server Info" to ServerInfo (#15436)

2023-04-16 10:55:59 +10:00

Sandbox.txt

Rename "Server Info" to ServerInfo (#15436)

2023-04-16 10:55:59 +10:00