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.

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

Большой Ребаланс Огнестрела #1280

Merged
merged 15 commits into from
Feb 5, 2025
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ntuplink-equip-riotlasershield-name = riot laser shield
ntuplink-equip-riotbulletshield-name = riot bullet shield
ntuplink-equip-telescopicshield-name = telescopic shield
ntuplink-engineering-powercellnt-name = PowerCell NanoTrasen
ntuplink-gun-bundlewt550-name = Bundle WT550
ntuplink-gun-bundlemp5-name = Bundle Mp5
ntuplink-gun-bundlemp7-name = Bundle Mp7
ntuplink-gun-bundlelecter-name = Bundle Lecter
ntuplink-gun-bundlep90-name = Bundle P-90
ntuplink-gun-bundleams42-name = Bundle AMS-42
Expand All @@ -27,4 +27,4 @@ ntuplink-gun-bundlebr64-name = Bundle BR-64
ntuplink-gun-bundlezauer-name = Bundle Zauer
ntuplink-gun-bundlehristov-name = Bundle Hristov
ntuplink-gun-bundlexm1014-name = Bundle XM1014
ntuplink-gun-bundlelaw12-name = Bundle Law-12
ntuplink-gun-bundlelaw12-name = Bundle Law-12
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ ntuplink-equip-riotbulletshield-name = противопульный щит
ntuplink-equip-telescopicshield-name = телескопический щит
ntuplink-engineering-powercellnt-name = Батарея НаноТрейзен
ntuplink-engineering-powercellnt-desc = Высокотехнологичная батарея НаноТрейзен, имеет огромный запас в двое больший чем запас высокоёмкой батареи а так же имеет защитное покрытие от ЭМИ воздействия.
ntuplink-gun-bundlewt550-name = Набор WT550
ntuplink-gun-bundlemp5-name = Набор MP-5
ntuplink-gun-bundlemp7-name = Набор MP-7
ntuplink-gun-bundlelecter-name = Набор Lecter
ntuplink-gun-bundlep90-name = Набор P-90
ntuplink-gun-bundleams42-name = Набор AMS-42
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@
- id: ClothingOuterHardsuitSecurity
- id: ClothingMaskBreath
- id: ClothingShoesBootsMagSec # Sunrise-edit
prob: 0.75
- type: AccessReader
access: [["Security"]]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
sprite: Objects/Specific/Mech/mecha_equipment.rsi
state: mecha_antimatrifle
- type: Gun
fireRate: 1.25
fireRate: 0.75
selectedMode: FullAuto
availableModes:
- FullAuto
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Gun
fireRate: 2.2 #Sunrise-Edit
fireRate: 2.25 #Sunrise-Edit
- type: RevolverAmmoProvider
capacity: 5
chambers: [ True, True, True, True, True ]
Expand Down Expand Up @@ -137,7 +137,7 @@
sprite: Objects/Weapons/Guns/Revolvers/python.rsi
- type: Gun
selectedMode: SemiAuto
fireRate: 2.6 #Sunrise-Edit
fireRate: 2.5 #Sunrise-Edit
availableModes:
- SemiAuto
soundGunshot:
Expand Down Expand Up @@ -169,7 +169,7 @@
- type: Clothing
sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
- type: Gun
fireRate: 1.7 #Sunrise-Edit
fireRate: 1.75 #Sunrise-Edit
- type: ContainerContainer
containers:
revolver-ammo: !type:Container
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,27 @@
id: ClothingBackpackDuffelWeaponSubMachineGunMP5Filled
parent: ClothingBackpackDuffelMilitary
name: Bundle MP5
description: MP5 with 2 raspy magazines.
description: MP5 with 4 raspy magazines.
components:
- type: StorageFill
contents:
- id: WeaponSubMachineGunMP5
- id: MagazineMP5
amount: 1
- id: MagazineMP5Extended
amount: 1
amount: 4

- type: entity
id: ClothingBackpackDuffelWeaponSubMachineGunMP7Filled
parent: ClothingBackpackDuffelMilitary
name: Bundle MP7
description: MP7 with 4 raspy magazines.
components:
- type: StorageFill
contents:
- id: WeaponSubMachineGunMP7
- id: MagazinePistolSubMachineGun
amount: 4

#- type: entity
# id: ClothingBackpackDuffelWeaponRifleLecterFilled
Expand All @@ -41,37 +53,37 @@
id: ClothingBackpackDuffelWeaponSubMachineGunP90Filled
parent: ClothingBackpackDuffelMilitary
name: Bundle p90
description: P-90 with 2 raspy magazines.
description: P-90 with 3 raspy magazines.
components:
- type: StorageFill
contents:
- id: WeaponSubMachineGunP90
- id: MagazineP90
amount: 2
amount: 3

- type: entity
id: ClothingBackpackDuffelWeaponAMS42Filled
parent: ClothingBackpackDuffelMilitary
name: Bundle ams42
description: AMS-42 with 3 raspy magazines.
description: AMS-42 with 4 raspy magazines.
components:
- type: StorageFill
contents:
- id: WeaponAMS-42
- id: MagazineRifle
amount: 3
amount: 4

- type: entity
id: ClothingBackpackDuffelWeaponRifleG36Filled
parent: ClothingBackpackDuffelMilitary
name: Bundle G36
description: G36 with 2 raspy magazines.
description: G36 with 4 raspy magazines.
components:
- type: StorageFill
contents:
- id: WeaponRifleG36
- id: MagazineG36Extended
amount: 2
amount: 4

- type: entity
id: ClothingBackpackDuffelWeaponShotgunZauerFilled
Expand Down Expand Up @@ -121,17 +133,17 @@
- id: MagazineBR64Extended
amount: 2

- type: entity
id: ClothingBackpackDuffelWeaponLightMachineGunMG42
parent: ClothingBackpackDuffelMilitary
name: Bundle mg342
description: MG-342 with 2 raspy magazines.
components:
- type: StorageFill
contents:
- id: WeaponMachineGunMG42
- id: MagazineMachineGunMG42
amount: 2
#- type: entity
# id: ClothingBackpackDuffelWeaponLightMachineGunMG42
# parent: ClothingBackpackDuffelMilitary
# name: Bundle mg342
# description: MG-342 with 2 raspy magazines.
# components:
# - type: StorageFill
# contents:
# - id: WeaponMachineGunMG42
# - id: MagazineMachineGunMG42
# amount: 2

- type: entity
id: ClothingBackpackDuffelWeaponSniperHristovFilled
Expand All @@ -157,7 +169,9 @@
- id: MedkitCombatFilled
amount: 3
- id: Tourniquet
amount: 4
amount: 2
- id: MedipenCombatInjector
amount: 2
- id: CombatMedipen
amount: 4
- id: PunctAutoInjector
Expand Down
Loading
Loading