VigersRay d2c1a1df88 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorBoundUi.cs # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/Ghost/Roles/GhostRoleSystem.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml # Resources/Textures/Structures/Walls/mining.rsi/meta.json		2024-07-22 04:16:05 +03:00
..
EyeColorPicker.cs	Humanoid appearance refactor (#10882)	2022-09-22 17:19:00 -05:00
HumanoidAppearanceSystem.cs	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +10:00
HumanoidMarkingModifierBoundUserInterface.cs	Reapply "Remove some BUI boilerplate" (#30214) (#30219)	2024-07-21 14:48:13 +10:00
HumanoidMarkingModifierWindow.xaml	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
HumanoidMarkingModifierWindow.xaml.cs	Update trivial components to use auto comp states (#20539)	2023-09-28 16:20:29 -07:00
MarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
MarkingPicker.xaml.cs	Куча разного говна которое давно должно было в билде.	2024-07-15 01:22:56 +03:00
SingleMarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
SingleMarkingPicker.xaml.cs	Куча разного говна которое давно должно было в билде.	2024-07-15 01:22:56 +03:00