Skip to content

Rifle tweaks & fixes #477

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

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

Rifle tweaks & fixes #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3adab56
Rifle fixes
Fishpoker Mar 26, 2024
1fab4f2
Merge branch 'master' into Gangshit13
Fishpoker Mar 27, 2024
0e1fc35
Update rifle.dm
Fishpoker Mar 27, 2024
d7a0574
icons being tricky
Fishpoker Mar 27, 2024
818ff0f
Update automatic.dm
Fishpoker Mar 31, 2024
6a16191
u
Fishpoker Mar 31, 2024
cdc0158
Update rifle.dm
Fishpoker Apr 1, 2024
9396441
Merge branch 'master' into Gangshit13
Fishpoker Apr 1, 2024
78f9ad1
Merge branch 'master' into Gangshit13
Fishpoker Apr 5, 2024
2d0ad41
Merge branch 'master' into Gangshit13
Fishpoker Apr 11, 2024
7304b91
Merge branch 'master' into Gangshit13
xTrainx Apr 13, 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
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/external/sniper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "Anti-materiel rifle magazine (.50)"
icon = 'icons/fallout/objects/guns/ammo.dmi'
icon_state = "50mag"
max_ammo = 8
max_ammo = 5
ammo_type = /obj/item/ammo_casing/a50MG
caliber = "a50MG"
multiple_sprites = 2
Expand Down
12 changes: 6 additions & 6 deletions code/modules/projectiles/guns/ballistic/automatic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
fire_delay = 3.5
burst_size = 1
spread = 0
extra_damage = 20
extra_damage = 25
extra_speed = 500
can_bayonet = FALSE
semi_auto = TRUE
Expand Down Expand Up @@ -882,11 +882,11 @@
force = 20
mag_type = /obj/item/ammo_box/magazine/m556/rifle/small
init_mag_type = /obj/item/ammo_box/magazine/m556/rifle/small
extra_damage = 33
extra_damage = 30
extra_penetration = 0.2
extra_speed = 500
extra_speed = 600
burst_size = 1
fire_delay = 4
fire_delay = 3
slowdown = 0.4
spread = 1
automatic_burst_overlay = FALSE
Expand Down Expand Up @@ -1028,7 +1028,7 @@
burst_size = 1
extra_speed = 800
extra_penetration = 0.2
extra_damage = 35
extra_damage = 40
slowdown = 0.4
zoom_amt = 10
zoom_out_amt = 13
Expand Down Expand Up @@ -1063,7 +1063,7 @@
/obj/item/gun/ballistic/automatic/marksman/sniper/sniperranger
name = "compact sniper rifle"
desc = "A DKS 501, chambered in .308 Winchester. With a light polymer body, it's suited for long treks through the desert. This particular model is lighter and faster."
slowdown = 0.4
slowdown = 0.35
fire_delay = 6

//////////////////
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/guns/ballistic/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,12 +305,12 @@
item_state = "amr"
mag_type = /obj/item/ammo_box/magazine/amr
fire_delay = 12 //Heavy round, tiny bit slower
extra_damage = 37
extra_damage = 50
extra_penetration = 1
recoil = 1
spread = 0
force = 10 //Big clumsy and sensitive scope, makes for a poor club
slowdown = 0.2
slowdown = 0.7
zoomable = TRUE
zoom_amt = 10
zoom_out_amt = 13
Expand Down