R-UST Mk.VII Mod. 1 (#37983)

* Rods now show their fullness

* Open cover icon is now actually open

* Fuel compression feedback

* Building feedback

* Proper fuel compressor sprite

* Better building

* Update fuel_assembly.dm

* Update fuel_assembly_port.dm

* Rods now always full, matter is 1 to 1

* to_chats for RUST testing, revert later

* More logging stuff to revert later

* Rust tokamak fixes

* Stupid github interface

* Revert "to_chats for RUST testing, revert later"

This reverts commit 4b3157b.

* Fixes RUST power drain

* Github, I...

* RUST fuel port adjacency rework

* Change base type of gyrotron to power

* Change gyro to power type pt2

* defines for gyrotrons

* Defines in one file

* Wire power consumption

* New UI for core monitor

* Forgot this

* Github (or me) being dumb, defines

* snake case + file rename

* complete file rename

* Proper power display in injector nano

* injector power consumption indicator update

* Fixes RUST core control computer

Author: Code-Alpha777

code/datums/supply_packs/engineering.dm

@@ -233,7 +233,7 @@
 	containsdesc = "Circuit boards for controlling a R-UST engine."
 
 /datum/supply_packs/rust_gyrotron
-	contains = list(/obj/machinery/rust/gyrotron)
+	contains = list(/obj/machinery/power/gyrotron)
 	name = "R-UST Mk. 7 gyrotron"
 	cost = 25
 	containertype = /obj/structure/closet/crate/secure/large
@@ -446,7 +446,7 @@
 	group = "Engineering"
 	access = list(access_engine_major)
 	containsdesc = "Everything you need to build a very basic fission reactor. Comes with a pre-filled (albeit small) fuel reservoir."
-	
+
 /datum/supply_packs/fissionreactor_expansion
 	contains = list(
 		/obj/structure/closet/crate/flatpack/configurable/fission_interior,
@@ -463,8 +463,8 @@
 	containername = "Fission reactor expansion pak"
 	group = "Engineering"
 	access = list(access_engine_major)
-	containsdesc = "Contains supplies to expand an existing fission reactor. Includes parts for 4 casings and 3 interior assemblies. Remember to turn it off and drain the coolant first!"		
-		
+	containsdesc = "Contains supplies to expand an existing fission reactor. Includes parts for 4 casings and 3 interior assemblies. Remember to turn it off and drain the coolant first!"
+
 /datum/supply_packs/fissionreactor_bigrod
 	contains = list(
 		/obj/item/weapon/fuelrod/large
@@ -476,8 +476,8 @@
 	group = "Engineering"
 	access = list(access_engine_major)
 	containsdesc = "An extra-large fuel reservoir, for extra power or for more complex fuel mixes. Use with extreme caution and control rods inserted."
-		
-				
+
+
 /datum/supply_packs/fissionreactor_randomrod
 	contains = list(
 		/obj/item/weapon/fuelrod/randomized
@@ -488,7 +488,6 @@
 	containername = "Pre-filled fuel reservoir"
 	group = "Engineering"
 	access = list(access_engine_major)
-	containsdesc = "A standard fuel reservoir, filled with a unique mixture selected by NanoTransen's engineering team."	
-	
-	
-	
+	containsdesc = "A standard fuel reservoir, filled with a unique mixture selected by NanoTransen's engineering team."
+
+

code/modules/maps/spawners/spawners.dm

@@ -199,7 +199,7 @@
 		/obj/machinery/power/battery/smes,
 		/obj/machinery/processor,
 		/obj/machinery/recharge_station,
-		/obj/machinery/rust/gyrotron,
+		/obj/machinery/power/gyrotron,
 		/obj/machinery/shield_gen,
 		/obj/machinery/shieldgen,
 		/obj/machinery/shieldwallgen,

code/modules/power/rust/_defines.dm

@@ -1 +1,11 @@
-#define RUST_GYROTRON_RANGE 25
+#define RUST_GYROTRON_RANGE 25
+#define MAX_FIELD_FREQ 1000
+#define MIN_FIELD_FREQ 1
+#define MAX_FIELD_STR 1000
+#define MIN_FIELD_STR 1
+#define RUST_CORE_STR_COST 500
+#define MIN_MEGA_ENERGY 0.001
+#define MAX_MEGA_ENERGY 0.01
+#define MAX_GYRO_FREQ 1000
+#define MIN_GYRO_FREQ 1
+#define GYRO_MEGA_COST 100000000 //Yes, original code made it that big

code/modules/power/rust/core_control.dm

@@ -31,8 +31,8 @@
 		dat += {"
 			<a href='?src=\ref[src];goto_scanlist=1'>Back to overview</a><hr>
 			<b>Device tag:</b> [cur_viewed_device.id_tag]<br>
-			<span style='color: [cur_viewed_device.owned_field ? "green" : "red"]'>Device [cur_viewed_device.owned_field ? "activated" : "deactivated"].</span><br>
-			<a href='?src=\ref[src];toggle_active=1'>Bring field [cur_viewed_device.owned_field ? "offline" : "online"]</a><br>
+			<span style='color: [cur_viewed_device.attempt_activate ? "green" : "red"]'>Device [cur_viewed_device.attempt_activate ? "activated" : "deactivated"].</span><br>
+			<a href='?src=\ref[src];toggle_active=1'>[cur_viewed_device.attempt_activate ? "Shut down" : "Boot up"] field</a><br>
 			<hr>
 
 			<b>Field encumbrance:</b> [cur_viewed_device.owned_field ? 0 : "N/A"]<br>
@@ -41,7 +41,7 @@
 			<a href='?src=\ref[src];str=-100'>--- </a>
 			<a href='?src=\ref[src];str=-10'>--  </a>
 			<a href='?src=\ref[src];str=-1'>-   </a>
-			<a href='?src=\ref[src];str=0'>[cur_viewed_device.field_strength]</a>
+			<a href='?src=\ref[src];str=0'>[cur_viewed_device.targeted_field_strength]</a>
 			<a href='?src=\ref[src];str=1'>+   </a>
 			<a href='?src=\ref[src];str=10'>++  </a>
 			<a href='?src=\ref[src];str=100'>+++ </a>
@@ -80,7 +80,7 @@
 				if(!check_core_status(C))
 					status = "<span style='color: red'>Unresponsive</span>"
 					can_access = 0
-				else if(C.avail() < C.active_power_usage)
+				else if(C.surplus() + round(C.get_satisfaction() * C.last_power_request) < C.active_power_usage)
 					status = "<span style='color: orange'>Underpowered</span>"
 				else
 					status = "<span style='color: green'>Good</span>"
@@ -117,7 +117,7 @@
 		return
 
 	if(href_list["access_device"])
-		var/idx = clamp(text2num(href_list["toggle_active"]), 1, connected_devices.len)
+		var/idx = clamp(text2num(href_list["access_device"]), 1, connected_devices.len)
 		cur_viewed_device = connected_devices[idx]
 		updateUsrDialog()
 		return 1
@@ -139,9 +139,9 @@
 	if(href_list["str"])
 		var/val = text2num(href_list["str"])
 		if(!val) //Value is 0, which is manual entering.
-			cur_viewed_device.set_strength(input("Enter the new field power density (W.m^-3)", "R-UST Mk. 7 Tokamak Controls", cur_viewed_device.field_strength) as num)
+			cur_viewed_device.set_targeted_strength(input("Enter the new field power density (W.m^-3)", "R-UST Mk. 7 Tokamak Controls", cur_viewed_device.targeted_field_strength) as num)
 		else
-			cur_viewed_device.set_strength(cur_viewed_device.field_strength + val)
+			cur_viewed_device.set_targeted_strength(cur_viewed_device.targeted_field_strength + val)
 		updateUsrDialog()
 		return 1
 
@@ -166,7 +166,7 @@
 	if(C.state != 2)
 		return
 
-	if(C.idle_power_usage > C.avail())
+	if(!C.powered)
 		return
 
 	. = 1

code/modules/power/rust/core_field.dm

@@ -29,7 +29,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 	var/mega_energy = 0
 	var/radiation = 0
 	var/frequency = 1
-	var/field_strength = 0.01						//in teslas, max is 50T
+	var/field_strength = MIN_FIELD_STR						//in teslas, max is 50T
 
 	var/obj/machinery/rust/rad_source/radiator
 	var/datum/gas_mixture/held_plasma = new
@@ -261,6 +261,8 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 	environment.merge(held_plasma)
 
 /obj/effect/rust_em_field/proc/change_size(var/newsize = 1)
+	if(newsize == size)
+		return
 	//
 	var/changed = 0
 	switch(newsize)
@@ -307,7 +309,8 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 	var/list/reactants_reacting_pool = dormant_reactant_quantities.Copy()
 	/*
 	for(var/reagent in dormant_reactant_quantities)
-			to_chat(world, "	before: [reagent]: [dormant_reactant_quantities[reagent]]")
+		to_chat(world, "	before: [reagent]: [dormant_reactant_quantities[reagent]]")
+
 		*/
 
 	//cant have any reactions if there aren't any reactants present
@@ -343,7 +346,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 					continue
 				var/datum/fusion_reaction/cur_reaction = get_fusion_reaction(cur_primary_reactant, cur_secondary_reactant)
 				if(cur_reaction)
-//					to_chat(world, "<span class='notice'>secondary reactant: [cur_secondary_reactant], [reaction_products.len]</span>")
+//					to_chat(world, "<span class='notice'>secondary reactant: [cur_secondary_reactant]</span>")s
 					possible_reactions.Add(cur_reaction)
 
 			//if there are no possible reactions here, abandon this primary reactant and move on

code/modules/power/rust/core_gen.dm

@@ -40,12 +40,6 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 
 */
 
-#define MAX_FIELD_FREQ 1000
-#define MIN_FIELD_FREQ 1
-#define MAX_FIELD_STR 1000
-#define MIN_FIELD_STR 1
-#define RUST_CORE_STR_COST 5
-
 /obj/machinery/power/rust_core
 	name = "R-UST Mk 7 Tokamak core"
 	desc = "An enormous solenoid for generating extremely high power electromagnetic fields."
@@ -57,12 +51,19 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 	light_color = LIGHT_COLOR_BLUE
 
 	var/obj/effect/rust_em_field/owned_field
-	var/field_strength = 1//0.01
-	var/field_frequency = 1
-
-	use_power = MACHINE_POWER_USE_IDLE
+	var/field_strength = MIN_FIELD_STR
+	var/targeted_field_strength = MIN_FIELD_STR
+	var/field_frequency = MIN_FIELD_FREQ
+	var/attempt_activate = FALSE
+	var/powered = 0
+	var/last_power_request = 0
+	var/last_power_received = 0
+
+	use_power = MACHINE_POWER_USE_NONE
+	power_priority = POWER_PRIORITY_POWER_EQUIPMENT
+	monitoring_enabled = TRUE
 	idle_power_usage = 50
-	active_power_usage = 500	//multiplied by field strength
+	active_power_usage = MIN_FIELD_FREQ * RUST_CORE_STR_COST	//multiplied by field strength
 	anchored = 0
 	machine_flags = SCREWTOGGLE | CROWDESTROY | WRENCHMOVE | FIXED2WORK | WELD_FIXED | MULTITOOL_MENU
 
@@ -81,14 +82,36 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 	if(ticker)
 		initialize()
 
+/obj/machinery/power/rust_core/Destroy()
+	qdel(owned_field)
+	..()
+
 /obj/machinery/power/rust_core/initialize()
 	if(!id_tag)
 		assign_uid()
 		id_tag = uid
 
 /obj/machinery/power/rust_core/process()
-	if(stat & BROKEN || !powernet)
+	if(stat & BROKEN || state != 2 || (!powernet && active_power_usage))
+		powered = 0
+		Shutdown()
+		return
+	var/cur_satisfaction = get_satisfaction()
+	var/power_received = last_power_request * cur_satisfaction
+	add_load((attempt_activate || owned_field) ? active_power_usage : idle_power_usage)
+	powered = power_received >= idle_power_usage
+	if(!powered)
 		Shutdown()
+	else if(owned_field && power_received < MIN_FIELD_STR * RUST_CORE_STR_COST)
+		Shutdown()
+	else if(attempt_activate)
+		if(owned_field)
+			set_strength(round(power_received / RUST_CORE_STR_COST))
+		else if(power_received >= MIN_FIELD_STR * RUST_CORE_STR_COST)
+			set_strength(round(power_received / RUST_CORE_STR_COST))
+			activate_field()
+	last_power_request = (attempt_activate || owned_field) ? active_power_usage : idle_power_usage
+	last_power_received = power_received
 
 /obj/machinery/power/rust_core/weldToFloor(var/obj/item/tool/weldingtool/WT, mob/user)
 	if(owned_field)
@@ -103,14 +126,14 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 				connect_to_network()
 		return 1
 	return -1
-
+/* //was this ever needed? The core lacks a direct interface
 /obj/machinery/power/rust_core/Topic(href, href_list)
 	if(..())
 		return 1
 	if(href_list["str"])
 		var/dif = text2num(href_list["str"])
 		field_strength = min(max(field_strength + dif, MIN_FIELD_STR), MAX_FIELD_STR)
-		active_power_usage = 5 * field_strength	//change to 500 later
+		active_power_usage = RUST_CORE_STR_COST * field_strength	//change to 500 later
 		if(owned_field)
 			owned_field.ChangeFieldStrength(field_strength)
 
@@ -119,25 +142,28 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 		field_frequency = min(max(field_frequency + dif, MIN_FIELD_FREQ), MAX_FIELD_FREQ)
 		if(owned_field)
 			owned_field.ChangeFieldFrequency(field_frequency)
-
+*/
 /obj/machinery/power/rust_core/proc/Startup()
 	if(owned_field)
 		return
+	attempt_activate = TRUE
+	. = 1
 
+/obj/machinery/power/rust_core/proc/activate_field()
+	if(owned_field)
+		return
 	owned_field = new(loc, src)
 	owned_field.ChangeFieldStrength(field_strength)
 	owned_field.ChangeFieldFrequency(field_frequency)
 	set_light(light_range_on, light_power_on)
 	icon_state = "core1"
-	use_power = MACHINE_POWER_USE_ACTIVE
 	. = 1
 
 /obj/machinery/power/rust_core/proc/Shutdown()
-	//todo: safety checks for field status
+	attempt_activate = FALSE
 	if(owned_field)
 		icon_state = "core0"
 		qdel(owned_field)
-		use_power = MACHINE_POWER_USE_IDLE
 		set_light(0)
 
 /obj/machinery/power/rust_core/proc/AddParticles(var/name, var/quantity = 1)
@@ -156,10 +182,14 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 		</ul>
 	"}
 
+/obj/machinery/power/rust_core/proc/set_targeted_strength(var/value)
+	value = clamp(value, MIN_FIELD_STR, MAX_FIELD_STR)
+	targeted_field_strength = value
+	active_power_usage = RUST_CORE_STR_COST * value
+
 /obj/machinery/power/rust_core/proc/set_strength(var/value)
 	value = clamp(value, MIN_FIELD_STR, MAX_FIELD_STR)
 	field_strength = value
-	active_power_usage = RUST_CORE_STR_COST * value
 	if(owned_field)
 		owned_field.ChangeFieldStrength(value)