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

Jump to bottom

Heavy Pulse RIfle Rework #298

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

Heavy Pulse RIfle Rework #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
03aab63
first step, gives HPR FA and makes HT go away from the cases.
Apr 3, 2024
d825fcd
probably working bipod need to debug later
Jun 16, 2024
32fab2e
Merge branch 'master' into heavy-pulse-rifle-buff
KoishiVibe Jun 20, 2024
6350dee
bugsquishing
Jun 22, 2024
72f54fd
more bugfixing
Jun 22, 2024
0036720
Merge remote-tracking branch 'upstream/master' into heavy-pulse-rifle…
Jun 22, 2024
d95812a
makes the magazines fit into backpacks and gen pouches but not the am…
Jun 22, 2024
000537e
maybe nerfed right
KoishiVibe Jun 25, 2024
6feeb1c
new sprites
KoishiVibe Jun 25, 2024
15fd8b4
attachment fix?
KoishiVibe Jun 25, 2024
6638733
ok working now
KoishiVibe Jun 25, 2024
657bd64
Merge remote-tracking branch 'upstream/master' into heavy-pulse-rifle…
KoishiVibe Jun 25, 2024
1dc7ee0
commonalizes the sprites and also improves the sprite. thanks dong!!!
KoishiVibe Jun 25, 2024
3b4e2c1
Merge branch 'master' into heavy-pulse-rifle-buff
KoishiVibe Jun 28, 2024
bf2a6bb
Emergenvy nerf lmao
KoishiVibe Jul 8, 2024
0217d8e
Refactors the machinegun box to be with all the other machineguns. It…
KoishiVibe Jul 8, 2024
53267e4
additional balancing
KoishiVibe Jul 8, 2024
4492278
fuck. Ok, this isn;t a varuiable.
KoishiVibe Jul 8, 2024
37648e6
Merge branch 'master' into heavy-pulse-rifle-buff
KoishiVibe Jul 8, 2024
ff71c36
fixes for damage, ammo type of base magazine. minor flavor text change.
KoishiVibe Jul 9, 2024
b2c1f55
Merge branch 'heavy-pulse-rifle-buff' of https://github.com/KoishiVib…
KoishiVibe Jul 9, 2024
3887650
Merge branch 'PvE-CMSS13:master' into heavy-pulse-rifle-buff
KoishiVibe Jul 9, 2024
793e5d5
see if this makes it more of a proper sidegrade or not
KoishiVibe Aug 14, 2024
8350f46
fuck it this is good enough
KoishiVibe Aug 14, 2024
ae9b7a1
Synchronization
Nov 13, 2024
a477d15
replaces new instances of ammobox
Nov 13, 2024
cf9679f
might break the tac and army variants. will work on those later.
Nov 13, 2024
a04b0d5
ok last change. then i can test and see how it feels.
Nov 13, 2024
e59793c
additional modifications. defines a couple vars.
Nov 13, 2024
0ec6b8b
so that was a fucking lie
Nov 13, 2024
4f21bf8
hopefully fixes issue
Nov 15, 2024
8b30b8d
maybe fixes phantom var?
Nov 15, 2024
1e94bff
Merge branch 'master' into heavy-pulse-rifle-buff
KoishiVibe Nov 15, 2024
6f2ad76
fuck
Nov 15, 2024
af7c3f4
Merge branch 'heavy-pulse-rifle-buff' of https://github.com/KoishiVib…
Nov 15, 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
4 changes: 2 additions & 2 deletions code/datums/emergency_calls/supplies.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
new /obj/item/attachable/stock/tactical(W)
if(6)
new /obj/item/weapon/gun/rifle/lmg(W)
new /obj/item/ammo_magazine/rifle/lmg(W)
new /obj/item/ammo_magazine/rifle/lmg(W)
new /obj/item/ammo_magazine/hpr_box(W)
new /obj/item/ammo_magazine/hpr_box(W)
new /obj/item/attachable/verticalgrip (W)
if(7)
new /obj/item/weapon/gun/rifle/l42a(W)
Expand Down
10 changes: 5 additions & 5 deletions code/datums/supply_packs/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@

/datum/supply_packs/ammo_hpr
contains = list(
/obj/item/ammo_magazine/rifle/lmg,
/obj/item/ammo_magazine/rifle/lmg,
/obj/item/ammo_magazine/hpr_box,
/obj/item/ammo_magazine/hpr_box,
)
name = "M41AE2 HPR Magazines crate (HPR ammo box x2)"
cost = 20
Expand All @@ -297,8 +297,8 @@

/datum/supply_packs/ammo_hpr_holo
contains = list(
/obj/item/ammo_magazine/rifle/lmg/holo_target,
/obj/item/ammo_magazine/rifle/lmg/holo_target,
/obj/item/ammo_magazine/hpr_box/holo_target,
/obj/item/ammo_magazine/hpr_box/holo_target,
)
name = "M41AE2 HPR Holo-Target Magazines crate (HPR HT ammo box x2)"
cost = 20
Expand Down Expand Up @@ -478,7 +478,7 @@
/obj/item/ammo_magazine/rifle/m41aMK1,
/obj/item/ammo_magazine/rifle/m41aMK1/ap,
/obj/item/ammo_magazine/rifle/m4ra,
/obj/item/ammo_magazine/rifle/lmg,
/obj/item/ammo_magazine/hpr_box,
/obj/item/ammo_magazine/pistol,
/obj/item/ammo_magazine/pistol,
/obj/item/ammo_magazine/pistol,
Expand Down
8 changes: 4 additions & 4 deletions code/game/gamemodes/colonialmarines/whiskey_outpost.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,10 @@
if(80 to 82)
crate = new /obj/structure/closet/crate/ammo(T)
choosemax = rand(2, 3)
randomitems = list(/obj/item/ammo_magazine/rifle/lmg/holo_target,
/obj/item/ammo_magazine/rifle/lmg/holo_target,
/obj/item/ammo_magazine/rifle/lmg,
/obj/item/ammo_magazine/rifle/lmg,
randomitems = list(/obj/item/ammo_magazine/hpr_box/holo_target,
/obj/item/ammo_magazine/hpr_box/holo_target,
/obj/item/ammo_magazine/hpr_box,
/obj/item/ammo_magazine/hpr_box,
)

if(83 to 86)
Expand Down
64 changes: 17 additions & 47 deletions code/game/machinery/vending/vendor_types/requisitions.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,55 +269,25 @@
list("SPECIAL AMMUNITION", -1, null, null),
list("M56 DV9 Battery", 4, /obj/item/smartgun_battery, VENDOR_ITEM_REGULAR),
list("M56 Smartgun Drum", 4, /obj/item/ammo_magazine/smartgun, VENDOR_ITEM_REGULAR),
list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR),
list("M44 Marksman Speed Loader (.44)", 6, /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR),
list("M4A3 HP Magazine (9mm)", floor(scale * 2), /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR),
list("M41AE2 Holo Target Rounds (10x24mm)", floor(scale * 2), /obj/item/ammo_magazine/rifle/lmg/holo_target, VENDOR_ITEM_REGULAR),
list("Box Of .458 SOCOM Rounds (.458 SOCOM)", floor(scale * 4), /obj/item/ammo_magazine/lever_action/xm88, VENDOR_ITEM_REGULAR),
list("M44 Heavy Speed Loader (.44)", round(scale * 10.5), /obj/item/ammo_magazine/revolver/heavy, VENDOR_ITEM_REGULAR),
list("M44 Marksman Speed Loader (.44)", round(scale * 5.7), /obj/item/ammo_magazine/revolver/marksman, VENDOR_ITEM_REGULAR),
list("M4A3 HP Magazine (9mm)", round(scale * 2), /obj/item/ammo_magazine/pistol/hp, VENDOR_ITEM_REGULAR),
list("M41AE2 Holo Target Rounds (10x24mm)", round(scale * 2), /obj/item/ammo_magazine/hpr_box/holo_target, VENDOR_ITEM_REGULAR),

list("RESTRICTED FIREARM AMMUNITION", -1, null, null),
list("VP78 Magazine", 11, /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR),
list("SU-6 Smartpistol Magazine (.45)", 13, /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR),
list("M240 Incinerator Tank", floor(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR),
list("M41AE2 Box Magazine (10x24mm)", floor(scale * 3), /obj/item/ammo_magazine/rifle/lmg, VENDOR_ITEM_REGULAR),
list("M41A MK1 Magazine (10x24mm)", 4.5, /obj/item/ammo_magazine/rifle/m41aMK1, VENDOR_ITEM_REGULAR),
list("M41A MK1 AP Magazine (10x24mm)", floor(scale * 2), /obj/item/ammo_magazine/rifle/m41aMK1/ap, VENDOR_ITEM_REGULAR),
list("M56D Drum Magazine", floor(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR),
list("M2C Box Magazine", floor(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR),
list("XM51 Magazine (16g)", floor(scale * 3), /obj/item/ammo_magazine/rifle/xm51, VENDOR_ITEM_REGULAR),

list("MAGAZINE BOXES", -1, null, null),
list("Magazine Box (M39 x 12)", 0, /obj/item/ammo_box/magazine/m39, VENDOR_ITEM_REGULAR),
list("Magazine Box (AP M39 x 12)", 0, /obj/item/ammo_box/magazine/m39/ap, VENDOR_ITEM_REGULAR),
list("Magazine Box (Ext M39 x 10)", 0, /obj/item/ammo_box/magazine/m39/ext, VENDOR_ITEM_REGULAR),
list("Magazine Box (M41A x 10)", 0, /obj/item/ammo_box/magazine, VENDOR_ITEM_REGULAR),
list("Magazine Box (AP M41A x 10)", 0, /obj/item/ammo_box/magazine/ap, VENDOR_ITEM_REGULAR),
list("Magazine Box (Ext M41A x 8)", 0, /obj/item/ammo_box/magazine/ext, VENDOR_ITEM_REGULAR),
list("Magazine Box (M4A3 x 16)", 0, /obj/item/ammo_box/magazine/m4a3, VENDOR_ITEM_REGULAR),
list("Magazine Box (AP M4A3 x 16)", 0, /obj/item/ammo_box/magazine/m4a3/ap, VENDOR_ITEM_REGULAR),
list("Magazine Box (HP M4A3 x 16)", 0, /obj/item/ammo_box/magazine/m4a3/hp, VENDOR_ITEM_REGULAR),
list("Magazine Box (M4RA x 16)", 0, /obj/item/ammo_box/magazine/m4ra, VENDOR_ITEM_REGULAR),
list("Magazine Box (AP M4RA x 16)", 0, /obj/item/ammo_box/magazine/m4ra/ap, VENDOR_ITEM_REGULAR),
list("Magazine Box (M41AE2 x 8)", 0, /obj/item/ammo_box/magazine/m41ae2, VENDOR_ITEM_REGULAR),
list("Magazine Box (M41AE2 Holo-Target x 8)", 0, /obj/item/ammo_box/magazine/m41ae2/holo, VENDOR_ITEM_REGULAR),
list("Magazine Box (M41A MK1 x 10)", 0, /obj/item/ammo_box/magazine/mk1, VENDOR_ITEM_REGULAR),
list("Magazine Box (M41A MK1 AP x 10)", 0, /obj/item/ammo_box/magazine/mk1/ap, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Buckshot x 100)", 0, /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Flechette x 100)", 0, /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Slugs x 100)", 0, /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (16g) (Breaching x 120)", 0, /obj/item/ammo_box/magazine/shotgun/light/breaching, VENDOR_ITEM_REGULAR),
list("Magazine Box (VP70 x 16)", 0, /obj/item/ammo_box/magazine/vp70, VENDOR_ITEM_REGULAR),
list("Magazine Box (SU-6 x 16)", 0, /obj/item/ammo_box/magazine/su6, VENDOR_ITEM_REGULAR),
list("Magazine Box (VP78 x 16)", 0, /obj/item/ammo_box/magazine/vp78, VENDOR_ITEM_REGULAR),
list("Magazine Box (XM51 x 8)", 0, /obj/item/ammo_box/magazine/xm51, VENDOR_ITEM_REGULAR),
list("Rounds Box (.458 SOCOM x 300)", 0, /obj/item/ammo_box/magazine/lever_action/xm88, VENDOR_ITEM_REGULAR),
list("Ammo Box (M2C x 8)", 0, /obj/item/ammo_box/magazine/m2c, VENDOR_ITEM_REGULAR),
list("Drum Box (M56B x 8)", 0, /obj/item/ammo_box/magazine/m56b, VENDOR_ITEM_REGULAR),
list("Drum Box (M56D x 8)", 0, /obj/item/ammo_box/magazine/m56d, VENDOR_ITEM_REGULAR),
list("Speed Loaders Box (M44 x 16)", 0, /obj/item/ammo_box/magazine/m44, VENDOR_ITEM_REGULAR),
list("Speed Loaders Box (Marksman M44 x 16)", 0, /obj/item/ammo_box/magazine/m44/marksman, VENDOR_ITEM_REGULAR),
list("Speed Loaders Box (Heavy M44 x 16)", 0, /obj/item/ammo_box/magazine/m44/heavy, VENDOR_ITEM_REGULAR),
list("Flamer Tank Box (UT-Napthal Fuel x 8)", 0, /obj/item/ammo_box/magazine/flamer, VENDOR_ITEM_REGULAR),
list("VP78 Magazine", round(scale * 11.2), /obj/item/ammo_magazine/pistol/vp78, VENDOR_ITEM_REGULAR),
list("SU-6 Smartpistol Magazine (.45)", round(scale * 12,8), /obj/item/ammo_magazine/pistol/smart, VENDOR_ITEM_REGULAR),
list("M240 Incinerator Tank", round(scale * 3), /obj/item/ammo_magazine/flamer_tank, VENDOR_ITEM_REGULAR),
list("M41AE2 Box Magazine (10x24mm)", round(scale * 3), /obj/item/ammo_magazine/hpr_box, VENDOR_ITEM_REGULAR),
list("M41A MK1 Magazine (10x24mm)", round(scale * 4.5), /obj/item/ammo_magazine/rifle/m41aMK1, VENDOR_ITEM_REGULAR),
list("M41A MK1 AP Magazine (10x24mm)", round(scale * 2), /obj/item/ammo_magazine/rifle/m41aMK1/ap, VENDOR_ITEM_REGULAR),
list("M56D Drum Magazine", round(scale * 2), /obj/item/ammo_magazine/m56d, VENDOR_ITEM_REGULAR),
list("M2C Box Magazine", round(scale * 2), /obj/item/ammo_magazine/m2c, VENDOR_ITEM_REGULAR),

list("SHOTGUN SHELL BOXES", -1, null, null),
list("Shotgun Shell Box (Buckshot x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun/buckshot, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Flechette x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun/flechette, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Box (Slugs x 100)", round(scale * 2), /obj/item/ammo_box/magazine/shotgun, VENDOR_ITEM_REGULAR),
)

/obj/structure/machinery/cm_vending/sorted/cargo_ammo/stock(obj/item/item_to_stock, mob/user)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/belt.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@

/obj/item/storage/belt/marine/m41e2ap/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/rifle/lmg/ap (src)
new /obj/item/ammo_magazine/hpr_box/ap (src)

/obj/item/storage/belt/marine/m39/fill_preset_inventory()
for(var/i = 1 to storage_slots)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/pouch.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@

/obj/item/storage/pouch/magazine/large/pmc_lmg/fill_preset_inventory()
for(var/i = 1 to storage_slots)
new /obj/item/ammo_magazine/rifle/lmg(src)
new /obj/item/ammo_magazine/hpr_box(src)

/obj/item/storage/pouch/magazine/large/pmc_sniper/fill_preset_inventory()
for(var/i = 1 to storage_slots)
Expand Down
12 changes: 6 additions & 6 deletions code/modules/cm_marines/equipment/guncases.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@
//------------
/obj/item/storage/box/guncase/lmg
name = "\improper M41AE2 heavy pulse rifle case"
desc = "A gun case containing a M41AE2 heavy pulse rifle. You can get additional ammunition at requisitions."
storage_slots = 5
can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg)
desc = "A plastic hard weapon case containing the M41AE2 Heavy Pulse Rifle and three magazines."
storage_slots = 4
can_hold = list(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/hpr_box)

/obj/item/storage/box/guncase/lmg/fill_preset_inventory()
new /obj/item/weapon/gun/rifle/lmg(src)
new /obj/item/ammo_magazine/rifle/lmg(src)
new /obj/item/ammo_magazine/rifle/lmg/holo_target(src)
new /obj/item/attachable/flashlight
new /obj/item/ammo_magazine/hpr_box(src)
new /obj/item/ammo_magazine/hpr_box(src)
new /obj/item/ammo_magazine/hpr_box(src)

//------------
/obj/item/storage/box/guncase/m41aMK1
Expand Down
5 changes: 3 additions & 2 deletions code/modules/cm_marines/equipment/kit_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,9 @@

/obj/item/storage/box/kit/heavy_support/fill_preset_inventory()
new /obj/item/weapon/gun/rifle/lmg(src)
new /obj/item/ammo_magazine/rifle/lmg(src)
new /obj/item/ammo_magazine/rifle/lmg/holo_target(src)
new /obj/item/ammo_magazine/hpr_box(src)
new /obj/item/ammo_magazine/hpr_box/holo_target(src)
new /obj/item/attachable/bipod(src)
new /obj/item/stack/folding_barricade/three(src)
new /obj/item/clothing/glasses/welding(src)
new /obj/item/tool/weldingtool(src)
Expand Down
20 changes: 10 additions & 10 deletions code/modules/gear_presets/contractor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@
if(3) // 33%
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/lmg/tactical, WEAR_J_STORE)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/ap, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/ap, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/ap, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/ap, WEAR_IN_BACK)

//*****************************************************************************************************/
/datum/equipment_preset/contractor/duty/engi
Expand Down Expand Up @@ -568,9 +568,9 @@
new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/ap, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/ap, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/ap, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/ap, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/ap, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/ap, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/holobadge/cord, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET)
Expand All @@ -597,8 +597,8 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK)


Expand Down
6 changes: 3 additions & 3 deletions code/modules/gear_presets/other.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3, WEAR_WAIST)
new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
spawn_merc_weapon(new_human,1,6)
spawn_weapon(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/rifle/lmg, new_human, 0, 5) //HPR mini-spec
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/lmg/holo_target, WEAR_IN_BACK)
spawn_weapon(/obj/item/weapon/gun/rifle/lmg, /obj/item/ammo_magazine/hpr_box, new_human, 0, 5) //HPR mini-spec
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/holo_target, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/hpr_box/holo_target, WEAR_IN_BACK)
new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive/C4, WEAR_R_STORE)

/datum/equipment_preset/other/freelancer/standard/proc/load_freelancer_shotgunner(mob/living/carbon/human/new_human)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/ammo_boxes/magazine_boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@
overlay_ammo_type = "_reg_heavy"
overlay_gun_type = "_m41ae2"
overlay_content = "_m41ae2"
magazine_type = /obj/item/ammo_magazine/rifle/lmg
magazine_type = /obj/item/ammo_magazine/hpr_box
num_of_magazines = 8

/obj/item/ammo_box/magazine/m41ae2/empty
Expand All @@ -515,7 +515,7 @@
name = "magazine box (M41AE2 Holo-Target x 8)"
overlay_ammo_type = "_holo_heavy"
overlay_content = "_m41ae2_holo"
magazine_type = /obj/item/ammo_magazine/rifle/lmg/holo_target
magazine_type = /obj/item/ammo_magazine/hpr_box/holo_target

/obj/item/ammo_box/magazine/m41ae2/holo/empty
empty = TRUE
Expand All @@ -524,7 +524,7 @@
name = "magazine box (M41AE2 HEAP x 8)"
overlay_ammo_type = "_heap_heavy"
overlay_content = "_m41ae2_heap"
magazine_type = /obj/item/ammo_magazine/rifle/lmg/heap
magazine_type = /obj/item/ammo_magazine/hpr_box/heap

/obj/item/ammo_box/magazine/m41ae2/heap/empty
empty = TRUE
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/gun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@
accuracy_mult_unwielded += R.accuracy_unwielded_mod
scatter += R.scatter_mod
scatter_unwielded += R.scatter_unwielded_mod
fa_scatter_peak += R.fa_scatter_peak_mod
fa_max_scatter += R.fa_max_scatter_mod
damage_mult += R.damage_mod
velocity_add += R.velocity_mod
damage_falloff_mult += R.damage_falloff_mod
Expand Down
25 changes: 25 additions & 0 deletions code/modules/projectiles/gun_attachables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ Defined in conflicts.dm of the #defines folder.
var/movement_onehanded_acc_penalty_mod = 0 //Modifies accuracy/scatter penalty when firing onehanded while moving.
var/velocity_mod = 0 // Added velocity to bullets
var/hud_offset_mod = 0 //How many pixels to adjust the gun's sprite coords by. Ideally, this should keep the gun approximately centered.
var/fa_scatter_peak_mod = 0 //modifies how many bullets it takes to reach max scatter in FA firing.
var/fa_max_scatter_mod = 0 //modifies maximum scatter in sustained FA

var/activation_sound = 'sound/weapons/handling/gun_underbarrel_activate.ogg'
var/deactivation_sound = 'sound/weapons/handling/gun_underbarrel_deactivate.ogg'
Expand Down Expand Up @@ -3568,6 +3570,9 @@ Defined in conflicts.dm of the #defines folder.
burst_scatter_mod = -SCATTER_AMOUNT_TIER_8
if(istype(gun, /obj/item/weapon/gun/rifle/sniper/M42A))
delay_mod = -FIRE_DELAY_TIER_7
else if(istype(gun,/obj/item/weapon/gun/rifle/lmg))
delay_mod = 0
fa_scatter_peak_mod = FULL_AUTO_SCATTER_PEAK_TIER_3
else
delay_mod = -FIRE_DELAY_TIER_12
gun.recalculate_attachment_bonuses()
Expand Down Expand Up @@ -3620,6 +3625,26 @@ Defined in conflicts.dm of the #defines folder.
return O2
return 0

/obj/item/attachable/bipod/integral
name = "integral bipod"
desc = "An integral bipod for the M41AE2 Heavy Pulse Rifle."
icon_state = "bipod"
attach_icon = "integ_bipod_a"
slot = "under"
size_mod = 0
melee_mod = 0
flags_attach_features = ATTACH_ACTIVATION
attachment_action_type = /datum/action/item_action/toggle

/obj/item/attachable/bipod/integral/New()
..()

delay_mod = 0
wield_delay_mod = WIELD_DELAY_FAST
accuracy_mod = -HIT_ACCURACY_MULT_TIER_5
scatter_mod = -SCATTER_AMOUNT_TIER_9
recoil_mod = RECOIL_AMOUNT_TIER_5
fa_scatter_peak_mod = 15 //fifteen more shots until you hit max scatter
//item actions for handling deployment to full auto.
/datum/action/item_action/bipod/toggle_full_auto_switch/New(Target, obj/item/holder)
. = ..()
Expand Down
Loading
Loading