]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Update fland disposals (jani rejoice) (#31918)
authorlzk <124214523+lzk228@users.noreply.github.com>
Sat, 7 Sep 2024 18:16:04 +0000 (20:16 +0200)
committerGitHub <noreply@github.com>
Sat, 7 Sep 2024 18:16:04 +0000 (12:16 -0600)
Update fland disposals

Resources/Maps/fland.yml

index 89f42a6349da96bf3abfce96841c53084b8bfefd..d842fd67447c97cc0be60cb3459c8853256c1cdb 100644 (file)
@@ -4502,6 +4502,7 @@ entities:
             8611: -11,8
             8728: 19,-31
             8729: 18,-31
+            8734: 126,-4
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -21333,13 +21334,6 @@ entities:
     - type: Transform
       pos: 41.59153,-33.7406
       parent: 13329
-- proto: AntimovCircuitBoard
-  entities:
-  - uid: 35743
-    components:
-    - type: Transform
-      pos: 107.49631,52.741814
-      parent: 13329
 - proto: AntiPoisonMedipen
   entities:
   - uid: 35283
@@ -29330,9 +29324,10 @@ entities:
     - type: Transform
       pos: 108.5,-36.5
       parent: 13329
-  - uid: 34659
+  - uid: 27054
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 129.5,-3.5
       parent: 13329
 - proto: BlastDoorOpen
@@ -30536,6 +30531,14 @@ entities:
     - type: Transform
       pos: -5.4753895,28.569885
       parent: 13329
+- proto: ButtonFrameCaution
+  entities:
+  - uid: 27081
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 127.5,-2.5
+      parent: 13329
 - proto: ButtonFrameExit
   entities:
   - uid: 20552
@@ -97648,41 +97651,47 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 19.5,-8.5
       parent: 13329
-  - uid: 27053
+  - uid: 26976
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 130.5,-3.5
+      pos: 124.5,-8.5
       parent: 13329
-  - uid: 27054
+  - uid: 26977
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 129.5,-3.5
       parent: 13329
+  - uid: 26978
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 130.5,-3.5
+      parent: 13329
   - uid: 27055
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 125.5,-8.5
+      pos: 128.5,-3.5
       parent: 13329
   - uid: 27056
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 124.5,-8.5
+      pos: 127.5,-3.5
       parent: 13329
   - uid: 27057
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 123.5,-8.5
+      rot: 3.141592653589793 rad
+      pos: 126.5,-4.5
       parent: 13329
   - uid: 27058
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 126.5,-8.5
+      pos: 126.5,-5.5
       parent: 13329
   - uid: 27059
     components:
@@ -97694,37 +97703,19 @@ entities:
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: 126.5,-6.5
+      pos: 126.5,-8.5
       parent: 13329
   - uid: 27061
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 126.5,-5.5
-      parent: 13329
-  - uid: 27062
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 126.5,-4.5
-      parent: 13329
-  - uid: 27063
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 126.5,-3.5
-      parent: 13329
-  - uid: 27064
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 127.5,-3.5
+      pos: 123.5,-8.5
       parent: 13329
-  - uid: 34655
+  - uid: 32424
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 131.5,-3.5
+      pos: 125.5,-8.5
       parent: 13329
 - proto: CorporateCircuitBoard
   entities:
@@ -100602,11 +100593,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 68.5,-25.5
       parent: 13329
-  - uid: 26978
-    components:
-    - type: Transform
-      pos: 123.5,-7.5
-      parent: 13329
   - uid: 26979
     components:
     - type: Transform
@@ -100640,6 +100626,17 @@ entities:
     - type: Transform
       pos: 100.5,10.5
       parent: 13329
+  - uid: 27063
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 121.5,-8.5
+      parent: 13329
+  - uid: 27064
+    components:
+    - type: Transform
+      pos: 121.5,-7.5
+      parent: 13329
   - uid: 27727
     components:
     - type: Transform
@@ -106360,17 +106357,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 120.5,-7.5
       parent: 13329
-  - uid: 26975
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 121.5,-7.5
-      parent: 13329
-  - uid: 26976
+  - uid: 27080
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 122.5,-7.5
+      pos: 122.5,-8.5
       parent: 13329
   - uid: 27713
     components:
@@ -109225,10 +109216,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 75.5,-23.5
       parent: 13329
-  - uid: 26977
+  - uid: 27062
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
+      rot: -1.5707963267948966 rad
       pos: 123.5,-8.5
       parent: 13329
   - uid: 27711
@@ -115850,11 +115841,13 @@ entities:
     - type: Transform
       pos: 131.71098,-3.6476665
       parent: 13329
+    - type: Conveyed
   - uid: 34758
     components:
     - type: Transform
       pos: 131.32036,-3.2101665
       parent: 13329
+    - type: Conveyed
 - proto: FoodBoxDonkpocketPizza
   entities:
   - uid: 21337
@@ -116167,6 +116160,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 130.64848,-3.0851665
       parent: 13329
+    - type: Conveyed
 - proto: FoodTinMRETrash
   entities:
   - uid: 34766
@@ -166465,13 +166459,6 @@ entities:
     - type: Transform
       pos: 13.5,-28.5
       parent: 13329
-- proto: OverlordCircuitBoard
-  entities:
-  - uid: 35769
-    components:
-    - type: Transform
-      pos: 108.49631,46.60119
-      parent: 13329
 - proto: OxygenCanister
   entities:
   - uid: 6546
@@ -167506,9 +167493,10 @@ entities:
     - type: Transform
       pos: 52.5,-28.5
       parent: 13329
-  - uid: 34658
+  - uid: 34655
     components:
     - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 129.5,-3.5
       parent: 13329
 - proto: PlasticFlapsAirtightOpaque
@@ -177796,11 +177784,10 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 18.5,-24.5
       parent: 13329
-  - uid: 27052
+  - uid: 34658
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 128.5,-3.5
+      pos: 126.5,-6.5
       parent: 13329
 - proto: ReinforcedPlasmaWindow
   entities:
@@ -183810,15 +183797,6 @@ entities:
         - Pressed: Toggle
         31550:
         - Pressed: Toggle
-  - uid: 32424
-    components:
-    - type: Transform
-      pos: 127.5,-5.5
-      parent: 13329
-    - type: DeviceLinkSource
-      linkedPorts:
-        34659:
-        - Pressed: Toggle
   - uid: 32703
     components:
     - type: Transform
@@ -183994,6 +183972,16 @@ entities:
       linkedPorts:
         29006:
         - Pressed: DoorBolt
+  - uid: 26975
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 127.5,-2.5
+      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
+        27054:
+        - Pressed: Toggle
   - uid: 35603
     components:
     - type: Transform
@@ -199216,17 +199204,13 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-  - uid: 27080
+  - uid: 27052
     components:
     - type: Transform
-      pos: 125.5,-7.5
+      pos: 126.5,-2.5
       parent: 13329
     - type: DeviceLinkSource
       linkedPorts:
-        27057:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
         27056:
         - Left: Forward
         - Right: Reverse
@@ -199235,56 +199219,52 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        27058:
+        26977:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        27059:
-        - Left: Forward
-        - Right: Reverse
-        - Middle: Off
-        27060:
+        26978:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
+  - uid: 27053
+    components:
+    - type: Transform
+      pos: 125.5,-7.5
+      parent: 13329
+    - type: DeviceLinkSource
+      linkedPorts:
         27061:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        27062:
+        26976:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        27063:
+        32424:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        27064:
+        27060:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        27054:
+        27059:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        27053:
+        27058:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-        34655:
+        27057:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-  - uid: 27081
-    components:
-    - type: Transform
-      pos: 125.5,-3.5
-      parent: 13329
-    - type: DeviceLinkSource
-      linkedPorts:
-        27052:
-        - Left: Forward
-        - Right: Reverse
+        34658:
+        - Right: Forward
+        - Left: Reverse
         - Middle: Off
 - proto: UnfinishedMachineFrame
   entities: