diff --git a/code/__defines/research.dm b/code/__defines/research.dm index b37808def9..46621df86d 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -18,3 +18,13 @@ #define MECHFAB 0x0004 //Mechfab #define CHASSIS 0x0008 //For protolathe, but differently #define PROSFAB 0x0010 //For prosthetics fab + +// CHOMPAdd - Departmental Lathes +#define LATHE_ALL 0x1 +#define LATHE_SCIENCE 0x2 +#define LATHE_ENGINEERING 0x4 +#define LATHE_MEDICAL 0x8 +#define LATHE_CARGO 0x10 +#define LATHE_SERVICE 0x20 +#define LATHE_SECURITY 0x40 +#define LATHE_PUBLIC 0x80 diff --git a/code/game/objects/items/weapons/circuitboards/machinery/research.dm b/code/game/objects/items/weapons/circuitboards/machinery/research.dm index 8f23291f8a..935ebf33e4 100644 --- a/code/game/objects/items/weapons/circuitboards/machinery/research.dm +++ b/code/game/objects/items/weapons/circuitboards/machinery/research.dm @@ -55,6 +55,34 @@ /obj/item/weapon/stock_parts/manipulator = 2, /obj/item/weapon/reagent_containers/glass/beaker = 2) +// CHOMPAdd - Departmental Lathes + +/obj/item/weapon/circuitboard/protolathe/science + name = T_BOARD("science protolathe") + build_path = /obj/machinery/r_n_d/protolathe/science + +/obj/item/weapon/circuitboard/protolathe/engineering + name = T_BOARD("engineering protolathe") + build_path = /obj/machinery/r_n_d/protolathe/engineering + +/obj/item/weapon/circuitboard/protolathe/medical + name = T_BOARD("medical protolathe") + build_path = /obj/machinery/r_n_d/protolathe/medical + +/obj/item/weapon/circuitboard/protolathe/cargo + name = T_BOARD("cargo protolathe") + build_path = /obj/machinery/r_n_d/protolathe/cargo + +/obj/item/weapon/circuitboard/protolathe/service + name = T_BOARD("service protolathe") + build_path = /obj/machinery/r_n_d/protolathe/service + +/obj/item/weapon/circuitboard/protolathe/security + name = T_BOARD("security protolathe") + build_path = /obj/machinery/r_n_d/protolathe/security + +// CHOMPAdd End + /obj/item/weapon/circuitboard/circuit_imprinter name = T_BOARD("circuit imprinter") build_path = /obj/machinery/r_n_d/circuit_imprinter diff --git a/code/modules/power/tesla/telsa_construction.dm b/code/modules/power/tesla/telsa_construction.dm index 603dc508aa..3a7f61501a 100644 --- a/code/modules/power/tesla/telsa_construction.dm +++ b/code/modules/power/tesla/telsa_construction.dm @@ -17,6 +17,7 @@ build_path = /obj/item/weapon/circuitboard/tesla_coil req_tech = list(TECH_MAGNET = 2, TECH_POWER = 4) sort_string = "MAAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // Grounding rods can be built as machines using a circuit made in an autolathe. /obj/item/weapon/circuitboard/grounding_rod diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index f5fa40484b..ec09825dc8 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -32,6 +32,7 @@ other types of metals and chemistry for reagents). var/list/category = list() //Primarily used for Mech Fabricators, but can be used for anything. var/sort_string = "ZZZZZ" //Sorting order var/search_metadata // Optional string that interfaces can use as part of search filters. See- item/borg/upgrade/ai and the Exosuit Fabs. + var/department = LATHE_ALL // Flag as to what departmental lathe can print this design /datum/design/New() ..() @@ -84,4 +85,4 @@ other types of metals and chemistry for reagents). if(C) C.charge = 0 I.update_icon() - return I \ No newline at end of file + return I diff --git a/code/modules/research/designs/HUDs.dm b/code/modules/research/designs/HUDs.dm index 1bb10b0cfc..ac0aaf6431 100644 --- a/code/modules/research/designs/HUDs.dm +++ b/code/modules/research/designs/HUDs.dm @@ -16,6 +16,7 @@ req_tech = list(TECH_BIO = 2, TECH_MAGNET = 3) build_path = /obj/item/clothing/glasses/hud/health sort_string = "EAAAA" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/hud/security name = "security records" @@ -23,6 +24,7 @@ req_tech = list(TECH_MAGNET = 3, TECH_COMBAT = 2) build_path = /obj/item/clothing/glasses/hud/security sort_string = "EAAAB" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/hud/janitor name = "contaminant detector" @@ -30,6 +32,7 @@ req_tech = list(TECH_MAGNET = 2) build_path = /obj/item/clothing/glasses/hud/janitor sort_string = "EAAAC" + department = LATHE_ALL | LATHE_SERVICE // CHOMPAdd /datum/design/item/hud/mesons name = "optical meson scanner" @@ -37,6 +40,7 @@ req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/clothing/glasses/meson sort_string = "EAAAD" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/hud/material name = "optical material scanner" @@ -44,6 +48,7 @@ req_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 3) build_path = /obj/item/clothing/glasses/material sort_string = "EAAAE" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/hud/graviton_visor name = "graviton visor" @@ -52,3 +57,4 @@ materials = list(MAT_PLASTEEL = 2000, MAT_GLASS = 3000, MAT_PHORON = 1500) //CHOMP Edit build_path = /obj/item/clothing/glasses/graviton sort_string = "EAAAF" + department = LATHE_ALL | LATHE_CARGO diff --git a/code/modules/research/designs/bag_of_holding.dm b/code/modules/research/designs/bag_of_holding.dm index 23d075c19d..0230e99510 100644 --- a/code/modules/research/designs/bag_of_holding.dm +++ b/code/modules/research/designs/bag_of_holding.dm @@ -12,6 +12,7 @@ materials = list(MAT_GOLD = 1000, MAT_DIAMOND = 500, MAT_URANIUM = 250) // Less expensive since it can only hold ores build_path = /obj/item/weapon/storage/bag/ore/holding sort_string = "QAAAA" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/boh/bag_holding name = "Bag of Holding" @@ -39,6 +40,7 @@ materials = list("gold" = 2000, "diamond" = 1000, "uranium" = 250) build_path = /obj/item/weapon/storage/bag/trash/holding sort_string = "QAAAC" + department = LATHE_ALL | LATHE_SERVICE // CHOMPAdd /datum/design/item/boh/pouch_holding name = "Pouch of Holding" @@ -48,7 +50,7 @@ materials = list("gold" = 3000, "diamond" = 2000, "uranium" = 250) build_path = /obj/item/weapon/storage/pouch/holding sort_string = "QAAAD" - + /datum/design/item/boh/belt_holding_med name = "Medical Belt of Holding" @@ -58,6 +60,7 @@ materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500) build_path = /obj/item/weapon/storage/belt/medical/holding sort_string = "QAAAE" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/boh/belt_holding_utility name = "Tool-Belt of Holding" @@ -67,4 +70,4 @@ materials = list("gold" = 3000, "diamond" = 2000, "titanium" = 500) build_path = /obj/item/weapon/storage/belt/utility/holding sort_string = "QAAAF" - \ No newline at end of file + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd diff --git a/code/modules/research/designs/beakers.dm b/code/modules/research/designs/beakers.dm index 0b3c359d39..21fff29d4e 100644 --- a/code/modules/research/designs/beakers.dm +++ b/code/modules/research/designs/beakers.dm @@ -11,6 +11,7 @@ materials = list(MAT_STEEL = 3000) build_path = /obj/item/weapon/reagent_containers/glass/beaker/noreact sort_string = "IAAAA" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/beaker/bluespace name = TECH_BLUESPACE @@ -19,4 +20,5 @@ req_tech = list(TECH_BLUESPACE = 2, TECH_MATERIAL = 6) materials = list(MAT_STEEL = 3000, MAT_PHORON = 3000, MAT_DIAMOND = 500) build_path = /obj/item/weapon/reagent_containers/glass/beaker/bluespace - sort_string = "IAAAB" \ No newline at end of file + sort_string = "IAAAB" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd diff --git a/code/modules/research/designs/bio_devices.dm b/code/modules/research/designs/bio_devices.dm index 27f1e0a556..694eb42ad1 100644 --- a/code/modules/research/designs/bio_devices.dm +++ b/code/modules/research/designs/bio_devices.dm @@ -1,5 +1,6 @@ /datum/design/item/biotech materials = list(MAT_STEEL = 30, MAT_GLASS = 20) + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/biotech/AssembleDesignName() ..() @@ -42,6 +43,7 @@ materials = list(MAT_STEEL = 500, MAT_GLASS = 200) build_path = /obj/item/device/robotanalyzer sort_string = "JAACA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/biotech/nanopaste desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." @@ -50,6 +52,7 @@ materials = list(MAT_STEEL = 7000, MAT_GLASS = 7000) build_path = /obj/item/stack/nanopaste sort_string = "JAACB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/biotech/plant_analyzer desc = "A device capable of quickly scanning all relevant data about a plant." @@ -58,4 +61,4 @@ materials = list(MAT_STEEL = 500, MAT_GLASS = 500) build_path = /obj/item/device/analyzer/plant_analyzer sort_string = "JAADA" - + department = LATHE_ALL | LATHE_SERVICE // CHOMPAdd diff --git a/code/modules/research/designs/bio_devices_vr.dm b/code/modules/research/designs/bio_devices_vr.dm index ee651b193e..318fb869ed 100644 --- a/code/modules/research/designs/bio_devices_vr.dm +++ b/code/modules/research/designs/bio_devices_vr.dm @@ -5,6 +5,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 8000, MAT_URANIUM = 6000, MAT_DIAMOND = 6000) build_path = /obj/item/device/nif sort_string = "JVAAA" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/biotech/nifbio name = "bioadaptive NIF" @@ -13,6 +14,7 @@ materials = list(MAT_STEEL = 10000, MAT_GLASS = 15000, MAT_URANIUM = 10000, MAT_DIAMOND = 10000) build_path = /obj/item/device/nif/bioadap sort_string = "JVAAB" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/biotech/nifrepairtool name = "adv. NIF repair tool" @@ -20,4 +22,4 @@ req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) materials = list(MAT_STEEL = 2000, MAT_GLASS = 3000, MAT_URANIUM = 2000, MAT_DIAMOND = 2000) build_path = /obj/item/device/nifrepairer - sort_string = "JVABA" \ No newline at end of file + sort_string = "JVABA" diff --git a/code/modules/research/designs/circuit_assembly.dm b/code/modules/research/designs/circuit_assembly.dm index e9271d6d5c..be2f4585fb 100644 --- a/code/modules/research/designs/circuit_assembly.dm +++ b/code/modules/research/designs/circuit_assembly.dm @@ -1,4 +1,6 @@ // Integrated circuits stuff +/datum/design/item/integrated_circuitry // CHOMPAdd + department = LATHE_ALL | LATHE_SCIENCE | LATHE_ENGINEERING /datum/design/item/integrated_circuitry/AssembleDesignName() ..() diff --git a/code/modules/research/designs/circuits/ai_modules.dm b/code/modules/research/designs/circuits/ai_modules.dm index b61c6f89db..2fcfe13607 100644 --- a/code/modules/research/designs/circuits/ai_modules.dm +++ b/code/modules/research/designs/circuits/ai_modules.dm @@ -1,6 +1,7 @@ /datum/design/aimodule build_type = IMPRINTER materials = list(MAT_GLASS = 2000, MAT_GOLD = 100) + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/aimodule/AssembleDesignName() name = "AI module design ([name])" diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index 3dd78473fa..1612a1385a 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -30,6 +30,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/arcade/battle sort_string = "MAAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/oriontrail name = "orion trail arcade machine" @@ -37,6 +38,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/arcade/orion_trail sort_string = "MAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/clawmachine name = "grab-a-gift arcade machine" @@ -44,6 +46,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/arcade/clawmachine sort_string = "MAAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/jukebox name = "jukebox" @@ -51,6 +54,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 2, TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/jukebox sort_string = "MAAAO" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/seccamera name = "security camera monitor" @@ -164,6 +168,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3) build_path = /obj/item/weapon/circuitboard/comm_monitor sort_string = "HAACA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/comm_server name = "telecommunications server monitoring console" @@ -171,6 +176,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3) build_path = /obj/item/weapon/circuitboard/comm_server sort_string = "HAACB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/message_monitor name = "messaging monitor console" @@ -178,6 +184,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 5) build_path = /obj/item/weapon/circuitboard/message_monitor sort_string = "HAACC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/aiupload name = "AI upload console" @@ -185,6 +192,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4) build_path = /obj/item/weapon/circuitboard/aiupload sort_string = "HAABA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/borgupload name = "cyborg upload console" @@ -192,6 +200,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4) build_path = /obj/item/weapon/circuitboard/borgupload sort_string = "HAABB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/destructive_analyzer name = "destructive analyzer" @@ -199,6 +208,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2, TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/destructive_analyzer sort_string = "HABAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/protolathe name = "protolathe" @@ -206,6 +216,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/protolathe sort_string = "HABAB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/circuit_imprinter name = "circuit imprinter" @@ -213,6 +224,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/circuit_imprinter sort_string = "HABAC" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/autolathe name = "autolathe board" @@ -220,6 +232,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/autolathe sort_string = "HABAD" + department = LATHE_ALL | LATHE_SCIENCE | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/rdservercontrol name = "R&D server control console" @@ -227,6 +240,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3) build_path = /obj/item/weapon/circuitboard/rdservercontrol sort_string = "HABBA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/rdserver name = "R&D server" @@ -234,6 +248,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3) build_path = /obj/item/weapon/circuitboard/rdserver sort_string = "HABBB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/mechfab name = "exosuit fabricator" @@ -241,6 +256,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/mechfab sort_string = "HABAE" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/prosfab name = "prosthetics fabricator" @@ -248,6 +264,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/prosthetics sort_string = "HABAF" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/mech_recharger name = "mech recharger" @@ -255,6 +272,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2, TECH_POWER = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/mech_recharger sort_string = "HACAA" + department = LATHE_ALL | LATHE_SCIENCE | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/recharge_station name = "cyborg recharge station" @@ -262,18 +280,21 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/recharge_station sort_string = "HACAC" + department = LATHE_ALL | LATHE_SCIENCE | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/atmosalerts name = "atmosphere alert console" id = "atmosalerts" build_path = /obj/item/weapon/circuitboard/atmos_alert sort_string = "JAAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/air_management name = "atmosphere monitoring console" id = "air_management" build_path = /obj/item/weapon/circuitboard/air_management sort_string = "JAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/rcon_console name = "RCON remote control console" @@ -281,6 +302,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_POWER = 5) build_path = /obj/item/weapon/circuitboard/rcon_console sort_string = "JAAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/dronecontrol name = "drone control console" @@ -288,18 +310,21 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4) build_path = /obj/item/weapon/circuitboard/drone_control sort_string = "JAAAD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/powermonitor name = "power monitoring console" id = "powermonitor" build_path = /obj/item/weapon/circuitboard/powermonitor sort_string = "JAAAE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/solarcontrol name = "solar control console" id = "solarcontrol" build_path = /obj/item/weapon/circuitboard/solar_control sort_string = "JAAAF" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/shutoff_monitor name = "Automatic shutoff valve monitor" @@ -307,6 +332,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/shutoff_monitor sort_string = "JAAAG" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/pacman name = "PACMAN-type generator" @@ -314,6 +340,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3, TECH_PHORON = 3, TECH_POWER = 3, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/pacman sort_string = "JBAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/superpacman name = "SUPERPACMAN-type generator" @@ -321,6 +348,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3, TECH_POWER = 4, TECH_ENGINEERING = 4) build_path = /obj/item/weapon/circuitboard/pacman/super sort_string = "JBAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/mrspacman name = "MRSPACMAN-type generator" @@ -328,6 +356,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3, TECH_POWER = 5, TECH_ENGINEERING = 5) build_path = /obj/item/weapon/circuitboard/pacman/mrs sort_string = "JBAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/batteryrack name = "cell rack PSU" @@ -335,6 +364,7 @@ CIRCUITS BELOW req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/batteryrack sort_string = "JBABA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/smes_cell name = "'SMES' superconductive magnetic energy storage" @@ -343,6 +373,7 @@ CIRCUITS BELOW req_tech = list(TECH_POWER = 7, TECH_ENGINEERING = 5) build_path = /obj/item/weapon/circuitboard/smes sort_string = "JBABB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/grid_checker name = "power grid checker" @@ -351,6 +382,7 @@ CIRCUITS BELOW req_tech = list(TECH_POWER = 4, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/grid_checker sort_string = "JBABC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/breakerbox name = "breaker box" @@ -359,6 +391,7 @@ CIRCUITS BELOW req_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/breakerbox sort_string = "JBABD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/gas_heater name = "gas heating system" @@ -366,6 +399,7 @@ CIRCUITS BELOW req_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 1) build_path = /obj/item/weapon/circuitboard/unary_atmos/heater sort_string = "JCAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/gas_cooler name = "gas cooling system" @@ -373,6 +407,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/unary_atmos/cooler sort_string = "JCAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/secure_airlock name = "secure airlock electronics" @@ -381,12 +416,14 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3) build_path = /obj/item/weapon/airlock_electronics/secure sort_string = "JDAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/ordercomp name = "supply ordering console" id = "ordercomp" build_path = /obj/item/weapon/circuitboard/supplycomp sort_string = "KAAAY" // Duplicate string, really need to redo this whole thing + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/supplycomp name = "supply control console" @@ -394,6 +431,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 3) build_path = /obj/item/weapon/circuitboard/supplycomp/control sort_string = "KAAAZ" // Duplicate string, really need to redo this whole thing + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/biogenerator name = "biogenerator" @@ -401,6 +439,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2) build_path = /obj/item/weapon/circuitboard/biogenerator sort_string = "KBAAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/miningdrill name = "mining drill head" @@ -408,6 +447,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) build_path = /obj/item/weapon/circuitboard/miningdrill sort_string = "KCAAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/miningdrillbrace name = "mining drill brace" @@ -415,24 +455,28 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1) build_path = /obj/item/weapon/circuitboard/miningdrillbrace sort_string = "KCAAB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/comconsole name = "communications console" id = "comconsole" build_path = /obj/item/weapon/circuitboard/communications sort_string = "LAAAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/idcardconsole name = "ID card modification console" id = "idcardconsole" build_path = /obj/item/weapon/circuitboard/card sort_string = "LAAAB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/emp_data name = "employment records console" id = "emp_data" build_path = /obj/item/weapon/circuitboard/skills sort_string = "LAAAC" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/arf_generator name = "atmospheric field generator" @@ -440,6 +484,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 4, TECH_POWER = 4, TECH_BIO = 3) build_path = /obj/item/weapon/circuitboard/arf_generator sort_string = "LAAAD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/protean_reconstitutor name = "protean reconstitutor" @@ -447,9 +492,11 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 5, TECH_BLUESPACE = 5, TECH_MATERIAL = 5, TECH_ENGINEERING = 5, TECH_DATA = 5) build_path = /obj/item/weapon/circuitboard/protean_reconstitutor sort_string = "LAAAE" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/mecha req_tech = list(TECH_DATA = 3) + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/mecha/AssembleDesignName() name = "Exosuit module circuit design ([name])" @@ -539,6 +586,7 @@ CIRCUITS BELOW /datum/design/circuit/tcom req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4) + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/tcom/AssembleDesignName() name = "Telecommunications machinery circuit design ([name])" @@ -600,6 +648,7 @@ CIRCUITS BELOW /datum/design/circuit/shield req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3) materials = list(MAT_GLASS = 2000, MAT_GOLD = 1000) + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/shield/AssembleDesignName() name = "Shield generator circuit design ([name])" @@ -633,6 +682,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4) build_path = /obj/item/weapon/circuitboard/ntnet_relay sort_string = "WAAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/aicore name = "AI core" @@ -640,6 +690,8 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4, TECH_BIO = 3) build_path = /obj/item/weapon/circuitboard/aicore sort_string = "XAAAA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_SCIENCE // CHOMPAdd + // Cooking Appliances /datum/design/circuit/microwave name = "microwave board" @@ -647,6 +699,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/microwave sort_string = "HACAM" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/oven name = "oven board" @@ -654,6 +707,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/oven sort_string = "HACAN" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/fryer name = "deep fryer board" @@ -661,6 +715,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/fryer sort_string = "HACAO" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/cerealmaker name = "cereal maker board" @@ -668,6 +723,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/cerealmaker sort_string = "HACAP" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/candymaker name = "candy machine board" @@ -675,6 +731,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/candymachine sort_string = "HACAQ" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/microwave/advanced name = "deluxe microwave" @@ -689,6 +746,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4) build_path = /obj/item/weapon/circuitboard/pointdefense sort_string = "OAABA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/pointdefense_control name = "point defense control" @@ -696,6 +754,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2) build_path = /obj/item/weapon/circuitboard/pointdefense_control sort_string = "OAABB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/shield_generator name = "shield generator" @@ -703,6 +762,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 3, TECH_POWER = 4, TECH_BLUESPACE = 2, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/shield_generator sort_string = "OAAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/shield_diffuser name = "shield diffuser" @@ -710,6 +770,7 @@ CIRCUITS BELOW req_tech = list(TECH_MAGNET = 4, TECH_POWER = 2, TECH_ENGINEERING = 5) build_path = /obj/item/weapon/circuitboard/shield_diffuser sort_string = "OAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/pointdefense name = "point defense battery" @@ -717,6 +778,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4) build_path = /obj/item/weapon/circuitboard/pointdefense sort_string = "OAABA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/pointdefense_control name = "point defense control" @@ -724,6 +786,7 @@ CIRCUITS BELOW req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2) build_path = /obj/item/weapon/circuitboard/pointdefense_control sort_string = "OAABB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/recycler_crusher name = "recycler - crusher" @@ -731,6 +794,7 @@ CIRCUITS BELOW req_tech = list(TECH_MATERIAL = 2) build_path = /obj/item/weapon/circuitboard/recycler_crusher sort_string = "OAABC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/recycler_sorter name = "recycler - sorter" @@ -738,6 +802,7 @@ CIRCUITS BELOW req_tech = list(TECH_MATERIAL = 2) build_path = /obj/item/weapon/circuitboard/recycler_sorter sort_string = "OAABD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/recycler_stamper name = "recycler - stamper" @@ -745,3 +810,4 @@ CIRCUITS BELOW req_tech = list(TECH_MATERIAL = 2) build_path = /obj/item/weapon/circuitboard/recycler_stamper sort_string = "OAABE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd diff --git a/code/modules/research/designs/circuits/circuits_ch.dm b/code/modules/research/designs/circuits/circuits_ch.dm index 6f2ca630c2..edb43e355d 100644 --- a/code/modules/research/designs/circuits/circuits_ch.dm +++ b/code/modules/research/designs/circuits/circuits_ch.dm @@ -4,6 +4,7 @@ req_tech = list(TECH_DATA = 5, TECH_ENGINEERING = 5, TECH_BLUESPACE = 4) build_path = /obj/item/weapon/circuitboard/microwave/advanced sort_string = "MAAAC" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/circuit/mecha/scarab_main name = "'Scarab' central control" diff --git a/code/modules/research/designs/circuits/circuits_vr.dm b/code/modules/research/designs/circuits/circuits_vr.dm index 2224d6e190..bb7ccd1d8d 100644 --- a/code/modules/research/designs/circuits/circuits_vr.dm +++ b/code/modules/research/designs/circuits/circuits_vr.dm @@ -4,6 +4,7 @@ req_tech = list(TECH_ENGINEERING = 3, TECH_BIO = 2) build_path = /obj/item/weapon/circuitboard/algae_farm sort_string = "HABAE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/thermoregulator name = "thermal regulator" @@ -11,6 +12,7 @@ req_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 3) build_path = /obj/item/weapon/circuitboard/thermoregulator sort_string = "HABAF" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/bomb_tester name = "Explosive Effect Simulator" @@ -18,6 +20,7 @@ req_tech = list(TECH_PHORON = 3, TECH_DATA = 2, TECH_MAGNET = 2) build_path = /obj/item/weapon/circuitboard/bomb_tester sort_string = "HABAG" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/quantum_pad name = "Quantum Pad" @@ -25,6 +28,7 @@ req_tech = list(TECH_ENGINEERING = 4, TECH_POWER = 4, TECH_BLUESPACE = 4) build_path = /obj/item/weapon/circuitboard/quantumpad sort_string = "HABAH" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd //////Micro mech stuff /* //CHOMPedit commented micromech stuff, because fuck this trash @@ -88,6 +92,7 @@ req_tech = list(TECH_DATA = 3, TECH_BIO = 3) build_path = /obj/item/weapon/circuitboard/transhuman_clonepod sort_string = "HAADA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/transhuman_synthprinter name = "SynthFab 3000" @@ -95,6 +100,7 @@ req_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/transhuman_synthprinter sort_string = "HAADB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/transhuman_resleever name = "Resleeving pod" @@ -102,6 +108,7 @@ req_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4) build_path = /obj/item/weapon/circuitboard/transhuman_resleever sort_string = "HAADC" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd // Resleeving @@ -111,6 +118,7 @@ req_tech = list(TECH_DATA = 5) build_path = /obj/item/weapon/circuitboard/resleeving_control sort_string = "HAADE" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/body_designer name = "Body design console" @@ -118,6 +126,7 @@ req_tech = list(TECH_DATA = 5) build_path = /obj/item/weapon/circuitboard/body_designer sort_string = "HAADF" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/partslathe name = "Parts lathe" @@ -125,6 +134,7 @@ req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/partslathe sort_string = "HABAD" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd // Telesci stuff @@ -134,6 +144,7 @@ req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 3, TECH_PHORON = 4) build_path = /obj/item/weapon/circuitboard/telesci_console sort_string = "HAAEA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/telesci_pad name = "Telepad" @@ -141,6 +152,7 @@ req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_PHORON = 4, TECH_BLUESPACE = 5) build_path = /obj/item/weapon/circuitboard/telesci_pad sort_string = "HAAEB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/quantum_pad name = "Quantum Pad" @@ -148,6 +160,7 @@ req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_PHORON = 4, TECH_BLUESPACE = 5) build_path = /obj/item/weapon/circuitboard/quantumpad sort_string = "HAAC" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/rtg name = "radioisotope TEG" @@ -155,6 +168,7 @@ req_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3) build_path = /obj/item/weapon/circuitboard/machine/rtg sort_string = "HAAD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/rtg_advanced name = "advanced radioisotope TEG" @@ -162,6 +176,7 @@ req_tech = list(TECH_DATA = 5, TECH_POWER = 5, TECH_PHORON = 5, TECH_ENGINEERING = 5) build_path = /obj/item/weapon/circuitboard/machine/rtg/advanced sort_string = "HAAE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/rtg name = "vitals monitor" @@ -169,6 +184,7 @@ req_tech = list(TECH_DATA = 3, TECH_BIO = 4, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/machine/vitals_monitor sort_string = "HAAF" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/firework_launcher name = "firework launcher" @@ -176,6 +192,7 @@ req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2) build_path = /obj/item/weapon/circuitboard/firework_launcher sort_string = "KBAAB" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/pointdefense name = "point defense battery" @@ -183,6 +200,7 @@ req_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 3, TECH_COMBAT = 4) build_path = /obj/item/weapon/circuitboard/pointdefense sort_string = "OAABA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/circuit/pointdefense_control name = "point defense control" @@ -190,3 +208,4 @@ req_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_COMBAT = 2) build_path = /obj/item/weapon/circuitboard/pointdefense_control sort_string = "OAABB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd diff --git a/code/modules/research/designs/circuits/circuits_yw.dm b/code/modules/research/designs/circuits/circuits_yw.dm index 4d1756d24f..ca94a37cbf 100644 --- a/code/modules/research/designs/circuits/circuits_yw.dm +++ b/code/modules/research/designs/circuits/circuits_yw.dm @@ -4,10 +4,12 @@ req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 2) build_path = /obj/item/weapon/circuitboard/teleporter_hub sort_string = "HAAAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/circuit/teleporter_station name = "teleporter station" id = "teleporter_station" req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 2) build_path = /obj/item/weapon/circuitboard/teleporter_station - sort_string = "HAAAA" \ No newline at end of file + sort_string = "HAAAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd diff --git a/code/modules/research/designs/engineering.dm b/code/modules/research/designs/engineering.dm index 7d57aa62df..156971336e 100644 --- a/code/modules/research/designs/engineering.dm +++ b/code/modules/research/designs/engineering.dm @@ -12,6 +12,7 @@ materials = list(MAT_STEEL = 70, MAT_GLASS = 120, MAT_PHORON = 100) build_path = /obj/item/weapon/weldingtool/experimental sort_string = "NAAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/tool/hand_drill name = "Hand drill" @@ -21,6 +22,7 @@ materials = list(MAT_STEEL = 300, MAT_SILVER = 100) build_path = /obj/item/weapon/tool/transforming/powerdrill sort_string = "NAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/tool/jaws_life name = "Jaws of life" @@ -30,6 +32,7 @@ materials = list(MAT_STEEL = 300, MAT_SILVER = 100) build_path = /obj/item/weapon/tool/transforming/jawsoflife sort_string = "NAAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // YW addition begins /datum/design/item/tool/rpd name = "Rapid Piping Device (RPD)" @@ -39,6 +42,7 @@ materials = list(DEFAULT_WALL_MATERIAL = 300, "silver" = 100, "diamond" = 500) build_path = /obj/item/weapon/pipe_dispenser sort_string = "NAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/tool/rms name = "Rapid Material Synthesizer (RMS)" @@ -48,6 +52,7 @@ materials = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 500, "silver" = 300, "phoron" = 300, "diamond" = 500) //Probably change the price in the future just put something for now build_path = /obj/item/weapon/rms sort_string = "NAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // YW addition end /datum/design/item/tool/rpd @@ -58,6 +63,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000) build_path = /obj/item/weapon/pipe_dispenser sort_string = "NAAAD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/tool/qpad_booster name = "Quantum Pad Particle Booster" @@ -67,6 +73,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 1000) build_path = /obj/item/device/quantum_pad_booster sort_string = "NAAAF" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // Other devices @@ -91,6 +98,7 @@ materials = list(MAT_STEEL = 500, MAT_PHORON = 150) build_path = /obj/item/device/t_scanner/upgraded sort_string = "NBAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/engineering/t_scanner_adv name = "Advanced T-ray Scanner" @@ -100,6 +108,7 @@ materials = list(MAT_STEEL = 1250, MAT_PHORON = 500, MAT_SILVER = 50) build_path = /obj/item/device/t_scanner/advanced sort_string = "NBAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/engineering/atmosanalyzer name = "Analyzer" @@ -109,3 +118,4 @@ materials = list(MAT_STEEL = 200, MAT_GLASS = 100) build_path = /obj/item/device/analyzer sort_string = "NBABA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd diff --git a/code/modules/research/designs/firework_stars.dm b/code/modules/research/designs/firework_stars.dm index b365367451..bd789ee57f 100644 --- a/code/modules/research/designs/firework_stars.dm +++ b/code/modules/research/designs/firework_stars.dm @@ -1,4 +1,6 @@ // Firework Stars +/datum/design/item/firework_star // CHOMPAdd + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/firework_star/AssembleDesignName() name = "Firework star prototype ([item_name])" diff --git a/code/modules/research/designs/implants.dm b/code/modules/research/designs/implants.dm index 2f9e4cc83d..d3b2947f88 100644 --- a/code/modules/research/designs/implants.dm +++ b/code/modules/research/designs/implants.dm @@ -13,10 +13,12 @@ req_tech = list(TECH_MATERIAL = 2, TECH_BIO = 3) build_path = /obj/item/weapon/implantcase/chem sort_string = "MFAAA" + department = LATHE_ALL | LATHE_MEDICAL | LATHE_SECURITY // CHOMPAdd /datum/design/item/implant/freedom name = "freedom" id = "implant_free" req_tech = list(TECH_ILLEGAL = 2, TECH_BIO = 3) build_path = /obj/item/weapon/implantcase/freedom - sort_string = "MFAAB" \ No newline at end of file + sort_string = "MFAAB" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd diff --git a/code/modules/research/designs/implants_vr.dm b/code/modules/research/designs/implants_vr.dm index 9812e0f192..16b5dc2914 100644 --- a/code/modules/research/designs/implants_vr.dm +++ b/code/modules/research/designs/implants_vr.dm @@ -5,6 +5,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) build_path = /obj/item/weapon/implantcase/backup sort_string = "MFAVA" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/implant/sizecontrol name = "Size control implant" @@ -13,3 +14,4 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) build_path = /obj/item/weapon/implanter/sizecontrol sort_string = "MFAVB" + department = LATHE_ALL | LATHE_MEDICAL | LATHE_PUBLIC // CHOMPAdd diff --git a/code/modules/research/designs/locator_devices.dm b/code/modules/research/designs/locator_devices.dm index 82a5c81cf3..d18ca48b50 100644 --- a/code/modules/research/designs/locator_devices.dm +++ b/code/modules/research/designs/locator_devices.dm @@ -13,6 +13,7 @@ id = "gps_gen" build_path = /obj/item/device/gps sort_string = "DAAAA" + department = LATHE_ALL | LATHE_PUBLIC// CHOMPAdd /datum/design/item/gps/command name = "COM" @@ -25,30 +26,35 @@ id = "gps_sec" build_path = /obj/item/device/gps/security sort_string = "DAAAC" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/gps/medical name = "MED" id = "gps_med" build_path = /obj/item/device/gps/medical sort_string = "DAAAD" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/gps/engineering name = "ENG" id = "gps_eng" build_path = /obj/item/device/gps/engineering sort_string = "DAAAE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/gps/science name = "SCI" id = "gps_sci" build_path = /obj/item/device/gps/science sort_string = "DAAAF" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/gps/mining name = "MINE" id = "gps_mine" build_path = /obj/item/device/gps/mining sort_string = "DAAAG" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/gps/explorer name = "EXP" @@ -70,6 +76,7 @@ materials = list(MAT_STEEL = 1000,MAT_GLASS = 500) build_path = /obj/item/device/beacon_locator sort_string = "DBAAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/locator/beacon name = "Bluespace tracking beacon" @@ -78,3 +85,4 @@ materials = list (MAT_STEEL = 20, MAT_GLASS = 10) build_path = /obj/item/device/radio/beacon sort_string = "DBABA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd diff --git a/code/modules/research/designs/medical.dm b/code/modules/research/designs/medical.dm index 75f1785514..8a1f1840fe 100644 --- a/code/modules/research/designs/medical.dm +++ b/code/modules/research/designs/medical.dm @@ -1,5 +1,6 @@ /datum/design/item/medical materials = list(MAT_STEEL = 30, MAT_GLASS = 20) + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/medical/AssembleDesignName() ..() diff --git a/code/modules/research/designs/mining_toys.dm b/code/modules/research/designs/mining_toys.dm index ed71323b14..92d47e5733 100644 --- a/code/modules/research/designs/mining_toys.dm +++ b/code/modules/research/designs/mining_toys.dm @@ -10,6 +10,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) //expensive, but no need for miners. build_path = /obj/item/weapon/pickaxe/drill sort_string = "FAAAA" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/weapon/mining/advdrill id = "advanced_drill" @@ -17,6 +18,7 @@ materials = list(MAT_STEEL = 6000, MAT_GLASS = 1000) //expensive, but no need for miners. build_path = /obj/item/weapon/pickaxe/advdrill sort_string = "FAAAB" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/weapon/mining/jackhammer id = "jackhammer" @@ -24,6 +26,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_SILVER = 500) build_path = /obj/item/weapon/pickaxe/jackhammer sort_string = "FAAAC" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/weapon/mining/plasmacutter id = "plasmacutter" @@ -31,6 +34,7 @@ materials = list(MAT_STEEL = 1500, MAT_GLASS = 500, MAT_GOLD = 500, MAT_PHORON = 500) build_path = /obj/item/weapon/pickaxe/plasmacutter sort_string = "FAAAD" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/weapon/mining/pick_diamond id = "pick_diamond" @@ -38,6 +42,7 @@ materials = list(MAT_DIAMOND = 3000) build_path = /obj/item/weapon/pickaxe/diamond sort_string = "FAAAE" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/weapon/mining/drill_diamond id = "drill_diamond" @@ -45,6 +50,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) build_path = /obj/item/weapon/pickaxe/diamonddrill sort_string = "FAAAF" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd // Mining other equipment @@ -55,6 +61,7 @@ materials = list(MAT_STEEL = 1000,MAT_GLASS = 1000) build_path = /obj/item/device/depth_scanner sort_string = "FBAAA" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/weapon/mining/upgradeAOE name = "Mining Explosion Upgrade" @@ -64,3 +71,4 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 5000, MAT_SILVER = 500, MAT_GOLD = 500, MAT_URANIUM = 2000, MAT_PHORON = 2000) build_path = /obj/item/borg/upgrade/modkit/aoe/turfs sort_string = "FAAF" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd diff --git a/code/modules/research/designs/misc.dm b/code/modules/research/designs/misc.dm index c008eec25d..75b851bf0d 100644 --- a/code/modules/research/designs/misc.dm +++ b/code/modules/research/designs/misc.dm @@ -11,6 +11,7 @@ materials = list(MAT_STEEL = 500, MAT_GLASS = 500) build_path = /obj/item/device/communicator sort_string = "TAAAA" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/laserpointer name = "laser pointer" @@ -20,6 +21,7 @@ materials = list(MAT_STEEL = 100, MAT_GLASS = 50) build_path = /obj/item/device/laser_pointer sort_string = "TAABA" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/translator name = "handheld translator" @@ -28,6 +30,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) build_path = /obj/item/device/universal_translator sort_string = "TAACA" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/ear_translator name = "earpiece translator" @@ -36,6 +39,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000, MAT_GOLD = 1000) build_path = /obj/item/device/universal_translator/ear sort_string = "TAACB" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/light_replacer name = "Light replacer" @@ -45,6 +49,7 @@ materials = list(MAT_STEEL = 1500, MAT_SILVER = 150, MAT_GLASS = 3000) build_path = /obj/item/device/lightreplacer sort_string = "TAADA" + department = LATHE_ALL | LATHE_SERVICE // CHOMPAdd /datum/design/item/general/binaryencrypt name = "Binary encryption key" @@ -89,4 +94,5 @@ req_tech = list(TECH_MATERIAL = 3, TECH_ENGINEERING = 5, TECH_BIO = 1) materials = list(MAT_STEEL = 5000, MAT_GLASS = 2000, MAT_GOLD = 1000) build_path = /obj/item/weapon/mop/advanced - sort_string = "TBAAE" \ No newline at end of file + sort_string = "TBAAE" + department = LATHE_ALL | LATHE_SERVICE // CHOMPAdd diff --git a/code/modules/research/designs/misc_vr.dm b/code/modules/research/designs/misc_vr.dm index 12121fea11..570d78b11e 100644 --- a/code/modules/research/designs/misc_vr.dm +++ b/code/modules/research/designs/misc_vr.dm @@ -5,6 +5,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 1000) build_path = /obj/item/clothing/under/hyperfiber sort_string = "TAVAA" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/bluespace_jumpsuit name = "Bluespace jumpsuit" @@ -13,6 +14,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) build_path = /obj/item/clothing/under/hyperfiber/bluespace sort_string = "TAVAB" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/sizegun name = "Size gun" @@ -21,6 +23,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000) build_path = /obj/item/weapon/gun/energy/sizegun sort_string = "TAVBA" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/sizegun_gradual name = "Gradual size gun" @@ -29,6 +32,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000) build_path = /obj/item/device/slow_sizegun sort_string = "TAVBB" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/bluespace_collar name = "Bluespace collar" @@ -37,6 +41,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) build_path = /obj/item/clothing/accessory/collar/shock/bluespace sort_string = "TAVBC" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/bodysnatcher name = "Body Snatcher" @@ -45,6 +50,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000) build_path = /obj/item/device/bodysnatcher sort_string = "TBVAA" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/inducer_sci name = "Inducer (Scientific)" @@ -53,6 +59,7 @@ materials = list(MAT_STEEL = 8000, MAT_GLASS = 2000, MAT_URANIUM = 4000, MAT_PHORON = 4000) build_path = /obj/item/weapon/inducer/sci sort_string = "TCVAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/general/inducer_eng name = "Inducer (Industrial)" @@ -61,6 +68,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 2000) build_path = /obj/item/weapon/inducer/unloaded sort_string = "TCVAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/weapon/mining/mining_scanner id = "mining_scanner" @@ -68,6 +76,7 @@ materials = list(MAT_STEEL = 1000,MAT_GLASS = 500) build_path = /obj/item/weapon/mining_scanner/advanced sort_string = "FBAAB" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/general/walkpod name = "PodZu Music Player" @@ -76,6 +85,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 2000) build_path = /obj/item/device/walkpod sort_string = "TCVAD" + department = LATHE_ALL | LATHE_SERVICE | LATHE_PUBLIC // CHOMPAdd /datum/design/item/general/juke_remote name = "BoomTown Cordless Speaker" @@ -84,3 +94,4 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000) build_path = /obj/item/device/juke_remote sort_string = "TCVAE" + department = LATHE_ALL | LATHE_SERVICE | LATHE_PUBLIC // CHOMPAdd diff --git a/code/modules/research/designs/pdas.dm b/code/modules/research/designs/pdas.dm index c13d490493..faff73ec3d 100644 --- a/code/modules/research/designs/pdas.dm +++ b/code/modules/research/designs/pdas.dm @@ -23,46 +23,55 @@ id = "cart_basic" build_path = /obj/item/weapon/cartridge sort_string = "WBAAA" + department = LATHE_ALL | LATHE_PUBLIC // CHOMPAdd /datum/design/item/pda_cartridge/engineering id = "cart_engineering" build_path = /obj/item/weapon/cartridge/engineering sort_string = "WBAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/pda_cartridge/atmos id = "cart_atmos" build_path = /obj/item/weapon/cartridge/atmos sort_string = "WBAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/pda_cartridge/medical id = "cart_medical" build_path = /obj/item/weapon/cartridge/medical sort_string = "WBAAD" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/pda_cartridge/chemistry id = "cart_chemistry" build_path = /obj/item/weapon/cartridge/chemistry sort_string = "WBAAE" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/pda_cartridge/security id = "cart_security" build_path = /obj/item/weapon/cartridge/security sort_string = "WBAAF" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/pda_cartridge/janitor id = "cart_janitor" build_path = /obj/item/weapon/cartridge/janitor sort_string = "WBAAG" + department = LATHE_ALL | LATHE_SERVICE // CHOMPAdd /datum/design/item/pda_cartridge/science id = "cart_science" build_path = /obj/item/weapon/cartridge/signal/science sort_string = "WBAAH" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/pda_cartridge/quartermaster id = "cart_quartermaster" build_path = /obj/item/weapon/cartridge/quartermaster sort_string = "WBAAI" + department = LATHE_ALL | LATHE_CARGO // CHOMPAdd /datum/design/item/pda_cartridge/head id = "cart_head" @@ -97,4 +106,4 @@ /datum/design/item/pda_cartridge/captain id = "cart_captain" build_path = /obj/item/weapon/cartridge/captain - sort_string = "WBAAP" \ No newline at end of file + sort_string = "WBAAP" diff --git a/code/modules/research/designs/power_cells.dm b/code/modules/research/designs/power_cells.dm index 4a58a06ebc..1d0681776a 100644 --- a/code/modules/research/designs/power_cells.dm +++ b/code/modules/research/designs/power_cells.dm @@ -24,6 +24,7 @@ build_path = /obj/item/weapon/cell category = list("Misc") sort_string = "BAAAA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_PUBLIC // CHOMPAdd /datum/design/item/powercell/high name = "high-capacity" @@ -33,6 +34,7 @@ build_path = /obj/item/weapon/cell/high category = list("Misc") sort_string = "BAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/powercell/super name = "super-capacity" @@ -42,6 +44,7 @@ build_path = /obj/item/weapon/cell/super category = list("Misc") sort_string = "BAAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/powercell/hyper name = "hyper-capacity" @@ -51,6 +54,7 @@ build_path = /obj/item/weapon/cell/hyper category = list("Misc") sort_string = "BAAAD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/powercell/device name = "device" @@ -60,6 +64,7 @@ build_path = /obj/item/weapon/cell/device category = list("Misc") sort_string = "BAABA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd //Yawn changes /datum/design/item/powercell/advance_device @@ -70,6 +75,7 @@ build_path = /obj/item/weapon/cell/device/weapon category = list("Misc") sort_string = "BAABB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/powercell/super_device name = "device, super" @@ -79,6 +85,7 @@ build_path = /obj/item/weapon/cell/device/super category = list("Misc") sort_string = "BAABC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/powercell/hype_device name = "device, hyper" @@ -88,6 +95,7 @@ build_path = /obj/item/weapon/cell/device/hyper category = list("Misc") sort_string = "BAABD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/powercell/omni_device name = "device, omni" @@ -98,6 +106,7 @@ build_path = /obj/item/weapon/cell/device/weapon/recharge/alien/omni category = list("Misc") sort_string = "BAABE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd //End of Yawn add /datum/design/item/powercell/mecha/high diff --git a/code/modules/research/designs/precursor.dm b/code/modules/research/designs/precursor.dm index 24f888f722..7faca0a81e 100644 --- a/code/modules/research/designs/precursor.dm +++ b/code/modules/research/designs/precursor.dm @@ -19,9 +19,13 @@ req_tech = list(TECH_MATERIAL = 4, TECH_BLUESPACE = 3, TECH_MAGNET = 4, TECH_PHORON = 2, TECH_ARCANE = 2) build_path = /obj/item/weapon/beartrap/hunting sort_string = "ZAAAA" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd // Precursor +/datum/design/item/precursor // CHOMPAdd + department = LATHE_ALL | LATHE_SCIENCE + /datum/design/item/precursor/AssembleDesignName() ..() name = "Alien prototype ([item_name])" @@ -90,4 +94,4 @@ /datum/design/item/precursor/janusmodule/Fabricate(var/newloc, var/fabricator) var/type_to_spawn = pick(subtypesof(/obj/item/weapon/circuitboard/mecha/imperion)) - return new type_to_spawn(newloc) \ No newline at end of file + return new type_to_spawn(newloc) diff --git a/code/modules/research/designs/stock_parts.dm b/code/modules/research/designs/stock_parts.dm index 20c09f7900..9ea388959b 100644 --- a/code/modules/research/designs/stock_parts.dm +++ b/code/modules/research/designs/stock_parts.dm @@ -22,6 +22,7 @@ materials = list(MAT_STEEL = 80) build_path = /obj/item/weapon/stock_parts/matter_bin sort_string = "AAAAA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_PUBLIC // CHOMPAdd /datum/design/item/stock_part/adv_matter_bin id = "adv_matter_bin" @@ -29,6 +30,7 @@ materials = list(MAT_STEEL = 80) build_path = /obj/item/weapon/stock_parts/matter_bin/adv sort_string = "AAAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/super_matter_bin id = "super_matter_bin" @@ -36,6 +38,7 @@ materials = list(MAT_STEEL = 80) build_path = /obj/item/weapon/stock_parts/matter_bin/super sort_string = "AAAAC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/hyper_matter_bin id = "hyper_matter_bin" @@ -43,6 +46,7 @@ materials = list(MAT_STEEL = 200, MAT_VERDANTIUM = 60, MAT_DURASTEEL = 75) build_path = /obj/item/weapon/stock_parts/matter_bin/hyper sort_string = "AAAAD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/omni_matter_bin id = "omni_matter_bin" @@ -50,6 +54,7 @@ materials = list(MAT_STEEL = 2000, MAT_PLASTEEL = 100, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) build_path = /obj/item/weapon/stock_parts/matter_bin/omni sort_string = "AAAAE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // Micro-manipulators @@ -59,6 +64,7 @@ materials = list(MAT_STEEL = 30) build_path = /obj/item/weapon/stock_parts/manipulator sort_string = "AAABA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_PUBLIC // CHOMPAdd /datum/design/item/stock_part/nano_mani id = "nano_mani" @@ -66,6 +72,7 @@ materials = list(MAT_STEEL = 30) build_path = /obj/item/weapon/stock_parts/manipulator/nano sort_string = "AAABB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/pico_mani id = "pico_mani" @@ -73,6 +80,7 @@ materials = list(MAT_STEEL = 30) build_path = /obj/item/weapon/stock_parts/manipulator/pico sort_string = "AAABC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/hyper_mani id = "hyper_mani" @@ -80,6 +88,7 @@ materials = list(MAT_STEEL = 200, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 50) build_path = /obj/item/weapon/stock_parts/manipulator/hyper sort_string = "AAABD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/omni_mani id = "omni_mani" @@ -87,6 +96,7 @@ materials = list(MAT_STEEL = 2000, MAT_PLASTEEL = 500, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) build_path = /obj/item/weapon/stock_parts/manipulator/omni sort_string = "AAABE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // Capacitors @@ -96,6 +106,7 @@ materials = list(MAT_STEEL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/stock_parts/capacitor sort_string = "AAACA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_PUBLIC // CHOMPAdd /datum/design/item/stock_part/adv_capacitor id = "adv_capacitor" @@ -103,6 +114,7 @@ materials = list(MAT_STEEL = 50, MAT_GLASS = 50) build_path = /obj/item/weapon/stock_parts/capacitor/adv sort_string = "AAACB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/super_capacitor id = "super_capacitor" @@ -110,6 +122,7 @@ materials = list(MAT_STEEL = 50, MAT_GLASS = 50, MAT_GOLD = 20) build_path = /obj/item/weapon/stock_parts/capacitor/super sort_string = "AAACC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/hyper_capacitor id = "hyper_capacitor" @@ -117,6 +130,7 @@ materials = list(MAT_STEEL = 200, MAT_GLASS = 100, MAT_VERDANTIUM = 30, MAT_DURASTEEL = 25) build_path = /obj/item/weapon/stock_parts/capacitor/hyper sort_string = "AAACD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/omni_capacitor id = "omni_capacitor" @@ -124,6 +138,7 @@ materials = list(MAT_STEEL = 2000, MAT_DIAMOND = 1000, MAT_GLASS = 1000, MAT_MORPHIUM = 100, MAT_DURASTEEL = 100) build_path = /obj/item/weapon/stock_parts/capacitor/omni sort_string = "AAACE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // Sensors @@ -133,6 +148,7 @@ materials = list(MAT_STEEL = 50, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/scanning_module sort_string = "AAADA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_PUBLIC // CHOMPAdd /datum/design/item/stock_part/adv_sensor id = "adv_sensor" @@ -140,6 +156,7 @@ materials = list(MAT_STEEL = 50, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/scanning_module/adv sort_string = "AAADB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/phasic_sensor id = "phasic_sensor" @@ -147,6 +164,7 @@ materials = list(MAT_STEEL = 50, MAT_GLASS = 20, MAT_SILVER = 10) build_path = /obj/item/weapon/stock_parts/scanning_module/phasic sort_string = "AAADC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/hyper_sensor id = "hyper_sensor" @@ -154,6 +172,7 @@ materials = list(MAT_STEEL = 50, MAT_GLASS = 20, MAT_SILVER = 50, MAT_VERDANTIUM = 40, MAT_DURASTEEL = 50) build_path = /obj/item/weapon/stock_parts/scanning_module/hyper sort_string = "AAADD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/omni_sensor id = "omni_sensor" @@ -161,6 +180,7 @@ materials = list(MAT_STEEL = 1000, MAT_PLASTEEL = 500, MAT_GLASS = 750, MAT_SILVER = 500, MAT_MORPHIUM = 60, MAT_DURASTEEL = 100) build_path = /obj/item/weapon/stock_parts/scanning_module/omni sort_string = "AAADE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // Micro-lasers @@ -170,6 +190,7 @@ materials = list(MAT_STEEL = 10, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/micro_laser sort_string = "AAAEA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_PUBLIC // CHOMPAdd /datum/design/item/stock_part/high_micro_laser id = "high_micro_laser" @@ -177,6 +198,7 @@ materials = list(MAT_STEEL = 10, MAT_GLASS = 20) build_path = /obj/item/weapon/stock_parts/micro_laser/high sort_string = "AAAEB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/ultra_micro_laser id = "ultra_micro_laser" @@ -184,6 +206,7 @@ materials = list(MAT_STEEL = 10, MAT_GLASS = 20, MAT_URANIUM = 10) build_path = /obj/item/weapon/stock_parts/micro_laser/ultra sort_string = "AAAEC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/hyper_micro_laser id = "hyper_micro_laser" @@ -191,6 +214,7 @@ materials = list(MAT_STEEL = 200, MAT_GLASS = 20, MAT_URANIUM = 30, MAT_VERDANTIUM = 50, MAT_DURASTEEL = 100) build_path = /obj/item/weapon/stock_parts/micro_laser/hyper sort_string = "AAAED" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/omni_micro_laser id = "omni_micro_laser" @@ -198,6 +222,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 2000, MAT_MORPHIUM = 50, MAT_DURASTEEL = 100) build_path = /obj/item/weapon/stock_parts/micro_laser/omni sort_string = "AAAEE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // part bundles, because i HATE queues and i don't want to rewrite it for stack-printing @@ -207,6 +232,7 @@ materials = list(MAT_STEEL = 1100, MAT_GLASS = 450) build_path = /obj/effect/spawner/parts/t1 sort_string = "AAAFA" + department = LATHE_ALL | LATHE_ENGINEERING | LATHE_PUBLIC // CHOMPAdd /datum/design/item/stock_part/bundle/t2 id = "parts_bundle_t2" @@ -214,6 +240,7 @@ materials = list(MAT_STEEL = 1100, MAT_GLASS = 450) build_path = /obj/effect/spawner/parts/t2 sort_string = "AAAFB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/bundle/t3 id = "parts_bundle_t3" @@ -221,6 +248,7 @@ materials = list(MAT_STEEL = 1100, MAT_GLASS = 450, MAT_SILVER = 50, MAT_GOLD = 100, MAT_URANIUM = 50) build_path = /obj/effect/spawner/parts/t3 sort_string = "AAAFC" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/bundle/t4 id = "parts_bundle_t4" @@ -228,6 +256,7 @@ materials = list(MAT_STEEL = 4250, MAT_GLASS = 700, MAT_SILVER = 250, MAT_URANIUM = 150, MAT_DURASTEEL = 1450, MAT_VERDANTIUM = 900) build_path = /obj/effect/spawner/parts/t4 sort_string = "AAAFD" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/bundle/t5 id = "parts_bundle_t5" @@ -235,6 +264,7 @@ materials = list(MAT_STEEL = 45000, MAT_PLASTEEL = 5500, MAT_GLASS = 11250, MAT_SILVER = 2500, MAT_URANIUM = 10000, MAT_DIAMOND = 5000, MAT_DURASTEEL = 2500, MAT_MORPHIUM = 2050) build_path = /obj/effect/spawner/parts/t5 sort_string = "AAAFE" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd // RPEDs @@ -246,6 +276,7 @@ materials = list(MAT_STEEL = 15000, MAT_GLASS = 5000) build_path = /obj/item/weapon/storage/part_replacer sort_string = "ABAAA" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/ARPED name = "Advanced Rapid Part Exchange Device" @@ -256,6 +287,7 @@ materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000) build_path = /obj/item/weapon/storage/part_replacer/adv sort_string = "ABAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd /datum/design/item/stock_part/PBRPED name = "Prototype Bluespace Rapid Part Exchange Device" @@ -265,4 +297,5 @@ req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 7, TECH_BLUESPACE = 5) materials = list(MAT_STEEL = 30000, MAT_GLASS = 10000, MAT_SILVER = 5000, MAT_GOLD = 5000, MAT_DIAMOND = 1000) build_path = /obj/item/weapon/storage/part_replacer/adv/discount_bluespace - sort_string = "ABAAB" \ No newline at end of file + sort_string = "ABAAB" + department = LATHE_ALL | LATHE_ENGINEERING // CHOMPAdd diff --git a/code/modules/research/designs/subspace_parts.dm b/code/modules/research/designs/subspace_parts.dm index 7df051ce47..04a43a4b4e 100644 --- a/code/modules/research/designs/subspace_parts.dm +++ b/code/modules/research/designs/subspace_parts.dm @@ -1,9 +1,14 @@ // Telecomm parts +/datum/design/item/stock_part/subspace // CHOMPAdd + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/stock_part/subspace/AssembleDesignName() ..() name = "Subspace component design ([item_name])" +/datum/design/item/stock_part/subspace // CHOMPAdd + department = LATHE_ALL | LATHE_ENGINEERING + /datum/design/item/stock_part/subspace/subspace_ansible id = "s-ansible" req_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2) @@ -51,4 +56,4 @@ req_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3) materials = list(MAT_GLASS = 100, MAT_SILVER = 10, MAT_URANIUM = 15) build_path = /obj/item/weapon/stock_parts/subspace/transmitter - sort_string = "RAAAG" \ No newline at end of file + sort_string = "RAAAG" diff --git a/code/modules/research/designs/weapons.dm b/code/modules/research/designs/weapons.dm index f6644babaa..9a0146f200 100644 --- a/code/modules/research/designs/weapons.dm +++ b/code/modules/research/designs/weapons.dm @@ -25,6 +25,7 @@ materials = list(MAT_STEEL = 4000) build_path = /obj/item/weapon/gun/energy/stunrevolver sort_string = "MAAAA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/energy/nuclear_gun id = "nuclear_gun" @@ -32,6 +33,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_URANIUM = 500) build_path = /obj/item/weapon/gun/energy/gun/nuclear sort_string = "MAAAB" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/energy/phoronpistol id = "ppistol" @@ -39,6 +41,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_PHORON = 3000) build_path = /obj/item/weapon/gun/energy/toxgun sort_string = "MAAAC" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/energy/lasercannon desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core." @@ -47,6 +50,7 @@ materials = list(MAT_STEEL = 10000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) build_path = /obj/item/weapon/gun/energy/lasercannon sort_string = "MAAAD" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/energy/decloner id = "decloner" @@ -54,6 +58,7 @@ materials = list(MAT_GOLD = 5000,MAT_URANIUM = 10000) build_path = /obj/item/weapon/gun/energy/decloner sort_string = "MAAAE" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/energy/temp_gun desc = "A gun that shoots high-powered glass-encased energy temperature bullets." @@ -62,6 +67,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 500, MAT_SILVER = 3000) build_path = /obj/item/weapon/gun/energy/temperature sort_string = "MAAAF" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/energy/flora_gun id = "flora_gun" @@ -69,6 +75,7 @@ materials = list(MAT_STEEL = 2000, MAT_GLASS = 500, MAT_URANIUM = 500) build_path = /obj/item/weapon/gun/energy/floragun sort_string = "MAAAG" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd /datum/design/item/weapon/energy/vinstunrevolver id = "vinstunrevolver" @@ -76,6 +83,7 @@ materials = list(MAT_STEEL = 4000) build_path = /obj/item/weapon/gun/energy/stunrevolver/vintage sort_string = "MAAAH" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // Ballistic weapons @@ -90,6 +98,7 @@ materials = list(MAT_STEEL = 8000, MAT_SILVER = 2000, MAT_DIAMOND = 1000) build_path = /obj/item/weapon/gun/projectile/automatic/advanced_smg sort_string = "MABAA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // Ballistic ammo @@ -105,6 +114,7 @@ materials = list(MAT_STEEL = 3750, MAT_SILVER = 100) // Requires silver for proprietary magazines! Or something. build_path = /obj/item/ammo_magazine/m9mmAdvanced sort_string = "MABBA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/ballistic/ammo/stunshell name = "stun shells" @@ -114,6 +124,7 @@ materials = list(MAT_STEEL = 4000) build_path = /obj/item/ammo_magazine/ammo_box/b12g/stunshell sort_string = "MABBB" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/ballistic/ammo/empshell name = "emp shells" @@ -123,6 +134,7 @@ materials = list(MAT_STEEL = 4000, MAT_URANIUM = 1000) build_path = /obj/item/ammo_magazine/ammo_box/b12g/emp sort_string = "MABBC" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // Phase weapons @@ -168,6 +180,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) build_path = /obj/item/weapon/gun/launcher/syringe/rapid sort_string = "MADAA" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/dartgun desc = "A gun that fires small hollow chemical-payload darts." @@ -176,6 +189,7 @@ materials = list(MAT_STEEL = 5000, MAT_GOLD = 5000, MAT_SILVER = 2500, MAT_GLASS = 750) build_path = /obj/item/weapon/gun/projectile/dartgun/research sort_string = "MADAB" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/chemsprayer desc = "An advanced chem spraying device." @@ -184,6 +198,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000) build_path = /obj/item/weapon/reagent_containers/spray/chemsprayer sort_string = "MADAC" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/fuelrod id = "fuelrod_gun" @@ -191,6 +206,7 @@ materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_GOLD = 500, MAT_SILVER = 500, MAT_URANIUM = 1000, MAT_PHORON = 3000, MAT_DIAMOND = 1000) build_path = /obj/item/weapon/gun/magnetic/fuelrod sort_string = "MADAD" + department = LATHE_ALL | LATHE_SCIENCE // CHOMPAdd // Ammo for those @@ -200,6 +216,7 @@ materials = list(MAT_STEEL = 300, MAT_GOLD = 100, MAT_SILVER = 100, MAT_GLASS = 300) build_path = /obj/item/ammo_magazine/chemdart/small sort_string = "MADBA" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/ammo/dartgun_ammo_small id = "dartgun_ammo_s" @@ -207,6 +224,7 @@ materials = list(MAT_STEEL = 50, MAT_GOLD = 30, MAT_SILVER = 30, MAT_GLASS = 50) build_path = /obj/item/ammo_casing/chemdart/small sort_string = "MADBB" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/ammo/dartgunmag_med id = "dartgun_mag_m" @@ -214,6 +232,7 @@ materials = list(MAT_STEEL = 500, MAT_GOLD = 150, MAT_SILVER = 150, MAT_DIAMOND = 200, MAT_GLASS = 400) build_path = /obj/item/ammo_magazine/chemdart sort_string = "MADBC" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/ammo/dartgun_ammo_med id = "dartgun_ammo_m" @@ -221,6 +240,7 @@ materials = list(MAT_STEEL = 80, MAT_GOLD = 40, MAT_SILVER = 40, MAT_GLASS = 60) build_path = /obj/item/ammo_casing/chemdart sort_string = "MADBD" + department = LATHE_ALL | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/ammo/flechette id = "magnetic_ammo" @@ -228,6 +248,7 @@ materials = list(MAT_STEEL = 500, MAT_GOLD = 300, MAT_GLASS = 150, MAT_PHORON = 100) build_path = /obj/item/weapon/magnetic_ammo sort_string = "MADBE" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // Melee weapons @@ -242,6 +263,7 @@ materials = list(MAT_PLASTEEL = 3500, MAT_GLASS = 1000, MAT_LEAD = 2250, MAT_METALHYDROGEN = 500) build_path = /obj/item/weapon/melee/energy/sword/charge sort_string = "MBAAA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/melee/eaxe name = "Energy Axe" @@ -250,6 +272,7 @@ materials = list(MAT_PLASTEEL = 3500, MAT_OSMIUM = 2000, MAT_LEAD = 2000, MAT_METALHYDROGEN = 500) build_path = /obj/item/weapon/melee/energy/axe/charge sort_string = "MBAAB" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // Grenade stuff /datum/design/item/weapon/grenade/AssembleDesignName() @@ -262,3 +285,4 @@ materials = list(MAT_STEEL = 3000) build_path = /obj/item/weapon/grenade/chem_grenade/large sort_string = "MCAAA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd diff --git a/code/modules/research/designs/weapons_vr.dm b/code/modules/research/designs/weapons_vr.dm index 5aa52eb156..fd66ca9804 100644 --- a/code/modules/research/designs/weapons_vr.dm +++ b/code/modules/research/designs/weapons_vr.dm @@ -16,6 +16,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 1000) build_path = /obj/item/weapon/gun/energy/gun/protector sort_string = "MAAVA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/energy/sickshot desc = "A 'Sickshot' is a 4-shot energy revolver that causes nausea and confusion." @@ -24,6 +25,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 2000) build_path = /obj/item/weapon/gun/energy/sickshot sort_string = "MAAVB" + department = LATHE_ALL | LATHE_SECURITY | LATHE_MEDICAL // CHOMPAdd /datum/design/item/weapon/energy/netgun desc = "The \"Varmint Catcher\" is an energy net projector designed to immobilize dangerous wildlife." @@ -32,6 +34,7 @@ materials = list(MAT_STEEL = 6000, MAT_GLASS = 3000) build_path = /obj/item/weapon/gun/energy/netgun sort_string = "MAAVC" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // Misc weapons @@ -42,6 +45,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000, MAT_URANIUM = 1000) build_path = /obj/item/weapon/gun/energy/pummeler sort_string = "MADVA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // Anti-particle stuff @@ -56,6 +60,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 1000, MAT_GOLD = 1000, MAT_URANIUM = 750) build_path = /obj/item/weapon/gun/energy/particle/advanced sort_string = "MAAUA" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/particle/particlecannon name = "Anti-particle cannon" @@ -64,6 +69,7 @@ materials = list(MAT_STEEL = 10000, MAT_GLASS = 1500, MAT_GOLD = 2000, MAT_URANIUM = 1000, MAT_DIAMOND = 2000) build_path = /obj/item/weapon/gun/energy/particle/cannon sort_string = "MAAUB" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /datum/design/item/weapon/particle/pressureinterlock name = "APP pressure interlock" @@ -72,6 +78,7 @@ materials = list(MAT_STEEL = 1000, MAT_GLASS = 250) build_path = /obj/item/pressurelock sort_string = "MAAUC" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd // NSFW gun and cells /* @@ -167,6 +174,7 @@ None of these for now, too. -DHA */ materials = list(MAT_STEEL = 4000, MAT_PLASTEEL = 500) //CHOMPedit Nerfs costs a bit for something a bit more sensical build_path = /obj/item/ammo_casing/a145 sort_string = "MABBD" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd /* /datum/design/item/nsfw_cell/final diff --git a/code/modules/research/designs/weapons_yw.dm b/code/modules/research/designs/weapons_yw.dm index b5480ac618..ee572b5048 100644 --- a/code/modules/research/designs/weapons_yw.dm +++ b/code/modules/research/designs/weapons_yw.dm @@ -5,3 +5,4 @@ materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000, "silver" = 1000) build_path = /obj/item/weapon/gun/energy/hunter sort_string = "MAAVC" + department = LATHE_ALL | LATHE_SECURITY // CHOMPAdd diff --git a/code/modules/research/designs/xenoarch_toys.dm b/code/modules/research/designs/xenoarch_toys.dm index 5d90867a95..d6753b36e0 100644 --- a/code/modules/research/designs/xenoarch_toys.dm +++ b/code/modules/research/designs/xenoarch_toys.dm @@ -4,6 +4,9 @@ // Xenoarch tools +/datum/design/item/weapon/xenoarch // CHOMPAdd + department = LATHE_ALL | LATHE_SCIENCE + /datum/design/item/weapon/xenoarch/ano_scanner name = "Alden-Saraspova counter" id = "ano_scanner" @@ -28,4 +31,4 @@ build_type = PROTOLATHE materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000) build_path = /obj/item/weapon/pickaxe/excavationdrill - sort_string = "GAAAC" \ No newline at end of file + sort_string = "GAAAC" diff --git a/code/modules/research/designs/xenobio_toys.dm b/code/modules/research/designs/xenobio_toys.dm index 2c7f3f402a..f3f4ff3f43 100644 --- a/code/modules/research/designs/xenobio_toys.dm +++ b/code/modules/research/designs/xenobio_toys.dm @@ -3,6 +3,8 @@ name = "Xenobiology equipment design ([item_name])" // Xenobio Weapons +/datum/design/item/weapon/xenobio // CHOMPAdd + department = LATHE_ALL | LATHE_SCIENCE /datum/design/item/weapon/xenobio/slimebaton id = "slimebaton" @@ -27,4 +29,4 @@ req_tech = list(TECH_MAGNET = 2, TECH_BIO = 2) materials = list(MAT_STEEL = 500, MAT_GLASS = 500) build_path = /obj/item/device/slime_scanner - sort_string = "HBAAA" \ No newline at end of file + sort_string = "HBAAA" diff --git a/code/modules/research/designs/xenobio_toys_vr.dm b/code/modules/research/designs/xenobio_toys_vr.dm index 39491c1b0c..cd121f1f88 100644 --- a/code/modules/research/designs/xenobio_toys_vr.dm +++ b/code/modules/research/designs/xenobio_toys_vr.dm @@ -14,4 +14,4 @@ req_tech = list(TECH_MAGNET = 4, TECH_BIO = 7) materials = list(MAT_STEEL = 500, MAT_GLASS = 500, MAT_DIAMOND = 500, MAT_MORPHIUM = 100) build_path = /obj/item/weapon/slime_grinder - sort_string = "HBBB" \ No newline at end of file + sort_string = "HBBB" diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 50848632d1..8df4b2287e 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -38,6 +38,9 @@ hidden_materials = list(MAT_PLASTEEL, MAT_DURASTEEL, MAT_GRAPHITE, MAT_VERDANTIUM, MAT_MORPHIUM, MAT_METALHYDROGEN, MAT_SUPERMATTER) + var/req_category = LATHE_ALL // CHOMPAdd - Departmental Lathes + var/dep_overlay = null // CHOMPAdd - Departmental Lathes + /obj/machinery/r_n_d/protolathe/Initialize() . = ..() @@ -52,6 +55,9 @@ default_apply_parts() + if(dep_overlay) // CHOMPAdd + overlays.Add(image('modular_chomp/icons/obj/machines/research.dmi', dep_overlay)) + /obj/machinery/r_n_d/protolathe/process() ..() if(stat) @@ -115,6 +121,9 @@ icon_state = initial(icon_state) + if(dep_overlay) // CHOMPAdd + overlays.Add(image('modular_chomp/icons/obj/machines/research.dmi', dep_overlay)) + if(panel_open) overlays.Add(image(icon, "[icon_state]_panel")) diff --git a/code/modules/research/rdconsole_tgui.dm b/code/modules/research/rdconsole_tgui.dm index 52ada00250..efa29d15da 100644 --- a/code/modules/research/rdconsole_tgui.dm +++ b/code/modules/research/rdconsole_tgui.dm @@ -230,6 +230,8 @@ //CHOMPAdd Start, Locked Designs if(is_type_in_list(D, LockedLatheDesigns)) continue + if(!D.department || !(D.department & P.req_category)) + continue //CHOMPAdd End, Locked Designs var/list/mat_list = list() diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index c8069b2e5d..c0333b09ff 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -5317,17 +5317,11 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = 5 - }, -/obj/item/weapon/storage/toolbox/mechanical{ - pixel_y = 5 - }, -/obj/item/weapon/storage/toolbox/electrical, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, +/obj/structure/closet/toolcloset, +/obj/item/device/flashlight, /turf/simulated/floor/tiled/dark, /area/engineering/workshop) "aoU" = ( @@ -12216,12 +12210,11 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "aLv" = ( -/obj/structure/closet/toolcloset, -/obj/item/device/flashlight, /obj/structure/window/reinforced{ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/r_n_d/circuit_imprinter, /turf/simulated/floor/tiled, /area/engineering/workshop) "aLw" = ( @@ -14923,6 +14916,16 @@ pixel_y = 4 }, /obj/item/device/radio/off, +/obj/item/weapon/storage/toolbox/electrical, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_y = 5 + }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_y = 5 + }, +/obj/structure/reagent_dispensers/acid{ + pixel_y = -30 + }, /turf/simulated/floor/tiled/dark, /area/engineering/workshop) "aTV" = ( @@ -20383,7 +20386,17 @@ dir = 8 }, /obj/effect/floor_decal/industrial/warning, -/obj/machinery/iv_drip, +/obj/structure/table/glass, +/obj/item/device/defib_kit/loaded, +/obj/item/device/defib_kit/loaded, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "bkK" = ( @@ -23691,6 +23704,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 5 }, +/obj/machinery/r_n_d/protolathe/security, /turf/simulated/floor/tiled, /area/security/security_hallway) "bva" = ( @@ -25845,6 +25859,13 @@ /obj/effect/floor_decal/corner/red/bordercorner{ dir = 4 }, +/obj/machinery/computer/rdconsole/public{ + dir = 8; + req_access = list(63); + name = "Security Protolathe console"; + is_public = 0; + req_one_access = list(1) + }, /turf/simulated/floor/tiled, /area/security/security_hallway) "bAm" = ( @@ -27464,8 +27485,7 @@ /obj/machinery/door/airlock/glass_security{ id_tag = "BrigFoyer"; layer = 2.8; - name = "Security Wing"; - req_access = list(63) + name = "Security Wing" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -28449,7 +28469,6 @@ /turf/simulated/floor/tiled/white, /area/medical/sleeper) "bIQ" = ( -/obj/structure/table/glass, /obj/effect/floor_decal/borderfloorwhite{ dir = 6 }, @@ -28462,6 +28481,12 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, +/obj/machinery/computer/rdconsole/public{ + dir = 1; + req_access = list(5); + name = "Medical Protolathe console"; + is_public = 0 + }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "bIS" = ( @@ -32864,7 +32889,12 @@ dir = 4; layer = 3 }, -/obj/structure/reagent_dispensers/watertank/high, +/obj/machinery/computer/rdconsole/public{ + dir = 8; + req_access = null; + name = "Service Protolathe console"; + is_public = 0 + }, /turf/simulated/floor/tiled/hydro, /area/hydroponics) "bYq" = ( @@ -38983,6 +39013,9 @@ /obj/effect/floor_decal/corner/purple/bordercorner{ dir = 4 }, +/obj/structure/mopbucket, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/mop, /turf/simulated/floor/tiled, /area/janitor) "csD" = ( @@ -41610,6 +41643,9 @@ /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/purple/bordercorner, /obj/structure/janitorialcart, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/structure/mopbucket, +/obj/item/weapon/mop, /turf/simulated/floor/tiled, /area/janitor) "cAq" = ( @@ -41617,17 +41653,12 @@ /turf/simulated/floor/plating, /area/maintenance/bar) "cAu" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, +/obj/machinery/r_n_d/protolathe/service, /turf/simulated/floor/tiled, /area/janitor) "cAv" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, /obj/item/device/radio/intercom{ dir = 4; name = "Station Intercom (General)"; @@ -41639,6 +41670,12 @@ /obj/effect/floor_decal/corner/purple/border{ dir = 6 }, +/obj/machinery/computer/rdconsole/public{ + req_access = null; + name = "Service Protolathe console"; + is_public = 0; + dir = 1 + }, /turf/simulated/floor/tiled, /area/janitor) "cAw" = ( @@ -45490,16 +45527,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/research_lockerroom) "dGB" = ( -/obj/structure/table/standard, -/obj/machinery/recharger, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/primary) "dGC" = ( @@ -46917,6 +46953,9 @@ /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/storage/rollingpapers/blunt, +/obj/item/weapon/storage/rollingpapers, +/obj/item/weapon/storage/rollingpapers, /turf/simulated/floor/tiled/hydro, /area/hydroponics) "ewV" = ( @@ -51161,6 +51200,16 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"gFZ" = ( +/obj/machinery/computer/rdconsole/public{ + dir = 1; + req_access = list(50); + name = "Cargo Protolathe console"; + req_one_access = list(48); + is_public = 0 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "gGj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -51529,6 +51578,19 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"gQB" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/computer/rdconsole/public{ + dir = 4; + req_one_access = list(10); + name = "Medical Protolathe console"; + is_public = 0 + }, +/turf/simulated/floor/tiled, +/area/engineering/workshop) "gQR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -57726,7 +57788,7 @@ name = "\improper Persistent Industrial Sheet Storage"; req_one_access = list(31,48) }, -/turf/simulated/wall, +/turf/simulated/floor/tiled, /area/quartermaster/warehouse) "kay" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -59205,7 +59267,9 @@ /turf/simulated/floor/plating, /area/maintenance/research) "kQH" = ( -/obj/machinery/r_n_d/protolathe, +/obj/machinery/r_n_d/protolathe{ + name = "Core R&D Protolathe" + }, /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/reagent_dispensers/acid{ pixel_x = -30 @@ -59401,14 +59465,15 @@ /turf/simulated/floor/tiled/white, /area/medical/chemistry) "kXk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/structure/table/standard, /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, /obj/random/tech_supply, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/machinery/recharger, /turf/simulated/floor/tiled, /area/storage/primary) "kXm" = ( @@ -59956,16 +60021,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/table/steel, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/item/device/floor_painter, -/obj/item/device/multitool{ - pixel_x = 5 - }, -/obj/item/device/t_scanner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/random/tech_supply, -/obj/random/tech_supply, +/obj/machinery/r_n_d/protolathe/engineering, /turf/simulated/floor/tiled, /area/engineering/workshop) "lsH" = ( @@ -61837,6 +61894,12 @@ /obj/item/weapon/tool/crowbar/red, /obj/item/weapon/storage/box/lights/mixed, /obj/item/device/lightreplacer, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/item/device/multitool{ + pixel_x = 5 + }, +/obj/item/weapon/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/dark, /area/engineering/workshop) "muM" = ( @@ -63109,6 +63172,8 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/item/device/t_scanner, +/obj/item/device/floor_painter, /turf/simulated/floor/tiled/dark, /area/engineering/workshop) "nkN" = ( @@ -66534,6 +66599,12 @@ /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"pgp" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/tiled/hydro, +/area/hydroponics) "pgN" = ( /obj/structure/closet, /obj/random/contraband, @@ -71753,10 +71824,7 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/structure/table/standard, -/obj/item/weapon/storage/rollingpapers, -/obj/item/weapon/storage/rollingpapers, -/obj/item/weapon/storage/rollingpapers/blunt, +/obj/machinery/r_n_d/protolathe/service, /turf/simulated/floor/tiled/hydro, /area/hydroponics) "soy" = ( @@ -78918,15 +78986,6 @@ /turf/simulated/floor/tiled, /area/library) "xaD" = ( -/obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/cleaner{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/weapon/reagent_containers/spray/cleaner{ - pixel_x = -2; - pixel_y = -2 - }, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -21 @@ -78935,10 +78994,9 @@ c_tag = "MED - Acute"; dir = 1 }, -/obj/item/device/defib_kit/loaded, -/obj/item/device/defib_kit/loaded, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/r_n_d/protolathe/medical, /turf/simulated/floor/tiled/white, /area/medical/sleeper) "xaT" = ( @@ -79699,6 +79757,10 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) +"xxY" = ( +/obj/machinery/r_n_d/protolathe/cargo, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "xyV" = ( /obj/item/weapon/storage/briefcase/inflatable, /turf/simulated/floor/plating, @@ -100832,7 +100894,7 @@ aLy jwT alu lsm -aLv +gQB aLv aoS aPY @@ -103180,7 +103242,7 @@ bEJ bCU bCU bCU -bCU +xxY bQz bHV bQu @@ -103438,7 +103500,7 @@ aUN bzn bAM bdQ -bCU +gFZ bQz bQz bJJ @@ -110170,7 +110232,7 @@ chp chp chp cjL -ijW +pgp hoK ckv mOG diff --git a/modular_chomp/code/modules/research/designs/devices.dm b/modular_chomp/code/modules/research/designs/devices.dm index a67297375b..5f8a17679c 100644 --- a/modular_chomp/code/modules/research/designs/devices.dm +++ b/modular_chomp/code/modules/research/designs/devices.dm @@ -4,3 +4,27 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 500) build_path = /obj/item/device/floor_painter sort_string = "TADAA" + department = LATHE_ALL | LATHE_SERVICE + +/datum/design/item/device/medical_holosign + id = "medical_holosign" + req_tech = list(TECH_BIO = 2) + materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) + build_path = /obj/item/weapon/holosign_creator/medical + sort_string = "TADAB" + department = LATHE_ALL | LATHE_MEDICAL + +/datum/design/item/device/atmos_holosign + id = "atmos_holosign" + req_tech = list(TECH_ENGINEERING = 2) + materials = list(MAT_STEEL = 1000, MAT_GLASS = 500) + build_path = /obj/item/weapon/holosign_creator/combifan + sort_string = "TADAC" + department = LATHE_ALL | LATHE_ENGINEERING + +/datum/design/item/device/mail_scanner + id = "mail_scanner" + materials = list(MAT_STEEL = 500, MAT_GLASS = 500) + build_path = /obj/item/mail_scanner + sort_string = "TADAD" + department = LATHE_ALL | LATHE_CARGO diff --git a/modular_chomp/code/modules/research/designs/implants.dm b/modular_chomp/code/modules/research/designs/implants.dm index 4ff99ad59d..887520c5e9 100644 --- a/modular_chomp/code/modules/research/designs/implants.dm +++ b/modular_chomp/code/modules/research/designs/implants.dm @@ -10,6 +10,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) build_path = /obj/item/organ/internal/augment/armmounted/hand sort_string = "JVACE" + department = LATHE_ALL | LATHE_SCIENCE /datum/design/item/organ/internal/augment/armmounted/shoulder/multiple @@ -19,6 +20,7 @@ materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000) build_path = /obj/item/organ/internal/augment/armmounted/shoulder/multiple sort_string = "JVACI" + department = LATHE_ALL | LATHE_SCIENCE /datum/design/item/organ/internal/augment/armmounted/shoulder/multiple/medical desc = "A large implant that fits into a subject's arm. It deploys an array of tools by some painful means." @@ -27,3 +29,4 @@ materials = list(MAT_STEEL = 6000, MAT_GLASS = 6000, MAT_SILVER = 1000) build_path = /obj/item/organ/internal/augment/armmounted/shoulder/multiple/medical sort_string = "JVACJ" + department = LATHE_ALL | LATHE_MEDICAL diff --git a/modular_chomp/code/modules/research/designs/misc.dm b/modular_chomp/code/modules/research/designs/misc.dm index 29b34cbd6e..d999e957c6 100644 --- a/modular_chomp/code/modules/research/designs/misc.dm +++ b/modular_chomp/code/modules/research/designs/misc.dm @@ -6,6 +6,7 @@ materials = list(MAT_STEEL = 5000) build_path = /obj/item/trash/rkibble sort_string = "KIBBB" + department = LATHE_ALL | LATHE_SCIENCE /datum/design/item/general/mindbinder name = "Mind Binder" @@ -14,3 +15,4 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 4000, MAT_URANIUM = 2000) build_path = /obj/item/device/mindbinder sort_string = "TBVAB" + department = LATHE_ALL | LATHE_MEDICAL diff --git a/modular_chomp/code/modules/research/designs/power_cells.dm b/modular_chomp/code/modules/research/designs/power_cells.dm index 7735aa5562..714a68174f 100644 --- a/modular_chomp/code/modules/research/designs/power_cells.dm +++ b/modular_chomp/code/modules/research/designs/power_cells.dm @@ -26,6 +26,7 @@ build_path = /obj/item/weapon/cell category = list("Misc") sort_string = "BAAAA" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/high name = "high-capacity" @@ -35,6 +36,7 @@ build_path = /obj/item/weapon/cell/high category = list("Misc") sort_string = "BAAAB" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/super name = "super-capacity" @@ -44,6 +46,7 @@ build_path = /obj/item/weapon/cell/super category = list("Misc") sort_string = "BAAAC" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/hyper name = "hyper-capacity" @@ -53,6 +56,7 @@ build_path = /obj/item/weapon/cell/hyper category = list("Misc") sort_string = "BAAAD" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/giga name = "giga-capacity" @@ -62,6 +66,7 @@ build_path = /obj/item/weapon/cell/giga category = list("Misc") sort_string = "BAAAE" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/potato name = "potato cell" @@ -70,6 +75,7 @@ build_path = /obj/item/weapon/cell/potato category = list("Misc") sort_string = "BAAAF" + department = LATHE_ALL | LATHE_ENGINEERING /* //Device Cells @@ -82,6 +88,7 @@ build_path = /obj/item/weapon/cell/device category = list("Misc") sort_string = "BAABA" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/device_empproof name = "device, empproof" @@ -91,6 +98,7 @@ build_path = /obj/item/weapon/cell/device/empproof category = list("Misc") sort_string = "BAABB" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/advance_device name = "device, advanced" @@ -100,6 +108,7 @@ build_path = /obj/item/weapon/cell/device/weapon category = list("Misc") sort_string = "BAABC" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/advance_device_empproof name = "device, advanced empproof" @@ -109,7 +118,8 @@ build_path = /obj/item/weapon/cell/device/weapon/empproof category = list("Misc") sort_string = "BAABD" - + department = LATHE_ALL | LATHE_ENGINEERING + /datum/design/item/powercell/advance_device_recharge name = "device, advanced recharging" id = "recharging_advanced_device" @@ -118,6 +128,7 @@ build_path = /obj/item/weapon/cell/device/weapon/recharge category = list("Misc") sort_string = "BAABE" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/super_device name = "device, super" @@ -127,6 +138,7 @@ build_path = /obj/item/weapon/cell/device/super category = list("Misc") sort_string = "BAABF" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/hype_device name = "device, hyper" @@ -136,6 +148,7 @@ build_path = /obj/item/weapon/cell/device/hyper category = list("Misc") sort_string = "BAABG" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/giga_device name = "device, giga" @@ -145,6 +158,7 @@ build_path = /obj/item/weapon/cell/device/giga category = list("Misc") sort_string = "BAAAH" + department = LATHE_ALL | LATHE_ENGINEERING /datum/design/item/powercell/omni_device name = "device, omni" @@ -155,6 +169,7 @@ build_path = /obj/item/weapon/cell/device/weapon/recharge/alien/omni category = list("Misc") sort_string = "BAABI" + department = LATHE_ALL | LATHE_ENGINEERING /* //Mecha Cells diff --git a/modular_chomp/code/modules/research/designs/weapons.dm b/modular_chomp/code/modules/research/designs/weapons.dm index 0fe606cd1b..60fac7fd94 100644 --- a/modular_chomp/code/modules/research/designs/weapons.dm +++ b/modular_chomp/code/modules/research/designs/weapons.dm @@ -6,6 +6,7 @@ materials = list(MAT_STEEL = 3000, MAT_GLASS = 3000) build_path = /obj/item/weapon/gun/launcher/confetti_cannon sort_string = "MAAVD" + department = LATHE_ALL | LATHE_SERVICE /datum/design/item/weapon/energy/metamorphosisray name = "metamorphosis ray" @@ -22,6 +23,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 500) build_path = /obj/item/weapon/gun/energy/locked/phasegun/pistol sort_string = "MACAA" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/phase_carbine id = "phasecarbine" @@ -29,6 +31,7 @@ materials = list(MAT_STEEL = 6000, MAT_GLASS = 500) build_path = /obj/item/weapon/gun/energy/locked/phasegun sort_string = "MACAB" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/phase_rifle id = "phaserifle" @@ -36,6 +39,7 @@ materials = list(MAT_STEEL = 7000, MAT_GLASS = 500, MAT_SILVER = 500) build_path = /obj/item/weapon/gun/energy/locked/phasegun/rifle sort_string = "MACAC" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/phase_cannon id = "phasecannon" @@ -43,6 +47,7 @@ materials = list(MAT_STEEL = 10000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_DIAMOND = 750) build_path = /obj/item/weapon/gun/energy/locked/phasegun/cannon sort_string = "MACAD" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/frontier_holdout id = "holdout frontier phaser" @@ -50,6 +55,7 @@ materials = list(MAT_STEEL = 6000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 100, MAT_PHORON = 1000) build_path = /obj/item/weapon/gun/energy/locked/frontier/holdout sort_string = "MACAE" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/frontier_phaser id = "frontier phaser" @@ -57,6 +63,7 @@ materials = list(MAT_STEEL = 7000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 2000) build_path = /obj/item/weapon/gun/energy/locked/frontier sort_string = "MACAF" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/frontier_carbine id = "carbine frontier phaser" @@ -64,6 +71,7 @@ materials = list(MAT_STEEL = 6500, MAT_GLASS = 900, MAT_DURASTEEL = 150, MAT_VERDANTIUM = 200, MAT_PHORON = 4000) build_path = /obj/item/weapon/gun/energy/locked/frontier/carbine sort_string = "MACAG" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/frontier_rifle id = "marksman rifle frontier phaser" @@ -71,6 +79,7 @@ materials = list(MAT_STEEL = 8000, MAT_GLASS = 900, MAT_DURASTEEL = 200, MAT_VERDANTIUM = 250, MAT_PHORON = 2000) build_path = /obj/item/weapon/gun/energy/locked/frontier/rifle sort_string = "MACAH" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/phase/frontier_handbow id = "handbow frontier phaser" @@ -78,6 +87,7 @@ materials = list(MAT_STEEL = 5000, MAT_GLASS = 900, MAT_DURASTEEL = 100, MAT_VERDANTIUM = 150, MAT_PHORON = 1000) build_path = /obj/item/weapon/gun/energy/locked/frontier/handbow sort_string = "MACAI" + department = LATHE_ALL | LATHE_SECURITY //Leathals And any new CHOMP weapons. /datum/design/item/weapon/gun/projectile/caseless/prototype @@ -86,6 +96,7 @@ materials = list(MAT_STEEL = 7000, MAT_TITANIUM = 4000) build_path = /obj/item/weapon/gun/projectile/caseless/prototype sort_string = "MACBA" + department = LATHE_ALL | LATHE_SECURITY /datum/design/item/weapon/energy/lasercannon desc = "The lasing medium of this prototype is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core." @@ -94,6 +105,7 @@ materials = list(MAT_STEEL = 4000, MAT_GLASS = 1000, MAT_DIAMOND = 2000, MAT_TITANIUM = 4000, MAT_LEAD = 4000, MAT_URANIUM = 5000) build_path = /obj/item/weapon/gun/energy/lasercannon sort_string = "MAAAD" + department = LATHE_ALL | LATHE_SECURITY //Wierd weapon time /datum/design/item/weapon/energy/cyrogun @@ -103,3 +115,4 @@ materials = list(MAT_GLASS = 3000, MAT_MORPHIUM = 4000, MAT_DURASTEEL = 6000, MAT_LEAD = 6000, MAT_METALHYDROGEN = 3000) build_path = /obj/item/weapon/gun/energy/freezegun sort_string = "MAAAD" + department = LATHE_ALL | LATHE_SECURITY diff --git a/modular_chomp/code/modules/research/lathes/protolathe.dm b/modular_chomp/code/modules/research/lathes/protolathe.dm new file mode 100644 index 0000000000..02830aa8d8 --- /dev/null +++ b/modular_chomp/code/modules/research/lathes/protolathe.dm @@ -0,0 +1,33 @@ +/obj/machinery/r_n_d/protolathe/science + name = "Science Protolathe" + req_category = LATHE_SCIENCE + dep_overlay = "sci" + +/obj/machinery/r_n_d/protolathe/engineering + name = "Engineering Protolathe" + req_category = LATHE_ENGINEERING + dep_overlay = "engi" + +/obj/machinery/r_n_d/protolathe/medical + name = "Medical Protolathe" + req_category = LATHE_MEDICAL + dep_overlay = "med" + +/obj/machinery/r_n_d/protolathe/cargo + name = "Cargo Protolathe" + req_category = LATHE_CARGO + dep_overlay = "cargo" + +/obj/machinery/r_n_d/protolathe/service + name = "Service Protolathe" + req_category = LATHE_SERVICE + dep_overlay = "serv" + +/obj/machinery/r_n_d/protolathe/security + name = "Security Protolathe" + req_category = LATHE_SECURITY + dep_overlay = "sec" + +/obj/machinery/r_n_d/protolathe/public + name = "Public Protolathe" + req_category = LATHE_PUBLIC diff --git a/modular_chomp/icons/obj/machines/research.dmi b/modular_chomp/icons/obj/machines/research.dmi new file mode 100644 index 0000000000..330f9bcd60 Binary files /dev/null and b/modular_chomp/icons/obj/machines/research.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 3d6d7c6d75..0e04f17664 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -5051,6 +5051,7 @@ #include "modular_chomp\code\modules\research\designs\misc.dm" #include "modular_chomp\code\modules\research\designs\power_cells.dm" #include "modular_chomp\code\modules\research\designs\weapons.dm" +#include "modular_chomp\code\modules\research\lathes\protolathe.dm" #include "modular_chomp\code\modules\shieldgen\shield_capacitor.dm" #include "modular_chomp\code\modules\shieldgen\shield_gen.dm" #include "modular_chomp\code\modules\spells\spells.dm"