Merge branch 'master' into 2024-10-13-Workflows2

whatston3 · Oct 16, 2024 · ce2f5c5 · ce2f5c5
2 parents 1c1f2be + d6d0d8c
commit ce2f5c5
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 152 deletions.
diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -8247,18 +8247,6 @@ entities:
     - type: Transform
       pos: 26.5,30.5
       parent: 1
-- proto: DebugSMES
-  entities:
-  - uid: 966
-    components:
-    - type: Transform
-      pos: 22.5,32.5
-      parent: 1
-  - uid: 969
-    components:
-    - type: Transform
-      pos: 18.5,32.5
-      parent: 1
 - proto: DiseaseDiagnoser
   entities:
   - uid: 1419
@@ -8273,18 +8261,6 @@ entities:
     - type: Transform
       pos: 22.5,16.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        DisposalUnit: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 551
-        disposals: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-    - type: Timer
   - uid: 724
     components:
     - type: Transform
@@ -8737,16 +8713,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 8.5,28.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
   - uid: 940
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 10.5,28.5
       parent: 1
-    - type: Fixtures
-      fixtures: {}
 - proto: FloraRockSolid01
   entities:
   - uid: 1954
@@ -9134,18 +9106,6 @@ entities:
       parent: 1
 - proto: HospitalCurtains
   entities:
-  - uid: 944
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 8.5,24.5
-      parent: 1
-    - type: Occluder
-      enabled: False
-    - type: Door
-      state: Open
-    - type: Physics
-      canCollide: False
   - uid: 945
     components:
     - type: Transform
@@ -9160,6 +9120,12 @@ entities:
       parent: 1
 - proto: HospitalCurtainsOpen
   entities:
+  - uid: 944
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,24.5
+      parent: 1
   - uid: 941
     components:
     - type: Transform
@@ -9329,8 +9295,6 @@ entities:
     components:
     - type: Transform
       parent: 550
-    - type: Physics
-      canCollide: False
 - proto: MedicalBed
   entities:
   - uid: 1141
@@ -9492,15 +9456,13 @@ entities:
     - type: Transform
       pos: 20.590317,3.594551
       parent: 1
-- proto: PortableGeneratorHyperPacmanShuttle
+- proto: PortableGeneratorHyperPacman
   entities:
   - uid: 2077
     components:
     - type: Transform
       pos: 32.5,20.5
       parent: 1
-    - type: FuelGenerator
-      on: False
 - proto: PortableGeneratorPacman
   entities:
   - uid: 962
@@ -11393,6 +11355,16 @@ entities:
       parent: 1
 - proto: SMESBasic
   entities:
+  - uid: 966
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 1
+  - uid: 969
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 1
   - uid: 47
     components:
     - type: Transform

diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml
@@ -473,13 +473,6 @@ entities:
     - type: Transform
       pos: 9.5,28.5
       parent: 1653
-- proto: CigaretteCapsaicinOil
-  entities:
-  - uid: 322
-    components:
-    - type: Transform
-      pos: 31.649122,18.823664
-      parent: 1653
 - proto: ClothingHeadHatFlowerWreath
   entities:
   - uid: 233
@@ -1456,28 +1449,26 @@ entities:
       parent: 1653
 - proto: OreBox
   entities:
-  - uid: 184
+  - uid: 161
     components:
     - type: Transform
       pos: 2.5,24.5
       parent: 1653
-  - uid: 270
+  - uid: 164
     components:
     - type: Transform
       pos: 37.5,4.5
       parent: 1653
-  - uid: 283
+  - uid: 165
     components:
     - type: Transform
       pos: 17.5,8.5
       parent: 1653
-  - uid: 488
+  - uid: 184
     components:
     - type: Transform
-      pos: 29.496475,8.499265
+      pos: 29.5,8.5
       parent: 1653
-    - type: Physics
-      fixedRotation: False
 - proto: OreProcessor
   entities:
   - uid: 231
@@ -1564,13 +1555,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 10.5,45.5
       parent: 1653
-- proto: PuddleVomit
-  entities:
-  - uid: 229
-    components:
-    - type: Transform
-      pos: 3.5,45.5
-      parent: 1653
 - proto: Rack
   entities:
   - uid: 276
@@ -1809,6 +1793,16 @@ entities:
     - type: Transform
       pos: 2.6439443,45.462845
       parent: 1653
+  - uid: 229
+    components:
+    - type: Transform
+      pos: 4.4356813,1.5142399
+      parent: 1653
+  - uid: 232
+    components:
+    - type: Transform
+      pos: 13.473847,3.4530866
+      parent: 1653
   - uid: 240
     components:
     - type: Transform
@@ -1839,6 +1833,11 @@ entities:
     - type: Transform
       pos: 31.586864,30.529964
       parent: 1653
+  - uid: 509
+    components:
+    - type: Transform
+      pos: 14.9959345,10.159707
+      parent: 1653
   - uid: 563
     components:
     - type: Transform
@@ -2467,23 +2466,6 @@ entities:
     - type: Transform
       pos: 2.6935458,19.305508
       parent: 1653
-- proto: SpawnDungeonLootMeleeT1
-  entities:
-  - uid: 503
-    components:
-    - type: Transform
-      pos: 4.279275,1.5174387
-      parent: 1653
-  - uid: 504
-    components:
-    - type: Transform
-      pos: 13.09337,3.5103157
-      parent: 1653
-  - uid: 509
-    components:
-    - type: Transform
-      pos: 14.9959345,10.159707
-      parent: 1653
 - proto: SpawnDungeonLootOresFull
   entities:
   - uid: 191
@@ -2779,13 +2761,6 @@ entities:
     - type: Transform
       pos: 4.5500164,45.666206
       parent: 1653
-- proto: SpawnMobFrog
-  entities:
-  - uid: 386
-    components:
-    - type: Transform
-      pos: 18.5,44.5
-      parent: 1653
 - proto: SteelBench
   entities:
   - uid: 71
@@ -2917,35 +2892,38 @@ entities:
     - type: Transform
       pos: 2.5,47.5
       parent: 1653
-  - uid: 161
+  - uid: 163
     components:
     - type: Transform
-      pos: 1.5,44.5
+      pos: 5.5,45.5
       parent: 1653
-  - uid: 163
+  - uid: 247
     components:
     - type: Transform
-      pos: 5.5,45.5
+      pos: 10.5,47.5
       parent: 1653
-  - uid: 164
+  - uid: 265
     components:
     - type: Transform
-      pos: 1.5,46.5
+      pos: 21.5,46.5
       parent: 1653
-  - uid: 165
+  - uid: 269
     components:
     - type: Transform
-      pos: 1.5,45.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,44.5
       parent: 1653
-  - uid: 247
+  - uid: 270
     components:
     - type: Transform
-      pos: 10.5,47.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,46.5
       parent: 1653
-  - uid: 265
+  - uid: 283
     components:
     - type: Transform
-      pos: 21.5,46.5
+      rot: -1.5707963267948966 rad
+      pos: 1.5,45.5
       parent: 1653
   - uid: 329
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -7212,18 +7212,6 @@ entities:
     - type: Transform
       pos: 14.5,47.5
       parent: 588
-- proto: DebugSMES
-  entities:
-  - uid: 971
-    components:
-    - type: Transform
-      pos: 22.5,32.5
-      parent: 588
-  - uid: 974
-    components:
-    - type: Transform
-      pos: 18.5,32.5
-      parent: 588
 - proto: DeployableBarrier
   entities:
   - uid: 1233
@@ -10248,6 +10236,16 @@ entities:
       parent: 588
 - proto: SMESBasic
   entities:
+  - uid: 971
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 588
+  - uid: 974
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 588
   - uid: 46
     components:
     - type: Transform

diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -7334,18 +7334,6 @@ entities:
     - type: Transform
       pos: 19.5,35.5
       parent: 588
-- proto: DebugSMES
-  entities:
-  - uid: 971
-    components:
-    - type: Transform
-      pos: 22.5,32.5
-      parent: 588
-  - uid: 974
-    components:
-    - type: Transform
-      pos: 18.5,32.5
-      parent: 588
 - proto: DiseaseDiagnoser
   entities:
   - uid: 1424
@@ -10262,6 +10250,16 @@ entities:
       parent: 588
 - proto: SMESBasic
   entities:
+  - uid: 971
+    components:
+    - type: Transform
+      pos: 22.5,32.5
+      parent: 588
+  - uid: 974
+    components:
+    - type: Transform
+      pos: 18.5,32.5
+      parent: 588
   - uid: 46
     components:
     - type: Transform

diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -10995,7 +10995,7 @@ entities:
     - type: Transform
       pos: 36.5,32.5
       parent: 1653
-- proto: ResearchAndDevelopmentServer
+- proto: MachineFrame
   entities:
   - uid: 1883
     components: