Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 25 additions & 4 deletions modular_darkpack/modules/cargo/code/supply_packs/weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down
Binary file modified modular_darkpack/modules/deprecated/icons/48x32.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/deprecated/icons/lefthand.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/deprecated/icons/righthand.dmi
Binary file not shown.
44 changes: 44 additions & 0 deletions modular_darkpack/modules/weapons/code/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified modular_darkpack/modules/weapons/icons/ammo.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/weapons/icons/ammo_onfloor.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/weapons/icons/weapons_onfloor.dmi
Binary file not shown.
Binary file modified modular_darkpack/modules/weapons/icons/worn_guns.dmi
Binary file not shown.
Loading