From de91fba8359fe4a7bb548f8aa9c74195a092e9e4 Mon Sep 17 00:00:00 2001 From: Cael Aislinn Date: Sun, 23 Jun 2013 10:27:48 +1000 Subject: [PATCH] halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much Signed-off-by: Cael Aislinn --- .../machinery/analysis_accelerator.dm | 2 ++ .../xenoarchaeology/machinery/analysis_base.dm | 12 +++++++----- .../machinery/analysis_fourier_transform.dm | 2 ++ .../machinery/analysis_gas_chromatography.dm | 2 ++ .../machinery/analysis_ion_mobility.dm | 2 ++ .../machinery/analysis_isotope_ratio.dm | 2 ++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm b/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm index 0a618dc8ba2..74ac904dc9b 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm @@ -1,4 +1,6 @@ +// This machine shows the age for extremely old finds + obj/machinery/anomaly/accelerator name = "Accelerator spectrometer" diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm index 558b354a5d9..a462bd98fa0 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm @@ -23,7 +23,7 @@ var/obj/item/weapon/reagent_containers/glass/held_container var/obj/item/weapon/tank/fuel_container - var/target_scan_ticks = 60 + var/target_scan_ticks = 30 var/report_num = 0 var/scan_process = 0 var/temperature = 273 //measured in kelvin, if this exceeds 1200, the machine is damaged and requires repairs @@ -50,8 +50,10 @@ if(scan_process) if(scan_process++ > target_scan_ticks) FinishScan() - - if(temperature > 350 && prob(10)) + else if(temperature > 400) + src.visible_message("\blue \icon[src] shuts down from the heat!", 2) + scan_process = 0 + else if(temperature > 350 && prob(10)) src.visible_message("\blue \icon[src] bleets plaintively.", 2) if(temperature > 400) scan_process = 0 @@ -107,7 +109,7 @@ user.machine = src var/dat = "[src.name]
" dat += "Module heat level: [temperature] kelvin
" - dat += "Safeties set at 300k, shielding failure at 400k. Failure to maintain safe heat levels may result in equipment damage.
" + dat += "Safeties set at 350k, shielding failure at 400k. Failure to maintain safe heat levels may result in equipment damage.
" dat += "
" if(scan_process) dat += "Scan in progress


" @@ -178,7 +180,7 @@ obj/machinery/anomaly/Topic(href, href_list) fuel_container.loc = src.loc fuel_container = null if(href_list["begin"]) - if(temperature >= 300) + if(temperature >= 350) var/proceed = input("Unsafe internal temperature detected, enter YES below to continue.","Warning") if(proceed == "YES" && get_dist(src, usr) <= 1) scan_process = 1 diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm b/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm index d8f45ae6d8e..98c49b2372a 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm @@ -1,4 +1,6 @@ +// This machine tells the distance to a nearby artifact, if there is one + obj/machinery/anomaly/fourier_transform name = "Fourier Transform spectroscope" diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm b/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm index 79bc546b7ca..bd6dbeb9b36 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm @@ -1,4 +1,6 @@ +// This machine shows the materials that are present + obj/machinery/anomaly/gas_chromatography name = "Gas Chromatography spectrometer" diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm index cdc388d7c87..70fde828dfe 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm @@ -1,4 +1,6 @@ +// This machine shows the amount of a certain material that is present + obj/machinery/anomaly/ion_mobility name = "Ion Mobility Spectrometer" desc = "A specialised, complex analysis machine." diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm index 57e26840803..604015d31c3 100644 --- a/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm +++ b/code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm @@ -1,4 +1,6 @@ +// This machine shows the age for newer finds + obj/machinery/anomaly/isotope_ratio name = "Isotope ratio spectrometer" desc = "A specialised, complex analysis machine."