diff --git a/baystation12.dme b/baystation12.dme index adb5f39af0f..b01f9d9427a 100644 --- a/baystation12.dme +++ b/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" diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/core.dmi deleted file mode 100644 index 3fa8c9a3696..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/core.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_control.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_control.dm index 19d8e07dd85..9cee19cea8f 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_control.dm +++ b/code/WorkInProgress/Cael_Aislinn/Rust/core_control.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/rust_core_control - name = "RUST Core Control" - icon_state = "power" + icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' + icon_state = "core" var/list/connected_devices = list() var/id_tag = "allan remember to update this before you leave" var/scan_range = 25 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm index 9442ced3a46..6127e8f9d7e 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm +++ b/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 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm b/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm index 7dadb4943a6..a7cb88708f0 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/core_gen.dm +++ b/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 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/emfield.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/emfield.dmi deleted file mode 100644 index 4f53b069c64..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/emfield.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dm index d2f348b8931..bbd374a21e4 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dm +++ b/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 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dmi deleted file mode 100644 index a902202183b..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dm index d0e23e290c2..1f881c8150e 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dm +++ b/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_state = "port0" + icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' + 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) diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dmi deleted file mode 100644 index d2250e97d53..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dm index 3b0589008c6..1dd5a77c22d 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dm +++ b/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_state = "fuel_compressor" + icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' + 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) diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dmi deleted file mode 100644 index 75c6cde0350..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_control.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_control.dm index 5218e386f72..a69f4023e53 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_control.dm +++ b/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() diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm index 69d4464eac1..ef819a300a9 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dm +++ b/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 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dmi deleted file mode 100644 index c9897813677..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/fuel_injector.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm index 83d43833775..ba12179bf60 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm +++ b/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 diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dmi deleted file mode 100644 index 919503515fd..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm b/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm index e2b13bc2c32..a28f67cc394 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/gyrotron_controller.dm +++ b/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() diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi index cb8c21f10b9..2f77b52db19 100644 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi and b/code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/rust_computers.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/rust_computers.dmi deleted file mode 100644 index 324848a06a1..00000000000 Binary files a/code/WorkInProgress/Cael_Aislinn/Rust/rust_computers.dmi and /dev/null differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/rust_old.dmi b/code/WorkInProgress/Cael_Aislinn/Rust/rust_old.dmi new file mode 100644 index 00000000000..7fd6ad57d03 Binary files /dev/null and b/code/WorkInProgress/Cael_Aislinn/Rust/rust_old.dmi differ diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm b/code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm index b87a12a9aef..f7a282ee6c9 100644 --- a/code/WorkInProgress/Cael_Aislinn/Rust/virtual_particle_catcher.dm +++ b/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