Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/workflows/update-wiki.yml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/Markings/MarkingPrototype.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/manifest.yml		2023-09-24 12:56:24 +03:00
..
Names	Datasets translate (#1411)	2023-09-19 12:20:08 +03:00
adjectives.yml	Translate traitor codewords to russian (#72)	2022-01-17 17:23:32 +03: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
tips.yml	Laser namechange and some buffs (#18951)	2023-08-13 01:18:49 -06:00
verbs.yml	remove sus codewords (#20060)	2023-09-12 00:37:43 -05:00