From 9a42a85f703b3b2725a45641f6c6cd7a4eaf43e6 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Thu, 5 Sep 2024 23:26:57 -0500 Subject: [PATCH 1/4] yea --- code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index e8e5c59c9c65..700f75bc6917 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -55,7 +55,7 @@ desc = "A box of top grade .45-70 ammo. These rounds do significant damage with average performance against armor." icon_state = "4570" ammo_type = /obj/item/ammo_casing/a4570 - max_ammo = 12 + max_ammo = 24 /obj/item/ammo_box/a4570/match name = "ammo box (.45-70 match)" From 97ecd4a8ca51a8ca33313c256fbbfae9a3c3e243 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Fri, 6 Sep 2024 00:56:23 -0500 Subject: [PATCH 2/4] a --- code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 700f75bc6917..2296ef0ca289 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -55,24 +55,24 @@ desc = "A box of top grade .45-70 ammo. These rounds do significant damage with average performance against armor." icon_state = "4570" ammo_type = /obj/item/ammo_casing/a4570 - max_ammo = 24 + max_ammo = 18 /obj/item/ammo_box/a4570/match name = "ammo box (.45-70 match)" - desc = "A 12-round ammo box for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets." + desc = "A 18-round ammo box for .45-70 revolvers. These match rounds travel faster, perform better against armor, and can ricochet off targets." icon_state = "4570-match" ammo_type = /obj/item/ammo_casing/a4570/match /obj/item/ammo_box/a4570/hp name = "ammo box (.45-70 hollow point)" - desc = "A 12-round ammo box for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones." + desc = "A 18-round ammo box for .45-70 revolvers. These hollow point rounds do legendary damage against soft targets, but are nearly ineffective against armored ones." icon_state = "4570-hp" ammo_type = /obj/item/ammo_casing/a4570/hp /obj/item/ammo_box/a4570/explosive name = "ammo box (.45-70 explosive)" - desc = "A 12-round ammo box for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs." + desc = "A 18-round ammo box for .45-70 revolvers. These explosive rounds contain a small explosive charge that detonates on impact, creating large wounds and potentially removing limbs." icon_state = "4570-explosive" ammo_type = /obj/item/ammo_casing/a4570/explosive From d12e4cb7d39bcd369113e6ad3fbc8a47ae6dcf70 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Fri, 6 Sep 2024 11:59:49 -0500 Subject: [PATCH 3/4] ehehehe --- .../cargo/blackmarket/blackmarket_items/ammo.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm index dcc5c56b93c2..b4c8244745ca 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm @@ -219,3 +219,13 @@ stock_max = 5 availability_prob = 0 +/datum/blackmarket_item/ammo/a4570hp + name = ".45-70 Hollow Point Ammo Box" + desc = "Put the hollow in hollow point by blowing a crater in some random sod with this devastating .45-70 cartridge." + item = /obj/item/ammo_box/a4570/hp + + price_min = 600 + price_max = 1000 + stock_min = 3 + stock_max = 5 + availability_prob = 20 From 075f3f64c909b7e0c218e8fbd20705d88ad5b4f7 Mon Sep 17 00:00:00 2001 From: generalthrax <5nthr5x@gmail.com> Date: Tue, 17 Sep 2024 10:47:31 -0500 Subject: [PATCH 4/4] im crazy now --- .../cargo/blackmarket/blackmarket_items/ammo.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm index d774e31240f4..47f7fd884993 100644 --- a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm +++ b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm @@ -260,3 +260,14 @@ stock_min = 3 stock_max = 5 availability_prob = 20 + +/datum/blackmarket_item/ammo/a4570explo + name = "Single .45-70 Explosive Round" + desc = "If you need to fuck someone, hard, we got just the thing. Only one round, though, hope you got good aim." + item = /obj/item/ammo_casing/a4570/explosive + + price_min = 400 + price_max = 800 //still an exorbitantly high price for one round that you might not even hit + stock_min = 2 + stock_max = 10 + availability_prob = 10