Merge Stable into Master (#39404)

This commit is contained in:
ScarKy0
2025-08-05 19:56:24 +02:00
committed by GitHub
3 changed files with 28 additions and 27 deletions

View File

@@ -665,6 +665,7 @@
- type: CommunicationsConsole - type: CommunicationsConsole
title: comms-console-announcement-title-station title: comms-console-announcement-title-station
- type: DeviceNetwork - type: DeviceNetwork
deviceNetId: Wireless
transmitFrequencyId: ShuttleTimer transmitFrequencyId: ShuttleTimer
- type: ActivatableUI - type: ActivatableUI
key: enum.CommunicationsConsoleUiKey.Key key: enum.CommunicationsConsoleUiKey.Key

View File

@@ -14,6 +14,7 @@
sprite: Structures/Wallmounts/screen.rsi sprite: Structures/Wallmounts/screen.rsi
state: screen state: screen
noRot: true noRot: true
- type: Appearance
- type: Destructible - type: Destructible
thresholds: thresholds:
- trigger: - trigger:

View File

@@ -36,10 +36,9 @@
- type: Sprite - type: Sprite
sprite: Structures/Machines/station_map.rsi sprite: Structures/Machines/station_map.rsi
layers: layers:
- map: ["computerLayerBody"] - state: station_map0
state: station_map0 - state: unshaded
- map: ["computerLayerScreen"] shader: unshaded
state: unshaded
- type: Icon - type: Icon
sprite: Structures/Machines/station_map.rsi sprite: Structures/Machines/station_map.rsi
state: station_map0 state: station_map0