Перенос шаттлов, различных гридов для ивентов и прочее прочее

Corvax-Frontier · Aug 16, 2024 · 5303d02 · 5303d02
1 parent c2c9f70
commit 5303d02
Show file tree

Hide file tree

Showing 49 changed files with 11,317 additions and 50,868 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);
+            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/Bluespace/RuinedCourser.yml b/Resources/Maps/Corvax/Bluespace/RuinedCourser.yml
@@ -612,7 +612,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-3.5
       parent: 1
-- proto: AsteroidRockBananiumCrabSalvage
+- proto: AsteroidRockBananiumCrab
   entities:
   - uid: 106
     components:
@@ -626,7 +626,7 @@ entities:
     - type: Transform
       pos: 1.5,11.5
       parent: 1
-- proto: AsteroidRockIronCrabSalvage
+- proto: AsteroidRockIronGolem
   entities:
   - uid: 31
     components:
@@ -643,7 +643,7 @@ entities:
     - type: Transform
       pos: 2.5,13.5
       parent: 1
-- proto: AsteroidRockIronGolemSalvage
+- proto: AsteroidRockIronGolem
   entities:
   - uid: 35
     components:
@@ -657,7 +657,7 @@ entities:
     - type: Transform
       pos: 1.5,10.5
       parent: 1
-- proto: AsteroidRockPlasmaGolemSalvage
+- proto: AsteroidRockPlasmaGolem
   entities:
   - uid: 199
     components:
@@ -671,7 +671,7 @@ entities:
     - type: Transform
       pos: 1.5,7.5
       parent: 1
-- proto: AsteroidRockSilverCrabSalvage
+- proto: AsteroidRockSilverCrab
   entities:
   - uid: 55
     components:
@@ -2684,63 +2684,63 @@ entities:
     - type: Transform
       pos: 1.5,-6.5
       parent: 1
-- proto: MobSpawnBananiumGolemSalvage
+- proto: MobSpawnBananiumGolem
   entities:
   - uid: 127
     components:
     - type: Transform
       pos: -0.5,-5.5
       parent: 1
-- proto: MobSpawnCoalCrabSalvage
+- proto: MobSpawnCoalCrab
   entities:
   - uid: 122
     components:
     - type: Transform
       pos: 5.5,4.5
       parent: 1
-- proto: MobSpawnCoalGolemSalvage
+- proto: MobSpawnCoalGolem
   entities:
   - uid: 52
     components:
     - type: Transform
       pos: -2.5,-12.5
       parent: 1
-- proto: MobSpawnIronGolemSalvage
+- proto: MobSpawnIronGolem
   entities:
   - uid: 218
     components:
     - type: Transform
       pos: -0.5,6.5
       parent: 1
-- proto: MobSpawnPlasmaCrabSalvage
+- proto: MobSpawnPlasmaCrab
   entities:
   - uid: 194
     components:
     - type: Transform
       pos: -0.5,11.5
       parent: 1
-- proto: MobSpawnQuartzCrabSalvage
+- proto: MobSpawnQuartzGolem
   entities:
   - uid: 28
     components:
     - type: Transform
       pos: -5.5,-4.5
       parent: 1
-- proto: MobSpawnSaltCrabSalvage
+- proto: MobSpawnSaltCrab
   entities:
   - uid: 146
     components:
     - type: Transform
       pos: -0.5,1.5
       parent: 1
-- proto: MobSpawnSaltGolemSalvage
+- proto: MobSpawnSaltGolem
   entities:
   - uid: 95
     components:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
-- proto: MobSpawnSilverCrabSalvage
+- proto: MobSpawnSilverGolem
   entities:
   - uid: 36
     components:
@@ -2752,7 +2752,7 @@ entities:
     - type: Transform
       pos: 4.5,-4.5
       parent: 1
-- proto: MobSpawnUraniumCrabSalvage
+- proto: MobSpawnUraniumGolem
   entities:
   - uid: 50
     components:

diff --git a/Resources/Maps/Corvax/Bluespace/RuinedCrescent.yml b/Resources/Maps/Corvax/Bluespace/RuinedCrescent.yml
@@ -15529,42 +15529,42 @@ entities:
     - type: Transform
       pos: -5.8052936,14.627985
       parent: 1
-- proto: MobSpawnBananiumCrabSalvage
+- proto: MobSpawnBananiumCrab
   entities:
   - uid: 2650
     components:
     - type: Transform
       pos: 28.5,15.5
       parent: 1
-- proto: MobSpawnBananiumGolemSalvage
+- proto: MobSpawnBananiumGolem
   entities:
   - uid: 1669
     components:
     - type: Transform
       pos: 17.5,16.5
       parent: 1
-- proto: MobSpawnCoalCrabSalvage
+- proto: MobSpawnCoalCrab
   entities:
   - uid: 201
     components:
     - type: Transform
       pos: 22.5,16.5
       parent: 1
-- proto: MobSpawnGoldCrabSalvage
+- proto: MobSpawnGoldCrab
   entities:
   - uid: 203
     components:
     - type: Transform
       pos: 25.5,19.5
       parent: 1
-- proto: MobSpawnGoldGolemSalvage
+- proto: MobSpawnGoldGolem
   entities:
   - uid: 212
     components:
     - type: Transform
       pos: 22.5,31.5
       parent: 1
-- proto: MobSpawnIronCrabSalvage
+- proto: MobSpawnIronGolem
   entities:
   - uid: 202
     components:
@@ -15576,14 +15576,14 @@ entities:
     - type: Transform
       pos: 24.5,33.5
       parent: 1
-- proto: MobSpawnIronGolemSalvage
+- proto: MobSpawnIronGolem
   entities:
   - uid: 211
     components:
     - type: Transform
       pos: 29.5,27.5
       parent: 1
-- proto: MobSpawnPlasmaCrabSalvage
+- proto: MobSpawnPlasmaCrab
   entities:
   - uid: 190
     components:
@@ -15600,7 +15600,7 @@ entities:
     - type: Transform
       pos: 7.5,13.5
       parent: 1
-- proto: MobSpawnPlasmaGolemSalvage
+- proto: MobSpawnPlasmaGolem
   entities:
   - uid: 2932
     components:
@@ -15612,7 +15612,7 @@ entities:
     - type: Transform
       pos: 5.5,2.5
       parent: 1
-- proto: MobSpawnQuartzCrabSalvage
+- proto: MobSpawnQuartzGolem
   entities:
   - uid: 2931
     components:
@@ -15624,7 +15624,7 @@ entities:
     - type: Transform
       pos: 18.5,3.5
       parent: 1
-- proto: MobSpawnSaltCrabSalvage
+- proto: MobSpawnSaltCrab
   entities:
   - uid: 209
     components:
@@ -17022,7 +17022,7 @@ entities:
     - type: Transform
       pos: -13.5,0.5
       parent: 1
-- proto: RandomRockSpawner
+- proto: WallRock
   entities:
   - uid: 184
     components:

diff --git a/Resources/Maps/Corvax/Bluespace/RuinedSprinter.yml b/Resources/Maps/Corvax/Bluespace/RuinedSprinter.yml
@@ -3044,56 +3044,56 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-10.5
       parent: 1
-- proto: MobSpawnBananiumCrabSalvage
+- proto: MobSpawnBananiumCrab
   entities:
   - uid: 225
     components:
     - type: Transform
       pos: -4.5,-4.5
       parent: 1
-- proto: MobSpawnBananiumGolemSalvage
+- proto: MobSpawnBananiumGolem
   entities:
   - uid: 170
     components:
     - type: Transform
       pos: -11.5,-3.5
       parent: 1
-- proto: MobSpawnCoalCrabSalvage
+- proto: MobSpawnCoalCrab
   entities:
   - uid: 116
     components:
     - type: Transform
       pos: -2.5,-9.5
       parent: 1
-- proto: MobSpawnCoalGolemSalvage
+- proto: MobSpawnCoalGolem
   entities:
   - uid: 173
     components:
     - type: Transform
       pos: 2.5,-4.5
       parent: 1
-- proto: MobSpawnGoldCrabSalvage
+- proto: MobSpawnGoldCrab
   entities:
   - uid: 230
     components:
     - type: Transform
       pos: 7.5,-3.5
       parent: 1
-- proto: MobSpawnGoldGolemSalvage
+- proto: MobSpawnGoldGolem
   entities:
   - uid: 109
     components:
     - type: Transform
       pos: -2.5,0.5
       parent: 1
-- proto: MobSpawnIronGolemSalvage
+- proto: MobSpawnIronGolem
   entities:
   - uid: 121
     components:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
-- proto: MobSpawnPlasmaCrabSalvage
+- proto: MobSpawnPlasmaCrab
   entities:
   - uid: 113
     components:
@@ -3345,7 +3345,7 @@ entities:
     - type: Transform
       pos: 4.5,-8.5
       parent: 1
-- proto: RandomRockSpawner
+- proto: WallRock
   entities:
   - uid: 10
     components: