Skip to content

Commit

Permalink
Real 9mm fix (#3804)
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

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

## Why It's Good For The Game

<!-- 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: 9mm AP boxes now work right
/: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: Theos <[email protected]>
  • Loading branch information
SomeguyManperson authored Nov 19, 2024
1 parent f9c658e commit 76977cb
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3073,7 +3073,7 @@
pixel_x = -3
},
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/storage/box/ammo/c9mm/ap,
/obj/item/storage/box/ammo/c9mm_ap,
/obj/item/ammo_box/magazine/illestren_a850r,
/obj/item/ammo_box/magazine/co9mm{
start_empty = 1
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13080,7 +13080,7 @@
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm,
/obj/item/storage/box/ammo/c9mm/ap,
/obj/item/storage/box/ammo/c9mm_ap,
/obj/item/stock_parts/cell/gun{
pixel_x = -3;
pixel_y = -5
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/datum/supply_pack/ammo/c9mmap_ammo_box
name = "9mm AP Ammo Box Crate"
desc = "Contains a 48-round 9mm box loaded with armor piercing ammo."
contains = list(/obj/item/storage/box/ammo/c9mm/ap)
contains = list(/obj/item/storage/box/ammo/c9mm_ap)
cost = 400

/datum/supply_pack/ammo/c9mmhp_ammo_box
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,18 +115,18 @@
/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/surplus = 48)
generate_items_inside(items_inside,src)

/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm_ap
/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap
ammo_type = /obj/item/ammo_casing/c9mm/ap

/obj/item/storage/box/ammo/c9mm/ap
/obj/item/storage/box/ammo/c9mm_ap
name = "box of AP 9mm ammo"
desc = "A box of 9mm armor-piercing ammo, designed to penetrate through armor at the cost of total damage."
icon_state = "9mmbox-ap"

/obj/item/storage/box/ammo/c9mm/ap/PopulateContents()
/obj/item/storage/box/ammo/c9mm_ap/PopulateContents()
..()
var/static/items_inside = list(
/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm_ap = 4)
/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/ap = 4)
generate_items_inside(items_inside,src)

/obj/item/ammo_box/magazine/ammo_stack/prefilled/c9mm/hp
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/designs/weapon_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
id = "ap9mm"
build_type = PROTOLATHE
materials = list(/datum/material/iron = 15000, /datum/material/uranium = 1000)
build_path = /obj/item/storage/box/ammo/c9mm/ap
build_path = /obj/item/storage/box/ammo/c9mm_ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY

Expand Down

0 comments on commit 76977cb

Please sign in to comment.