Morb0 6f6cbb14af Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Administration/UI/AdminMenuWindow.xaml.cs # Content.Client/Changelog/ChangelogManager.cs # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # SpaceStation14.sln		2023-10-14 00:39:46 +03:00
..
auto_emotes.yml	Cluwne smite (#13367)	2023-03-06 11:09:24 -08:00
disease_emotes.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-14 00:39:46 +03:00
speech_emote_sounds.yml	small moth changes (#18810)	2023-08-08 22:05:05 -06:00
speech_emotes.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-14 00:39:46 +03:00
speech_sounds.yml	Arachnid species (#13945)	2023-04-30 02:19:06 +10:00
speech_verbs.yml	More Speech Verbs (#19626)	2023-08-31 20:15:31 -07:00