From 86c72f9302ceb2da676366ec42ecca05b908bc66 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 17 May 2022 22:42:51 +0200 Subject: [PATCH] [MIRROR] Lathe taxes now checks departmental flags [MDB IGNORE] (#13563) * Lathe taxes now checks departmental flags * Update tool_designs.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> --- code/__DEFINES/research.dm | 8 - code/modules/mining/lavaland/tendril_loot.dm | 2 +- .../research/designs/AI_module_designs.dm | 34 ++-- .../research/designs/autolathe_designs.dm | 124 +++++++------- .../research/designs/bluespace_designs.dm | 14 +- .../research/designs/comp_board_designs.dm | 62 +++---- .../research/designs/computer_part_designs.dm | 42 ++--- .../research/designs/electronics_designs.dm | 10 +- .../research/designs/experisci_designs.dm | 2 +- .../research/designs/limbgrower_designs.dm | 2 +- .../research/designs/machine_designs.dm | 158 +++++++++--------- .../modules/research/designs/mecha_designs.dm | 54 +++--- .../designs/mechfabricator_designs.dm | 10 +- .../research/designs/medical_designs.dm | 114 ++++++------- .../research/designs/mining_designs.dm | 26 +-- code/modules/research/designs/misc_designs.dm | 120 ++++++------- .../modules/research/designs/power_designs.dm | 12 +- .../research/designs/smelting_designs.dm | 14 +- .../research/designs/stock_parts_designs.dm | 60 +++---- .../research/designs/telecomms_designs.dm | 16 +- code/modules/research/designs/tool_designs.dm | 56 +++---- .../research/designs/weapon_designs.dm | 66 ++++---- .../research/designs/wiremod_designs.dm | 8 +- .../modules/research/machinery/_production.dm | 4 +- .../departmental_circuit_imprinter.dm | 2 +- .../machinery/departmental_protolathe.dm | 12 +- .../machinery/departmental_techfab.dm | 12 +- .../modules/research/designs/misc_designs.dm | 10 +- .../ammo_workbench/code/ammo_workbench.dm | 2 +- .../ammo_workbench/code/design_disks.dm | 2 +- .../apocolypse_of_scythes/code/scythes.dm | 4 +- .../bluespace_miner/code/bluespace_miner.dm | 2 +- .../cargo_teleporter/code/cargo_teleporter.dm | 2 +- .../modules/cellguns/code/medigun_research.dm | 32 ++-- .../conveyor_sorter/code/conveyor_sorter.dm | 2 +- .../electric_welder/code/electric_welder.dm | 2 +- .../code/bluespace_design.dm | 6 +- modular_skyrat/modules/huds/code/designs.dm | 12 +- .../hyposprays/code/autolathe_designs.dm | 2 +- .../modules/implants/code/medical_designs.dm | 18 +- .../microfusion/code/microfusion_designs.dm | 2 +- .../modular_items/code/ranged_analyzer.dm | 2 +- .../modules/mutants/code/mutant_techweb.dm | 6 +- .../modules/sec_haul/code/guns/ammo.dm | 2 +- .../sec_haul/code/guns/pepperball_gun.dm | 2 +- .../code/self_actualization_device.dm | 2 +- .../stasisrework/code/medical_designs.dm | 4 +- .../research/xenoarch/designs_and_tech.dm | 30 ++-- 48 files changed, 591 insertions(+), 599 deletions(-) diff --git a/code/__DEFINES/research.dm b/code/__DEFINES/research.dm index 30ed0d4ad50..c4eb553cf06 100644 --- a/code/__DEFINES/research.dm +++ b/code/__DEFINES/research.dm @@ -7,14 +7,6 @@ #define RESEARCH_FABRICATOR_SCREEN_SEARCH 4 #define RESEARCH_FABRICATOR_SCREEN_CATEGORYVIEW 5 -//! Department flags for techwebs. Defines which department can print what from each protolathe so Cargo can't print guns, etc. -#define DEPARTMENTAL_FLAG_SECURITY (1<<0) -#define DEPARTMENTAL_FLAG_MEDICAL (1<<1) -#define DEPARTMENTAL_FLAG_CARGO (1<<2) -#define DEPARTMENTAL_FLAG_SCIENCE (1<<3) -#define DEPARTMENTAL_FLAG_ENGINEERING (1<<4) -#define DEPARTMENTAL_FLAG_SERVICE (1<<5) - /// For instances where we don't want a design showing up due to it being for debug/sanity purposes #define DESIGN_ID_IGNORE "IGNORE_THIS_DESIGN" diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 854a457697e..7cd7f9f1d2a 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -30,7 +30,7 @@ /datum/design/unique_modkit category = list("Mining Designs", "Cyborg Upgrade Modules") //can't be normally obtained build_type = PROTOLATHE | AWAY_LATHE | MECHFAB - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/unique_modkit/offensive_turf_aoe name = "Kinetic Accelerator Offensive Mining Explosion Mod" diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index 69be3203da0..c74deeffa65 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -8,7 +8,7 @@ id = "aicore" build_path = /obj/item/circuitboard/aicore category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/safeguard_module name = "Module Design (Safeguard)" @@ -17,7 +17,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/supplied/safeguard category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/onehuman_module name = "Module Design (OneHuman)" @@ -26,7 +26,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 6000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/zeroth/onehuman category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/protectstation_module name = "Module Design (ProtectStation)" @@ -35,7 +35,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/supplied/protect_station category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/quarantine_module name = "Module Design (Quarantine)" @@ -44,7 +44,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/supplied/quarantine category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/oxygen_module name = "Module Design (OxygenIsToxicToHumans)" @@ -53,7 +53,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/supplied/oxygen category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/freeform_module name = "Module Design (Freeform)" @@ -62,7 +62,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 10000, /datum/material/bluespace = 2000)//Custom inputs should be more expensive to get build_path = /obj/item/ai_module/supplied/freeform category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/reset_module name = "Module Design (Reset)" @@ -71,7 +71,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) build_path = /obj/item/ai_module/reset category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/purge_module name = "Module Design (Purge)" @@ -80,7 +80,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/reset/purge category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/remove_module name = "Module Design (Law Removal)" @@ -89,7 +89,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/remove category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/freeformcore_module name = "AI Core Module (Freeform)" @@ -98,7 +98,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 10000, /datum/material/bluespace = 2000)//Ditto build_path = /obj/item/ai_module/core/freeformcore category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/asimov name = "Core Module Design (Asimov)" @@ -107,7 +107,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/core/full/asimov category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/paladin_module name = "Core Module Design (P.A.L.A.D.I.N.)" @@ -116,7 +116,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/core/full/paladin category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/tyrant_module name = "Core Module Design (T.Y.R.A.N.T.)" @@ -125,7 +125,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/core/full/tyrant category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/overlord_module name = "Core Module Design (Overlord)" @@ -134,7 +134,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/core/full/overlord category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/corporate_module name = "Core Module Design (Corporate)" @@ -143,7 +143,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/core/full/corp category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/default_module name = "Core Module Design (Default)" @@ -152,4 +152,4 @@ materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000, /datum/material/bluespace = 1000) build_path = /obj/item/ai_module/core/full/custom category = list("AI Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index ab9adf2f9da..fbfea0465fb 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -9,7 +9,7 @@ materials = list(/datum/material/iron = 200) build_path = /obj/item/reagent_containers/glass/bucket category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/mop name = "Mop" @@ -18,7 +18,7 @@ materials = list(/datum/material/iron = 1000) build_path = /obj/item/mop category = list("initial", "Equipment", "Tools", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/broom name="Push Broom" @@ -27,7 +27,7 @@ materials = list(/datum/material/iron = 2000) build_path = /obj/item/pushbroom category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/crowbar name = "Pocket Crowbar" @@ -36,7 +36,7 @@ materials = list(/datum/material/iron = 50) build_path = /obj/item/crowbar category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/flashlight name = "Flashlight" @@ -69,7 +69,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 20) build_path = /obj/item/multitool category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/analyzer name = "Gas Analyzer" @@ -78,7 +78,7 @@ materials = list(/datum/material/iron = 30, /datum/material/glass = 20) build_path = /obj/item/analyzer category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/tscanner name = "T-Ray Scanner" @@ -87,7 +87,7 @@ materials = list(/datum/material/iron = 150) build_path = /obj/item/t_scanner category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/weldingtool name = "Welding Tool" @@ -96,7 +96,7 @@ materials = list(/datum/material/iron = 70, /datum/material/glass = 20) build_path = /obj/item/weldingtool category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/mini_weldingtool name = "Emergency Welding Tool" @@ -113,7 +113,7 @@ materials = list(/datum/material/iron = 75) build_path = /obj/item/screwdriver category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/wirecutters name = "Wirecutters" @@ -122,7 +122,7 @@ materials = list(/datum/material/iron = 80) build_path = /obj/item/wirecutters category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/wrench name = "Wrench" @@ -131,7 +131,7 @@ materials = list(/datum/material/iron = 150) build_path = /obj/item/wrench category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/plunger name = "Plunger" @@ -140,7 +140,7 @@ materials = list(/datum/material/iron = 150) build_path = /obj/item/plunger category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/welding_helmet name = "Welding Helmet" @@ -149,7 +149,7 @@ materials = list(/datum/material/iron = 1750, /datum/material/glass = 400) build_path = /obj/item/clothing/head/welding category = list("initial","Tools","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/cable_coil name = "Cable Coil" @@ -159,7 +159,7 @@ build_path = /obj/item/stack/cable_coil category = list("initial","Tools","Tool Designs") maxstack = MAXCOIL - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/toolbox name = "Toolbox" @@ -176,7 +176,7 @@ materials = list(/datum/material/iron = 100, /datum/material/glass = 100) build_path = /obj/item/electronics/apc category = list("initial", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/airlock_board name = "Airlock Electronics" @@ -185,7 +185,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 50) build_path = /obj/item/electronics/airlock category = list("initial", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/firelock_board name = "Firelock Circuitry" @@ -194,7 +194,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 50) build_path = /obj/item/electronics/firelock category = list("initial", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/airalarm_electronics name = "Air Alarm Electronics" @@ -203,7 +203,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 50) build_path = /obj/item/electronics/airalarm category = list("initial", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/firealarm_electronics name = "Fire Alarm Electronics" @@ -212,7 +212,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 50) build_path = /obj/item/electronics/firealarm category = list("initial", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/camera name = "Camera" @@ -245,7 +245,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2000) build_path = /obj/item/pipe_painter category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/airlock_painter name = "Airlock Painter" @@ -254,7 +254,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 50) build_path = /obj/item/airlock_painter category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE /datum/design/airlock_painter/decal name = "Decal Painter" @@ -263,7 +263,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 50) build_path = /obj/item/airlock_painter/decal category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE /datum/design/airlock_painter/decal/tile name = "Tile Sprayer" @@ -272,7 +272,7 @@ materials = list(/datum/material/iron = 50, /datum/material/glass = 50) build_path = /obj/item/airlock_painter/decal/tile category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE /datum/design/emergency_oxygen name = "Emergency Oxygen Tank" @@ -289,7 +289,7 @@ materials = list(/datum/material/iron = 750) build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty category = list("hacked","Misc","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO /datum/design/plasmaman_tank_belt name = "Plasmaman Belt Tank" @@ -298,7 +298,7 @@ materials = list(/datum/material/iron = 800) build_path = /obj/item/tank/internals/plasmaman/belt/empty category = list("hacked","Misc","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO /datum/design/generic_gas_tank name = "Generic Gas Tank" @@ -307,7 +307,7 @@ materials = list(/datum/material/iron = 1000) build_path = /obj/item/tank/internals/generic category = list("initial","Misc","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO /datum/design/iron name = "Iron" @@ -384,7 +384,7 @@ materials = list(/datum/material/plastic = 80) build_path = /obj/item/kitchen/fork/plastic category = list("initial", "Tool Designs", "Dinnerware") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/spoon name = "Spoon" @@ -393,7 +393,7 @@ materials = list(/datum/material/iron = 120) build_path = /obj/item/kitchen/spoon category = list("initial", "Tool Designs", "Dinnerware") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/plastic_spoon name = "Plastic Spoon" @@ -402,7 +402,7 @@ materials = list(/datum/material/plastic = 120) build_path = /obj/item/kitchen/spoon/plastic category = list("initial", "Tool Designs", "Dinnerware") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/tray name = "Serving Tray" @@ -435,7 +435,7 @@ materials = list(/datum/material/glass = 500) build_path = /obj/item/reagent_containers/glass/bowl category = list("initial", "Tool Designs", "Dinnerware") // SKYRAT EDIT - Original line: category = list("initial","Dinnerware") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE //SKYRAT EDIT: added to service techfab + departmental_flags = DEPARTMENT_BITFLAG_SERVICE //SKYRAT EDIT: added to service techfab /datum/design/drinking_glass name = "Drinking Glass" @@ -446,7 +446,7 @@ build_path = /obj/item/reagent_containers/food/drinks/drinkingglass //category = list("initial","Dinnerware") SKYRAT EDIT: Original line category = list("initial", "Tool Designs", "Dinnerware") // SKYRAT EDIT - departmental_flags = DEPARTMENTAL_FLAG_SERVICE //SKYRAT EDIT: added to service techfab + departmental_flags = DEPARTMENT_BITFLAG_SERVICE //SKYRAT EDIT: added to service techfab /datum/design/shot_glass name = "Shot Glass" @@ -455,7 +455,7 @@ materials = list(/datum/material/glass = 100) build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass category = list("initial", "Tool Designs", "Dinnerware") // SKYRAT EDIT - Original line: category = list("initial","Dinnerware") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE //SKYRAT EDIT: added to service techfab + departmental_flags = DEPARTMENT_BITFLAG_SERVICE //SKYRAT EDIT: added to service techfab /datum/design/shaker name = "Shaker" @@ -472,7 +472,7 @@ materials = list(/datum/material/iron=50) build_path = /obj/item/cultivator category = list("initial","Misc", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/plant_analyzer name = "Plant Analyzer" @@ -481,7 +481,7 @@ materials = list(/datum/material/iron = 30, /datum/material/glass = 20) build_path = /obj/item/plant_analyzer category = list("initial","Misc", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/shovel name = "Shovel" @@ -490,7 +490,7 @@ materials = list(/datum/material/iron = 50) build_path = /obj/item/shovel category = list("initial","Misc", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/spade name = "Spade" @@ -499,7 +499,7 @@ materials = list(/datum/material/iron = 50) build_path = /obj/item/shovel/spade category = list("initial","Misc", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/hatchet name = "Hatchet" @@ -508,7 +508,7 @@ materials = list(/datum/material/iron = 15000) build_path = /obj/item/hatchet category = list("initial","Misc", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/secateurs name = "Secateurs" @@ -517,7 +517,7 @@ materials = list(/datum/material/iron = 4000) build_path = /obj/item/secateurs category = list("initial","Misc", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/foilhat name = "Tinfoil Hat" @@ -534,7 +534,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/glass = 1500, /datum/material/silver = 500) build_path = /obj/item/blood_filter category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/scalpel name = "Scalpel" @@ -543,7 +543,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/silver = 2000) build_path = /obj/item/scalpel category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/circular_saw name = "Circular Saw" @@ -552,7 +552,7 @@ materials = list(/datum/material/iron = 10000, /datum/material/glass = 6000, /datum/material/silver = 5000) build_path = /obj/item/circular_saw category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/bonesetter name = "Bonesetter" @@ -561,7 +561,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 2500) build_path = /obj/item/bonesetter category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/surgicaldrill name = "Surgical Drill" @@ -570,7 +570,7 @@ materials = list(/datum/material/iron = 10000, /datum/material/glass = 6000, /datum/material/silver = 5000) build_path = /obj/item/surgicaldrill category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/retractor name = "Retractor" @@ -579,7 +579,7 @@ materials = list(/datum/material/iron = 6000, /datum/material/glass = 3000, /datum/material/silver = 3000) build_path = /obj/item/retractor category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/cautery name = "Cautery" @@ -588,7 +588,7 @@ materials = list(/datum/material/iron = 2500, /datum/material/glass = 750, /datum/material/silver = 1250) build_path = /obj/item/cautery category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/hemostat name = "Hemostat" @@ -597,7 +597,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 2500) build_path = /obj/item/hemostat category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/stethoscope name = "Stethoscope" @@ -606,7 +606,7 @@ materials = list(/datum/material/iron = 1000) build_path = /obj/item/clothing/neck/stethoscope category = list("initial", "Medical", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/beaker name = "Beaker" @@ -615,7 +615,7 @@ materials = list(/datum/material/glass = 500) build_path = /obj/item/reagent_containers/glass/beaker category = list("initial", "Medical", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE /datum/design/large_beaker name = "Large Beaker" @@ -624,7 +624,7 @@ materials = list(/datum/material/glass = 2500) build_path = /obj/item/reagent_containers/glass/beaker/large category = list("initial", "Medical", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE /datum/design/pillbottle name = "Pill Bottle" @@ -633,7 +633,7 @@ materials = list(/datum/material/plastic = 20, /datum/material/glass = 100) build_path = /obj/item/storage/pill_bottle category = list("initial", "Medical", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/beanbag_slug name = "Beanbag Slug" @@ -802,7 +802,7 @@ materials = list(/datum/material/iron = 10, /datum/material/glass = 20) build_path = /obj/item/reagent_containers/syringe category = list("initial", "Medical", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/dropper name = "Dropper" @@ -811,7 +811,7 @@ materials = list(/datum/material/glass = 10, /datum/material/plastic = 30) build_path = /obj/item/reagent_containers/dropper category = list("initial", "Medical", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/prox_sensor name = "Proximity Sensor" @@ -951,7 +951,7 @@ materials = list(/datum/material/iron = 100, /datum/material/glass = 100) build_path = /obj/item/toy/crayon/spraycan category = list("initial","Tools","Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/desttagger name = "Destination Tagger" @@ -968,7 +968,7 @@ materials = list(/datum/material/iron = 700, /datum/material/glass = 200) build_path = /obj/item/sales_tagger category = list("initial", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SERVICE /datum/design/handlabeler name = "Hand Labeler" @@ -1002,7 +1002,7 @@ build_path = /obj/item/stack/conveyor category = list("initial", "Construction", "Electronics") maxstack = 30 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/conveyor_switch name = "Conveyor Belt Switch" @@ -1011,7 +1011,7 @@ materials = list(/datum/material/iron = 450, /datum/material/glass = 190) build_path = /obj/item/conveyor_switch_construct category = list("initial", "Construction", "Electronics") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/laptop name = "Laptop Frame" @@ -1202,7 +1202,7 @@ materials = list(/datum/material/plastic = 500) build_path = /obj/item/stack/sticky_tape/surgical category = list("initial", "Medical") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/petridish name = "Petri Dish" @@ -1211,7 +1211,7 @@ materials = list(/datum/material/glass = 500) build_path = /obj/item/petri_dish category = list("initial","Misc","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/swab name = "Sterile Swab" @@ -1220,7 +1220,7 @@ materials = list(/datum/material/plastic = 200) build_path = /obj/item/swab category = list("initial","Misc","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/chisel name = "Chisel" @@ -1245,7 +1245,7 @@ materials = list(/datum/material/iron = 75) build_path = /obj/item/razor category = list("initial","Medical") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/paperroll name = "Hand Labeler Paper Roll" @@ -1262,7 +1262,7 @@ materials = list(/datum/material/iron = 10, /datum/material/glass = 10) build_path = /obj/item/toner category = list("initial", "Misc", "Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE /datum/design/toner/large name = "Large Toner Cartridge" @@ -1271,4 +1271,4 @@ materials = list(/datum/material/iron = 35, /datum/material/glass = 35) build_path = /obj/item/toner/large category = list("initial", "Misc", "Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE diff --git a/code/modules/research/designs/bluespace_designs.dm b/code/modules/research/designs/bluespace_designs.dm index ee8c7344928..e39cce8093d 100644 --- a/code/modules/research/designs/bluespace_designs.dm +++ b/code/modules/research/designs/bluespace_designs.dm @@ -11,7 +11,7 @@ materials = list(/datum/material/iron = 150, /datum/material/glass = 100) build_path = /obj/item/beacon category = list("Bluespace Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SECURITY /datum/design/bag_holding name = "Inert Bag of Holding" @@ -22,7 +22,7 @@ build_path = /obj/item/bag_of_holding_inert category = list("Bluespace Designs") dangerous_construction = TRUE - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/bluespace_crystal name = "Artificial Bluespace Crystal" @@ -32,7 +32,7 @@ materials = list(/datum/material/diamond = 1500, /datum/material/plasma = 1500) build_path = /obj/item/stack/ore/bluespace_crystal/artificial category = list("Bluespace Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/telesci_gps name = "GPS Device" @@ -42,7 +42,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 1000) build_path = /obj/item/gps category = list("Bluespace Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO /datum/design/desynchronizer name = "Desynchronizer" @@ -52,7 +52,7 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/silver = 1500, /datum/material/bluespace = 1000) build_path = /obj/item/desynchronizer category = list("Bluespace Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/miningsatchel_holding name = "Mining Satchel of Holding" @@ -62,7 +62,7 @@ materials = list(/datum/material/gold = 250, /datum/material/uranium = 500) //quite cheap, for more convenience build_path = /obj/item/storage/bag/ore/holding category = list("Bluespace Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/swapper name = "Quantum Spin Inverter" @@ -72,4 +72,4 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 1000, /datum/material/bluespace = 2000, /datum/material/gold = 1500, /datum/material/silver = 1000) build_path = /obj/item/swapper category = list("Bluespace Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index f48584a8ff7..425d053d032 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -28,7 +28,7 @@ id = "seccamera" build_path = /obj/item/circuitboard/computer/security category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/board/rdcamera name = "Computer Design (Research Monitor)" @@ -36,7 +36,7 @@ id = "rdcamera" build_path = /obj/item/circuitboard/computer/research category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/xenobiocamera name = "Computer Design (Xenobiology Console)" @@ -44,7 +44,7 @@ id = "xenobioconsole" build_path = /obj/item/circuitboard/computer/xenobiology category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/aiupload name = "Computer Design (AI Upload)" @@ -53,7 +53,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/diamond = 2000, /datum/material/bluespace = 2000) build_path = /obj/item/circuitboard/computer/aiupload category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/borgupload name = "Computer Design (Cyborg Upload)" @@ -62,7 +62,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000, /datum/material/diamond = 2000, /datum/material/bluespace = 2000) build_path = /obj/item/circuitboard/computer/borgupload category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/med_data name = "Computer Design (Medical Records)" @@ -70,7 +70,7 @@ id = "med_data" build_path = /obj/item/circuitboard/computer/med_data category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/operating name = "Computer Design (Operating Computer)" @@ -78,7 +78,7 @@ id = "operating" build_path = /obj/item/circuitboard/computer/operating category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/pandemic name = "Computer Design (PanD.E.M.I.C. 2200)" @@ -86,7 +86,7 @@ id = "pandemic" build_path = /obj/item/circuitboard/computer/pandemic category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/scan_console name = "Computer Design (DNA Console)" @@ -94,7 +94,7 @@ id = "scan_console" build_path = /obj/item/circuitboard/computer/scan_consolenew category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/comconsole name = "Computer Design (Communications)" @@ -102,7 +102,7 @@ id = "comconsole" build_path = /obj/item/circuitboard/computer/communications category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY //Honestly should have a bridge techfab for this sometime. + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SECURITY //Honestly should have a bridge techfab for this sometime. /datum/design/board/crewconsole name = "Computer Design (Crew monitoring computer)" @@ -111,7 +111,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/computer/crew category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/secdata name = "Computer Design (Security Records Console)" @@ -119,7 +119,7 @@ id = "secdata" build_path = /obj/item/circuitboard/computer/secure_data category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/board/atmosalerts name = "Computer Design (Atmosphere Alert)" @@ -127,7 +127,7 @@ id = "atmosalerts" build_path = /obj/item/circuitboard/computer/atmos_alert category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/atmos_control name = "Computer Design (Atmospheric Monitor)" @@ -135,7 +135,7 @@ id = "atmos_control" build_path = /obj/item/circuitboard/computer/atmos_control category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/robocontrol name = "Computer Design (Robotics Control Console)" @@ -144,7 +144,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000, /datum/material/bluespace = 2000) build_path = /obj/item/circuitboard/computer/robotics category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/slot_machine name = "Computer Design (Slot Machine)" @@ -160,7 +160,7 @@ id = "powermonitor" build_path = /obj/item/circuitboard/computer/powermonitor category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/solarcontrol name = "Computer Design (Solar Control)" @@ -168,7 +168,7 @@ id = "solarcontrol" build_path = /obj/item/circuitboard/computer/solar_control category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/prisonmanage name = "Computer Design (Prisoner Management Console)" @@ -176,7 +176,7 @@ id = "prisonmanage" build_path = /obj/item/circuitboard/computer/prisoner category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/board/mechacontrol name = "Computer Design (Exosuit Control Console)" @@ -184,7 +184,7 @@ id = "mechacontrol" build_path = /obj/item/circuitboard/computer/mecha_control category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/mechapower name = "Computer Design (Mech Bay Power Control Console)" @@ -192,7 +192,7 @@ id = "mechapower" build_path = /obj/item/circuitboard/computer/mech_bay_power_console category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/rdconsole name = "Computer Design (R&D Console)" @@ -200,7 +200,7 @@ id = "rdconsole" build_path = /obj/item/circuitboard/computer/rdconsole category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/cargo name = "Computer Design (Supply Console)" @@ -209,7 +209,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/computer/cargo category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/board/cargorequest name = "Computer Design (Supply Request Console)" @@ -218,7 +218,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/computer/cargo/request category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/board/mining name = "Computer Design (Outpost Status Display)" @@ -226,7 +226,7 @@ id = "mining" build_path = /obj/item/circuitboard/computer/mining category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SECURITY /datum/design/board/comm_monitor name = "Computer Design (Telecommunications Monitoring Console)" @@ -234,7 +234,7 @@ id = "comm_monitor" build_path = /obj/item/circuitboard/computer/comm_monitor category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/comm_server name = "Computer Design (Telecommunications Server Monitoring Console)" @@ -242,7 +242,7 @@ id = "comm_server" build_path = /obj/item/circuitboard/computer/comm_server category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/message_monitor name = "Computer Design (Messaging Monitor Console)" @@ -250,7 +250,7 @@ id = "message_monitor" build_path = /obj/item/circuitboard/computer/message_monitor category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/aifixer name = "Computer Design (AI Integrity Restorer)" @@ -258,7 +258,7 @@ id = "aifixer" build_path = /obj/item/circuitboard/computer/aifixer category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/libraryconsole name = "Computer Design (Library Console)" @@ -274,7 +274,7 @@ id = "apc_control" build_path = /obj/item/circuitboard/computer/apc_control category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/advanced_camera name = "Computer Design (Advanced Camera Console)" @@ -282,7 +282,7 @@ id = "advanced_camera" build_path = /obj/item/circuitboard/computer/advanced_camera category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/board/bountypad_control name = "Computer Design (Civilian Bounty Pad Control)" @@ -314,4 +314,4 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/computer/accounting category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm index fc8e2e12ac0..753a0b0c37a 100644 --- a/code/modules/research/designs/computer_part_designs.dm +++ b/code/modules/research/designs/computer_part_designs.dm @@ -9,7 +9,7 @@ materials = list(/datum/material/iron = 400, /datum/material/glass = 100) build_path = /obj/item/computer_hardware/hard_drive category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/disk/advanced name = "Advanced Hard Disk Drive" @@ -18,7 +18,7 @@ materials = list(/datum/material/iron = 800, /datum/material/glass = 200) build_path = /obj/item/computer_hardware/hard_drive/advanced category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/disk/super name = "Super Hard Disk Drive" @@ -27,7 +27,7 @@ materials = list(/datum/material/iron = 1600, /datum/material/glass = 400) build_path = /obj/item/computer_hardware/hard_drive/super category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/disk/cluster name = "Cluster Hard Disk Drive" @@ -36,7 +36,7 @@ materials = list(/datum/material/iron = 3200, /datum/material/glass = 800) build_path = /obj/item/computer_hardware/hard_drive/cluster category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/disk/small name = "Solid State Drive" @@ -45,7 +45,7 @@ materials = list(/datum/material/iron = 800, /datum/material/glass = 200) build_path = /obj/item/computer_hardware/hard_drive/small category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/disk/micro name = "Micro Solid State Drive" @@ -54,7 +54,7 @@ materials = list(/datum/material/iron = 400, /datum/material/glass = 100) build_path = /obj/item/computer_hardware/hard_drive/micro category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING // Network cards /datum/design/netcard/basic @@ -64,7 +64,7 @@ materials = list(/datum/material/iron = 250, /datum/material/glass = 100) build_path = /obj/item/computer_hardware/network_card category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/netcard/advanced name = "Advanced Network Card" @@ -73,7 +73,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 200) build_path = /obj/item/computer_hardware/network_card/advanced category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/netcard/wired name = "Wired Network Card" @@ -82,7 +82,7 @@ materials = list(/datum/material/iron = 2500, /datum/material/glass = 400) build_path = /obj/item/computer_hardware/network_card/wired category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING // Data disks /datum/design/portabledrive/basic @@ -92,7 +92,7 @@ materials = list(/datum/material/glass = 800) build_path = /obj/item/computer_hardware/hard_drive/portable category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/portabledrive/advanced name = "Advanced Data Disk" @@ -101,7 +101,7 @@ materials = list(/datum/material/glass = 1600) build_path = /obj/item/computer_hardware/hard_drive/portable/advanced category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/portabledrive/super name = "Super Data Disk" @@ -110,7 +110,7 @@ materials = list(/datum/material/glass = 3200) build_path = /obj/item/computer_hardware/hard_drive/portable/super category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING // Card slot /datum/design/cardslot @@ -120,7 +120,7 @@ materials = list(/datum/material/iron = 600) build_path = /obj/item/computer_hardware/card_slot category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING // Intellicard slot /datum/design/aislot @@ -130,7 +130,7 @@ materials = list(/datum/material/iron = 600) build_path = /obj/item/computer_hardware/ai_slot category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING // Mini printer /datum/design/miniprinter @@ -140,7 +140,7 @@ materials = list(/datum/material/iron = 600) build_path = /obj/item/computer_hardware/printer/mini category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING // APC Link /datum/design/apc_link @@ -150,7 +150,7 @@ materials = list(/datum/material/iron = 2000) build_path = /obj/item/computer_hardware/recharger/apc_recharger category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING // Batteries /datum/design/battery/controller @@ -160,7 +160,7 @@ materials = list(/datum/material/iron = 400) build_path = /obj/item/computer_hardware/battery category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/battery/normal name = "Battery Module" @@ -169,7 +169,7 @@ materials = list(/datum/material/iron = 400) build_path = /obj/item/stock_parts/cell/computer category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/battery/advanced name = "Advanced Battery Module" @@ -178,7 +178,7 @@ materials = list(/datum/material/iron = 800) build_path = /obj/item/stock_parts/cell/computer/advanced category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/battery/super name = "Super Battery Module" @@ -187,7 +187,7 @@ materials = list(/datum/material/iron = 1600) build_path = /obj/item/stock_parts/cell/computer/super category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/battery/nano name = "Nano Battery Module" @@ -196,7 +196,7 @@ materials = list(/datum/material/iron = 200) build_path = /obj/item/stock_parts/cell/computer/nano category = list("Computer Parts") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/battery/micro name = "Micro Battery Module" diff --git a/code/modules/research/designs/electronics_designs.dm b/code/modules/research/designs/electronics_designs.dm index 7cb94cfda0e..8a2ae66a9fe 100644 --- a/code/modules/research/designs/electronics_designs.dm +++ b/code/modules/research/designs/electronics_designs.dm @@ -11,7 +11,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/gold = 200) build_path = /obj/item/aicard category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/paicard name = "Personal Artificial Intelligence Card" @@ -31,7 +31,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 5000, /datum/material/gold = 15000, /datum/material/silver = 15000, /datum/material/diamond = 20000, /datum/material/plasma = 10000) build_path = /obj/item/surveillance_upgrade category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE //////////////////////////////////////// //////////Disk Construction Disks/////// @@ -44,7 +44,7 @@ materials = list(/datum/material/iron = 300, /datum/material/glass = 100) build_path = /obj/item/disk/design_disk category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/design_disk_adv name = "Advanced Design Storage Disk" @@ -54,7 +54,7 @@ materials = list(/datum/material/iron = 300, /datum/material/glass = 100, /datum/material/silver=50) build_path = /obj/item/disk/design_disk/adv category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/tech_disk name = "Technology Data Storage Disk" @@ -64,4 +64,4 @@ materials = list(/datum/material/iron = 300, /datum/material/glass = 100) build_path = /obj/item/disk/tech_disk category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE diff --git a/code/modules/research/designs/experisci_designs.dm b/code/modules/research/designs/experisci_designs.dm index 3ca9a94a964..c00d376a440 100644 --- a/code/modules/research/designs/experisci_designs.dm +++ b/code/modules/research/designs/experisci_designs.dm @@ -6,4 +6,4 @@ materials = list(/datum/material/glass = 500, /datum/material/iron = 500) build_path = /obj/item/experi_scanner category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE diff --git a/code/modules/research/designs/limbgrower_designs.dm b/code/modules/research/designs/limbgrower_designs.dm index 2738fc89d5c..d9357c5553e 100644 --- a/code/modules/research/designs/limbgrower_designs.dm +++ b/code/modules/research/designs/limbgrower_designs.dm @@ -237,7 +237,7 @@ materials = list(/datum/material/iron = 300, /datum/material/glass = 100) build_path = /obj/item/disk/design_disk/limbs category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /obj/item/disk/design_disk/limbs/felinid name = "Felinid Organ Design Disk" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 40c7d7b112f..3f677bb5ceb 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -7,7 +7,7 @@ id = "electrolyzer" build_path = /obj/item/circuitboard/machine/electrolyzer category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/smes name = "Machine Design (SMES Board)" @@ -15,7 +15,7 @@ id = "smes" build_path = /obj/item/circuitboard/machine/smes category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/announcement_system name = "Machine Design (Automated Announcement System Board)" @@ -23,7 +23,7 @@ id = "automated_announcement" build_path = /obj/item/circuitboard/machine/announcement_system category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/turbine_computer name = "Computer Design (Power Turbine Console Board)" @@ -31,7 +31,7 @@ id = "power_turbine_console" build_path = /obj/item/circuitboard/computer/turbine_computer category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/emitter name = "Machine Design (Emitter Board)" @@ -39,7 +39,7 @@ id = "emitter" build_path = /obj/item/circuitboard/machine/emitter category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/turbine_compressor name = "Machine Design (Turbine Compressor Board)" @@ -47,7 +47,7 @@ id = "turbine_compressor" build_path = /obj/item/circuitboard/machine/turbine_compressor category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/turbine_rotor name = "Machine Design (Turbine Rotor Board)" @@ -55,7 +55,7 @@ id = "turbine_rotor" build_path = /obj/item/circuitboard/machine/turbine_rotor category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/turbine_stator name = "Machine Design (Turbine Stator Board)" @@ -63,7 +63,7 @@ id = "turbine_stator" build_path = /obj/item/circuitboard/machine/turbine_stator category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/thermomachine name = "Machine Design (Thermomachine Board)" @@ -71,7 +71,7 @@ id = "thermomachine" build_path = /obj/item/circuitboard/machine/thermomachine category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/space_heater name = "Machine Design (Space Heater Board)" @@ -88,7 +88,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/teleporter_station category = list ("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/teleport_hub name = "Machine Design (Teleportation Hub Board)" @@ -97,7 +97,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/teleporter_hub category = list ("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/quantumpad name = "Machine Design (Quantum Pad Board)" @@ -106,7 +106,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/quantumpad category = list ("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/launchpad name = "Machine Design (Bluespace Launchpad Board)" @@ -115,7 +115,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/launchpad category = list ("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/launchpad_console name = "Machine Design (Bluespace Launchpad Console Board)" @@ -124,7 +124,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/computer/launchpad_console category = list ("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/teleconsole name = "Computer Design (Teleporter Console)" @@ -133,14 +133,14 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/computer/teleporter category = list("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/cryotube name = "Machine Design (Cryotube Board)" desc = "The circuit board for a cryotube." id = "cryotube" build_path = /obj/item/circuitboard/machine/cryo_tube - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_MEDICAL category = list ("Medical Machinery") /datum/design/board/chem_dispenser @@ -148,14 +148,14 @@ desc = "The circuit board for a portable chem dispenser." id = "chem_dispenser" build_path = /obj/item/circuitboard/machine/chem_dispenser - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_MEDICAL category = list ("Medical Machinery") /datum/design/board/chem_master name = "Machine Design (Chem Master Board)" desc = "The circuit board for a Chem Master 3000." id = "chem_master" - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_MEDICAL build_path = /obj/item/circuitboard/machine/chem_master category = list ("Medical Machinery") @@ -163,7 +163,7 @@ name = "Machine Design (Chemical Heater Board)" desc = "The circuit board for a chemical heater." id = "chem_heater" - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_MEDICAL build_path = /obj/item/circuitboard/machine/chem_heater category = list ("Medical Machinery") @@ -171,7 +171,7 @@ name = "Machine Design (High-Performance Liquid Chromatography)" desc = "The circuit board for a High-Performance Liquid Chromatography (Machine Board)" id = "chem_mass_spec" - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_MEDICAL build_path = /obj/item/circuitboard/machine/chem_mass_spec category = list ("Medical Machinery") @@ -181,7 +181,7 @@ id = "smoke_machine" build_path = /obj/item/circuitboard/machine/smoke_machine category = list ("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/reagentgrinder name = "Machine Design (All-In-One Grinder)" @@ -194,7 +194,7 @@ name = "Machine Design (Enhanced Interrogation Chamber)" desc = "Allows for the construction of circuit boards used to build an Enhanced Interrogation Chamber." id = "hypnochair" - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY build_path = /obj/item/circuitboard/machine/hypnochair category = list("Misc. Machinery") @@ -204,7 +204,7 @@ id = "biogenerator" build_path = /obj/item/circuitboard/machine/biogenerator category = list ("Hydroponics Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/hydroponics name = "Machine Design (Hydroponics Tray Board)" @@ -212,7 +212,7 @@ id = "hydro_tray" build_path = /obj/item/circuitboard/machine/hydroponics category = list ("Hydroponics Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/destructive_analyzer name = "Machine Design (Destructive Analyzer Board)" @@ -220,7 +220,7 @@ id = "destructive_analyzer" build_path = /obj/item/circuitboard/machine/destructive_analyzer category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/experimentor name = "Machine Design (E.X.P.E.R.I-MENTOR Board)" @@ -228,7 +228,7 @@ id = "experimentor" build_path = /obj/item/circuitboard/machine/experimentor category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/bepis name = "Machine Design (B.E.P.I.S. Board)" @@ -236,7 +236,7 @@ id = "bepis" build_path = /obj/item/circuitboard/machine/bepis category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/board/protolathe name = "Machine Design (Protolathe Board)" @@ -245,7 +245,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/protolathe category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/protolathe/offstation name = "Machine Design (Ancient Protolathe Board)" @@ -254,7 +254,7 @@ build_type = AWAY_IMPRINTER build_path = /obj/item/circuitboard/machine/protolathe/offstation category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/circuit_imprinter name = "Machine Design (Circuit Imprinter Board)" @@ -263,7 +263,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/circuit_imprinter category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/circuit_imprinter/offstation name = "Machine Design (Ancient Circuit Imprinter Board)" @@ -272,7 +272,7 @@ build_type = AWAY_IMPRINTER build_path = /obj/item/circuitboard/machine/circuit_imprinter/offstation category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/rdservercontrol name = "Computer Design (R&D Server Control Console Board)" @@ -280,7 +280,7 @@ id = "rdservercontrol" build_path = /obj/item/circuitboard/computer/rdservercontrol category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/rdserver name = "Machine Design (R&D Server Board)" @@ -288,7 +288,7 @@ id = "rdserver" build_path = /obj/item/circuitboard/machine/rdserver category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/mechfab name = "Machine Design (Exosuit Fabricator Board)" @@ -296,7 +296,7 @@ id = "mechfab" build_path = /obj/item/circuitboard/machine/mechfab category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/cyborgrecharger name = "Machine Design (Cyborg Recharger Board)" @@ -304,7 +304,7 @@ id = "cyborgrecharger" build_path = /obj/item/circuitboard/machine/cyborgrecharger category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/mech_recharger name = "Machine Design (Mechbay Recharger Board)" @@ -312,13 +312,13 @@ id = "mech_recharger" build_path = /obj/item/circuitboard/machine/mech_recharger category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/dnascanner name = "Machine Design (DNA Scanner)" desc = "The circuit board for a DNA Scanner." id = "dnascanner" - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE build_path = /obj/item/circuitboard/machine/dnascanner category = list("Research Machinery") @@ -328,7 +328,7 @@ id = "destructive_scanner" build_path = /obj/item/circuitboard/machine/destructive_scanner category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/doppler_array name = "Machine Design (Tachyon-Doppler Research Array Board)" @@ -336,7 +336,7 @@ id = "doppler_array" build_path = /obj/item/circuitboard/machine/doppler_array category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/anomaly_refinery name = "Machine Design (Anomaly Refinery Board)" @@ -344,7 +344,7 @@ id = "anomaly_refinery" build_path = /obj/item/circuitboard/machine/anomaly_refinery category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/tank_compressor name = "Machine Design (Tank Compressor Board)" @@ -352,7 +352,7 @@ id = "tank_compressor" build_path = /obj/item/circuitboard/machine/tank_compressor category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/microwave name = "Machine Design (Microwave Board)" @@ -368,7 +368,7 @@ id = "gibber" build_path = /obj/item/circuitboard/machine/gibber category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/smartfridge name = "Machine Design (Smartfridge Board)" @@ -384,7 +384,7 @@ id = "monkey_recycler" build_path = /obj/item/circuitboard/machine/monkey_recycler category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE /datum/design/board/seed_extractor name = "Machine Design (Seed Extractor Board)" @@ -392,7 +392,7 @@ id = "seed_extractor" build_path = /obj/item/circuitboard/machine/seed_extractor category = list ("Hydroponics Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/processor name = "Machine Design (Food/Slime Processor Board)" @@ -400,14 +400,14 @@ id = "processor" build_path = /obj/item/circuitboard/machine/processor category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE /datum/design/board/soda_dispenser name = "Machine Design (Portable Soda Dispenser Board)" desc = "The circuit board for a portable soda dispenser." id = "soda_dispenser" build_path = /obj/item/circuitboard/machine/chem_dispenser/drinks - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE category = list ("Misc. Machinery") /datum/design/board/beer_dispenser @@ -415,7 +415,7 @@ desc = "The circuit board for a portable booze dispenser." id = "beer_dispenser" build_path = /obj/item/circuitboard/machine/chem_dispenser/drinks/beer - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE category = list ("Misc. Machinery") /datum/design/board/recycler @@ -473,7 +473,7 @@ id = "ore_redemption" build_path = /obj/item/circuitboard/machine/ore_redemption category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/mining_equipment_vendor name = "Machine Design (Mining Rewards Vendor Board)" @@ -481,7 +481,7 @@ id = "mining_equipment_vendor" build_path = /obj/item/circuitboard/machine/mining_equipment_vendor category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/board/tesla_coil name = "Machine Design (Tesla Coil Board)" @@ -489,7 +489,7 @@ id = "tesla_coil" build_path = /obj/item/circuitboard/machine/tesla_coil category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/grounding_rod name = "Machine Design (Grounding Rod Board)" @@ -497,7 +497,7 @@ id = "grounding_rod" build_path = /obj/item/circuitboard/machine/grounding_rod category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/ntnet_relay name = "Machine Design (NTNet Relay Board)" @@ -506,7 +506,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/ntnet_relay category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/limbgrower name = "Machine Design (Limb Grower Board)" @@ -514,7 +514,7 @@ id = "limbgrower" build_path = /obj/item/circuitboard/machine/limbgrower category = list("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/harvester name = "Machine Design (Organ Harvester Board)" @@ -522,7 +522,7 @@ id = "harvester" build_path = /obj/item/circuitboard/machine/harvester category = list("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/deepfryer name = "Machine Design (Deep Fryer)" @@ -530,7 +530,7 @@ id = "deepfryer" build_path = /obj/item/circuitboard/machine/deep_fryer category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/griddle name = "Machine Design (Griddle)" @@ -538,7 +538,7 @@ id = "griddle" build_path = /obj/item/circuitboard/machine/griddle category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/oven name = "Machine Design (Oven)" @@ -546,7 +546,7 @@ id = "oven" build_path = /obj/item/circuitboard/machine/oven category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/donksofttoyvendor name = "Machine Design (Donksoft Toy Vendor Board)" @@ -570,7 +570,7 @@ id = "dish_drive" build_path = /obj/item/circuitboard/machine/dish_drive category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/stacking_unit_console name = "Machine Design (Stacking Machine Console)" @@ -578,7 +578,7 @@ id = "stack_console" build_path = /obj/item/circuitboard/machine/stacking_unit_console category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/stacking_machine name = "Machine Design (Stacking Machine)" @@ -586,7 +586,7 @@ id = "stack_machine" build_path = /obj/item/circuitboard/machine/stacking_machine category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/ore_silo name = "Machine Design (Ore Silo)" @@ -594,7 +594,7 @@ id = "ore_silo" build_path = /obj/item/circuitboard/machine/ore_silo category = list ("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/board/fat_sucker name = "Machine Design (Lipid Extractor)" @@ -602,7 +602,7 @@ id = "fat_sucker" build_path = /obj/item/circuitboard/machine/fat_sucker category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/board/stasis name = "Machine Design (Lifeform Stasis Unit)" @@ -610,7 +610,7 @@ id = "stasis" build_path = /obj/item/circuitboard/machine/stasis category = list("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/spaceship_navigation_beacon name = "Machine Design (Bluespace Navigation Gigabeacon)" @@ -619,7 +619,7 @@ build_type = IMPRINTER build_path = /obj/item/circuitboard/machine/spaceship_navigation_beacon category = list ("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/medical_kiosk name = "Machine Design (Medical Kiosk)" @@ -627,7 +627,7 @@ id = "medical_kiosk" build_path = /obj/item/circuitboard/machine/medical_kiosk category = list ("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/medipen_refiller name = "Machine Design (Medipen Refiller)" @@ -635,7 +635,7 @@ id = "medipen_refiller" build_path = /obj/item/circuitboard/machine/medipen_refiller category = list ("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/plumbing_receiver name = "Machine Design (Chemical Recipient)" @@ -643,7 +643,7 @@ id = "plumbing_receiver" build_path = /obj/item/circuitboard/machine/plumbing_receiver category = list ("Teleportation Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/sheetifier @@ -681,7 +681,7 @@ id = "skill_station" build_path = /obj/item/circuitboard/machine/skill_station category = list ("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE //Hypertorus fusion reactor designs @@ -691,7 +691,7 @@ id = "HFR_core" build_path = /obj/item/circuitboard/machine/HFR_core category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/HFR_fuel_input name = "Machine Design (HFR fuel input)" @@ -699,7 +699,7 @@ id = "HFR_fuel_input" build_path = /obj/item/circuitboard/machine/HFR_fuel_input category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/HFR_waste_output name = "Machine Design (HFR waste output)" @@ -707,7 +707,7 @@ id = "HFR_waste_output" build_path = /obj/item/circuitboard/machine/HFR_waste_output category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/HFR_moderator_input name = "Machine Design (HFR moderator input)" @@ -715,7 +715,7 @@ id = "HFR_moderator_input" build_path = /obj/item/circuitboard/machine/HFR_moderator_input category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/HFR_corner name = "Machine Design (HFR corner)" @@ -723,7 +723,7 @@ id = "HFR_corner" build_path = /obj/item/circuitboard/machine/HFR_corner category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/HFR_interface name = "Machine Design (HFR interface)" @@ -731,7 +731,7 @@ id = "HFR_interface" build_path = /obj/item/circuitboard/machine/HFR_interface category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/crystallizer name = "Machine Design (Crystallizer)" @@ -739,7 +739,7 @@ id = "crystallizer" build_path = /obj/item/circuitboard/machine/crystallizer category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/exoscanner name = "Machine Design (Scanner Array)" @@ -747,7 +747,7 @@ id = "exoscanner" build_path = /obj/item/circuitboard/machine/exoscanner category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/board/exodrone_launcher name = "Machine Design (Exploration Drone Launcher)" @@ -755,7 +755,7 @@ id = "exodrone_launcher" build_path = /obj/item/circuitboard/machine/exodrone_launcher category = list ("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/board/component_printer name = "Machine Design (Component Printer)" @@ -763,7 +763,7 @@ id = "component_printer" build_path = /obj/item/circuitboard/machine/component_printer category = list("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/module_printer name = "Machine Design (Module Duplicator)" @@ -771,4 +771,4 @@ id = "module_duplicator" build_path = /obj/item/circuitboard/machine/module_duplicator category = list("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm index 0652e33e801..abf677f480f 100644 --- a/code/modules/research/designs/mecha_designs.dm +++ b/code/modules/research/designs/mecha_designs.dm @@ -8,7 +8,7 @@ id = "ripley_main" build_path = /obj/item/circuitboard/mecha/ripley/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/ripley_peri name = "APLU \"Ripley\" Peripherals Control module" @@ -16,7 +16,7 @@ id = "ripley_peri" build_path = /obj/item/circuitboard/mecha/ripley/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/odysseus_main name = "\"Odysseus\" Central Control module" @@ -24,7 +24,7 @@ id = "odysseus_main" build_path = /obj/item/circuitboard/mecha/odysseus/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/odysseus_peri name = "\"Odysseus\" Peripherals Control module" @@ -32,7 +32,7 @@ id = "odysseus_peri" build_path = /obj/item/circuitboard/mecha/odysseus/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/gygax_main name = "\"Gygax\" Central Control module" @@ -40,7 +40,7 @@ id = "gygax_main" build_path = /obj/item/circuitboard/mecha/gygax/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/gygax_peri name = "\"Gygax\" Peripherals Control module" @@ -48,7 +48,7 @@ id = "gygax_peri" build_path = /obj/item/circuitboard/mecha/gygax/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/gygax_targ name = "\"Gygax\" Weapons & Targeting Control module" @@ -56,7 +56,7 @@ id = "gygax_targ" build_path = /obj/item/circuitboard/mecha/gygax/targeting category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/durand_main name = "\"Durand\" Central Control module" @@ -64,7 +64,7 @@ id = "durand_main" build_path = /obj/item/circuitboard/mecha/durand/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/durand_peri name = "\"Durand\" Peripherals Control module" @@ -72,7 +72,7 @@ id = "durand_peri" build_path = /obj/item/circuitboard/mecha/durand/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/durand_targ name = "\"Durand\" Weapons & Targeting Control module" @@ -80,7 +80,7 @@ id = "durand_targ" build_path = /obj/item/circuitboard/mecha/durand/targeting category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/honker_main name = "\"H.O.N.K\" Central Control module" @@ -88,7 +88,7 @@ id = "honker_main" build_path = /obj/item/circuitboard/mecha/honker/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/honker_peri name = "\"H.O.N.K\" Peripherals Control module" @@ -96,7 +96,7 @@ id = "honker_peri" build_path = /obj/item/circuitboard/mecha/honker/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/honker_targ name = "\"H.O.N.K\" Weapons & Targeting Control module" @@ -104,7 +104,7 @@ id = "honker_targ" build_path = /obj/item/circuitboard/mecha/honker/targeting category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/phazon_main name = "\"Phazon\" Central Control module" @@ -113,7 +113,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 100) build_path = /obj/item/circuitboard/mecha/phazon/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/phazon_peri name = "\"Phazon\" Peripherals Control module" @@ -122,7 +122,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 100) build_path = /obj/item/circuitboard/mecha/phazon/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/phazon_targ name = "\"Phazon\" Weapons & Targeting Control module" @@ -131,7 +131,7 @@ materials = list(/datum/material/glass = 1000, /datum/material/bluespace = 100) build_path = /obj/item/circuitboard/mecha/phazon/targeting category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/clarke_main name = "\"Clarke\" Central Control module" @@ -139,7 +139,7 @@ id = "clarke_main" build_path = /obj/item/circuitboard/mecha/clarke/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/clarke_peri name = "\"Clarke\" Peripherals Control module" @@ -147,7 +147,7 @@ id = "clarke_peri" build_path = /obj/item/circuitboard/mecha/clarke/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/savannah_ivanov_main name = "\"Savannah-Ivanov\" Central Control module" @@ -155,7 +155,7 @@ id = "savannah_ivanov_main" build_path = /obj/item/circuitboard/mecha/savannah_ivanov/main category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/savannah_ivanov_peri name = "\"Savannah-Ivanov\" Peripherals Control module" @@ -163,7 +163,7 @@ id = "savannah_ivanov_peri" build_path = /obj/item/circuitboard/mecha/savannah_ivanov/peripherals category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/savannah_ivanov_targ name = "\"Savannah-Ivanov\" Weapons & Targeting Control module" @@ -171,7 +171,7 @@ id = "savannah_ivanov_targ" build_path = /obj/item/circuitboard/mecha/savannah_ivanov/targeting category = list("Exosuit Modules") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE //////////////////////////////////////// /////////// Mecha Equpment ///////////// @@ -196,7 +196,7 @@ materials = list(/datum/material/iron=6000) construction_time = 20 category = list("Exosuit Ammunition", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mech_carbine name = "Exosuit Weapon (FNX-99 \"Hades\" Carbine)" @@ -217,7 +217,7 @@ materials = list(/datum/material/iron=6000) construction_time = 20 category = list("Exosuit Ammunition", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mech_ion name = "Exosuit Weapon (MKIV Ion Heavy Cannon)" @@ -288,7 +288,7 @@ materials = list(/datum/material/iron=4000,/datum/material/gold=500,/datum/material/iron=500) construction_time = 20 category = list("Exosuit Ammunition", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mech_missile_rack name = "Exosuit Weapon (BRM-6 Missile Rack)" @@ -309,7 +309,7 @@ materials = list(/datum/material/iron=8000,/datum/material/gold=500,/datum/material/iron=500) construction_time = 20 category = list("Exosuit Ammunition", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/clusterbang_launcher name = "Exosuit Weapon (SOB-3 Clusterbang Launcher)" @@ -330,7 +330,7 @@ materials = list(/datum/material/iron=6000,/datum/material/gold=1500,/datum/material/uranium=1500) construction_time = 20 category = list("Exosuit Ammunition", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mech_wormhole_gen name = "Exosuit Module (Localized Wormhole Generator)" @@ -461,7 +461,7 @@ materials = list(/datum/material/iron=4000) construction_time = 20 category = list("Exosuit Ammunition", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/mech_sleeper name = "Exosuit Medical (Mounted Sleeper)" diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index c993b3f5b05..eda6a6bbd70 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -1048,35 +1048,35 @@ id = "mod_plating_engineering" build_path = /obj/item/mod/construction/plating/engineering materials = list(/datum/material/iron = 6000, /datum/material/gold = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING research_icon_state = "engineering-plating" /datum/design/mod_plating/atmospheric id = "mod_plating_atmospheric" build_path = /obj/item/mod/construction/plating/atmospheric materials = list(/datum/material/iron = 6000, /datum/material/titanium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING research_icon_state = "atmospheric-plating" /datum/design/mod_plating/medical id = "mod_plating_medical" build_path = /obj/item/mod/construction/plating/medical materials = list(/datum/material/iron = 6000, /datum/material/silver = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL research_icon_state = "medical-plating" /datum/design/mod_plating/security id = "mod_plating_security" build_path = /obj/item/mod/construction/plating/security materials = list(/datum/material/iron = 6000, /datum/material/uranium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY research_icon_state = "security-plating" /datum/design/mod_plating/cosmohonk id = "mod_plating_cosmohonk" build_path = /obj/item/mod/construction/plating/cosmohonk materials = list(/datum/material/iron = 6000, /datum/material/bananium = 2000, /datum/material/glass = 1000, /datum/material/plasma = 1000) - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE research_icon_state = "cosmohonk-plating" /datum/design/mod_paint_kit diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 0a3d301e493..74956a1e424 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -9,7 +9,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 50) build_path = /obj/item/healthanalyzer category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/mmi name = "Man-Machine Interface" @@ -20,7 +20,7 @@ construction_time = 75 build_path = /obj/item/mmi category = list("Control Interfaces", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/posibrain name = "Positronic Brain" @@ -31,7 +31,7 @@ construction_time = 75 build_path = /obj/item/mmi/posibrain category = list("Control Interfaces", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/bluespacebeaker name = "Bluespace Beaker" @@ -41,7 +41,7 @@ materials = list(/datum/material/glass = 5000, /datum/material/plastic = 3000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000) build_path = /obj/item/reagent_containers/glass/beaker/bluespace category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/noreactbeaker name = "Cryostasis Beaker" @@ -51,13 +51,13 @@ materials = list(/datum/material/iron = 3000) build_path = /obj/item/reagent_containers/glass/beaker/noreact category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/xlarge_beaker name = "X-large Beaker" id = "xlarge_beaker" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000) build_path = /obj/item/reagent_containers/glass/beaker/plastic category = list("Medical Designs") @@ -66,7 +66,7 @@ name = "Metamaterial Beaker" id = "meta_beaker" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL materials = list(/datum/material/glass = 2500, /datum/material/plastic = 3000, /datum/material/gold = 1000, /datum/material/titanium = 1000) build_path = /obj/item/reagent_containers/glass/beaker/meta category = list("Medical Designs") @@ -75,7 +75,7 @@ name = "Chemical Analyzer" id = "ph_meter" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL materials = list(/datum/material/glass = 2500, /datum/material/gold = 1000, /datum/material/titanium = 1000) build_path = /obj/item/ph_meter category = list("Medical Designs") @@ -88,7 +88,7 @@ materials = list(/datum/material/glass = 2000, /datum/material/plasma = 1000, /datum/material/diamond = 1000, /datum/material/bluespace = 500) build_path = /obj/item/reagent_containers/syringe/bluespace category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/dna_disk name = "Genetic Data Disk" @@ -98,7 +98,7 @@ materials = list(/datum/material/iron = 300, /datum/material/glass = 100, /datum/material/silver = 50) build_path = /obj/item/disk/data category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/piercesyringe name = "Piercing Syringe" @@ -108,7 +108,7 @@ materials = list(/datum/material/glass = 2000, /datum/material/diamond = 1000) build_path = /obj/item/reagent_containers/syringe/piercing category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/bluespacebodybag name = "Bluespace Body Bag" @@ -118,7 +118,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/plasma = 2000, /datum/material/diamond = 500, /datum/material/bluespace = 500) build_path = /obj/item/bodybag/bluespace category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/plasmarefiller name = "Plasma-Man Jumpsuit Refill" @@ -138,7 +138,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 1500, /datum/material/gold = 500) build_path = /obj/item/pinpointer/crew category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/crewpinpointerprox name = "Proximity Crew Pinpointer" @@ -148,7 +148,7 @@ materials = list(/datum/material/iron = 1200, /datum/material/glass = 300, /datum/material/gold = 200) build_path = /obj/item/pinpointer/crew/prox category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/defibrillator name = "Defibrillator" @@ -158,7 +158,7 @@ build_path = /obj/item/defibrillator materials = list(/datum/material/iron = 8000, /datum/material/glass = 4000, /datum/material/silver = 3000, /datum/material/gold = 1500) category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/defibrillator_mount name = "Defibrillator Wall Mount" @@ -168,7 +168,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) build_path = /obj/item/wallframe/defib_mount category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/defibrillator_mount_charging name = "PENLITE Defibrillator Wall Mount" @@ -178,7 +178,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000, /datum/material/silver = 500) build_path = /obj/item/wallframe/defib_mount/charging category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/defibrillator_compact @@ -189,7 +189,7 @@ build_path = /obj/item/defibrillator/compact materials = list(/datum/material/iron = 16000, /datum/material/glass = 8000, /datum/material/silver = 6000, /datum/material/gold = 3000) category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/genescanner name = "Genetic Sequence Analyzer" @@ -199,7 +199,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 1000, /datum/material/glass = 500) category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/healthanalyzer_advanced name = "Advanced Health Analyzer" @@ -209,7 +209,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 2000, /datum/material/gold = 1500) category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/medigel name = "Medical Gel" @@ -219,7 +219,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 2500, /datum/material/glass = 500) category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/surgical_drapes name = "Surgical Drapes" @@ -228,7 +228,7 @@ materials = list(/datum/material/plastic = 2000) build_path = /obj/item/surgical_drapes category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/hospital_gown //SKYRAT EDIT ADDITION START name = "Hospital Gown" @@ -237,7 +237,7 @@ materials = list(/datum/material/plastic = 2500) build_path = /obj/item/clothing/suit/toggle/labcoat/hospitalgown category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE //SKYRAT EDIT ADDITION END + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE //SKYRAT EDIT ADDITION END /datum/design/laserscalpel name = "Laser Scalpel" @@ -247,7 +247,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 6000, /datum/material/glass = 1500, /datum/material/silver = 2000, /datum/material/gold = 1500, /datum/material/diamond = 200, /datum/material/titanium = 4000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/mechanicalpinches name = "Mechanical Pinches" @@ -257,7 +257,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 12000, /datum/material/glass = 4000, /datum/material/silver = 4000, /datum/material/titanium = 5000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/searingtool name = "Searing Tool" @@ -267,14 +267,14 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 4000, /datum/material/glass = 2000, /datum/material/plasma = 2000, /datum/material/uranium = 3000, /datum/material/titanium = 3000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/medical_spray_bottle name = "Medical Spray Bottle" desc = "A traditional spray bottle used to generate a fine mist. Not to be confused with a medspray." id = "med_spray_bottle" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL materials = list(/datum/material/plastic = 2000) build_path = /obj/item/reagent_containers/spray/medical category = list("Medical Designs") @@ -284,7 +284,7 @@ desc = "A plastic pressure bag for IV administration of drugs." id = "chem_pack" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL materials = list(/datum/material/plastic = 2000) build_path = /obj/item/reagent_containers/chem_pack category = list("Medical Designs") @@ -294,7 +294,7 @@ desc = "Is used to contain blood used for transfusion. Must be attached to an IV drip." id = "blood_pack" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL materials = list(/datum/material/plastic = 1000) build_path = /obj/item/reagent_containers/blood category = list("Medical Designs") @@ -304,7 +304,7 @@ desc = "A portable device that dispenses and mixes chemicals. Reagents have to be supplied with beakers." id = "portable_chem_mixer" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL materials = list(/datum/material/plastic = 5000, /datum/material/iron = 10000, /datum/material/glass = 3000) build_path = /obj/item/storage/portable_chem_mixer category = list("Equipment") @@ -322,7 +322,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 400) build_path = /obj/item/organ/eyes/robotic/shield category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_gloweyes name = "Luminescent Eyes" @@ -333,7 +333,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 1000) build_path = /obj/item/organ/eyes/robotic/glow category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_breather name = "Breathing Tube Implant" @@ -344,7 +344,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 250) build_path = /obj/item/organ/cyberimp/mouth/breathing_tube category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_surgical name = "Surgical Arm Implant" @@ -355,7 +355,7 @@ construction_time = 200 build_path = /obj/item/organ/cyberimp/arm/surgery category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_toolset name = "Toolset Arm Implant" @@ -366,7 +366,7 @@ construction_time = 200 build_path = /obj/item/organ/cyberimp/arm/toolset category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_medical_hud name = "Medical HUD Implant" @@ -377,7 +377,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 500, /datum/material/gold = 500) build_path = /obj/item/organ/cyberimp/eyes/hud/medical category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_security_hud name = "Security HUD Implant" @@ -388,7 +388,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 750, /datum/material/gold = 750) build_path = /obj/item/organ/cyberimp/eyes/hud/security category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_diagnostic_hud name = "Diagnostic HUD Implant" @@ -399,7 +399,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600) build_path = /obj/item/organ/cyberimp/eyes/hud/diagnostic category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_xray name = "X-ray Eyes" @@ -410,7 +410,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/uranium = 1000, /datum/material/diamond = 1000, /datum/material/bluespace = 1000) build_path = /obj/item/organ/eyes/robotic/xray category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_thermals name = "Thermal Eyes" @@ -421,7 +421,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/plasma = 1000, /datum/material/diamond = 2000) build_path = /obj/item/organ/eyes/robotic/thermals category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_antidrop name = "Anti-Drop Implant" @@ -432,7 +432,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 400, /datum/material/gold = 400) build_path = /obj/item/organ/cyberimp/brain/anti_drop category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_antistun name = "CNS Rebooter Implant" @@ -443,7 +443,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 500, /datum/material/gold = 1000) build_path = /obj/item/organ/cyberimp/brain/anti_stun category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_nutriment name = "Nutriment Pump Implant" @@ -454,7 +454,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/gold = 500) build_path = /obj/item/organ/cyberimp/chest/nutriment category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_nutriment_plus name = "Nutriment Pump Implant PLUS" @@ -465,7 +465,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/gold = 500, /datum/material/uranium = 750) build_path = /obj/item/organ/cyberimp/chest/nutriment/plus category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_reviver name = "Reviver Implant" @@ -476,7 +476,7 @@ materials = list(/datum/material/iron = 800, /datum/material/glass = 800, /datum/material/gold = 300, /datum/material/uranium = 500) build_path = /obj/item/organ/cyberimp/chest/reviver category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_thrusters name = "Thrusters Set Implant" @@ -487,7 +487,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/glass = 2000, /datum/material/silver = 1000, /datum/material/diamond = 1000) build_path = /obj/item/organ/cyberimp/chest/thrusters category = list("Implants", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL ///////////////////////////////////////// ////////////Regular Implants///////////// @@ -501,7 +501,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 200) build_path = /obj/item/implanter category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/implantcase name = "Implant Case" @@ -511,7 +511,7 @@ materials = list(/datum/material/glass = 500) build_path = /obj/item/implantcase category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/implant_sadtrombone name = "Sad Trombone Implant Case" @@ -531,7 +531,7 @@ materials = list(/datum/material/glass = 700) build_path = /obj/item/implantcase/chem category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/implant_tracking name = "Tracking Implant Case" @@ -541,7 +541,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/implantcase/tracking category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL //Cybernetic organs @@ -554,7 +554,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/organ/liver/cybernetic category = list("Cybernetics", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cybernetic_liver/tier2 name = "Cybernetic Liver" @@ -580,7 +580,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/organ/heart/cybernetic category = list("Cybernetics", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cybernetic_heart/tier2 name = "Cybernetic Heart" @@ -606,7 +606,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/organ/lungs/cybernetic category = list("Cybernetics", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cybernetic_lungs/tier2 name = "Cybernetic Lungs" @@ -632,7 +632,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/organ/stomach/cybernetic category = list("Cybernetics", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cybernetic_stomach/tier2 name = "Cybernetic Stomach" @@ -658,7 +658,7 @@ materials = list(/datum/material/iron = 250, /datum/material/glass = 400) build_path = /obj/item/organ/ears/cybernetic category = list("Cybernetics", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cybernetic_ears_u name = "Upgraded Cybernetic Ears" @@ -669,7 +669,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 500) build_path = /obj/item/organ/ears/cybernetic/upgraded category = list("Cybernetics", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cybernetic_eyes name = "Basic Cybernetic Eyes" @@ -680,7 +680,7 @@ materials = list(/datum/material/iron = 250, /datum/material/glass = 400) build_path = /obj/item/organ/eyes/robotic/basic category = list("Cybernetics", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cybernetic_eyes/improved name = "Cybernetic Eyes" diff --git a/code/modules/research/designs/mining_designs.dm b/code/modules/research/designs/mining_designs.dm index 682a321d030..1802f85c788 100644 --- a/code/modules/research/designs/mining_designs.dm +++ b/code/modules/research/designs/mining_designs.dm @@ -10,7 +10,7 @@ materials = list(/datum/material/glass = 1000) build_path = /obj/item/circuitboard/computer/cargo/express category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/bluespace_pod name = "Supply Drop Pod Upgrade Disk" @@ -20,7 +20,7 @@ materials = list(/datum/material/glass = 1000) build_path = /obj/item/disk/cargo/bluespace_pod category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/drill name = "Mining Drill" @@ -30,7 +30,7 @@ materials = list(/datum/material/iron = 6000, /datum/material/glass = 1000) //expensive, but no need for miners. build_path = /obj/item/pickaxe/drill category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/drill_diamond name = "Diamond-Tipped Mining Drill" @@ -40,7 +40,7 @@ materials = list(/datum/material/iron = 6000, /datum/material/glass = 1000, /datum/material/diamond = 2000) //Yes, a whole diamond is needed. build_path = /obj/item/pickaxe/drill/diamonddrill category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/plasmacutter name = "Plasma Cutter" @@ -50,7 +50,7 @@ materials = list(/datum/material/iron = 1500, /datum/material/glass = 500, /datum/material/plasma = 400) build_path = /obj/item/gun/energy/plasmacutter category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/plasmacutter_adv name = "Advanced Plasma Cutter" @@ -60,7 +60,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000, /datum/material/plasma = 2000, /datum/material/gold = 500) build_path = /obj/item/gun/energy/plasmacutter/adv category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/jackhammer name = "Sonic Jackhammer" @@ -70,7 +70,7 @@ materials = list(/datum/material/iron = 6000, /datum/material/glass = 2000, /datum/material/silver = 2000, /datum/material/diamond = 6000) build_path = /obj/item/pickaxe/drill/jackhammer category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/superresonator name = "Upgraded Resonator" @@ -80,7 +80,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/glass = 1500, /datum/material/silver = 1000, /datum/material/uranium = 1000) build_path = /obj/item/resonator/upgraded category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/trigger_guard_mod name = "Kinetic Accelerator Trigger Guard Mod" @@ -90,7 +90,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) build_path = /obj/item/borg/upgrade/modkit/trigger_guard category = list("Mining Designs") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/damage_mod name = "Kinetic Accelerator Damage Mod" @@ -100,7 +100,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) build_path = /obj/item/borg/upgrade/modkit/damage category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/cooldown_mod name = "Kinetic Accelerator Cooldown Mod" @@ -110,7 +110,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) build_path = /obj/item/borg/upgrade/modkit/cooldown category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/range_mod name = "Kinetic Accelerator Range Mod" @@ -120,7 +120,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1500, /datum/material/gold = 1500, /datum/material/uranium = 1000) build_path = /obj/item/borg/upgrade/modkit/range category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/design/hyperaccelerator name = "Kinetic Accelerator Mining AoE Mod" @@ -130,4 +130,4 @@ materials = list(/datum/material/iron = 8000, /datum/material/glass = 1500, /datum/material/silver = 2000, /datum/material/gold = 2000, /datum/material/diamond = 2000) build_path = /obj/item/borg/upgrade/modkit/aoe/turfs category = list("Mining Designs", "Cyborg Upgrade Modules") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index a2ceb20bc17..f168e7c6adc 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -11,7 +11,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/clothing/glasses/hud/health category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/health_hud_night name = "Night Vision Health Scanner HUD" @@ -21,7 +21,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/silver = 350) build_path = /obj/item/clothing/glasses/hud/health/night category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/security_hud name = "Security HUD" @@ -31,7 +31,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/clothing/glasses/hud/security category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/security_hud_night name = "Night Vision Security HUD" @@ -41,7 +41,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/gold = 350) build_path = /obj/item/clothing/glasses/hud/security/night category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/diagnostic_hud name = "Diagnostic HUD" @@ -51,7 +51,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/clothing/glasses/hud/diagnostic category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/diagnostic_hud_night name = "Night Vision Diagnostic HUD" @@ -61,7 +61,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/uranium = 1000, /datum/material/plasma = 300) build_path = /obj/item/clothing/glasses/hud/diagnostic/night category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE ///////////////////////////////////////// //////////////////Misc/////////////////// @@ -75,7 +75,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/clothing/glasses/welding category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/welding_mask name = "Welding Gas Mask" @@ -85,7 +85,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000) build_path = /obj/item/clothing/mask/gas/welding category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/bright_helmet name = "Workplace-Ready Firefighter Helmet" @@ -95,7 +95,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 3000, /datum/material/silver = 500) build_path = /obj/item/clothing/head/hardhat/red/upgraded category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_CARGO /datum/design/mauna_mug name = "Mauna Mug" @@ -125,7 +125,7 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 400) build_path = /obj/item/storage/bag/plants/portaseeder category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/air_horn name = "Air Horn" @@ -145,7 +145,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/clothing/glasses/meson category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/engine_goggles name = "Engineering Scanner Goggles" @@ -155,7 +155,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/plasma = 100) build_path = /obj/item/clothing/glasses/meson/engine category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/tray_goggles name = "Optical T-Ray Scanners" @@ -165,7 +165,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/clothing/glasses/meson/engine/tray category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/nvgmesons name = "Night Vision Optical Meson Scanners" @@ -175,7 +175,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000) build_path = /obj/item/clothing/glasses/meson/night category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO /datum/design/night_vision_goggles name = "Night Vision Goggles" @@ -185,7 +185,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000) build_path = /obj/item/clothing/glasses/night category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY /datum/design/magboots name = "Magnetic Boots" @@ -195,7 +195,7 @@ materials = list(/datum/material/iron = 4500, /datum/material/silver = 1500, /datum/material/gold = 2500) build_path = /obj/item/clothing/shoes/magboots category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/forcefield_projector name = "Forcefield Projector" @@ -205,7 +205,7 @@ materials = list(/datum/material/iron = 2500, /datum/material/glass = 1000) build_path = /obj/item/forcefield_projector category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/sci_goggles name = "Science Goggles" @@ -215,7 +215,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/clothing/glasses/science category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/nv_sci_goggles name = "Night Vision Science Goggles" @@ -225,7 +225,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/plasma = 350, /datum/material/uranium = 1000) build_path = /obj/item/clothing/glasses/science/night category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/roastingstick name = "Advanced Roasting Stick" @@ -235,7 +235,7 @@ materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/bluespace = 250) build_path = /obj/item/melee/roastingstick category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/locator name = "Bluespace Locator" @@ -245,7 +245,7 @@ materials = list(/datum/material/iron=1000, /datum/material/glass = 500, /datum/material/silver = 500) build_path = /obj/item/locator category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/quantum_keycard name = "Quantum Keycard" @@ -255,7 +255,7 @@ materials = list(/datum/material/glass = 500, /datum/material/iron = 500, /datum/material/silver = 500, /datum/material/bluespace = 1000) build_path = /obj/item/quantum_keycard category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/anomaly_neutralizer name = "Anomaly Neutralizer" @@ -265,7 +265,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/gold = 2000, /datum/material/plasma = 5000, /datum/material/uranium = 2000) build_path = /obj/item/anomaly_neutralizer category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/donksoft_refill name = "Donksoft Toy Vendor Refill" @@ -284,7 +284,7 @@ materials = list(/datum/material/iron = 2000) build_path = /obj/item/tank/internals/oxygen/empty category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/plasma_tank name = "Plasma Tank" @@ -294,7 +294,7 @@ materials = list(/datum/material/iron = 2000) build_path = /obj/item/tank/internals/plasma/empty category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/id name = "Identification Card" @@ -304,7 +304,7 @@ materials = list(/datum/material/iron=200, /datum/material/glass = 100) build_path = /obj/item/card/id/advanced category = list("Electronics") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/eng_gloves name = "Tinkers Gloves" @@ -314,7 +314,7 @@ materials = list(/datum/material/iron=2000, /datum/material/silver=1500, /datum/material/gold = 1000) build_path = /obj/item/clothing/gloves/color/latex/engineering category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/lavarods name = "Lava-Resistant Iron Rods" @@ -323,7 +323,7 @@ materials = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000) build_path = /obj/item/stack/rods/lava category = list("initial", "Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/plasticducky name = "Rubber Ducky" @@ -342,7 +342,7 @@ materials = list(/datum/material/iron = 20000, /datum/material/plasma = 10000) build_path = /obj/item/door_seal category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_SCIENCE ///////////////////////////////////////// ////////////Janitor Designs////////////// @@ -356,7 +356,7 @@ materials = list(/datum/material/iron = 2500, /datum/material/glass = 200) build_path = /obj/item/mop/advanced category = list("Equipment", "Tools", "Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/normtrash name = "Trashbag" @@ -366,7 +366,7 @@ materials = list(/datum/material/plastic = 2000) build_path = /obj/item/storage/bag/trash category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/blutrash name = "Trashbag of Holding" @@ -376,7 +376,7 @@ materials = list(/datum/material/gold = 1500, /datum/material/uranium = 250, /datum/material/plasma = 1500) build_path = /obj/item/storage/bag/trash/bluespace category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/light_replacer name = "Light Replacer" @@ -386,7 +386,7 @@ materials = list(/datum/material/iron = 1500, /datum/material/silver = 150, /datum/material/glass = 3000) build_path = /obj/item/lightreplacer category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/buffer_upgrade name = "Floor Buffer Upgrade" @@ -396,7 +396,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 200) build_path = /obj/item/janicart_upgrade/buffer category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/vacuum_upgrade name = "Vacuum Upgrade" @@ -406,7 +406,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 200) build_path = /obj/item/janicart_upgrade/vacuum category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/paint_remover name = "Paint Remover" @@ -417,7 +417,7 @@ reagents_list = list(/datum/reagent/acetone = 60) build_path = /obj/item/paint/paint_remover category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/spraybottle name = "Spray Bottle" @@ -427,7 +427,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 200) build_path = /obj/item/reagent_containers/spray category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/beartrap name = "Bear Trap" @@ -437,7 +437,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/titanium = 1000) build_path = /obj/item/restraints/legcuffs/beartrap category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE ///////////////////////////////////////// /////////////Holobarriers//////////////// @@ -451,7 +451,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) build_path = /obj/item/holosign_creator category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/holobarrier_jani name = "Custodial Holobarrier Projector" @@ -461,7 +461,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000, /datum/material/silver = 1000) build_path = /obj/item/holosign_creator/janibarrier category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/holosignsec @@ -472,7 +472,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000) build_path = /obj/item/holosign_creator/security category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/holosignengi name = "Engineering Holobarrier Projector" @@ -482,7 +482,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000) build_path = /obj/item/holosign_creator/engineering category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/holosignatmos name = "ATMOS Holofan Projector" @@ -492,7 +492,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/silver = 1000) build_path = /obj/item/holosign_creator/atmos category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/holobarrier_med name = "PENLITE Holobarrier Projector" @@ -502,7 +502,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 100) //a hint of silver since it can troll 2 antags (bad viros and sentient disease) id = "holobarrier_med" category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL ///////////////////////////////////////// ////////////////Armour/////////////////// @@ -516,7 +516,7 @@ materials = list(/datum/material/iron = 10000, /datum/material/diamond = 5000, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold = 5000) build_path = /obj/item/reactive_armour_shell category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/knight_armour name = "Knight Armour" @@ -550,7 +550,7 @@ materials = list(/datum/material/iron = 2500) build_path = /obj/item/flashlight/seclite category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/detective_scanner name = "Forensic Scanner" @@ -560,7 +560,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 2500, /datum/material/silver = 2000) build_path = /obj/item/detective_scanner category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/pepperspray name = "Pepper Spray" @@ -570,7 +570,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000) build_path = /obj/item/reagent_containers/spray/pepper/empty category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/bola_energy name = "Energy Bola" @@ -580,7 +580,7 @@ materials = list(/datum/material/silver = 500, /datum/material/plasma = 500, /datum/material/titanium = 500) build_path = /obj/item/restraints/legcuffs/bola/energy category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/zipties @@ -591,7 +591,7 @@ materials = list(/datum/material/plastic = 250) build_path = /obj/item/restraints/handcuffs/cable/zipties category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/evidencebag name = "Evidence Bag" @@ -601,7 +601,7 @@ materials = list(/datum/material/plastic = 100) build_path = /obj/item/evidencebag category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/inspector name = "N-Spect Scanner" @@ -611,7 +611,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000, /datum/material/gold = 1000, /datum/material/uranium = 2000) build_path = /obj/item/inspector category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/plumbing_rcd name = "Plumbing Constructor" @@ -620,7 +620,7 @@ materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic = 1000) build_path = /obj/item/construction/plumbing category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/gas_filter name = "Gas filter" @@ -649,7 +649,7 @@ materials = list(/datum/material/plastic = 3000) build_path = /obj/item/stack/sticky_tape/super category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/pointy_tape name = "Pointy Tape" @@ -658,7 +658,7 @@ materials = list(/datum/material/iron = 1500, /datum/material/plastic = 1000) build_path = /obj/item/stack/sticky_tape/pointy category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE @@ -673,7 +673,7 @@ materials = list(/datum/material/plastic = 2500) build_path = /obj/item/clothing/gloves/tackler/dolphin category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/tackle_rocket name = "Rocket Gloves" @@ -682,7 +682,7 @@ materials = list(/datum/material/plasma = 1000, /datum/material/plastic = 2000) build_path = /obj/item/clothing/gloves/tackler/rocket category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY @@ -698,7 +698,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) build_path = /obj/item/holosign_creator/robot_seat/restaurant category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/holosign/bar name = "Bar Seating Projector" @@ -708,7 +708,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 1000) build_path = /obj/item/holosign_creator/robot_seat/bar category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/oven_tray name = "Oven Tray" @@ -718,4 +718,4 @@ materials = list(/datum/material/iron = 500) build_path = /obj/item/plate/oven_tray category = list("initial","Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm index eda72699d4c..66924ca855a 100644 --- a/code/modules/research/designs/power_designs.dm +++ b/code/modules/research/designs/power_designs.dm @@ -21,7 +21,7 @@ construction_time=100 build_path = /obj/item/stock_parts/cell/high/empty category = list("Misc","Power Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/super_cell name = "Super-Capacity Power Cell" @@ -32,7 +32,7 @@ construction_time=100 build_path = /obj/item/stock_parts/cell/super/empty category = list("Misc","Power Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/hyper_cell name = "Hyper-Capacity Power Cell" @@ -43,7 +43,7 @@ construction_time=100 build_path = /obj/item/stock_parts/cell/hyper/empty category = list("Misc","Power Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/bluespace_cell name = "Bluespace Power Cell" @@ -54,7 +54,7 @@ construction_time=100 build_path = /obj/item/stock_parts/cell/bluespace/empty category = list("Misc","Power Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/inducer name = "Inducer" @@ -64,7 +64,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 1000) build_path = /obj/item/inducer/sci category = list("Power Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/board/pacman name = "Machine Design (PACMAN-type Generator Board)" @@ -72,7 +72,7 @@ id = "pacman" build_path = /obj/item/circuitboard/machine/pacman category = list("Engineering Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/turbine_part_compressor name = "Turbine Part - Compressor" diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm index af8f6839a46..f6dfa0c8dc2 100644 --- a/code/modules/research/designs/smelting_designs.dm +++ b/code/modules/research/designs/smelting_designs.dm @@ -7,7 +7,7 @@ materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plasteel category = list("initial", "Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING maxstack = 50 @@ -18,7 +18,7 @@ materials = list(/datum/material/titanium = MINERAL_MATERIAL_AMOUNT, /datum/material/plasma = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/plastitanium category = list("initial", "Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING maxstack = 50 /datum/design/plaglass_alloy @@ -28,7 +28,7 @@ materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plasmaglass category = list("initial", "Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING maxstack = 50 /datum/design/plasmarglass_alloy @@ -38,7 +38,7 @@ materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/iron = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plasmarglass category = list("initial", "Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING maxstack = 50 /datum/design/titaniumglass_alloy @@ -48,7 +48,7 @@ materials = list(/datum/material/titanium = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/titaniumglass category = list("initial", "Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING maxstack = 50 /datum/design/plastitaniumglass_alloy @@ -58,7 +58,7 @@ materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/titanium = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plastitaniumglass category = list("initial", "Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING maxstack = 50 /datum/design/alienalloy @@ -69,4 +69,4 @@ materials = list(/datum/material/iron = 4000, /datum/material/plasma = 4000) build_path = /obj/item/stack/sheet/mineral/abductor category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm index 21748b548ad..ea3c6a47117 100644 --- a/code/modules/research/designs/stock_parts_designs.dm +++ b/code/modules/research/designs/stock_parts_designs.dm @@ -10,7 +10,7 @@ materials = list(/datum/material/iron = 10000, /datum/material/glass = 5000) //hardcore build_path = /obj/item/storage/part_replacer category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/bs_rped name = "Bluespace RPED" @@ -20,7 +20,7 @@ materials = list(/datum/material/iron = 15000, /datum/material/glass = 5000, /datum/material/silver = 2500) //hardcore build_path = /obj/item/storage/part_replacer/bluespace category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE //Capacitors /datum/design/basic_capacitor @@ -32,7 +32,7 @@ build_path = /obj/item/stock_parts/capacitor category = list("Stock Parts","Machinery","initial") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/adv_capacitor name = "Advanced Capacitor" @@ -43,7 +43,7 @@ build_path = /obj/item/stock_parts/capacitor/adv category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/super_capacitor name = "Super Capacitor" @@ -54,7 +54,7 @@ build_path = /obj/item/stock_parts/capacitor/super category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/quadratic_capacitor name = "Quadratic Capacitor" @@ -65,7 +65,7 @@ build_path = /obj/item/stock_parts/capacitor/quadratic category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE //Scanning modules /datum/design/basic_scanning @@ -77,7 +77,7 @@ build_path = /obj/item/stock_parts/scanning_module category = list("Stock Parts","Machinery","initial") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/adv_scanning name = "Advanced Scanning Module" @@ -88,7 +88,7 @@ build_path = /obj/item/stock_parts/scanning_module/adv category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/phasic_scanning name = "Phasic Scanning Module" @@ -99,7 +99,7 @@ build_path = /obj/item/stock_parts/scanning_module/phasic category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/triphasic_scanning name = "Triphasic Scanning Module" @@ -110,7 +110,7 @@ build_path = /obj/item/stock_parts/scanning_module/triphasic category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE //Maipulators /datum/design/micro_mani @@ -122,7 +122,7 @@ build_path = /obj/item/stock_parts/manipulator category = list("Stock Parts","Machinery","initial") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/nano_mani name = "Nano Manipulator" @@ -133,7 +133,7 @@ build_path = /obj/item/stock_parts/manipulator/nano category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/pico_mani name = "Pico Manipulator" @@ -144,7 +144,7 @@ build_path = /obj/item/stock_parts/manipulator/pico category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/femto_mani name = "Femto Manipulator" @@ -155,7 +155,7 @@ build_path = /obj/item/stock_parts/manipulator/femto category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE //Micro-lasers /datum/design/basic_micro_laser @@ -167,7 +167,7 @@ build_path = /obj/item/stock_parts/micro_laser category = list("Stock Parts","Machinery","initial") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/high_micro_laser name = "High-Power Micro-Laser" @@ -178,7 +178,7 @@ build_path = /obj/item/stock_parts/micro_laser/high category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/ultra_micro_laser name = "Ultra-High-Power Micro-Laser" @@ -189,7 +189,7 @@ build_path = /obj/item/stock_parts/micro_laser/ultra category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/quadultra_micro_laser name = "Quad-Ultra Micro-Laser" @@ -200,7 +200,7 @@ build_path = /obj/item/stock_parts/micro_laser/quadultra category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/basic_matter_bin name = "Basic Matter Bin" @@ -211,7 +211,7 @@ build_path = /obj/item/stock_parts/matter_bin category = list("Stock Parts","Machinery","initial") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/adv_matter_bin name = "Advanced Matter Bin" @@ -222,7 +222,7 @@ build_path = /obj/item/stock_parts/matter_bin/adv category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/super_matter_bin name = "Super Matter Bin" @@ -233,7 +233,7 @@ build_path = /obj/item/stock_parts/matter_bin/super category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/bluespace_matter_bin name = "Bluespace Matter Bin" @@ -244,7 +244,7 @@ build_path = /obj/item/stock_parts/matter_bin/bluespace category = list("Stock Parts") lathe_time_factor = 0.2 - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE //T-Comms devices /datum/design/subspace_ansible @@ -255,7 +255,7 @@ materials = list(/datum/material/iron = 100, /datum/material/silver = 100) build_path = /obj/item/stock_parts/subspace/ansible category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/hyperwave_filter name = "Hyperwave Filter" @@ -265,7 +265,7 @@ materials = list(/datum/material/iron = 100, /datum/material/silver = 100) build_path = /obj/item/stock_parts/subspace/filter category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/subspace_amplifier name = "Subspace Amplifier" @@ -275,7 +275,7 @@ materials = list(/datum/material/iron = 100, /datum/material/gold = 100, /datum/material/uranium = 100) build_path = /obj/item/stock_parts/subspace/amplifier category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/subspace_treatment name = "Subspace Treatment Disk" @@ -285,7 +285,7 @@ materials = list(/datum/material/iron = 100, /datum/material/silver = 200) build_path = /obj/item/stock_parts/subspace/treatment category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/subspace_analyzer name = "Subspace Analyzer" @@ -295,7 +295,7 @@ materials = list(/datum/material/iron = 100, /datum/material/gold = 100) build_path = /obj/item/stock_parts/subspace/analyzer category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/subspace_crystal name = "Ansible Crystal" @@ -305,7 +305,7 @@ materials = list(/datum/material/glass = 800, /datum/material/silver = 100, /datum/material/gold = 100) build_path = /obj/item/stock_parts/subspace/crystal category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/subspace_transmitter name = "Subspace Transmitter" @@ -315,7 +315,7 @@ materials = list(/datum/material/glass = 100, /datum/material/silver = 100, /datum/material/uranium = 100) build_path = /obj/item/stock_parts/subspace/transmitter category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/card_reader name = "Card Reader" @@ -334,4 +334,4 @@ materials = list(/datum/material/plastic = 200, /datum/material/iron = 50) build_path = /obj/item/stock_parts/water_recycler category = list("Stock Parts") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm index 18c7b4a9caf..0b30e0617af 100644 --- a/code/modules/research/designs/telecomms_designs.dm +++ b/code/modules/research/designs/telecomms_designs.dm @@ -8,7 +8,7 @@ id = "s-receiver" build_path = /obj/item/circuitboard/machine/telecomms/receiver category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/telecomms_bus name = "Machine Design (Bus Mainframe)" @@ -16,7 +16,7 @@ id = "s-bus" build_path = /obj/item/circuitboard/machine/telecomms/bus category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/telecomms_hub name = "Machine Design (Hub Mainframe)" @@ -24,7 +24,7 @@ id = "s-hub" build_path = /obj/item/circuitboard/machine/telecomms/hub category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/telecomms_relay name = "Machine Design (Relay Mainframe)" @@ -32,7 +32,7 @@ id = "s-relay" build_path = /obj/item/circuitboard/machine/telecomms/relay category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/telecomms_processor name = "Machine Design (Processor Unit)" @@ -40,7 +40,7 @@ id = "s-processor" build_path = /obj/item/circuitboard/machine/telecomms/processor category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/telecomms_server name = "Machine Design (Server Mainframe)" @@ -48,7 +48,7 @@ id = "s-server" build_path = /obj/item/circuitboard/machine/telecomms/server category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/telecomms_messaging name = "Machine Design (Messaging Server)" @@ -56,7 +56,7 @@ id = "s-messaging" build_path = /obj/item/circuitboard/machine/telecomms/message_server category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/subspace_broadcaster name = "Machine Design (Subspace Broadcaster)" @@ -64,4 +64,4 @@ id = "s-broadcaster" build_path = /obj/item/circuitboard/machine/telecomms/broadcaster category = list("Subspace Telecomms") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index 55a88ff5db5..f384447f64b 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -11,7 +11,7 @@ materials = list(/datum/material/iron = 3500, /datum/material/silver = 1500, /datum/material/titanium = 2500) build_path = /obj/item/screwdriver/power category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/jawsoflife name = "Jaws of Life" @@ -21,7 +21,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 4500, /datum/material/silver = 2500, /datum/material/titanium = 3500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING autolathe_exportable = FALSE /* SKYRAT EDIT - MOVED TO modular_skyrat/modules/electric_welder/code/electric_welder.dm @@ -33,7 +33,7 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/plasma = 1500, /datum/material/uranium = 200) build_path = /obj/item/weldingtool/experimental category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING */ /datum/design/rpd @@ -43,7 +43,7 @@ materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500) build_path = /obj/item/pipe_dispenser category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO /datum/design/rcd_loaded name = "Rapid Construction Device" @@ -53,7 +53,7 @@ materials = list(/datum/material/iron = 60000, /datum/material/glass = 5000) // costs more than what it did in the autolathe, this one comes loaded. build_path = /obj/item/construction/rcd/loaded category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO //SKYRAT EDIT ADDITION// /datum/design/engi_plumbing @@ -64,7 +64,7 @@ materials = list(/datum/material/iron = 60000, /datum/material/glass = 5000) // Costs the same as an RCD. build_path = /obj/item/construction/plumbing/engineering category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING //SKYRAT EDIT END// /datum/design/rcd_upgrade/frames @@ -75,7 +75,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 1500, /datum/material/titanium = 2000) build_path = /obj/item/rcd_upgrade/frames category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/rcd_upgrade/simple_circuits name = "RCD simple circuits designs upgrade" @@ -85,7 +85,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 1500, /datum/material/titanium = 2000) build_path = /obj/item/rcd_upgrade/simple_circuits category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/rcd_upgrade/furnishing name = "RCD furnishing upgrade" @@ -95,7 +95,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 1500, /datum/material/titanium = 2000) build_path = /obj/item/rcd_upgrade/furnishing category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/rcd_upgrade/silo_link name = "Advanced RCD silo link upgrade" @@ -105,7 +105,7 @@ materials = list(/datum/material/iron = 2500, /datum/material/glass = 2500, /datum/material/silver = 2500, /datum/material/titanium = 2500, /datum/material/bluespace = 2500) build_path = /obj/item/rcd_upgrade/silo_link category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/rpd_upgrade/unwrench name = "RPD unwrenching upgrade" @@ -115,7 +115,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500) build_path = /obj/item/rpd_upgrade/unwrench category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/rld_mini name = "Mini Rapid Light Device (MRLD)" @@ -125,7 +125,7 @@ materials = list(/datum/material/iron = 20000, /datum/material/glass = 10000, /datum/material/plastic = 8000, /datum/material/gold = 2000) build_path = /obj/item/construction/rld/mini category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO /datum/design/geneshears name = "Botanogenetic Plant Shears" @@ -135,7 +135,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron=4000, /datum/material/uranium=1500, /datum/material/silver=500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/plumbing_rcd_sci name = "Research Plumbing Constructor" @@ -144,7 +144,7 @@ materials = list(/datum/material/iron = 75000, /datum/material/glass = 37500, /datum/material/plastic = 1000) build_path = /obj/item/construction/plumbing/research category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/biopsy_tool name = "Biopsy Tool" @@ -153,7 +153,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/glass = 3000) build_path = /obj/item/biopsy_tool category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE ///////////////////////////////////////// //////////////Alien Tools//////////////// @@ -167,7 +167,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/alienwirecutters name = "Alien Wirecutters" @@ -177,7 +177,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/alienscrewdriver name = "Alien Screwdriver" @@ -187,7 +187,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/aliencrowbar name = "Alien Crowbar" @@ -197,7 +197,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/alienwelder name = "Alien Welding Tool" @@ -207,7 +207,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 5000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/alienmultitool name = "Alien Multitool" @@ -217,7 +217,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 5000, /datum/material/silver = 2500, /datum/material/plasma = 5000, /datum/material/titanium = 2000, /datum/material/diamond = 2000) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING ///////////////////////////////////////// /////////Alien Surgical Tools//////////// @@ -231,7 +231,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/alienhemostat name = "Alien Hemostat" @@ -241,7 +241,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/alienretractor name = "Alien Retractor" @@ -251,7 +251,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/aliensaw name = "Alien Circular Saw" @@ -261,7 +261,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 10000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 1500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/aliendrill name = "Alien Drill" @@ -271,7 +271,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 10000, /datum/material/silver = 2500, /datum/material/plasma = 1000, /datum/material/titanium = 1500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/aliencautery name = "Alien Cautery" @@ -281,7 +281,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 2000, /datum/material/silver = 1500, /datum/material/plasma = 500, /datum/material/titanium = 1500) category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/wirebrush name = "Wirebrush" @@ -292,4 +292,4 @@ materials = list(/datum/material/iron = 200, /datum/material/glass = 200) build_path = /obj/item/wirebrush category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index fe3a8c172e3..b8a272ce556 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -6,7 +6,7 @@ id = "sec_38" build_type = PROTOLATHE | AWAY_LATHE category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE //Redundant, there's already an autolathe version. /datum/design/c38_trac @@ -17,7 +17,7 @@ materials = list(/datum/material/iron = 20000, /datum/material/silver = 5000, /datum/material/gold = 1000) build_path = /obj/item/ammo_box/c38/trac category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/c38_hotshot name = "Speed Loader (.38 Hot Shot)" @@ -27,7 +27,7 @@ materials = list(/datum/material/iron = 20000, /datum/material/plasma = 5000) build_path = /obj/item/ammo_box/c38/hotshot category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/c38_iceblox name = "Speed Loader (.38 Iceblox)" @@ -37,7 +37,7 @@ materials = list(/datum/material/iron = 20000, /datum/material/plasma = 5000) build_path = /obj/item/ammo_box/c38/iceblox category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/c38_rubber name = "Speed Loader (.38 Rubber)" @@ -47,34 +47,34 @@ materials = list(/datum/material/iron = 20000) build_path = /obj/item/ammo_box/c38/match/bouncy category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/rubbershot/sec id = "sec_rshot" build_type = PROTOLATHE | AWAY_LATHE category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE //Redundant /datum/design/beanbag_slug/sec id = "sec_beanbag_slug" build_type = PROTOLATHE | AWAY_LATHE category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/shotgun_dart/sec id = "sec_dart" build_type = PROTOLATHE | AWAY_LATHE category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/incendiary_slug/sec id = "sec_Islug" build_type = PROTOLATHE | AWAY_LATHE category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/pin_testing @@ -85,7 +85,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 300) build_path = /obj/item/firing_pin/test_range category = list("Firing Pins") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/pin_mindshield name = "Mindshield Firing Pin" @@ -95,7 +95,7 @@ materials = list(/datum/material/silver = 600, /datum/material/diamond = 600, /datum/material/uranium = 200) build_path = /obj/item/firing_pin/implant/mindshield category = list("Firing Pins") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/pin_explorer name = "Outback Firing Pin" @@ -105,7 +105,7 @@ materials = list(/datum/material/silver = 1000, /datum/material/gold = 1000, /datum/material/iron = 500) build_path = /obj/item/firing_pin/explorer category = list("Firing Pins") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/stunrevolver name = "Tesla Cannon Part Kit" @@ -115,7 +115,7 @@ materials = list(/datum/material/iron = 10000, /datum/material/glass = 10000, /datum/material/silver = 10000) build_path = /obj/item/weaponcrafting/gunkit/tesla category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/nuclear_gun @@ -126,7 +126,7 @@ materials = list(/datum/material/iron = 10000, /datum/material/glass = 2000, /datum/material/uranium = 3000, /datum/material/titanium = 1000) build_path = /obj/item/weaponcrafting/gunkit/nuclear category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/tele_shield @@ -137,7 +137,7 @@ materials = list(/datum/material/iron = 4000, /datum/material/glass = 4000, /datum/material/silver = 300, /datum/material/titanium = 200) build_path = /obj/item/shield/riot/tele category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/beamrifle @@ -148,7 +148,7 @@ materials = list(/datum/material/iron = 10000, /datum/material/glass = 5000, /datum/material/diamond = 5000, /datum/material/uranium = 8000, /datum/material/silver = 4500, /datum/material/gold = 5000) build_path = /obj/item/weaponcrafting/gunkit/beam_rifle category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/decloner @@ -159,7 +159,7 @@ materials = list(/datum/material/gold = 5000,/datum/material/uranium = 10000) build_path = /obj/item/weaponcrafting/gunkit/decloner category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/rapidsyringe @@ -170,7 +170,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000) build_path = /obj/item/gun/syringe/rapidsyringe category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL //uwu + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL //uwu /datum/design/temp_gun name = "Temperature Gun Part Kit" @@ -180,7 +180,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 500, /datum/material/silver = 3000) build_path = /obj/item/weaponcrafting/gunkit/temperature category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/flora_gun @@ -191,7 +191,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 500, /datum/material/uranium = 2000) build_path = /obj/item/gun/energy/floragun category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/large_grenade name = "Large Grenade" @@ -201,7 +201,7 @@ materials = list(/datum/material/iron = 3000) build_path = /obj/item/grenade/chem_grenade/large category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/pyro_grenade name = "Pyro Grenade" @@ -211,7 +211,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/plasma = 500) build_path = /obj/item/grenade/chem_grenade/pyro category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/cryo_grenade name = "Cryo Grenade" @@ -221,7 +221,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/silver = 500) build_path = /obj/item/grenade/chem_grenade/cryo category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/adv_grenade name = "Advanced Release Grenade" @@ -231,7 +231,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/glass = 500) build_path = /obj/item/grenade/chem_grenade/adv_release category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_MEDICAL /datum/design/xray name = "X-ray Laser Gun Part Kit" @@ -241,7 +241,7 @@ materials = list(/datum/material/gold = 5000, /datum/material/uranium = 4000, /datum/material/iron = 5000, /datum/material/titanium = 2000, /datum/material/bluespace = 2000) build_path = /obj/item/weaponcrafting/gunkit/xray category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/ioncarbine @@ -252,7 +252,7 @@ materials = list(/datum/material/silver = 6000, /datum/material/iron = 8000, /datum/material/uranium = 2000) build_path = /obj/item/weaponcrafting/gunkit/ion category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/wormhole_projector @@ -263,7 +263,7 @@ materials = list(/datum/material/silver = 2000, /datum/material/iron = 5000, /datum/material/diamond = 2000, /datum/material/bluespace = 3000) build_path = /obj/item/gun/energy/wormhole_projector category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/stunshell name = "Stun Shell" @@ -273,7 +273,7 @@ materials = list(/datum/material/iron = 200) build_path = /obj/item/ammo_casing/shotgun/stunslug category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/techshell name = "Unloaded Technological Shotshell" @@ -283,7 +283,7 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 200) build_path = /obj/item/ammo_casing/shotgun/techshell category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_SCIENCE /datum/design/suppressor name = "Suppressor" @@ -293,7 +293,7 @@ materials = list(/datum/material/iron = 2000, /datum/material/silver = 500) build_path = /obj/item/suppressor category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/gravitygun name = "One-point Gravitational Manipulator" @@ -303,7 +303,7 @@ materials = list(/datum/material/silver = 8000, /datum/material/uranium = 8000, /datum/material/glass = 12000, /datum/material/iron = 12000, /datum/material/diamond = 3000, /datum/material/bluespace = 3000) build_path = /obj/item/gun/energy/gravity_gun category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/largecrossbow name = "Energy Crossbow Part Kit" @@ -313,7 +313,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1500, /datum/material/uranium = 1500, /datum/material/silver = 1500) build_path = /obj/item/weaponcrafting/gunkit/ebow category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY autolathe_exportable = FALSE /datum/design/cleric_mace @@ -333,4 +333,4 @@ materials = list(/datum/material/iron = 10000, /datum/material/glass = 4000, /datum/material/silver = 10000, /datum/material/gold = 2000) build_path = /obj/item/melee/baton/security/boomerang category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/code/modules/research/designs/wiremod_designs.dm b/code/modules/research/designs/wiremod_designs.dm index 1025fef2990..d0d9ce72b3f 100644 --- a/code/modules/research/designs/wiremod_designs.dm +++ b/code/modules/research/designs/wiremod_designs.dm @@ -6,7 +6,7 @@ build_type = IMPRINTER | COMPONENT_PRINTER category = list("Circuitry", "Core") materials = list(/datum/material/glass = 1000, /datum/material/iron = 1000) - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/circuit_multitool name = "Circuit Multitool" @@ -16,7 +16,7 @@ build_type = PROTOLATHE | COMPONENT_PRINTER category = list("Circuitry", "Core") materials = list(/datum/material/glass = 1000, /datum/material/iron = 1000) - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/usb_cable name = "USB Cable" @@ -27,14 +27,14 @@ category = list("Circuitry", "Core") // Yes, it would make sense to make them take plastic, but then less people would make them, and I think they're cool materials = list(/datum/material/iron = 2500) - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/component name = "Component ( NULL ENTRY )" desc = "A component that goes into an integrated circuit." build_type = IMPRINTER | COMPONENT_PRINTER materials = list(/datum/material/glass = 1000) - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE category = list("Circuitry", "Components") /datum/design/component/New() diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 29ad80696ac..097c5c4a0f4 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -182,9 +182,9 @@ var/obj/item/card/id/card = user.get_idcard(TRUE) if(!card && istype(user.pulling, /obj/item/card/id)) card = user.pulling - if(card) + if(card && card.registered_account) var/datum/bank_account/our_acc = card.registered_account - if(our_acc.account_job && SSeconomy.get_dep_account(our_acc.account_job?.paycheck_department) == SSeconomy.get_dep_account(payment_department)) + if(our_acc.account_job.departments_bitflags & allowed_department_flags) total_cost = 0 //We are not charging crew for printing their own supplies and equipment. if(attempt_charge(src, usr, total_cost) & COMPONENT_OBJ_CANCEL_CHARGE) return FALSE diff --git a/code/modules/research/machinery/departmental_circuit_imprinter.dm b/code/modules/research/machinery/departmental_circuit_imprinter.dm index 0f50fc71b2e..7277c41d978 100644 --- a/code/modules/research/machinery/departmental_circuit_imprinter.dm +++ b/code/modules/research/machinery/departmental_circuit_imprinter.dm @@ -7,6 +7,6 @@ /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_SCIENCE + allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE department_tag = "Science" payment_department = ACCOUNT_SCI diff --git a/code/modules/research/machinery/departmental_protolathe.dm b/code/modules/research/machinery/departmental_protolathe.dm index d416c8f263f..44f78564a1e 100644 --- a/code/modules/research/machinery/departmental_protolathe.dm +++ b/code/modules/research/machinery/departmental_protolathe.dm @@ -6,7 +6,7 @@ /obj/machinery/rnd/production/protolathe/department/engineering name = "department protolathe (Engineering)" - allowed_department_flags = DEPARTMENTAL_FLAG_ENGINEERING + allowed_department_flags = DEPARTMENT_BITFLAG_ENGINEERING department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/protolathe/department/engineering stripe_color = "#EFB341" @@ -18,7 +18,7 @@ /obj/machinery/rnd/production/protolathe/department/service name = "department protolathe (Service)" - allowed_department_flags = DEPARTMENTAL_FLAG_SERVICE + allowed_department_flags = DEPARTMENT_BITFLAG_SERVICE department_tag = "Service" circuit = /obj/item/circuitboard/machine/protolathe/department/service stripe_color = "#83ca41" @@ -26,7 +26,7 @@ /obj/machinery/rnd/production/protolathe/department/medical name = "department protolathe (Medical)" - allowed_department_flags = DEPARTMENTAL_FLAG_MEDICAL + allowed_department_flags = DEPARTMENT_BITFLAG_MEDICAL department_tag = "Medical" circuit = /obj/item/circuitboard/machine/protolathe/department/medical stripe_color = "#52B4E9" @@ -34,7 +34,7 @@ /obj/machinery/rnd/production/protolathe/department/cargo name = "department protolathe (Cargo)" - allowed_department_flags = DEPARTMENTAL_FLAG_CARGO + allowed_department_flags = DEPARTMENT_BITFLAG_CARGO department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/protolathe/department/cargo stripe_color = "#956929" @@ -42,7 +42,7 @@ /obj/machinery/rnd/production/protolathe/department/science name = "department protolathe (Science)" - allowed_department_flags = DEPARTMENTAL_FLAG_SCIENCE + allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE department_tag = "Science" circuit = /obj/item/circuitboard/machine/protolathe/department/science stripe_color = "#D381C9" @@ -50,7 +50,7 @@ /obj/machinery/rnd/production/protolathe/department/security name = "department protolathe (Security)" - allowed_department_flags = DEPARTMENTAL_FLAG_SECURITY + allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY department_tag = "Security" circuit = /obj/item/circuitboard/machine/protolathe/department/security stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" diff --git a/code/modules/research/machinery/departmental_techfab.dm b/code/modules/research/machinery/departmental_techfab.dm index e1ddfbfa8d8..a7e03e355d0 100644 --- a/code/modules/research/machinery/departmental_techfab.dm +++ b/code/modules/research/machinery/departmental_techfab.dm @@ -6,7 +6,7 @@ /obj/machinery/rnd/production/techfab/department/engineering name = "department techfab (Engineering)" - allowed_department_flags = DEPARTMENTAL_FLAG_ENGINEERING + allowed_department_flags = DEPARTMENT_BITFLAG_ENGINEERING department_tag = "Engineering" circuit = /obj/item/circuitboard/machine/techfab/department/engineering stripe_color = "#EFB341" @@ -14,7 +14,7 @@ /obj/machinery/rnd/production/techfab/department/service name = "department techfab (Service)" - allowed_department_flags = DEPARTMENTAL_FLAG_SERVICE + allowed_department_flags = DEPARTMENT_BITFLAG_SERVICE department_tag = "Service" circuit = /obj/item/circuitboard/machine/techfab/department/service stripe_color = "#83ca41" @@ -22,7 +22,7 @@ /obj/machinery/rnd/production/techfab/department/medical name = "department techfab (Medical)" - allowed_department_flags = DEPARTMENTAL_FLAG_MEDICAL + allowed_department_flags = DEPARTMENT_BITFLAG_MEDICAL department_tag = "Medical" circuit = /obj/item/circuitboard/machine/techfab/department/medical stripe_color = "#52B4E9" @@ -30,7 +30,7 @@ /obj/machinery/rnd/production/techfab/department/cargo name = "department techfab (Cargo)" - allowed_department_flags = DEPARTMENTAL_FLAG_CARGO + allowed_department_flags = DEPARTMENT_BITFLAG_CARGO department_tag = "Cargo" circuit = /obj/item/circuitboard/machine/techfab/department/cargo stripe_color = "#956929" @@ -38,7 +38,7 @@ /obj/machinery/rnd/production/techfab/department/science name = "department techfab (Science)" - allowed_department_flags = DEPARTMENTAL_FLAG_SCIENCE + allowed_department_flags = DEPARTMENT_BITFLAG_SCIENCE department_tag = "Science" circuit = /obj/item/circuitboard/machine/techfab/department/science stripe_color = "#D381C9" @@ -46,7 +46,7 @@ /obj/machinery/rnd/production/techfab/department/security name = "department techfab (Security)" - allowed_department_flags = DEPARTMENTAL_FLAG_SECURITY + allowed_department_flags = DEPARTMENT_BITFLAG_SECURITY department_tag = "Security" circuit = /obj/item/circuitboard/machine/techfab/department/security stripe_color = "#486091" //SKYRAT EDIT - ORIGINAL "#DE3A3A" diff --git a/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm index 2f6a56d5ce2..266a91c7a3a 100644 --- a/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm +++ b/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm @@ -6,7 +6,7 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/gold = 1000) build_path = /obj/item/clothing/head/helmet/monkey_sentience category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/plumbing_chem name = "Plumbing Constructor (Chemistry)" @@ -16,7 +16,7 @@ materials = list(/datum/material/iron = 75000, /datum/material/glass = 10000, /datum/material/gold = 1000) build_path = /obj/item/construction/plumbing category = list("Tools") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/plumbing_eng @@ -27,7 +27,7 @@ materials = list(/datum/material/iron = 75000, /datum/material/glass = 10000, /datum/material/gold = 1000) build_path = /obj/item/construction/plumbing/engineering category = list("Tools") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/plumbing_sci name = "Plumbing Constructor (Science)" @@ -37,7 +37,7 @@ materials = list(/datum/material/iron = 75000, /datum/material/glass = 10000, /datum/material/gold = 1000) build_path = /obj/item/construction/plumbing/research category = list("Tools") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/smartdartgun name = "Medical SmartDart Gun" @@ -47,4 +47,4 @@ materials = list(/datum/material/iron = 2000, /datum/material/glass = 10000, /datum/material/silver = 4000) build_path = /obj/item/gun/syringe/smartdart category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm index 80404b04a93..bfdf8a06e79 100644 --- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm +++ b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm @@ -336,7 +336,7 @@ id = "ammo_workbench" build_path = /obj/item/circuitboard/machine/ammo_workbench category = list("Weapons Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY //MISC MACHINE PROCS diff --git a/modular_skyrat/modules/ammo_workbench/code/design_disks.dm b/modular_skyrat/modules/ammo_workbench/code/design_disks.dm index af36266d369..ec7174c78b2 100644 --- a/modular_skyrat/modules/ammo_workbench/code/design_disks.dm +++ b/modular_skyrat/modules/ammo_workbench/code/design_disks.dm @@ -15,4 +15,4 @@ materials = list(/datum/material/iron = 1000) build_path = /obj/item/disk/ammo_workbench/lethal category = list("intial", "Security", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY diff --git a/modular_skyrat/modules/apocolypse_of_scythes/code/scythes.dm b/modular_skyrat/modules/apocolypse_of_scythes/code/scythes.dm index 880a202a3fb..8a8ae632740 100644 --- a/modular_skyrat/modules/apocolypse_of_scythes/code/scythes.dm +++ b/modular_skyrat/modules/apocolypse_of_scythes/code/scythes.dm @@ -64,7 +64,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/scythe/tier1 category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/design/scythe_t2 name = "Scythe (Tier 2)" @@ -74,7 +74,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500) build_path = /obj/item/scythe/tier2 category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_SERVICE /datum/techweb_node/scythe_t1 id = "t1scythe" diff --git a/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm b/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm index 94913f5a904..ca4a74a1454 100644 --- a/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm +++ b/modular_skyrat/modules/bluespace_miner/code/bluespace_miner.dm @@ -161,7 +161,7 @@ id = "bluespace_miner" build_path = /obj/item/circuitboard/machine/bluespace_miner category = list("Misc. Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING /datum/experiment/scanning/points/bluespace_miner name = "Bluespace Miner" diff --git a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm index f66f5084f5a..b8c0165c081 100644 --- a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm +++ b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm @@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(cargo_marks) build_path = /obj/item/cargo_teleporter materials = list(/datum/material/iron = 500, /datum/material/plastic = 500, /datum/material/uranium = 500) category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/techweb_node/cargo_teleporter id = "cargoteleporter" diff --git a/modular_skyrat/modules/cellguns/code/medigun_research.dm b/modular_skyrat/modules/cellguns/code/medigun_research.dm index b77032ef72e..b276c0d3928 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_research.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_research.dm @@ -8,7 +8,7 @@ reagents_list = list(/datum/reagent/medicine/c2/libital = 10) build_path = /obj/item/weaponcell/medical/brute/better category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/burn2medicell name = "Burn II Medicell" @@ -19,7 +19,7 @@ reagents_list = list(/datum/reagent/medicine/c2/aiuri = 10) build_path = /obj/item/weaponcell/medical/burn/better category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/toxin2medicell name = "Toxin II Medicell" @@ -30,7 +30,7 @@ reagents_list = list(/datum/reagent/medicine/c2/multiver = 10) build_path = /obj/item/weaponcell/medical/toxin/better category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/oxy2medicell name = "Oxygen II Medicell" @@ -41,7 +41,7 @@ reagents_list = list(/datum/reagent/medicine/c2/convermol = 10) build_path = /obj/item/weaponcell/medical/oxygen/better category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL //Tier 3 Medicells// /datum/design/brute3medicell @@ -53,7 +53,7 @@ reagents_list = list(/datum/reagent/medicine/sal_acid = 10) build_path = /obj/item/weaponcell/medical/brute/better/best category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/burn3medicell name = "Burn III Medicell" @@ -64,7 +64,7 @@ reagents_list = list(/datum/reagent/medicine/oxandrolone = 10) build_path = /obj/item/weaponcell/medical/burn/better/best category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/toxin3medicell name = "Toxin III Medicell" @@ -75,7 +75,7 @@ reagents_list = list(/datum/reagent/medicine/pen_acid = 10) build_path = /obj/item/weaponcell/medical/toxin/better/best category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/oxy3medicell name = "Oxygem III Medicell" @@ -86,7 +86,7 @@ build_path = /obj/item/weaponcell/medical/oxygen/better/best reagents_list = list(/datum/reagent/medicine/salbutamol = 10) category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL //Utility Medicells /datum/design/clotmedicell @@ -98,7 +98,7 @@ build_path = /obj/item/weaponcell/medical/utility/clotting reagents_list = list(/datum/reagent/medicine/salglu_solution = 5, /datum/reagent/blood = 5) category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/tempmedicell name = "Temperature Adjustment Medicell" @@ -109,7 +109,7 @@ build_path = /obj/item/weaponcell/medical/utility/temperature reagents_list = list(/datum/reagent/medicine/leporazine = 10) category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/gownmedicell name = "Hardlight Gown Medicell" @@ -119,7 +119,7 @@ materials = list(/datum/material/plastic = 2000, /datum/material/glass = 2000) build_path = /obj/item/weaponcell/medical/utility/hardlight_gown category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/bedmedicell name = "Hardlight Roller Bed Medicell" @@ -129,7 +129,7 @@ materials = list(/datum/material/plastic = 2000, /datum/material/glass = 2000) build_path = /obj/item/weaponcell/medical/utility/bed category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/salvemedicell name = "Empty Salve Medicell" @@ -139,7 +139,7 @@ materials = list(/datum/material/plastic = 2000, /datum/material/glass = 2000) build_path = /obj/item/device/custom_kit/empty_cell category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/bodymedicell name = "Empty Body Teleporter Medicell" @@ -149,7 +149,7 @@ materials = list(/datum/material/plastic = 2000, /datum/material/glass = 2000, /datum/material/plasma = 1000, /datum/material/diamond = 500, /datum/material/bluespace = 2000) build_path = /obj/item/device/custom_kit/empty_cell/body_teleporter category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/relocatemedicell name = "Oppressive Force Relocation Medicell" @@ -160,7 +160,7 @@ reagents_list = list(/datum/reagent/eigenstate = 10) build_path = /obj/item/weaponcell/medical/utility/relocation category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL //Upgrade Kit// /datum/design/medigunspeedkit @@ -171,4 +171,4 @@ materials = list(/datum/material/uranium = 5000, /datum/material/glass = 4000, /datum/material/plasma = 2000, /datum/material/diamond = 500) build_path = /obj/item/device/custom_kit/medigun_fastcharge category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL diff --git a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm index 55dd01bab9b..be611f04993 100644 --- a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm +++ b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm @@ -132,7 +132,7 @@ build_path = /obj/item/conveyor_sorter materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_CARGO /datum/techweb_node/conveyor_sorter id = "conveyorsorter" diff --git a/modular_skyrat/modules/electric_welder/code/electric_welder.dm b/modular_skyrat/modules/electric_welder/code/electric_welder.dm index 51a37fa6ca2..2e1847961d1 100644 --- a/modular_skyrat/modules/electric_welder/code/electric_welder.dm +++ b/modular_skyrat/modules/electric_welder/code/electric_welder.dm @@ -95,4 +95,4 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/plasma = 1500, /datum/material/uranium = 200) build_path = /obj/item/weldingtool/electric category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING diff --git a/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm b/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm index ed9cb8f947d..0c62ae75f3a 100644 --- a/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm +++ b/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm @@ -7,8 +7,8 @@ build_path = /obj/item/satchel_of_holding_inert category = list("Bluespace Designs") dangerous_construction = TRUE - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE - + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE + /datum/design/duffel_holding name = "Inert Duffel Bag of Holding" desc = "A block of metal ready to be transformed into a duffel bag of holding with a bluespace anomaly core." @@ -18,4 +18,4 @@ build_path = /obj/item/duffel_of_holding_inert category = list("Bluespace Designs") dangerous_construction = TRUE - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE diff --git a/modular_skyrat/modules/huds/code/designs.dm b/modular_skyrat/modules/huds/code/designs.dm index 8dc29bf1aea..f6161a9a663 100644 --- a/modular_skyrat/modules/huds/code/designs.dm +++ b/modular_skyrat/modules/huds/code/designs.dm @@ -6,7 +6,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 350) build_path = /obj/item/clothing/glasses/hud/health/prescription category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/security_hud_prescription name = "Prescription Security HUD" @@ -16,7 +16,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 350) build_path = /obj/item/clothing/glasses/hud/security/prescription category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/diagnostic_hud_prescription name = "Prescription Diagnostic HUD" @@ -26,7 +26,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/gold = 350) build_path = /obj/item/clothing/glasses/hud/diagnostic/prescription category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/mesons_prescription name = "Prescription Optical Meson Scanners" @@ -36,7 +36,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 350) build_path = /obj/item/clothing/glasses/meson/prescription category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING /datum/design/engine_goggles_prescription name = "Prescription Engineering Scanner Goggles" @@ -46,7 +46,7 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/plasma = 100, /datum/material/silver = 350) build_path = /obj/item/clothing/glasses/meson/engine/prescription category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/tray_goggles_prescription name = "Prescription Optical T-Ray Scanners" @@ -56,4 +56,4 @@ materials = list(/datum/material/iron = 500, /datum/material/glass = 500, /datum/material/silver = 150) build_path = /obj/item/clothing/glasses/meson/engine/tray/prescription category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING diff --git a/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm b/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm index 3ed10abd303..f8e0ec5c038 100644 --- a/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm +++ b/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm @@ -5,7 +5,7 @@ materials = list(/datum/material/iron = 2500) build_path = /obj/item/reagent_containers/glass/vial/large category = list("initial","Medical","Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/pen name = "Pen" diff --git a/modular_skyrat/modules/implants/code/medical_designs.dm b/modular_skyrat/modules/implants/code/medical_designs.dm index ae3d065503a..c90b0625c3d 100644 --- a/modular_skyrat/modules/implants/code/medical_designs.dm +++ b/modular_skyrat/modules/implants/code/medical_designs.dm @@ -7,7 +7,7 @@ construction_time = 200 build_path = /obj/item/organ/cyberimp/arm/armblade category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/cyberimp_hacker name = "Hacking Hand Implant" @@ -18,7 +18,7 @@ construction_time = 200 build_path = /obj/item/organ/cyberimp/arm/hacker category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING /datum/design/cyberimp_flash name = "Photon Projector Implant" @@ -29,7 +29,7 @@ construction_time = 200 build_path = /obj/item/organ/cyberimp/arm/flash category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/cyberimp_botany name = "Botany Arm Implant" @@ -40,7 +40,7 @@ construction_time = 200 build_path = /obj/item/organ/cyberimp/arm/botany category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE /datum/design/cyberimp_nv name = "Night Vision Eyes" @@ -51,7 +51,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 600, /datum/material/gold = 600, /datum/material/uranium = 1000,) build_path = /obj/item/organ/eyes/night_vision/cyber category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_antisleep name = "CNS Jumpstarter Implant" @@ -62,7 +62,7 @@ materials = list(/datum/material/iron = 600, /datum/material/glass = 600, /datum/material/silver = 1000, /datum/material/gold = 500) build_path = /obj/item/organ/cyberimp/brain/anti_sleep category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_scanner name = "Internal Medical Analyzer" @@ -73,7 +73,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 2500, /datum/material/silver = 2000, /datum/material/gold = 1500) build_path = /obj/item/organ/cyberimp/chest/scanner category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /datum/design/cyberimp_janitor name = "Janitor Arm Implant" @@ -84,7 +84,7 @@ construction_time = 200 build_path = /obj/item/organ/cyberimp/arm/janitor category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE /datum/design/cyberimp_lighter name = "Lighter Arm Implant" @@ -95,4 +95,4 @@ construction_time = 100 build_path = /obj/item/organ/cyberimp/arm/lighter category = list("Misc", "Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE diff --git a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm b/modular_skyrat/modules/microfusion/code/microfusion_designs.dm index 273e6db0482..b54088230e1 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_designs.dm @@ -2,7 +2,7 @@ /datum/design/microfusion name = "Microfusion Part" build_type = PROTOLATHE | AWAY_LATHE - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY construction_time = 10 SECONDS //dunno if this is for mechfabs or what but I'll keep this anyway category = list("Weapons") diff --git a/modular_skyrat/modules/modular_items/code/ranged_analyzer.dm b/modular_skyrat/modules/modular_items/code/ranged_analyzer.dm index d592b0ff25d..5cf7fbd60dc 100644 --- a/modular_skyrat/modules/modular_items/code/ranged_analyzer.dm +++ b/modular_skyrat/modules/modular_items/code/ranged_analyzer.dm @@ -25,7 +25,7 @@ materials = list(/datum/material/iron = 400, /datum/material/glass = 1000, /datum/material/uranium = 800, /datum/material/gold = 200, /datum/material/plastic = 200) build_path = /obj/item/analyzer/ranged category = list("Tool Designs") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING //Half-overwrites original tg proc for analyzer/attack_self() //(This is literally just the commented out portion of the old proc in scanners.dm; it needs to be seperate so we can call it at varying ranges, though) diff --git a/modular_skyrat/modules/mutants/code/mutant_techweb.dm b/modular_skyrat/modules/mutants/code/mutant_techweb.dm index 4ca5d7a55f2..c4c607ffbfc 100644 --- a/modular_skyrat/modules/mutants/code/mutant_techweb.dm +++ b/modular_skyrat/modules/mutants/code/mutant_techweb.dm @@ -23,7 +23,7 @@ materials = list(/datum/material/iron = 1000, /datum/material/glass = 3000, /datum/material/silver = 1000) build_path = /obj/item/rna_vial category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL /datum/design/rna_extractor name = "Empty RNA vial" @@ -33,7 +33,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/gold = 3000, /datum/material/uranium = 1000, /datum/material/diamond = 1000) build_path = /obj/item/rna_extractor category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL /datum/design/board/rna_recombinator name = "Machine Design (RNA Recombinator)" @@ -41,4 +41,4 @@ id = "rna_recombinator" build_path = /obj/item/circuitboard/machine/rna_recombinator category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL diff --git a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm index 6f7b8c5b433..4a97bbf15ce 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/ammo.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/ammo.dm @@ -123,7 +123,7 @@ materials = list(/datum/material/silver = 10000, /datum/material/gold = 10000, /datum/material/glass = 10000) build_path = /obj/item/ammo_box/advanced/smartgun category = list("Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /obj/item/ammo_box/advanced/smartgun name = "5mm Shock-Rail box" diff --git a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm index 8bd6cb8a497..e14c2e526b6 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/pepperball_gun.dm @@ -63,7 +63,7 @@ materials = list(/datum/material/iron = 5000) build_path = /obj/item/ammo_box/advanced/pepperballs category = list("intial", "Security", "Ammo") - departmental_flags = DEPARTMENTAL_FLAG_SECURITY + departmental_flags = DEPARTMENT_BITFLAG_SECURITY /obj/item/ammo_box/advanced/pepperballs name = "pepperball ammo box" diff --git a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm index a7bd3179c0b..5271def789e 100644 --- a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm +++ b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm @@ -4,7 +4,7 @@ id = "self_actualization_device" build_path = /obj/item/circuitboard/machine/self_actualization_device category = list("Medical Machinery") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL /obj/item/circuitboard/machine/self_actualization_device name = "Self-Actualization Device (Machine Board)" diff --git a/modular_skyrat/modules/stasisrework/code/medical_designs.dm b/modular_skyrat/modules/stasisrework/code/medical_designs.dm index d934743eabb..7771c0f07df 100644 --- a/modular_skyrat/modules/stasisrework/code/medical_designs.dm +++ b/modular_skyrat/modules/stasisrework/code/medical_designs.dm @@ -6,7 +6,7 @@ materials = list(/datum/material/iron = 3000, /datum/material/plasma = 2000, /datum/material/diamond = 1000) build_path = /obj/item/bodybag/stasis category = list("Medical Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/stasissleeper name = "Machine Design (Lifeform Stasis Unit)" @@ -14,4 +14,4 @@ id = "stasissleeper" build_path = /obj/item/circuitboard/machine/stasissleeper category = list("Machine Designs") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm index b8e63e61ab7..c37d5cd6d1a 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm @@ -3,7 +3,7 @@ build_type = PROTOLATHE | AWAY_LATHE materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/xeno_hammer/hammercm1 name = "Hammer (cm 1)" @@ -48,7 +48,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) build_path = /obj/item/xenoarch/brush category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/xeno_tape name = "Xenoarch Tape Measure" @@ -58,7 +58,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) build_path = /obj/item/xenoarch/tape_measure category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/xeno_hh_scanner name = "Xenoarch Handheld Scanner" @@ -68,7 +68,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) build_path = /obj/item/xenoarch/handheld_scanner category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/xeno_hh_scanner/advanced name = "Xenoarch Advanced Handheld Scanner" @@ -76,7 +76,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500, /datum/material/diamond = 500) build_path = /obj/item/xenoarch/handheld_scanner/advanced category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/xeno_hh_recoverer name = "Xenoarch Handheld Recoverer" @@ -86,7 +86,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) build_path = /obj/item/xenoarch/handheld_recoverer category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/xeno_bag name = "Xenoarch Bag" @@ -96,7 +96,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) build_path = /obj/item/storage/bag/xenoarch category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/xeno_belt name = "Xenoarch Belt" @@ -106,7 +106,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500) build_path = /obj/item/storage/belt/utility/xenoarch category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/adv_hammer name = "Advanced Hammer" @@ -116,7 +116,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500, /datum/material/diamond = 500) build_path = /obj/item/xenoarch/hammer/adv category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/adv_brush name = "Advanced Brush" @@ -126,7 +126,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500, /datum/material/diamond = 500) build_path = /obj/item/xenoarch/brush/adv category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/adv_bag name = "Advanced Xenoarch Bag" @@ -136,7 +136,7 @@ materials = list(/datum/material/iron = 500, /datum/material/plastic = 500, /datum/material/diamond = 500) build_path = /obj/item/storage/bag/xenoarch/adv category = list("Equipment") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO /datum/design/board/xeno_researcher name = "Machine Design (Xenoarch Researcher)" @@ -144,7 +144,7 @@ id = "xeno_researcher" build_path = /obj/item/circuitboard/machine/xenoarch_machine/xenoarch_researcher category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/xeno_scanner name = "Machine Design (Xenoarch Scanner)" @@ -152,7 +152,7 @@ id = "xeno_scanner" build_path = /obj/item/circuitboard/machine/xenoarch_machine/xenoarch_scanner category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/xeno_recoverer name = "Machine Design (Xenoarch Recoverer)" @@ -160,7 +160,7 @@ id = "xeno_recoverer" build_path = /obj/item/circuitboard/machine/xenoarch_machine/xenoarch_recoverer category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/design/board/xeno_digger name = "Machine Design (Xenoarch Digger)" @@ -168,7 +168,7 @@ id = "xeno_digger" build_path = /obj/item/circuitboard/machine/xenoarch_machine/xenoarch_digger category = list("Research Machinery") - departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE /datum/techweb_node/basic_xenoarch id = "basic_xenoarch"