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

Upp machine gun #2650

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Upp machine gun #2650

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89cbf25
enter
anders0n9 Mar 3, 2025
0d51bc8
Fix MachineGun
anders0n9 Mar 3, 2025
8b4e4db
Fix SG
anders0n9 Mar 3, 2025
deb285d
Merge branch 'SerbiaStrong-220:master' into UppMachineGun
anders0n9 Mar 6, 2025
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
34 changes: 17 additions & 17 deletions Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
- suitStorage
- type: AmmoCounter
- type: Gun
minAngle: 2
maxAngle: 16
fireRate: 8
minAngle: 11 #220 SG Angle Updates
maxAngle: 20 #220 SG Angle Updates
fireRate: 7.5 #220 SG Angle Updates
Comment on lines +24 to +26
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
minAngle: 11 #220 SG Angle Updates
maxAngle: 20 #220 SG Angle Updates
fireRate: 7.5 #220 SG Angle Updates
#220 SG Angle Updates begin
minAngle: 11
maxAngle: 20
fireRate: 7.5
#220 SG Angle Updates end

И по такому образцу все остальные многострочные изменения

burstFireRate: 8
angleIncrease: 3
angleDecay: 16
Expand Down Expand Up @@ -78,7 +78,7 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Gun
fireRate: 10
fireRate: 8 #220 SG Angle Updates
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
- type: MagazineVisuals
Expand All @@ -105,12 +105,12 @@
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -19
maxAngle: -16
minAngle: -2 #220 SG Angle Updates
maxAngle: -13 #220 SG Angle Updates
- type: Gun
minAngle: 21
maxAngle: 32
shotsPerBurst: 5
minAngle: 17 #220 SG Angle Updates
maxAngle: 29 #220 SG Angle Updates
shotsPerBurst: 6 #220 SG Angle Updates
availableModes:
- Burst
- FullAuto
Expand Down Expand Up @@ -143,12 +143,12 @@
- type: Wieldable
unwieldOnUse: false
- type: GunWieldBonus
minAngle: -19
maxAngle: -16
minAngle: -2 #220 SG Angle Updates
maxAngle: -13 #220 SG Angle Updates
- type: Gun
minAngle: 21
maxAngle: 32
fireRate: 6
minAngle: 17 #220 SG Angle Updates
maxAngle: 29 #220 SG Angle Updates
fireRate: 6.5 #220 SG Angle Updates
burstFireRate: 12
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
Expand Down Expand Up @@ -207,9 +207,9 @@
- type: ChamberMagazineAmmoProvider
boltClosed: null
- type: Gun
fireRate: 5.5
minAngle: 1
maxAngle: 6
fireRate: 6.5 #220 SG Angle Updates
minAngle: 17 #220 SG Angle Updates
maxAngle: 27 #220 SG Angle Updates
angleIncrease: 1.5
angleDecay: 6
selectedMode: FullAuto
Expand Down
Loading