Revert "Meteors fix"

This reverts commit 5e43d2170e.

Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs

@@ -25,11 +25,11 @@ public sealed partial class MeteorSchedulerComponent : Component
     /// The minimum time between swarms
     /// </summary>
     [DataField]
-    public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(20.0f);
+    public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(7.5f);
 
     /// <summary>
     /// The maximum time between swarms
     /// </summary>
     [DataField]
-    public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(25.0f);
+    public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(12.5f);
 }

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml

@@ -69,7 +69,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 25
+        damage: 100
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
@@ -104,7 +104,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 300
+        damage: 1250
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
@@ -139,7 +139,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 435
+        damage: 1750
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
@@ -161,7 +161,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 625
+        damage: 2500
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
@@ -192,7 +192,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 750
+        damage: 3000
       behaviors:
       - !type:DoActsBehavior
         acts: [ "Destruction" ]

Resources/Prototypes/GameRules/meteorswarms.yml

@@ -10,9 +10,9 @@
 - type: weightedRandomEntity
   id: DefaultConfig
   weights:
-    GameRuleSpaceDustMinor: 50
+    GameRuleSpaceDustMinor: 44
-    GameRuleSpaceDustMajor: 20
+    GameRuleSpaceDustMajor: 22
-    GameRuleMeteorSwarmSmall: 15
+    GameRuleMeteorSwarmSmall: 18
     GameRuleMeteorSwarmMedium: 10
     GameRuleMeteorSwarmLarge: 5
     GameRuleUristSwarm: 0.05
@@ -37,7 +37,7 @@
     meteors:
       MeteorSpaceDust: 1
     waves:
-      min: 1
+      min: 2
       max: 3
     meteorsPerWave:
       min: 3
@@ -58,8 +58,8 @@
       min: 2
       max: 3
     meteorsPerWave:
-      min: 6
+      min: 8
-      max: 10
+      max: 12
 
 - type: entity
   parent: GameRuleMeteorSwarm
@@ -68,8 +68,8 @@
   components:
   - type: MeteorSwarm
     meteors:
-      MeteorSmall: 4
+      MeteorSmall: 7
-      MeteorMedium: 1
+      MeteorMedium: 3
 
 - type: entity
   parent: GameRuleMeteorSwarm
@@ -78,8 +78,8 @@
   components:
   - type: MeteorSwarm
     meteors:
-      MeteorSmall: 1
+      MeteorSmall: 3
-      MeteorMedium: 4
+      MeteorMedium: 6
       MeteorLarge: 1
 
 - type: entity
@@ -89,9 +89,9 @@
   components:
   - type: MeteorSwarm
     meteors:
-      MeteorSmall: 1
+      MeteorSmall: 2
-      MeteorMedium: 2
+      MeteorMedium: 4
-      MeteorLarge: 3
+      MeteorLarge: 4
 
 - type: entity
   parent: GameRuleMeteorSwarm
@@ -104,8 +104,8 @@
     meteors:
       MeteorUrist: 1
     waves:
-      min: 1
+      min: 3
       max: 3
     meteorsPerWave:
-      min: 6
+      min: 10
-      max: 8
+      max: 10

Resources/Prototypes/_White/Ghosts/custom_ghosts.yml

@@ -273,6 +273,7 @@
   alpha: 0.8
   ghostName: Fiammetta
   ghostDescription: Горничная под своим кодовым именем. Следит за порядком в кафе Мастера.
+  size: 0.7, 0.7
 
 - type: customGhost
   id: hayras-ghost
@@ -419,12 +420,3 @@
   alpha: 0.9
   ghostName: Никотиноед
   ghostDescription: Поедает никотин в любом виде
-
-#Jabak
-- type: customGhost
-  id: jabak-ghost
-  ckey: Jabak
-  sprite: White/Ghosts/jabak-ghost.rsi
-  alpha: 0.9
-  ghostName: Жопа
-  ghostDescription: Хуй