Skip to content

Commit

Permalink
Fixes 38 Surplus being unprintable in the autolathe and 38 speedloade…
Browse files Browse the repository at this point in the history
…r description (#2840)

<!-- 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

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Fixes #2814 and makes 38 surplus ammo able to be printed from the
autolathe. Changes the damage blurb on the 38 speedloader to reflect
standard 38 ammo's new stats.
## Why It's Good For The Game
Bug fixes are good.

<!-- 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:
fix: 38 Surplus ammo should be printable in the autolathe.
fix: 38 speedloader damage blurb is accurate to it's new stats.
/: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
Gristlebee authored Mar 28, 2024
1 parent 3ac23bd commit 4ca313c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

/obj/item/ammo_box/c38
name = "speed loader (.38 special)"
desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds do moderate damage, but plink against armor."
desc = "A 6-round speed loader for quickly reloading .38 special revolvers. These rounds do okay damage, but struggle against armor."
icon_state = "38"
ammo_type = /obj/item/ammo_casing/c38
caliber = ".38"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/research/designs/autolathe_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -798,9 +798,9 @@
build_path = /obj/item/weaponcrafting/receiver
category = list("hacked", "Security")

/datum/design/c38
/datum/design/c38_surplus
name = "Ammo Box (.38 surplus)"
id = "c38"
id = "c38_surplus"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 15000)
build_path = /obj/item/ammo_box/c38_box/surplus
Expand Down

0 comments on commit 4ca313c

Please sign in to comment.