From e01533438d4b3dc56387332ce9cbfe9ee32d5bc0 Mon Sep 17 00:00:00 2001 From: Lucy Date: Tue, 25 Jun 2024 17:13:34 -0400 Subject: [PATCH] Allows Science to print RCDs and experimental medical tools, allows Robotics to print alien tools --- .../research/designs/medical_designs.dm | 14 +++++----- code/modules/research/designs/tool_designs.dm | 28 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index de0ff047415f..72589b553c82 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -253,7 +253,7 @@ /datum/design/surgical_drapes name = "Surgical Drapes" id = "surgical_drapes" - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/plastic =SHEET_MATERIAL_AMOUNT) build_path = /obj/item/surgical_drapes category = list( @@ -266,36 +266,36 @@ desc = "A laser scalpel used for precise cutting." id = "laserscalpel" build_path = /obj/item/scalpel/advanced - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron = 6000, /datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/silver =SHEET_MATERIAL_AMOUNT, /datum/material/gold =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/diamond =SMALL_MATERIAL_AMOUNT * 2, /datum/material/titanium = 4000) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/mechanicalpinches name = "Mechanical Pinches" desc = "These pinches can be either used as retractor or hemostat." id = "mechanicalpinches" build_path = /obj/item/retractor/advanced - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron = 12000, /datum/material/glass = 4000, /datum/material/silver = 4000, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/searingtool name = "Searing Tool" desc = "Used to mend tissue together. Or drill tissue away." id = "searingtool" build_path = /obj/item/cautery/advanced - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron = 4000, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plasma =SHEET_MATERIAL_AMOUNT, /datum/material/uranium =SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_MEDICAL + departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/medical_spray_bottle name = "Medical Spray Bottle" diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index a9267f9484d0..d99e8051b6d3 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -72,7 +72,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rcd_loaded name = "Rapid Construction Device" @@ -84,7 +84,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rtd_loaded name = "Rapid Tiling Device" @@ -107,7 +107,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rcd_upgrade/frames name = "RCD frames designs upgrade" @@ -119,7 +119,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rcd_upgrade/simple_circuits name = "RCD simple circuits designs upgrade" @@ -131,7 +131,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rcd_upgrade/furnishing name = "RCD furnishing upgrade" @@ -143,7 +143,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rcd_upgrade/silo_link name = "Advanced RCD silo link upgrade" @@ -155,7 +155,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rpd_upgrade/unwrench name = "RPD unwrenching upgrade" @@ -167,7 +167,7 @@ category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING_ADVANCED ) - departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE // monkestation edit: allow science to print /datum/design/rld_mini name = "Mini Rapid Light Device (MRLD)" @@ -311,7 +311,7 @@ desc = "An advanced scalpel obtained through Abductor technology." id = "alien_scalpel" build_path = /obj/item/scalpel/alien - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN @@ -323,7 +323,7 @@ desc = "An advanced hemostat obtained through Abductor technology." id = "alien_hemostat" build_path = /obj/item/hemostat/alien - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN @@ -335,7 +335,7 @@ desc = "An advanced retractor obtained through Abductor technology." id = "alien_retractor" build_path = /obj/item/retractor/alien - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN @@ -347,7 +347,7 @@ desc = "An advanced surgical saw obtained through Abductor technology." id = "alien_saw" build_path = /obj/item/circular_saw/alien - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN @@ -359,7 +359,7 @@ desc = "An advanced drill obtained through Abductor technology." id = "alien_drill" build_path = /obj/item/surgicaldrill/alien - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT*5, /datum/material/silver =SHEET_MATERIAL_AMOUNT*1.25, /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN @@ -371,7 +371,7 @@ desc = "An advanced cautery obtained through Abductor technology." id = "alien_cautery" build_path = /obj/item/cautery/alien - build_type = PROTOLATHE | AWAY_LATHE + build_type = PROTOLATHE | AWAY_LATHE | MECHFAB // monkestation edit: allow robotics to print materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5) category = list( RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN