Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Real 9mm fix #3804

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −8
Open

Real 9mm fix #3804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3bccc5
Update ammo.dm
SomeguyManperson Nov 19, 2024
d737983
9mm fix
SomeguyManperson Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
8 changes: 4 additions & 4 deletions code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm
View file
Open in desktop
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()
..()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this call does nothing you should just removee it instead.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you need the parent call

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
View file
Open in desktop
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
Loading