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
..
ame.rsi	Added Warning state for AME (#24699)	2024-02-01 19:40:57 +11:00
PA	PA ui cleanup + bugfixes (#28750)	2024-07-21 15:27:18 +10:00
portable_generator.rsi	Portable Generator Rework (#19302)	2023-08-25 11:40:42 -07:00
rtg.rsi	New generators and wallmount substation (Shuttle power PR) (#6795)	2022-03-15 12:27:39 +11:00
Singularity	Фикс всех ошибок в validate_rsis.py	2024-06-12 14:15:29 +03:00
solar_panel.rsi	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
teg.rsi	Fixed the pipe in the TEG sprite (#29543)	2024-06-28 22:03:45 -04:00
Tesla	Major Tesla tweaks (#23235)	2023-12-31 23:33:48 -08:00
wallmount_generator.rsi	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00