City Gate fix + Comoss update (#1289)

* city gate fix

* Update comoss.yml

* fix

* Update migration.yml

Content.Server/Parallax/BiomeSystem.cs

@@ -324,7 +324,7 @@ public sealed partial class BiomeSystem : SharedBiomeSystem
 
     private bool CanLoad(EntityUid uid)
     {
-        return !_ghostQuery.HasComp(uid) || _tags.HasTag(uid, AllowBiomeLoadingTag);
+        return !_ghostQuery.HasComp(uid);// CP14 - Admin biome loading break mapping || _tags.HasTag(uid, AllowBiomeLoadingTag);
     }
 
     public override void Update(float frameTime)

Resources/Locale/en-US/_CP14/lockKey/locks-types.ftl

@@ -35,10 +35,9 @@ cp14-lock-shape-personalhouse14 = house  №14
 cp14-lock-shape-personalhouse15 = house  №15
 cp14-lock-shape-personalhouse16 = house  №16
 
-cp14-lock-shaper-guard-entrance = barracks, entrance
-cp14-lock-shaper-guard-staff = barracks
-cp14-lock-shaper-guard-commander = guardhouse
-cp14-lock-shaper-guard-weapon-storage = weapons storage
+cp14-lock-shaper-guard-city-gate = city gate
+cp14-lock-shaper-guard-barracks = barracks
+cp14-lock-shaper-guard-commander = guard commander house
 
 cp14-lock-shape-guildmaster = guildmaster
 cp14-lock-shape-demiplane-crystal = demiplane crystal

Resources/Locale/ru-RU/_CP14/lockKey/locks-types.ftl

@@ -35,10 +35,9 @@ cp14-lock-shape-personalhouse14 = дом №14
 cp14-lock-shape-personalhouse15 = дом №15
 cp14-lock-shape-personalhouse16 = дом №16
 
-cp14-lock-shaper-guard-entrance = казармы, вход
-cp14-lock-shaper-guard-staff = казармы
+cp14-lock-shaper-guard-city-gate = городские ворота
+cp14-lock-shaper-guard-barracks = казармы
 cp14-lock-shaper-guard-commander = дом главы стражи
-cp14-lock-shaper-guard-weapon-storage = хранилище оружия
 
 cp14-lock-shape-guildmaster = гильдмастер
 cp14-lock-shape-demiplane-crystal = кристалл демиплана

Resources/Prototypes/_CP14/Entities/Objects/Keys/Catalog/guard.yml

@@ -1,18 +1,18 @@
 - type: entity
   parent: CP14KeyIronBlank
-  id: CP14KeyGuardEntrance
-  suffix: Guard Entrance
+  id: CP14KeyCityGate
+  suffix: City Gate
   components:
   - type: CP14Key
-    autoGenerateShape: GuardEntrance
+    autoGenerateShape: CityGate
 
 - type: entity
   parent: CP14KeyIronBlank
-  id: CP14KeyGuard
-  suffix: Guard
+  id: CP14KeyGuardBarracks
+  suffix: Guard Barracks
   components:
   - type: CP14Key
-    autoGenerateShape: Guard
+    autoGenerateShape: GuardBarracks
 
 - type: entity
   parent: CP14KeyMithrilBlank
@@ -21,11 +21,3 @@
   components:
   - type: CP14Key
     autoGenerateShape: GuardCommander
-
-- type: entity
-  parent: CP14KeyMithrilBlank
-  id: CP14KeyGuardWeaponStorage
-  suffix: Guard Weapon Storage
-  components:
-  - type: CP14Key
-    autoGenerateShape: GuardWeaponStorage

Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml

@@ -101,8 +101,8 @@
   components:
   - type: StorageFill
     contents:
-    - id: CP14KeyGuardEntrance
-    - id: CP14KeyGuard
+    - id: CP14KeyCityGate
+    - id: CP14KeyGuardBarracks
 
 - type: entity
   parent: CP14BaseKeyRing
@@ -111,10 +111,9 @@
   components:
   - type: StorageFill
     contents:
-    - id: CP14KeyGuardEntrance
-    - id: CP14KeyGuard
+    - id: CP14KeyCityGate
+    - id: CP14KeyGuardBarracks
     - id: CP14KeyGuardCommander
-    #- id: CP14KeyGuardWeaponStorage
 
 - type: entity
   parent: CP14BaseKeyRing

Resources/Prototypes/_CP14/Entities/Structures/Doors/Locked/guard.yml

@@ -3,11 +3,11 @@
 
 - type: entity
   parent: CP14IronDoor
-  id: CP14IronDoorGuard
-  suffix: Guard
+  id: CP14IronDoorGuardBarracks
+  suffix: Guard Barracks
   components:
   - type: CP14Lock
-    autoGenerateShape: Guard
+    autoGenerateShape: GuardBarracks
   - type: Lock
     locked: true
 
@@ -21,43 +21,43 @@
   - type: Lock
     locked: true
 
-- type: entity
-  parent: CP14IronDoor
-  id: CP14IronDoorGuardWeaponStorage
-  suffix: Guard, Weapon Storage
-  components:
-  - type: CP14Lock
-    autoGenerateShape: GuardWeaponStorage
-  - type: Lock
-    locked: true
-
 # Iron windowed
 
 - type: entity
   parent: CP14IronDoorWindowed
-  id: CP14IronDoorWindowedGuardEntrance
-  suffix: Guard, Entrance
+  id: CP14IronDoorWindowedCityGate
+  suffix: Guard Barracks
   components:
   - type: CP14Lock
-    autoGenerateShape: GuardEntrance
+    autoGenerateShape: GuardBarracks
   - type: Lock
     locked: true
 
 - type: entity
   parent:
-  - CP14IronDoorWindowedGuardEntrance
+  - CP14IronDoorWindowedCityGate
   - CP14IronDoorWindowedMirrored
-  id: CP14IronDoorWindowedMirroredGuardEntrance
-  suffix: Guard, Entrance, Mirrored
+  id: CP14IronDoorWindowedMirroredCityGate
+  suffix: Guard Barracks, Mirrored
 
 # Grill Gate
 
 - type: entity
   parent: CP14FenceGateBigIron
-  id: CP14FenceGateBigIronGuard
-  suffix: Guard
+  id: CP14FenceGateBigIronGuardBarracks
+  suffix: Guard Barracks
   components:
   - type: CP14Lock
-    autoGenerateShape: Guard
+    autoGenerateShape: GuardBarracks
   - type: Lock
-    locked: true
+    locked: true
+
+- type: entity
+  parent: CP14FenceGateBigIron
+  id: CP14FenceGateBigIronCityGate
+  suffix: City Gate
+  components:
+  - type: CP14Lock
+    autoGenerateShape: CityGate
+  - type: Lock
+    locked: false #City gate opened by default

Resources/Prototypes/_CP14/LockCategories/lockTypes.yml

@@ -209,21 +209,16 @@
 # Guard
 
 - type: CP14LockType
-  id: GuardEntrance
+  id: CityGate
   complexity: 5
-  name: cp14-lock-shaper-guard-entrance
+  name: cp14-lock-shaper-guard-city-gate
 
 - type: CP14LockType
-  id: Guard
+  id: GuardBarracks
   complexity: 5
-  name: cp14-lock-shaper-guard-staff
+  name: cp14-lock-shaper-guard-barracks
 
 - type: CP14LockType
   id: GuardCommander
   complexity: 7
-  name: cp14-lock-shaper-guard-commander
-
-- type: CP14LockType
-  id: GuardWeaponStorage
-  complexity: 7
-  name: cp14-lock-shaper-guard-weapon-storage
+  name: cp14-lock-shaper-guard-commander

Resources/migration.yml

@@ -264,7 +264,7 @@ CP14FenceWoodSmallCorner: CP14FenceWooden
 CP14FenceWoodSmallGate: CP14FenceGateWooden
 CP14FenceIronGrilleStraight: CP14FenceBigIron
 CP14FenceIronGrilleGate: CP14FenceGateBigIron
-CP14FenceIronGrilleGateGuard: CP14FenceGateBigIronGuard
+CP14FenceIronGrilleGateGuard: CP14FenceGateBigIronGuardBarracks
 CP14FenceIronGrilleGateGuildmaster: CP14FenceGateBigIronGuildmaster 
 CP14FenceIronGrilleGateDemiplaneCrystal: CP14FenceGateBigIronDemiplaneCrystal
 CP14FenceIronGrilleWindowStraight: CP14FenceWindowIron
@@ -316,6 +316,18 @@ CP14EnergyCrystalSmall: CP14EnergyCrystalMedium
 CP14DemiplaneKeyT1: null
 CP14DemiplaneKeyT2: null
 
+#2025-20-05
+CP14KeyGuardEntrance: CP14KeyGuardBarracks
+CP14KeyGuard: CP14KeyGuardBarracks
+CP14KeyGuardWeaponStorage: null
+CP14IronDoorGuard: CP14IronDoorGuardBarracks
+CP14IronDoorGuardWeaponStorage: null
+CP14IronDoorWindowedGuardEntrance: CP14IronDoorGuardBarracks
+CP14IronDoorWindowedMirroredGuardEntrance: CP14IronDoorGuardBarracks
+CP14FenceGateBigIronGuard: CP14FenceGateBigIronGuardBarracks
+
+
+
 # <---> CrystallEdge migration zone end