Skip to content

Commit

Permalink
initial
Browse files Browse the repository at this point in the history
  • Loading branch information
bearrrrrrrr committed Jan 10, 2024
1 parent a7d2e30 commit 398a0dd
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 0 deletions.
11 changes: 11 additions & 0 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2228,6 +2228,17 @@ Defined in conflicts.dm of the #defines folder.
if("classic")
attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon

/obj/item/attachable/m4ra_barrel/pve
name = "M4RA-R2 muzzle break"
desc = "This isn't supposed to be seperated from the gun, how'd this happen?"
icon_state = "pve_m4ra_barrel"
attach_icon = "pve_m4ra_barrel"
slot = "special"
wield_delay_mod = WIELD_DELAY_NONE
flags_attach_features = NO_FLAGS
melee_mod = 0 //Integrated attachment for visuals, stats handled on main gun.
size_mod = 0

/obj/item/attachable/upp_rpg_breech
name = "HJRA-12 Breech"
desc = "This isn't supposed to be seperated from the gun, how'd this happen?"
Expand Down
44 changes: 44 additions & 0 deletions code/modules/projectiles/guns/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1587,6 +1587,50 @@
/obj/item/weapon/gun/rifle/m4ra/training
current_mag = /obj/item/ammo_magazine/rifle/m4ra/rubber

// pve - kinda weird icon usage, uses urban M4RA sprite w/ custom attachie sprite
/obj/item/weapon/gun/rifle/m4ra/pve
name = "\improper M4RA-R2 battle rifle"
desc = "The M4RA-R2 is a souped-up M4RA, the result of an upgrade program that didn't pan out in huge numbers. Its main attraction is the ability to chamber and fire devastating <b>A19 'hard-slug' tungsten rounds,</b> infamous for their overpenetration abilities. The thicker barrel, of course, also has no issue with non-HV ammo."
desc_lore = "The USMC was not terribly enthusiastic about unproven hand-held plasma weaponry. Before the XM99A was eventually adopted into use, the USMC instead sought out a traditional squad-portable, precision, armor-piercing weapon, and contracted ARMAT to upgrade their M4RA platform to be capable of firing advanced AP rounds. They succeeded- sort of. The R2 is a killer, but also a piece of junk. It kicks hard enough that precision sights simply don't stay zeroed, its oversized muzzle-barrel extends an already long barrel-length, and A19 ammo, already expensive, was driven to absurd highs by the specification of depleted uranium slugs."
icon = 'icons/obj/items/weapons/guns/guns_by_map/urban/guns_obj.dmi'
icon_state = "m4ra"
item_state = "m4ra"
fire_sound = 'sound/weapons/gun_m4ra.ogg'
reload_sound = 'sound/weapons/handling/l42_reload.ogg'
unload_sound = 'sound/weapons/handling/l42_unload.ogg'
current_mag = /obj/item/ammo_magazine/rifle/m4ra
attachable_allowed = list(
/obj/item/attachable/suppressor,
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonet/upp,
/obj/item/attachable/bayonet/co2,
/obj/item/attachable/reddot,
/obj/item/attachable/reflex,
/obj/item/attachable/flashlight,
/obj/item/attachable/extended_barrel,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/bipod,
/obj/item/attachable/verticalgrip,
/obj/item/attachable/angledgrip,
/obj/item/attachable/lasersight,
/obj/item/attachable/scope,
/obj/item/attachable/scope/mini,
/obj/item/attachable/scope/mini_iff,
/obj/item/attachable/flashlight/grip,
)

flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER
wield_delay = WIELD_DELAY_VERY_FAST
aim_slowdown = SLOWDOWN_ADS_QUICK
map_specific_decoration = FALSE

/obj/item/weapon/gun/rifle/m4ra/pve/handle_starting_attachment()
..()
var/obj/item/attachable/m4ra_barrel/pve/integrated = new(src)
integrated.flags_attach_features &= ~ATTACH_REMOVABLE
integrated.Attach(src)
update_attachable(integrated.slot)

//-------------------------------------------------------

//L42A Battle Rifle
Expand Down
Binary file modified icons/obj/items/weapons/guns/attachments/barrel.dmi
Binary file not shown.

0 comments on commit 398a0dd

Please sign in to comment.