Merge branch 'master' into ConsFix

2024-12-25 15:29:39 +03:00
parent ed94656d6d eef5c09a18
commit 674a1cb140
5 changed files with 38 additions and 23 deletions
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -260,7 +260,7 @@
        startingItem: MagazinePistolRubber
        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
-        priority: 2
+        priority: 4
        whitelist:
          tags:
            - MagazinePistol
--- a/Resources/Prototypes/_White/event_prototypes.yml
+++ b/Resources/Prototypes/_White/event_prototypes.yml
@@ -5,7 +5,7 @@
  components:
    - type: StationEvent
      weight: 0
-      duration: 20
+      duration: 30
    - type: ERTRecruitmentRule
      minPlayer: 4
      earliestStart: 30