Skip to content

Commit

Permalink
Saint Roumain Militia Content Expansion Part 1: The Prelude (#2962)
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
This PR is a start to an upcoming project to give the SRM some more
love.

This adds several weapons locked behind admin spawn as purchasable items
in the outpost console.

- The Contender for 2250 Credits (And 45-70 ammunition boxes for 500
Credits)
- The Scout for 5500 Credits (And .300 Magnum boxes for 500 Credits,
with stripper clips for 750 Credits)
- The Double Barrel Shotgun for 1000 Credits (Cheaper than Hellfire and
Brimstone)
- The Firebrand for 1250 Credits (And .357 Ammo Boxes for 250 Credits
with specialty editions for 500 Credits)
- The .38 Derringer for 350 Credits

This PR also granularizes disposable guns and makes them 150 credits per
unit.

Finally, this PR removes the Scarborough Revolver as a purchasable
weapon in the outpost store, being now replaced by the Firebrand. Gorlex
and Syndicate captains still have it for the foreseeable future!

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Considering how a lot of content the SRM has is currently locked in
Admin Hell, hopefully adding these weapons to the outpost will help give
more character for a potential "indie armory" in outposts, as well as
giving the SRM more options for fights without having to beg admins to
use them. The Ashhand, Vickland, Huntsman and Firestorm are currently
locked behind admin spawn for a future SRM ERT.

I swear to fucking god after I'm done with this entire rework I still
get no people joining my ships I'm gonna go nuclear.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy
add: The HP Firebrand, HP Scout, HP Contender, .38 Derringer and Double
Barrel Shotgun are now purchasable in the outpost store.
add: .357 Ammo Boxes, .300 Magnum Stripper Clips and Ammo Boxes are now
implemented and purchasable in the outpost.
add: .45-70 Ammo Boxes are now purchasable in the outpost.
fix: The Disposable Gun crate is now granularized.
del: The Scarborough Revolver is no longer purchasable in the outpost
store.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Imaginos16 authored May 8, 2024
1 parent 8ccac2c commit cf0c8ec
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 20 deletions.
36 changes: 36 additions & 0 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@
contains = list(/obj/item/ammo_box/amagpellet_claris)
cost = 1000

/datum/supply_pack/ammo/a300
name = ".300 Magnum Stripper Clip Crate"
desc = "Contains a five round .300 Magnum stripper clip for sniper rifles such as the HP Scout."
contains = list(/obj/item/ammo_box/a300)
cost = 750

/datum/supply_pack/ammo/ebr_ammo
name = "M514 EBR .308 Magazine Crate"
desc = "Contains a .308 magazine for the M514 EBR rifle, containing ten rounds."
Expand Down Expand Up @@ -173,6 +179,12 @@
contains = list(/obj/item/ammo_box/a762_40)
cost = 500

/datum/supply_pack/ammo/a357_ammo_box
name = ".357 Ammo Box Crate"
desc = "Contains a fifty-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
contains = list(/obj/item/ammo_box/a357_box)
cost = 250

/datum/supply_pack/ammo/c556mmHITP_ammo_box
name = "5.56 Caseless Ammo Box Crate"
desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
Expand Down Expand Up @@ -209,6 +221,12 @@
contains = list(/obj/item/ammo_box/c9mm/ap)
cost = 500

/datum/supply_pack/ammo/a357match_ammo_box
name = ".357 Match Ammo Box Crate"
desc = "Contains a fifty-round .357 match box for better performance against armor."
contains = list(/obj/item/ammo_box/a357_box/match)
cost = 500

/datum/supply_pack/ammo/c556mmHITPap_ammo_box
name = "5.56 caseless AP Ammo Box Crate"
desc = "Contains a fifty-round 5.56mm caseless boxloaded with armor piercing ammo."
Expand All @@ -233,6 +251,12 @@
contains = list(/obj/item/ammo_box/c9mm/hp)
cost = 500

/datum/supply_pack/ammo/a357hp_ammo_box
name = ".357 HP Ammo Box Crate"
desc = "Contains a fifty-round .357 box loaded with hollow point ammo, great against unarmored targets."
contains = list(/obj/item/ammo_box/a357_box/hp)
cost = 500

/datum/supply_pack/ammo/c10mmhp_ammo_box
name = "10mm HP Ammo Box Crate"
desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
Expand Down Expand Up @@ -305,6 +329,18 @@
contains = list(/obj/item/ammo_box/c8x50mmhp_box)
cost = 500

/datum/supply_pack/ammo/a300_box
name = ".300 Ammo Box Crate"
desc = "Contains a twenty-round .300 Magnum ammo box for sniper rifles such as the HP Scout."
contains = list(/obj/item/ammo_box/a300_box)
cost = 500

/datum/supply_pack/ammo/a4570_box
name = ".45-70 Ammo Box Crate"
desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition."
contains = list(/obj/item/ammo_box/a4570)
cost = 500

/datum/supply_pack/ammo/ferropelletboxcrate
name = "Ferromagnetic Pellet Box Crate"
desc = "Contains a fifty-round ferromagnetic pellet ammo box for gauss guns such as the Claris."
Expand Down
64 changes: 44 additions & 20 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@
*/

/datum/supply_pack/gun/disposable
name = "Disposable Guns Crate"
desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 400cr. That price is still far too high; this pack contains five."
cost = 750
contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/gun/ballistic/automatic/pistol/disposable,
/obj/item/gun/ballistic/automatic/pistol/disposable)
name = "Disposable Gun Crate"
desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 200cr. That price is still far too high."
cost = 150
contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable)
crate_name = "disposable gun crate"

/datum/supply_pack/gun/derringer
name = ".38 Derringer Crate"
desc = "A cheap, concealable pistol manufactured by the reputable Hunter's Pride. At least it's better than a disposable pistol. Chambered in .38 rounds."
cost = 350
contains = list(/obj/item/gun/ballistic/derringer)
crate_name = "derringer crate"

/datum/supply_pack/gun/commanders
name = "Commander Pistol Crate"
desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
Expand All @@ -36,15 +39,15 @@
cost = 1000
contains = list(/obj/item/gun/ballistic/automatic/pistol/candor)

/datum/supply_pack/gun/revolver
name = "Scarborough Revolver Crate"
desc = "Contains a concealable Scarborough revolver, chambered in .357."
/datum/supply_pack/gun/pepperbox
name = "HP Firebrand Pepperbox Revolver Crate"
desc = "Contains a concealable pepperbox revolver manufactured by the Saint Roumain Militia, chambered in .357."
cost = 1250
contains = list(/obj/item/gun/ballistic/revolver)
contains = list(/obj/item/gun/ballistic/revolver/firebrand)

/datum/supply_pack/gun/detrevolver
name = "Hunter's Pride Detective Revolver Crate"
desc = "Contains a concealable Solarian revolver, chambered in .38."
desc = "Contains a concealable revolver favored by police departments around the sector, chambered in .38."
cost = 600
contains = list(/obj/item/gun/ballistic/revolver/detective)

Expand Down Expand Up @@ -107,6 +110,13 @@
Shotguns
*/

/datum/supply_pack/gun/doublebarrel_shotgun
name = "Double Barrel Shotgun Crate"
desc = "For when you need to deal with 2 drunkards the old-fashioned way. Contains a double-barreled shotgun, favored by Bartenders. Warranty voided if sawed off."
cost = 1000
contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel)
crate_name = "shotguns crate"

/datum/supply_pack/gun/hellfire_shotgun
name = "Hellfire Shotgun Crate"
desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity."
Expand All @@ -132,20 +142,34 @@
contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow)
crate_name = "rifle crate"

/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
cost = 3000
contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
crate_name = "SMG crate"

/datum/supply_pack/gun/illestren
name = "Illestren Rifle Crate"
desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds."
cost = 1250
contains = list(/obj/item/gun/ballistic/rifle/illestren)
crate_name = "rifle crate"

/datum/supply_pack/gun/beacon
name = "Contender Break Action Rifle Crate"
desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off."
cost = 2250
contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel/beacon)
crate_name = "rifle crate"

/datum/supply_pack/gun/scout
name = "Scout Sniper Rifle Crate"
desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
cost = 5500
contains = list(/obj/item/gun/ballistic/rifle/scout)
crate_name = "rifle crate"

/datum/supply_pack/gun/cobra20
name = "Cobra-20 SMG Crate"
desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
cost = 3000
contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
crate_name = "SMG crate"

/datum/supply_pack/gun/wt550
name = "WT-550 Auto Rifle Crate"
desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."
Expand Down
29 changes: 29 additions & 0 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,28 @@
desc = "A 7-round speed loader for quickly reloading .357 revolvers. These hollow point rounds do incredible damage against soft targets, but are nearly ineffective against armored ones."
ammo_type = /obj/item/ammo_casing/a357/hp

/obj/item/ammo_box/a357_box
name = "ammo box (.357)"
desc = "A box of standard .357 ammo."
icon_state = "357box"
ammo_type = /obj/item/ammo_casing/a357
max_ammo = 50

/obj/item/ammo_box/a357_box/match
name = "ammo box (.357)"
desc = "A box of match .357 ammo."
icon_state = "357box-match"
ammo_type = /obj/item/ammo_casing/a357/match
max_ammo = 50

/obj/item/ammo_box/a357_box/hp
name = "ammo box (.357)"
desc = "A box of hollow point .357 ammo."
icon_state = "357box-hp"
ammo_type = /obj/item/ammo_casing/a357/hp
max_ammo = 50


// .45-70 Ammo Holders (Hunting Revolver)

/obj/item/ammo_box/a4570
Expand Down Expand Up @@ -443,3 +465,10 @@
icon_state = "8x50mmbox-hp"
ammo_type = /obj/item/ammo_casing/a8_50rhp
max_ammo = 20

/obj/item/ammo_box/a300_box
name = "ammo box (.300 Magnum)"
desc = "A box of standard .300 Magnum ammo."
icon_state = "300box"
ammo_type = /obj/item/ammo_casing/a300
max_ammo = 20
3 changes: 3 additions & 0 deletions code/modules/projectiles/boxes_magazines/internal/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@

/obj/item/ammo_box/magazine/internal/cylinder/pepperbox
name = "pepperbox revolver cylinder"
ammo_type = /obj/item/ammo_casing/a357
caliber = ".357"
max_ammo = 5
instant_load = FALSE

/obj/item/ammo_box/magazine/internal/cylinder/rev45
name = "cattleman revolver cylinder"
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/ballistic/revolver.dm
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,7 @@
manufacturer = MANUFACTURER_HUNTERSPRIDE
spread_unwielded = 50
fire_delay = 0
gate_offset = 4
semi_auto = TRUE
safety_wording = "safety"

Expand Down
Binary file modified icons/obj/ammo.dmi
Binary file not shown.

0 comments on commit cf0c8ec

Please sign in to comment.