Merge remote-tracking branch 'WD-core/master' into upstream-3

2024-11-17 15:00:17 +03:00
parent 6ca57d3a61 cad28080e5
commit 9e2c10ef21
62 changed files with 473 additions and 201 deletions
--- a/Resources/Maps/White/DryDock.yml
+++ b/Resources/Maps/White/DryDock.yml
@@ -18416,7 +18416,7 @@ entities:
    - type: Transform
      pos: 12.8871565,-5.2782454
      parent: 17144
- proto: BoxResinShot
+- proto: BoxRubberShot
  entities:
  - uid: 17282
    components:
@@ -114123,7 +114123,7 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -149.58974,10.572603
      parent: 2
- proto: WeaponResinShotgun
+- proto: WeaponRubberShotgun
  entities:
  - uid: 17280
    components:
--- a/Resources/Maps/White/WhiteMoose.yml
+++ b/Resources/Maps/White/WhiteMoose.yml
@@ -14960,7 +14960,7 @@ entities:
    - type: Transform
      pos: 9.52937,15.355085
      parent: 2
- proto: BoxResinShot
+- proto: BoxRubberShot
  entities:
  - uid: 13214
    components:
@@ -106899,7 +106899,7 @@ entities:
    - type: Physics
      canCollide: False
    - type: InsideEntityStorage
- proto: WeaponResinShotgun
+- proto: WeaponRubberShotgun
  entities:
  - uid: 14524
    components:
--- a/Resources/Maps/White/Whitebox.yml
+++ b/Resources/Maps/White/Whitebox.yml
@@ -22174,7 +22174,7 @@ entities:
    - type: Transform
      pos: 46.48018,-25.706886
      parent: 2
- proto: BoxResinShot
+- proto: BoxRubberShot
  entities:
  - uid: 12481
    components:
@@ -181701,7 +181701,7 @@ entities:
    - type: Transform
      pos: 25.484055,36.464966
      parent: 2
- proto: WeaponResinShotgun
+- proto: WeaponRubberShotgun
  entities:
  - uid: 12477
    components: