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.

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

Serene Outdoors Model 23 Woodsman Rifle #4083

Merged
merged 4 commits into from
Feb 2, 2025
Merged
Show file tree
Hide file tree
Changes from 3 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
5 changes: 5 additions & 0 deletions code/game/objects/items/storage/filled_guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@
gun_type = /obj/item/gun/ballistic/automatic/m15
mag_type = /obj/item/ammo_box/magazine/m15

/obj/item/storage/guncase/woodsman
gun_type = /obj/item/gun/ballistic/automatic/marksman/woodsman
mag_type = /obj/item/ammo_box/magazine/m23
mag_count = 3

/obj/item/storage/guncase/buckmaster
gun_type = /obj/item/gun/ballistic/shotgun/automatic/m11

Expand Down
7 changes: 7 additions & 0 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,13 @@
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/gun/woodsman
name = "Model 23 'Woodsman' Hunting Rifle"
desc = "Contains a semi-automatic hunting rifle chambered in 8x50mmR and produced by Serene Outdoors. Come with three magazines with a 5-round capacity."
cost = 3500
contains = list(/obj/item/storage/guncase/woodsman)
crate_name = "hunting rifle crate"

/datum/supply_pack/gun/vickland
name = "Vickland Battle Rifle"
desc = "Contains a high-powered semi-automatic battle rifle chambered in .308 and produced by Hunter's Pride. Fed via stripper clips with a 10 round capacity."
Expand Down
12 changes: 12 additions & 0 deletions code/modules/cargo/packs/magazines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@
contains = list(/obj/item/ammo_box/magazine/m15/empty)
cost = 300

/datum/supply_pack/magazine/woodsman_mag
name = "Woodsman Magazine Crate"
desc = "Contains an 8x50mmR magazine for the Woodsman Rifle, with a capacity of five rounds."
contains = list(/obj/item/ammo_box/magazine/m23/empty)
cost = 200

/datum/supply_pack/magazine/woodsman_mag
name = "Woodsman Magazine Crate"
desc = "Contains an 8x50mmR magazine for the Woodsman Rifle, with a capacity of ten rounds."
contains = list(/obj/item/ammo_box/magazine/m23/extended/empty)
cost = 500

/datum/supply_pack/magazine/m20_auto_elite
name = "Auto Elite Magazine Crate"
desc = "Contains a .44 Roumain magazine for the Auto Elite pistol, with a capacity of ten rounds."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,91 @@ EMPTY_GUN_HELPER(automatic/m12_sporter)

EMPTY_GUN_HELPER(automatic/m12_sporter/mod)

/* woodsman */

/obj/item/gun/ballistic/automatic/marksman/woodsman
name = "Model 23 Woodsman"
desc = "A large semi-automatic hunting rifle manufactured by Serene Outdoors. Its powerful cartridge, excellent ergonomics and ease of use make it highly popular for hunting big game Chambered in 8x50mmR."

icon = 'icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi'
lefthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi'
righthand_file = 'icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi'
mob_overlay_icon = 'icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi'
icon_state = "woodsman"
item_state = "woodsman"

default_ammo_type = /obj/item/ammo_box/magazine/m23
allowed_ammo_types = list(
/obj/item/ammo_box/magazine/m23,
)

unique_mag_sprites_for_variants = TRUE

fire_sound = 'sound/weapons/gun/rifle/ssg669c.ogg'

manufacturer = MANUFACTURER_SERENE
show_magazine_on_sprite = TRUE

bolt_type = BOLT_TYPE_LOCKING

slot_flags = ITEM_SLOT_BACK

w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_MEDIUM

slot_flags = ITEM_SLOT_BACK

spread = -4
spread_unwielded = 20
recoil = 1.25
recoil_unwielded = 6
fire_delay = 0.75 SECONDS
wield_delay = 1.15 SECONDS //a little longer and less wieldy than other DMRs

can_be_sawn_off = FALSE

valid_attachments = SERENE_ATTACHMENTS
slot_available = list(
ATTACHMENT_SLOT_MUZZLE = 1,
ATTACHMENT_SLOT_RAIL = 1
)

slot_offsets = list(
ATTACHMENT_SLOT_MUZZLE = list(
"x" = 48,
"y" = 20,
),
ATTACHMENT_SLOT_RAIL = list(
"x" = 32,
"y" = 18,
)
)

EMPTY_GUN_HELPER(automatic/marksman/woodsman)

/obj/item/ammo_box/magazine/m23
name = "Model 23 magazine (8x50mmR)"
desc = "A 5-round magazine for the Model 23 \"Woodsman\". These rounds do high damage, with excellent armor penetration."
icon_state = "woodsman_mag-1"
base_icon_state = "woodsman_mag"
ammo_type = /obj/item/ammo_casing/a8_50r
caliber = "8x50mmR"
max_ammo = 5
multiple_sprites = AMMO_BOX_FULL_EMPTY

/obj/item/ammo_box/magazine/m23/empty
start_empty = TRUE

/obj/item/ammo_box/magazine/m23/extended
name = "Model 23 Extended Magazine (8x50mmR)"
desc = "A 10-round magazine for the Model 23 \"Woodsman\". These rounds do high damage, with excellent armor penetration."
icon_state = "woodsman_extended-1"
base_icon_state = "woodsman_extended"
max_ammo = 10

/obj/item/ammo_box/magazine/m23/extended/empty
start_empty = TRUE

/* super soaker */

/obj/item/gun/ballistic/automatic/m15
Expand Down
Binary file modified icons/obj/ammunition/ammo.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/serene_outdoors/48x32.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/serene_outdoors/lefthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/serene_outdoors/onmob.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/serene_outdoors/righthand.dmi
Binary file not shown.
Loading