Возвращаем Чарли, Эпсилон и Аванпост

Corvax-Frontier · Aug 22, 2024 · fa6b09e · fa6b09e
1 parent 4d039ad
commit fa6b09e
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 73 deletions.
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -204,7 +204,7 @@ public static readonly CVarDef<int>
         ///     Controls the game map prototype to load. SS14 stores these prototypes in Prototypes/Maps.
         /// </summary>
         public static readonly CVarDef<string>
-            GameMap = CVarDef.Create("game.map", "Frontier", CVar.SERVERONLY); // Corvax-Frontier
+            GameMap = CVarDef.Create("game.map", "corvaxFrontier", CVar.SERVERONLY); // Corvax-Frontier
 
         /// <summary>
         ///     Controls whether to use world persistence or not.

diff --git a/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml b/Resources/Maps/Corvax/Outpost/corvaxFrontier.yml
@@ -9782,15 +9782,6 @@ entities:
     - type: Transform
       pos: 17.46684,-8.50809
       parent: 1
-- proto: BoxSurvivalNFOxygen
-  entities:
-  - uid: 351
-    components:
-    - type: Transform
-      parent: 350
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: BoxTrashbag
   entities:
   - uid: 354
@@ -18112,15 +18103,6 @@ entities:
         actions: !type:Container
           ents:
           - 3
-- proto: ClothingOuterEVASuitMailman
-  entities:
-  - uid: 352
-    components:
-    - type: Transform
-      parent: 350
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: Cobweb2
   entities:
   - uid: 4514
@@ -44812,22 +44794,7 @@ entities:
     - type: Transform
       pos: 4.5,-28.5
       parent: 1
-- proto: SuitStorageMailCarrier
-  entities:
-  - uid: 350
-    components:
-    - type: Transform
-      pos: 20.5,-9.5
-      parent: 1
-    - type: ContainerContainer
-      containers:
-        entity_storage: !type:Container
-          showEnts: False
-          occludes: True
-          ents:
-          - 352
-          - 351
-          - 353
+
 - proto: SurveillanceCameraCommand
   entities:
   - uid: 5883
@@ -45875,15 +45842,6 @@ entities:
     - type: Transform
       pos: -4.8303585,22.695908
       parent: 1
-- proto: ToolboxEmergencyFilled
-  entities:
-  - uid: 353
-    components:
-    - type: Transform
-      parent: 350
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: ToolboxMechanicalFilled
   entities:
   - uid: 3808
@@ -46139,27 +46097,13 @@ entities:
     - type: Transform
       pos: 3.49276,-22.467604
       parent: 1
-- proto: VendingMachineRestockCiviMedVend
-  entities:
-  - uid: 3255
-    components:
-    - type: Transform
-      pos: 2.539635,-22.498875
-      parent: 1
 - proto: VendingMachineRestockCuddlyCritterVend
   entities:
   - uid: 3258
     components:
     - type: Transform
       pos: 4.46151,-22.498875
       parent: 1
-- proto: VendingMachineRestockFlatpackVend
-  entities:
-  - uid: 3259
-    components:
-    - type: Transform
-      pos: 3.33651,-23.49957
-      parent: 1
 - proto: VendingMachineRestockPottedPlantVend
   entities:
   - uid: 3261

diff --git a/Resources/Maps/Corvax/POI/charlie.yml b/Resources/Maps/Corvax/POI/charlie.yml
@@ -50353,7 +50353,7 @@ entities:
       parent: 6914
     - type: Physics
       canCollide: False
-- proto: WeaponTurretLaserSyndicateNF
+- proto: SpawnMobWeaponTurretLaserSyndicateNF
   entities:
   - uid: 6798
     components:
@@ -50467,7 +50467,7 @@ entities:
     - type: Transform
       pos: 32.5,36.5
       parent: 2
-- proto: WeaponTurretSyndicate
+- proto: SpawnMobWeaponTurretSyndicate
   entities:
   - uid: 131
     components:
@@ -50672,7 +50672,7 @@ entities:
     - type: Transform
       pos: 14.5,45.5
       parent: 2
-- proto: WeaponTurretSyndicateAntiMateriel
+- proto: SpawnMobWeaponTurretSyndicateAntiMateriel
   entities:
   - uid: 1332
     components:
@@ -50936,7 +50936,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 30.5,19.5
       parent: 2
-- proto: WeaponTurretSyndicateMagnumAP
+- proto: SpawnMobWeaponTurretSyndicateMagnumAP
   entities:
   - uid: 350
     components:
@@ -51002,7 +51002,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 7.5,-33.5
       parent: 2
-- proto: WeaponTurretSyndicateShotgun
+- proto: SpawnMobWeaponTurretSyndicateShotgun
   entities:
   - uid: 338
     components:

diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/turrets.yml
@@ -6,7 +6,7 @@
   components:
     - type: NpcFactionMember
       factions:
-        - Syndicate
+        - SyndicateNF
     - type: Gun
       fireRate: 3
       selectedMode: FullAuto
@@ -25,7 +25,7 @@
   components:
     - type: NpcFactionMember
       factions:
-        - Syndicate
+        - SyndicateNF
     - type: Gun
       fireRate: 1
       selectedMode: FullAuto
@@ -44,7 +44,7 @@
   components:
     - type: NpcFactionMember
       factions:
-        - Syndicate
+        - SyndicateNF
     - type: Gun
       fireRate: 4
       selectedMode: FullAuto

diff --git a/Resources/Prototypes/Corvax/PointsOflnterest/Charlie.yml b/Resources/Prototypes/Corvax/PointsOflnterest/Charlie.yml
@@ -15,7 +15,7 @@
   rangeMax: 13550
   iffColor: "#C83737" #red the color of ebil
   isHidden: true
-  spawnChance: 0
+  spawnChance: 1
   gridPath: /Maps/Corvax/POI/charlie.yml
 
 - type: gameMap

diff --git a/Resources/Prototypes/Corvax/PointsOflnterest/Epsilon.yml b/Resources/Prototypes/Corvax/PointsOflnterest/Epsilon.yml
@@ -15,7 +15,7 @@
   rangeMax: 6550
   iffColor: "#C83737" #red the color of ebil
   isHidden: true
-  spawnChance: 0
+  spawnChance: 1
   gridPath: /Maps/Corvax/POI/epsilon.yml
 
 - type: gameMap

diff --git a/Resources/Prototypes/Corvax/Spawners/turret_spawner.yml b/Resources/Prototypes/Corvax/Spawners/turret_spawner.yml
@@ -0,0 +1,45 @@
+#Corvax-frontier
+- type: entity
+  id: SpawnMobWeaponTurretSyndicateAntiMateriel
+  parent: MarkerBase
+  name: спавнер баллистической турели синдиката
+  suffix: Синдикат, Фронтир, 60 калибр
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Weapons/Guns/Turrets/turrets.rsi
+      state: syndie_lethal
+  - type: ConditionalSpawner
+    prototypes:
+    - WeaponTurretSyndicateAntiMateriel
+
+- type: entity
+  id: SpawnMobWeaponTurretSyndicateMagnumAP
+  parent: MarkerBase
+  name: спавнер баллистической турели синдиката
+  suffix: Синдикат, Фронтир, 45калибрББ
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Weapons/Guns/Turrets/turrets.rsi
+      state: syndie_lethal
+  - type: ConditionalSpawner
+    prototypes:
+    - WeaponTurretSyndicateMagnumAP
+
+- type: entity
+  id: SpawnMobWeaponTurretSyndicateShotgun
+  parent: MarkerBase
+  name: спавнер баллистической турели синдиката
+  suffix: Синдикат, Фронтир, 50дробь
+  components:
+  - type: Sprite
+    layers:
+    - state: red
+    - sprite: Objects/Weapons/Guns/Turrets/turrets.rsi
+      state: syndie_lethal
+  - type: ConditionalSpawner
+    prototypes:
+    - WeaponTurretSyndicateShotgun
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
@@ -128,7 +128,7 @@
   components:
     - type: NpcFactionMember
       factions:
-        - Syndicate
+        - SyndicateNF
 
 - type: entity
   parent: BaseWeaponTurret
@@ -138,7 +138,7 @@
   components:
     - type: NpcFactionMember
       factions:
-        - Syndicate
+        - SyndicateNF
     - type: Destructible
       thresholds:
         - trigger:
@@ -182,7 +182,7 @@
 - type: entity
   parent: BaseWeaponTurret
   id: WeaponTurretNanoTrasen
-  suffix: NanoTrasen
+  suffix: NanoTrasen, НЕ_МАППИТЬ
   components:
   - type: NpcFactionMember
     factions:
@@ -191,7 +191,7 @@
 - type: entity
   parent: BaseWeaponTurret
   id: WeaponTurretHostile
-  suffix: Hostile
+  suffix: Hostile, НЕ_МАППИТЬ
   components:
   - type: NpcFactionMember
     factions:
@@ -202,7 +202,7 @@
   description: Shoots 9mm acid projectiles
   parent: BaseWeaponTurret
   id: WeaponTurretXeno
-  suffix: Xeno
+  suffix: Xeno, НЕ_МАППИТЬ
   components:
     - type: NpcFactionMember
       factions: