Vigers Ray cef39bc293 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/UserInterface/Controls/RadialContainer.cs # Content.Server/Lathe/LatheSystem.cs # Content.Server/Silicons/Laws/SiliconLawSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Materials/SharedMaterialReclaimerSystem.cs # Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs # Content.Shared/VendingMachines/SharedVendingMachineSystem.cs # Content.Shared/Wieldable/SharedWieldableSystem.cs # Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl # Resources/Locale/en-US/_strings/store/uplink-catalog.ftl # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Datasets/Names/borg.yml # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml # Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.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/Power.xml # Resources/ServerInfo/Guidebook/Engineering/RTG.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json # Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png # Resources/migration.yml		2025-01-30 11:33:49 +03:00
..
Loadouts	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-24 03:31:44 +03:00
Roles	Фикс антаг банов и наказание случайной смерти [ПОРТ] (#1088)	2025-01-11 05:07:34 +03:00
CharacterPickerButton.xaml	Give silicons proper lobby/character editor previews (#33763)	2024-12-08 02:46:41 +01:00
CharacterPickerButton.xaml.cs	Add Job preference tests (#28625)	2024-06-06 00:19:24 +10:00
CharacterSetupGui.xaml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-11-19 18:34:32 +03:00
CharacterSetupGui.xaml.cs	фиксы апстрима	2024-11-19 18:50:55 +03:00
CharacterSetupGuiSavePanel.xaml	Character menu asks if you want to save your character on exit (#29875)	2024-07-11 10:24:37 +10:00
CharacterSetupGuiSavePanel.xaml.cs	Character menu asks if you want to save your character on exit (#29875)	2024-07-11 10:24:37 +10:00
HighlightedContainer.xaml	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10:00
HighlightedContainer.xaml.cs	Lobby refactor + species loadouts support (#27576)	2024-05-12 09:18:21 +10:00
HumanoidProfileEditor.xaml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-12-09 23:32:58 +03:00
HumanoidProfileEditor.xaml.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2025-01-30 11:33:49 +03:00
LobbyCharacterPreviewPanel.xaml	Редизайн лобби 2	2024-07-05 10:22:18 +03:00
LobbyCharacterPreviewPanel.xaml.cs	Power stuff (#31314)	2024-08-25 22:18:42 +10:00
LobbyGui.xaml	фиксы апстрима	2025-01-06 00:18:08 +03:00
LobbyGui.xaml.cs	Скрытие пустых гридов в спонсор инфо.	2024-12-24 02:47:44 +03:00
ObserveWarningWindow.xaml	Fix late join & observe to de-admin admins. (#28319)	2024-05-28 14:00:42 -04:00
ObserveWarningWindow.xaml.cs	Fix late join & observe to de-admin admins. (#28319)	2024-05-28 14:00:42 -04:00