Merge branch 'master' into Medical_hud_improvement

DeltaV-Station · Sep 11, 2023 · 5a5740f · 5a5740f
2 parents de5dfc4 + d83d4f8
commit 5a5740f
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 45 deletions.
diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml
@@ -14,23 +14,16 @@
   - type: VentCrittersRule
     entries:
     - id: MobXeno
-      amount: 4
-      maxAmount: 12
+      prob: 0.01
     - id: MobXenoDrone
-      amount: 4
-      maxAmount: 10
+      prob: 0.005
     - id: MobXenoSpitter
-      amount: 4
-      maxAmount: 10
+      prob: 0.005
     - id: MobXenoRunner
-      amount: 4
-      maxAmount: 10
+      prob: 0.005
     - id: MobXenoPraetorian
-      amount: 4
-      maxAmount: 10
+      prob: 0.005
     - id: MobXenoRavager
-      amount: 4
-      maxAmount: 10
+      prob: 0.005
     - id: MobXenoQueen
-      amount: 2
-      maxAmount: 6
+      prob: 0.005
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
@@ -161,29 +161,29 @@
     startDelay: 30
   - type: MeteorSwarmRule
 
-- type: entity
-  id: MouseMigration
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
-    earliestStart: 30
-    minimumPlayers: 35
-    weight: 5
-    duration: 50
-  - type: VentCrittersRule
-    entries:
-    - id: MobMouse
-      prob: 0.015
-    - id: MobMouse1
-      prob: 0.015
-    - id: MobMouse2
-      prob: 0.015
-    - id: MobRatServant
-      prob: 0.015
-    specialEntries:
-    - id: SpawnPointGhostRatKing
-      prob: 0.005
+#- type: entity
+#  id: MouseMigration
+#  parent: BaseGameRule
+#  noSpawn: true
+#  components:
+#  - type: StationEvent
+#    earliestStart: 30
+#    minimumPlayers: 35
+#    weight: 5
+#    duration: 50
+#  - type: VentCrittersRule
+#    entries:
+#    - id: MobMouse
+#      prob: 0.015
+#    - id: MobMouse1
+#      prob: 0.015
+#    - id: MobMouse2
+#      prob: 0.015
+#    - id: MobRatServant
+#      prob: 0.015
+#    specialEntries:
+#    - id: SpawnPointGhostRatKing
+#      prob: 0.005
 
 - type: entity
   id: PowerGridCheck
@@ -267,15 +267,13 @@
   - type: VentCrittersRule
     entries:
     - id: MobMouse
-      prob: 0.02
+      prob: 0.01
     - id: MobMouse1
-      prob: 0.02
+      prob: 0.01
     - id: MobMouse2
-      amount: 4
-      maxAmount: 12
+      prob: 0.01
     - id: MobPibbleVent
-      amount: 2
-      maxAmount: 6
+      prob: 0.005
 
 - type: entity
   id: MothroachesSpawn
@@ -290,8 +288,7 @@
   - type: VentCrittersRule
     entries:
     - id: MobMothroach
-      amount: 2
-      maxAmount: 6
+      prob: 0.02
 
 - type: entity
   id: SlimesSpawn