From f8a99c28a7ec699991dba43acc4ffac12c024c9a Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Thu, 23 Apr 2020 18:50:47 +0200 Subject: [PATCH] removes confusing bitflag in research.dm part 2: no webeditalaroo (#50536) * epic kevinz moment * extra checks * done * fixes * forgot this one * webedit --- code/__DEFINES/research.dm | 2 -- .../research/designs/comp_board_designs.dm | 8 +++--- .../research/designs/electronics_designs.dm | 2 +- .../research/designs/machine_designs.dm | 26 +++++++++---------- .../research/designs/medical_designs.dm | 4 +-- code/modules/research/designs/misc_designs.dm | 8 +++--- .../modules/research/designs/power_designs.dm | 1 - .../research/designs/stock_parts_designs.dm | 1 - .../modules/research/machinery/_production.dm | 2 +- .../departmental_circuit_imprinter.dm | 2 +- .../machinery/departmental_protolathe.dm | 12 ++++----- .../machinery/departmental_techfab.dm | 12 ++++----- 12 files changed, 38 insertions(+), 42 deletions(-) diff --git a/code/__DEFINES/research.dm b/code/__DEFINES/research.dm index 8e4fc4ca1d8..a0e2fa9d9f9 100644 --- a/code/__DEFINES/research.dm +++ b/code/__DEFINES/research.dm @@ -57,8 +57,6 @@ #define DEPARTMENTAL_FLAG_SCIENCE (1<<3) #define DEPARTMENTAL_FLAG_ENGINEERING (1<<4) #define DEPARTMENTAL_FLAG_SERVICE (1<<5) -#define DEPARTMENTAL_FLAG_ALL (1<<6) //NO THIS DOESN'T ALLOW YOU TO PRINT EVERYTHING, IT'S FOR ALL DEPARTMENTS! -//#define DEPARTMENTAL_FLAG_MINING (1<<7) //I swear I'm actually going to use this eventually leave it here #define DESIGN_ID_IGNORE "IGNORE_THIS_DESIGN" ///For instances where we don't want a design showing up due to it being for debug/sanity purposes diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 0bb813a8ca5..61fe825bc30 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -12,7 +12,7 @@ id = "arcade_battle" build_path = /obj/item/circuitboard/computer/arcade/battle category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/orion_trail name = "Computer Design (Orion Trail Arcade Machine)" @@ -20,7 +20,7 @@ id = "arcade_orion" build_path = /obj/item/circuitboard/computer/arcade/orion_trail category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/seccamera name = "Computer Design (Security Camera)" @@ -158,7 +158,7 @@ id = "slotmachine" build_path = /obj/item/circuitboard/computer/slot_machine category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/powermonitor name = "Computer Design (Power Monitor)" @@ -278,7 +278,7 @@ id = "libraryconsole" build_path = /obj/item/circuitboard/computer/libraryconsole category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/apc_control name = "Computer Design (APC Control)" diff --git a/code/modules/research/designs/electronics_designs.dm b/code/modules/research/designs/electronics_designs.dm index 109a41207d8..5eedb4f731a 100644 --- a/code/modules/research/designs/electronics_designs.dm +++ b/code/modules/research/designs/electronics_designs.dm @@ -21,7 +21,7 @@ materials = list(/datum/material/glass = 500, /datum/material/iron = 500) build_path = /obj/item/paicard category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/ai_cam_upgrade name = "AI Surveillance Software Update" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 72fbb34ec79..46e97dc4c34 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -183,7 +183,7 @@ id = "reagentgrinder" build_path = /obj/item/circuitboard/machine/reagentgrinder category = list ("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/dnascanner name = "Machine Design (DNA Scanner)" @@ -335,7 +335,7 @@ id = "microwave" build_path = /obj/item/circuitboard/machine/microwave category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/gibber name = "Machine Design (Gibber Board)" @@ -351,7 +351,7 @@ id = "smartfridge" build_path = /obj/item/circuitboard/machine/smartfridge category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/monkey_recycler name = "Machine Design (Monkey Recycler Board)" @@ -399,7 +399,7 @@ id = "recycler" build_path = /obj/item/circuitboard/machine/recycler category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/scanner_gate name = "Machine Design (Scanner Gate)" @@ -407,7 +407,7 @@ id = "scanner_gate" build_path = /obj/item/circuitboard/machine/scanner_gate category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/holopad name = "Machine Design (AI Holopad Board)" @@ -415,7 +415,7 @@ id = "holopad" build_path = /obj/item/circuitboard/machine/holopad category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/autolathe name = "Machine Design (Autolathe Board)" @@ -423,7 +423,7 @@ id = "autolathe" build_path = /obj/item/circuitboard/machine/autolathe category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL //Lets be honest here half the maps have public ones. + /datum/design/board/recharger name = "Machine Design (Weapon Recharger Board)" @@ -432,7 +432,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) build_path = /obj/item/circuitboard/machine/recharger category = list("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/vendor name = "Machine Design (Vendor Board)" @@ -440,7 +440,7 @@ id = "vendor" build_path = /obj/item/circuitboard/machine/vendor category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/ore_redemption name = "Machine Design (Ore Redemption Board)" @@ -520,7 +520,7 @@ id = "donksofttoyvendor" build_path = /obj/item/circuitboard/machine/vending/donksofttoyvendor category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL //Toys!! + /datum/design/board/cell_charger name = "Machine Design (Cell Charger Board)" @@ -528,7 +528,7 @@ id = "cell_charger" build_path = /obj/item/circuitboard/machine/cell_charger category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/dish_drive name = "Machine Design (Dish Drive)" @@ -568,7 +568,7 @@ id = "paystand" build_path = /obj/item/circuitboard/machine/paystand category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/board/fat_sucker name = "Machine Design (Lipid Extractor)" @@ -616,4 +616,4 @@ id = "sheetifier" build_path = /obj/item/circuitboard/machine/sheetifier category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ALL + diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 09e44eb1c3d..517abcc4394 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -119,7 +119,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/plasma = 1000) build_path = /obj/item/extinguisher_refill category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/crewpinpointer name = "Crew Pinpointer" @@ -493,7 +493,7 @@ materials = list(/datum/material/glass = 500, /datum/material/bananium = 500) build_path = /obj/item/implantcase/sad_trombone category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_ALL //if you get bananium you get the sad trombones. + /datum/design/implant_chem name = "Chemical Implant Case" diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index a3a425d3717..5a39a9a9ede 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -105,7 +105,7 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 100) build_path = /obj/item/reagent_containers/glass/maunamug category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/rolling_table name = "Rolly poly" @@ -115,7 +115,7 @@ materials = list(/datum/material/iron = 4000) build_path = /obj/structure/table/rolling category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ALL + /datum/design/portaseeder name = "Portable Seed Extractor" @@ -135,7 +135,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/bananium = 1000) build_path = /obj/item/bikehorn/airhorn category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ALL //HONK! + /datum/design/mesons name = "Optical Meson Scanners" @@ -323,7 +323,7 @@ materials = list(/datum/material/plastic = 1000) build_path = /obj/item/bikehorn/rubberducky/plasticducky category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ALL + ///////////////////////////////////////// ////////////Janitor Designs////////////// diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index fdbeab1968f..8efaad3b760 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -11,7 +11,6 @@ construction_time=100 build_path = /obj/item/stock_parts/cell/empty category = list("Misc","Power Designs","Machinery","initial") - departmental_flags = DEPARTMENTAL_FLAG_ALL /datum/design/high_cell name = "High-Capacity Power Cell" diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index fa718344e94..221699e4c90 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -325,4 +325,3 @@ materials = list(/datum/material/iron=50, /datum/material/glass=10) build_path = /obj/item/stock_parts/card_reader category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ALL diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index efc10ae0ba3..b8848c40a4b 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -168,7 +168,7 @@ matching_designs.Cut() for(var/v in stored_research.researched_designs) var/datum/design/D = SSresearch.techweb_design_by_id(v) - if(!(D.build_type & allowed_buildtypes) || !(isnull(allowed_department_flags) || (D.departmental_flags & allowed_department_flags))) + if(!(D.build_type & allowed_buildtypes) || !(isnull(allowed_department_flags) ||(D.departmental_flags & allowed_department_flags))) continue if(findtext(D.name,string)) matching_designs.Add(D) diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm index 4c455ad9d05..574009d94b3 100644 --- a/code/modules/research/machinery/departmental_circuit_imprinter.dm +++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm @@ -9,5 +9,5 @@ /obj/machinery/rnd/production/circuit_imprinter/department/science name = "department circuit imprinter (Science)" circuit = /obj/item/circuitboard/machine/circuit_imprinter/department/science - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE + allowed_department_flags = DEPARTMENTAL_FLAG_SCIENCE department_tag = "Science" diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index c5956ce2a39..fb76cfd60ca 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -8,36 +8,36 @@ /obj/machinery/rnd/production/protolathe/department/engineering name = "department protolathe (Engineering)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_ENGINEERING + allowed_department_flags = DEPARTMENTAL_FLAG_ENGINEERING department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/protolathe/department/engineering /obj/machinery/rnd/production/protolathe/department/service name = "department protolathe (Service)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SERVICE + allowed_department_flags = DEPARTMENTAL_FLAG_SERVICE department_tag = "Service" circuit = /obj/item/circuitboard/machine/protolathe/department/service /obj/machinery/rnd/production/protolathe/department/medical name = "department protolathe (Medical)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_MEDICAL + allowed_department_flags = DEPARTMENTAL_FLAG_MEDICAL department_tag = "Medical" circuit = /obj/item/circuitboard/machine/protolathe/department/medical /obj/machinery/rnd/production/protolathe/department/cargo name = "department protolathe (Cargo)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_CARGO + allowed_department_flags = DEPARTMENTAL_FLAG_CARGO department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/protolathe/department/cargo /obj/machinery/rnd/production/protolathe/department/science name = "department protolathe (Science)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE + allowed_department_flags = DEPARTMENTAL_FLAG_SCIENCE department_tag = "Science" circuit = /obj/item/circuitboard/machine/protolathe/department/science /obj/machinery/rnd/production/protolathe/department/security name = "department protolathe (Security)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY + allowed_department_flags = DEPARTMENTAL_FLAG_SECURITY department_tag = "Security" circuit = /obj/item/circuitboard/machine/protolathe/department/security diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm index 9e598376e5c..99ad3c70707 100644 --- a/code/modules/research/machinery/departmental_techfab.dm +++ b/code/modules/research/machinery/departmental_techfab.dm @@ -6,36 +6,36 @@ /obj/machinery/rnd/production/techfab/department/engineering name = "department techfab (Engineering)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_ENGINEERING + allowed_department_flags = DEPARTMENTAL_FLAG_ENGINEERING department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/techfab/department/engineering /obj/machinery/rnd/production/techfab/department/service name = "department techfab (Service)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SERVICE + allowed_department_flags = DEPARTMENTAL_FLAG_SERVICE department_tag = "Service" circuit = /obj/item/circuitboard/machine/techfab/department/service /obj/machinery/rnd/production/techfab/department/medical name = "department techfab (Medical)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_MEDICAL + allowed_department_flags = DEPARTMENTAL_FLAG_MEDICAL department_tag = "Medical" circuit = /obj/item/circuitboard/machine/techfab/department/medical /obj/machinery/rnd/production/techfab/department/cargo name = "department techfab (Cargo)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_CARGO + allowed_department_flags = DEPARTMENTAL_FLAG_CARGO department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/techfab/department/cargo /obj/machinery/rnd/production/techfab/department/science name = "department techfab (Science)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SCIENCE + allowed_department_flags = DEPARTMENTAL_FLAG_SCIENCE department_tag = "Science" circuit = /obj/item/circuitboard/machine/techfab/department/science /obj/machinery/rnd/production/techfab/department/security name = "department techfab (Security)" - allowed_department_flags = DEPARTMENTAL_FLAG_ALL|DEPARTMENTAL_FLAG_SECURITY + allowed_department_flags = DEPARTMENTAL_FLAG_SECURITY department_tag = "Security" circuit = /obj/item/circuitboard/machine/techfab/department/security