VigersRay 83090d089f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/blue.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/red.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png # Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/light-icon.png		2024-07-13 12:55:55 +03:00
..
Commands	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Components	Revert "plutonium core steal objective" (#29578)	2024-06-30 01:23:03 +10:00
Systems	Целью на убийство для антагониста может быть только экипаж основной станции	2024-07-12 06:16:42 +03:00
ObjectivesSystem.cs	Fix antag objectives always overshooting MaxDifficulty (and kill tries20) (#29830)	2024-07-13 14:14:30 +10:00