Vigers Ray f71f04558f Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs # Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs # Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml # Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml		2025-04-17 23:48:59 +03:00
..
Audio	Merge remote-tracking branch 'space-wizards/master'	2025-04-15 04:03:44 +03:00
Changelog	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 23:48:59 +03:00
ConfigPresets	Merge remote-tracking branch 'space-wizards/master'	2025-04-13 23:19:59 +03:00
Credits	Update Credits (#36499)	2025-04-13 03:52:03 +02:00
Fonts
IgnoredPrototypes
Locale	Топ контрибюторов в лобби (#1828)	2025-04-17 06:27:30 +03:00
Maps	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 23:48:59 +03:00
Prototypes	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 23:48:59 +03:00
ServerInfo	Merge remote-tracking branch 'space-wizards/master'	2025-04-16 01:44:52 +03:00
Textures	Merge remote-tracking branch 'space-wizards/master'	2025-04-17 23:48:59 +03:00
clientCommandPerms.yml	Command to open chatbox in a new window (#33548)	2025-04-14 17:37:58 +02:00
engineCommandPerms.yml	мда	2025-01-18 22:05:45 +03:00
keybinds.yml	Прыжки на пробел (боже зачем)	2024-12-25 03:29:18 +03:00
manifest.yml	фикс OOC чата для админов	2025-04-06 01:59:18 +03:00
map_attributions.txt	Amber Station - Small Improvements (#36335)	2025-04-14 11:58:21 -07:00
mapping_actions.yml
migration.yml	Merge remote-tracking branch 'space-wizards/master'	2025-04-16 01:44:52 +03:00
sunrise_map_attributions.txt	Blyazdec (#1196)	2025-02-04 04:09:17 +03:00
toolshedEngineCommandPerms.yml	Update permissions for engine toolshed PR	2024-12-24 03:37:31 +13:00