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
..
Tabs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-19 08:18:59 +03:00
EscapeMenu.xaml	Guidebook Revival (#13320)	2023-01-16 02:42:22 -06:00
EscapeMenu.xaml.cs	Merge more UI refactor stuff (#11277)	2022-09-14 14:34:48 -07:00
OptionDropDown.xaml	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionDropDown.xaml.cs	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionSlider.xaml	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionSlider.xaml.cs	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionsMenu.xaml	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionsMenu.xaml.cs	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionsTabControlRow.xaml	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00
OptionsTabControlRow.xaml.cs	Rewrite the options menu (#28389)	2024-06-22 14:11:14 +10:00