Ed cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml

2024-12-11 14:49:02 +03:00

..

Names

Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

2024-12-11 14:49:02 +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

figurines.yml

new boxer figurine voicelines (#31382)

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

ion_storm.yml

more consistent CentComm naming (#29217)

2024-08-08 20:04:19 +10: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

story_generation.yml

Convert story generation to use LocalizedDatasets (#28402)

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

tips.yml

Localize tips (#28285)

2024-05-30 07:39:07 -04:00

verbs.yml

Add codeword highlighting (#30092)

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