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

Adds two new lever action rifles. #3243

Merged
merged 20 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
9 changes: 9 additions & 0 deletions code/game/objects/items/storage/guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@
/obj/item/storage/guncase/winchester/PopulateContents()
new /obj/item/gun/ballistic/shotgun/flamingarrow/no_mag(src)

/obj/item/storage/guncase/conflagration
/obj/item/storage/guncase/conflagration/PopulateContents()
new /obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/no_mag(src)

/obj/item/storage/guncase/absolution
/obj/item/storage/guncase/absolution/PopulateContents()
new /obj/item/gun/ballistic/shotgun/flamingarrow/absolution/no_mag(src)


/obj/item/storage/guncase/skm
/obj/item/storage/guncase/skm/PopulateContents()
new /obj/item/gun/ballistic/automatic/assault/skm/no_mag(src)
Expand Down
14 changes: 14 additions & 0 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@
contains = list(/obj/item/storage/guncase/doublebarrel)
crate_name = "shotguns crate"

/datum/supply_pack/gun/conflagration
name = "Conflagration Lever Action Shotgun Crate"
desc = "For when you need to deal with 6 hooligans and look good doing it. Contains one lever-action shotgun, with a 6 round capacity."
cost = 1500
contains = list(/obj/item/storage/guncase/conflagration)
crate_name = "shotguns crate"

/datum/supply_pack/gun/hellfire_shotgun
name = "Hellfire Shotgun Crate"
desc = "For when you need to deal with 8 hooligans. Contains a pump shotgun, with a 8-round capacity."
Expand All @@ -141,6 +148,13 @@
contains = list(/obj/item/storage/guncase/winchester)
crate_name = "rifle crate"

/datum/supply_pack/gun/absolution
name = "Absolution Lever Action Rifle Crate"
desc = "Contains a powerful lever-action rifle for hunting larger wildlife. Chambered in .357."
cost = 2000
contains = list(/obj/item/storage/guncase/absolution)
crate_name = "shotguns crate"

/datum/supply_pack/gun/illestren
name = "Illestren Rifle Crate"
desc = "Contains an expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds."
Expand Down
12 changes: 12 additions & 0 deletions code/modules/projectiles/boxes_magazines/internal/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@
caliber = ".38"
max_ammo = 12

/obj/item/ammo_box/magazine/internal/shot/winchester/absolution
name = "absolution internal magazine"
ammo_type = /obj/item/ammo_casing/a357
caliber = ".357"
max_ammo = 8

/obj/item/ammo_box/magazine/internal/shot/winchester/conflagration
name = "conflagration internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
caliber = "12ga"
max_ammo = 5

/obj/item/ammo_box/magazine/internal/shot/beacon
name = "beacon internal magazine"
ammo_type = /obj/item/ammo_casing/a4570
Expand Down
64 changes: 64 additions & 0 deletions code/modules/projectiles/guns/ballistic/shotgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,70 @@ EMPTY_GUN_HELPER(shotgun/bulldog/inteq)
item_state = "flamingbolt_sawn"
mob_overlay_state = item_state

/obj/item/gun/ballistic/shotgun/flamingarrow/absolution
name = "HP Absolution"
base_icon_state = "absolution"
icon_state = "absolution"
item_state = "absolution"
fire_sound = 'sound/weapons/gun/revolver/shot.ogg'
desc = "A large lever-action rifle with hand-stamped Hunter's Pride marks on the receiver and an 8 round ammunition capacity. More powerful than the Flaming Arrow, the Absolution is a popular pick for hunting larger fauna like bears and goliaths, especially when a bolt action's slower rate of fire would be a liability. Chambered in .357."
sawn_desc = "A large lever-action rifle, sawn down for portability. It looks much cooler, but you should probably be using a revolver..."
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/absolution

/obj/item/gun/ballistic/shotgun/flamingarrow/absolution/sawoff(mob/user)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
tube.max_ammo = 8

item_state = "illestren_sawn"
mob_overlay_state = item_state
weapon_weight = WEAPON_MEDIUM

wield_slowdown = 0.25
wield_delay = 0.2 SECONDS

spread = 4
spread_unwielded = 12

recoil = 0
recoil_unwielded = 3

/obj/item/gun/ballistic/shotgun/flamingarrow/absolution/no_mag
spawnwithmagazine = FALSE

/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration
name = "HP Conflagration"
base_icon_state = "conflagration"
icon_state = "conflagration"
item_state = "conflagration"
fire_sound = 'sound/weapons/gun/shotgun/shot.ogg'
desc = "A lightweight lever-action shotgun with a 5 round ammunition capacity. The lever action allows it to be cycled quickly and acurrately. In theory, you could ever operate it one-handed. Chambered in 12g."
sawn_desc = "A lever action shotgun that's been sawed down for portability. The recoil makes it mostly useless outside of point-blank range, but it hits hard for its size and, more importantly, can be flipped around stylishly."
mag_type = /obj/item/ammo_box/magazine/internal/shot/winchester/conflagration

/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/sawoff(mob/user)
. = ..()
if(.)
var/obj/item/ammo_box/magazine/internal/tube = magazine
tube.max_ammo = 5

item_state = "beacon_factory_sawn"
mob_overlay_state = item_state
weapon_weight = WEAPON_MEDIUM

wield_slowdown = 0.25
wield_delay = 0.2 SECONDS

spread = 4
spread_unwielded = 12

recoil = 0
recoil_unwielded = 3

/obj/item/gun/ballistic/shotgun/flamingarrow/conflagration/no_mag
spawnwithmagazine = FALSE

//Elephant Gun
/obj/item/gun/ballistic/shotgun/doublebarrel/twobore
name = "HP Huntsman"
Expand Down
Binary file modified icons/obj/guns/manufacturer/hunterspride/48x32.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/hunterspride/lefthand.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/hunterspride/onmob.dmi
Binary file not shown.
Binary file modified icons/obj/guns/manufacturer/hunterspride/righthand.dmi
Binary file not shown.
Loading