Morb0 28edee0fe2 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Commands/AdminWhoCommand.cs # Content.Server/Administration/Commands/PlayTimeCommands.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml		2024-06-01 23:06:19 +03:00
..
Names	Add last names (#2146)	2024-05-20 14:41:05 +03:00
adjectives.yml	Translate traitor codewords to russian (#72)	2022-01-17 17:23:32 +03:00
corporations.yml	Translate Upstream #2114 (#2116)	2024-05-12 00:53:50 +03:00
criminal_records.yml	Translate Upstream #2114 (#2116)	2024-05-12 00:53:50 +03:00
ion_storm.yml	Rename crowbar (#2085)	2024-04-30 10:55:46 +03:00
news.yml	Perform CentCom-ification (#9876)	2022-07-19 21:08:24 -07:00
rat_king_commands.yml	Translate rat_king_commands.yml (#1456)	2023-09-25 15:35:29 +03: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	remove sus codewords (#20060)	2023-09-12 00:37:43 -05:00