VigersRay c8e9b7bbf4 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs # Content.Server/Roles/RoleSystem.cs # Content.Server/Silicons/Laws/SiliconLawSystem.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Resources/Prototypes/Entities/Objects/Fun/pai.yml # Resources/Prototypes/GameRules/midround.yml # RobustToolbox		2024-10-10 19:09:17 +03:00
..
base_objectives.yml	make objectives use entityCategory (#28269)	2024-06-03 09:23:52 -04:00
changeling.yml	Говнокрад (#268)	2024-08-08 09:28:44 +03:00
dragon.yml	Mind Role Entities (#31318)	2024-10-10 10:48:56 +02:00
ninja.yml	Mind Role Entities (#31318)	2024-10-10 10:48:56 +02:00
objectiveGroups.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
stealTargetGroups.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-02 06:45:10 +03:00
terminator.yml	фиксы	2024-09-19 16:57:23 +03:00
thief.yml	Mind Role Entities (#31318)	2024-10-10 10:48:56 +02:00
traitor.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-10-10 19:09:17 +03:00