Morb0 8572f60456 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Medical/Chemist.xml # Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml # Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml # Resources/ServerInfo/Guidebook/Science/APE.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/ServerInfo/Guidebook/Survival.xml # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json		2024-08-19 08:18:59 +03:00
..
AnnounceOnSpawnSystem.cs	Аnnouncement sender localization (#29907)	2024-07-12 00:02:53 +10:00
AutoEmoteSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ChatSystem.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-12 13:18:43 +03:00
ChatSystem.Emote.cs	Trim punctuation marks in the chat emote system (#28612)	2024-08-18 16:49:07 -06:00
EmoteOnDamageSystem.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
SpeakOnUseSystem.cs	SpeakOnUseSystem and phrases for figurines (#30455)	2024-08-03 10:06:04 -04:00