diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_monitor.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_monitor.dm index ed84ea2162e..af964c5110a 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_monitor.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_monitor.dm @@ -20,7 +20,7 @@ /obj/machinery/computer/rust_core_monitor/interact(var/mob/user) if(linked_core) . = {" - Device ID tag:[linked_core.id_tag]
+ Device ID tag: [linked_core.id_tag]
"} if(!check_core_status()) . += {" @@ -36,8 +36,7 @@ "} if(linked_core.owned_field) . += {" - Field longer diameter (m): [linked_core.owned_field.major_radius]
- Field shorter diameter (m): [linked_core.owned_field.minor_radius]
+ Approximate field diameter (m): [linked_core.owned_field.size]
Field mega energy: [linked_core.owned_field.mega_energy]
Field sub-mega energy: [linked_core.owned_field.energy]
Field dormant reagents:
diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm index d04bbce4aff..11a9cf69fe9 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm @@ -49,13 +49,13 @@ for(var/obj/machinery/rust/gyrotron/gyro in linked_gyrotrons) //These vars are here because muh readable HTML code. var/gyro_id = linked_gyrotrons.Find(gyro) - var/status = ((state != 2 || gyro.stat & (NOPOWER | BROKEN)) ? "Unresponsive" : "Operational") + var/status = ((gyro.state != 2 || gyro.stat & (NOPOWER | BROKEN)) ? "Unresponsive" : "Operational") dat += {" [gyro.id_tag] [status] "} - if(state != 2 || gyro.stat & (NOPOWER | BROKEN)) //Error data not found. + if(gyro.state != 2 || gyro.stat & (NOPOWER | BROKEN)) //Error data not found. dat += {" ERROR ERROR diff --git a/html/changelogs/PJB3005-RUSTy.yml b/html/changelogs/PJB3005-RUSTy.yml index 153fd00691b..cb56d172af8 100644 --- a/html/changelogs/PJB3005-RUSTy.yml +++ b/html/changelogs/PJB3005-RUSTy.yml @@ -3,4 +3,9 @@ delete-after: true changes: - bugfix: Fixed the R-UST Mk. 7 Gyrotrons and fuel injectors. - rscadd: Gyrotron control computers can now be built. - - tweak: Gyrotrons now need to be linked to the computer with a multitool. \ No newline at end of file + - tweak: Gyrotrons now need to be linked to the computer with a multitool. + - rscdel: Removed the interface from the R-UST Mk. 7 tokamak, don't worry there's still the core control computer. + - tweak: R-UST Mk. 7 tokamaks now need to be linked to their control computers via multitool. + - tweak: Cleaned up the code for R-UST Mk. 7 core control computers. + - rscadd: Added the R-UST Mk. 7 tokamak core monitoring computer. + - rscdel: Removes substantial features from disabling the R-UST Mk. 7 EM field. \ No newline at end of file