From 894172628e5c50cb05e15708964f6e6c22d249a6 Mon Sep 17 00:00:00 2001
From: Carolyn3114 <136143032+Carolyn3114@users.noreply.github.com>
Date: Fri, 3 Jan 2025 10:09:12 -0600
Subject: [PATCH 01/20] Tide cleanup (#2593)

* Update tide.yml

* svtide

* asd

* Update meta.json

* Update svtide.png

* I made it 121x96

* Cleanup

* Restore to grid

* Update tide.yml

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 .../Locale/en-US/_NF/guidebook/guides.ftl     |    1 +
 Resources/Maps/_NF/Shuttles/Scrap/tide.yml    | 2393 +++++++----------
 .../Prototypes/_NF/Guidebook/shipyard.yml     |    6 +
 .../Prototypes/_NF/Guidebook/shuttle_maps.yml |   12 +
 .../Prototypes/_NF/Shipyard/Scrap/tide.yml    |    2 +-
 .../_NF/Guidebook/Shipyard/Tide.xml           |   73 +
 .../shuttle_maps/128x96.rsi/meta.json         |    3 +
 .../shuttle_maps/128x96.rsi/tide.png          |  Bin 0 -> 1191 bytes
 8 files changed, 1111 insertions(+), 1379 deletions(-)
 create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml
 create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png

diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
index fce01946477..4bb723f2702 100644
--- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -73,6 +73,7 @@ guide-entry-shipyard-sparrow = Sparrow
 guide-entry-shipyard-skipper = Skipper
 guide-entry-shipyard-spirit = Spirit
 guide-entry-shipyard-stasis = Stasis
+guide-entry-shipyard-tide = Tide
 guide-entry-shipyard-vagabond = Vagabond
 
 # Rules entries
diff --git a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
index 08262021883..9f46292a949 100644
--- a/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
+++ b/Resources/Maps/_NF/Shuttles/Scrap/tide.yml
@@ -13,17 +13,18 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
+  - uid: 2
     components:
     - type: MetaData
       name: Tide
-    - pos: -2.3024244,-6.0853996
+    - type: Transform
+      pos: -2.3024244,-6.0853996
       parent: invalid
-      type: Transform
-    - chunks:
+    - type: MapGrid
+      chunks:
         0,0:
           ind: 0,0
-          tiles: cAAAAAAASwAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: cAAAAAAASwAAAAAASwAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAAAAAGAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
@@ -37,524 +38,199 @@ entities:
           ind: 0,-1
           tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbwAAAAAAbwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAbwAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
-      type: MapGrid
     - type: Broadphase
-    - bodyStatus: InAir
+    - type: Physics
+      bodyStatus: InAir
       angularDamping: 0.05
       linearDamping: 0.05
       fixedRotation: False
       bodyType: Dynamic
-      type: Physics
-    - fixtures: {}
-      type: Fixtures
+    - type: Fixtures
+      fixtures: {}
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
     - type: GridPathfinding
-    - gravityShakeSound: !type:SoundPathSpecifier
+    - type: Gravity
+      gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
-      type: Gravity
-    - chunkCollection:
+    - type: DecalGrid
+      chunkCollection:
         version: 2
         nodes:
-        - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteCornerNe
-          decals:
-            329: 1,10
-        - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteCornerNw
-          decals:
-            328: -1,10
-        - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteCornerSw
-          decals:
-            327: -1,9
-        - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteLineN
-          decals:
-            330: 0,10
-        - node:
-            color: '#334E6DFF'
-            id: BrickTileWhiteLineS
-          decals:
-            331: 0,9
-        - node:
-            color: '#FFFFFFAB'
-            id: Damaged
-          decals:
-            203: -3,1
-            204: 4,4
-            205: -2,6
-        - node:
-            color: '#FFFFFFFF'
-            id: Damaged
-          decals:
-            332: -1,9
-            333: -1,10
-            334: 0,10
-            364: -1,9
-            365: 1,8
         - node:
             color: '#FFFFFF46'
             id: Dirt
           decals:
             78: 0,4
             79: 0,4
-            80: -1,4
-            81: -2,6
-            82: -3,6
-            83: -3,6
-            84: -2,7
-            85: 0,7
-            86: 0,6
-            87: 0,6
-            88: 1,7
-        - node:
-            color: '#FFFFFFAB'
-            id: Dirt
-          decals:
-            213: -2,6
-            214: -2,6
         - node:
             color: '#FFFFFFB7'
             id: Dirt
           decals:
             289: 0,4
-            290: -1,4
             291: 0,4
             292: 0,4
         - node:
             color: '#FFFFFFFF'
             id: Dirt
           decals:
-            14: -3,1
-            15: -2,1
             16: 3,4
-            17: 0,6
             18: 0,8
-            19: -1,7
-            20: -2,7
-            21: -3,6
             22: 0,5
-            23: -1,4
             24: 4,3
-            25: 5,4
-            26: 5,5
-            27: 5,4
             28: 4,3
-            29: 6,2
             30: 5,7
-            31: 4,5
             32: 4,3
-            33: 3,2
-            34: 5,4
-            35: 4,5
-            36: 5,5
-            37: 4,6
-            38: 4,4
             39: 4,3
             40: 3,5
-            41: 3,9
-            42: 3,9
-            43: 3,9
-            96: 6,7
-            144: -2,1
-            145: -3,1
-            146: 0,1
             147: 1,1
-            148: 3,1
-            149: 2,0
             150: 1,0
-            201: -3,7
-            202: -3,7
-            227: 2,2
-            250: 1,6
-            251: 2,6
-            252: 2,7
-            253: 2,5
-            254: 2,5
-            255: 2,4
-            256: 1,8
-            257: 1,8
-            277: -1,3
-            278: -1,3
-            279: -1,3
-            280: -2,4
-            281: -2,3
-            282: 0,3
             283: 0,4
-            316: -4,4
-            317: -4,4
-            323: -4,10
-            324: 7,7
-            325: 4,8
-            326: 6,-1
-            335: -1,9
-            336: -1,10
-            337: 0,10
-            338: 1,10
-            339: 0,9
-            340: 1,9
-            375: -1,7
-        - node:
-            color: '#FFFFFFAB'
-            id: DirtHeavy
-          decals:
-            206: -3,6
-            207: -2,6
-            208: -2,6
-            209: -2,6
-            210: -2,6
-            211: -2,6
-            212: -2,6
+            376: -3,1
+            377: -1,1
+            379: 2,6
+            380: 1,8
+            381: 1,9
+            382: -1,9
+            383: -2,7
+            385: -2,3
+            386: -1,3
+            387: 0,3
+            388: -4,4
+            398: -3,7
+            399: 4,8
+            400: 7,7
+            401: -4,10
+            402: -4,8
+            403: 6,-1
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavy
           decals:
             44: -2,2
-            45: -2,1
-            46: -2,1
-            47: -1,1
-            48: 1,2
-            49: 1,2
-            50: 1,4
-            51: -1,4
-            52: 1,4
             53: 4,3
-            54: 4,4
             55: 3,5
             56: 1,5
-            57: -1,7
-            58: 0,6
-            59: 0,7
-            60: -1,7
-            61: -3,6
-            62: -2,6
-            63: -2,7
-            64: -1,8
-            65: 2,8
-            66: 1,7
-            67: 0,7
-            68: 1,7
-            69: 3,2
-            70: 5,3
-            71: 5,5
-            72: 5,5
-            73: 4,4
-            74: 4,2
-            75: -1,1
-            89: 0,6
-            90: 0,6
-            91: 0,7
-            92: 0,6
-            93: 0,7
-            97: 2,3
-            98: 2,3
-            99: 2,1
-            100: 2,0
-            101: 2,0
-            102: 2,0
-            103: 2,1
             104: 1,0
             105: 1,1
-            106: 2,1
-            107: 0,1
-            108: 0,1
             109: 1,1
-            110: 2,3
-            237: 1,6
-            238: 2,6
-            239: 2,7
-            240: 2,5
-            241: 2,4
-            242: 2,4
-            243: 2,6
-            244: 2,6
-            245: 1,6
-            246: 2,7
-            247: 2,6
-            248: 2,5
-            249: 2,4
-            258: 1,8
-            259: 1,8
-            260: 1,6
-            261: 1,6
             262: 0,4
             263: 0,4
-            264: -2,3
-            265: -1,3
-            266: 0,3
             267: 0,4
-            268: -1,4
-            269: -2,3
-            270: -1,3
             271: 0,4
-            272: -1,4
-            273: -1,4
-            274: 0,3
             275: 0,4
-            276: -2,4
             293: 0,4
-            294: -4,10
-            295: -4,10
-            296: -4,10
-            297: -3,9
-            298: -3,9
-            299: 4,8
-            300: 4,8
-            301: 4,8
-            302: 4,8
-            303: 4,8
-            304: 6,-1
-            305: 6,-1
-            306: 6,-1
-            307: 6,-1
-            308: 6,-1
-            309: 6,-1
-            310: 7,7
-            311: 7,7
-            312: 7,7
-            313: 7,7
-            314: 7,7
-            315: 7,7
-            318: -4,4
-            319: -4,4
-            320: -4,4
-            321: -4,4
-            322: -4,10
-            341: 1,9
-            342: 1,9
-            343: 1,9
-            344: 0,9
-            345: 0,9
-            346: -1,9
-            347: -1,10
-            348: 0,10
-            349: 1,10
-            350: 1,10
-            351: 1,9
-            352: -1,9
-            353: -1,9
-            354: 0,10
-            355: 1,10
-            356: 1,9
-            357: 0,9
-            358: 0,9
-            359: 1,10
-            366: -1,7
-            367: -1,7
-            368: -1,7
-            369: -1,7
-            370: -1,7
-            371: -1,7
-        - node:
-            color: '#FFFFFFAB'
-            id: DirtHeavyMonotile
-          decals:
-            215: -2,6
-            216: -2,6
-            217: -2,6
-            218: -2,6
+            412: 2,3
+            413: 2,2
+            414: 4,4
+            415: 5,4
+            416: 5,5
+            417: 1,7
+            418: 0,7
+            419: 2,0
+            420: 2,1
+            422: -3,6
         - node:
             color: '#FFFFFFFF'
             id: DirtHeavyMonotile
           decals:
             76: -1,5
-            77: -1,7
-            111: 0,1
             112: 1,1
             113: 1,1
             114: 1,0
             115: 1,0
             116: 1,1
-            117: 0,1
-            118: -1,1
-            119: -2,1
-            120: -2,1
-            121: -2,1
-            122: -1,1
             123: 1,1
-            124: 2,1
-            125: 2,0
-            126: 2,0
             127: 1,0
             128: 1,0
-            129: 2,3
-            130: 2,3
-            131: -1,4
             132: 0,4
+            389: 2,3
+            390: 2,2
+            391: 1,7
+            392: 0,7
+            393: -1,9
+            423: -2,6
         - node:
             color: '#FFFFFFFF'
             id: DirtLight
           decals:
-            133: 2,3
-            134: 2,3
-            135: 2,1
-            136: 2,1
-            137: 2,0
             138: 1,0
             139: 1,1
-            140: 0,1
-            141: 0,1
-            142: -3,1
-            143: -3,1
-            360: -1,9
-            361: 0,9
-            362: -1,10
-            363: -1,10
-            372: -1,7
-            373: -1,7
-            374: -1,7
-        - node:
-            color: '#FFFFFFAB'
-            id: Rust
-          decals:
-            219: -2,6
-            220: -2,6
-            221: -2,6
-            222: -2,6
-            223: -2,6
+            394: 0,9
+            395: 0,10
+            396: -1,10
+            397: 1,10
+            404: 2,0
+            405: 2,1
+            406: 4,4
+            407: 5,4
+            408: 5,5
+            409: 4,5
+            410: 4,3
+            411: 4,2
         - node:
             color: '#FFFFFFFF'
             id: Rust
           decals:
             0: 4,3
-            1: 4,2
-            2: 4,4
-            3: 6,4
-            4: 1,7
-            5: 1,7
-            6: -1,6
-            7: -2,7
-            8: -2,7
-            9: -3,6
-            10: 1,4
-            11: -1,4
-            12: -2,1
-            13: -3,1
-            151: -3,1
-            152: -2,1
-            153: 0,1
             154: 1,1
             155: 1,0
-            156: 2,0
-            157: 2,1
-            158: 2,3
-            159: 0,6
-            160: 0,7
-            161: 6,0
-            162: 5,0
-            163: 4,0
-            164: 3,-1
-            165: 3,-1
-            166: 3,0
-            167: 2,-1
-            168: 1,-1
-            169: 1,-1
             170: 0,0
-            171: -1,0
-            172: -1,0
             173: -3,0
-            174: -4,0
             175: -4,2
             176: -3,2
             177: -2,2
-            178: -1,2
-            179: 1,2
-            180: 3,2
-            181: 3,2
-            182: 5,2
-            183: 5,3
             184: 4,3
             185: 3,3
             186: 3,4
-            187: 3,6
-            188: 3,6
             189: 1,5
             190: 0,5
             191: -1,5
             192: -2,5
             193: -3,5
             194: -3,5
-            195: -4,6
-            196: -4,7
-            197: -3,6
-            198: -2,7
-            199: -2,7
-            200: -3,7
-            225: 2,2
-            226: 2,2
-            228: 0,-1
-            229: 1,-1
-            230: 6,7
-            231: 6,7
-            232: -4,7
-            233: -4,7
-            234: -4,8
-            235: 2,3
-            236: 2,2
-            284: 0,3
-        - node:
-            color: '#FFFFFFFF'
-            id: StairsRS
-          decals:
-            224: 2,2
         - node:
             color: '#FFFFFFB7'
             id: WarnFull
           decals:
             288: 0,4
-        - node:
-            color: '#FFFFFF8E'
-            id: WarnLineE
-          decals:
-            285: 5,3
-            286: 5,4
-            287: 5,5
-        - node:
-            color: '#FFFFFFFF'
-            id: body
-          decals:
-            95: -2,7
-        - node:
-            color: '#760000FF'
-            id: splatter
-          decals:
-            94: -2,7
-      type: DecalGrid
-    - version: 2
+    - type: GridAtmosphere
+      version: 2
       data:
         tiles:
           0,0:
-            0: 65535
-          1,0:
-            0: 65399
+            0: 29942
+          0,-1:
+            0: 36864
+            1: 3072
+          -1,0:
+            0: 49328
           0,1:
-            0: 65535
+            0: 30541
+          -1,1:
+            0: 58893
           0,2:
-            0: 14335
+            0: 947
+          -1,2:
+            0: 2464
+            1: 528
           0,3:
-            0: 2
+            1: 2
+          1,0:
+            0: 29447
+            1: 34816
           1,1:
-            0: 65535
+            0: 33587
+            1: 2184
           1,2:
-            0: 21
-          -1,0:
-            0: 61439
-          -1,1:
-            0: 65535
-          -1,2:
-            0: 36863
-          -1,-1:
-            0: 16384
-          0,-1:
-            0: 64512
+            0: 1
+            1: 20
           1,-1:
-            0: 24576
+            1: 8192
+            0: 16384
+          -1,-1:
+            1: 16384
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -571,1410 +247,1371 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          immutable: True
+          moles:
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
-      type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: BecomesStation
       id: Tide
-- proto: Airlock
+- proto: AirlockAssemblyMaintenance
   entities:
-  - uid: 2
+  - uid: 84
     components:
-    - pos: -0.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
 - proto: AirlockGlassShuttle
   entities:
-  - uid: 3
+  - uid: 4
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -3.5,1.5
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: AirlockMaint
   entities:
-  - uid: 4
+  - uid: 3
+    components:
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
+  - uid: 5
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,3.5
-      parent: 1
-      type: Transform
+      parent: 2
+  - uid: 126
+    components:
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+  - uid: 135
+    components:
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
 - proto: APCBasic
   entities:
-  - uid: 5
+  - uid: 6
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 2.5,-0.5
-      parent: 1
-      type: Transform
-- proto: Barricade
+      parent: 2
+- proto: CableApcExtension
   entities:
-  - uid: 6
-    components:
-    - pos: -3.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 7
-    components:
-    - pos: 0.5,11.5
-      parent: 1
-      type: Transform
   - uid: 8
     components:
-    - pos: 1.5,11.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 2
   - uid: 9
     components:
-    - pos: 6.5,3.5
-      parent: 1
-      type: Transform
-- proto: CableApcExtension
-  entities:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
   - uid: 10
     components:
-    - pos: -3.5,1.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 2
   - uid: 11
     components:
-    - pos: -2.5,1.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
   - uid: 12
     components:
-    - pos: -1.5,1.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 0.5,1.5
+      parent: 2
   - uid: 13
     components:
-    - pos: -0.5,1.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
   - uid: 14
     components:
-    - pos: 0.5,1.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 2
   - uid: 15
     components:
-    - pos: 1.5,1.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
   - uid: 16
     components:
-    - pos: 2.5,1.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
   - uid: 17
     components:
-    - pos: 2.5,0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
   - uid: 18
     components:
-    - pos: 2.5,-0.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 2
   - uid: 19
     components:
-    - pos: 1.5,-0.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
   - uid: 20
     components:
-    - pos: 0.5,-0.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 2
   - uid: 21
     components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
   - uid: 22
     components:
-    - pos: 2.5,3.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
   - uid: 23
     components:
-    - pos: 1.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
   - uid: 24
     components:
-    - pos: 0.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: -1.5,3.5
+      parent: 2
   - uid: 25
     components:
-    - pos: -0.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 1.5,6.5
+      parent: 2
   - uid: 26
     components:
-    - pos: -1.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
   - uid: 27
     components:
-    - pos: 1.5,6.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: -1.5,6.5
+      parent: 2
   - uid: 28
     components:
-    - pos: 0.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 2
   - uid: 29
     components:
-    - pos: -1.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,7.5
+      parent: 2
   - uid: 30
     components:
-    - pos: -2.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,7.5
+      parent: 2
   - uid: 31
     components:
-    - pos: -0.5,7.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 2
   - uid: 32
     components:
-    - pos: -1.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 2
   - uid: 33
     components:
-    - pos: 1.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,9.5
+      parent: 2
   - uid: 34
     components:
-    - pos: 1.5,8.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 2
   - uid: 35
     components:
-    - pos: 1.5,9.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 2
   - uid: 36
     components:
-    - pos: 1.5,10.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 2
   - uid: 37
     components:
-    - pos: 5.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
   - uid: 38
     components:
-    - pos: 6.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,5.5
+      parent: 2
   - uid: 39
     components:
-    - pos: 7.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 2
   - uid: 40
     components:
-    - pos: 5.5,5.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,7.5
+      parent: 2
   - uid: 41
     components:
-    - pos: 5.5,6.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,3.5
+      parent: 2
   - uid: 42
     components:
-    - pos: 5.5,7.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 2
   - uid: 43
     components:
-    - pos: 5.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,1.5
+      parent: 2
   - uid: 44
     components:
-    - pos: 5.5,2.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 5.5,0.5
+      parent: 2
   - uid: 45
     components:
-    - pos: 5.5,1.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 2
   - uid: 46
     components:
-    - pos: 5.5,0.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
   - uid: 47
     components:
-    - pos: 4.5,6.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
   - uid: 48
     components:
-    - pos: 2.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 4.5,4.5
+      parent: 2
   - uid: 49
     components:
-    - pos: 3.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,6.5
+      parent: 2
+- proto: CableApcStack1
+  entities:
   - uid: 50
     components:
-    - pos: 4.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.2841935,4.753075
+      parent: 2
   - uid: 51
     components:
-    - pos: 2.5,6.5
-      parent: 1
-      type: Transform
-
-- proto: CableApcStack1
-  entities:
+    - type: Transform
+      pos: 1.2873576,9.791525
+      parent: 2
   - uid: 52
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.2841935,4.753075
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5862179,1.5903597
+      parent: 2
   - uid: 53
     components:
-    - pos: 1.2873576,9.791525
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 2.7530308,6.615054
+      parent: 2
+- proto: CableHV
+  entities:
   - uid: 54
     components:
-    - pos: 1.5862179,1.5903597
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
   - uid: 55
     components:
-    - pos: 2.7530308,6.615054
-      parent: 1
-      type: Transform
-- proto: CableHV
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
+- proto: CableMV
   entities:
   - uid: 56
     components:
-    - pos: 0.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,3.5
+      parent: 2
   - uid: 57
     components:
-    - pos: -0.5,4.5
-      parent: 1
-      type: Transform
-
-- proto: CableMV
-  entities:
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
   - uid: 58
     components:
-    - pos: 2.5,3.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,3.5
+      parent: 2
   - uid: 59
     components:
-    - pos: -0.5,4.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 2
   - uid: 60
     components:
-    - pos: -0.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,1.5
+      parent: 2
   - uid: 61
     components:
-    - pos: 0.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
   - uid: 62
     components:
-    - pos: 2.5,1.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,3.5
+      parent: 2
   - uid: 63
     components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
   - uid: 64
     components:
-    - pos: 1.5,3.5
-      parent: 1
-      type: Transform
-
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+- proto: Catwalk
+  entities:
   - uid: 65
     components:
-    - pos: 2.5,0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,2.5
+      parent: 2
   - uid: 66
     components:
-    - pos: 2.5,-0.5
-      parent: 1
-      type: Transform
-
-- proto: Catwalk
-  entities:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,3.5
+      parent: 2
   - uid: 67
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 2
   - uid: 68
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,3.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,5.5
+      parent: 2
   - uid: 69
     components:
-    - pos: 7.5,3.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
   - uid: 70
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,5.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 2
   - uid: 71
     components:
-    - pos: 7.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 72
-    components:
-    - pos: 7.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 73
-    components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 74
+      parent: 2
+  - uid: 72
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 4.5,6.5
-      parent: 1
-      type: Transform
+      parent: 2
+  - uid: 103
+    components:
+    - type: Transform
+      pos: 5.5,2.5
+      parent: 2
 - proto: Chair
   entities:
-  - uid: 75
+  - uid: 73
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,9.5
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: ChairFolding
   entities:
-  - uid: 76
+  - uid: 74
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.2483454,6.5219746
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: ChairPilotSeat
   entities:
-  - uid: 77
+  - uid: 75
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 1.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 78
+      parent: 2
+  - uid: 76
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,0.5
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: ComputerBroken
   entities:
-  - uid: 79
+  - uid: 77
     components:
-    - pos: -0.5,10.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,10.5
+      parent: 2
 - proto: ComputerShuttle
   entities:
-  - uid: 80
+  - uid: 78
     components:
-    - pos: 0.5,10.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 2
 - proto: ComputerStationRecords
   entities:
-  - uid: 81
+  - uid: 79
     components:
-    - pos: 1.5,10.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,10.5
+      parent: 2
 - proto: CrateEmptySpawner
   entities:
-  - uid: 82
+  - uid: 80
     components:
-    - pos: 4.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 4.5,2.5
+      parent: 2
 - proto: Crowbar
   entities:
-  - uid: 83
+  - uid: 81
     components:
-    - pos: -0.5,1.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
 - proto: Firelock
   entities:
-  - uid: 84
-    components:
-    - pos: 3.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 85
+  - uid: 82
     components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
-- proto: FirelockFrame
+    - type: Transform
+      pos: 3.5,4.5
+      parent: 2
+- proto: FuelPlasma
   entities:
-  - uid: 86
+  - uid: 83
     components:
-    - pos: 0.5,8.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.4788256,4.4430637
+      parent: 2
 - proto: GasPassiveVent
   entities:
-  - uid: 87
+  - uid: 85
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 5.5,4.5
-      parent: 1
-      type: Transform
+      parent: 2
+  - uid: 193
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,1.5
+      parent: 2
 - proto: GasPipeBend
   entities:
-  - uid: 88
+  - uid: 86
     components:
-    - anchored: False
+    - type: Transform
+      anchored: False
       rot: -0.12514226137072493 rad
       pos: 2.5779724,6.4750323
-      parent: 1
-      type: Transform
-    - canCollide: True
+      parent: 2
+    - type: Physics
+      canCollide: True
       bodyType: Dynamic
-      type: Physics
-
-  - uid: 89
+  - uid: 87
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 0.5,6.5
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: GasPipeStraight
   entities:
-  - uid: 90
+  - uid: 88
     components:
-    - anchored: False
-      rot: -2.0017326374881614 rad
-      pos: 2.4778514,5.5419455
-      parent: 1
-      type: Transform
-    - canCollide: True
-      bodyType: Dynamic
-      type: Physics
-
-  - uid: 91
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,5.5
+      parent: 2
+  - uid: 89
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,3.5
-      parent: 1
-      type: Transform
-
-  - uid: 92
+      parent: 2
+  - uid: 90
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 0.5,3.5
-      parent: 1
-      type: Transform
-
-  - uid: 93
+      parent: 2
+  - uid: 91
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,3.5
-      parent: 1
-      type: Transform
-
-  - uid: 94
+      parent: 2
+  - uid: 92
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 3.5,4.5
-      parent: 1
-      type: Transform
-
-  - uid: 95
+      parent: 2
+  - uid: 94
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 4.5,4.5
-      parent: 1
-      type: Transform
-
-  - uid: 96
+    - type: Transform
+      pos: 2.5,2.5
+      parent: 2
+  - uid: 95
     components:
-    - pos: 2.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,6.5
+      parent: 2
   - uid: 97
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,6.5
-      parent: 1
-      type: Transform
-
-  - uid: 98
+    - type: Transform
+      pos: 0.5,8.5
+      parent: 2
+  - uid: 225
     components:
-    - pos: 0.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 99
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,1.5
+      parent: 2
+  - uid: 226
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,1.5
+      parent: 2
+  - uid: 227
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,1.5
+      parent: 2
+  - uid: 228
     components:
-    - pos: 0.5,8.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -0.5,7.5
+      parent: 2
 - proto: GasPipeTJunction
   entities:
-  - uid: 100
+  - uid: 96
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,7.5
+      parent: 2
+  - uid: 98
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 2.5,3.5
-      parent: 1
-      type: Transform
-  - uid: 101
+      parent: 2
+  - uid: 99
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: 2.5,4.5
-      parent: 1
-      type: Transform
-
+      parent: 2
+  - uid: 101
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,1.5
+      parent: 2
 - proto: GasPort
   entities:
-  - uid: 102
+  - uid: 100
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.5,3.5
-      parent: 1
-      type: Transform
-- proto: GasVentPump
+      parent: 2
+- proto: GasPressurePump
   entities:
-  - uid: 103
+  - uid: 93
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,1.5
-      parent: 1
-      type: Transform
-    - enabled: False
-      type: AmbientSound
-  - uid: 104
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,4.5
+      parent: 2
+  - uid: 125
     components:
-    - pos: 0.5,9.5
-      parent: 1
-      type: Transform
-    - enabled: False
-      type: AmbientSound
-- proto: Girder
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,1.5
+      parent: 2
+- proto: GasVentPump
   entities:
-  - uid: 105
-    components:
-    - pos: 4.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 106
-    components:
-    - pos: -3.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 107
-    components:
-    - pos: 3.5,3.5
-      parent: 1
-      type: Transform
-  - uid: 108
+  - uid: 102
     components:
-    - pos: -0.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 109
+    - type: Transform
+      pos: 0.5,9.5
+      parent: 2
+  - uid: 105
     components:
-    - pos: 3.5,8.5
-      parent: 1
-      type: Transform
-  - uid: 110
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 229
     components:
-    - pos: -3.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,7.5
+      parent: 2
 - proto: Grille
   entities:
-  - uid: 111
+  - uid: 121
     components:
-    - pos: 6.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 112
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 2
+  - uid: 123
     components:
-    - pos: -1.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 113
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,5.5
+      parent: 2
+  - uid: 222
     components:
-    - pos: -1.5,8.5
-      parent: 1
-      type: Transform
-  - uid: 114
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
+  - uid: 223
+    components:
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 2
+  - uid: 224
     components:
-    - pos: -3.5,5.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
 - proto: GrilleBroken
   entities:
+  - uid: 114
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 2
   - uid: 115
     components:
-    - pos: 1.5,8.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,0.5
+      parent: 2
   - uid: 116
     components:
-    - rot: 3.141592653589793 rad
-      pos: 1.5,8.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
   - uid: 117
     components:
-    - pos: 1.5,0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 2
   - uid: 118
     components:
-    - pos: 1.5,1.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
   - uid: 119
     components:
-    - pos: 5.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 120
-    components:
-    - pos: 0.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 121
-    components:
-    - pos: -2.5,7.5
-      parent: 1
-      type: Transform
-- proto: GrilleSpawner
-  entities:
-  - uid: 122
-    components:
-    - pos: 3.5,6.5
-      parent: 1
-      type: Transform
-  - uid: 123
-    components:
-    - pos: 0.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 124
-    components:
-    - pos: 1.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 125
-    components:
-    - pos: 2.5,5.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,7.5
+      parent: 2
 - proto: Gyroscope
   entities:
-  - uid: 126
+  - uid: 124
     components:
-    - pos: -2.5,9.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,9.5
+      parent: 2
 - proto: InflatableDoor
   entities:
   - uid: 127
     components:
-    - pos: 0.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 128
-    components:
-    - pos: 3.5,4.5
-      parent: 1
-      type: Transform
-  - uid: 129
-    components:
-    - pos: -1.5,1.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,1.5
+      parent: 2
 - proto: InflatableDoorStack1
   entities:
-  - uid: 130
+  - uid: 128
     components:
-    - pos: -1.5,4.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
 - proto: InflatableWall
   entities:
-  - uid: 131
+  - uid: 7
     components:
-    - pos: -0.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 132
+    - type: Transform
+      pos: 7.5,5.5
+      parent: 2
+  - uid: 122
     components:
-    - pos: 5.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 133
+    - type: Transform
+      pos: -0.5,11.5
+      parent: 2
+  - uid: 129
     components:
-    - pos: 5.5,3.5
-      parent: 1
-      type: Transform
-- proto: InflatableWallStack5
-  entities:
-  - uid: 134
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 2
+  - uid: 156
     components:
-    - pos: -1.5,4.5
-      parent: 1
-      type: Transform
-- proto: MaintenanceWeaponSpawner
+    - type: Transform
+      pos: 7.5,4.5
+      parent: 2
+- proto: InflatableWallStack5
   entities:
-  - uid: 135
+  - uid: 131
     components:
-    - pos: 0.5,4.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
 - proto: Mattress
   entities:
-  - uid: 136
+  - uid: 133
     components:
-    - pos: -2.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,7.5
+      parent: 2
 - proto: OreBag
   entities:
-  - uid: 137
+  - uid: 134
     components:
-    - pos: 5.5351467,6.5488915
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 5.5351467,6.5488915
+      parent: 2
 - proto: PartRodMetal1
   entities:
-  - uid: 138
-    components:
-    - rot: 3.141592653589793 rad
-      pos: -2.3108153,7.444821
-      parent: 1
-      type: Transform
-  - uid: 139
+  - uid: 136
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -1.9982572,1.738504
-      parent: 1
-      type: Transform
-  - uid: 140
+      parent: 2
+  - uid: 142
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,7.5
+      parent: 2
+  - uid: 143
     components:
-    - pos: 2.540806,4.403475
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,3.5
+      parent: 2
 - proto: Pickaxe
   entities:
-  - uid: 141
+  - uid: 138
     components:
-    - pos: 4.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 2
 - proto: PortableGeneratorPacman
   entities:
-  - uid: 142
+  - uid: 1
     components:
-    - pos: -0.5,3.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,4.5
+      parent: 2
 - proto: PosterContrabandGreyTide
   entities:
-  - uid: 143
+  - uid: 140
     components:
-    - pos: 3.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
 - proto: PoweredSmallLight
   entities:
-  - uid: 144
+  - uid: 130
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,6.5
+      parent: 2
+  - uid: 141
     components:
-    - rot: 1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
       pos: -2.5,6.5
-      parent: 1
-      type: Transform
+      parent: 2
+  - uid: 144
+    components:
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 2
   - uid: 145
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 1.5,10.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 2.5,0.5
+      parent: 2
+- proto: Rack
+  entities:
   - uid: 146
     components:
-    - rot: 3.141592653589793 rad
-      pos: 6.5,8.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
   - uid: 147
     components:
-    - pos: -1.5,-0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 4.5,6.5
+      parent: 2
   - uid: 148
     components:
-    - pos: 5.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 5.5,6.5
+      parent: 2
+- proto: Railing
+  entities:
   - uid: 149
     components:
-    - rot: 3.141592653589793 rad
-      pos: 2.5,0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 7.5,2.5
+      parent: 2
   - uid: 150
     components:
-    - rot: -1.5707963267948966 rad
-      pos: -3.5,4.5
-      parent: 1
-      type: Transform
-- proto: Rack
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 2
+- proto: ShardGlass
   entities:
   - uid: 151
     components:
-    - pos: -1.5,4.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 2.5409737,3.4604747
+      parent: 2
   - uid: 152
     components:
-    - pos: 4.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5126061,7.633571
+      parent: 2
   - uid: 153
     components:
-    - pos: 5.5,6.5
-      parent: 1
-      type: Transform
-- proto: Railing
-  entities:
+    - type: Transform
+      pos: -1.7702793,6.5593524
+      parent: 2
   - uid: 154
     components:
-    - rot: 3.141592653589793 rad
-      pos: 7.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 1.5,8.5
+      parent: 2
   - uid: 155
     components:
-    - pos: 7.5,6.5
-      parent: 1
-      type: Transform
-- proto: ShardGlass
-  entities:
-  - uid: 162
-    components:
-    - pos: 2.5409737,3.4604747
-      parent: 1
-      type: Transform
-  - uid: 163
-    components:
-    - pos: -2.5126061,7.633571
-      parent: 1
-      type: Transform
-  - uid: 164
-    components:
-    - pos: -1.7702793,6.5593524
-      parent: 1
-      type: Transform
-  - uid: 165
-    components:
-    - pos: 1.4725108,9.157009
-      parent: 1
-      type: Transform
-  - uid: 166
-    components:
-    - pos: -0.4028381,10.563259
-      parent: 1
-      type: Transform
-  - uid: 167
-    components:
-    - pos: 7.5285015,3.3042417
-      parent: 1
-      type: Transform
-- proto: SheetPlasma1
-  entities:
-  - uid: 168
-    components:
-    - pos: -1.472928,4.493269
-      parent: 1
-      type: Transform
-    - count: 6
-      type: Stack
-    - size: 6
-      type: Item
+    - type: Transform
+      pos: -0.4028381,10.563259
+      parent: 2
 - proto: SheetSteel1
   entities:
-  - uid: 169
+  - uid: 158
     components:
-    - pos: 4.4873247,3.5939727
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 4.5407724,3.3561268
+      parent: 2
 - proto: ShuttersFrame
   entities:
-  - uid: 170
+  - uid: 159
     components:
-    - anchored: True
+    - type: Transform
+      anchored: True
       pos: 6.5,3.5
-      parent: 1
-      type: Transform
-    - bodyType: Static
-      type: Physics
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: ShuttersWindow
   entities:
-  - uid: 171
+  - uid: 160
     components:
-    - pos: 6.5,4.5
-      parent: 1
-      type: Transform
-    - links:
-      - 174
-      type: DeviceLinkSink
-  - uid: 172
+    - type: Transform
+      pos: 6.5,4.5
+      parent: 2
+  - uid: 161
     components:
-    - pos: 6.5,5.5
-      parent: 1
-      type: Transform
-    - links:
-      - 174
-      type: DeviceLinkSink
+    - type: Transform
+      pos: 6.5,5.5
+      parent: 2
 - proto: ShuttleWindow
   entities:
-  - uid: 173
+  - uid: 162
     components:
-    - pos: 3.5,0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 3.5,0.5
+      parent: 2
 - proto: SignalButton
   entities:
-  - uid: 174
+  - uid: 163
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 6.5,2.5
-      parent: 1
-      type: Transform
-    - linkedPorts:
-        171:
+      parent: 2
+    - type: DeviceLinkSource
+      linkedPorts:
+        160:
         - Pressed: Toggle
-        172:
+        161:
         - Pressed: Toggle
-      type: DeviceLinkSource
 - proto: SignDirectionalEvac
   entities:
-  - uid: 175
+  - uid: 164
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,2.5
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: SignEVA
   entities:
-  - uid: 176
+  - uid: 165
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 177
+      parent: 2
+  - uid: 166
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,6.5
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: SignToolStorage
   entities:
-  - uid: 178
+  - uid: 167
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 1.5,4.5
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: Spaceshroom
   entities:
-  - uid: 179
+  - uid: 168
     components:
-    - pos: 1.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 180
+    - type: Transform
+      pos: 1.5,1.5
+      parent: 2
+  - uid: 169
     components:
-    - pos: 0.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,7.5
+      parent: 2
 - proto: Stool
   entities:
-  - uid: 181
+  - uid: 170
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -1.3014435,6.6570086
-      parent: 1
-      type: Transform
+      parent: 2
 - proto: SubstationBasic
   entities:
-  - uid: 182
+  - uid: 171
     components:
-    - pos: -0.5,4.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,4.5
+      parent: 2
 - proto: Table
   entities:
-  - uid: 183
+  - uid: 172
     components:
-    - pos: 0.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 2
 - proto: Thruster
   entities:
-  - uid: 184
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 185
+  - uid: 132
     components:
-    - rot: 3.141592653589793 rad
+    - type: Transform
+      rot: 3.141592653589793 rad
       pos: 5.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 186
+      parent: 2
+  - uid: 173
     components:
-    - rot: -1.5707963267948966 rad
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-0.5
+      parent: 2
+  - uid: 175
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
       pos: 6.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 187
+      parent: 2
+  - uid: 176
     components:
-    - pos: 3.5,9.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 3.5,9.5
+      parent: 2
 - proto: ToolboxMechanical
   entities:
-  - uid: 188
+  - uid: 177
     components:
-    - pos: -2.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,6.5
+      parent: 2
 - proto: ToyFigurineGreytider
   entities:
-  - uid: 189
+  - uid: 178
     components:
-    - pos: 0.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,6.5
+      parent: 2
 - proto: WallShuttle
   entities:
+  - uid: 179
+    components:
+    - type: Transform
+      pos: 2.5,9.5
+      parent: 2
+  - uid: 182
+    components:
+    - type: Transform
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 183
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 184
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 2
+- proto: WallShuttleDiagonal
+  entities:
+  - uid: 189
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-0.5
+      parent: 2
   - uid: 190
     components:
-    - pos: 2.5,9.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 2
+- proto: WallSolid
+  entities:
+  - uid: 104
+    components:
+    - type: Transform
+      pos: -3.5,2.5
+      parent: 2
+  - uid: 106
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,5.5
+      parent: 2
+  - uid: 107
+    components:
+    - type: Transform
+      pos: 3.5,8.5
+      parent: 2
+  - uid: 108
+    components:
+    - type: Transform
+      pos: -3.5,0.5
+      parent: 2
+  - uid: 109
+    components:
+    - type: Transform
+      pos: 6.5,7.5
+      parent: 2
+  - uid: 111
+    components:
+    - type: Transform
+      pos: -1.5,8.5
+      parent: 2
+  - uid: 112
+    components:
+    - type: Transform
+      pos: -3.5,5.5
+      parent: 2
+  - uid: 113
+    components:
+    - type: Transform
+      pos: -2.5,0.5
+      parent: 2
+  - uid: 120
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,3.5
+      parent: 2
+  - uid: 180
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -3.5,8.5
+      parent: 2
+  - uid: 181
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,7.5
+      parent: 2
+  - uid: 185
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,2.5
+      parent: 2
+  - uid: 186
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,1.5
+      parent: 2
+  - uid: 187
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 1.5,5.5
+      parent: 2
+  - uid: 188
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 6.5,2.5
+      parent: 2
   - uid: 191
     components:
-    - pos: 5.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,1.5
+      parent: 2
   - uid: 192
     components:
-    - pos: 6.5,1.5
-      parent: 1
-      type: Transform
-  - uid: 193
-    components:
-    - pos: 2.5,-0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 6.5,6.5
+      parent: 2
   - uid: 194
     components:
-    - pos: 1.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 195
-    components:
-    - pos: -1.5,10.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -3.5,6.5
+      parent: 2
   - uid: 196
     components:
-    - pos: -2.5,0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,4.5
+      parent: 2
   - uid: 197
     components:
-    - pos: 1.5,5.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,3.5
+      parent: 2
   - uid: 198
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,6.5
+      parent: 2
   - uid: 199
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 3.5,5.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,2.5
+      parent: 2
   - uid: 200
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 6.5,2.5
-      parent: 1
-      type: Transform
-- proto: WallShuttleDiagonal
-  entities:
+    - type: Transform
+      pos: 1.5,2.5
+      parent: 2
   - uid: 201
     components:
-    - rot: 3.141592653589793 rad
-      pos: 3.5,-0.5
-      parent: 1
-      type: Transform
-  - uid: 202
+    - type: Transform
+      pos: 3.5,2.5
+      parent: 2
+  - uid: 230
     components:
-    - rot: -1.5707963267948966 rad
-      pos: 3.5,1.5
-      parent: 1
-      type: Transform
-- proto: WallSolid
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,6.5
+      parent: 2
+  - uid: 231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 3.5,5.5
+      parent: 2
+- proto: WallSolidRust
   entities:
+  - uid: 110
+    components:
+    - type: Transform
+      pos: -1.5,5.5
+      parent: 2
+  - uid: 195
+    components:
+    - type: Transform
+      pos: -2.5,5.5
+      parent: 2
+  - uid: 202
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 2.5,10.5
+      parent: 2
   - uid: 203
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 5.5,1.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,7.5
+      parent: 2
   - uid: 204
     components:
-    - pos: 6.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,0.5
+      parent: 2
   - uid: 205
     components:
-    - pos: 4.5,0.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,2.5
+      parent: 2
   - uid: 206
     components:
-    - pos: -3.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 0.5,5.5
+      parent: 2
   - uid: 207
     components:
-    - pos: -2.5,5.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 3.5,7.5
+      parent: 2
   - uid: 208
     components:
-    - pos: -2.5,4.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 2.5,8.5
+      parent: 2
   - uid: 209
     components:
-    - pos: -2.5,3.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 2
   - uid: 210
     components:
-    - pos: -0.5,6.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 2
   - uid: 211
     components:
-    - pos: -0.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,9.5
+      parent: 2
   - uid: 212
     components:
-    - pos: 1.5,2.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -0.5,8.5
+      parent: 2
   - uid: 213
     components:
-    - pos: 3.5,2.5
-      parent: 1
-      type: Transform
-- proto: WallSolidRust
-  entities:
+    - type: Transform
+      pos: -2.5,8.5
+      parent: 2
   - uid: 214
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 2.5,10.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -2.5,2.5
+      parent: 2
   - uid: 215
     components:
-    - rot: 1.5707963267948966 rad
-      pos: 4.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 216
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 0.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 217
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: -1.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 218
-    components:
-    - pos: 0.5,5.5
-      parent: 1
-      type: Transform
-  - uid: 219
-    components:
-    - pos: 3.5,7.5
-      parent: 1
-      type: Transform
-  - uid: 220
-    components:
-    - pos: 2.5,8.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: 1.5,4.5
+      parent: 2
   - uid: 221
     components:
-    - rot: 1.5707963267948966 rad
-      pos: -0.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 222
-    components:
-    - pos: -1.5,0.5
-      parent: 1
-      type: Transform
-  - uid: 223
-    components:
-    - pos: -1.5,9.5
-      parent: 1
-      type: Transform
-  - uid: 224
-    components:
-    - pos: -0.5,8.5
-      parent: 1
-      type: Transform
-  - uid: 225
-    components:
-    - pos: -2.5,8.5
-      parent: 1
-      type: Transform
-  - uid: 226
-    components:
-    - pos: -2.5,2.5
-      parent: 1
-      type: Transform
-  - uid: 227
-    components:
-    - pos: 1.5,4.5
-      parent: 1
-      type: Transform
-- proto: WarpPointShip
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 2
+- proto: WarpPoint
   entities:
-  - uid: 228
+  - uid: 216
     components:
-    - pos: 2.5,4.5
-      parent: 1
-      type: Transform
-    - location: Sv-Tide
-      type: WarpPoint
+    - type: Transform
+      pos: 2.5,4.5
+      parent: 2
+    - type: WarpPoint
+      location: Sv-Tide
 - proto: Window
   entities:
-  - uid: 229
+  - uid: 217
     components:
-    - pos: 1.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 230
+    - type: Transform
+      pos: 1.5,11.5
+      parent: 2
+  - uid: 218
     components:
-    - pos: 0.5,11.5
-      parent: 1
-      type: Transform
-  - uid: 231
+    - type: Transform
+      pos: 0.5,11.5
+      parent: 2
+  - uid: 219
     components:
-    - pos: -3.5,7.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -3.5,7.5
+      parent: 2
 - proto: Wrench
   entities:
-  - uid: 232
+  - uid: 220
     components:
-    - pos: -1.5,4.5
-      parent: 1
-      type: Transform
+    - type: Transform
+      pos: -1.5,4.5
+      parent: 2
 ...
diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
index 5dec78ace72..70553a21489 100644
--- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
@@ -46,6 +46,7 @@
   - ShipyardSkipper
   - ShipyardSpirit
   - ShipyardStasis
+  - ShipyardTide
   - ShipyardVagabond
 
 - type: guideEntry
@@ -262,3 +263,8 @@
   id: ShipyardVagabond
   name: guide-entry-shipyard-vagabond
   text: "/ServerInfo/_NF/Guidebook/Shipyard/Vagabond.xml"
+  
+- type: guideEntry
+  id: ShipyardTide
+  name: guide-entry-shipyard-tide
+  text: "/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml"
diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
index 16092d133df..646383bf9f4 100644
--- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
@@ -418,6 +418,18 @@
     state: stasis
     scale: 1.2, 1.2
 
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapTide
+  name: "Tide"
+  description: "Detailed map of a Tide shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: tide
+    scale: 1.2, 1.2
+
 - type: entity
   parent: PosterBase
   id: ShuttleMapVagabond
diff --git a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
index aceda3a808b..31e169ffb67 100644
--- a/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Scrap/tide.yml
@@ -7,7 +7,7 @@
   category: Small
   group: Scrap
   shuttlePath: /Maps/_NF/Shuttles/Scrap/tide.yml
-  guidebookPage: Null
+  guidebookPage: ShipyardTide
   class:
   - Scrapyard
   - Civilian
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml
new file mode 100644
index 00000000000..a8e6fc906a8
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Tide.xml
@@ -0,0 +1,73 @@
+<Document>
+  # TIDE-CLASS GENERAL SHUTTLE
+  <Box>
+  <GuideEntityEmbed Entity="ToolboxMechanical"/>
+  <GuideEntityEmbed Entity="Crowbar"/>
+  </Box>  
+  <Box>
+  <GuideEntityEmbed Entity="ShuttleMapTide" Caption="A small map of the Tide Shuttle"/>
+  </Box>
+    [color=#a4885c]Ship Size:[/color] Small
+	
+	[color=#a4885c]Recommended Crew:[/color] 1-3
+	
+	[color=#a4885c]Power Gen Type:[/color] Plasma
+	
+	[color=#a4885c]Expeditions:[/color] None
+	
+	[color=#a4885c]IFF Console:[/color] None
+	
+  "A flying pile of scrap for the seasoned assistant."
+  
+  # PREFLIGHT CHECKLIST
+  
+  ## 1. Power supply
+  
+  ## 1.1. Battery units
+  <Box>
+  <GuideEntityEmbed Entity="SubstationBasic"/>
+  <GuideEntityEmbed Entity="APCBasic"/>
+  </Box>
+
+  - Check to see if the substation is working.
+  - Check that the APC unit's Main Breaker is toggled on.
+  - Check the APC unit's current Load* (W).
+  
+  ## 1.2. P.A.C.M.A.N. generator unit
+  <Box>
+  <GuideEntityEmbed Entity="PortableGeneratorPacmanShuttle"/>
+  <GuideEntityEmbed Entity="SheetPlasma"/>
+  </Box>
+  
+  - Check that the P.A.C.M.A.N. generator unit is anchored, fueled, and on top of Heavy Voltage cable.
+  
+  ## 2. Atmospherics
+  
+  ## 2.1. Distribution Loop
+  <Box>
+  <GuideEntityEmbed Entity="AirCanister"/>
+  <GuideEntityEmbed Entity="GasPort"/>
+  <GuideEntityEmbed Entity="GasPressurePump"/>
+  </Box>
+  
+  - Acquire an air canister if wanted.
+  - After acquiring an air canister, attach it to the connector.
+  - Check that the pipeline is intact.
+  
+  ## 3. Other checks
+  <Box>
+  <GuideEntityEmbed Entity="Gyroscope"/>
+  
+  </Box>
+  
+  - Check that the gyroscope is anchored, powered, and enabled.
+  - Ensure the wiring is in order.
+  
+  ## Sidenotes
+  
+  * - The Tide requires around 8 kilowatts of power to be in working order.
+  
+  ** - The Tide has no tiny fans, in return, there are pumps in the airlocks so you may vent the gases into the air pipes.
+  
+  *** - There is no gravity generator, and there is minor damage to the interior and exterior.
+</Document>
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
index 14145fba669..3a1728a35fe 100644
--- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
+++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
@@ -115,6 +115,9 @@
     {
       "name": "stasis"
     },
+    {
+      "name": "tide"
+    },
     {
       "name": "vagabond"
     }
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/tide.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9a7d279ec2a24e7e97c7081e4c5d923f40c123b
GIT binary patch
literal 1191
zcmV;Y1X%ltP)<h;3K|Lk000e1NJLTq004jh003YJ1^@s6)p~kK00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY1UyMZK~#8N?b^L^
z)G!bSa32(*BMlXk2cb)zfF5Y+LQlavK#>kg@&I`PjyGV2nu?*KfRYq&cyD&kI(cQw
z`iN!g|C`ZR^5?}`$$P#u000000000000000006K?8(yy3`T6;ds|VZdwu--f%spO0
zr4Rs>LjX*$J8kxl5_2iVTrbS+Qg~A_5CD-jzncveZuZEwp?x46ji}HvnLU!VHZ6s{
z-rimU%m5SFBYA8FC>;VI5{+teWZUi1E&aI^bEEN0ZXp0X<QUPVJT_+k5ZYTh&33!x
zn&B#<UoO=@eeixzAgnE$M-EUq1VH7gcm(X;r28}1_6VpV08{}vz#1U{4DDy(+OReK
zl#CppatMIRApj~D6ae=7ZfVQ9p|-gm<`<OAPzTc2q1dIIj+bfpCWiXAfF3O|)RI6g
znO#D%nC%f@buttxTL8#N=Oz>?H~{Psj?P}Dpa7tbH#=Y2vd(u2^PAKWIYxOK3_Wjm
zuej#+v-#0HY94c|b93>PYtyN38zcB8kaL<e1JKCzEx!BjPYkokmIT5wAOI?tZ3<4A
zFTDHJ&k2wNq*20$=>>{U5_sGEX<l#MbF1U~ldh)ioWEQ>xPE$epR0qO-+bp<XLU(n
zNluyvT!R?M0V;<8s2l>Iaz!SAcfpaM^*&3R1P0$DEir5@Ckdpla#CDvT8g3l%r=x`
z^bugcuJwI=YrpEnYu_@B27u3~)%LMRJk=2deR7}VUTJMw3VXfm>)W<@%>W@CXCFs(
z*N3Q`cCWbV#ok{#pX;217orX`4>UWF)@vPVua~yD<V|~RGS)kX_DXj5@q}yBZC>1R
zt)nG@FCTv6S{gn{;LttQ?wNfrUHiMXbM;_w2CxsHwiLVVS}$#L2_5r3iK+K#Y=7+<
zLJa_ln%spiRXv~kVeUg6N%f&lx6fxDZ&L$6A||Gcoo9a`IJ!sDwwLC1qSei%6s>I=
zO#&f38If}p{up~|RHQ%`az&ko-gFg{1ZplmJmFeLOFplko^fruRBr+!@8zJZGk_U&
z6AK-CRGP~+lQ#<_ku3nsXHP((<Bv*n)y@EBfh3RvR4!W%5UJQ4;Mr&Oxt?7+3ufu7
z5&}T|ewv%(=iq-_J!k{KYnH_S1i~UA04j$7s2l>Ia<eBS+Rwpr(Y^&lD)n2|0cL>8
zApj~@Yyf=vl6*P_1!jQCIg^y#Y4?VXUPDq_mc06CJ+D%a<7V$Xe4LsDw%cj{B(yhj
z8Z8O*JyuiNTR+X<48R@K<61B5?bIGS2Iess0Osg58KXBy?D3FJ@C@Jz4j-|{Lpn*4
zK<Z4hL+#GBw?jFKorWo3%o#{~W9Ue-QU_Y^8oqBY7nuagXuZqAmxdYi0)R$cXbC-j
ze_@zKk{ke*3jt8Mq|<Ne=Q$n^0000000000008lt=08L6aW@e`-QWNK002ovPDHLk
FV1l!Y2<!j=

literal 0
HcmV?d00001


From dc1ae5072269eab3cfa929d17107e55d44c8efa6 Mon Sep 17 00:00:00 2001
From: PECK <74548962+PeccNeck@users.noreply.github.com>
Date: Fri, 3 Jan 2025 11:44:49 -0500
Subject: [PATCH 02/20] Bocakillo Directional Fans + tweaks (#2469)

* Directional fans, other tweaks

* Update bocakillo.yml

---------

Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com>
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 .../_NF/Shuttles/BlackMarket/bocakillo.yml    | 212 +++++-------------
 1 file changed, 50 insertions(+), 162 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
index fd01f53615d..f92644803d4 100644
--- a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
+++ b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
@@ -19,11 +19,11 @@ entities:
     components:
     - type: MetaData
       name: Bocakillo
-    - type: BecomesStation
-      id: Bocakillo
     - type: Transform
       pos: -0.4375,-1.703125
       parent: invalid
+    - type: BecomesStation
+      id: Bocakillo
     - type: MapGrid
       chunks:
         0,0:
@@ -231,11 +231,11 @@ entities:
     - type: RadiationGridResistance
 - proto: AirCanister
   entities:
-  - uid: 126
+  - uid: 24
     components:
     - type: Transform
       anchored: True
-      pos: -0.5,0.5
+      pos: 0.5,0.5
       parent: 2
     - type: Physics
       bodyType: Static
@@ -251,12 +251,6 @@ entities:
     - type: Transform
       pos: 1.5,-0.5
       parent: 2
-    - type: Door
-      secondsUntilStateChange: -239.95091
-      state: Opening
-    - type: DeviceLinkSource
-      lastSignals:
-        DoorStatus: True
   - uid: 59
     components:
     - type: Transform
@@ -299,30 +293,27 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,9.5
       parent: 2
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
   entities:
   - uid: 162
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
       pos: 0.5,-3.5
       parent: 2
-  - uid: 218
+  - uid: 164
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -0.5,-3.5
+      pos: 1.5,-3.5
       parent: 2
-  - uid: 247
+  - uid: 197
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5,-3.5
+      pos: -0.5,-3.5
       parent: 2
-  - uid: 248
+  - uid: 198
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
+      rot: 3.141592653589793 rad
       pos: 2.5,4.5
       parent: 2
 - proto: AtmosFixBlockerMarker
@@ -434,58 +425,31 @@ entities:
     - type: Transform
       pos: -0.5,12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 186
   - uid: 171
     components:
     - type: Transform
       pos: 1.5,6.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 186
   - uid: 184
     components:
     - type: Transform
       pos: 1.5,12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 186
   - uid: 212
     components:
     - type: Transform
       pos: -0.5,8.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 186
   - uid: 219
     components:
     - type: Transform
       pos: 0.5,12.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 186
   - uid: 220
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 186
-- proto: BoxBodyBag
-  entities:
-  - uid: 192
-    components:
-    - type: Transform
-      parent: 191
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ButtonFrameCaution
   entities:
   - uid: 213
@@ -837,39 +801,6 @@ entities:
     - type: Transform
       pos: -0.5,12.5
       parent: 2
-- proto: ClosetWall
-  entities:
-  - uid: 191
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 3.5,1.5
-      parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 192
 - proto: ComputerIFF
   entities:
   - uid: 195
@@ -993,7 +924,7 @@ entities:
       pos: -0.5,10.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 111
     components:
     - type: Transform
@@ -1019,14 +950,6 @@ entities:
       parent: 2
     - type: AtmosPipeColor
       color: '#FF1111FF'
-  - uid: 26
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
-      parent: 2
-    - type: AtmosPipeColor
-      color: '#0088FFFF'
   - uid: 28
     components:
     - type: Transform
@@ -1034,7 +957,7 @@ entities:
       pos: -0.5,8.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 36
     components:
     - type: Transform
@@ -1072,7 +995,7 @@ entities:
       pos: -0.5,3.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 91
     components:
     - type: Transform
@@ -1088,7 +1011,7 @@ entities:
       pos: -0.5,9.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 108
     components:
     - type: Transform
@@ -1104,7 +1027,7 @@ entities:
       pos: -0.5,4.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 113
     components:
     - type: Transform
@@ -1112,7 +1035,7 @@ entities:
       pos: -0.5,5.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 114
     components:
     - type: Transform
@@ -1120,7 +1043,7 @@ entities:
       pos: -0.5,7.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 117
     components:
     - type: Transform
@@ -1144,7 +1067,7 @@ entities:
       pos: -0.5,1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 130
     components:
     - type: Transform
@@ -1152,9 +1075,17 @@ entities:
       pos: -0.5,-0.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
+  - uid: 26
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,0.5
+      parent: 2
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 34
     components:
     - type: Transform
@@ -1162,7 +1093,7 @@ entities:
       pos: -0.5,6.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 41
     components:
     - type: Transform
@@ -1178,7 +1109,7 @@ entities:
       pos: -0.5,2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 49
     components:
     - type: Transform
@@ -1197,14 +1128,14 @@ entities:
       color: '#FF1111FF'
 - proto: GasPort
   entities:
-  - uid: 131
+  - uid: 126
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -0.5,0.5
+      rot: -1.5707963267948966 rad
+      pos: 0.5,0.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
 - proto: GasVentPump
   entities:
   - uid: 23
@@ -1214,7 +1145,7 @@ entities:
       pos: -0.5,-1.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 132
     components:
     - type: Transform
@@ -1222,7 +1153,7 @@ entities:
       pos: 0.5,10.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 141
     components:
     - type: Transform
@@ -1230,7 +1161,7 @@ entities:
       pos: 0.5,2.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
   - uid: 142
     components:
     - type: Transform
@@ -1238,7 +1169,7 @@ entities:
       pos: 0.5,6.5
       parent: 2
     - type: AtmosPipeColor
-      color: '#0088FFFF'
+      color: '#0055CCFF'
 - proto: GasVentScrubber
   entities:
   - uid: 33
@@ -1286,34 +1217,22 @@ entities:
     - type: Transform
       pos: -0.5,5.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
-- proto: LockerWallMedicalFilled
+- proto: LockerWallMaterialsFuelPlasmaFilled
   entities:
-  - uid: 216
+  - uid: 191
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 1.5,5.5
       parent: 2
-    - type: EntityStorage
-      air:
-        volume: 200
-        immutable: False
-        temperature: 293.14923
-        moles:
-        - 1.7459903
-        - 6.568249
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
-        - 0
+- proto: LockerWallMedicalFilled
+  entities:
+  - uid: 188
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,1.5
+      parent: 2
 - proto: PirateFlag
   entities:
   - uid: 79
@@ -1383,15 +1302,11 @@ entities:
       parent: 2
 - proto: PortableGeneratorPacmanShuttle
   entities:
-  - uid: 24
+  - uid: 131
     components:
     - type: Transform
       pos: -0.5,6.5
       parent: 2
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
 - proto: PowerCellRecharger
   entities:
   - uid: 157
@@ -1470,13 +1385,6 @@ entities:
     - type: Transform
       pos: 3.5,-2.5
       parent: 2
-- proto: SheetPlasma
-  entities:
-  - uid: 188
-    components:
-    - type: Transform
-      pos: -0.5,6.5
-      parent: 2
 - proto: ShuttleGunPirateCannon
   entities:
   - uid: 75
@@ -1485,18 +1393,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,5.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 226
   - uid: 86
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 3.5,7.5
       parent: 2
-    - type: DeviceLinkSink
-      links:
-      - 226
 - proto: SignalButtonDirectional
   entities:
   - uid: 186
@@ -1594,54 +1496,40 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-0.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 13
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-1.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 15
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -3.5,-0.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 182
     components:
     - type: Transform
       pos: -2.5,4.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 187
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-0.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 225
     components:
     - type: Transform
       pos: -3.5,4.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
   - uid: 236
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -3.5,3.5
       parent: 2
-    - type: Thruster
-      originalPowerLoad: 1500
 - proto: WallPlastitanium
   entities:
   - uid: 18
@@ -1888,7 +1776,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,7.5
       parent: 2
-- proto: WarpPointShip
+- proto: WarpPoint
   entities:
   - uid: 93
     components:

From eec40e03e57176db1411267b05cf3a512e586302 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Fri, 3 Jan 2025 16:45:13 +0000
Subject: [PATCH 03/20] Automatic Changelog (#2469)

---
 Resources/Changelog/Frontier.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index a1756d8c078..d0287445d2e 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6206,3 +6206,13 @@ Entries:
       message: Add toggle feature to moon boots.
   id: 5626
   time: '2025-01-03T13:22:59.0000000+00:00'
+- author: PeccNeck
+  changes:
+    - type: Tweak
+      message: Bocakillo now uses directional fans
+    - type: Tweak
+      message: Moved Bocakillo plasma into wall locker
+    - type: Fix
+      message: Fixed loose piping on Bocakillo
+  id: 5627
+  time: '2025-01-03T16:44:50.0000000+00:00'

From 70bc1a5600fe52d6b42459ec0e83c2fc04e35ad7 Mon Sep 17 00:00:00 2001
From: chrome-cirrus <95361+chrome-cirrus@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:32:24 +0100
Subject: [PATCH 04/20] Fix up Charon + add some features (#2597)

* Fix up Charon + add some features

* Update charon.yml

* Update charon.yml

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 .../Maps/_NF/Shuttles/Expedition/charon.yml   | 592 ++++++++++++++----
 1 file changed, 459 insertions(+), 133 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml
index 10dd44ef769..a99fbffc6dc 100644
--- a/Resources/Maps/_NF/Shuttles/Expedition/charon.yml
+++ b/Resources/Maps/_NF/Shuttles/Expedition/charon.yml
@@ -27,19 +27,19 @@ entities:
       chunks:
         0,0:
           ind: 0,0
-          tiles: gwAAAAAAIQAAAAADcQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAACgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAACIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACcQAAAAAAgwAAAAAAcQAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: gwAAAAAAgwAAAAAAcQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAACgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAACIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAACcQAAAAAAgwAAAAAAcQAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
-          tiles: BAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAABgwAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAACgwAAAAAAIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAADcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACAgAAAAABAgAAAAACIQAAAAACAgAAAAADIQAAAAACAgAAAAADIQAAAAABAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAAAAgAAAAABAgAAAAABIQAAAAABAgAAAAAAIQAAAAADAgAAAAADIQAAAAACAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAABIQAAAAAAcQAAAAAAIQAAAAABIQAAAAADcQAAAAAAIQAAAAADcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAAAAAAAAABAAAAAABgwAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACAAAAAAAAgwAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAACcQAAAAAAIQAAAAADAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAADAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAIQAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAABAAAAAAAAgwAAAAAAIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAAIQAAAAACAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: BAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAACIQAAAAABgwAAAAAAIQAAAAABIQAAAAABcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAABgwAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAACgwAAAAAAIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAADcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAIQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAADgwAAAAAAAgAAAAABAgAAAAACgwAAAAAAAgAAAAADgwAAAAAAAgAAAAADgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAAgAAAAABAgAAAAABgwAAAAAAAgAAAAAAgwAAAAAAAgAAAAADgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAAAAAAAAABAAAAAABgwAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAACIQAAAAADIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAADIQAAAAACAAAAAAAAgwAAAAAAIQAAAAADIQAAAAAAIQAAAAABIQAAAAABIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAADAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAIQAAAAADIQAAAAACIQAAAAABgwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAIQAAAAAAIQAAAAABAAAAAAAAgwAAAAAAIQAAAAACIQAAAAABIQAAAAACIQAAAAACIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAAwAAAAAAgwAAAAAAAQAAAAAAAQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAABIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAADAAAAAAAAAAAAAAAABAAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAABAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAACgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAIQAAAAABIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAADIQAAAAADIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAADIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAIQAAAAADIQAAAAACgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAABIQAAAAADIQAAAAABIQAAAAACIQAAAAACIQAAAAAAIQAAAAABIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADIQAAAAACIQAAAAABIQAAAAACIQAAAAABIQAAAAAAIQAAAAABIQAAAAACIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACIQAAAAACIQAAAAACIQAAAAABIQAAAAACIQAAAAACAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAADIQAAAAABIQAAAAADIQAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAggAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAIQAAAAABgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAIQAAAAADIQAAAAADIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAABAAAAAAAgwAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAIQAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAABgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAIQAAAAADIQAAAAABIQAAAAACIQAAAAACIQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAADgwAAAAAAIQAAAAABIQAAAAACIQAAAAABIQAAAAAAIQAAAAABgwAAAAAAIQAAAAAAIQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAADgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAACIQAAAAACIQAAAAACgwAAAAAAIQAAAAACIQAAAAACAAAAAAAAAAAAAAAAggAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAADIQAAAAADgwAAAAAAIQAAAAADIQAAAAAC
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: cQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAACIQAAAAADIQAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAgwAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAABIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: cQAAAAAAgwAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAADgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADgwAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAACIQAAAAADgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAABIQAAAAADIQAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAAAIQAAAAACgwAAAAAAIQAAAAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAgwAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAgwAAAAAAIQAAAAADIQAAAAABgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAgwAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAAAADIQAAAAABgwAAAAAAIQAAAAACgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAADgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAACgwAAAAAAIQAAAAABgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAIQAAAAAAgwAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         0,-2:
           ind: 0,-2
@@ -548,40 +548,41 @@ entities:
           0,1:
             0: 60894
           -1,1:
-            0: 56784
+            0: 56528
+            1: 256
           0,2:
             0: 44798
           -1,2:
             0: 16383
           0,3:
             0: 2798
-            1: 256
+            2: 256
           0,-1:
             0: 61166
           1,0:
             0: 65376
-            1: 8
+            2: 8
           1,3:
-            1: 256
+            2: 256
           1,1:
-            2: 544
-            1: 8
+            3: 544
+            2: 8
           1,-1:
-            2: 8192
+            3: 8192
           -4,0:
-            1: 1
+            2: 1
             0: 65376
           -4,1:
-            1: 1
-            2: 1088
+            2: 1
+            3: 1088
           -4,2:
-            1: 2
+            2: 2
             0: 52424
           -4,3:
-            1: 32
+            2: 32
             0: 12
           -4,-1:
-            2: 16384
+            3: 16384
           -3,0:
             0: 65522
           -3,1:
@@ -590,7 +591,7 @@ entities:
             0: 30591
           -3,3:
             0: 3
-            1: 64
+            2: 64
           -3,-1:
             0: 30583
           -2,0:
@@ -602,30 +603,30 @@ entities:
           -2,-1:
             0: 65535
           -2,3:
-            1: 2
-            2: 192
+            2: 2
+            3: 192
           -1,3:
-            2: 48
-            1: 4
+            3: 48
+            2: 4
           -1,-1:
             0: 56797
           -4,-3:
-            2: 2
+            3: 2
             0: 19520
           -4,-2:
             0: 2
-            2: 1088
+            3: 1088
           -4,-4:
-            2: 18432
+            3: 18432
           -3,-4:
             0: 65228
-            2: 16
+            3: 16
           -3,-3:
             0: 65535
           -3,-2:
             0: 65535
           -3,-5:
-            1: 11264
+            2: 11264
           -2,-4:
             0: 65535
           -2,-3:
@@ -640,25 +641,25 @@ entities:
             0: 4095
           0,-4:
             0: 63283
-            2: 128
+            3: 128
           0,-3:
             0: 65535
           0,-2:
             0: 65535
           0,-5:
-            1: 17152
+            2: 17152
           1,-4:
-            2: 8448
+            3: 8448
           1,-3:
             0: 8992
-            2: 4
+            3: 4
           1,-2:
-            2: 544
+            3: 544
             0: 4
           -1,-5:
-            1: 3840
+            2: 3840
           -2,-5:
-            1: 3840
+            2: 3840
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -675,6 +676,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14996
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -1508,6 +1524,51 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-3.5
       parent: 1
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 1145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,4.5
+      parent: 1
+  - uid: 1152
+    components:
+    - type: Transform
+      pos: -11.5,4.5
+      parent: 1
+  - uid: 1153
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,10.5
+      parent: 1
+- proto: ButtonFrameGrey
+  entities:
+  - uid: 1131
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-1.5
+      parent: 1
+  - uid: 1132
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,7.5
+      parent: 1
+  - uid: 1133
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 1
+  - uid: 1151
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,7.5
+      parent: 1
 - proto: CableApcExtension
   entities:
   - uid: 327
@@ -3550,13 +3611,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,5.5
       parent: 1
-- proto: ClosetWallMaintenanceFilledRandom
-  entities:
-  - uid: 497
-    components:
-    - type: Transform
-      pos: -6.5,11.5
-      parent: 1
 - proto: ClosetWallO2N2FilledRandom
   entities:
   - uid: 135
@@ -3565,12 +3619,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,10.5
       parent: 1
-  - uid: 136
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,-7.5
-      parent: 1
   - uid: 140
     components:
     - type: Transform
@@ -3582,6 +3630,12 @@ entities:
     - type: Transform
       pos: -7.5,4.5
       parent: 1
+  - uid: 1134
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-8.5
+      parent: 1
 - proto: ComputerPowerMonitoring
   entities:
   - uid: 470
@@ -3600,11 +3654,11 @@ entities:
       parent: 1
 - proto: ComputerTabletopRadar
   entities:
-  - uid: 679
+  - uid: 945
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-2.5
       parent: 1
 - proto: ComputerTabletopSalvageExpedition
   entities:
@@ -3622,14 +3676,36 @@ entities:
       parent: 1
 - proto: ComputerTabletopStationRecords
   entities:
-  - uid: 418
+  - uid: 981
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,9.5
+      parent: 1
+- proto: ComputerTabletopSurveillanceCameraMonitor
+  entities:
+  - uid: 263
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -13.5,10.5
       parent: 1
+- proto: ComputerTelevision
+  entities:
+  - uid: 691
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,10.5
+      parent: 1
 - proto: ComputerWallmountWithdrawBankATM
   entities:
+  - uid: 876
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-14.5
+      parent: 1
   - uid: 1023
     components:
     - type: Transform
@@ -3784,9 +3860,9 @@ entities:
     - type: Transform
       pos: 3.5,-6.5
       parent: 1
-- proto: CrateMaterials
+- proto: CrateEmptySpawner
   entities:
-  - uid: 816
+  - uid: 497
     components:
     - type: Transform
       pos: 3.5,-2.5
@@ -3843,11 +3919,22 @@ entities:
       parent: 1
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 142
+  - uid: 894
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -12.5,7.5
+      pos: -6.5,4.5
+      parent: 1
+- proto: DrinkMugMetal
+  entities:
+  - uid: 968
+    components:
+    - type: Transform
+      pos: 0.514734,5.5936146
+      parent: 1
+  - uid: 989
+    components:
+    - type: Transform
+      pos: -13.586125,12.227859
       parent: 1
 - proto: EmergencyLight
   entities:
@@ -3900,10 +3987,11 @@ entities:
     - type: Transform
       pos: -12.5,-8.5
       parent: 1
-  - uid: 452
+  - uid: 458
     components:
     - type: Transform
-      pos: 4.5,-8.5
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-7.5
       parent: 1
 - proto: FaxMachineShip
   entities:
@@ -3966,10 +4054,10 @@ entities:
       - 1002
 - proto: FlashlightLantern
   entities:
-  - uid: 1035
+  - uid: 979
     components:
     - type: Transform
-      pos: -9.327917,-2.2779932
+      pos: 1.620919,-2.118234
       parent: 1
 - proto: FloorDrain
   entities:
@@ -3981,19 +4069,26 @@ entities:
       parent: 1
     - type: Fixtures
       fixtures: {}
+- proto: FoodPlateSmall
+  entities:
+  - uid: 816
+    components:
+    - type: Transform
+      pos: -0.48450565,5.718701
+      parent: 1
 - proto: FoodShakerPepper
   entities:
   - uid: 793
     components:
     - type: Transform
-      pos: 0.031318903,5.7154756
+      pos: 0.11334777,5.708277
       parent: 1
 - proto: FoodShakerSalt
   entities:
   - uid: 792
     components:
     - type: Transform
-      pos: -0.1718061,5.5434813
+      pos: -0.0012357235,5.520647
       parent: 1
 - proto: GasFilterOxygenOnFlipped
   entities:
@@ -5718,14 +5813,21 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -2.5,6.5
       parent: 1
-- proto: LockerWallEVAColorSalvageFilled
+- proto: LockerWallColorGenericBlack
   entities:
-  - uid: 263
+  - uid: 452
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -10.5,-14.5
       parent: 1
+- proto: LockerWallColorGenericBlue
+  entities:
+  - uid: 136
+    components:
+    - type: Transform
+      pos: -6.5,11.5
+      parent: 1
 - proto: LockerWallMaterialsFuelAmeJarFilled
   entities:
   - uid: 1019
@@ -5736,10 +5838,10 @@ entities:
       parent: 1
 - proto: MicroManipulatorStockPart
   entities:
-  - uid: 945
+  - uid: 988
     components:
     - type: Transform
-      pos: 1.5528102,-2.126207
+      pos: 1.662586,-1.492799
       parent: 1
 - proto: MopItem
   entities:
@@ -5816,11 +5918,11 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -11.5,5.5
       parent: 1
-  - uid: 1036
+  - uid: 1179
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-2.5
       parent: 1
 - proto: PoweredLEDLightPostSmall
   entities:
@@ -6134,13 +6236,6 @@ entities:
     - type: Transform
       pos: 1.5,-17.5
       parent: 1
-- proto: RandomArcade
-  entities:
-  - uid: 894
-    components:
-    - type: Transform
-      pos: -1.5,10.5
-      parent: 1
 - proto: RandomBook
   entities:
   - uid: 101
@@ -6169,10 +6264,11 @@ entities:
     - type: Transform
       pos: -7.5,9.5
       parent: 1
-  - uid: 876
+  - uid: 985
     components:
     - type: Transform
-      pos: 2.5,-14.5
+      rot: 3.141592653589793 rad
+      pos: 4.5,-11.5
       parent: 1
   - uid: 1007
     components:
@@ -6356,20 +6452,160 @@ entities:
       parent: 1
 - proto: Screwdriver
   entities:
-  - uid: 979
+  - uid: 1035
     components:
     - type: Transform
-      pos: 1.4590602,-2.470196
+      pos: 1.527169,-1.8055165
       parent: 1
 - proto: ShipyardCharonInfo
   entities:
-  - uid: 1133
+  - uid: 1074
+    components:
+    - type: Transform
+      pos: -13.304875,12.49888
+      parent: 1
+- proto: ShuttersNormalOpen
+  entities:
+  - uid: 986
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -9.5,12.5
+      parent: 1
+  - uid: 987
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -10.5,13.5
+      parent: 1
+  - uid: 994
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -11.5,13.5
+      parent: 1
+  - uid: 998
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -12.5,13.5
+      parent: 1
+  - uid: 999
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -13.5,13.5
+      parent: 1
+  - uid: 1022
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,12.5
+      parent: 1
+  - uid: 1026
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,11.5
+      parent: 1
+  - uid: 1027
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,10.5
+      parent: 1
+  - uid: 1030
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,9.5
+      parent: 1
+  - uid: 1031
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-2.5
+      parent: 1
+  - uid: 1040
     components:
     - type: Transform
-      pos: -13.227627,12.695766
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-3.5
+      parent: 1
+  - uid: 1041
+    components:
+    - type: Transform
+      pos: -13.5,8.5
+      parent: 1
+  - uid: 1042
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -12.5,-2.5
+      parent: 1
+  - uid: 1122
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-3.5
+      parent: 1
+  - uid: 1123
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,9.5
+      parent: 1
+  - uid: 1130
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,8.5
       parent: 1
 - proto: SignalButton
   entities:
+  - uid: 418
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1041:
+        - Pressed: Toggle
+        1030:
+        - Pressed: Toggle
+        1027:
+        - Pressed: Toggle
+        1026:
+        - Pressed: Toggle
+        1022:
+        - Pressed: Toggle
+        999:
+        - Pressed: Toggle
+        998:
+        - Pressed: Toggle
+        994:
+        - Pressed: Toggle
+        987:
+        - Pressed: Toggle
+        986:
+        - Pressed: Toggle
+  - uid: 962
+    components:
+    - type: Transform
+      pos: -11.5,4.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        44:
+        - Pressed: DoorBolt
+        35:
+        - Pressed: DoorBolt
+        487:
+        - Pressed: DoorBolt
+        41:
+        - Pressed: DoorBolt
   - uid: 996
     components:
     - type: Transform
@@ -6434,6 +6670,76 @@ entities:
         - Pressed: Toggle
         276:
         - Pressed: Toggle
+  - uid: 1075
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,-1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1031:
+        - Pressed: Toggle
+        1122:
+        - Pressed: Toggle
+  - uid: 1076
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,4.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        731:
+        - Pressed: DoorBolt
+        486:
+        - Pressed: DoorBolt
+        38:
+        - Pressed: DoorBolt
+        489:
+        - Pressed: DoorBolt
+  - uid: 1077
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -12.5,-1.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1042:
+        - Pressed: Toggle
+        1040:
+        - Pressed: Toggle
+  - uid: 1078
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,7.5
+      parent: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        1123:
+        - Pressed: Toggle
+        1130:
+        - Pressed: Toggle
+  - uid: 1090
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,10.5
+      parent: 1
+    - type: SignalSwitch
+      state: True
+    - type: DeviceLinkSource
+      linkedPorts:
+        42:
+        - Pressed: DoorBolt
+        40:
+        - Pressed: DoorBolt
+        73:
+        - Pressed: DoorBolt
+        46:
+        - Pressed: DoorBolt
   - uid: 1118
     components:
     - type: Transform
@@ -6471,11 +6777,11 @@ entities:
       parent: 1
 - proto: SignDirectionalBridge
   entities:
-  - uid: 962
+  - uid: 1079
     components:
     - type: Transform
       rot: 3.141592653589793 rad
-      pos: -11.5,4.5
+      pos: -9.5,4.5
       parent: 1
 - proto: SignDirectionalCB1
   entities:
@@ -6552,42 +6858,6 @@ entities:
     - type: Transform
       pos: -3.5,-1.5
       parent: 1
-- proto: SpawnDungeonLootCutlery
-  entities:
-  - uid: 989
-    components:
-    - type: Transform
-      pos: -3.456415,11.434776
-      parent: 1
-  - uid: 1014
-    components:
-    - type: Transform
-      pos: -0.5656798,5.6530457
-      parent: 1
-  - uid: 1135
-    components:
-    - type: Transform
-      pos: -3.456415,11.163755
-      parent: 1
-- proto: SpawnDungeonLootMugs
-  entities:
-  - uid: 968
-    components:
-    - type: Transform
-      pos: 0.52348495,5.589697
-      parent: 1
-  - uid: 1134
-    components:
-    - type: Transform
-      pos: -13.602627,12.195419
-      parent: 1
-- proto: SpawnDungeonVendomatsClothes
-  entities:
-  - uid: 458
-    components:
-    - type: Transform
-      pos: 1.5,8.5
-      parent: 1
 - proto: SpawnerHoloGraffitiRandom
   entities:
   - uid: 165
@@ -6644,6 +6914,53 @@ entities:
     - type: Transform
       pos: -9.5,-0.5
       parent: 1
+- proto: SurveillanceCameraAssembly
+  entities:
+  - uid: 1173
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-0.5
+      parent: 1
+  - uid: 1175
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -13.5,-0.5
+      parent: 1
+- proto: SurveillanceCameraGeneral
+  entities:
+  - uid: 1036
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 5.5,3.5
+      parent: 1
+  - uid: 1176
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -9.5,-17.5
+      parent: 1
+  - uid: 1181
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -14.5,3.5
+      parent: 1
+  - uid: 1182
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,12.5
+      parent: 1
+- proto: SurveillanceCameraRouterGeneral
+  entities:
+  - uid: 983
+    components:
+    - type: Transform
+      pos: -4.5,-3.5
+      parent: 1
 - proto: Table
   entities:
   - uid: 258
@@ -6662,18 +6979,20 @@ entities:
     - type: Transform
       pos: 1.5,-1.5
       parent: 1
-  - uid: 988
+  - uid: 1178
     components:
     - type: Transform
-      pos: -9.5,-2.5
+      rot: 3.141592653589793 rad
+      pos: -5.5,-0.5
       parent: 1
-  - uid: 1130
+- proto: TableCounterMetal
+  entities:
+  - uid: 142
     components:
     - type: Transform
-      pos: -4.5,-3.5
+      rot: 1.5707963267948966 rad
+      pos: -13.5,9.5
       parent: 1
-- proto: TableCounterMetal
-  entities:
   - uid: 631
     components:
     - type: Transform
@@ -6692,11 +7011,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -13.5,11.5
       parent: 1
-  - uid: 691
+  - uid: 679
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -13.5,9.5
+      rot: -1.5707963267948966 rad
+      pos: -9.5,-2.5
       parent: 1
   - uid: 693
     components:
@@ -6746,9 +7065,9 @@ entities:
     - type: Transform
       pos: -7.5,5.5
       parent: 1
-- proto: TelecomServerFilledCommon
+- proto: TelecomServerFilledShuttle
   entities:
-  - uid: 1030
+  - uid: 982
     components:
     - type: Transform
       pos: -3.5,-3.5
@@ -6893,10 +7212,10 @@ entities:
       parent: 1
 - proto: ToolboxElectricalFilled
   entities:
-  - uid: 1027
+  - uid: 980
     components:
     - type: Transform
-      pos: -4.56157,-3.2981017
+      pos: -5.4728174,-0.3558907
       parent: 1
 - proto: TrashBag
   entities:
@@ -7025,6 +7344,13 @@ entities:
         - Left: Reverse
         - Right: Forward
         - Middle: Off
+- proto: VendingMachineCargoDrobe
+  entities:
+  - uid: 1014
+    components:
+    - type: Transform
+      pos: 1.5,8.5
+      parent: 1
 - proto: VendingMachineEngiDrobe
   entities:
   - uid: 993

From 872a511ab4e0940143d9cd38b234ae65d58dd535 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Fri, 3 Jan 2025 17:32:50 +0000
Subject: [PATCH 05/20] Automatic Changelog (#2597)

---
 Resources/Changelog/Frontier.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index d0287445d2e..6e0b7fb40c3 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6216,3 +6216,11 @@ Entries:
       message: Fixed loose piping on Bocakillo
   id: 5627
   time: '2025-01-03T16:44:50.0000000+00:00'
+- author: chrome-cirrus
+  changes:
+    - type: Add
+      message: Charon gets shutters and some cameras.
+    - type: Tweak
+      message: Charon had a bunch of small fixes and additions made.
+  id: 5628
+  time: '2025-01-03T17:32:24.0000000+00:00'

From 919009ee9238637a141cfde0f920484137a75f5f Mon Sep 17 00:00:00 2001
From: Bonaout <bonaoutgneugneu@gmail.com>
Date: Fri, 3 Jan 2025 19:26:44 +0100
Subject: [PATCH 06/20] Commander's Beret 1.0 (#2634)

---
 Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml    | 6 ++++++
 Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml   | 6 ++++++
 .../Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml    | 1 +
 3 files changed, 13 insertions(+)

diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
index 1ac6b3a7264..f8c976c40a4 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
@@ -262,3 +262,9 @@
   - type: Clothing
     sprite: _NF/Clothing/Head/Hats/stc_cap.rsi
   - type: HamsterWearable
+    
+- type: entity
+  parent: ClothingHeadHatBeretHoS
+  id: ClothingHeadHatBeretCommander
+  name: commander's beret
+  description: A black beret with a commander's rank emblem.
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml
index 656f7b11fbf..72255806c63 100644
--- a/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml
+++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Mercenary/head.yml
@@ -21,3 +21,9 @@
   price: 0
   equipment:
     head: ClothingHeadHatBeretMercenary
+
+- type: loadout
+  id: MercenaryClothingHeadHatBeretCommander
+  price: 500
+  equipment:
+    head: ClothingHeadHatBeretCommander
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
index b69126348b3..edbb864dd70 100644
--- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
+++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
@@ -75,6 +75,7 @@
   - MercenaryClothingHeadHelmetMercenaryBlack
   - MercenaryClothingHeadBandMercenary
   - MercenaryClothingHeadHatBeretMercenary
+  - MercenaryClothingHeadHatBeretCommander
   - SecurityHelmet
   - SecurityBeret
   subgroups:

From 0924e9f9fb95804ef100affcb5751f04d057deb9 Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Sat, 4 Jan 2025 16:53:52 +0000
Subject: [PATCH 07/20] Adds clear condiment bottle. (#2654)

* Adds clear condiment bottle.

* Update meta.json

* Update condiments.yml

* Update lathe.yml

* Cleanup

* Fixup

* Inv change

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 .../Containers/CondimentKetchupComponent.cs   |  11 +++++
 .../Containers/CondimentMustardComponent.cs   |  11 +++++
 .../Inventories/condiments.yml                |  13 ++---
 .../Entities/Structures/Machines/lathe.yml    |   1 +
 .../Consumable/Food/Containers/condiments.yml |  45 ++++++++++++------
 .../Entities/Structures/Machines/lathe.yml    |   1 +
 .../Recipes/Crafting/Graphs/shoes_graphs.yml  |   8 ++--
 .../Prototypes/_NF/Recipes/Lathes/service.yml |   8 ++++
 Resources/Prototypes/_NF/tags.yml             |   3 --
 .../Consumable/Food/condiments.rsi/meta.json  |  23 ++++++++-
 .../condiments.rsi/squeeze-bottle-clear.png   | Bin 0 -> 349 bytes
 .../condiments.rsi/squeeze-bottle-clear1.png  | Bin 0 -> 144 bytes
 .../condiments.rsi/squeeze-bottle-clear2.png  | Bin 0 -> 162 bytes
 .../condiments.rsi/squeeze-bottle-clear3.png  | Bin 0 -> 175 bytes
 .../condiments.rsi/squeeze-bottle-clear4.png  | Bin 0 -> 177 bytes
 .../condiments.rsi/squeeze-bottle-clear5.png  | Bin 0 -> 186 bytes
 .../condiments.rsi/squeeze-bottle-clear6.png  | Bin 0 -> 194 bytes
 17 files changed, 95 insertions(+), 29 deletions(-)
 create mode 100644 Content.Shared/_NF/Containers/CondimentKetchupComponent.cs
 create mode 100644 Content.Shared/_NF/Containers/CondimentMustardComponent.cs
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear3.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear5.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png

diff --git a/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs b/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs
new file mode 100644
index 00000000000..27571ed0c65
--- /dev/null
+++ b/Content.Shared/_NF/Containers/CondimentKetchupComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentKetchup empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentKetchupComponent : Component
+{
+
+}
diff --git a/Content.Shared/_NF/Containers/CondimentMustardComponent.cs b/Content.Shared/_NF/Containers/CondimentMustardComponent.cs
new file mode 100644
index 00000000000..8d242809760
--- /dev/null
+++ b/Content.Shared/_NF/Containers/CondimentMustardComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentMustard empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentMustardComponent : Component
+{
+
+}
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
index a4dddd0e5d8..f3dd5b58959 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
@@ -15,12 +15,13 @@
     FoodCondimentPacketSoy: 5
     FoodCondimentPacketSugar: 5
     FoodCondimentPacketCornoil: 5
-    FoodCondimentBottleBBQ: 2 # Frontier
-    FoodCondimentBottleColdsauce: 2 # Frontier
-    FoodCondimentBottleHotsauce: 2 # Frontier
-    FoodCondimentBottleKetchup: 2 # Frontier
-    FoodCondimentSqueezeBottleKetchup: 4 # Frontier
-    FoodCondimentSqueezeBottleMustard: 4 # Frontier
+    FoodCondimentBottleBBQ: 1 # Frontier
+    FoodCondimentBottleColdsauce: 1 # Frontier
+    FoodCondimentBottleHotsauce: 1 # Frontier
+    FoodCondimentBottleKetchup: 1 # Frontier
+    FoodCondimentSqueezeBottleClear: 2 # Frontier
+    FoodCondimentSqueezeBottleKetchup: 1 # Frontier
+    FoodCondimentSqueezeBottleMustard: 1 # Frontier
     ForkPlastic: 10
     SpoonPlastic: 10
     KnifePlastic: 10
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 3399f2646b6..45e157b6e91 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -211,6 +211,7 @@
       - FreezerElectronics
       - BoxDispenserFlare # Frontier
       - Durathread # Frontier
+      - FoodCondimentSqueezeBottleClear # Frontier
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml
index 0ee74d535de..a6ab68876f6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -2,7 +2,7 @@
   parent: BaseFoodCondiment
   id: BaseFoodCondimentSqueezeBottle
   abstract: true
-  name: condiment squeeze bottle
+  name: squeeze bottle
   description: A thin plastic container used to store condiments.
   components:
   - type: Drink
@@ -10,7 +10,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 30
+        maxVol: 50
   - type: RefillableSolution
     solution: food
   - type: Spillable
@@ -19,7 +19,7 @@
     playTransferSound: true
     canChangeTransferAmount: true
     minTransferAmount: 5
-    maxTransferAmount: 30
+    maxTransferAmount: 50
   - type: Appearance
   - type: PhysicalComposition
     materialComposition:
@@ -42,39 +42,54 @@
 - type: entity
   parent: BaseFoodCondimentSqueezeBottle
   id: FoodCondimentSqueezeBottleKetchup
-  name: ketchup squeeze bottle
-  description: You feel more American already.
   components:
   - type: SolutionContainerManager
     solutions:
       food:
         reagents:
         - ReagentId: Ketchup
-          Quantity: 30
-  - type: Tag
-    tags:
-      - Ketchup
+          Quantity: 50
   - type: Sprite
     state: squeeze-bottle-ketchup
   - type: Icon
     state: squeeze-bottle-ketchup
+  - type: Label
+    currentLabel: reagent-name-ketchup
+  - type: CondimentKetchup
 
 - type: entity
   parent: BaseFoodCondimentSqueezeBottle
   id: FoodCondimentSqueezeBottleMustard
-  name: mustard squeeze bottle
-  description: You feel more American already.
   components:
   - type: SolutionContainerManager
     solutions:
       food:
         reagents:
         - ReagentId: Mustard
-          Quantity: 30
-  - type: Tag
-    tags:
-      - Mustard
+          Quantity: 50
   - type: Sprite
     state: squeeze-bottle-mustard
   - type: Icon
     state: squeeze-bottle-mustard
+  - type: Label
+    currentLabel: reagent-name-mustard
+  - type: CondimentMustard
+
+- type: entity
+  parent: BaseFoodCondimentSqueezeBottle
+  id: FoodCondimentSqueezeBottleClear
+  description: When it comes to squeeze bottles this is the clear choice.
+  components:
+  - type: Sprite
+    layers:
+      - state: squeeze-bottle-clear
+      - state: squeeze-bottle-clear1
+        map: [ "enum.SolutionContainerLayers.Fill" ]
+        visible: false
+    state: squeeze-bottle-clear
+  - type: Icon
+    state: squeeze-bottle-clear
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 6
+    fillBaseName: squeeze-bottle-clear
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index d98eb7e6fad..ae15f942792 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -134,6 +134,7 @@
       - FoodPlateSmallPlastic
       - NapkinDrum
       - Napkin
+      - FoodCondimentSqueezeBottleClear
     ## EVA
       - ClothingOuterEVASuitHydro
       - ClothingOuterEVASuitJanitor
diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml
index e25448f6693..d5feb45e858 100644
--- a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml
+++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/shoes_graphs.yml
@@ -41,7 +41,7 @@
                 sprite: Clothing/Shoes/Specific/clown.rsi
                 state: icon
               doAfter: 1
-            - tag: Ketchup
+            - component: CondimentKetchup
               name: squeeze bottle
               icon:
                 sprite: _NF/Objects/Consumable/Food/condiments.rsi
@@ -64,13 +64,13 @@
                 sprite: Clothing/Shoes/Specific/clown.rsi
                 state: icon
               doAfter: 1
-            - tag: Ketchup
+            - component: CondimentKetchup
               name: ketchup
               icon:
                 sprite: _NF/Objects/Consumable/Food/condiments.rsi
                 state: squeeze-bottle-ketchup
               doAfter: 1
-            - tag: Mustard
+            - component: CondimentMustard
               name: mustard
               icon:
                 sprite: _NF/Objects/Consumable/Food/condiments.rsi
@@ -93,7 +93,7 @@
                 sprite: Clothing/Shoes/Specific/clown.rsi
                 state: icon
               doAfter: 1
-            - tag: Ketchup
+            - component: CondimentKetchup
               name: squeeze bottle
               icon:
                 sprite: _NF/Objects/Consumable/Food/condiments.rsi
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
index 738e97e152d..853acc01279 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -57,3 +57,11 @@
     Glass: 200
     Plastic: 100
     Steel: 100
+
+- type: latheRecipe
+  id: FoodCondimentSqueezeBottleClear
+  result: FoodCondimentSqueezeBottleClear
+  parent: BaseServiceItemsRecipe  
+  applyMaterialDiscount: false
+  materials:
+    Plastic: 50
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index aee1f4b7654..e22609d87a2 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -91,9 +91,6 @@
 - type: Tag
   id: WhoopieCushion
 
-- type: Tag
-  id: Mustard
-
 - type: Tag
   id: PrizeTicket
 
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json
index 0ff13deaa74..cd6fb5554dc 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "bingus",
+  "copyright": "gentlebutter, clear edited by dustylens(github)",
   "size": {
     "x": 32,
     "y": 32
@@ -12,6 +12,27 @@
     },
 	{
       "name": "squeeze-bottle-mustard"
+    },
+    {
+      "name": "squeeze-bottle-clear"
+    },
+    {
+      "name": "squeeze-bottle-clear1"
+    },
+    {
+      "name": "squeeze-bottle-clear2"
+    },
+    {
+      "name": "squeeze-bottle-clear3"
+    },
+    {
+      "name": "squeeze-bottle-clear4"
+    },
+    {
+      "name": "squeeze-bottle-clear5"
+    },
+    {
+      "name": "squeeze-bottle-clear6"
     }
   ]
 }
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear.png
new file mode 100644
index 0000000000000000000000000000000000000000..12a9b1945ba69f7a04e91f43216363492bf7b3e7
GIT binary patch
literal 349
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<;+`&!ArY;~
z2@<S}6EvE4m%snFzvShmdapAH3tf!O&COMBNlF00j1yOXJUZI_p9ct<nwof~v@k{T
zReXPUx1J3M%*@Q%;`i4Xo;Y!0!ds3_G9O-F*SFv;X4!f1pvNk<-=~_ZbJnWz01f(-
zn3NY~(_J3>yQt*<zTMZ{fA8@yntaEkKz6nQxAphpAYLVFL8a!{>-&yOT0LEh&w=Us
zi>C~}C5-;EcE&|KN;etn>*|*7`Lgf`;|~VQzQtuy3X(kX>^b{Cy%e#PZ3q;&s4M<}
z=?fp@D#le72V!TJ3+@Gq3OO~h?v-&cbttNCXl!gexGLp5*x6xW*PidM|357y0SNwl
l?{2)Z?SO^^YcmrAgW@AU8^>D{UjxI7!PC{xWt~$(695TKh&TWM

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e77c9045d296b0ef60f680bf396ad72f3d5a6b4
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_
z&utWJVBm1RSaDo$&4DDJgGo9EY@#w#otGZ1PkqNR5vY>kLGtl$3dZL<ChWGKIWsfu
p%H36~LZ4S1uzjR^-;TZRA=7atKIYpCe}L>{@O1TaS?83{1OPNLGTs0H

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear2.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d934936d01d1078cd332b63aa6d1812aab7c8e6
GIT binary patch
literal 162
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}F`h1tArY-_
zFCFA;aNu#d7<lRQwh70!b>-^lE|IdW5c(!0D)Q&O#RP*19zfLx?(1G{y!ZRryR5Zy
zKb;A2$><5ZwKI(S%#52)Z@P2c`B>HXiQnV6{FzU${x<sGU^JS^C#ssc<T+3$gQu&X
J%Q~loCIA*hKPdnJ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear3.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6aee0346489bb6ba7fd6e99dee3dabbd8ca57fa2
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}nVv3=ArY-_
zFK^^MV8G#W(ff#=NZf&L!&dRnOd|8tG=p5dxMaMS><CwCtYda?0fLj;UNp^=-5R#y
zRj%DJhxf8;w_Z4FEA?U76r-)%bq?GuW=_-P6qtCYLH`o-p?r>*^*>Dd_bFV|pHpcd
VD6R6L;}+0T22WQ%mvv4FO#qDHJ}CeI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear4.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e2605cedf05fd87e75cefe95ea9809f4a12d6b8
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*`6+rArY-_
zuWaOPFyL{y$XqEd9;wh>*>&c@MjL*S5D$|!54VE#TSQ)Kw=yazDgD~5`uo6{ZTGB0
zzM6;&?yx>4v2t#<S;DsWEG{m&4%utX7W`p<H%mxCX)B}u6!s<hiUl!;S66=H654x+
ZPvn5Wf=y}$yMfj+c)I$ztaD0e0szW2Jpup#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear5.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear5.png
new file mode 100644
index 0000000000000000000000000000000000000000..3048b72afb95c3b2f43e44fdd87d009847f0b301
GIT binary patch
literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}C7v#hArY-_
zuO8$)pup4m@cJV?%N-5fmaW~XjWTnV*?v*k(jK9>bkBQ<fI1dV2NxHSoX>JAw#qFP
z={RBVey?-r#i-)DJFA)JJ(;uooG$l_qYeLAW<=&V{Lts9Z;bS23i8^>nBT&_W4d60
i?vmX*%LN5%4{@q}5>XEmofZqUpTX1B&t;ucLK6UkMMGr(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png b/Resources/Textures/_NF/Objects/Consumable/Food/condiments.rsi/squeeze-bottle-clear6.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8f4b7296a553fb3833d5e12e65d5bcd42125099
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}HJ&bxArY-_
zuN~w(pup4m@cN`!n;i|^maW}89kvPHa$dMRZc*cuZ?(r8J}GlBc69v9+bp+YtK3qN
zB~#wb>~ILZSnZyDw&Zyp?}ukX2FE&hBOZ!PDDLB(akSw*%ZjWVhadVJ^^K8wj7mb%
r8<cDg?BQp)?)SlD`#UC=^#x2-oZ^aW_TQZcbO(c{tDnm{r-UW|<M&EL

literal 0
HcmV?d00001


From 079c63c654f56f078530375fe1cf928c4f03ea6a Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sat, 4 Jan 2025 16:54:16 +0000
Subject: [PATCH 08/20] Automatic Changelog (#2654)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 6e0b7fb40c3..e936661ccc9 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6224,3 +6224,9 @@ Entries:
       message: Charon had a bunch of small fixes and additions made.
   id: 5628
   time: '2025-01-03T17:32:24.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Adds clear condiment bottle and lathe recipe.
+  id: 5629
+  time: '2025-01-04T16:53:52.0000000+00:00'

From 6d82a7becc3d40937c83b98c25cf85042811fe95 Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Sat, 4 Jan 2025 20:32:57 +0000
Subject: [PATCH 09/20] Adds a new condiment station (#2637)

* Adds a new condiment station

* Update soda.yml

* Update service.yml

* Update soda.yml

* Moves condiment cup to _NF

* Changes + cleanup

Converted tag to empty comp
Removed StaticPrice to match the rest of the machines
Rebase CondimentCup to DrinkWaterCup added on head sprite
Added label to jugs

* Condiment cups are now at 10, small copyright adjustment. Feel free to review.

* Update service.yml

* My sins (CondimentSqueezeBottle)

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 .../_NF/Containers/CondimentCupComponent.cs   |  11 ++
 .../CondimentSqueezeBottleComponent.cs        |  11 ++
 .../meta/consumable/food/condiments.ftl       |   2 +
 .../Entities/Structures/Machines/lathe.yml    |   1 +
 .../Catalog/ReagentDispensers/condiments.yml  |  11 ++
 .../Consumable/Drinks/condiments_bottles.yml  | 135 ++++++++++++++++++
 .../Objects/Consumable/Drinks/drinks.yml      |  17 +++
 .../Consumable/Food/Containers/condiments.yml |  13 +-
 .../Entities/Objects/Devices/production.yml   |  19 +++
 .../Objects/Specific/Service/condimentcup.yml |  43 ++++++
 .../Structures/Dispensers/condiments.yml      |  36 +++++
 .../Entities/Structures/Machines/lathe.yml    |   2 +
 .../_NF/Recipes/Lathes/electronics.yml        |  10 +-
 .../Prototypes/_NF/Recipes/Lathes/service.yml |  15 ++
 Resources/Prototypes/_NF/tags.yml             |   2 +-
 .../condiment_cup.rsi/equipped-HELMET.png     | Bin 0 -> 324 bytes
 .../Head/Hats/condiment_cup.rsi/icon.png      | Bin 0 -> 229 bytes
 .../Head/Hats/condiment_cup.rsi/meta.json     |  18 +++
 .../Drinks/condiment_cup.rsi/icon-0.png       | Bin 0 -> 261 bytes
 .../Drinks/condiment_cup.rsi/icon-1.png       | Bin 0 -> 127 bytes
 .../Drinks/condiment_cup.rsi/meta.json        |  17 +++
 .../dispenser0.png                            | Bin 0 -> 303 bytes
 .../dispenser1.png                            | Bin 0 -> 334 bytes
 .../condiment_cup_dispenser.rsi/meta.json     |  17 +++
 .../Structures/smalldispensers.rsi/icon.png   | Bin 0 -> 804 bytes
 .../Structures/smalldispensers.rsi/meta.json  |  14 ++
 26 files changed, 382 insertions(+), 12 deletions(-)
 create mode 100644 Content.Shared/_NF/Containers/CondimentCupComponent.cs
 create mode 100644 Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs
 create mode 100644 Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl
 create mode 100644 Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png
 create mode 100644 Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json
 create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png
 create mode 100644 Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json

diff --git a/Content.Shared/_NF/Containers/CondimentCupComponent.cs b/Content.Shared/_NF/Containers/CondimentCupComponent.cs
new file mode 100644
index 00000000000..01ef61f9ed0
--- /dev/null
+++ b/Content.Shared/_NF/Containers/CondimentCupComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentCup empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentCupComponent : Component
+{
+
+}
diff --git a/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs
new file mode 100644
index 00000000000..7d7711f1a3b
--- /dev/null
+++ b/Content.Shared/_NF/Containers/CondimentSqueezeBottleComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._NF.Containers.Components;
+/// <summary>
+/// CondimentSqueezeBottle empty component
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CondimentSqueezeBottleComponent : Component
+{
+
+}
diff --git a/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl
new file mode 100644
index 00000000000..f89397fcb53
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/reagents/meta/consumable/food/condiments.ftl
@@ -0,0 +1,2 @@
+reagent-name-coldsauce = coldsauce
+reagent-desc-coldsauce = Coldsauce. Leaves the tongue numb in its passage.
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 45e157b6e91..8af06f49954 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -517,6 +517,7 @@
     - SalvageTechFabCircuitboardNF # Frontier
     - NFScrapProcessorCircuitboard # Frontier
     - BlueprintLithographMachineCircuitboard # Frontier
+    - CondimentDispenserCircuitboard # Frontier
     dynamicRecipes:
       - ThermomachineFreezerMachineCircuitBoard
       - HellfireFreezerMachineCircuitBoard
diff --git a/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml
new file mode 100644
index 00000000000..366a7b6c185
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/ReagentDispensers/condiments.yml
@@ -0,0 +1,11 @@
+- type: reagentDispenserInventory
+  id: CondimentDispenserInventory
+  inventory:
+  - DrinkAstrotameJug
+  - DrinkBbqSauceJug
+  - DrinkColdsauceJug
+  - DrinkHorseradishSauceJug
+  - DrinkHotsauceJug
+  - DrinkKetchupJug
+  - DrinkMustardJug
+  - DrinkSoysauceJug
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml
new file mode 100644
index 00000000000..aea59ed3e51
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/condiments_bottles.yml
@@ -0,0 +1,135 @@
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkAstrotameJug
+  name: astrotame jug
+  description: The sweetness of a thousand sugars but none of the calories. Put it in your coffee.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: Astrotame
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-astrotame
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkBbqSauceJug
+  name: bbq sauce jug
+  description: Finally, ketchup for grownups.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: BbqSauce
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-bbq-sauce
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkColdsauceJug
+  name: coldsauce jug
+  description: Something to make every meal a little cooler.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: Frostoil
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-coldsauce
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkHorseradishSauceJug
+  name: horseradish sauce jug
+  description: Now with 50% more horse.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: HorseradishSauce
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-horseradish-sauce
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkHotsauceJug
+  name: hotsauce jug
+  description: The antithesis of no more tears shampoo.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: Hotsauce
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-hotsauce
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkKetchupJug
+  name: ketchup jug
+  description: Someone filled a tomato with sugar until it burst. Delicious.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: Ketchup
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-ketchup
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkMustardJug
+  name: mustard jug
+  description: All of the implications of real mustard with none of the flavor.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: Mustard
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-mustard
+
+- type: entity
+  parent: DrinkBottlePlasticBaseFull
+  id: DrinkSoysauceJug
+  name: soy sauce jug
+  description: You can only dream of putting some of this on a bowl of rice.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 150
+        reagents:
+        - ReagentId: Soysauce
+          Quantity: 150
+  - type: Drink
+  - type: Label
+    currentLabel: reagent-name-soysauce
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml
index 761d49039ee..61a58dbf889 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -95,3 +95,20 @@
   - type: Icon
     sprite: _NF/Objects/Consumable/Drinks/beesknees.rsi
     state: icon
+
+# condiment cup
+- type: entity
+  parent: DrinkWaterCup
+  id: CondimentCup
+  name: condiment cup
+  description: A flimsy cup that can be filled with condiments. Warranty void if filled with other things.
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Consumable/Drinks/condiment_cup.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Head/Hats/condiment_cup.rsi
+  - type: CondimentCup
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 10
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml
index a6ab68876f6..6b43a731960 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -28,16 +28,9 @@
     sprite: _NF/Objects/Consumable/Food/condiments.rsi
   - type: Icon
     sprite: _NF/Objects/Consumable/Food/condiments.rsi
-  # - type: EmitSoundOnActivate
-    # sound:
-      # collection: squeezeBottleUseSounds
-      # params:
-        # variation: 0.125
-  # - type: EmitSoundOnLand
-    # sound:
-      # collection: squeezeBottleUseSounds
-      # params:
-        # variation: 0.125
+  - type: CondimentSqueezeBottle
+  - type: FitsInDispenser
+    solution: food
 
 - type: entity
   parent: BaseFoodCondimentSqueezeBottle
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
index bfd5c43d1db..182d5c2add6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
@@ -348,3 +348,22 @@
       stackRequirements:
         Steel: 5
         Plastic: 5
+
+- type: entity
+  id: CondimentDispenserCircuitboard
+  parent: BaseMachineCircuitboard  
+  name: condiment dispenser machine board
+  description: A machine printed circuit board for a condiment dispenser.
+  components:
+    - type: Sprite
+      state: service
+    - type: MachineBoard
+      prototype: CondimentDispenserEmpty
+      requirements: # Frontier
+        MatterBin: 1 # Frontier
+      stackRequirements:
+        Steel: 5
+      tagRequirements:
+          GlassBeaker:
+            amount: 1
+            defaultPrototype: Beaker
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml
new file mode 100644
index 00000000000..5d236032593
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Service/condimentcup.yml
@@ -0,0 +1,43 @@
+- type: entity
+  name: condiment cup dispenser
+  description: It holds little condiment cups. They claim to be recyled.
+  id: CondimentCupDispenser
+  parent: [BaseItem, PaperBin]
+  components:
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi
+    state: dispenser0
+  - type: ItemMapper
+    sprite: _NF/Objects/Specific/Service/condiment_cup_dispenser.rsi
+    mapLayers:
+      dispenser1:
+        whitelist:
+          components:
+          - CondimentCup
+  - type: Bin
+    whitelist:
+      components:
+      - CondimentCup
+
+- type: entity
+  name: condiment cup dispenser
+  suffix: 10
+  description: It holds little condiment cups. They claim to be recyled.
+  id: CondimentCupDispenser10
+  parent: CondimentCupDispenser
+  components:
+  - type: Bin
+    initialContents:
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    - CondimentCup
+    whitelist:
+      components:
+      - CondimentCup
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml
new file mode 100644
index 00000000000..f0b25439ebb
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Dispensers/condiments.yml
@@ -0,0 +1,36 @@
+- type: entity
+  parent: ReagentDispenserBase
+  id: CondimentDispenser  
+  name: condiment dispenser
+  suffix: Filled
+  description: A condiment dispenser with a single slot for a condiment cup.
+  components:
+  - type: Rotatable
+  - type: Sprite
+    sprite: _NF/Structures/smalldispensers.rsi
+    drawdepth: SmallObjects
+    state: icon
+  - type: ReagentDispenser
+    storageWhitelist:
+     tags:
+      - DrinkBottle
+    pack: CondimentDispenserInventory
+  - type: Transform
+    noRot: false
+  - type: Machine
+    board: CondimentDispenserCircuitboard
+  - type: GuideHelp
+    guides:
+    - Bartender
+    - Drinks
+
+- type: entity
+  id: CondimentDispenserEmpty
+  suffix: Empty
+  parent: CondimentDispenser
+  components:
+  - type: ReagentDispenser
+    storageWhitelist:
+      tags:
+      - DrinkBottle
+    pack: EmptyInventory
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index ae15f942792..9a8a5e67723 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -134,6 +134,8 @@
       - FoodPlateSmallPlastic
       - NapkinDrum
       - Napkin
+      - CondimentCupDispenser
+      - CondimentCup
       - FoodCondimentSqueezeBottleClear
     ## EVA
       - ClothingOuterEVASuitHydro
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
index 96cd0950d1c..4de8b2c445e 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
@@ -46,6 +46,14 @@
     Steel: 800
     Glass: 900
 
+- type: latheRecipe
+  parent: BaseCircuitboardRecipe
+  id: CondimentDispenserCircuitboard
+  result: CondimentDispenserCircuitboard
+  materials:
+    Steel: 100
+    Glass: 500
+
 # Thrusters
 - type: latheRecipe
   id: ThrusterSecurityMachineCircuitboard
@@ -105,4 +113,4 @@
   result: PortableGeneratorHyperPacmanMachineCircuitboard
   materials:
      Steel: 350
-     Glass: 350
\ No newline at end of file
+     Glass: 350
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
index 853acc01279..0d693561ceb 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -58,6 +58,21 @@
     Plastic: 100
     Steel: 100
 
+- type: latheRecipe
+  id: CondimentCupDispenser
+  result: CondimentCupDispenser
+  parent: BaseServiceItemsRecipe
+  applyMaterialDiscount: false
+
+- type: latheRecipe
+  id: CondimentCup
+  result: CondimentCup
+  parent: BaseServiceItemsRecipe
+  completetime: 0.1
+  applyMaterialDiscount: false
+  materials:
+    Steel: 10
+
 - type: latheRecipe
   id: FoodCondimentSqueezeBottleClear
   result: FoodCondimentSqueezeBottleClear
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index e22609d87a2..1a7e9b6ff15 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -152,4 +152,4 @@
   id: NFVGRoidInterior
 
 - type: Tag
-  id: NFFoamRPG
\ No newline at end of file
+  id: NFFoamRPG
diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b156524af5f99df7b26f5b5fb37680fb51b66c
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{&~7MhE&XX
zd+TCvvw?u?Mf26V3_FFz9XJDYN*bgWF+Wdc4O*l!X>XX?0o(Z=GmclZu=KQKZ=N;z
z*S_<Uu9V)b%bAyc+S0u1>#UiX5^aB-Uhndn6y!Cncv|F5-M?4ZZsyq?TOr`|)+p48
zqs#E#(-on27;nE@KIL2ScG;QBR<2s?)$@49(*1qaXSV2cPc3sOd~n?Cx65t&&sxrz
zj6mlxFocJEwfb|`?wjii9gT)^hJ29&)(z%d4`dHWvwq-vuyzMS`tOe)UdukPkIHe|
z{Ps(Qdq!ZxX?tcqb9sfm^940xUr+eV7_?im@$gx8kN4>;S-Zfdf{7gs(jHPl0yp2T
Q`wQZGy85}Sb4q9e0OUx900000

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d9a9acb6928f0ee5e7b3c62ce250ba596729525
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2z=
zUOvcsSV4g0fbSHh3#J7^vH=XL0lKXL%)AO#1#%Z%Tb?}pYHqF{edEn5mWJYUJL}7n
z>rYt9f0J?g5w(76P<4=e^bXc;4hDzNi`B;^n)M3Pxn@|ZGwfmR6-}Cxx2vx%^|FU%
z?5snNa~flNK0e;NwJcM9)d9I(LV_!_V%w}*mQG===>09uoyMnF%X?kP`Wu(k^Et%~
aA6Qg5^(DEI4u1eTmBG{1&t;ucLK6VH08&%{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json
new file mode 100644
index 00000000000..e53406df8f1
--- /dev/null
+++ b/Resources/Textures/_NF/Clothing/Head/Hats/condiment_cup.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "equipped-HELMET, icon by wallflowerghost(discord), edited by dvir001 (GitHub)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-HELMET",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-0.png
new file mode 100644
index 0000000000000000000000000000000000000000..e570dc439c889d8892ffb5f6b86bacbae278885f
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4&D<I4mm->_gC^*;C
z#W5tJ_3h+?yv&L`Earh+4kiw~B9F2(8<}1(oa9xodJy-lcsj>#>GRwRkM7=P@W7()
z@gHmb)5=Ow{@<61l<w_6YVrJ!@1`w|eXTBAj?9=@pH=;S#a6kiVZIBtZaZ&yZ1zgl
zPzFOk&9?@{ev>yY_+{d<Wy$9$LNg?jd!i>?{>XeFTA1O0nTSdNhhsEXLn80|unV{L
yJ_g#taDa8q8`DR3COo|ibSPhHglC$sFM}444RSaLTne5HqC8#wT-G@yGywpPH(wF}

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/icon-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..589dcf55b36c1f8c89a815c203c86ba7c0b0b9bb
GIT binary patch
literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}mYyz-ArY-_
zFKlFFFyLTvyiuRAsX<f4b=H14S5*cEyJBIlNrf}^&fCs)M{K{yN;`w8nd{gY7$z)X
Y?(*Sb31bix2O7fQ>FVdQ&MBb@0NIlwz5oCK

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json
new file mode 100644
index 00000000000..90542ff7b90
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/condiment_cup.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "icon-0/1 by wallflowerghost(discord)",
+    "states": [
+        {
+            "name": "icon-0"
+        },
+        {
+            "name": "icon-1"
+        }
+    ]
+}
diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser0.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6d594488b7a9bb33c39fb1da076394b11b35c28
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}FFjoxLn2y}
z6C_v{Cy4Zv9Pn6oY`6ctzwz5s^_hXdc|yN&^QInw$h3(|Gf)0v{(n9HPM1<zV&buY
zS%O}hDt(q@?fCsfw(Tho5UBgjNdofj*3Ytj@Z+Vo#Z$hyyWCb4F0p>_`Z+&O<G*_n
zkL>FH@$BEXNAV`3j>_wVgoGPAi`AXOy;TqIb6ze10(0J+k$83{{?GyieRp|w10Z;F
zv%KTs9aoPD|9^jOj!E|DXUb|0WS{V+;mZyNH)-u+o<i12%Qhfq61UQ(?ng7b%@&AQ
mJ&Ca6ayzI2_7%tw1_t+h+aFG=f3pKU&EV<k=d#Wzp$P!R4tX&E

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/dispenser1.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e367189d31db56c57e79703986e802b917a6b5
GIT binary patch
literal 334
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^T<9G)(YArY;~
z2@<S}6GVDS4tT6{i;utm|HPlOv&|=`iV3Su<L2Zvl#r4#;sDY&Zr%E)zNBA^Z^!Q^
zvUiGNicCrmY&D-#ux-yCo5P3O`8S@rc!u%3-rE$9?6{*J-rcos`~3X8@t*4MeGl*M
zF6T*|TyAKyd&}e$_6-x(G&eRTUhPq9<Gd_>sCJF&r@4ve{@mo@`c(9#kb#+*`S85j
zc8PPbdyX9df)76N-7(1?{Y~rR?Ix?bo3a}K!Jogs*^h1liWnRG`|sQr_{5zNr0>4{
zlgKU}55C4lYa-lAMO}Fc%gXrLfSgI*&YQX)9Xpq)(dt)QDRwihw<*wo%k7|s#7zc<
YKFy%}bJ^#m0|SV`)78&qol`;+0IeU2)&Kwi

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json
new file mode 100644
index 00000000000..6c27c69df8f
--- /dev/null
+++ b/Resources/Textures/_NF/Objects/Specific/Service/condiment_cup_dispenser.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by dustylens",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "dispenser0"
+    },
+    {
+      "name": "dispenser1"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png b/Resources/Textures/_NF/Structures/smalldispensers.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..de1dfe52b9ceb79092390a7dfa90ef0cbed31e98
GIT binary patch
literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%-bqA3R9J=Wlut+$VHn1LV?rn%I)t`p6m<$ef?Rg`b5bfRq&;+yh~17B9+ob3
z5MuS>K`-G=K}dJOTZf_TP(~wo5XVErhKF32z}9t?Fqa&Z*y%8ToN;%dV6)3U@G(2T
zeZG00nR(xVnriyblFC8TG)>naNm8}BS9KMWRoGB1{zvlO!N1^8;T1UhD)_3!D+joF
zuEC64Jqv)Y>%7hE@^00TIy*bf-rio9tE!5ss?s2s@kqqloJ=wV41#q1(Npum^AX#>
z#q9V9@5e`dHA{M6U|_&atn2z;agxaj{w*JOR>>1cBob!Cxf3AixnQ-pqvhpghKGlx
zvQyA~z7c@@^b_V^^fMjr1E8y`3xG@}!|d!VlarGG4B3qyiAHIQM#)5@0Ni-|41l%v
z+sqkFyqy2U*w`2V>2w-^`opPYS*C8U2*AqseE@d$ipa7|v1svZHVZ(ZP(YStF4_B4
z`<Me{Sw=d2!3w-IZ}~Sj+&YeY0RRGl0E(vJjPK>v<Fo{C0iY;~%Y(rnt*xy9OaK!$
z?*sDTFabb$HH{=q10dgf$f;l35D56{mArxuMZt_jtOeZpwucacjx(#6KgX^0<vw?>
zS=>+*rkb0XYHnr}$O1wLesr{vGPg;Y+r-T@4HugbLLh`7oldj9zFt0nD^KG%@5_3=
zAIfs?WO(@^Yd-ER4xTAUBoY<BR@Ii%h?=HJ^@soH(KO=rxeCkysZfZXD+ckHu=v6T
zbBmj#78*FAX>{BE6<`(E4uxp!3DFtv2Oz61@^x;B-IPWw7W0L112~<T<Di?JbAX&~
zpe}42aNPhJ*s%*c+Ody?oK99<ba^4Ca}56k_yT}60r_y48AWlK)6sb&z|8B<2i$14
z8af>2qsQM84%>!((lc*d-j?4lnShc2LI~%F%TD_2<+<?q%ezZ1<jQTrP$+a{O$b&4
i9%a3nYO1NGiuw(7{8_b^1}e?~0000<MNUMnLSTX#K7R@T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json b/Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json
new file mode 100644
index 00000000000..7f3397b2939
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/smalldispensers.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "wallflowerghost(discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}

From 700ad0c7a2fa60a1aebd8d10ce03654b0fc5a840 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sat, 4 Jan 2025 20:33:23 +0000
Subject: [PATCH 10/20] Automatic Changelog (#2637)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index e936661ccc9..8a37c6bfa0b 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6230,3 +6230,9 @@ Entries:
       message: Adds clear condiment bottle and lathe recipe.
   id: 5629
   time: '2025-01-04T16:53:52.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Condiment dispenser.
+  id: 5630
+  time: '2025-01-04T20:32:57.0000000+00:00'

From de59bb6b6de8831f0972c838c779f9f08420a162 Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Sat, 4 Jan 2025 23:23:37 +0000
Subject: [PATCH 11/20] Adds colored light bulbs (#2636)

* Adds colored light bulbs

* Strobes with fills update.

* It turns out I didn't need this. Whoops.

* Un mess

* My bad

* Line cuts

* Migration

* Update general.yml

* Update migration.yml

* Update migration.yml

* Fix

* Cleanup

* Update lathe.yml

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
Co-authored-by: Dvir <dvirf01@gmail.com>
---
 .../Spawners/Random/Salvage/tables_loot.yml   |   2 +
 .../Entities/Structures/Machines/lathe.yml    |   2 +
 .../Catalog/Fills/Boxes/general.yml           |  29 ----
 .../Catalog/Fills/Cargo/cargo_service.yml     |   9 -
 .../Catalog/Fills/Crates/service.yml          |   9 -
 .../Entities/Objects/Power/lights.yml         |  50 ------
 .../Objects/Specific/Power/lights.yml         |  17 --
 .../Structures/Lighting/base_lighting.yml     |   8 -
 .../Structures/Lighting/colored_lighting.yml  |  42 -----
 .../_NF/Catalog/Cargo/cargo_service.yml       |  10 ++
 .../_NF/Catalog/Fills/Boxes/general.yml       |  65 ++++++++
 .../_NF/Catalog/Fills/Crates/service.yml      |  10 ++
 .../_NF/Entities/Objects/Power/lights.yml     | 155 ++++++++++++++++++
 .../Structures/Lighting/base_lighting.yml     |   7 +
 .../Structures/Lighting/ground_lighting.yml   |  11 ++
 .../Structures/Lighting/strobe_lighting.yml   | 113 +++++++++++++
 .../Entities/Structures/Machines/lathe.yml    |  14 +-
 .../Graphs/utilities/lighting.yml             | 120 ++++++++++++++
 .../_NF/Recipes/Construction/lighting.yml     |  65 ++++++++
 .../Prototypes/_NF/Recipes/Lathes/misc.yml    |  16 +-
 .../Prototypes/_NF/Recipes/Lathes/service.yml |  18 ++
 Resources/_NF/migration.yml                   |  10 ++
 22 files changed, 601 insertions(+), 181 deletions(-)
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
 delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml
 create mode 100644 Resources/Prototypes/_NF/Recipes/Construction/lighting.yml

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 71eda92b8e4..89376c39294 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -196,6 +196,8 @@
       - id: BoxInflatable # Frontier
       - id: BoxLighttube # Frontier
       - id: BoxLightbulb # Frontier
+      - id: BoxColoredLighttube # Frontier
+      - id: BoxColoredLightbulb # Frontier
 
 - type: entityTable
   id: SalvageEquipmentUncommon
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 8af06f49954..4d2afe193da 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -157,6 +157,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - SodiumLightBulb # Frontier
+      - ExteriorLightBulb #Frontier
       - Bucket
       - DrinkMug
       - DrinkMugMetal
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
deleted file mode 100644
index 15b74b7451d..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/general.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-- type: entity
-  name: colored lighttube box
-  parent: BoxCardboard
-  id: BoxColoredLighttube
-  description: This box is shaped on the inside so that only light tubes and bulbs fit.
-  components:
-  - type: StorageFill
-    contents:
-      - id: ColoredLightTubeRed
-        amount: 4
-      - id: ColoredLightTubeFrostyBlue
-        amount: 4
-      - id: ColoredLightTubeBlackLight
-        amount: 4
-  - type: Sprite
-    layers:
-      - state: box
-      - state: lighttube
-  - type: Storage
-    maxItemSize: Small
-    grid:
-    - 0,0,5,3
-    whitelist:
-      components:
-      - LightBulb
-  - type: Tag
-    tags:
-      - DroneUsable
-      
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml
deleted file mode 100644
index 55c28222bd7..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Cargo/cargo_service.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: cargoProduct
-  id: ServiceColoredLightsReplacement
-  icon:
-    sprite: Objects/Power/light_bulb.rsi
-    state: normal
-  product: CrateServiceReplacementColoredLights
-  cost: 600
-  category: Service
-  group: market
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml
deleted file mode 100644
index eda100a8755..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Crates/service.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  id: CrateServiceReplacementColoredLights
-  name: Colored Lights Crate
-  parent: CrateGenericSteel
-  components:
-  - type: StorageFill
-    contents:
-      - id: BoxColoredLighttube
-        amount: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml
deleted file mode 100644
index a5910a81c80..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Power/lights.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-- type: entity
-  parent: BaseLightbulb
-  name: red light tube
-  description: A colorful light tube. These emit a red hue.
-  id: ColoredLightTubeRed
-  components:
-  - type: LightBulb
-    bulb: Tube
-    color: "#FF6666"
-    lightEnergy: 0.8
-    lightRadius: 10
-    lightSoftness: 0.5
-    PowerUse: 25
-  - type: Sprite
-    sprite:  Objects/Power/light_tube.rsi
-    state: normal 
-
-- type: entity
-  parent: BaseLightbulb
-  name: blue light tube
-  description: A colorful light tube. These emit a frosty blue hue.
-  id: ColoredLightTubeFrostyBlue
-  components:
-  - type: LightBulb
-    bulb: Tube
-    color: "#00FFFF"
-    lightEnergy: 0.8
-    lightRadius: 10
-    lightSoftness: 1
-    PowerUse: 25
-  - type: Sprite
-    sprite:  Objects/Power/light_tube.rsi
-    state: normal 
-    
-- type: entity
-  parent: BaseLightbulb
-  name: black light tube
-  description: A colorful light tube. These emit "black light".
-  id: ColoredLightTubeBlackLight
-  components:
-  - type: LightBulb
-    bulb: Tube
-    color: "#5D0CED"
-    lightEnergy: 0.8
-    lightRadius: 10
-    lightSoftness: 1
-    PowerUse: 25
-  - type: Sprite
-    sprite:  Objects/Power/light_tube.rsi
-    state: normal 
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml
deleted file mode 100644
index e984f148e55..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Power/lights.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- type: entity
-  parent: BaseLightbulb
-  name: blue light tube
-  description: A medium power high energy bulb that reminds you of space. May contain mercury.
-  id: BlueLightTube
-  components:
-  - type: LightBulb
-    bulb: Tube
-    color: "#B4FCF0"
-    lightEnergy: 3
-    lightRadius: 12
-    lightSoftness: 0.5
-    BurningTemperature: 350
-    PowerUse: 75
-  - type: Sprite
-    sprite:  Objects/Power/light_tube.rsi
-    state: normal
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
deleted file mode 100644
index 3b9627cede8..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/base_lighting.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- type: entity
-  parent: PoweredlightExterior
-  id: PoweredlightBlueInterior
-  suffix: Blue Interior
-  description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  components:
-  - type: PoweredLight
-    hasLampOnSpawn: BlueLightTube
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml
deleted file mode 100644
index 95d2e02204a..00000000000
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Lighting/colored_lighting.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-#Colored lights
-
-- type: entity
-  id: PoweredlightColoredRed
-  description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  suffix: Red
-  parent: Poweredlight
-  components:
-  - type: PoweredLight
-    hasLampOnSpawn: ColoredLightTubeRed
-
-- type: entity
-  id: PoweredlightColoredFrostyBlue
-  description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  suffix: Frosty
-  parent: Poweredlight
-  components:
-  - type: PoweredLight
-    hasLampOnSpawn: ColoredLightTubeFrostyBlue
-
-- type: entity
-  id: PoweredlightColoredBlack
-  description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  suffix: Black
-  parent: Poweredlight
-  components:
-  - type: PoweredLight
-    hasLampOnSpawn: ColoredLightTubeBlackLight
-
-- type: entity
-  id: PoweredLightPostSmallRed
-  name: post light
-  description: "A light fixture. Draws power and produces light when equipped with a light tube."
-  suffix: Red
-  parent: PoweredLightPostSmallEmpty
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-      map: [ "enum.PoweredLightLayers.Base" ]
-  - type: PoweredLight
-    hasLampOnSpawn: ColoredLightTubeRed
diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml
index d471a927a03..0dbecc70f0e 100644
--- a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_service.yml
@@ -28,3 +28,13 @@
   cost: 1500
   category: cargoproduct-category-name-service
   group: market
+
+- type: cargoProduct
+  id: ServiceColoredLightsReplacement
+  icon:
+    sprite: Objects/Power/light_bulb.rsi
+    state: normal
+  product: CrateServiceReplacementColoredLights
+  cost: 600
+  category: Service
+  group: market
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml
index d738dec2d9e..2a0d10e04cb 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/general.yml
@@ -142,3 +142,68 @@
     whitelist:
       components:
       - LightBulb
+
+- type: entity
+  name: colored lighttube box
+  parent: BoxCardboard
+  id: BoxColoredLighttube
+  description: This box is shaped on the inside so that only light tubes and bulbs fit.
+  components:
+  - type: StorageFill
+    contents:
+      - id: LightTubeCrystalCyan
+        amount: 2
+      - id: LightTubeCrystalBlue
+        amount: 2
+      - id: LightTubeCrystalPink
+        amount: 2
+      - id: LightTubeCrystalOrange
+        amount: 2
+      - id: LightTubeCrystalRed
+        amount: 2
+      - id: LightTubeCrystalGreen
+        amount: 2
+  - type: Sprite
+    layers:
+      - state: box
+      - state: lighttube
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,5,3
+    whitelist:
+      components:
+      - LightBulb
+
+- type: entity
+  name: colored bulbs box
+  parent: BoxLightbulb
+  id: BoxColoredLightbulb
+  description: This box is shaped on the inside so that only light tubes and bulbs fit. It's full of neat colored light bulbs!
+  components:
+  - type: StorageFill
+    contents:
+      - id: LightBulbCrystalCyan
+        amount: 2
+      - id: LightBulbCrystalBlue
+        amount: 2
+      - id: LightBulbCrystalPink
+        amount: 2
+      - id: LightBulbCrystalOrange
+        amount: 2
+      - id: LightBulbCrystalRed
+        amount: 2
+      - id: LightBulbCrystalGreen
+        amount: 2
+  - type: Sprite
+    layers:
+      - state: box
+      - state: light
+        color: "cyan"
+  - type: Storage
+    maxItemSize: Small
+    grid:
+    - 0,0,5,3
+    whitelist:
+      components:
+      - LightBulb
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml
index 51c472147f9..b083029342c 100644
--- a/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Crates/service.yml
@@ -22,3 +22,13 @@
     contents:
       - id: NFVehicleJanicart
       - id: VehicleKeyJanicart
+
+- type: entity
+  id: CrateServiceReplacementColoredLights
+  name: colored lights crate
+  parent: CrateGenericSteel
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxColoredLighttube
+      - id: BoxColoredLightbulb
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml
new file mode 100644
index 00000000000..af3222d17b5
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Power/lights.yml
@@ -0,0 +1,155 @@
+- type: entity
+  parent: BaseLightTube
+  name: black crystal light tube
+  id: LightTubeCrystalBlack
+  description: A high power high energy bulb which has a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#5D0CED"
+    lightEnergy: 3
+    lightRadius: 8
+    lightSoftness: 0.5
+    BurningTemperature: 350
+    PowerUse: 60
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+#    - id: ShardCrystalBlack
+
+- type: entity
+  parent: LightBulb
+  name: cyan crystal light bulb
+  id: LightBulbCrystalCyan
+  description: A colorful light bulb with a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#47f8ff"
+    lightEnergy: 1.0
+    lightRadius: 6
+    lightSoftness: 1.1
+  - type: Construction
+    graph: CyanLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalCyan
+
+- type: entity
+  parent: LightBulb
+  name: blue crystal light bulb
+  id: LightBulbCrystalBlue
+  description: A colorful light bulb with a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#39a1ff"
+    lightEnergy: 1.0
+    lightRadius: 6
+    lightSoftness: 1.1
+  - type: Construction
+    graph: BlueLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalBlue
+
+- type: entity
+  parent: LightBulb
+  name: pink crystal light bulb
+  id: LightBulbCrystalPink
+  description: A colorful light bulb with a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#ff66cc"
+    lightEnergy: 1.0
+    lightRadius: 6
+    lightSoftness: 1.1
+  - type: Construction
+    graph: PinkLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalPink
+
+- type: entity
+  parent: LightBulb
+  name: orange crystal light bulb
+  id: LightBulbCrystalOrange
+  description: A colorful light bulb with a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#ff8227"
+    lightEnergy: 1.0
+    lightRadius: 6
+    lightSoftness: 1.1
+  - type: Construction
+    graph: OrangeLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalOrange
+
+- type: entity
+  parent: LightBulb
+  name: red crystal light bulb
+  id: LightBulbCrystalRed
+  description: A colorful light bulb with a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#fb4747"
+    lightEnergy: 1.0
+    lightRadius: 6
+    lightSoftness: 1.1
+  - type: Construction
+    graph: RedLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalRed
+
+- type: entity
+  parent: LightBulb
+  name: green crystal light bulb
+  id: LightBulbCrystalGreen
+  description: A colorful light bulb with a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#52ff39"
+    lightEnergy: 1.0
+    lightRadius: 6
+    lightSoftness: 1.1
+  - type: Construction
+    graph: GreenLight
+    node: icon
+  - type: ToolRefinable
+    refineResult:
+    - id: SheetGlass1
+    - id: ShardCrystalGreen
+
+- type: entity
+  parent: LightBulb
+  name: sodium light bulb
+  id: SodiumLightBulb
+  description: A harsh lightbulb that both alarms and depresses you.
+  components:
+  - type: LightBulb
+    color: "#FFAF38"
+    lightEnergy: 4
+    lightRadius: 8
+    lightSoftness: 0.7
+
+- type: entity
+  parent: LightBulb
+  name: exterior light bulb
+  id: ExteriorLightBulb
+  description: A colorful light bulb with a small colored crystal inside.
+  components:
+  - type: LightBulb
+    color: "#B4FCF0"
+    lightEnergy: 4.5
+    lightRadius: 8
+    lightSoftness: 0.7
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml
new file mode 100644
index 00000000000..83a448b9683
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/base_lighting.yml
@@ -0,0 +1,7 @@
+- type: entity
+  id: PoweredlightBlack
+  suffix: Black
+  parent: Poweredlight
+  components:
+  - type: PoweredLight
+    hasLampOnSpawn: LightTubeCrystalBlack
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml
new file mode 100644
index 00000000000..cdf5befc804
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/ground_lighting.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: PoweredLightPostSmallRed
+  suffix: Red
+  parent: PoweredLightPostSmall
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+      map: [ "enum.PoweredLightLayers.Base" ]
+  - type: PoweredLight
+    hasLampOnSpawn: PoweredlightRed
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml
new file mode 100644
index 00000000000..b1cbfb866df
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Lighting/strobe_lighting.yml
@@ -0,0 +1,113 @@
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeIncandescent
+  suffix: Incandescent
+  components:
+  - type: PointLight
+    enabled: true
+    color: "#FFD1A3" # 4000K color temp
+    energy: 1.0
+    radius: 6
+    softness: 1.1
+  - type: PoweredLight
+    hasLampOnSpawn: LightBulb
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeLed
+  suffix: LED
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: LedLightBulb
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeService
+  suffix: Service
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: ServiceLightBulb
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeSodium
+  suffix: Sodium
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: SodiumLightBulb
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeExterior
+  suffix: Exterior
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: ExteriorLightBulb
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeCyan
+  suffix: Cyan
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: LightBulbCrystalCyan
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeBlue
+  suffix: Blue
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: LightBulbCrystalBlue
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobePink
+  suffix: Pink
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: LightBulbCrystalPink
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeOrange
+  suffix: Orange
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: LightBulbCrystalOrange
+
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeRed
+  suffix: Red
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: LightBulbCrystalRed
+      
+- type: entity
+  parent: PoweredStrobeLightEmpty
+  id: PoweredStrobeGreen
+  suffix: Green
+  components:
+  - type: PointLight
+    enabled: true
+  - type: PoweredLight
+    hasLampOnSpawn: LightBulbCrystalGreen
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index 9a8a5e67723..1bdfeedf63a 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -76,6 +76,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - SodiumLightBulb
+      - ExteriorLightBulb
       - ConveyorBeltAssembly
       - PowerCellSmall
       - PowerCellMedium
@@ -238,6 +240,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - SodiumLightBulb
+      - ExteriorLightBulb
       - ConveyorBeltAssembly
       - PowerCellSmall
       - PowerCellMedium
@@ -395,6 +399,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - SodiumLightBulb
+      - ExteriorLightBulb
       - ConveyorBeltAssembly
       - PowerCellSmall
       - PowerCellMedium
@@ -646,6 +652,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - SodiumLightBulb
+      - ExteriorLightBulb
       - ConveyorBeltAssembly
       - PowerCellSmall
       - PowerCellMedium
@@ -863,6 +871,8 @@
       - ExteriorLightTube
       - LightBulb
       - LedLightBulb
+      - SodiumLightBulb
+      - ExteriorLightBulb
       - ConveyorBeltAssembly
       - PowerCellSmall
       - PowerCellMedium
@@ -873,10 +883,6 @@
       - WeaponCapacitorRechargerCircuitboard
       - AirTank
     # Mercenary techfab
-    ## Utility
-      - ColoredLightTubeRedNF
-      - ColoredLightTubeBlackLightNF
-      - ColoredLightTubeFrostyBlueNF
     ## Clothing / Armor
       - RiotShield
       - ClothingHandsMercenaryGlovesCombat
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml
new file mode 100644
index 00000000000..8deb0b4871f
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/Graphs/utilities/lighting.yml
@@ -0,0 +1,120 @@
+- type: constructionGraph
+  id: CyanLightBulb
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 1
+              doAfter: 1
+            - tag: CrystalCyan
+              name: cyan crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+                color: #52ff39
+              doAfter: 1
+    - node: icon
+      entity: LightBulbCrystalCyan
+
+- type: constructionGraph
+  id: BlueLightBulb
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 2
+              doAfter: 1
+            - tag: CrystalBlue
+              name: blue crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+              doAfter: 1
+    - node: icon
+      entity: LightBulbCrystalBlue
+
+- type: constructionGraph
+  id: PinkLightBulb
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 2
+              doAfter: 1
+            - tag: CrystalPink
+              name: pink crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+              doAfter: 1
+    - node: icon
+      entity: LightBulbCrystalPink
+
+- type: constructionGraph
+  id: OrangeLightBulb
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 2
+              doAfter: 1
+            - tag: CrystalOrange
+              name: orange crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+              doAfter: 1
+    - node: icon
+      entity: LightBulbCrystalOrange
+
+- type: constructionGraph
+  id: RedLightBulb
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 2
+              doAfter: 1
+            - tag: CrystalRed
+              name: red crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+              doAfter: 1
+    - node: icon
+      entity: LightBulbCrystalRed
+
+- type: constructionGraph
+  id: GreenLightBulb
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: icon
+          steps:
+            - material: Glass
+              amount: 2
+              doAfter: 1
+            - tag: CrystalGreen
+              name: green crystal shard
+              icon:
+                sprite: Objects/Materials/Shards/crystal.rsi
+                state: shard1
+              doAfter: 1
+    - node: icon
+      entity: LightBulbCrystalGreen
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml
new file mode 100644
index 00000000000..74d4c74f130
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Construction/lighting.yml
@@ -0,0 +1,65 @@
+- type: construction
+  name: cyan light bulb
+  id: CyanLightBulb
+  graph: CyanLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing a cyan crystal
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
+
+- type: construction
+  name: blue light bulb
+  id: BlueLightBulb
+  graph: BlueLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing a blue crystal
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
+
+- type: construction
+  name: pink light bulb
+  id: PinkLightBulb
+  graph: PinkLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing a pink crystal
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
+
+- type: construction
+  name: orange light bulb
+  id: OrangeLightBulb
+  graph: OrangeLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing an orange crystal
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
+
+- type: construction
+  name: red light bulb
+  id: RedLightBulb
+  graph: RedLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing a red crystal
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
+
+- type: construction
+  name: green light bulb
+  id: GreenLightBulb
+  graph: GreenLightBulb
+  startNode: start
+  targetNode: icon
+  category: construction-category-utilities
+  description: A high powered light tube containing a green crystal
+  icon: { sprite: Objects/Power/light_bulb.rsi, state: normal }
+  objectType: Item
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
index ab7e9f825a5..8aeedcd6908 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -132,19 +132,9 @@
   result: ClothingNeckIFFPurple
   parent: NFWearableIFFRecipe
 
-- type: latheRecipe
-  id: ColoredLightTubeRedNF
-  result: ColoredLightTubeRed
-  parent: NFBaseLightTubeRecipe
-
-- type: latheRecipe
-  id: ColoredLightTubeBlackLightNF
-  result: ColoredLightTubeBlackLight
-  parent: NFBaseLightTubeRecipe
-
-- type: latheRecipe
-  id: ColoredLightTubeFrostyBlueNF
-  result: ColoredLightTubeFrostyBlue
+- type: latheRecipe # Remove this ones we have a black crystal
+  id: LightTubeCrystalBlack
+  result: LightTubeCrystalBlack
   parent: NFBaseLightTubeRecipe
 
 - type: latheRecipe
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
index 0d693561ceb..16738728adf 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -80,3 +80,21 @@
   applyMaterialDiscount: false
   materials:
     Plastic: 50
+
+- type: latheRecipe
+  id: SodiumLightBulb
+  result: SodiumLightBulb
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
+
+- type: latheRecipe
+  id: ExteriorLightBulb
+  result: ExteriorLightBulb
+  category: Lights
+  completetime: 2
+  materials:
+    Steel: 50
+    Glass: 50
diff --git a/Resources/_NF/migration.yml b/Resources/_NF/migration.yml
index b64ad3579c4..f17c5ceb6af 100644
--- a/Resources/_NF/migration.yml
+++ b/Resources/_NF/migration.yml
@@ -181,3 +181,13 @@ CrateSpaceCleaner: ChemicalBarrelSpaceCleaner
 ScienceTechFab: UnfinishedMachineFrame
 ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
 ScienceTechFabFlatpack: ProtolatheFlatpack
+
+# 2025-01-05 Lights
+ColoredLightTubeRed: LightTubeCrystalRed
+ColoredBlueLightTube: LightTubeCrystalBlue
+ColoredLightTubeCyan: LightTubeCrystalCyan
+ColoredLightTubeBlackLight: PoweredlightBlack
+PoweredlightColoredRed: PoweredlightRed
+PoweredlightBlueInterior: PoweredlightBlue
+PoweredlightColoredFrostyBlue: PoweredlightCyan
+PoweredlightColoredBlack: LightTubeCrystalBlack

From 78a49332c1f5fbae4c4c4c30a4511439daa03612 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sat, 4 Jan 2025 23:24:07 +0000
Subject: [PATCH 12/20] Automatic Changelog (#2636)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 8a37c6bfa0b..3f2423429e8 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6236,3 +6236,9 @@ Entries:
       message: Condiment dispenser.
   id: 5630
   time: '2025-01-04T20:32:57.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Colored craftable lightbulbs and prefilled light strobes.!
+  id: 5631
+  time: '2025-01-04T23:23:37.0000000+00:00'

From 027c1a984cbdf55b2ae1bf68efaa1223a0cad3cc Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Sun, 5 Jan 2025 01:40:12 +0000
Subject: [PATCH 13/20] Adds ice sink (#2635)

* Adds ice sink

* buckets of fun

* Making sure the recipe isn't a steel

* Update service.yml

* Update drinks_special.yml

* Update drinks_special.yml

* Update service.yml

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../Consumable/Drinks/drinks_special.yml      |  17 ++++++++
 .../Entities/Structures/Furniture/icebox.yml  |  39 ++++++++++++++++++
 .../Entities/Structures/Machines/lathe.yml    |   1 +
 .../Prototypes/_NF/Recipes/Lathes/service.yml |   8 ++++
 .../Furniture/icebox.rsi/icebox.png           | Bin 0 -> 1623 bytes
 .../Furniture/icebox.rsi/icebox_fill-1.png    | Bin 0 -> 585 bytes
 .../Structures/Furniture/icebox.rsi/meta.json |  19 +++++++++
 7 files changed, 84 insertions(+)
 create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml
 create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png
 create mode 100644 Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml
new file mode 100644
index 00000000000..540220d33a0
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -0,0 +1,17 @@
+- type: entity
+  parent: [BaseItem, BartenderMixer]
+  id: DrinkIceBucketEmpty
+  name: ice bucket
+  suffix: empty
+  description: A special bucket that was specifically designed to hold ice.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 200
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/icebucket.rsi
+    state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 50
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml
new file mode 100644
index 00000000000..7cecd0fd444
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Structures/Furniture/icebox.yml
@@ -0,0 +1,39 @@
+- type: entity
+  name: ice box
+  description: This delightful machine is slowly filling with ice!
+  id: IceboxEmpty
+  parent: SinkEmpty
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Furniture/icebox.rsi
+    layers:
+      - state: icebox
+      - map: [ "enum.SolutionContainerLayers.Fill" ]
+        state: icebox_fill-1
+        visible: false
+  - type: Appearance
+  - type: SolutionContainerVisuals
+    maxFillLevels: 1
+    fillBaseName: icebox_fill-
+    solutionName: drainBuffer
+  - type: SolutionRegeneration
+    solution: tank
+    generated:
+      reagents:
+      - ReagentId: Ice
+        Quantity: 1
+
+- type: entity
+  name: ice box
+  id: Icebox
+  parent: IceboxEmpty
+  suffix: Ice
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drainBuffer:
+        maxVol: 100
+      tank:
+        reagents:
+        - ReagentId: Ice
+          Quantity: 500
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index 1bdfeedf63a..b0536262c3b 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -117,6 +117,7 @@
       - DrinkMug
       - DrinkMugMetal
       - DrinkGlass
+      - DrinkIceBucketEmpty
       - KitchenKnife
       - ButchCleaver
       - ServiceRollingPin
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
index 16738728adf..9c9d221e705 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/service.yml
@@ -98,3 +98,11 @@
   materials:
     Steel: 50
     Glass: 50
+
+- type: latheRecipe
+  id: DrinkIceBucketEmpty
+  result: DrinkIceBucketEmpty
+  parent: BaseServiceItemsRecipe  
+  completetime: 2
+  materials:
+    Steel: 100
diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox.png
new file mode 100644
index 0000000000000000000000000000000000000000..0fdbd26947583c21a2ecb342a67bc210586f1182
GIT binary patch
literal 1623
zcmV-d2B`UoP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px*5lKWrRCt{2nq6oVR}{y8v(9FAlB~(b+S)?tRxnC^Fa#o6sYUu^LG&eIZ7H<{
zrBG2945c9bq92Gtx}|+6LTQC!Y9DG4^r=WHB*j$vQXdqeOY}hr$t2k%vmfK$KHQ!C
zh&!`uSL<xpKTKxk&du5RpE>u;y=VRk6%gr*2$bB30Q*=GAe7u5h2p;o0wH@bc=n7^
z#;j+cx?PO)Ma0o)w1j^plsHBK5MuD`pl6-n=zvIHMD$0GaO;J&jHxXE^jHf34Eb8v
zot4MwY!-md+i^|~4CMdcm@xqO^3%^iK@9%lO(*!AFDW1t#?%%zr4#g63!FP12Vkd_
zU|49Rvsp$JohF|&W11$WX#z4@LhT`GN_dhx;Nk!U0ZQppS3caxk474RX1~hSwA>F1
z4FEHh1Yj}e1ep_{y20~g;5Y>A8@EFokYOKcVpwQ2%_rCz@bUM3i)OzxqX5ZN5={%_
z6QSZ^^57By6Y+6C;lhatE~-I{DT8655mq(c_QT#*ov^Br%sp)z0WE+6ghCzpH-@z3
zO*lq?9lpm7w7^tcHqOjG&~HD0IRz_&#EO!jjrq9*-pv4RLqLH;hY#{i?Aw}t;LzcN
zc-aHa^8f+c_w-5vHQ=>3-{tq8f2hgE<Am!F$oO@(@9BNun!hDTW+72k+hW@Casapw
zfi>+x?#`69>un(xXASV{Rkf{Y4|;hT;64OEI>AP;Jw#&0pzUGXJp3kfnFy7_CiP$1
zJRAVd4k!-WTF5W8<u$n8+P2L-;;sH;HIe`A)OU<r8S|_QD&E+(%{@XWfG89L3UmBY
zOR_dlWLXGCuKeX$@(nc5Km(pnP?5e!*=dw%nwX2S0HZet&~?3BH!9U5U5lbm8j-$;
z_~he{YBl3pl=Z9wZ1RVrQ36^30KHj0<)cTU+;~0=kgrD;7ix=(xH$(pI>DtV>K!Cg
zNd#aR)A@-;lh4PfqLa>M85SBlEx8gscRWsywZNuyBJT({c-{d4EkHmE(5&l-qLekJ
zwy@GC9nq9B8C7I-?D-(fkWUidlunejSq#q(0UO21O`-6;0U&9bgj;pOt#*sXPZ=<#
z3@)w;A-=js_W}1P@T>zS;^P=|vp6NecP8WVptL5-`}V=qEF5UTn45Ji%6irT07I89
zvwO!YHQR85ryY>->kM7GOvbO{&zKKftEMfyZasgv{Dx<f;K-FRW%Sq6gx9SHBsqI~
zn6}d=K6hP?dwwSP^5&kJ3Tj@iMKsVr15Y0L1mU#o^s>CA8dTz?+MW8NQ70Ro*7&%g
z!g5*+o*h(FTL^XHYx!y0Tr5l^lBuNB_|%~jZ1VqvRs-afEgSxv1jsLw3o}6h#>_OD
zCKn&6oZO|}k<Mnhnud+5rC!O}p%Tz_n7#vmIz3fbT?rJLbE~hqdfXLo-L$}zJU6Zm
zkve|^wlpz4Wfax|#*9%y+Ns7?uh<uA0w9b9yVk;_i~!HB1s)gTR*J#%H}mKD2>3!K
zyJd+N+k=d$lB#;&LhN`}>Y6BWz?o;l1auv1g=|{PSZoz0>u<;Z|2uw!=)4`Lv)qN1
zQoEpbtdiMLZ4F`}i37Z<q)2;M*ibD_E>W)8CAHYV03EABg$U?H5|1k>K)yHMX!CTv
zq$=3bT|21@pu?8%QZxhx&);Olu1>BQl`E<B1T&RH*8+L@E|k9FRl7lZeJ#oPL}9`(
zzdRgKEZ>#qqD0$}kAT#Ln<&7wEpjN>@6F`^`^ysKB)mmX0n%jI`;r{{%-zZD<t|N@
zdWA7JTUNenUjy(>#K(yZ#7L7ZyTt}#o)$YhVIn@xsqar=%*~eFY+forxT~AkK&-5x
za94L-IsoA5&J7iLsQ~Iz&k^n_?O;n^GyeKr6J-24;jZqIwxzsOfHuYAu7mWoSSea>
zSSs~h%In_bT;VNX6D=owtw-FOlv%tIuaecElK`^b;l|51a%If5Q)0%z?o&?~zjYmO
z=QV!ox{QE_k-pXws^R4Wl=pgfJ9g^dzYprOLRJ;8Vq#8<-+ClpjOEI!fd(E0{srlT
Vxd6d&xRn3^002ovPDHLkV1iSP4lw`#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/icebox_fill-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cab252864c7eb49a268231eae3aee846607fde8
GIT binary patch
literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004jX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*JD@0Kg$3HVe#E7u4uy_fpAwOzjV=<Fog~iM$zcw?^
zycsn=Uhln0ldZB<l-T&S;4fgStd$~CvSm$d&~u)rMl$Di&;8u*J?C`qx!{du)T~+2
z1KFHqL`Fl(%<P;}^@xvJJT%e}S518~IufI-z1>Kp*j1NPt9;zQR=b!qRq#{`52?Cg
z36BX+EL*z6o5Ia%I=(1;EF3W8g2LC1o^bie;griC4jZvZ7`zR_O6nIUezBT1vcmFm
z+OwI0`g0%WCH`b?Ix1_M%vMYyj1od&oMFNQ>19xSkS_Y@mK|mCd%p9h$V;v&UZ;q`
z5-HMH1Vk-J^`xwt=t&tFicbIk_SMw-``qgO5L7<c_Dcs;ZNTTcZNKl^_U8fk?%^y~
z%Fpk?z^mx%C9QoI>Q~|9yrd<z;B*aI?)113|CW3*y_yEkM^HBlO_xwJ@AmBHoWom)
zt;knh!1fMwN__po7XkTaxG5POs{jB1gGod|RCt{2+A$8oFc1X5gID^A{v~uN5E2DJ
z8?iHGig>j}tUG0fZnraEw)cL#K3i*@ddAuA=>Ta8NC!x(F8}}l0O)h+h2_le7p?Uh
zAqAuZ0000H$5{Dp?3}s&KR(~8ABGf=4v<z~0PX(zikta-z1M#O6p#*(R$l-B0051i
Xeq#_LE9ANe00000NkvXXu0mjf%H0k|

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json
new file mode 100644
index 00000000000..f8b62ecf815
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Furniture/icebox.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Icebox based on sink-fill-1 and sink_wide-fill-1 made by Topy for SS14, edited by DustyLens",
+    "states": [
+        {
+            "name": "icebox",
+            "directions": 4
+        },
+        {
+            "name": "icebox_fill-1",
+            "directions": 4
+        }
+    ]
+}

From c4fc733fe890d90dbc0b9d707f296ec0b2957093 Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sun, 5 Jan 2025 01:40:39 +0000
Subject: [PATCH 14/20] Automatic Changelog (#2635)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 3f2423429e8..c2c9ccefce8 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6242,3 +6242,9 @@ Entries:
       message: Colored craftable lightbulbs and prefilled light strobes.!
   id: 5631
   time: '2025-01-04T23:23:37.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: mappable ice box for bars and restaurants!
+  id: 5632
+  time: '2025-01-05T01:40:13.0000000+00:00'

From 0ad2d80783632d6619cb52611370c562c2ba4884 Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:56:20 +0000
Subject: [PATCH 15/20] Quick black light fix. (#2656)

---
 Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index b0536262c3b..eee26763396 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -74,6 +74,7 @@
       - LedLightTube
       - SodiumLightTube
       - ExteriorLightTube
+      - LightTubeCrystalBlack
       - LightBulb
       - LedLightBulb
       - SodiumLightBulb

From b4f1becbf7a4c0410f3a141666ee2129c5c2eb2e Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sun, 5 Jan 2025 17:56:43 +0000
Subject: [PATCH 16/20] Automatic Changelog (#2656)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index c2c9ccefce8..8b21990d074 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6248,3 +6248,9 @@ Entries:
       message: mappable ice box for bars and restaurants!
   id: 5632
   time: '2025-01-05T01:40:13.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Black light to service lathe.
+  id: 5633
+  time: '2025-01-05T17:56:21.0000000+00:00'

From 4d56d80f4470b56f20d9b9f2272d30b2d73458e7 Mon Sep 17 00:00:00 2001
From: dustylens <54123313+dustylens@users.noreply.github.com>
Date: Sun, 5 Jan 2025 17:57:46 +0000
Subject: [PATCH 17/20] Handheld crew health monitor added to medical techfab.
 (#2655)

* Adds handheld crew monitor to medical techfab

* Updated to requested values.

---------

Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com>
---
 .../Prototypes/Entities/Structures/Machines/lathe.yml    | 1 +
 Resources/Prototypes/_NF/Recipes/Lathes/medical.yml      | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 Resources/Prototypes/_NF/Recipes/Lathes/medical.yml

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 4d2afe193da..d58917ff8a2 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1041,6 +1041,7 @@
       - PowerCellSmall # Frontier
       - BlankMediPen # Frontier
       - MedicalAppraisalTool # Frontier
+      - HandheldCrewMonitor # Frontier
     dynamicRecipes:
       - ChemicalPayload
       - CryostasisBeaker
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
new file mode 100644
index 00000000000..cd6e76be1e5
--- /dev/null
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/medical.yml
@@ -0,0 +1,9 @@
+- type: latheRecipe
+  id: HandheldCrewMonitor
+  result: HandheldCrewMonitor
+  category: Tools
+  completetime: 4
+  materials:
+    Glass: 1200
+    Steel: 1000
+    Plastic: 1400

From cdcc0dd0df82c661d478b17f2af382d64a144b3b Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Sun, 5 Jan 2025 17:58:11 +0000
Subject: [PATCH 18/20] Automatic Changelog (#2655)

---
 Resources/Changelog/Frontier.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 8b21990d074..7d744f379e5 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6254,3 +6254,9 @@ Entries:
       message: Black light to service lathe.
   id: 5633
   time: '2025-01-05T17:56:21.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Handheld crew health monitor added to medical techfab.
+  id: 5634
+  time: '2025-01-05T17:57:46.0000000+00:00'

From 25f00957ba9041a7260cc38255500a6e93c94eb0 Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Mon, 6 Jan 2025 23:21:18 +0200
Subject: [PATCH 19/20] Update lathe.yml (#2653)

---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d58917ff8a2..88dd3896b60 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1406,6 +1406,8 @@
         - MaterialBananium1
         - MaterialDiamond
         - BluespaceCrystal #Nyano - Summary: Bluespace Crystals can be created here.
+    - type: PlaceableSurface # DeltaV: Allow ore bags to dump into it directly
+      isPlaceable: false # but not place on it if you just click it with a random item
 
 - type: entity
   parent: OreProcessor

From 7184b6c1f0dd8cfa2eb2f252f8d83a656a2c2ddb Mon Sep 17 00:00:00 2001
From: FrontierATC <zuuswa@gmail.com>
Date: Mon, 6 Jan 2025 21:21:46 +0000
Subject: [PATCH 20/20] Automatic Changelog (#2653)

---
 Resources/Changelog/Frontier.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 7d744f379e5..9a0d35f6241 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -6260,3 +6260,11 @@ Entries:
       message: Handheld crew health monitor added to medical techfab.
   id: 5634
   time: '2025-01-05T17:57:46.0000000+00:00'
+- author: dvir001
+  changes:
+    - type: Tweak
+      message: >-
+        You can now directly dump ore bags into ore processors by clicking on
+        them.
+  id: 5635
+  time: '2025-01-06T21:21:18.0000000+00:00'