Merge Stable into Master (#39404)

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

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

Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/screen.yml

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

Resources/Prototypes/Entities/Structures/Wallmounts/WallmountMachines/station_map.yml

@@ -36,10 +36,9 @@
     - type: Sprite
       sprite: Structures/Machines/station_map.rsi
       layers:
-      - map: ["computerLayerBody"]
+      - state: station_map0
-        state: station_map0
+      - state: unshaded
-      - map: ["computerLayerScreen"]
+        shader: unshaded
-        state: unshaded
     - type: Icon
       sprite: Structures/Machines/station_map.rsi
       state: station_map0
@@ -59,29 +58,29 @@
       key: enum.StationMapUiKey.Key
     - type: Destructible
       thresholds:
-        - trigger: # Excess damage, don't spawn entities
+      - trigger: # Excess damage, don't spawn entities
-            !type:DamageTrigger
+          !type:DamageTrigger
-            damage: 200
+          damage: 200
-          behaviors:
+        behaviors:
-            - !type:PlaySoundBehavior
+        - !type:PlaySoundBehavior
-              sound:
+          sound:
-                collection: GlassBreak
+            collection: GlassBreak
-            - !type:DoActsBehavior
+        - !type:DoActsBehavior
-              acts: [ "Destruction" ]
+          acts: [ "Destruction" ]
-        - trigger:
+      - trigger:
-            !type:DamageTrigger
+          !type:DamageTrigger
-            damage: 100
+          damage: 100
-          behaviors:
+        behaviors:
-            - !type:PlaySoundBehavior
+        - !type:PlaySoundBehavior
-              sound:
+          sound:
-                collection: GlassBreak
+            collection: GlassBreak
-            - !type:SpawnEntitiesBehavior
+        - !type:SpawnEntitiesBehavior
-              spawn:
+          spawn:
-                StationMapBroken:
+            StationMapBroken:
-                  min: 1
+              min: 1
-                  max: 1
+              max: 1
-            - !type:DoActsBehavior
+        - !type:DoActsBehavior
-              acts: [ "Destruction" ]
+          acts: [ "Destruction" ]
     - type: UserInterface
       interfaces:
         enum.StationMapUiKey.Key: