Vigers Ray a7131170fa Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Shared.Database/LogType.cs # Resources/Prototypes/Body/Organs/Animal/animal.yml # Resources/Prototypes/Body/Organs/arachnid.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/GameRules/roundstart.yml		2025-08-16 00:12:59 +03:00
..
Conditions	RandomChance trigger condition (#39543)	2025-08-13 01:04:29 +02:00
Effects	RemoveComponentsOnTrigger, ToggleComponentsOnTrigger (#39639)	2025-08-14 16:18:56 +02:00
Triggers	Throwing triggers (#39650)	2025-08-14 22:33:37 -07:00
ActiveTimerTriggerComponent.cs
ActiveTwoStageTriggerComponent.cs
RandomTimerTriggerComponent.cs
StartTimerOnShootComponent.cs	фиксы линтера	2025-08-13 19:35:03 +03:00
TimerTriggerComponent.cs
TwoStageTriggerComponent.cs