Merge remote-tracking branch 'Parsec-core/master' into upstream-core

Resources/Maps/White/Triumph.yml

@@ -132866,135 +132866,45 @@ entities:
 - proto: DeployableBarrier
   entities:
   - uid: 20084
-    components:
-    - type: Transform
-      anchored: True
-      pos: -152.5,42.5
-      parent: 2
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
-    - type: PointLight
-      enabled: True
-  - uid: 20085
-    components:
-    - type: Transform
-      anchored: True
-      pos: -153.5,42.5
-      parent: 2
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
-    - type: PointLight
-      enabled: True
-  - uid: 20086
-    components:
-    - type: Transform
-      anchored: True
-      pos: -154.5,42.5
-      parent: 2
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
-    - type: PointLight
-      enabled: True
-  - uid: 20087
-    components:
-    - type: Transform
-      anchored: True
-      pos: -171.5,55.5
-      parent: 2
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
-    - type: PointLight
-      enabled: True
-  - uid: 20088
-    components:
-    - type: Transform
-      anchored: True
-      pos: -169.5,55.5
-      parent: 2
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
-    - type: PointLight
-      enabled: True
-  - uid: 20089
-    components:
-    - type: Transform
-      pos: -169.5,59.5
-      parent: 2
-  - uid: 20090
-    components:
-    - type: Transform
-      pos: -170.5,59.5
-      parent: 2
-  - uid: 20091
-    components:
-    - type: Transform
-      pos: -28.5,104.5
-      parent: 2
-  - uid: 20092
-    components:
-    - type: Transform
-      pos: -29.5,104.5
-      parent: 2
-  - uid: 20093
-    components:
-    - type: Transform
-      pos: -30.5,104.5
-      parent: 2
-  - uid: 20094
     components:
     - type: Transform
       pos: -41.5,104.5
       parent: 2
-  - uid: 20095
+  - uid: 20085
     components:
     - type: Transform
       pos: -42.5,104.5
       parent: 2
-  - uid: 20096
+  - uid: 20086
     components:
     - type: Transform
       pos: -43.5,104.5
       parent: 2
-  - uid: 20097
-    components:
-    - type: Transform
-      pos: -44.5,104.5
-      parent: 2
-  - uid: 20098
-    components:
-    - type: Transform
-      pos: -71.5,104.5
-      parent: 2
-  - uid: 20099
+  - uid: 20087
     components:
     - type: Transform
       pos: -70.5,104.5
       parent: 2
-  - uid: 20100
+  - uid: 20088
     components:
     - type: Transform
       pos: -69.5,104.5
       parent: 2
-  - uid: 20101
+  - uid: 20089
     components:
     - type: Transform
       pos: -68.5,104.5
       parent: 2
-  - uid: 20102
+  - uid: 20090
     components:
     - type: Transform
       pos: -67.5,104.5
       parent: 2
+  - uid: 20091
+    components:
+    - type: Transform
+      pos: -44.5,104.5
+      parent: 2
 - proto: DeskBell
   entities:
   - uid: 20103

Resources/Prototypes/Maps/Pools/White.yml

@@ -8,6 +8,7 @@
   - Meta
   - Oasis
   - Omega
+  - Origin
   - Packed
   - Polaris
   - Reach

Resources/Prototypes/Maps/omega.yml

@@ -2,8 +2,7 @@
   id: Omega
   mapName: 'Omega'
   mapPath: /Maps/White/omega.yml
-  minPlayers: 10
-  maxPlayers: 35
+  minPlayers: 0
   stations:
     Omega:
       stationProto: StandardNanotrasenStation
@@ -41,6 +40,7 @@
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 2, 2 ]
             MedicalIntern: [ 2, 2 ]
+            Paramedic: [ 1, 2 ]
             #science
             ResearchDirector: [ 1, 1 ]
             SeniorResearcher: [ 1, 1 ]
@@ -54,6 +54,7 @@
             Detective: [ 1, 1 ]
             SecurityCadet: [ 2, 2 ]
             Lawyer: [ 1, 1 ]
+            Inspector: [ 1, 1 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 2, 2 ]

Resources/Prototypes/Maps/origin.yml

@@ -1,8 +1,8 @@
 - type: gameMap
   id: Origin
   mapName: 'Origin'
-  mapPath: /Maps/origin.yml
-  minPlayers: 50
+  mapPath: /Maps/White/origin.yml
+  minPlayers: 30
   stations:
     Origin:
       stationProto: StandardNanotrasenStation
@@ -56,6 +56,7 @@
             Detective: [ 1, 1 ]
             SecurityOfficer: [ 6, 6 ]
             SecurityCadet: [ 2, 4 ]
+            Inspector: [ 1, 1 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
@@ -67,4 +68,5 @@
             Musician: [ 2, 2 ]
             Boxer: [ 1, 1 ]
             Reporter: [ 1, 1 ]
-            
+            Maid: [ 1, 1 ]
+            Bomzh: [ 1, 0 ]

Resources/Prototypes/game_presets.yml

@@ -219,6 +219,18 @@
     - BasicRoundstartVariation
     - GameRuleMeteorScheduler
 
+- type: gamePreset
+  id: SecretSurvival #For Admin Use: Runs Survival but shows "Secret" in lobby.
+  alias:
+    - secretsurvival
+  name: secret-title
+  showInVote: false #Admin Use
+  description: secret-description
+  rules:
+    - RampingStationEventScheduler
+    - BasicRoundstartVariation
+    - GameRuleMeteorScheduler
+
 - type: gamePreset
   id: SecretTraitor #For Admin Use: Runs Traitor but shows "Secret" in lobby.
   alias: