Ed acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2 ...

# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs

2025-03-03 23:23:40 +03:00

..

Names

Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +03:00

adjectives.yml

Add codeword highlighting (#30092)

2024-08-23 11:14:38 +02:00

corporations.yml

Traitor objective issuers (#27855)

2024-05-09 19:01:02 -07:00

criminal_records.yml

ninja criminal records hacking (#24982)

2024-05-08 23:35:11 -07:00

damage_force_say.yml

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

figurines.yml

new boxer figurine voicelines (#31382)

2024-08-24 02:10:09 +02:00

ion_storm.yml

fix ion storm code readability (#35337)

2025-02-25 08:36:56 +11:00

news.yml

Perform CentCom-ification (#9876)

2022-07-19 21:08:24 -07:00

rat_king_commands.yml

Rat King Milsim + Buffs (#20190)

2023-09-22 15:01:05 -05:00

spooky_speakers.yml

Upstream sync (#786)

2025-01-21 23:57:12 +03:00

story_generation.yml

Convert story generation to use LocalizedDatasets (#28402)

2024-05-30 14:49:12 +03:00

tips.yml

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

verbs.yml

Add codeword highlighting (#30092)

2024-08-23 11:14:38 +02:00