Morb0 ce4a90a054 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/base.png # Resources/Textures/Structures/Power/apc.rsi/broken.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/display-charging.png # Resources/Textures/Structures/Power/apc.rsi/display-full.png # Resources/Textures/Structures/Power/apc.rsi/display-lack.png # Resources/Textures/Structures/Power/apc.rsi/display-remote.png # Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png # Resources/Textures/Structures/Power/apc.rsi/frame.png # Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/panel.png # Resources/Textures/Structures/Power/apc.rsi/static.png		2024-06-17 23:51:01 +03:00
..
Electronics/Systems	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Systems	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-17 23:51:01 +03:00
WireActions	Predict doors and airlocks (#25419)	2024-02-23 10:01:31 +11:00