From 329e07b037dd064a4392d2a6d47f598691b83877 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Thu, 5 Dec 2019 09:46:13 -0500 Subject: [PATCH 1/6] 357 bullets and rifle clips --- .../autolathe_designs_sec_and_hacked.dm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index e5e3a6bb4f..6e4151e7a0 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -130,13 +130,19 @@ category = list("hacked", "Security") /datum/design/a357 - name = "Speed Loader (.357)" + name = ".357 Bullet" id = "a357" build_type = AUTOLATHE - materials = list(MAT_METAL = 30000) - build_path = /obj/item/ammo_box/a357 + materials = list(MAT_METAL = 5000) + build_path = /obj/item/ammo_casing/a357 category = list("hacked", "Security") +/datum/design/a762 + name = "Stripper Clip (7.62mm) + id = "a762" + build_type = AUTOLATHE + materials = list(MAT_METAL = 20000) //more expensive with autolathe + category = list("hacked", "Security") /datum/design/c10mm name = "Ammo Box (10mm)" id = "c10mm" @@ -183,4 +189,4 @@ build_type = AUTOLATHE materials = list(MAT_METAL = 5500) build_path = /obj/item/clothing/head/foilhat - category = list("hacked", "Misc") \ No newline at end of file + category = list("hacked", "Misc") From df0fa330bffcb082b7fe3fbed9db1b43cfbd7b16 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Thu, 5 Dec 2019 09:49:09 -0500 Subject: [PATCH 2/6] bullet --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index 6e4151e7a0..e9e6351da6 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -138,10 +138,10 @@ category = list("hacked", "Security") /datum/design/a762 - name = "Stripper Clip (7.62mm) + name = "Rifle Bullet (7.62mm)" id = "a762" build_type = AUTOLATHE - materials = list(MAT_METAL = 20000) //more expensive with autolathe + materials = list(MAT_METAL = 5000) //need seclathe for clips category = list("hacked", "Security") /datum/design/c10mm name = "Ammo Box (10mm)" From 676476726f4a536e7d4a652e7506c0bdadf54f49 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Thu, 5 Dec 2019 09:50:34 -0500 Subject: [PATCH 3/6] i forgot to actually add the bullet --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index e9e6351da6..23da6293f5 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -142,7 +142,9 @@ id = "a762" build_type = AUTOLATHE materials = list(MAT_METAL = 5000) //need seclathe for clips + build_path = /obj/item/ammo_casing/a762 category = list("hacked", "Security") + /datum/design/c10mm name = "Ammo Box (10mm)" id = "c10mm" From d78df2cc5dc0625417ebd9e077967c199e7a86db Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:47:54 -0500 Subject: [PATCH 4/6] since they're gone from autos --- code/modules/uplink/uplink_items.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index aef3b31895..7a4f851bc8 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -765,12 +765,11 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes /datum/uplink_item/ammo/revolver name = ".357 Speed Loader" - desc = "A speed loader that contains seven additional .357 Magnum rounds; usable with the Syndicate revolver. \ + desc = "A speed loader that contains seven additional .357 Magnum rounds, and can be further reloaded with individual bullets; usable with the Syndicate revolver. \ For when you really need a lot of things dead." item = /obj/item/ammo_box/a357 cost = 3 exclude_modes = list(/datum/game_mode/nuclear/clown_ops) - illegal_tech = FALSE /datum/uplink_item/ammo/revolver/ap name = ".357 Armor Piercing Speed Loader" From 994411cc4e40e8cc49c2b04c8947b85a89674092 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:49:48 -0500 Subject: [PATCH 5/6] metal --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index 23da6293f5..d55b668bb8 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -133,7 +133,7 @@ name = ".357 Bullet" id = "a357" build_type = AUTOLATHE - materials = list(MAT_METAL = 5000) + materials = list(MAT_METAL = 4000) build_path = /obj/item/ammo_casing/a357 category = list("hacked", "Security") From c1c2661b8c8e65bc1e8bc399cb0f3bac37cfb5fd Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Thu, 5 Dec 2019 19:54:58 -0500 Subject: [PATCH 6/6] consistency --- .../autolathe_desings/autolathe_designs_sec_and_hacked.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index d55b668bb8..94599e9c32 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -130,7 +130,7 @@ category = list("hacked", "Security") /datum/design/a357 - name = ".357 Bullet" + name = "Revolver Bullet (.357)" id = "a357" build_type = AUTOLATHE materials = list(MAT_METAL = 4000)