consolidated icons

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

baystation12.dme

@@ -1200,12 +1200,15 @@
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_turfs.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\misc_helpers.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\areas.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Rust\circuits_and_design.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_control.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_field.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\core_gen.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly_port.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_assembly_port_construction.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_compressor.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_compressor_construction.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_control.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_injector.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron.dm"

code/WorkInProgress/Cael_Aislinn/Rust/core_control.dm

@@ -1,7 +1,7 @@
 
 /obj/machinery/computer/rust_core_control
-	name = "RUST Core Control"
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
-	icon_state = "power"
+	icon_state = "core"
 	var/list/connected_devices = list()
 	var/id_tag = "allan remember to update this before you leave"
 	var/scan_range = 25

code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm

@@ -9,7 +9,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
 /obj/effect/rust_em_field
 	name = "EM Field"
 	desc = "A coruscating, barely visible field of energy. It is shaped like a slightly flattened torus."
-	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/emfield.dmi'
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "emfield_s1"
 	//
 	var/major_radius = 0	//longer radius in meters = field_strength * 0.21875, max = 8.75

code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm

@@ -48,9 +48,8 @@ max volume of plasma storeable by the field = the total volume of a number of ti
 /obj/machinery/power/rust_core
 	name = "RUST Tokamak core"
 	desc = "Enormous solenoid for generating extremely high power electromagnetic fields"
-	icon = 'core.dmi'
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "core0"
-	anchored = 1
 	density = 1
 	var/obj/effect/rust_em_field/owned_field
 	var/field_strength = 1//0.01

code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dm

@@ -1,6 +1,6 @@
 
 /obj/item/weapon/fuel_assembly
-	icon = 'fuel_assembly.dmi'
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "fuel_assembly"
 	name = "Fuel Rod Assembly"
 	var/list/rod_quantities

code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dm

@@ -1,16 +1,22 @@
 
+
 /obj/machinery/rust_fuel_assembly_port
 	name = "Fuel Assembly Port"
-	icon = 'fuel_assembly_port.dmi'
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
-	icon_state = "port0"
+	icon_state = "port2"
 	density = 0
 	var/obj/item/weapon/fuel_assembly/cur_assembly
 	layer = 4
 	var/busy = 0
 	anchored = 1
 
+	var/opened = 1 //0=closed, 1=opened
+	var/coverlocked = 0
+	var/locked = 0
+	var/has_electronics = 0 // 0 - none, bit 1 - circuitboard, bit 2 - wires
+
 /obj/machinery/rust_fuel_assembly_port/attackby(var/obj/item/I, var/mob/user)
-	if(istype(I,/obj/item/weapon/fuel_assembly))
+	if(istype(I,/obj/item/weapon/fuel_assembly) && !opened)
 		if(cur_assembly)
 			user << "\red There is already a fuel rod assembly in there!"
 		else
@@ -21,7 +27,7 @@
 
 /obj/machinery/rust_fuel_assembly_port/attack_hand(mob/user)
 	add_fingerprint(user)
-	if(stat & (BROKEN|NOPOWER))
+	if(stat & (BROKEN|NOPOWER) || opened)
 		return
 
 	if(!busy)

code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dm

@@ -1,12 +1,18 @@
 var/const/max_assembly_amount = 300
 
 /obj/machinery/rust_fuel_compressor
-	icon = 'fuel_compressor.dmi'
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
-	icon_state = "fuel_compressor"
+	icon_state = "fuel_compressor0"
 	name = "Fuel Compressor"
 	var/list/new_assembly_quantities
+	var/compressed_matter = 100
 	anchored = 1
 
+	var/opened = 1 //0=closed, 1=opened
+	var/coverlocked = 0
+	var/locked = 0
+	var/has_electronics = 0 // 0 - none, bit 1 - circuitboard, bit 2 - wires
+
 /obj/machinery/rust_fuel_compressor/New()
 	new_assembly_quantities = new/list
 	spawn(0)

code/WorkInProgress/Cael_Aislinn/Rust/fuel_control.dm

@@ -1,7 +1,8 @@
 
 /obj/machinery/computer/rust_fuel_control
 	name = "Fuel Injection Control"
-	icon_state = "power"
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon_state = "fuel"
 	var/list/connected_injectors = list()
 	var/list/active_stages = list()
 	var/list/proceeding_stages = list()

code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm

@@ -1,9 +1,8 @@
 
 /obj/machinery/power/rust_fuel_injector
 	name = "Fuel Injector"
-	icon = 'fuel_injector.dmi'
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "injector0"
-	anchored = 0
 	density = 1
 	var/state = 0
 	var/locked = 0

code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm

@@ -3,7 +3,7 @@
 /obj/item/projectile/beam/ehf_beam
 
 /obj/machinery/rust/gyrotron
-	icon = 'gyrotron.dmi'
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
 	icon_state = "emitter-off"
 	name = "Gyrotron"
 	anchored = 1

code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm

@@ -1,7 +1,8 @@
 
 /obj/machinery/computer/rust_gyrotron_controller
 	name = "Gyrotron Remote Controller"
-	icon_state = "power"
+	icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
+	icon_state = "engine"
 	var/updating = 1
 
 	New()

code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm

@@ -5,7 +5,7 @@
 	icon_state = "energynet"
 	density = 0
 	anchored = 1
-	//invisibility = 101
+	invisibility = 101
 	layer = 4
 	var/obj/effect/rust_em_field/parent
 	var/mysize = 0