shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Adds two new intermediate beaker types to chemistry (#6018)

Browse Source 
* Adds two new intermediate beaker types to chemistry

* YAY I DON'T HAVE TO KEEP UP WITH SNOWFLAKE ANYMORE

* Update all_nodes.dm
This commit is contained in:
CitadelStationBot
2018-03-19 22:17:05 -05:00
committed by Poojawa
parent 7c8c8f3a0a
commit 7b3b1f65ec
7 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -165,6 +165,29 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
/obj/item/reagent_containers/glass/beaker/plastic
name = "x-large beaker"
desc = "An extra-large beaker. Can hold up to 120 units."
icon_state = "beakerwhite"
materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000)
volume = 120
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,15,20,25,30,60,120)
/obj/item/reagent_containers/glass/beaker/plastic/update_icon()
icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states
..()
icon_state = "beakerwhite"
/obj/item/reagent_containers/glass/beaker/meta
name = "metamaterial beaker"
desc = "A large beaker. Can hold up to 180 units."
icon_state = "beakergold"
materials = list(MAT_GLASS=2500, MAT_PLASTIC=3000, MAT_GOLD=1000, MAT_TITANIUM=1000)
volume = 180
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,15,20,25,30,60,120,180)
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
desc = "A cryostasis beaker that allows for chemical storage without \

20
code/modules/research/designs/medical_designs.dm
View File

@@ -44,6 +44,24 @@
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
/datum/design/xlarge_beaker
name = "X-large Beaker"
id = "xlarge_beaker"
build_type = PROTOLATHE
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
materials = list(MAT_GLASS = 2500, MAT_PLASTIC = 3000)
build_path = /obj/item/reagent_containers/glass/beaker/plastic
category = list("Medical Designs")
/datum/design/meta_beaker
name = "Metamaterial Beaker"
id = "meta_beaker"
build_type = PROTOLATHE
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
materials = list(MAT_GLASS = 2500, MAT_PLASTIC = 3000, MAT_GOLD = 1000, MAT_TITANIUM = 1000)
build_path = /obj/item/reagent_containers/glass/beaker/meta
category = list("Medical Designs")
/datum/design/bluespacesyringe
name = "Bluespace Syringe"
desc = "An advanced syringe that can hold 60 units of chemicals"
@@ -556,4 +574,4 @@
materials = list(MAT_METAL = 300, MAT_GLASS = 100)
build_path = /obj/item/disk/surgery/necrotic_revival
category = list("Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE

2
code/modules/research/machinery/_production.dm
View File

@@ -23,7 +23,7 @@
. = ..()
create_reagents(0)
materials = AddComponent(/datum/component/material_container,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE), 0,
list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), 0,
FALSE, list(/obj/item/stack), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
materials.precise_insertion = TRUE
RefreshParts()

4
code/modules/research/techweb/all_nodes.dm
View File

@@ -9,7 +9,7 @@
description = "NT default research technologies."
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani",
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
"space_heater") //Default research tech, prevents bricking
"space_heater","xlarge_beaker") //Default research tech, prevents bricking
/////////////////////////Biotech/////////////////////////
/datum/techweb_node/biotech
@@ -26,7 +26,7 @@
display_name = "Advanced Biotechnology"
description = "Advanced Biotechnology"
prereq_ids = list("biotech")
design_ids = list("piercesyringe", "plasmarefiller", "limbgrower", "defibrillator")
design_ids = list("piercesyringe", "smoke_machine", "plasmarefiller", "limbgrower", "defibrillator", "meta_beaker")
research_cost = 2500
export_price = 5000