Morbo c58729755f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json		2023-03-24 05:48:43 +03:00
..
Commands	Fix warnings and code cleanup/fixes (#13570)	2023-01-19 13:56:45 +11:00
Managers	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-03-24 05:48:43 +03:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-03-24 05:48:43 +03:00
TypingIndicator	Use state instead appearance for typing indicate	2023-02-05 06:42:06 +03:00
AutoEmoteComponent.cs	Add AutoEmote comp/system, updates to zombie code (#13932)	2023-03-02 11:23:56 -08:00
EmoteOnDamageComponent.cs	Add EmoteOnDamage comp/system for zombies (#14371)	2023-03-23 10:52:46 -04:00
SuicideSystem.cs	Mobstate Refactor (#13389)	2023-01-13 16:57:10 -08:00