diff --git a/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm b/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm index 53b7ca2089a1..a44b87602526 100644 --- a/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm +++ b/modular_darkpack/modules/cargo/code/supply_packs/weapons.dm @@ -193,6 +193,20 @@ contains = list(/obj/item/gun/ballistic/automatic/darkpack/aug, /obj/item/ammo_box/magazine/darkpackaug) crate_name = "weapon crate" +/datum/supply_pack/weapons/weaponfal + name = "Weapon (Battle Rifle)" + desc = "Contains an 7.62 battle rifle." + cost = 4000 + contains = list(/obj/item/gun/ballistic/automatic/darkpack/fal, /obj/item/ammo_box/magazine/darkpack762x51fal) + crate_name = "weapon crate" + +/datum/supply_pack/weapons/weaponfalauto + name = "Weapon (Military Battle Rifle)" + desc = "Contains an Military 7.62 battle rifle." + cost = 4500 + contains = list(/obj/item/gun/ballistic/automatic/darkpack/fal/automatic, /obj/item/ammo_box/magazine/darkpack762x51fal) + crate_name = "weapon crate" + /datum/supply_pack/weapons/musket name = "Weapon (antique musket)" desc = "Contains a .75 caliber antique musket." @@ -317,11 +331,11 @@ cost = 1000 contains = list(/obj/item/ammo_box/darkpack/c50ae, /obj/item/ammo_box/darkpack/c50ae) -/datum/supply_pack/weapons/ammo556 - name = "Ammo (5.56)" - desc = "Contains a box of 5.56 ammunition." +/datum/supply_pack/weapons/ammo762 + name = "Ammo (7.62)" + desc = "Contains a box of 7.62 ammunition." cost = 1500 - contains = list(/obj/item/ammo_box/darkpack/c556) + contains = list(/obj/item/ammo_box/darkpack/c762x51mm, /obj/item/ammo_box/darkpack/c762x51mm) crate_name = "ammo crate" /datum/supply_pack/weapons/ammo556/incendiart @@ -422,6 +436,13 @@ contains = list(/obj/item/ammo_box/magazine/darkpackaug, /obj/item/ammo_box/magazine/darkpackaug, /obj/item/ammo_box/magazine/darkpackaug) crate_name = "ammo crate" +/datum/supply_pack/weapons/magazine_fal + name = "Ammo (2x battle rifle magazine)" + desc = "Contains two battle rifle magazines." + cost = 300 + contains = list(/obj/item/ammo_box/magazine/darkpack762x51fal, /obj/item/ammo_box/magazine/darkpack762x51fal) + crate_name = "ammo crate" + /datum/supply_pack/weapons/magazine_thompson name = "Ammo (3x Thompson magazine)" desc = "Contains three Thompson magazines." diff --git a/modular_darkpack/modules/deprecated/icons/48x32.dmi b/modular_darkpack/modules/deprecated/icons/48x32.dmi index f0fc8cd335f8..2b107f0c3371 100644 Binary files a/modular_darkpack/modules/deprecated/icons/48x32.dmi and b/modular_darkpack/modules/deprecated/icons/48x32.dmi differ diff --git a/modular_darkpack/modules/deprecated/icons/lefthand.dmi b/modular_darkpack/modules/deprecated/icons/lefthand.dmi index 0742a8ca9703..32d00c709b0b 100644 Binary files a/modular_darkpack/modules/deprecated/icons/lefthand.dmi and b/modular_darkpack/modules/deprecated/icons/lefthand.dmi differ diff --git a/modular_darkpack/modules/deprecated/icons/righthand.dmi b/modular_darkpack/modules/deprecated/icons/righthand.dmi index acebd3761e61..f25b9919871d 100644 Binary files a/modular_darkpack/modules/deprecated/icons/righthand.dmi and b/modular_darkpack/modules/deprecated/icons/righthand.dmi differ diff --git a/modular_darkpack/modules/weapons/code/guns.dm b/modular_darkpack/modules/weapons/code/guns.dm index e3082d9c0b36..b86d05fac936 100644 --- a/modular_darkpack/modules/weapons/code/guns.dm +++ b/modular_darkpack/modules/weapons/code/guns.dm @@ -576,6 +576,50 @@ . = ..() AddComponent(/datum/component/automatic_fire, rof) +/obj/item/ammo_box/magazine/darkpack762x51fal + name = "battle rifle magazine (7.62x51mm)" + icon = 'modular_darkpack/modules/weapons/icons/ammo.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi') + icon_state = "308mag" + ammo_type = /obj/item/ammo_casing/vampire/c762x51mm + caliber = CALIBER_762NATO + max_ammo = 20 + multiple_sprites = AMMO_BOX_FULL_EMPTY + +/obj/item/gun/ballistic/automatic/darkpack/fal + name = "battle rifle" + desc = "A hard hitting rifle firing a full power 7.62 cartridge." + icon = 'modular_darkpack/modules/deprecated/icons/48x32.dmi' + ONFLOOR_ICON_HELPER('modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi') + icon_state = "fal" + inhand_icon_state = "fal" + worn_icon_state = "fal" + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM + accepted_magazine_type = /obj/item/ammo_box/magazine/darkpack762x51fal + burst_size = 1 + fire_delay = 3 + spread = 2 + recoil = 5 + bolt_type = BOLT_TYPE_LOCKING + show_bolt_icon = FALSE + mag_display = TRUE + fire_sound = 'modular_darkpack/modules/deprecated/sounds/sniper.ogg' + masquerade_violating = FALSE + serial_type = "BR" + +/obj/item/gun/ballistic/automatic/darkpack/fal/automatic + name = "military battle rifle" + desc = "A hard hitting rifle firing a full power 7.62 cartridge. This one is a military variant capable of automatic fire." + icon_state = "falgreen" + inhand_icon_state = "falgreen" + worn_icon_state = "falgreen" + var/rof = 0.2 SECONDS //300 RPM + +/obj/item/gun/ballistic/automatic/darkpack/fal/automatic/Initialize(mapload) + . = ..() + AddComponent(/datum/component/automatic_fire, rof) + /obj/item/ammo_box/magazine/internal/darkpack/lever name = "lever action internal magazine" ammo_type = /obj/item/ammo_casing/vampire/c44 diff --git a/modular_darkpack/modules/weapons/icons/ammo.dmi b/modular_darkpack/modules/weapons/icons/ammo.dmi index f54c21132d31..e22b82326477 100644 Binary files a/modular_darkpack/modules/weapons/icons/ammo.dmi and b/modular_darkpack/modules/weapons/icons/ammo.dmi differ diff --git a/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi b/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi index f6c5ed5b3374..30e1bb5db536 100644 Binary files a/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi and b/modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi differ diff --git a/modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi b/modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi index 9c510c38e770..3419db9cabf0 100644 Binary files a/modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi and b/modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi differ diff --git a/modular_darkpack/modules/weapons/icons/worn_guns.dmi b/modular_darkpack/modules/weapons/icons/worn_guns.dmi index 774ddf0b3f2c..389bd0df1c78 100644 Binary files a/modular_darkpack/modules/weapons/icons/worn_guns.dmi and b/modular_darkpack/modules/weapons/icons/worn_guns.dmi differ