From 3ea49fd1fc34e86b2315a7e28a5e8e5a0b46bb0c Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Tue, 15 Oct 2024 16:14:10 -0500 Subject: [PATCH 01/11] fixes --- code/game/objects/items/storage/ammo_can.dm | 7 +++++++ .../cargo/blackmarket/blackmarket_items/ammo.dm | 11 ----------- .../cargo/blackmarket/blackmarket_items/weapons.dm | 4 ++-- .../projectiles/ammunition/ballistic/pistol.dm | 2 +- .../modules/projectiles/ammunition/ballistic/rifle.dm | 4 ++-- .../projectiles/boxes_magazines/_box_magazine.dm | 2 +- .../boxes_magazines/ammo_stacks/_ammo_stack.dm | 2 +- .../ammo_stacks/prefab_stacks/premade_rifle_stacks.dm | 2 +- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm index 7962621674ad..b25a80b410c8 100644 --- a/code/game/objects/items/storage/ammo_can.dm +++ b/code/game/objects/items/storage/ammo_can.dm @@ -8,6 +8,13 @@ pickup_sound = 'sound/items/handling/ammobox_pickup.ogg' material_flags = NONE has_latches = FALSE + w_class = WEIGHT_CLASS_BULKY + +/obj/item/storage/toolbox/ammo/ComponentInitialize() + . = ..() + var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_volume = STORAGE_VOLUME_BACKPACK + STR.max_w_class = MAX_WEIGHT_CLASS_BACKPACK /obj/item/storage/toolbox/ammo/a850r/PopulateContents() name = "ammo can (8x50mmR)" diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm index 434a80c6416d..48e09e30de32 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm @@ -25,17 +25,6 @@ stock_max = 10 availability_prob = 0 -/datum/blackmarket_item/ammo/himehabu_box - name = ".22 LR Ammo Box" - desc = "A 75 round ammo box of .22 LR. Trust me, you'll need every shot." - item = /obj/item/storage/box/ammo/c22lr - - price_min = 100 - price_max = 300 - stock_min = 6 - stock_max = 10 - availability_prob = 0 - /datum/blackmarket_item/ammo/a357_box name = ".357 Ammo Box" desc = "A 50 round ammo box of .357." diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm index 740ee2c5341b..89fedd912517 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm @@ -98,7 +98,7 @@ name = "Himehabu Pistol" desc = "Great things come in small packages. The Himehabu is perfect for all your espionage needs. Chambered in .22lr." item = /obj/item/gun/ballistic/automatic/pistol/himehabu - pair_item = list(/datum/blackmarket_item/ammo/himehabu_mag, /datum/blackmarket_item/ammo/himehabu_box) + pair_item = list(/datum/blackmarket_item/ammo/himehabu_mag) price_min = 100 price_max = 600 @@ -320,7 +320,7 @@ name = "Pounder Submachine Gun" desc = "There's a certain quality to quantity. With a massive 50 round capacity, this .22lr submachine is capable of laying down an jawdropping amount of fire." item = /obj/item/gun/ballistic/automatic/smg/pounder - pair_item = list(/datum/blackmarket_item/ammo/pounder_mag,/datum/blackmarket_item/ammo/himehabu_box) + pair_item = list(/datum/blackmarket_item/ammo/pounder_mag) price_min = 1500 price_max = 2000 diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm index 9e1f880ffe1b..3d378a4020eb 100644 --- a/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -137,4 +137,4 @@ desc = "A .22 LR bullet casing." projectile_type = /obj/projectile/bullet/c22lr caliber = "22lr" - stack_size = 15 + stack_size = 25 diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 04545410300b..4ee38a7e378e 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -44,7 +44,7 @@ icon_state = "rifle-brass" caliber = "5.56x42mm" projectile_type = /obj/projectile/bullet/a556_42 - stack_size = 5 + stack_size = 15 // 5.45x39mm (SKM-24v) @@ -91,7 +91,7 @@ icon_state = "caseless" caliber = ".299 caseless" projectile_type = /obj/projectile/bullet/c299 - stack_size = 5 + stack_size = 15 /obj/item/ammo_casing/a65clip name = "6.5x57mm CLIP bullet casing" diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 57fb71d17f32..70a06d2d3140 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -120,7 +120,7 @@ if(istype(attacking_obj, /obj/item/ammo_box/magazine/ammo_stack)) var/obj/item/ammo_box/attacking_box = attacking_obj for(var/obj/item/ammo_casing/casing_to_insert in attacking_box.stored_ammo) - if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 1 SECONDS, attacking_box, timed_action_flags = IGNORE_USER_LOC_CHANGE))) + if(!((instant_load && attacking_box.instant_load) || (stored_ammo.len >= max_ammo) || do_after(user, 0.5 SECONDS, attacking_box, timed_action_flags = IGNORE_USER_LOC_CHANGE))) break var/did_load = give_round(casing_to_insert, replace_spent) if(!did_load) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm index f1e84780cb1e..6226438c8714 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm @@ -13,7 +13,7 @@ multiple_sprites = AMMO_BOX_ONE_SPRITE multiload = FALSE start_empty = TRUE - max_ammo = 12 + max_ammo = 25 /obj/item/ammo_box/magazine/ammo_stack/update_icon(updates) icon = initial(icon) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm index d22f62ec2165..b480cd4dad58 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm @@ -121,7 +121,7 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c299 ammo_type = /obj/item/ammo_casing/caseless/c299 - max_ammo = 5 + max_ammo = 15 /obj/item/storage/box/ammo/c299 name = "box of .299 Eoehoma caseless ammo" From f9b0f25b81d1609b2b93aad8c3e33bf28f8a9f98 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Tue, 15 Oct 2024 16:29:54 -0500 Subject: [PATCH 02/11] fwoagh --- .../ammo_stacks/prefab_stacks/premade_pistol_stacks.dm | 4 ++-- .../ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm index 68ea1a7faeb5..fec0eb7a8ad1 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm @@ -247,7 +247,7 @@ ammo_type = /obj/item/ammo_casing/c45/rubber /obj/item/storage/box/ammo/c45_rubber - name = "box of incendiary .45 ammo" + name = "box of rubbershot .45 ammo" desc = "A box of .45 rubbershot ammo, designed to disable targets without causing serious damage." icon_state = "45box-rubbershot" @@ -490,7 +490,7 @@ /obj/item/storage/box/ammo/a44roum_hp name = "box of HP .44 roumain ammo" desc = "A box of .44 roumain rubbershot ammo, designed to disable targets without causing serious damage." - icon_state = "a44roum-rubber" + icon_state = "a44roum-hp" /obj/item/storage/box/ammo/a44roum_hp/PopulateContents() ..() diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm index f67800330724..77c251c93603 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm @@ -52,7 +52,7 @@ desc = "A box of 12-gauge rubbershot shells, designed for riot control." icon_state = "12gbox-rubbershot" -/obj/item/storage/box/ammo/a12g_beanbag/PopulateContents() +/obj/item/storage/box/ammo/a12g_rubbershot/PopulateContents() ..() var/static/items_inside = list( /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/rubber = 4) From 0dd8fe8fe9cc6e9f7ac3c6625c0eb00bc92d1245 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Tue, 15 Oct 2024 17:14:55 -0500 Subject: [PATCH 03/11] i give up --- code/game/objects/items/storage/ammo_can.dm | 31 +++++++++++++------ .../research/designs/autolathe_designs.dm | 2 +- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm index b25a80b410c8..db0f12fc1284 100644 --- a/code/game/objects/items/storage/ammo_can.dm +++ b/code/game/objects/items/storage/ammo_can.dm @@ -1,5 +1,5 @@ //No idea why this is a toolbox but I'm not fixing that right now -/obj/item/storage/toolbox/ammo +/obj/item/storage/ammo_can name = "ammo can" desc = "A metal container for storing multiple boxes of ammunition or grenades." icon_state = "ammobox" @@ -7,52 +7,63 @@ drop_sound = 'sound/items/handling/ammobox_drop.ogg' pickup_sound = 'sound/items/handling/ammobox_pickup.ogg' material_flags = NONE - has_latches = FALSE + drop_sound = 'sound/items/handling/toolbox_drop.ogg' + pickup_sound = 'sound/items/handling/toolbox_pickup.ogg' w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/toolbox/ammo/ComponentInitialize() +/obj/item/storage/ammo_can/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_volume = STORAGE_VOLUME_BACKPACK STR.max_w_class = MAX_WEIGHT_CLASS_BACKPACK + STR.set_holdable(list( + /obj/item/storage/box/ammo, + /obj/item/mine, + /obj/item/grenade, + /obj/item/ammo_casing/caseless/rocket, + /obj/item/ammo_box/magazine/ammo_stack, + /obj/item/ammo_casing, + /obj/item/mine, + /obj/item/grenade + )) -/obj/item/storage/toolbox/ammo/a850r/PopulateContents() +/obj/item/storage/ammo_can/a850r/PopulateContents() name = "ammo can (8x50mmR)" icon_state = "ammobox_850" for(var/i in 1 to 4) new /obj/item/storage/box/ammo/a8_50r(src) -/obj/item/storage/toolbox/ammo/a762_40/PopulateContents() +/obj/item/storage/ammo_can/a762_40/PopulateContents() name = "ammo can (7.62x40mm CLIP)" icon_state = "ammobox_762" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/a762_40(src) -/obj/item/storage/toolbox/ammo/a308/PopulateContents() +/obj/item/storage/ammo_can/a308/PopulateContents() name = "ammo can (.308)" icon_state = "ammobox_308" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/a308(src) -/obj/item/storage/toolbox/ammo/c45/PopulateContents() +/obj/item/storage/ammo_can/c45/PopulateContents() name = "ammo can (.45)" icon_state = "ammobox_45" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/c45(src) -/obj/item/storage/toolbox/ammo/c9mm/PopulateContents() +/obj/item/storage/ammo_can/c9mm/PopulateContents() name = "ammo can (9mm)" icon_state = "ammobox_9mm" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/c9mm(src) -/obj/item/storage/toolbox/ammo/c10mm/PopulateContents() +/obj/item/storage/ammo_can/c10mm/PopulateContents() name = "ammo can (10mm)" icon_state = "ammobox_10mm" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/c10mm(src) -/obj/item/storage/toolbox/ammo/shotgun/PopulateContents() +/obj/item/storage/ammo_can/shotgun/PopulateContents() name = "ammo can (12ga)" icon_state = "ammobox_12ga" for (var/i in 1 to 4) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 5ac2370dc694..bf52b809c9db 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -857,7 +857,7 @@ id = "ammo-can" build_type = AUTOLATHE | PROTOLATHE materials = list(/datum/material/iron = 500) - build_path = /obj/item/storage/toolbox/ammo + build_path = /obj/item/storage/ammo_can category = list("initial", "Security", "Ammo") /datum/design/cleaver From e18d133bf3b776a4521f8f418fc6dfc03ddcbcb2 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Wed, 16 Oct 2024 12:17:32 -0500 Subject: [PATCH 04/11] 22 --- code/modules/cargo/packs/ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 716cb51d1e97..5686ad0aea98 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -426,6 +426,6 @@ /datum/supply_pack/ammo/c22lr name = ".22 LR Ammo Box Crate" - desc = "Contains a 60-round ammo box for refilling .22 LR weapons." + desc = "Contains a 100-round ammo box for refilling .22 LR weapons." contains = list(/obj/item/storage/box/ammo/c22lr) cost = 250 From dbc089504219a80e28f03ddfcc0fe5f4e848bd3b Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Wed, 16 Oct 2024 17:31:15 -0500 Subject: [PATCH 05/11] fuckywucky --- code/game/objects/items/storage/ammo_can.dm | 20 +++++++++---------- .../research/designs/autolathe_designs.dm | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm index db0f12fc1284..f168eb8cdf55 100644 --- a/code/game/objects/items/storage/ammo_can.dm +++ b/code/game/objects/items/storage/ammo_can.dm @@ -1,5 +1,5 @@ //No idea why this is a toolbox but I'm not fixing that right now -/obj/item/storage/ammo_can +/obj/item/storage/toolbox/ammo name = "ammo can" desc = "A metal container for storing multiple boxes of ammunition or grenades." icon_state = "ammobox" @@ -7,11 +7,9 @@ drop_sound = 'sound/items/handling/ammobox_drop.ogg' pickup_sound = 'sound/items/handling/ammobox_pickup.ogg' material_flags = NONE - drop_sound = 'sound/items/handling/toolbox_drop.ogg' - pickup_sound = 'sound/items/handling/toolbox_pickup.ogg' w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/ammo_can/ComponentInitialize() +/obj/item/storage/toolbox/ammo/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_volume = STORAGE_VOLUME_BACKPACK @@ -27,43 +25,43 @@ /obj/item/grenade )) -/obj/item/storage/ammo_can/a850r/PopulateContents() +/obj/item/storage/toolbox/ammo/a850r/PopulateContents() name = "ammo can (8x50mmR)" icon_state = "ammobox_850" for(var/i in 1 to 4) new /obj/item/storage/box/ammo/a8_50r(src) -/obj/item/storage/ammo_can/a762_40/PopulateContents() +/obj/item/storage/toolbox/ammo/a762_40/PopulateContents() name = "ammo can (7.62x40mm CLIP)" icon_state = "ammobox_762" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/a762_40(src) -/obj/item/storage/ammo_can/a308/PopulateContents() +/obj/item/storage/toolbox/ammo/a308/PopulateContents() name = "ammo can (.308)" icon_state = "ammobox_308" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/a308(src) -/obj/item/storage/ammo_can/c45/PopulateContents() +/obj/item/storage/toolbox/ammo/c45/PopulateContents() name = "ammo can (.45)" icon_state = "ammobox_45" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/c45(src) -/obj/item/storage/ammo_can/c9mm/PopulateContents() +/obj/item/storage/toolbox/ammo/c9mm/PopulateContents() name = "ammo can (9mm)" icon_state = "ammobox_9mm" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/c9mm(src) -/obj/item/storage/ammo_can/c10mm/PopulateContents() +/obj/item/storage/toolbox/ammo/c10mm/PopulateContents() name = "ammo can (10mm)" icon_state = "ammobox_10mm" for (var/i in 1 to 4) new /obj/item/storage/box/ammo/c10mm(src) -/obj/item/storage/ammo_can/shotgun/PopulateContents() +/obj/item/storage/toolbox/ammo/shotgun/PopulateContents() name = "ammo can (12ga)" icon_state = "ammobox_12ga" for (var/i in 1 to 4) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index bf52b809c9db..5ac2370dc694 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -857,7 +857,7 @@ id = "ammo-can" build_type = AUTOLATHE | PROTOLATHE materials = list(/datum/material/iron = 500) - build_path = /obj/item/storage/ammo_can + build_path = /obj/item/storage/toolbox/ammo category = list("initial", "Security", "Ammo") /datum/design/cleaver From 0b9de3f5ad6ef4bdd57b0b7c281ecfd24cd7fc31 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Wed, 16 Oct 2024 17:42:30 -0500 Subject: [PATCH 06/11] whoopsie --- .../ammo_stacks/prefab_stacks/premade_pistol_stacks.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm index fec0eb7a8ad1..289f506635ec 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm @@ -388,6 +388,7 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c38 ammo_type = /obj/item/ammo_casing/c38 + max_ammo = 15 /obj/item/storage/box/ammo/c38 name = "box of .38 ammo" From eae7c0b1fe6ffb41777cd92d42ccf303f1f2dbb2 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Wed, 16 Oct 2024 19:31:31 -0500 Subject: [PATCH 07/11] tempfix --- code/modules/cargo/packs/ammo.dm | 2 +- .../projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 5686ad0aea98..aca1d78e249a 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -427,5 +427,5 @@ /datum/supply_pack/ammo/c22lr name = ".22 LR Ammo Box Crate" desc = "Contains a 100-round ammo box for refilling .22 LR weapons." - contains = list(/obj/item/storage/box/ammo/c22lr) + contains = list(/obj/item/storage/box/ammo/c22lr, /obj/item/storage/box/ammo/c22lr) cost = 250 diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm index 6226438c8714..f1e84780cb1e 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/_ammo_stack.dm @@ -13,7 +13,7 @@ multiple_sprites = AMMO_BOX_ONE_SPRITE multiload = FALSE start_empty = TRUE - max_ammo = 25 + max_ammo = 12 /obj/item/ammo_box/magazine/ammo_stack/update_icon(updates) icon = initial(icon) From 0b2c6f1c5609075b7a1cce0bcea9ff943e015db3 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Thu, 17 Oct 2024 09:45:03 -0500 Subject: [PATCH 08/11] typo --- .../ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm index 77c251c93603..139abb6de851 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_shotshell_stacks.dm @@ -48,7 +48,7 @@ ammo_type = /obj/item/ammo_casing/shotgun/rubbershot /obj/item/storage/box/ammo/a12g_rubbershot - name = "box of 12ga beanbags" + name = "box of 12ga rubbershot" desc = "A box of 12-gauge rubbershot shells, designed for riot control." icon_state = "12gbox-rubbershot" From 08ee908a5f9e9d26ae04bcfb81d3b363e4d5474c Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Fri, 18 Oct 2024 11:26:58 -0500 Subject: [PATCH 09/11] stacksize, 22lr changes, and .299 eoehoma --- code/modules/cargo/packs/ammo.dm | 11 ++++++----- code/modules/projectiles/ammunition/_ammo_casing.dm | 2 +- .../prefab_stacks/premade_pistol_stacks.dm | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index 77af7b799544..2722d80f5b11 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -426,12 +426,13 @@ /datum/supply_pack/ammo/c299 name = ".299 Eoehoma Caseless Ammo Box Crate" - desc = "Contains a 120-round box of .299 Caseless ammo from the defunct Eoehoma. Used for the E-40 Hybrid Rifle." - contains = list(/obj/item/storage/box/ammo/c299) - cost = 250 + desc = "Contains two 60-round boxes of .299 Caseless ammo from the defunct Eoehoma. Used for the E-40 Hybrid Rifle." + contains = list(/obj/item/storage/box/ammo/c299, + /obj/item/storage/box/ammo/c299) + cost = 400 /datum/supply_pack/ammo/c22lr name = ".22 LR Ammo Box Crate" - desc = "Contains a 100-round ammo box for refilling .22 LR weapons." - contains = list(/obj/item/storage/box/ammo/c22lr, /obj/item/storage/box/ammo/c22lr) + desc = "Contains one 100-round ammo box for refilling .22 LR weapons." + contains = list(/obj/item/storage/box/ammo/c22lr) cost = 250 diff --git a/code/modules/projectiles/ammunition/_ammo_casing.dm b/code/modules/projectiles/ammunition/_ammo_casing.dm index 88b7b42d334a..b67ad230e947 100644 --- a/code/modules/projectiles/ammunition/_ammo_casing.dm +++ b/code/modules/projectiles/ammunition/_ammo_casing.dm @@ -48,7 +48,7 @@ ///What this casing can be stacked into. var/obj/item/ammo_box/magazine/stack_type = /obj/item/ammo_box/magazine/ammo_stack ///Maximum stack size of ammunition - var/stack_size = 12 + var/stack_size = 15 /obj/item/ammo_casing/attackby(obj/item/attacking_item, mob/user, params) if(istype(attacking_item, /obj/item/pen)) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm index 289f506635ec..1ef39821b408 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm @@ -269,6 +269,7 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr ammo_type = /obj/item/ammo_casing/c22lr + max_ammo = 25 /obj/item/storage/box/ammo/c22lr name = "box of .22 LR ammo" From 1501e11634300bf125fc3c77f6a5c523e820612d Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Fri, 25 Oct 2024 11:09:57 -0500 Subject: [PATCH 10/11] IDK --- code/game/objects/items/storage/ammo_can.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/storage/ammo_can.dm b/code/game/objects/items/storage/ammo_can.dm index f168eb8cdf55..e619aced0692 100644 --- a/code/game/objects/items/storage/ammo_can.dm +++ b/code/game/objects/items/storage/ammo_can.dm @@ -7,6 +7,7 @@ drop_sound = 'sound/items/handling/ammobox_drop.ogg' pickup_sound = 'sound/items/handling/ammobox_pickup.ogg' material_flags = NONE + has_latches = FALSE w_class = WEIGHT_CLASS_BULKY /obj/item/storage/toolbox/ammo/ComponentInitialize() From c36bc7b5e7cb0ef2d91bf76412a1f5a06fb44888 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Fri, 25 Oct 2024 11:10:56 -0500 Subject: [PATCH 11/11] typo --- .../ammo_stacks/prefab_stacks/premade_pistol_stacks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm index 1ef39821b408..6edc29a7b17a 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm @@ -491,7 +491,7 @@ /obj/item/storage/box/ammo/a44roum_hp name = "box of HP .44 roumain ammo" - desc = "A box of .44 roumain rubbershot ammo, designed to disable targets without causing serious damage." + desc = "A box of .44 roumain hollowpoint ammo, designed to disable targets without causing serious damage." icon_state = "a44roum-hp" /obj/item/storage/box/ammo/a44roum_hp/PopulateContents()