From aebca1767efe03536a2cb960e38b00090e115e58 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Fri, 23 Apr 2021 23:20:16 -0400 Subject: [PATCH 1/5] In a station full of bad ideas, these costs were.. --- .../boxes_magazines/external/pistol.dm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm index c39c66578b..65dc14a0f5 100644 --- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -3,8 +3,7 @@ desc = "A gun magazine. Loaded with rounds which ignite the target.." id = "10mminc" build_type = PROTOLATHE - materials = list(/datum/material/plasma = 50000, /datum/material/iron = 18000) - reagents_list = list(/datum/reagent/toxin/plasma = 120, /datum/reagent/napalm = 240) + materials = list(/datum/material/plasma = 5000, /datum/material/iron = 7500) build_path = /obj/item/ammo_box/magazine/m10mm/fire category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -14,7 +13,7 @@ desc = "A gun magazine." id = "10mm" build_type = PROTOLATHE - materials = list(/datum/material/iron = 55000) + materials = list(/datum/material/iron = 6000) build_path = /obj/item/ammo_box/magazine/m10mm category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -24,8 +23,7 @@ desc = "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing." id = "10mmhp" build_type = PROTOLATHE - materials = list(/datum/material/iron = 40000, /datum/material/glass = 50000) - reagents_list = list(/datum/reagent/sonic_powder = 280) + materials = list(/datum/material/iron = 7500, /datum/material/glass = 5000) build_path = /obj/item/ammo_box/magazine/m10mm/hp category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -35,7 +33,7 @@ desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets." id = "10mmap" build_type = PROTOLATHE - materials = list(/datum/material/iron = 40000, /datum/material/titanium = 60000) + materials = list(/datum/material/iron = 7500, /datum/material/titanium = 6500) build_path = /obj/item/ammo_box/magazine/m10mm/ap category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -54,7 +52,7 @@ name = "handgun magazine (.45)" id = "m45" build_type = PROTOLATHE - materials = list(/datum/material/iron = 80000) + materials = list(/datum/material/iron = 8000) build_path = /obj/item/ammo_box/magazine/m45 category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -64,7 +62,7 @@ desc = "A gun magazine." id = "pistolm9mm" build_type = PROTOLATHE - materials = list(/datum/material/iron = 80000) + materials = list(/datum/material/iron = 7500) build_path = /obj/item/ammo_box/magazine/pistolm9mm category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -84,7 +82,7 @@ desc = "A revolver speedloader. Cuts through like a hot knife through butter." id = "sl357ap" build_type = PROTOLATHE - materials = list(/datum/material/iron = 30000, /datum/material/titanium = 45000) + materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000) build_path = /obj/item/ammo_box/a357/ap category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY From c7b231637e064f130a1034aa8502c661cec85202 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 24 Apr 2021 00:53:57 -0400 Subject: [PATCH 2/5] boxes of ammo, also fire not weapon is bullet --- .../research/techweb/nodes/syndicate_nodes.dm | 2 +- .../boxes_magazines/external/pistol.dm | 32 ++++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/code/modules/research/techweb/nodes/syndicate_nodes.dm b/code/modules/research/techweb/nodes/syndicate_nodes.dm index e659e49ac7..5a3c0f541f 100644 --- a/code/modules/research/techweb/nodes/syndicate_nodes.dm +++ b/code/modules/research/techweb/nodes/syndicate_nodes.dm @@ -21,7 +21,7 @@ id = "advanced_illegal_ballistics" display_name = "Advanced Non-Standard Ballistics" description = "Ballistic ammunition for non-standard firearms. Usually the ones you don't have nor want to be involved with." - design_ids = list("10mm","10mmap","10mminc","10mmhp","sl357","sl357ap","pistolm9mm","m45","bolt_clip") + design_ids = list("10mm","10mmap","10mminc","10mmhp","sl357","sl357ap","pistolm9mm","m45","bolt_clip","m10apbox","m10firebox","m10hpbox") prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns from traitors, space, or anything in between. diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm index 65dc14a0f5..394ffcc58d 100644 --- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -5,7 +5,7 @@ build_type = PROTOLATHE materials = list(/datum/material/plasma = 5000, /datum/material/iron = 7500) build_path = /obj/item/ammo_box/magazine/m10mm/fire - category = list("Weapons") + category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY /datum/design/m10mm @@ -86,3 +86,33 @@ build_path = /obj/item/ammo_box/a357/ap category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/datum/design/m10apbox + name = "ammo box (10mm Armour Piercing)" + desc = "A box of ammo containing 20 rounds designed to penetrate armor, at the cost of raw damage." + id = "10apbox" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000) + build_path = /obj/item/ammo_box/c10mm/ap + category = list("Ammo") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/datum/design/m10firebox + name = "ammo box (10mm Incendiary)" + desc = "A box of ammo containing 20 rounds designed to set people ablaze, at the cost of raw damage." + id = "10apbox" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000) + build_path = /obj/item/ammo_box/c10mm/fire + category = list("Ammo") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/datum/design/m10hpbox + name = "ammo box (10mm Hollowpoint)" + desc = "A box of ammo containing 20 rounds designed to tear through unarmored opponents, while being completely ineffective against armor." + id = "10apbox" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000) + build_path = /obj/item/ammo_box/c10mm/hp + category = list("Ammo") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY From 42ed17d2aff128d396525a8c08e2f0172b655580 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 24 Apr 2021 00:54:56 -0400 Subject: [PATCH 3/5] this too --- .../modules/projectiles/boxes_magazines/external/pistol.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm index 394ffcc58d..eb8da2726e 100644 --- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -92,7 +92,7 @@ desc = "A box of ammo containing 20 rounds designed to penetrate armor, at the cost of raw damage." id = "10apbox" build_type = PROTOLATHE - materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000) + materials = list(/datum/material/iron = 30000, /datum/material/titanium = 6000) build_path = /obj/item/ammo_box/c10mm/ap category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -102,7 +102,7 @@ desc = "A box of ammo containing 20 rounds designed to set people ablaze, at the cost of raw damage." id = "10apbox" build_type = PROTOLATHE - materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000) + materials = list(/datum/material/iron = 30000, /datum/material/plasma = 6000) build_path = /obj/item/ammo_box/c10mm/fire category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY @@ -112,7 +112,7 @@ desc = "A box of ammo containing 20 rounds designed to tear through unarmored opponents, while being completely ineffective against armor." id = "10apbox" build_type = PROTOLATHE - materials = list(/datum/material/iron = 30000, /datum/material/titanium = 5000) + materials = list(/datum/material/iron = 30000, /datum/material/glass = 6000) build_path = /obj/item/ammo_box/c10mm/hp category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY From 00f50713eb77c641a6541b7143f0edff10b3674d Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 24 Apr 2021 02:04:21 -0400 Subject: [PATCH 4/5] The fault in my stars --- .../modules/projectiles/boxes_magazines/external/pistol.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm index eb8da2726e..8737c4593f 100644 --- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -100,7 +100,7 @@ /datum/design/m10firebox name = "ammo box (10mm Incendiary)" desc = "A box of ammo containing 20 rounds designed to set people ablaze, at the cost of raw damage." - id = "10apbox" + id = "10firebox" build_type = PROTOLATHE materials = list(/datum/material/iron = 30000, /datum/material/plasma = 6000) build_path = /obj/item/ammo_box/c10mm/fire @@ -110,7 +110,7 @@ /datum/design/m10hpbox name = "ammo box (10mm Hollowpoint)" desc = "A box of ammo containing 20 rounds designed to tear through unarmored opponents, while being completely ineffective against armor." - id = "10apbox" + id = "10hpbox" build_type = PROTOLATHE materials = list(/datum/material/iron = 30000, /datum/material/glass = 6000) build_path = /obj/item/ammo_box/c10mm/hp From 87eee1e15ea5c25534b4aed43717e4fd975256ce Mon Sep 17 00:00:00 2001 From: The0bserver Date: Sat, 24 Apr 2021 02:22:43 -0400 Subject: [PATCH 5/5] Why do I do this to myself at 2:22 AM --- .../modules/projectiles/boxes_magazines/external/pistol.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm index 8737c4593f..858fe8fd5f 100644 --- a/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -90,7 +90,7 @@ /datum/design/m10apbox name = "ammo box (10mm Armour Piercing)" desc = "A box of ammo containing 20 rounds designed to penetrate armor, at the cost of raw damage." - id = "10apbox" + id = "m10apbox" build_type = PROTOLATHE materials = list(/datum/material/iron = 30000, /datum/material/titanium = 6000) build_path = /obj/item/ammo_box/c10mm/ap @@ -100,7 +100,7 @@ /datum/design/m10firebox name = "ammo box (10mm Incendiary)" desc = "A box of ammo containing 20 rounds designed to set people ablaze, at the cost of raw damage." - id = "10firebox" + id = "m10firebox" build_type = PROTOLATHE materials = list(/datum/material/iron = 30000, /datum/material/plasma = 6000) build_path = /obj/item/ammo_box/c10mm/fire @@ -110,7 +110,7 @@ /datum/design/m10hpbox name = "ammo box (10mm Hollowpoint)" desc = "A box of ammo containing 20 rounds designed to tear through unarmored opponents, while being completely ineffective against armor." - id = "10hpbox" + id = "m10hpbox" build_type = PROTOLATHE materials = list(/datum/material/iron = 30000, /datum/material/glass = 6000) build_path = /obj/item/ammo_box/c10mm/hp