Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

калибры #272

Merged
merged 4 commits into from
Aug 15, 2024
Merged

калибры #272

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3ee6aa
калибры
pxc1984 Aug 9, 2024
c64b1a3
изменил калибры, добавил пушки на карты
pxc1984 Aug 9, 2024
f63fa6c
Merge branch 'refs/heads/master' into caliberfix
VigersRay Aug 15, 2024
9970491
миграция для пушек
VigersRay Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Resources/Maps/_Sunrise/Nonstations/transit_hub.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20056,7 +20056,7 @@ entities:
rot: -1.5707963267948966 rad
pos: 13.5,12.5
parent: 1
- proto: WeaponLaserCannon
- proto: WeaponEarthGovLaserSniper
entities:
- uid: 106
components:
Expand All @@ -20073,7 +20073,7 @@ entities:
- type: Transform
pos: 8.51783,7.583647
parent: 1
- proto: WeaponRifleLecter
- proto: WeaponRifleFamas
entities:
- uid: 1625
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_Sunrise/Shuttles/cburn_ert_shuttle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ entities:
- type: Transform
pos: 2.5,0.5
parent: 1
- proto: WeaponLaserCannon
- proto: WeaponEarthGovLaserSniper
entities:
- uid: 166
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_Sunrise/Shuttles/emergency_delta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8993,7 +8993,7 @@ entities:
rot: 1.5707963267948966 rad
pos: -17.5,-12.5
parent: 410
- proto: WeaponDisabler
- proto: WeaponEnergyGunMini
entities:
- uid: 438
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_Sunrise/Shuttles/prison.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3050,7 +3050,7 @@ entities:
rot: 3.141592653589793 rad
pos: 4.5,-2.5
parent: 1
- proto: WeaponDisabler
- proto: WeaponEnergyGunMini
entities:
- uid: 419
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/_Sunrise/Shuttles/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3771,7 +3771,7 @@ entities:
- type: Transform
pos: 0.5,-5.5
parent: 44868
- proto: WeaponLaserCarbine
- proto: WeaponEarthGovLaserCarbine
entities:
- uid: 44971
components:
Expand Down
6 changes: 3 additions & 3 deletions Resources/Maps/_Sunrise/Station/box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123179,7 +123179,7 @@ entities:
- type: Transform
pos: -52.5,5.5
parent: 8364
- proto: MagazinePistolSubMachineGunTopMounted
- proto: MagazineM16A4
entities:
- uid: 534
components:
Expand Down Expand Up @@ -169224,7 +169224,7 @@ entities:
- type: Transform
pos: -2.5,38.5
parent: 8364
- proto: WeaponDisabler
- proto: WeaponEnergyGunMini
entities:
- uid: 8819
components:
Expand Down Expand Up @@ -169295,7 +169295,7 @@ entities:
- type: Transform
pos: 21.462696,34.988297
parent: 8364
- proto: WeaponSubMachineGunWt550
- proto: WeaponRifleM16A4
entities:
- uid: 536
components:
Expand Down
10 changes: 5 additions & 5 deletions Resources/Maps/_Sunrise/Station/centcomm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27533,7 +27533,7 @@ entities:
- type: Transform
pos: 6.5,-9.5
parent: 1668
- proto: MagazinePistolSubMachineGunTopMounted
- proto: MagazineM16A4
entities:
- uid: 3896
components:
Expand Down Expand Up @@ -41380,7 +41380,7 @@ entities:
- type: Transform
pos: 24.5,-9.5
parent: 1668
- proto: WeaponDisabler
- proto: WeaponEnergyGunMini
entities:
- uid: 4697
components:
Expand Down Expand Up @@ -41443,7 +41443,7 @@ entities:
- type: Transform
pos: 13.481927,32.663063
parent: 1668
- proto: WeaponRevolverMateba
- proto: WeaponRevolverMatebaNew
entities:
- uid: 1436
components:
Expand All @@ -41465,7 +41465,7 @@ entities:
- type: Transform
pos: 16.628334,30.272438
parent: 1668
- proto: WeaponSniperHristov
- proto: WeaponRifleBR64
entities:
- uid: 3138
components:
Expand All @@ -41479,7 +41479,7 @@ entities:
- type: Transform
pos: 8.51666,29.42835
parent: 1668
- proto: WeaponSubMachineGunWt550
- proto: WeaponRifleM16A4
entities:
- uid: 3895
components:
Expand Down
30 changes: 15 additions & 15 deletions Resources/Maps/_Sunrise/Station/delta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28422,7 +28422,7 @@ entities:
- type: Transform
pos: 56.382652,19.638697
parent: 13307
- proto: BoxMagazinePistolSubMachineGunTopMounted
- proto: MagazineM16A4
entities:
- uid: 1134
components:
Expand Down Expand Up @@ -186179,7 +186179,7 @@ entities:
- type: Transform
pos: 59.5,9.5
parent: 13307
- proto: MagazinePistolSubMachineGunTopMounted
- proto: MagazineM16A4
entities:
- uid: 42206
components:
Expand Down Expand Up @@ -255681,7 +255681,7 @@ entities:
rot: 3.141592653589793 rad
pos: -45.5,8.5
parent: 13307
- proto: WeaponDisabler
- proto: WeaponEnergyGunMini
entities:
- uid: 36099
components:
Expand Down Expand Up @@ -255712,14 +255712,14 @@ entities:
rot: 3.141592653589793 rad
pos: 58.59685,15.98753
parent: 13307
- proto: WeaponLaserCannon
- proto: WeaponEarthGovLaserSniper
entities:
- uid: 42207
components:
- type: Transform
pos: 67.5,9.5
parent: 13307
- proto: WeaponLaserCarbine
- proto: WeaponEarthGovLaserCarbine
entities:
- uid: 38594
components:
Expand Down Expand Up @@ -255760,7 +255760,7 @@ entities:
- type: Transform
pos: 23.562122,59.322018
parent: 13307
- proto: WeaponPistolMk58
- proto: WeaponPistolACP14
entities:
- uid: 276
components:
Expand Down Expand Up @@ -255831,21 +255831,21 @@ entities:
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: WeaponRevolverMateba
- proto: WeaponRevolverMatebaNew
entities:
- uid: 12342
components:
- type: Transform
pos: 36.47151,18.549223
parent: 13307
- proto: WeaponRifleAk
- proto: WeaponAKMSRifle
entities:
- uid: 14080
components:
- type: Transform
pos: 40.57007,17.532423
parent: 13307
- proto: WeaponRifleLecter
- proto: WeaponRifleFamas
entities:
- uid: 1772
components:
Expand All @@ -255862,7 +255862,7 @@ entities:
- type: Transform
pos: 65.497795,9.494064
parent: 13307
- proto: WeaponRifleM90GrenadeLauncher
- proto: WeaponRifleM28
entities:
- uid: 33166
components:
Expand Down Expand Up @@ -255900,7 +255900,7 @@ entities:
- type: Transform
pos: -1.6446036,36.6353
parent: 13307
- proto: WeaponShotgunEnforcer
- proto: WeaponShotgunSPAS12
entities:
- uid: 9964
components:
Expand All @@ -255909,7 +255909,7 @@ entities:
- type: Physics
canCollide: False
- type: InsideEntityStorage
- proto: WeaponShotgunKammerer
- proto: WeaponShotgunTrenchgun4034
entities:
- uid: 2368
components:
Expand All @@ -255926,21 +255926,21 @@ entities:
- type: Transform
pos: 65.5,8.5
parent: 13307
- proto: WeaponSniperHristov
- proto: WeaponRifleBR64
entities:
- uid: 38633
components:
- type: Transform
pos: 70.4,10.5
parent: 13307
- proto: WeaponSubMachineGunDrozd
- proto: WeaponSubMachineGunMP7
entities:
- uid: 38627
components:
- type: Transform
pos: 65.5,7.5
parent: 13307
- proto: WeaponSubMachineGunWt550
- proto: WeaponRifleM16A4
entities:
- uid: 38612
components:
Expand Down
10 changes: 5 additions & 5 deletions Resources/Maps/_Sunrise/Station/fland.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220888,7 +220888,7 @@ entities:
- type: Transform
pos: 35.504837,-33.413353
parent: 13329
- proto: WeaponPistolMk58
- proto: WeaponPistolACP14
entities:
- uid: 10639
components:
Expand All @@ -220905,15 +220905,15 @@ entities:
- type: Transform
pos: 17.56414,13.463523
parent: 13329
- proto: WeaponRifleAk
- proto: WeaponAKMSRifle
entities:
- uid: 10496
components:
- type: Transform
rot: 1.5707963267948966 rad
pos: 35.367424,20.732126
parent: 13329
- proto: WeaponRifleLecter
- proto: WeaponRifleFamas
entities:
- uid: 10666
components:
Expand All @@ -220930,7 +220930,7 @@ entities:
- type: Transform
pos: 19.43914,12.321453
parent: 13329
- proto: WeaponShotgunEnforcer
- proto: WeaponShotgunSPAS12
entities:
- uid: 10632
components:
Expand All @@ -220955,7 +220955,7 @@ entities:
rot: -1.5707963267948966 rad
pos: -39.140755,78.51152
parent: 13329
- proto: WeaponSubMachineGunDrozd
- proto: WeaponSubMachineGunMP7
entities:
- uid: 1348
components:
Expand Down
8 changes: 4 additions & 4 deletions Resources/Maps/_Sunrise/Station/marathon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100165,7 +100165,7 @@ entities:
- type: Transform
pos: -20.370735,-69.56265
parent: 30
- proto: MagazinePistolSubMachineGunTopMounted
- proto: MagazineM16A4
entities:
- uid: 1999
components:
Expand Down Expand Up @@ -138193,7 +138193,7 @@ entities:
parent: 30
- type: Physics
canCollide: False
- proto: WeaponDisabler
- proto: WeaponEnergyGunMini
entities:
- uid: 1563
components:
Expand Down Expand Up @@ -138259,7 +138259,7 @@ entities:
- type: Transform
pos: -38.316597,60.345554
parent: 30
- proto: WeaponShotgunKammerer
- proto: WeaponShotgunTrenchgun4034
entities:
- uid: 1978
components:
Expand All @@ -138285,7 +138285,7 @@ entities:
- type: Transform
pos: -41.445473,54.621906
parent: 30
- proto: WeaponSubMachineGunWt550
- proto: WeaponRifleM16A4
entities:
- uid: 2000
components:
Expand Down
14 changes: 7 additions & 7 deletions Resources/Maps/_Sunrise/Station/origin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142075,7 +142075,7 @@ entities:
- type: Transform
pos: 29.030212,32.493073
parent: 2
- proto: MagazinePistolSubMachineGunTopMounted
- proto: MagazineM16A4
entities:
- uid: 21624
components:
Expand Down Expand Up @@ -198129,7 +198129,7 @@ entities:
- type: Transform
pos: -16.5,-21.5
parent: 2
- proto: WeaponDisabler
- proto: WeaponEnergyGunMini
entities:
- uid: 31158
components:
Expand All @@ -198146,7 +198146,7 @@ entities:
- type: Transform
pos: 12.453639,21.54209
parent: 2
- proto: WeaponLaserCarbine
- proto: WeaponEarthGovLaserCarbine
entities:
- uid: 31161
components:
Expand All @@ -198163,7 +198163,7 @@ entities:
- type: Transform
pos: 27.55704,27.505564
parent: 2
- proto: WeaponPistolMk58
- proto: WeaponPistolACP14
entities:
- uid: 31164
components:
Expand Down Expand Up @@ -198199,7 +198199,7 @@ entities:
- type: Transform
pos: 23.444613,-35.267536
parent: 2
- proto: WeaponShotgunKammerer
- proto: WeaponShotgunTrenchgun4034
entities:
- uid: 31170
components:
Expand All @@ -198216,7 +198216,7 @@ entities:
- type: Transform
pos: 26.709015,32.580257
parent: 2
- proto: WeaponSubMachineGunDrozd
- proto: WeaponSubMachineGunMP7
entities:
- uid: 31173
components:
Expand All @@ -198238,7 +198238,7 @@ entities:
- type: Transform
pos: 28.25588,32.289948
parent: 2
- proto: WeaponSubMachineGunWt550
- proto: WeaponRifleM16A4
entities:
- uid: 31177
components:
Expand Down
Loading
Loading