From 1552f6a21d685349d292ec5c1c5eb01bd2333e77 Mon Sep 17 00:00:00 2001
From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Date: Fri, 3 Jan 2025 01:40:41 -0500
Subject: [PATCH] Colin Maps hotfix (#2593)

hotfixes maps
---
 Resources/Maps/asterisk.yml |  29 +++----
 Resources/Maps/chibi.yml    | 163 +++++++++++++++++++++++++++++++++++-
 2 files changed, 174 insertions(+), 18 deletions(-)

diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
index 3ce41352674..ab0c4eacb33 100644
--- a/Resources/Maps/asterisk.yml
+++ b/Resources/Maps/asterisk.yml
@@ -36257,8 +36257,8 @@ entities:
   - uid: 3844
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 23.5,15.5
+      rot: 1.5707963267948966 rad
+      pos: 20.5,12.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0099FFFF'
@@ -36267,8 +36267,7 @@ entities:
   - uid: 3260
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 28.5,15.5
+      pos: 26.5,16.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF6600FF'
@@ -36386,16 +36385,14 @@ entities:
   - uid: 1971
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 20.5,12.5
+      pos: 23.5,15.5
       parent: 2
     - type: AtmosPipeColor
       color: '#0099FFFF'
   - uid: 2031
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 26.5,16.5
+      pos: 28.5,15.5
       parent: 2
     - type: AtmosPipeColor
       color: '#FF6600FF'
@@ -54348,9 +54345,9 @@ entities:
     - type: Transform
       pos: 62.5,-18.5
       parent: 2
-- proto: HolopadCargoBay
+- proto: HolopadCargoBayLongRange
   entities:
-  - uid: 12713
+  - uid: 12674
     components:
     - type: Transform
       pos: 5.5,25.5
@@ -54383,19 +54380,19 @@ entities:
     - type: Transform
       pos: 14.5,25.5
       parent: 2
-- proto: HolopadCommandBridge
+- proto: HolopadCommandBridgeHallway
   entities:
-  - uid: 12674
+  - uid: 1368
     components:
     - type: Transform
-      pos: 51.5,-5.5
+      pos: 38.5,-5.5
       parent: 2
-- proto: HolopadCommandBridgeHallway
+- proto: HolopadCommandBridgeLongRange
   entities:
-  - uid: 1368
+  - uid: 12713
     components:
     - type: Transform
-      pos: 38.5,-5.5
+      pos: 51.5,-5.5
       parent: 2
 - proto: HolopadCommandCaptain
   entities:
diff --git a/Resources/Maps/chibi.yml b/Resources/Maps/chibi.yml
index d1263dfbfc6..efe33bf7fd7 100644
--- a/Resources/Maps/chibi.yml
+++ b/Resources/Maps/chibi.yml
@@ -8752,6 +8752,11 @@ entities:
     - type: Transform
       pos: 11.5,17.5
       parent: 2
+  - uid: 4385
+    components:
+    - type: Transform
+      pos: 12.5,17.5
+      parent: 2
 - proto: CarpetGreen
   entities:
   - uid: 1430
@@ -21349,6 +21354,160 @@ entities:
     - type: Transform
       pos: 19.5,14.5
       parent: 2
+- proto: HolopadCargoBayLongRange
+  entities:
+  - uid: 3909
+    components:
+    - type: Transform
+      pos: 27.5,-3.5
+      parent: 2
+- proto: HolopadCargoSalvageBay
+  entities:
+  - uid: 4395
+    components:
+    - type: Transform
+      pos: 27.5,-13.5
+      parent: 2
+- proto: HolopadCommandBridgeLongRange
+  entities:
+  - uid: 4398
+    components:
+    - type: Transform
+      pos: 16.5,14.5
+      parent: 2
+- proto: HolopadCommandCaptain
+  entities:
+  - uid: 4384
+    components:
+    - type: Transform
+      pos: 11.5,17.5
+      parent: 2
+- proto: HolopadCommandVault
+  entities:
+  - uid: 4397
+    components:
+    - type: Transform
+      pos: 21.5,15.5
+      parent: 2
+- proto: HolopadEngineeringAtmosMain
+  entities:
+  - uid: 4380
+    components:
+    - type: Transform
+      pos: -4.5,-10.5
+      parent: 2
+- proto: HolopadEngineeringAtmosTeg
+  entities:
+  - uid: 4396
+    components:
+    - type: Transform
+      pos: 10.5,-23.5
+      parent: 2
+- proto: HolopadEngineeringFront
+  entities:
+  - uid: 4387
+    components:
+    - type: Transform
+      pos: 15.5,-14.5
+      parent: 2
+- proto: HolopadGeneralArrivals
+  entities:
+  - uid: 4389
+    components:
+    - type: Transform
+      pos: 6.5,20.5
+      parent: 2
+- proto: HolopadGeneralDisposals
+  entities:
+  - uid: 4391
+    components:
+    - type: Transform
+      pos: -6.5,-2.5
+      parent: 2
+- proto: HolopadGeneralEvac
+  entities:
+  - uid: 4388
+    components:
+    - type: Transform
+      pos: -10.5,4.5
+      parent: 2
+- proto: HolopadMedicalChemistry
+  entities:
+  - uid: 4390
+    components:
+    - type: Transform
+      pos: 16.5,0.5
+      parent: 2
+- proto: HolopadMedicalMedbay
+  entities:
+  - uid: 4394
+    components:
+    - type: Transform
+      pos: 14.5,-6.5
+      parent: 2
+- proto: HolopadScienceAnomaly
+  entities:
+  - uid: 4386
+    components:
+    - type: Transform
+      pos: 6.5,-14.5
+      parent: 2
+- proto: HolopadScienceFront
+  entities:
+  - uid: 4393
+    components:
+    - type: Transform
+      pos: 7.5,-7.5
+      parent: 2
+- proto: HolopadSecurityArmory
+  entities:
+  - uid: 4378
+    components:
+    - type: Transform
+      pos: 26.5,10.5
+      parent: 2
+- proto: HolopadSecurityBrig
+  entities:
+  - uid: 4383
+    components:
+    - type: Transform
+      pos: 27.5,2.5
+      parent: 2
+- proto: HolopadServiceBar
+  entities:
+  - uid: 4379
+    components:
+    - type: Transform
+      pos: 1.5,7.5
+      parent: 2
+- proto: HolopadServiceBotany
+  entities:
+  - uid: 4381
+    components:
+    - type: Transform
+      pos: 6.5,-1.5
+      parent: 2
+- proto: HolopadServiceJanitor
+  entities:
+  - uid: 4392
+    components:
+    - type: Transform
+      pos: -5.5,7.5
+      parent: 2
+- proto: HolopadServiceKitchen
+  entities:
+  - uid: 4400
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 2
+- proto: HolopadServiceLibrary
+  entities:
+  - uid: 4382
+    components:
+    - type: Transform
+      pos: 1.5,14.5
+      parent: 2
 - proto: HospitalCurtainsOpen
   entities:
   - uid: 525
@@ -25235,10 +25394,10 @@ entities:
       parent: 2
 - proto: SpawnPointHeadOfSecurity
   entities:
-  - uid: 3909
+  - uid: 4399
     components:
     - type: Transform
-      pos: 16.5,14.5
+      pos: 17.5,13.5
       parent: 2
 - proto: SpawnPointJanitor
   entities: