Skip to content

Commit

Permalink
Adds two new lever action rifles. (#3243)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds the Absolution Lever Action Rifle, chambered in 357, and
Conflagration Lever Action Shotgun. Pictured below.

![imagen](https://github.com/user-attachments/assets/5294ed7e-5d64-44dd-90b9-10d14a19e58b)

![imagen](https://github.com/user-attachments/assets/dcffaaca-ce82-48eb-b2fa-423204542f22)

![imagen](https://github.com/user-attachments/assets/62b9fdd1-f0f7-4a7b-977a-1da4362690ba)

Spriting by RyeRice, Names by Valorium, Descriptions by Apogee, and
coding by me!!

## Why It's Good For The Game
Upgrades to the .38 lever action rifle that provide a nice variety, with
the lever-action shotgun being an inbetween of a double-barrel and pump
action shotgun and the 357 being more expensive and with a smaller ammo
capacity but with a lot more power.
## Changelog

:cl:
add: To-do once i get the proper names and all
/:cl:

---------

Signed-off-by: Martinpachu <[email protected]>
Co-authored-by: Theos <[email protected]>
  • Loading branch information
Martinpachu and SomeguyManperson authored Sep 6, 2024
1 parent 5bd9ed5 commit 103479c
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 0 deletions.
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.

0 comments on commit 103479c

Please sign in to comment.