cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

DMRs now have rifled barrels (#17743)

Browse Source 
* rifling added

* renames default_spread
This commit is contained in:
Skrem_7
2023-02-04 08:52:56 -05:00
committed by GitHub
parent 3e5cd3fcdd
commit 73e835d675
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/gun.dm
View File

@@ -43,7 +43,7 @@
var/semicd = 0 //cooldown handler
var/weapon_weight = WEAPON_LIGHT
var/spread = 5 //Spread induced by the gun itself. SEE LINE BELOW.
var/default_spread = 5 //MUST be equal to the value above; used to calculate adjustments for if semi-auto is used on a burst weapon.
var/semi_auto_spread = 5 //Equal to the value above by default. The spread that a weapon will have if it is switched to semi-auto from a burst-fire mode.
var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'

7
code/modules/projectiles/guns/ballistic/automatic.dm
View File

@@ -42,7 +42,7 @@
/obj/item/gun/ballistic/automatic/proc/burst_select()
var/mob/living/carbon/human/user = usr
var/spread_difference = initial(spread) - default_spread //Set this way so laser sights work properly. Default value of 0
var/spread_difference = initial(spread) - semi_auto_spread //Set this way so laser sights work properly. Default value of 0
select = !select
if(!select)
burst_size = 1
@@ -170,7 +170,7 @@
/obj/item/gun/ballistic/automatic/m90/burst_select()
var/mob/living/carbon/human/user = usr
var/spread_difference = initial(spread) - default_spread //It shouldn't need this but just in case someone decides to nerf the M90-gl's accuracy for whatever reason
var/spread_difference = initial(spread) - semi_auto_spread //It shouldn't need this but just in case someone decides to nerf the M90-gl's accuracy for whatever reason
switch(select)
if(0)
select = 1
@@ -313,6 +313,7 @@
mag_type = /obj/item/ammo_box/magazine/m308
fire_delay = 6
burst_size = 1
spread = 2 //Marksman rifle == accurate?
can_suppress = FALSE
can_bayonet = TRUE
knife_x_offset = 27
@@ -340,6 +341,7 @@
mag_type = /obj/item/ammo_box/magazine/ks762
fire_delay = 5 //Can fire slightly faster than the LWT-650
burst_size = 1
spread = 2 //DMR gets to be special
can_suppress = FALSE
zoomable = TRUE
zoom_amt = 5 //Not as significant a scope as the sniper
@@ -371,7 +373,6 @@
fire_delay = 40
burst_size = 1
spread = 0
default_spread = 0 //It's a sniper rifle, it doesn't miss.
w_class = WEIGHT_CLASS_NORMAL
zoomable = TRUE
zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you.