From 14af1ed313c9379220fe7eb0b1219418a9aecbf7 Mon Sep 17 00:00:00 2001 From: Martinpachu Date: Tue, 27 Feb 2024 22:39:00 -0300 Subject: [PATCH 1/7] desc fixes + 38 price --- code/modules/cargo/packs/ammo.dm | 4 ++-- code/modules/cargo/packs/gun.dm | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm index ce69eb3d4b0d..2a40319e6234 100644 --- a/code/modules/cargo/packs/ammo.dm +++ b/code/modules/cargo/packs/ammo.dm @@ -91,8 +91,8 @@ /datum/supply_pack/ammo/winchester_ammo name = "Flaming Arrow and Detective Special .38 Ammo Boxes" - desc = "Contains two 30 round ammo boxes for refilling .38 weapons." - cost = 500 + desc = "Contains two 50 round ammo boxes for refilling .38 weapons." + cost = 250 contains = list(/obj/item/ammo_box/c38_box, /obj/item/ammo_box/c38_box) crate_name = "ammo crate" diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 05fb2308702b..ee2da4e86e3a 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -38,7 +38,7 @@ /datum/supply_pack/gun/detrevolver name = "Hunter's Pride Detective Revolver crate" - desc = "Contains a concealable Solarian revolver, chambered in .38." + desc = "Contains a concealable revolver, originally commissioned by Nanotrasen and produced by Hunter's Pride, chambered in .38." cost = 1000 contains = list(/obj/item/gun/ballistic/revolver/detective) @@ -60,9 +60,9 @@ contains = list(/obj/item/gun/energy/laser) crate_name = "laser crate" -/datum/supply_pack/gun/laser +/datum/supply_pack/gun/miniegun name = "Mini Energy Gun Crate" - desc = "Contains a small, versatile energy guns, capable of firing both nonlethal and lethal blasts, but with a limited power cell." + desc = "Contains a small, versatile energy gun, capable of firing both nonlethal and lethal blasts, but with a limited power cell." cost = 500 contains = list(/obj/item/gun/energy/e_gun/mini) crate_name = "laser crate" @@ -89,17 +89,17 @@ /datum/supply_pack/gun/hellfire_shotgun name = "Hellfire Shotgun Crate" - desc = "For when you need to deal with 7 hooligans. Contains a pump shotguns, with a 8-round capacity." + desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity." cost = 2000 contains = list(/obj/item/gun/ballistic/shotgun/hellfire) - crate_name = "shotguns crate" + crate_name = "shotgun crate" /datum/supply_pack/gun/brimstone_shotgun name = "Brimstone Shotgun Crate" - desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotguns, with a 5-round capacity. Warranty voided if sawed off." + desc = "For when you need to deal with 5 hooligans, and QUICKLY. Contains a slamfire shotgun, with a 5-round capacity. Warranty voided if sawed off." cost = 2000 contains = list(/obj/item/gun/ballistic/shotgun/brimstone) - crate_name = "shotguns crate" + crate_name = "shotgun crate" /* Rifles @@ -107,21 +107,21 @@ /datum/supply_pack/gun/winchester name = "Flaming Arrow Lever Action Rifle Crate" - desc = "Contains a antiquated lever action rifles intended for hunting wildlife. Chambered in .38 rounds." + desc = "Contains an antiquated lever action rifle intended for hunting wildlife. Chambered in .38 rounds." cost = 750 contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow) crate_name = "rifle crate" /datum/supply_pack/gun/cobra20 name = "Cobra-20 SMG Crate" - desc = "Contains a .45 submachine guns, manufactured by Scaraborough Arms and chambered in .45" + desc = "Contains a .45 submachine gun, manufactured by Scaraborough Arms and chambered in .45" cost = 3000 contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra) crate_name = "SMG crate" /datum/supply_pack/gun/illestren name = "Illestren Rifle Crate" - desc = "Contains a expertly made bolt action rifles intended for hunting wildlife. Chambered in 8x50mmR rounds." + desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds." cost = 1250 contains = list(/obj/item/gun/ballistic/rifle/illestren) crate_name = "rifle crate" @@ -135,14 +135,14 @@ /datum/supply_pack/gun/p16 name = "P16 Assault Rifle Crate" - desc = "Contains a high-powered, automatic rifles chambered in 5.56mm." + desc = "Contains a high-powered, automatic rifle chambered in 5.56mm." cost = 5000 contains = list(/obj/item/gun/ballistic/automatic/assault/p16) crate_name = "auto rifle crate" /datum/supply_pack/gun/skm name = "SKM-24 Rifle Crate" - desc = "Contains a high-powered, automatic rifles chambered in 7.62x40mm CLIP." + desc = "Contains a high-powered, automatic rifle chambered in 7.62x40mm CLIP." cost = 5000 contains = list(/obj/item/gun/ballistic/automatic/assault/skm) crate_name = "auto rifle crate" From 20385173228d29d9b9716f81a889b07d8d8f0516 Mon Sep 17 00:00:00 2001 From: Martinpachu <86135885+Martinpachu@users.noreply.github.com> Date: Fri, 29 Mar 2024 01:27:02 -0300 Subject: [PATCH 2/7] yearg Co-authored-by: Mark Suckerberg Signed-off-by: Martinpachu <86135885+Martinpachu@users.noreply.github.com> --- code/modules/cargo/packs/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index ee2da4e86e3a..862ebe0a7af4 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -89,7 +89,7 @@ /datum/supply_pack/gun/hellfire_shotgun name = "Hellfire Shotgun Crate" - desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity." + desc = "For when you need to deal with 8 hooligans. Contains a pump shotgun, with a 8-round capacity." cost = 2000 contains = list(/obj/item/gun/ballistic/shotgun/hellfire) crate_name = "shotgun crate" From 60ce08e1bd836aa62a9bd3c386e84589820dd2cc Mon Sep 17 00:00:00 2001 From: Martinpachu <86135885+Martinpachu@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:53:13 -0300 Subject: [PATCH 3/7] thanks Co-authored-by: Theos Signed-off-by: Martinpachu <86135885+Martinpachu@users.noreply.github.com> --- code/modules/cargo/packs/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 862ebe0a7af4..d4b52cde7fa5 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -121,7 +121,7 @@ /datum/supply_pack/gun/illestren name = "Illestren Rifle Crate" - desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds." + desc = "Contains an expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds." cost = 1250 contains = list(/obj/item/gun/ballistic/rifle/illestren) crate_name = "rifle crate" From aac9b70950e7c5243a782e8740f1fbb7e5c16056 Mon Sep 17 00:00:00 2001 From: Martinpachu Date: Tue, 30 Apr 2024 22:11:47 -0300 Subject: [PATCH 4/7] fixes stechkin dupe glitch --- code/modules/cargo/packs/gun.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 04d7acaffffe..1c4861cc3342 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -27,8 +27,7 @@ name = "Stechkin Pistol Crate" desc = "Contains a concealable stechkin pistol, produced by Scarborough Arms and chambered in 10mm." cost = 1000 - contains = list(/obj/item/gun/ballistic/automatic/pistol, - /obj/item/gun/ballistic/automatic/pistol) + contains = list(/obj/item/gun/ballistic/automatic/pistol) /datum/supply_pack/gun/revolver name = "Scarborough Revolver Crate" From 84f71c3a9a4c8554cc9a391d1db51f95898794a6 Mon Sep 17 00:00:00 2001 From: Martinpachu Date: Sun, 5 May 2024 13:28:23 -0300 Subject: [PATCH 5/7] the description: --- code/modules/cargo/packs/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 887df01f2558..ea8c3301ca10 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -43,7 +43,7 @@ /datum/supply_pack/gun/detrevolver name = "Hunter's Pride Detective Revolver Crate" - desc = "Contains a concealable Solarian revolver, chambered in .38." + desc = "Contains a concealable revolver, originally commissioned by Nanotrasen and produced by Hunter's Pride, chambered in .38." cost = 600 contains = list(/obj/item/gun/ballistic/revolver/detective) From df13a44ac25cb53479c989b2dc48338281388639 Mon Sep 17 00:00:00 2001 From: Martinpachu Date: Sun, 5 May 2024 14:59:32 -0300 Subject: [PATCH 6/7] Revert "the description:" This reverts commit 84f71c3a9a4c8554cc9a391d1db51f95898794a6. --- code/modules/cargo/packs/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index ea8c3301ca10..887df01f2558 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -43,7 +43,7 @@ /datum/supply_pack/gun/detrevolver name = "Hunter's Pride Detective Revolver Crate" - desc = "Contains a concealable revolver, originally commissioned by Nanotrasen and produced by Hunter's Pride, chambered in .38." + desc = "Contains a concealable Solarian revolver, chambered in .38." cost = 600 contains = list(/obj/item/gun/ballistic/revolver/detective) From 65677f66ac19fb33ba27eb7e1ef86e1ce4414678 Mon Sep 17 00:00:00 2001 From: Martinpachu Date: Sun, 5 May 2024 15:13:00 -0300 Subject: [PATCH 7/7] hi! i'm the description --- code/modules/cargo/packs/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm index 887df01f2558..ea8c3301ca10 100644 --- a/code/modules/cargo/packs/gun.dm +++ b/code/modules/cargo/packs/gun.dm @@ -43,7 +43,7 @@ /datum/supply_pack/gun/detrevolver name = "Hunter's Pride Detective Revolver Crate" - desc = "Contains a concealable Solarian revolver, chambered in .38." + desc = "Contains a concealable revolver, originally commissioned by Nanotrasen and produced by Hunter's Pride, chambered in .38." cost = 600 contains = list(/obj/item/gun/ballistic/revolver/detective)