AdventureTimeSS14 · PyotrIgn · Feb 28, 2024
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -424,7 +424,7 @@ public static readonly CVarDef<bool>
             CVarDef.Create("suspicion.min_traitors", 2);
 
         public static readonly CVarDef<int> SuspicionPlayersPerTraitor =
-            CVarDef.Create("suspicion.players_per_traitor", 6);
+            CVarDef.Create("suspicion.players_per_traitor", 15);
 
         public static readonly CVarDef<int> SuspicionStartingBalance =
             CVarDef.Create("suspicion.starting_balance", 20);
@@ -440,10 +440,10 @@ public static readonly CVarDef<bool>
             CVarDef.Create("traitor.min_players", 5);
 
         public static readonly CVarDef<int> TraitorMaxTraitors =
-            CVarDef.Create("traitor.max_traitors", 6); // Assuming average server maxes somewhere from like 50-80 people
+            CVarDef.Create("traitor.max_traitors", 4); // Assuming average server maxes somewhere from like 50-80 people
 
         public static readonly CVarDef<int> TraitorPlayersPerTraitor =
-            CVarDef.Create("traitor.players_per_traitor", 12);
+            CVarDef.Create("traitor.players_per_traitor", 15);
 
         public static readonly CVarDef<int> TraitorCodewordCount =
             CVarDef.Create("traitor.codeword_count", 4);
@@ -499,7 +499,7 @@ public static readonly CVarDef<bool>
             CVarDef.Create("changeling.min_players", 20);
 
         public static readonly CVarDef<int> ChangelingMaxChangelings =
-            CVarDef.Create("changeling.max_lings", 3); // Assuming average server maxes somewhere from like 50-80 people. Upd: У нас генокрады вместе с предателями, куда бля! Порезал в 2 раза лимит.
+            CVarDef.Create("changeling.max_lings", 2); // Assuming average server maxes somewhere from like 50-80 people. Upd: У нас генокрады вместе с предателями, куда бля! Порезал в 2 раза лимит.
 
         public static readonly CVarDef<int> ChangelingPlayersPerChangeling =
             CVarDef.Create("changeling.players_per_traitor", 15);

diff --git a/Resources/Maps/ADTMaps/adt_atlas.yml b/Resources/Maps/ADTMaps/adt_atlas.yml
@@ -2049,7 +2049,7 @@ entities:
             0: 30719
           7,5:
             0: 55
-            4: 256
+            2: 256
           -4,4:
             0: 65535
           -4,5:
@@ -2363,8 +2363,8 @@ entities:
             0: 65395
           -12,0:
             0: 36751
-            2: 112
-            3: 28672
+            3: 112
+            4: 28672
           -12,1:
             0: 65535
           -12,2:
@@ -2517,7 +2517,7 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 6666.982
+          - 0
           - 0
           - 0
           - 0
@@ -2532,7 +2532,6 @@ entities:
         - volume: 2500
           temperature: 293.15
           moles:
-          - 0
           - 6666.982
           - 0
           - 0
@@ -2544,11 +2543,12 @@ entities:
           - 0
           - 0
           - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
           - 0
-          - 0
+          - 6666.982
           - 0
           - 0
           - 0
@@ -2576,6 +2576,13 @@ entities:
       parent: 1523
     - type: InstantAction
       container: 1523
+- proto: ADTLockerPathologistFilled
+  entities:
+  - uid: 912
+    components:
+    - type: Transform
+      pos: 3.5,-11.5
+      parent: 30
 - proto: ADTSpawnPointADTSupplyBorg
   entities:
   - uid: 7963
@@ -2646,6 +2653,27 @@ entities:
     - type: Transform
       pos: -24.5,2.5
       parent: 30
+- proto: ADTVendingMachineParaDrobe
+  entities:
+  - uid: 4252
+    components:
+    - type: Transform
+      pos: 3.5,-5.5
+      parent: 30
+- proto: ADTVendingMachinePatholoDrobe
+  entities:
+  - uid: 1549
+    components:
+    - type: Transform
+      pos: 4.5,-11.5
+      parent: 30
+- proto: ADTVendingMachinePill
+  entities:
+  - uid: 887
+    components:
+    - type: Transform
+      pos: 8.5,-13.5
+      parent: 30
 - proto: ADTVendingMachinePrazatClothing
   entities:
   - uid: 3340
@@ -17283,22 +17311,12 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -1.5,5.5
       parent: 30
-  - uid: 887
-    components:
-    - type: Transform
-      pos: 4.5,-11.5
-      parent: 30
   - uid: 889
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -1.5,6.5
       parent: 30
-  - uid: 912
-    components:
-    - type: Transform
-      pos: 3.5,-11.5
-      parent: 30
   - uid: 1269
     components:
     - type: Transform
@@ -18466,15 +18484,6 @@ entities:
       parent: 30
     - type: Physics
       canCollide: False
-- proto: ClothingHeadHatChickenhead
-  entities:
-  - uid: 5198
-    components:
-    - type: Transform
-      pos: 4.4612703,-11.1283
-      parent: 30
-    - type: Physics
-      canCollide: False
 - proto: ClothingHeadHatCone
   entities:
   - uid: 4129
@@ -18699,15 +18708,6 @@ entities:
       parent: 30
     - type: Physics
       canCollide: False
-- proto: ClothingOuterSuitChicken
-  entities:
-  - uid: 4252
-    components:
-    - type: Transform
-      pos: 4.478327,-11.4409485
-      parent: 30
-    - type: Physics
-      canCollide: False
 - proto: ClothingShoesBootsMag
   entities:
   - uid: 363
@@ -19012,14 +19012,6 @@ entities:
     - type: Transform
       pos: -38.5,10.5
       parent: 30
-- proto: ComputerMedicalRecords
-  entities:
-  - uid: 1549
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 8.5,-13.5
-      parent: 30
 - proto: ComputerPowerMonitoring
   entities:
   - uid: 230
@@ -43485,6 +43477,13 @@ entities:
     - type: Transform
       pos: -2.5,-8.5
       parent: 30
+- proto: SpawnPointADTPathologist
+  entities:
+  - uid: 5198
+    components:
+    - type: Transform
+      pos: 3.5,-12.5
+      parent: 30
 - proto: SpawnPointAtmos
   entities:
   - uid: 280

diff --git a/Resources/Maps/ADTMaps/adt_bagel.yml b/Resources/Maps/ADTMaps/adt_bagel.yml
@@ -9573,6 +9573,13 @@ entities:
       parent: 19193
     - type: InstantAction
       container: 19193
+- proto: ADTLockerPathologistFilled
+  entities:
+  - uid: 22449
+    components:
+    - type: Transform
+      pos: 40.5,-10.5
+      parent: 60
 - proto: ADTSpawnPointADTSupplyBorg
   entities:
   - uid: 21690
@@ -9643,6 +9650,27 @@ entities:
     - type: Transform
       pos: 19.5,-33.5
       parent: 60
+- proto: ADTVendingMachineParaDrobe
+  entities:
+  - uid: 172
+    components:
+    - type: Transform
+      pos: 49.5,-17.5
+      parent: 60
+- proto: ADTVendingMachinePatholoDrobe
+  entities:
+  - uid: 9171
+    components:
+    - type: Transform
+      pos: 41.5,-10.5
+      parent: 60
+- proto: ADTVendingMachinePill
+  entities:
+  - uid: 21778
+    components:
+    - type: Transform
+      pos: 39.5,-20.5
+      parent: 60
 - proto: ADTVendingMachinePrazatClothing
   entities:
   - uid: 5503
@@ -16844,10 +16872,10 @@ entities:
     - type: Transform
       pos: -19.561207,-5.30166
       parent: 60
-  - uid: 172
+  - uid: 134
     components:
     - type: Transform
-      pos: 40.456047,-10.342315
+      pos: 38.759163,-10.403553
       parent: 60
 - proto: BoxFlare
   entities:
@@ -68625,13 +68653,6 @@ entities:
     - type: Transform
       pos: -22.5,-29.5
       parent: 60
-- proto: filingCabinetTallRandom
-  entities:
-  - uid: 134
-    components:
-    - type: Transform
-      pos: 49.5,-17.5
-      parent: 60
 - proto: FireAlarm
   entities:
   - uid: 4511
@@ -122933,7 +122954,7 @@ entities:
   - uid: 348
     components:
     - type: Transform
-      pos: 41.440662,-10.344523
+      pos: 36.634163,-9.356678
       parent: 60
 - proto: RubberStampMime
   entities:
@@ -129496,6 +129517,13 @@ entities:
     - type: Transform
       pos: 41.5,-30.5
       parent: 60
+- proto: SpawnPointADTPathologist
+  entities:
+  - uid: 21950
+    components:
+    - type: Transform
+      pos: 38.5,-9.5
+      parent: 60
 - proto: SpawnPointAtmos
   entities:
   - uid: 17917
@@ -132994,11 +133022,6 @@ entities:
     - type: Transform
       pos: -44.5,-10.5
       parent: 60
-  - uid: 9171
-    components:
-    - type: Transform
-      pos: 40.5,-10.5
-      parent: 60
   - uid: 9464
     components:
     - type: Transform