VigersRay 9328f4d9cb Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Server/Shuttles/Systems/ArrivalsSystem.cs # Content.Server/Shuttles/Systems/DockingSystem.Shuttle.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Shared/Chat/SharedChatSystem.cs # Content.Shared/UserInterface/ActivatableUIComponent.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Science/borg.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # SpaceStation14.sln		2024-08-28 19:12:01 +03:00
..
ActivatableUIComponent.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-08-28 19:12:01 +03:00
ActivatableUIEvents.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ActivatableUIRequiresPowerCellComponent.cs	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
ActivatableUISystem.cs	Station AI (#30944)	2024-08-28 10:57:12 +10:00
ActivatableUISystem.Power.cs	item toggling giga rework + full ninja refactor (#28039)	2024-07-11 15:55:56 +10:00
IntrinsicUIComponent.cs	Predict IntrinsicUI (#31310)	2024-08-22 13:03:05 -04:00
IntrinsicUISystem.cs	Predict IntrinsicUI (#31310)	2024-08-22 13:03:05 -04:00
OpenUiActionEvent.cs	Random spontaneous cleanup PR (#25131)	2024-02-13 16:48:39 -05:00
StatValuesEuiMessage.cs
ToggleIntrinsicUIEvent.cs