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

..

Antags

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

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

Ghostroles

Fixed ghost role rules for some syndicate familiars (#32457)

2024-12-02 20:43:59 +01:00

Jobs

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

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

MindRoles

Admin playerlist antag presentation rework (#35538)

2025-03-25 17:03:59 +01:00

play_time_trackers.yml

Fix some contraband issues (#31606)

2024-09-09 13:36:25 -06:00

requirement_overrides.yml

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

role_types.yml

Unhardcode role type names and colors within localization text (#36096)

2025-03-28 00:34:20 +01:00