From c45b04c49d9090d476f9d265e40f2917e2c2da15 Mon Sep 17 00:00:00 2001 From: octareenroon91 Date: Thu, 8 Oct 2015 18:18:45 -0600 Subject: [PATCH 1/2] Port pizzastation autolathe improvements Squashed version of 3 commits from pizza station Match the build_type to its defined bitflags. Introduce the "Machinery" category to accept low-tier machine parts. The designs in question already identify themselves as AUTOLATHE - buildable. They simply have no category. Update stock_parts_designs.dm Improve Autolathe selection Now you can make basic power cells in your Autolathe! --- code/game/machinery/autolathe.dm | 3 ++- code/modules/research/designs/power_designs.dm | 4 ++-- code/modules/research/designs/stock_parts_designs.dm | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 7472f7c6087..44624e57680 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -39,6 +39,7 @@ "Construction", "T-Comm", "Security", + "Machinery", "Medical", "Misc" ) @@ -373,7 +374,7 @@ if(hack) for(var/datum/design/D in files.possible_designs) - if((D.build_type & 4) && ("hacked" in D.category)) + if((D.build_type & AUTOLATHE) && ("hacked" in D.category)) files.known_designs += D else for(var/datum/design/D in files.known_designs) diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index a7df6bb115f..67eb0c36546 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -11,7 +11,7 @@ materials = list(MAT_METAL = 700, MAT_GLASS = 50) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell - category = list("Misc","Power Designs") + category = list("Misc","Power Designs","Machinery","initial") /datum/design/high_cell name = "High-Capacity Power Cell" @@ -22,7 +22,7 @@ materials = list(MAT_METAL = 700, MAT_GLASS = 60) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell/high - category = list("Misc","Power Designs") + category = list("Misc","Power Designs","Machinery","hacked") /datum/design/super_cell name = "Super-Capacity Power Cell" diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index e9d2511b8bb..3f10842e91f 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -32,7 +32,7 @@ build_type = PROTOLATHE | AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/stock_parts/capacitor - category = list("Stock Parts") + category = list("Stock Parts","Machinery","initial") /datum/design/adv_capacitor name = "Advanced Capacitor" @@ -75,7 +75,7 @@ build_type = PROTOLATHE | AUTOLATHE materials = list(MAT_METAL = 50, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/scanning_module - category = list("Stock Parts") + category = list("Stock Parts","Machinery","initial") /datum/design/adv_scanning name = "Advanced Scanning Module" @@ -118,7 +118,7 @@ build_type = PROTOLATHE | AUTOLATHE materials = list(MAT_METAL = 30) build_path = /obj/item/weapon/stock_parts/manipulator - category = list("Stock Parts") + category = list("Stock Parts","Machinery","initial") /datum/design/nano_mani name = "Nano Manipulator" @@ -161,7 +161,7 @@ build_type = PROTOLATHE | AUTOLATHE materials = list(MAT_METAL = 10, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/micro_laser - category = list("Stock Parts") + category = list("Stock Parts","Machinery","initial") /datum/design/high_micro_laser name = "High-Power Micro-Laser" @@ -203,7 +203,7 @@ build_type = PROTOLATHE | AUTOLATHE materials = list(MAT_METAL = 80) build_path = /obj/item/weapon/stock_parts/matter_bin - category = list("Stock Parts") + category = list("Stock Parts","Machinery","initial") /datum/design/adv_matter_bin name = "Advanced Matter Bin" @@ -306,4 +306,4 @@ build_type = PROTOLATHE materials = list(MAT_GLASS = 100, MAT_SILVER = 10, MAT_URANIUM = 15) build_path = /obj/item/weapon/stock_parts/subspace/transmitter - category = list("Stock Parts") \ No newline at end of file + category = list("Stock Parts") From f3a3139b7a538ae81f57c259e9dc5f08e3b5dd8d Mon Sep 17 00:00:00 2001 From: oranges Date: Mon, 12 Oct 2015 08:28:27 +1300 Subject: [PATCH 2/2] Disallow a hacked autholathe to build highcap cells It was decided that this was probably a little to OP with stun prods --- code/modules/research/designs/power_designs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index 67eb0c36546..0719aafb9e8 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -22,7 +22,7 @@ materials = list(MAT_METAL = 700, MAT_GLASS = 60) construction_time=100 build_path = /obj/item/weapon/stock_parts/cell/high - category = list("Misc","Power Designs","Machinery","hacked") + category = list("Misc","Power Designs") /datum/design/super_cell name = "Super-Capacity Power Cell"