VigersRay 913fb7ab7a Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml		2024-08-15 05:02:48 +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	[RU] Полный перевод (#236)	2024-08-14 21:44:32 +03:00
SingleMarkingPicker.xaml	add search to marking editors (#15526)	2023-04-18 22:44:37 -07:00
SingleMarkingPicker.xaml.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-15 05:02:48 +03:00