Fix mapping issues [Frankenstein, Axioma, Eclipse] (#1456)

* Fix ExternalAirlocks at ExplosiveScienceArea, New Proto for airlocks * EvacShuttle fix airlocks access * CableMV under atmos windows * Eclipse Fix Fauna, Clown and etc * Blyoba Toy
SerbiaStrong-220 · Jul 24, 2024 · 1d9bec2 · 1d9bec2
1 parent df93a59
commit 1d9bec2
Show file tree

Hide file tree

Showing 7 changed files with 37,828 additions and 36,573 deletions.
diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl
@@ -124,6 +124,11 @@ ent-AirlockExternalGlassCargoLocked = { ent-AirlockExternalGlass }
 ent-AirlockExternalGlassEngineeringLocked = { ent-AirlockExternalGlass }
     .suffix = External, Glass, Engineering, Locked
     .desc = { ent-AirlockExternalGlass.desc }
+# SS220 Science External Airlock begin
+ent-AirlockExternalGlassScienceLocked = { ent-AirlockExternalGlass }
+    .suffix = External, Glass, Science, Locked
+    .desc = { ent-AirlockExternalGlass.desc }
+# SS220 Science External Airlock end
 ent-AirlockExternalGlassAtmosphericsLocked = { ent-AirlockExternalGlass }
     .suffix = External, Glass, Atmospherics, Locked
     .desc = { ent-AirlockExternalGlass.desc }

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/airlocks/access.ftl
@@ -160,6 +160,11 @@ ent-AirlockExternalGlassNukeopLocked = { ent-AirlockExternalGlass }
 ent-AirlockExternalGlassEngineeringLocked = { ent-AirlockExternalGlass }
     .suffix = Внешний, Стеклянный, Инженерный, Закрыт
     .desc = { ent-AirlockExternalGlass.desc }
+# SS220 Science External Airlock begin
+ent-AirlockExternalGlassScienceLocked = { ent-AirlockExternalGlass }
+    .suffix = Внешний, Стеклянный, Научный, Закрыт
+    .desc = { ent-AirlockExternalGlass.desc }
+# SS220 Science External Airlock end
 ent-AirlockExternalGlassAtmosphericsLocked = { ent-AirlockExternalGlass }
     .suffix = Внешний, Стеклянный, Атмосферный, Закрыт
     .desc = { ent-AirlockExternalGlass.desc }

diff --git a/Resources/Maps/SS220/Shuttles/emergency/emergency_frankenstein.yml b/Resources/Maps/SS220/Shuttles/emergency/emergency_frankenstein.yml
@@ -39,26 +39,13 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 1
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
-    - type: LoadedMap
   - uid: 3
     components:
     - type: MetaData
       name: grid
     - type: Transform
       pos: -3.1453362,-2.0878687
-      parent: 1
+      parent: invalid
     - type: MapGrid
       chunks:
         0,0:
@@ -1132,20 +1119,6 @@ entities:
       - 222
       - 41
       - 131
-- proto: AirlockBarGlassLocked
-  entities:
-  - uid: 808
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,3.5
-      parent: 3
-  - uid: 810
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 8.5,2.5
-      parent: 3
 - proto: AirlockCommandGlassLocked
   entities:
   - uid: 803
@@ -1229,6 +1202,20 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,9.5
       parent: 3
+- proto: AirlockGlass
+  entities:
+  - uid: 1
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 8.5,3.5
+      parent: 3
+  - uid: 808
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,2.5
+      parent: 3
 - proto: AirlockMedicalGlassLocked
   entities:
   - uid: 800