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

SKM-24u LMG Modification on the Black Market #3871

Merged
merged 4 commits into from
Dec 4, 2024
Merged

SKM-24u LMG Modification on the Black Market #3871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fb96fe
initial commit
firebudgy Dec 3, 2024
af672ad
oops! :)
firebudgy Dec 3, 2024
45e220e
Merge branch 'master' into skm-lmg-blackmarket
firebudgy Dec 3, 2024
cb11696
fix
firebudgy Dec 4, 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
11 changes: 11 additions & 0 deletions code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,3 +425,14 @@
stock_min = 1
stock_max = 5
availability_prob = 10

/datum/blackmarket_item/weapon/skm_lmg
name = "SKM-24u Light Machinegun"
desc = "Your regular rifles not have enough oomph for you? This SKM-24 was converted with help from a 'liberated' CM-40 parts shipment into a light machinegun, ready to blow away whatever you point it at. Increased firerate makes it buck like a mule, so keep that bipod on the ground. Drums sold separately!"
item = /obj/item/gun/ballistic/automatic/hmg/skm_lmg

price_min = 5000
price_max = 7000
stock_max = 2
availability_prob = 15
spawn_weighting = FALSE
16 changes: 16 additions & 0 deletions code/modules/projectiles/guns/ballistic/hmg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,22 @@
else
retract_bipod(user=user)

/obj/item/gun/ballistic/automatic/hmg/calculate_recoil(mob/user, recoil_bonus = 0)
var/total_recoil = recoil_bonus

if(bipod_deployed)
total_recoil += deploy_recoil_bonus

return ..(user, total_recoil)

/obj/item/gun/ballistic/automatic/hmg/calculate_spread(mob/user, bonus_spread)
var/total_spread = bonus_spread

if(bipod_deployed)
total_spread += deploy_spread_bonus

return ..(user, total_spread)

/obj/item/gun/ballistic/automatic/hmg/proc/deploy_bipod(mob/user)
//we check if we can actually deploy the thing
var/can_deploy = TRUE
Expand Down
Loading