cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10324 from granodd/ReagentScannerUpgrade

Browse Source 
The Old Mass Spectrometer is Dead, Long Live the Reagent Scanner
This commit is contained in:
variableundefined
2018-11-25 08:38:29 +08:00
committed by GitHub
parent 7d14bbcea9 2cb99f51e4
commit 24ace06513
10 changed files with 32 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pda/utilities.dm
+6 -2
View File
@@ -109,8 +109,12 @@
if(A.reagents.reagent_list.len > 0)
var/reagents_length = A.reagents.reagent_list.len
to_chat(user, "<span class='notice'>[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.</span>")
for(var/re in A.reagents.reagent_list)
to_chat(user, "<span class='notice'>\t [re]</span>")
for(var/datum/reagent/R in A.reagents.reagent_list)
if(R.id != "blood")
to_chat(user, "<span class='notice'>\t [R]</span>")
else
var/blood_type = R.data["blood_type"]
to_chat(user, "<span class='notice'>\t [R] [blood_type]</span>")
else
to_chat(user, "<span class='notice'>No active chemical agents found in [A].</span>")
else
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -64,7 +64,7 @@
options[/obj/item/stock_parts/manipulator/pico] = "Upgrade to a pico manipulator to fix it."
options[/obj/item/stock_parts/matter_bin/super] = "Give it a super matter bin to fix it."
options[/obj/item/stock_parts/cell/super] = "Replace the reagent synthesizer with a super capacity cell to fix it."
options[/obj/item/mass_spectrometer/adv] = "Replace the reagent scanner with an advanced mass spectrometer to fix it"
options[/obj/item/reagent_scanner/adv] = "Replace the reagent scanner with an advanced reagent scanner to fix it"
options[/obj/item/stock_parts/micro_laser/high] = "Repair the reagent synthesizer with an high-power micro-laser to fix it"
options[/obj/item/reagent_scanner/adv] = "Replace the reagent scanner with an advanced reagent scanner to fix it"
options[/obj/item/stack/nanopaste] = "Apply some nanopaste to the broken nozzles to fix it."
code/modules/research/designs/medical_designs.dm
-19
View File
@@ -1,15 +1,6 @@
/////////////////////////////////////////
////////////Medical Tools////////////////
/////////////////////////////////////////
/datum/design/adv_mass_spectrometer
name = "Advanced Mass-Spectrometer"
desc = "A device for analyzing chemicals in the blood and their quantities."
id = "adv_mass_spectrometer"
req_tech = list("biotech" = 3, "magnets" = 4, "plasmatech" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 500, MAT_GLASS = 200)
build_path = "/obj/item/mass_spectrometer/adv"
category = list("Medical")
/datum/design/adv_reagent_scanner
name = "Advanced Reagent Scanner"
@@ -93,16 +84,6 @@
build_path = /obj/item/mmi
category = list("Misc","Medical")
/datum/design/mass_spectrometer
name = "Mass-Spectrometer"
desc = "A device for analyzing chemicals in the blood."
id = "mass_spectrometer"
req_tech = list("magnets" = 2, "plasmatech" = 2)
build_type = PROTOLATHE
materials = list(MAT_METAL = 300, MAT_GLASS = 100)
build_path = /obj/item/mass_spectrometer
category = list("Medical")
/datum/design/robotic_brain
name = "Robotic Brain"
desc = "The latest in non-sentient Artificial Intelligences."