From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 25 Jan 2024 06:58:27 +0000 (+1100)
Subject: Resave core cargo (#24533)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fc42c003f1c5eee8a65ce984c1cccbaeca6558d2;p=space-station-14.git

Resave core cargo (#24533)

Removes metadata merge alongside https://github.com/space-wizards/RobustToolbox/pull/4861

Looks like decal format is suss.
---

diff --git a/Resources/Maps/Shuttles/cargo_core.yml b/Resources/Maps/Shuttles/cargo_core.yml
index 42aac814a0..0c495835b9 100644
--- a/Resources/Maps/Shuttles/cargo_core.yml
+++ b/Resources/Maps/Shuttles/cargo_core.yml
@@ -63,56 +63,56 @@ entities:
             0: 2,0
             1: -1,-3
             2: -1,-5
-            34: 0,-5
-            35: 0,-3
+            27: 0,-5
+            28: 0,-3
         - node:
             color: '#79150047'
             id: CheckerNWSE
           decals:
             3: 1,-7
-            5: 1,-4
-            6: 1,-3
-            7: 1,-1
+            4: 1,-4
+            5: 1,-3
+            6: 1,-1
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
-            13: 1,-3
-            14: 2,1
-            15: 1,-7
-            27: 1,-5
+            9: 1,-3
+            10: 2,1
+            11: 1,-7
+            22: 1,-5
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
-            17: 0,-1
-            18: 1,-6
-            19: 1,-9
-            20: 2,-8
-            21: 1,0
-            30: 0,-5
-            31: 0,-3
+            12: 0,-1
+            13: 1,-6
+            14: 1,-9
+            15: 2,-8
+            16: 1,0
+            23: 0,-5
+            24: 0,-3
         - node:
             cleanable: True
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            22: 1,-4
-            23: 1,-1
-            24: 1,1
-            25: 1,-8
-            26: -1,-3
-            32: 0,-4
-            33: 0,-4
+            17: 1,-4
+            18: 1,-1
+            19: 1,1
+            20: 1,-8
+            21: -1,-3
+            25: 0,-4
+            26: 0,-4
         - node:
             angle: 1.5707963267948966 rad
             color: '#FFFFFFFF'
             id: LoadingArea
           decals:
-            8: 1,-6
-            9: 1,-2
+            7: 1,-6
+            8: 1,-2
     - type: GridAtmosphere
       version: 2
       data:
@@ -231,8 +231,6 @@ entities:
   entities:
   - uid: 135
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-5.5
       parent: 2
@@ -241,8 +239,6 @@ entities:
       - 137
   - uid: 136
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,-1.5
       parent: 2
@@ -792,16 +788,12 @@ entities:
   entities:
   - uid: 72
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-3.5
       parent: 2
   - uid: 73
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-3.5
@@ -991,154 +983,114 @@ entities:
   entities:
   - uid: 7
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,2.5
       parent: 2
   - uid: 8
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,2.5
       parent: 2
   - uid: 9
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 0.5,0.5
       parent: 2
   - uid: 10
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: -0.5,0.5
       parent: 2
   - uid: 11
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 4.5,0.5
       parent: 2
   - uid: 12
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       pos: 3.5,0.5
       parent: 2
   - uid: 24
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-0.5
       parent: 2
   - uid: 25
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-0.5
       parent: 2
   - uid: 31
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-6.5
       parent: 2
   - uid: 32
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 4.5,-7.5
       parent: 2
   - uid: 33
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-7.5
       parent: 2
   - uid: 34
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-7.5
       parent: 2
   - uid: 35
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-7.5
       parent: 2
   - uid: 36
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -0.5,-6.5
       parent: 2
   - uid: 37
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 0.5,-8.5
       parent: 2
   - uid: 38
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-8.5
       parent: 2
   - uid: 41
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,-9.5
       parent: 2
   - uid: 42
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 2.5,-9.5
       parent: 2
   - uid: 43
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-9.5
       parent: 2
   - uid: 44
     components:
-    - type: MetaData
-      flags: PvsPriority
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 0.5,-9.5