diff --git a/baystation12.dme b/baystation12.dme index 82337449f0..033657f790 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1437,9 +1437,7 @@ #include "code\modules\recycling\disposal-construction.dm" #include "code\modules\recycling\disposal.dm" #include "code\modules\recycling\sortingmachinery.dm" -#include "code\modules\research\assembly.dm" #include "code\modules\research\circuitprinter.dm" -#include "code\modules\research\designs-chassis.dm" #include "code\modules\research\designs.dm" #include "code\modules\research\destructive_analyzer.dm" #include "code\modules\research\message_server.dm" diff --git a/code/modules/research/assembly.dm b/code/modules/research/assembly.dm deleted file mode 100644 index 17d50ce8ac..0000000000 --- a/code/modules/research/assembly.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/machinery/r_n_d/assembly - name = "Assembly" - icon_state = "protolathe" - flags = OPENCONTAINER - - use_power = 1 - idle_power_usage = 30 - active_power_usage = 5000 \ No newline at end of file diff --git a/code/modules/research/designs-chassis.dm b/code/modules/research/designs-chassis.dm deleted file mode 100644 index 1665466bee..0000000000 --- a/code/modules/research/designs-chassis.dm +++ /dev/null @@ -1,76 +0,0 @@ -/datum/design/chassis - name = "Chassis" - build_type = CHASSIS - build_path = null - var/list/components = null - -/datum/design/chassis/proc/suitablePart(var/name, var/datum/design/D) - return 0 - -/datum/design/chassis/proc/setup(var/obj/item/I, var/obj/item/O, var/partname) - return - -/datum/design/chassis/revolver - name = "Energy gun (small)" - id = "chassis_gun_small" - build_path = /obj/item/weapon/gun/energy/custom - req_tech = list(TECH_MATERIAL = 2) - components = list("Power source", "Beam generator") - -/datum/design/chassis/revolver/suitablePart(var/name, var/datum/design/D) - switch(name) - if("Power source") - if(ispath(D.build_path, /obj/item/weapon/cell)) - return 1 - if("Beam generator") - if(ispath(D.build_path, /obj/item/beam_generator)) - return 1 - return 0 - -/datum/design/chassis/revolver/setup(var/obj/item/weapon/gun/energy/custom/I, var/obj/item/O, var/partname) - if(!I || !istype(I)) - return - switch(partname) - if("Power source") - I.power_supply = O - if("Beam generator") - var/obj/item/beam_generator/B = O - if(!B || !istype(B)) - return - I.charge_cost = B.energy_use - I.projectile_type = B.beam_type - I.fire_sound = B.shot_sound - -/obj/item/weapon/gun/energy/custom - name = "Prototype gun" - desc = "This is a prototype gun built in R&D." - icon_state = "stunrevolver" - item_state = "stunrevolver" - fire_sound = null - charge_cost = 0 - projectile_type = null - cell_type = null - -/datum/design/beam_generator - name = "Stun beam" - id = "stun_beam_generator" - req_tech = list(TECH_POWER = 3, TECH_COMBAT = 2) - materials = list("metal" = 700, "glass" = 1000) - build_path = /obj/item/beam_generator - -/obj/item/beam_generator - var/shot_sound = 'sound/weapons/Taser.ogg' - var/beam_type = /obj/item/projectile/beam/stun - var/energy_use = 150 - -/datum/design/beam_generator/laser - name = "Laser beam" - id = "laser_beam_generator" - req_tech = list(TECH_POWER = 3, TECH_COMBAT = 4) - materials = list("metal" = 1000, "glass" = 3000) - build_path = /obj/item/beam_generator/laser - -/obj/item/beam_generator/laser - shot_sound = 'sound/weapons/Laser.ogg' - beam_type = /obj/item/projectile/beam - energy_use = 300 diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index ed6df5dcae..00942e4195 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -7,17 +7,15 @@ idle_power_usage = 30 active_power_usage = 5000 + var/max_material_storage = 100000 var/list/materials = list("metal" = 0, "glass" = 0, "gold" = 0, "silver" = 0, "phoron" = 0, "uranium" = 0, "diamond" = 0) + var/list/datum/design/queue = list() var/progress = 0 - var/max_material_storage = 100000 // All this could probably be done better with a list but meh. var/mat_efficiency = 1 var/speed = 1 - var/datum/design/chassis/current_chassis = null - var/list/datum/design/current_components = list() - /obj/machinery/r_n_d/protolathe/New() ..() component_parts = list() @@ -239,17 +237,3 @@ if(new_item.matter && new_item.matter.len > 0) for(var/i in new_item.matter) new_item.matter[i] = new_item.matter[i] * mat_efficiency - -/obj/machinery/r_n_d/protolathe/proc/choosePart(var/name, var/datum/design/D) - current_components[name] = D - -/obj/machinery/r_n_d/protolathe/proc/buildChassis() - var/obj/item/I = new current_chassis.build_path(loc) - for(var/t in current_components) - var/datum/design/D = current_components[t] - var/obj/item/O = new D.build_path(I) - world << I - world << I.type - current_chassis.setup(I, O, t) - current_components.Cut() - current_chassis = null \ No newline at end of file diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 471a7a4093..d4f851115e 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -42,7 +42,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/screen = 1.0 //Which screen is currently showing. var/id = 0 //ID of the computer (for server restrictions). var/sync = 1 //If sync = 0, it doesn't show up on Server Control Console - var/picking_part = null req_access = list(access_research) //Data and setting manipulation requires scientist access. @@ -412,33 +411,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, else del sheet - else if(href_list["plan"]) - if(linked_lathe) - for(var/datum/design/D in files.known_designs) - if(D.id == href_list["plan"]) - linked_lathe.current_chassis = D - break - screen = 3.6 - updateUsrDialog() - - else if(href_list["pickpart"]) - picking_part = href_list["pickpart"] - screen = 3.7 - updateUsrDialog() - - else if(href_list["choosepart"]) - for(var/datum/design/D in files.known_designs) - if(D.id == href_list["choosepart"]) - linked_lathe.choosePart(picking_part, D) - break - screen = 3.6 - updateUsrDialog() - - else if(href_list["buildchassis"]) - linked_lathe.buildChassis() - screen = 3.1 - updateUsrDialog() - else if(href_list["find_device"]) //The R&D console looks for devices nearby to link up with. screen = 0.0 spawn(10) @@ -713,7 +685,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(3.1) dat += "Main Menu || " dat += "View Queue || " - dat += "Assembly || " dat += "Material Storage || " dat += "Chemical Storage
" dat += "Protolathe Menu:

" @@ -780,55 +751,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, dat += "[tmp]: [D.name] (Remove)
" ++tmp - if(3.5) // Protolathe assembly - dat += "Main Menu || " - dat += "Protolathe Menu
" - dat += "Chassis list
" - if(linked_lathe.queue.len) - dat += "Protolathe is in use" - else - dat += "" - - if(3.6) - dat += "Main Menu || " - dat += "Back to list || " - dat += "Protolathe Menu
" - dat += "Assembly
" - if(linked_lathe && linked_lathe.current_chassis) - dat += "[linked_lathe.current_chassis.name]
" - dat += "" - if(can_build) - dat += "BUILD" - else - dat += "NO PROTOLATHE LINKED OR NO DESIGN LOADED" - - if(3.7) - dat += "Main Menu || " - dat += "Back to list || " - dat += "Protolathe Menu
" - dat += "[picking_part]
" - ///////////////////CIRCUIT IMPRINTER SCREENS//////////////////// if(4.0) dat += "Main Menu
"