Merge remote-tracking branch 'upstream/master' into upstream-sync

Morb0 · Aug 17, 2023 · 9496d7d · 9496d7d
2 parents 01b5880 + 1fdce43
commit 9496d7d
Show file tree

Hide file tree

Showing 13 changed files with 8,183 additions and 7,903 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -1,22 +1,4 @@
 Entries:
-- author: Lank
-  changes:
-  - {message: 'Added Lead, a tasteless, incredibly powerful but slow-acting poison
-      obtained in small amounts by grinding steel.', type: Add}
-  - {message: Grinding powercells now gives Zinc instead of Licoxide, type: Tweak}
-  - {message: Licoxide is now obtained through a combination of Zinc and Lead., type: Tweak}
-  id: 4116
-  time: '2023-06-28T17:53:56.0000000+00:00'
-- author: EmoGarbage404
-  changes:
-  - {message: Salvages should be pulled in more reliably., type: Fix}
-  id: 4117
-  time: '2023-06-28T18:06:31.0000000+00:00'
-- author: DadeKuma
-  changes:
-  - {message: It's no longer possible to unbuckle if you are handcuffed, type: Fix}
-  id: 4118
-  time: '2023-06-28T18:09:04.0000000+00:00'
 - author: Jackal298
   changes:
   - {message: Changed kukri knife icon and merc backpack sprite on player, type: Tweak}
@@ -3029,3 +3011,19 @@ Entries:
       them and upgrade stuff!, type: Tweak}
   id: 4615
   time: '2023-08-16T22:12:09.0000000+00:00'
+- author: liltenhead
+  changes:
+  - {message: Reduced freedom implanter cost from 8 -> 5 TC., type: Tweak}
+  id: 4616
+  time: '2023-08-17T04:08:47.0000000+00:00'
+- author: liltenhead
+  changes:
+  - {message: 'Increased crafting costs of the advanced laser, and laser cannon.',
+    type: Tweak}
+  id: 4617
+  time: '2023-08-17T04:10:06.0000000+00:00'
+- author: Ubaser
+  changes:
+  - {message: New machine frame sprites, type: Tweak}
+  id: 4618
+  time: '2023-08-17T04:16:13.0000000+00:00'
diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
@@ -182,7 +182,7 @@ entities:
           tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGcAAABnAAAAZwAAAGcAAABnAAAAZwAAAGcAAABnAAAAZwAAAGcAAABnAAAAZwAAAGcAAABnAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
         0,3:
           ind: 0,3
-          tiles: WwAAAmgAAABbAAABWwAAAFsAAABbAAABWwAAAFsAAAFkAAACWwAAAFsAAANbAAACWwAAAlsAAABbAAABWwAAAFsAAANkAAADWwAAA1sAAAFbAAABWwAAAFsAAAFbAAABZAAAAlsAAAMaAAABGgAAAhoAAAIaAAAAGgAAA1sAAAFbAAACaAAAAEsAAABLAAADSwAAAksAAABLAAAASwAAA2gAAABbAAADGgAAARoAAAMaAAACGgAAAxoAAAJbAAABaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAWwAAA1sAAANbAAABWwAAAlsAAAFbAAACWwAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFsAAANbAAABaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABbAAABWwAAAVsAAAJbAAACWwAAAlsAAANoAAAAWwAAA1sAAABbAAABaAAAAFgAAAApAAAAKQAAACkAAABoAAAAWwAAAVsAAANbAAAAWwAAA1sAAABbAAADaAAAAFsAAABbAAABWwAAAGgAAABoAAAAKQAAACkAAAApAAAAZAAAAVsAAAJbAAACWwAAA1sAAABbAAABWwAAAWgAAABbAAAAWwAAAVsAAAJoAAAAaAAAACkAAAApAAAAKQAAAGgAAABbAAADWwAAAFsAAAJbAAACWwAAAlsAAAJoAAAAaAAAAGgAAABoAAAAWwAAAWgAAAApAAAAKQAAACkAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFsAAABbAAADWwAAAFsAAAFoAAAAKQAAACkAAAApAAAAaAAAABoAAAMaAAADGgAAAxoAAAMaAAABGgAAAGgAAABbAAAAWwAAAFsAAAFoAAAAaAAAACkAAAApAAAAKQAAAGgAAAAaAAACGgAAABoAAAMaAAAAGgAAABoAAAJoAAAAWwAAAlsAAABbAAADWwAAAWgAAABoAAAAZAAAA2gAAABoAAAAaAAAAGgAAABoAAAAGgAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFsAAAFkAAAAWwAAAVsAAABbAAAAWwAAAlsAAABbAAACWwAAAFsAAAFbAAABWwAAAmQAAAFbAAABWwAAAFsAAANbAAADaAAAAFsAAANbAAADSwAAAksAAAFLAAADSwAAAksAAABLAAADSwAAAUsAAAA+AAABSwAAA0sAAAJLAAABWwAAAGQAAAJbAAACWwAAAVsAAANbAAADWwAAAlsAAABbAAABWwAAA1sAAAJbAAAAZAAAAFsAAANbAAABWwAAAw==
+          tiles: WwAAAmgAAABbAAABWwAAAFsAAABbAAABWwAAAFsAAAFkAAACWwAAAFsAAANbAAACWwAAAlsAAABbAAABWwAAAFsAAANkAAADWwAAA1sAAAFbAAABWwAAAFsAAAFbAAABZAAAAlsAAAMaAAABGgAAAhoAAAIaAAAAGgAAA1sAAAFbAAACaAAAAEsAAABLAAADSwAAAksAAABLAAAASwAAA2gAAABbAAADGgAAARoAAAMaAAACGgAAAxoAAAJbAAABaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAWwAAA1sAAANbAAABWwAAAlsAAAFbAAACWwAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAABoAAAAaAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAAaAAAAGgAAABoAAABkAAAAZAAAAGQAAABoAAAAWwAAA1sAAABbAAABaAAAAFgAAAApAAAAKQAAACkAAABoAAAAGgAAABoAAAAaAAAAZAAAAGQAAABkAAAAaAAAAFsAAABbAAABWwAAAGgAAABoAAAAKQAAACkAAAApAAAAGgAAABoAAAAaAAAAGgAAAGQAAABkAAAAZAAAAGgAAABbAAAAWwAAAVsAAAJoAAAAaAAAACkAAAApAAAAKQAAAGgAAAAaAAAAGgAAABoAAABkAAAAZAAAAGQAAABoAAAAaAAAAGgAAABoAAAAWwAAAWgAAAApAAAAKQAAACkAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFsAAABbAAADWwAAAFsAAAFoAAAAKQAAACkAAAApAAAAaAAAABoAAAMaAAADGgAAAxoAAAMaAAABGgAAAGgAAABbAAAAWwAAAFsAAAFoAAAAaAAAACkAAAApAAAAKQAAAGgAAAAaAAACGgAAABoAAAMaAAAAGgAAABoAAAJoAAAAWwAAAlsAAABbAAADWwAAAWgAAABoAAAAZAAAA2gAAABoAAAAaAAAAGgAAABoAAAAGgAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFsAAAFkAAAAWwAAAVsAAABbAAAAWwAAAlsAAABbAAACWwAAAFsAAAFbAAABWwAAAmQAAAFbAAABWwAAAFsAAANbAAADaAAAAFsAAANbAAADSwAAAksAAAFLAAADSwAAAksAAABLAAADSwAAAUsAAAA+AAABSwAAA0sAAAJLAAABWwAAAGQAAAJbAAACWwAAAVsAAANbAAADWwAAAlsAAABbAAABWwAAA1sAAAJbAAAAZAAAAFsAAANbAAABWwAAAw==
         0,4:
           ind: 0,4
           tiles: WwAAA2gAAABYAAAAaAAAAGgAAABoAAAAaAAAAFsAAAFoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABbAAABaAAAAGgAAABoAAAAaAAAAGgAAAAvAAABWwAAABoAAABbAAABWwAAAmgAAABbAAACVwAAAEsAAAFLAAACSwAAAxoAAAFXAAAAaAAAAGgAAABoAAAAWwAAAlsAAANbAAACWwAAAVsAAAFoAAAAWwAAAmgAAAAZAAAAGQAAABkAAABLAAAAaAAAAGgAAABoAAAAaAAAAFsAAAJbAAAAWwAAA1sAAANbAAAAaAAAAFsAAAJoAAAAGQAAABkAAAAZAAAASwAAAVcAAABoAAAAaAAAAGgAAABbAAACWwAAAhoAAAJbAAABWwAAA2gAAABoAAAAaAAAAEsAAAJLAAABSwAAAksAAAJoAAAAaAAAAGgAAABoAAAAaAAAAFcAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAABoAAAAaAAABGgAAAhoAAAFoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAADYAAABoAAAAaAAAAGgAAAAaAAABGgAAAhoAAAEaAAADWAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAGgAAABoAAAEaAAABGgAAA2gAAABoAAAAaAAAAAoAAAAKAAAACgAAAAoAAAAKAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAAKAAAACgAAAAoAAAAKAAAACgAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAACgAAAAoAAAAKAAAACgAAAAoAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAAoAAAAKAAAACgAAAAoAAAAKAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAAKAAAACgAAAAwAAAUMAAAFCgAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAACgAAAAoAAAAMAAAGCgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAMAAADDAAAAwoAAAAKAAAAAAAAAA==
@@ -314,7 +314,7 @@ entities:
           tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAABoAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAADAAAAQwAAAQKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAMAAAHCgAAAAsAAAMKAAAACgAAAAwAAAIMAAAEDAAABgwAAAUKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAMAAAHCgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAALAAADCwAAAgoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAsAAAMKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAACwAAAgoAAAAKAAAAaAAAAGgAAABoAAAAaAAAAGgAAAAtAAABLQAAAC0AAAAtAAACLQAAAy0AAAItAAABLQAAAAoAAAAKAAAACgAAAGgAAABoAAAAaAAAAGUAAAJoAAAALQAAAC0AAAItAAADLQAAAS0AAAAtAAADLQAAAi0AAAEKAAAACgAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAC0AAAItAAADLQAAAi0AAAMtAAABLQAAAC0AAAMtAAACCgAAAGgAAABoAAAAZQAAA2UAAABoAAAAZQAAAWgAAAAtAAAALQAAAS0AAAEtAAADLQAAAS0AAAEtAAABLQAAAmgAAABoAAAAZQAAAWUAAAFlAAABaAAAAGUAAAJoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAZQAAAmgAAABlAAABaAAAAGgAAABlAAABaAAAAGgAAABlAAADZQAAA2UAAABlAAABZQAAA2UAAAJoAAAAZQAAA2UAAAFlAAABaAAAAGUAAAFoAAAAZQAAAWgAAABlAAABZQAAAmUAAANlAAACZQAAAGgAAABoAAAAaAAAAA==
         5,-3:
           ind: 5,-3
-          tiles: ZQAAAmUAAAJlAAACZQAAAWUAAABoAAAAaAAAAGUAAANlAAABZQAAAWUAAANoAAAAZQAAAWUAAAFoAAAAaAAAAGUAAAFlAAAAZQAAA2UAAANlAAABZQAAAmgAAABlAAAAaAAAAGgAAABlAAACZQAAA2UAAABoAAAAaAAAAFgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAASwAAA0sAAANoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAQQAAAEEAAABBAAAAaAAAAGgAAABBAAAAaAAAAEsAAANLAAADaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEEAAABBAAAAQQAAAGgAAABoAAAAQQAAAGgAAABLAAABSwAAAmgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABBAAAAQQAAAEEAAABoAAAAaAAAAEEAAABoAAAASwAAAksAAANoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFcAAABXAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEEAAABBAAAAQQAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABBAAAAQQAAAEEAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAQQAAAEEAAABBAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABBAAAAQQAAAEEAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAQQAAAEEAAABBAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEEAAABBAAAAQQAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAA==
+          tiles: ZQAAAmUAAAJlAAACZQAAAWUAAABoAAAAaAAAAGUAAANlAAABZQAAAWUAAANoAAAAZQAAAWUAAAFoAAAAaAAAAGUAAAFlAAAAZQAAA2UAAANlAAABZQAAAmgAAABlAAAAaAAAAGgAAABlAAACZQAAA2UAAABoAAAAaAAAAFgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAASwAAA0sAAANXAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAQQAAAEEAAABBAAAAaAAAAGgAAABBAAAAaAAAAEsAAANLAAADVwAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEEAAABBAAAAQQAAAGgAAABoAAAAQQAAAGgAAABLAAABSwAAAlcAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABBAAAAQQAAAEEAAABoAAAAaAAAAEEAAABoAAAASwAAAksAAANXAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFcAAABXAAAAVwAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEEAAABBAAAAQQAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABBAAAAQQAAAEEAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAQQAAAEEAAABBAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABBAAAAQQAAAEEAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAQQAAAEEAAABBAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAEEAAABBAAAAQQAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAA==
         5,-2:
           ind: 5,-2
           tiles: aAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFcAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABXAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAVwAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABXAAAAVwAAAFcAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAD4AAAM+AAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAAA+AAACPgAAAmgAAABXAAAAVwAAAFcAAABXAAAAVwAAAFcAAABXAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAVwAAAGgAAABoAAAAaAAAAGgAAABoAAAAVwAAAGgAAABoAAAAaAAAAGgAAABXAAAAVwAAAFcAAABXAAAAaAAAAFcAAAAaAAACaAAAABoAAAJLAAADSwAAA0sAAAJLAAACSwAAARoAAANoAAAASwAAAEsAAANQAAAAUAAAAEsAAAFXAAAAVwAAAFcAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAVwAAAEsAAANLAAACSwAAAUsAAABLAAACVwAAAFcAAABoAAAAGgAAAksAAAFLAAADSwAAAksAAAJoAAAAGgAAA2gAAABLAAACSwAAAUsAAAJLAAADSwAAARoAAAIaAAABaAAAABoAAAMaAAAAGgAAARoAAAAaAAABaAAAABoAAAFoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAGgAAABoAAAAaAAAAFcAAABoAAAAaAAAAEAAAABAAAAAQAAAAEAAAABAAAAAaAAAABoAAAIaAAAAaAAAABoAAAIaAAADGgAAAmgAAABoAAAAQgAAAGgAAABAAAAAQAAAAEAAAABAAAAAQAAAAA==
@@ -4431,6 +4431,8 @@ entities:
             8025: 22,-23
             8245: 22,7
             8712: -11,8
+            8757: 10,53
+            8758: 10,56
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -30016,16 +30018,6 @@ entities:
       type: Transform
 - proto: Bucket
   entities:
-  - uid: 1442
-    components:
-    - pos: -14.542519,34.82644
-      parent: 13329
-      type: Transform
-  - uid: 1443
-    components:
-    - pos: -14.370644,34.685814
-      parent: 13329
-      type: Transform
   - uid: 1650
     components:
     - pos: 6.4752116,12.454929
@@ -44344,8 +44336,6 @@ entities:
     - pos: 84.5,-42.5
       parent: 13329
       type: Transform
-    - enabled: True
-      type: AmbientSound
   - uid: 24506
     components:
     - pos: 86.5,-42.5
@@ -104327,6 +104317,16 @@ entities:
         - 0
         - 0
       type: EntityStorage
+  - uid: 24265
+    components:
+    - pos: 8.5,53.5
+      parent: 13329
+      type: Transform
+  - uid: 24266
+    components:
+    - pos: 8.5,56.5
+      parent: 13329
+      type: Transform
 - proto: CrateFunParty
   entities:
   - uid: 2697
@@ -115905,6 +115905,36 @@ entities:
     - pos: 9.5,40.5
       parent: 13329
       type: Transform
+  - uid: 24269
+    components:
+    - pos: 84.5,-17.5
+      parent: 13329
+      type: Transform
+  - uid: 24270
+    components:
+    - pos: 94.5,-18.5
+      parent: 13329
+      type: Transform
+  - uid: 24271
+    components:
+    - pos: 88.5,-7.5
+      parent: 13329
+      type: Transform
+  - uid: 24272
+    components:
+    - pos: 78.5,-1.5
+      parent: 13329
+      type: Transform
+  - uid: 24273
+    components:
+    - pos: 38.5,31.5
+      parent: 13329
+      type: Transform
+  - uid: 24274
+    components:
+    - pos: 33.5,36.5
+      parent: 13329
+      type: Transform
   - uid: 28165
     components:
     - pos: 119.5,-17.5
@@ -120922,6 +120952,22 @@ entities:
     - pos: 51.492767,24.946735
       parent: 13329
       type: Transform
+- proto: FoodCartCold
+  entities:
+  - uid: 1439
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -14.5,34.5
+      parent: 13329
+      type: Transform
+- proto: FoodCartHot
+  entities:
+  - uid: 1443
+    components:
+    - rot: -1.5707963267948966 rad
+      pos: -14.5,33.5
+      parent: 13329
+      type: Transform
 - proto: FoodCondimentBottleEnzyme
   entities:
   - uid: 1198
@@ -168975,6 +169021,16 @@ entities:
       type: Transform
 - proto: HospitalCurtainsOpen
   entities:
+  - uid: 1440
+    components:
+    - pos: 10.5,57.5
+      parent: 13329
+      type: Transform
+  - uid: 1442
+    components:
+    - pos: 9.5,57.5
+      parent: 13329
+      type: Transform
   - uid: 4583
     components:
     - pos: -27.5,47.5
@@ -169075,6 +169131,16 @@ entities:
     - pos: 50.5,29.5
       parent: 13329
       type: Transform
+  - uid: 24263
+    components:
+    - pos: 8.5,57.5
+      parent: 13329
+      type: Transform
+  - uid: 24264
+    components:
+    - pos: 7.5,57.5
+      parent: 13329
+      type: Transform
   - uid: 29149
     components:
     - rot: 3.141592653589793 rad
@@ -175428,11 +175494,6 @@ entities:
       type: Transform
 - proto: PottedPlant10
   entities:
-  - uid: 1439
-    components:
-    - pos: -14.495644,33.32644
-      parent: 13329
-      type: Transform
   - uid: 2669
     components:
     - pos: 5.527132,-18.789473
@@ -184017,6 +184078,16 @@ entities:
     - pos: 22.5,-28.5
       parent: 13329
       type: Transform
+  - uid: 24275
+    components:
+    - pos: -23.5,15.5
+      parent: 13329
+      type: Transform
+  - uid: 24276
+    components:
+    - pos: -22.5,22.5
+      parent: 13329
+      type: Transform
   - uid: 29259
     components:
     - pos: 84.5,20.5
@@ -199086,11 +199157,6 @@ entities:
     - pos: -14.5,40.5
       parent: 13329
       type: Transform
-  - uid: 1440
-    components:
-    - pos: -14.5,34.5
-      parent: 13329
-      type: Transform
   - uid: 1441
     components:
     - pos: -14.5,35.5
@@ -229369,6 +229435,16 @@ entities:
     - pos: 31.543167,28.363314
       parent: 13329
       type: Transform
+  - uid: 24267
+    components:
+    - pos: 35.504837,-33.585228
+      parent: 13329
+      type: Transform
+  - uid: 24268
+    components:
+    - pos: 35.504837,-33.413353
+      parent: 13329
+      type: Transform
 - proto: WeaponPistolMk58
   entities:
   - uid: 10639