VigersRay bee5d0410f Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/LobbyUIController.cs # Resources/Locale/en-US/chemistry/components/mixing-component.ftl # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Recipes/Crafting/crates.yml # Resources/ServerInfo/Guidebook/Mobs/Diona.xml # Resources/ServerInfo/Guidebook/Mobs/Species.xml # Resources/ServerInfo/Guidebook/Science/Science.xml # Resources/ServerInfo/Guidebook/Science/Technologies.xml # Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png # Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png # Resources/Textures/Tiles/attributions.yml # Resources/migration.yml		2024-07-11 14:05:37 +03:00
..
Components	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
Events	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-11 14:05:37 +03:00
BasicStationEventSchedulerSystem.cs	move gamerule components to shared (#28572)	2024-06-04 21:53:24 +10:00
EventManagerSystem.cs	Log event starts to admin alert chat (#27761)	2024-05-07 17:13:28 +02:00
MeteorSchedulerSystem.cs	CVarify meteor behavior (#29030)	2024-06-15 10:03:20 -04:00
RampingStationEventSchedulerSystem.cs	move gamerule components to shared (#28572)	2024-06-04 21:53:24 +10:00