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
..
apc.rsi	Apc & Substation resprite (#28998)	2024-06-16 05:43:22 -05:00
borg_charger.rsi	Borgs (#18136)	2023-08-12 16:39:58 -05:00
cable_terminal.rsi	Reorganizes Resources/Constructible (#4252)	2021-07-15 18:30:50 +00:00
Cables	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00
cage_recharger.rsi	Star Wars 14: Shuttle weapon update (#23644)	2024-01-21 19:58:40 +11:00
cell_recharger.rsi	machine parts + power cell resprite (#23913)	2024-01-10 23:06:01 -07:00
Generation	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-22 04:16:05 +03:00
power.rsi	Fix the remaining invalid RSIs (#13113)	2022-12-20 11:49:18 -06:00
recharger.rsi	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00
smes.rsi	Power monitoring console overhaul (#20927)	2023-12-24 17:07:41 +11:00
substation.rsi	Substation origin sprites (#2298)	2024-06-21 04:40:56 +03:00
turbo_recharger.rsi	Turbo Recharger (#23723)	2024-01-08 00:15:13 -07:00
wall_recharger.rsi	Remove trailing commas from RSIs. (#12865)	2022-12-04 22:47:23 +01:00