Skip to content

Commit

Permalink
Serene Sporting (shiptest-ss13#3604)
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. -->
Adds new guns sprited by @rye-rice
M17 pistol - .22lr - 10rd mag
M12 rifle - .22lr - 25rd mag
m13 rifle - .22lr - 25rd mag - 3rd burst
m15 rifle - 5.56 clip - 20rd mag
m11 shotgun - 12g - 8rd tube

![dreamseeker_55G0WFwm5r](https://github.com/user-attachments/assets/b9d9f91e-6699-4f40-a5e5-163d70069691)

[Watch the video here](https://youtu.be/O1TrkZ_FHFU?si=-dAk-dlTSsug8X0R)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
project content into the world
<!-- 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. -->

:cl: Apogeesys, Ryerice, Erikafox
add: Serene Outdoors has begun a new production run of its classics -
the Model 17, Model 12, Model 15, and Model 11
del: old combat shotgun
/: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. -->

---------

Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com>
Co-authored-by: Erika Fox <94164348+Bjarl@users.noreply.github.com>
  • Loading branch information
2 people authored and MrCat15352 committed Jan 3, 2025
1 parent 91759cb commit 3a5f971
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions code/modules/cargo/packs/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
contains = list(/obj/item/storage/guncase/pistol/m17)
crate_name = "pistol crate"

/datum/supply_pack/gun/m17
name = "M17 pistol Crate"
desc = "A cheap target shooting pistol manufactured by Serene Outdoors. Chambered in .22lr"
cost = 200
contains = list(/obj/item/storage/guncase/pistol/m17)
crate_name = "pistol 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 Down Expand Up @@ -317,6 +324,13 @@
faction_discount = 0
faction_locked = TRUE

/datum/supply_pack/gun/buckmaster
name = "Buckmaster Shotgun Crate"
desc = "For when you need to deal with 8 hooligans and can't be arsed to pump. Contains a semi-auto shotgun with an 8 round tube."
contains = list(/obj/item/storage/guncase/buckmaster)
cost = 3000
crate_name = "shotgun crate"

/*
SMGs
*/
Expand Down Expand Up @@ -647,6 +661,8 @@

/* Attachments */

/* Attachments */

/datum/supply_pack/gun/attachment/rail_light
name = "Tactical Rail Light Crate"
desc = "Contains a single rail light to be mounted on a firearm."
Expand Down

0 comments on commit 3a5f971

Please sign in to comment.