cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-17 02:47:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gradual Research (#9342)

Browse Source 
The RnD Console UI has been overhauled.
    RnD levels are now a gradual progress instead of just leveling up, not much has changed, but deconstructed items now give more * Data disks now tell you what they contain.
    The red scanning goggles now let you see examined items' tech levels.
    RnD consoles should now open on the main menu instead of the research menu.
    Ejected items from the RnD console and destructive analyzer now go into your hands if you're adjacent.
This commit is contained in:
Geeves
2020-07-18 22:36:06 +02:00
committed by GitHub
parent ca199c182c
commit 2cb2bce2af
57 changed files with 502 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+4 -1
View File
@@ -833,4 +833,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
//Override this for items that can be flame sources.
/obj/item/proc/isFlameSource()
return FALSE
return FALSE
/obj/item/proc/glasses_examine_atom(var/atom/A, var/user)
return
code/game/objects/items/devices/aicard.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/aicard
name = "inteliCard"
name = "intelliCard"
icon = 'icons/obj/pai.dmi'
icon_state = "aicard" // aicard-full
item_state = "electronic"
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
+1 -1
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/biogenerator
name = T_BOARD("biogenerator")
build_path = "/obj/machinery/biogenerator"
build_path = /obj/machinery/biogenerator
board_type = "machine"
origin_tech = list(TECH_DATA = 2)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/chem_heater.dm
+1 -1
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/chem_heater
name = T_BOARD("chem heater")
build_path = "/obj/machinery/chem_heater"
build_path = /obj/machinery/chem_heater
board_type = "machine"
origin_tech = list(TECH_DATA = 1, TECH_BIO = 2)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
+2 -2
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/clonepod
name = T_BOARD("clone pod")
build_path = "/obj/machinery/clonepod"
build_path = /obj/machinery/clonepod
board_type = "machine"
origin_tech = list(TECH_DATA = 3, TECH_BIO = 3)
req_components = list(
@@ -15,7 +15,7 @@
/obj/item/circuitboard/clonescanner
name = T_BOARD("cloning scanner")
build_path = "/obj/machinery/dna_scannernew"
build_path = /obj/machinery/dna_scannernew
board_type = "machine"
origin_tech = list(TECH_DATA = 2, TECH_BIO = 2)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
+1 -1
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/bluespacerelay
name = T_BOARD("bluespacerelay")
build_path = "/obj/machinery/bluespacerelay"
build_path = /obj/machinery/bluespacerelay
board_type = "machine"
origin_tech = list(TECH_BLUESPACE = 2, TECH_DATA = 2)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/mech_recharger.dm
+1 -1
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/mech_recharger
name = T_BOARD("mech recharger")
build_path = "/obj/machinery/mech_recharger"
build_path = /obj/machinery/mech_recharger
board_type = "machine"
origin_tech = list(TECH_DATA = 2, TECH_POWER = 2, TECH_ENGINEERING = 2)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
+2 -2
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/miningdrill
name = T_BOARD("mining drill head")
build_path = "/obj/machinery/mining/drill"
build_path = /obj/machinery/mining/drill
board_type = "machine"
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
req_components = list(
@@ -15,7 +15,7 @@
/obj/item/circuitboard/miningdrillbrace
name = T_BOARD("mining drill brace")
build_path = "/obj/machinery/mining/brace"
build_path = /obj/machinery/mining/brace
board_type = "machine"
origin_tech = list(TECH_DATA = 1, TECH_ENGINEERING = 1)
req_components = list()
code/game/objects/items/weapons/circuitboards/machinery/miscboards.dm
+21 -20
View File
@@ -12,7 +12,7 @@
/obj/item/circuitboard/sleeper
name = T_BOARD("Sleeper")
desc = "The circuitboard for a sleeper."
build_path = "/obj/machinery/sleeper"
build_path = /obj/machinery/sleeper
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -24,7 +24,7 @@
/obj/item/circuitboard/cryotube
name = T_BOARD("Cryo Cell")
desc = "The circuitboard for a cryo tube."
build_path = "/obj/machinery/atmospherics/unary/cryo_cell"
build_path = /obj/machinery/atmospherics/unary/cryo_cell
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 3)
board_type = "machine"
req_components = list(
@@ -36,7 +36,7 @@
/obj/item/circuitboard/bodyscanner
name = T_BOARD("Body Scanner Machine")
desc = "The circuitboard for a body scanner machine."
build_path = "/obj/machinery/bodyscanner"
build_path = /obj/machinery/bodyscanner
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -47,7 +47,7 @@
/obj/item/circuitboard/bodyscannerconsole
name = T_BOARD("Body Scanner Console")
desc = "The circuitboard for a body scanner console."
build_path = "/obj/machinery/body_scanconsole"
build_path = /obj/machinery/body_scanconsole
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -57,7 +57,7 @@
/obj/item/circuitboard/requestconsole
name = T_BOARD("Request Console")
desc = "The circuitboard for a body scanner console."
build_path = "/obj/machinery/requests_console"
build_path = /obj/machinery/requests_console
origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -67,7 +67,7 @@
/obj/item/circuitboard/optable
name = T_BOARD("Operation Table")
desc = "The circuitboard for a operation table."
build_path = "/obj/machinery/optable"
build_path = /obj/machinery/optable
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -76,7 +76,7 @@
/obj/item/circuitboard/smartfridge
name = T_BOARD("Smart Fridge")
desc = "The circuitboard for a smart fridge."
build_path = "/obj/machinery/smartfridge"
build_path = /obj/machinery/smartfridge
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 3)
board_type = "machine"
req_components = list(
@@ -86,6 +86,7 @@
/obj/item/circuitboard/refiner
name = T_BOARD("ore processor")
desc = "The circuitboard for an ore processing machine."
build_path = /obj/machinery/mineral/processing_unit
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "other" // change this to machine if you want it to be buildable
req_components = list(
@@ -97,7 +98,7 @@
/obj/item/circuitboard/microwave
name = T_BOARD("microwave")
desc = "The circuitboard for a microwave."
build_path = "/obj/machinery/microwave"
build_path = /obj/machinery/microwave
contain_parts = 0
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "machine"
@@ -109,7 +110,7 @@
/obj/item/circuitboard/oven
name = T_BOARD("oven")
desc = "The circuitboard for an oven."
build_path = "/obj/machinery/appliance/cooker/oven"
build_path = /obj/machinery/appliance/cooker/oven
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -120,7 +121,7 @@
/obj/item/circuitboard/fryer
name = T_BOARD("deep fryer")
desc = "The circuitboard for a deep fryer."
build_path = "/obj/machinery/appliance/cooker/fryer"
build_path = /obj/machinery/appliance/cooker/fryer
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -131,7 +132,7 @@
/obj/item/circuitboard/cerealmaker
name = T_BOARD("cereal maker")
desc = "The circuitboard for a cereal maker."
build_path = "/obj/machinery/appliance/mixer/cereal"
build_path = /obj/machinery/appliance/mixer/cereal
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -142,7 +143,7 @@
/obj/item/circuitboard/candymachine
name = T_BOARD("candy machine")
desc = "The circuitboard for a candy machine."
build_path = "/obj/machinery/appliance/mixer/candy"
build_path = /obj/machinery/appliance/mixer/candy
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -153,7 +154,7 @@
/obj/item/circuitboard/holopad
name = T_BOARD("Holopad")
desc = "The circuitboard for a holopad."
build_path = "/obj/machinery/hologram/holopad"
build_path = /obj/machinery/hologram/holopad
origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -161,9 +162,9 @@
"/obj/item/stock_parts/scanning_module" = 1)
/obj/item/circuitboard/crystelpodconsole
name = T_BOARD("Crystel Therapy Pod Console")
desc = "The circuitboard for a crystel therapy pod console."
build_path = "/obj/machinery/chakraconsole"
name = T_BOARD("Crystal Therapy Pod Console")
desc = "The circuitboard for a crystal therapy pod console."
build_path = /obj/machinery/chakraconsole
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -171,9 +172,9 @@
"/obj/item/stock_parts/capacitor" = 1)
/obj/item/circuitboard/crystelpod
name = T_BOARD("Crystel Therapy Pod")
desc = "The circuitboard for a crystel therapy pod."
build_path = "/obj/machinery/chakrapod"
name = T_BOARD("Crystal Therapy Pod")
desc = "The circuitboard for a crystal therapy pod."
build_path = /obj/machinery/chakrapod
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
board_type = "machine"
req_components = list(
@@ -183,7 +184,7 @@
/obj/item/circuitboard/weapons_analyzer
name = T_BOARD("Weapons Analyzer")
desc = "The circuitboard for a weapons analyzer."
build_path = "/obj/machinery/weapons_analyzer"
build_path = /obj/machinery/weapons_analyzer
origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 4, TECH_COMBAT = 3)
board_type = "machine"
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
+3 -3
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/pacman
name = T_BOARD("PACMAN-type generator")
build_path = "/obj/machinery/power/port_gen/pacman"
build_path = /obj/machinery/power/port_gen/pacman
board_type = "machine"
origin_tech = list(TECH_DATA = 3, TECH_POWER = 3, TECH_PHORON = 3, TECH_ENGINEERING = 3)
req_components = list(
@@ -15,10 +15,10 @@
/obj/item/circuitboard/pacman/super
name = T_BOARD("SUPERPACMAN-type generator")
build_path = "/obj/machinery/power/port_gen/pacman/super"
build_path = /obj/machinery/power/port_gen/pacman/super
origin_tech = list(TECH_DATA = 3, TECH_POWER = 4, TECH_ENGINEERING = 4)
/obj/item/circuitboard/pacman/mrs
name = T_BOARD("MRSPACMAN-type generator")
build_path = "/obj/machinery/power/port_gen/pacman/mrs"
build_path = /obj/machinery/power/port_gen/pacman/mrs
origin_tech = list(TECH_DATA = 3, TECH_POWER = 5, TECH_ENGINEERING = 5)
code/game/objects/items/weapons/circuitboards/machinery/power.dm
+3 -3
View File
@@ -4,14 +4,14 @@
/obj/item/circuitboard/smes
name = T_BOARD("superconductive magnetic energy storage")
build_path = "/obj/machinery/power/smes/buildable"
build_path = /obj/machinery/power/smes/buildable
board_type = "machine"
origin_tech = list(TECH_POWER = 6, TECH_ENGINEERING = 4)
req_components = list("/obj/item/smes_coil" = 1, "/obj/item/stack/cable_coil" = 30)
/obj/item/circuitboard/batteryrack
name = T_BOARD("battery rack PSU")
build_path = "/obj/machinery/power/smes/batteryrack"
build_path = /obj/machinery/power/smes/batteryrack
board_type = "machine"
origin_tech = list(TECH_POWER = 3, TECH_ENGINEERING = 2)
req_components = list("/obj/item/cell" = 3)
@@ -19,7 +19,7 @@
/obj/item/circuitboard/ghettosmes
name = T_BOARD("makeshift PSU")
desc = "An APC circuit repurposed into some power storage device controller."
build_path = "/obj/machinery/power/smes/batteryrack/makeshift"
build_path = /obj/machinery/power/smes/batteryrack/makeshift
board_type = "machine"
req_components = list("/obj/item/cell" = 3)
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
+1 -1
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/recharge_station
name = T_BOARD("cyborg recharging station")
build_path = "/obj/machinery/recharge_station"
build_path = /obj/machinery/recharge_station
board_type = "machine"
origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/research.dm
+8 -8
View File
@@ -4,7 +4,7 @@
obj/item/circuitboard/rdserver
name = T_BOARD("R&D server")
build_path = "/obj/machinery/r_n_d/server"
build_path = /obj/machinery/r_n_d/server
board_type = "machine"
origin_tech = list(TECH_DATA = 3)
req_components = list(
@@ -13,7 +13,7 @@ obj/item/circuitboard/rdserver
/obj/item/circuitboard/destructive_analyzer
name = T_BOARD("destructive analyzer")
build_path = "/obj/machinery/r_n_d/destructive_analyzer"
build_path = /obj/machinery/r_n_d/destructive_analyzer
board_type = "machine"
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2, TECH_DATA = 2)
req_components = list(
@@ -23,7 +23,7 @@ obj/item/circuitboard/rdserver
/obj/item/circuitboard/autolathe
name = T_BOARD("autolathe")
build_path = "/obj/machinery/autolathe"
build_path = /obj/machinery/autolathe
board_type = "machine"
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
req_components = list(
@@ -33,7 +33,7 @@ obj/item/circuitboard/rdserver
/obj/item/circuitboard/protolathe
name = T_BOARD("protolathe")
build_path = "/obj/machinery/r_n_d/protolathe"
build_path = /obj/machinery/r_n_d/protolathe
board_type = "machine"
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
req_components = list(
@@ -44,7 +44,7 @@ obj/item/circuitboard/rdserver
/obj/item/circuitboard/circuit_imprinter
name = T_BOARD("circuit imprinter")
build_path = "/obj/machinery/r_n_d/circuit_imprinter"
build_path = /obj/machinery/r_n_d/circuit_imprinter
board_type = "machine"
origin_tech = list(TECH_ENGINEERING = 2, TECH_DATA = 2)
req_components = list(
@@ -54,7 +54,7 @@ obj/item/circuitboard/rdserver
/obj/item/circuitboard/mechfab
name = "Circuit board (Exosuit Fabricator)"
build_path = "/obj/machinery/mecha_part_fabricator"
build_path = /obj/machinery/mecha_part_fabricator
board_type = "machine"
origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 3)
req_components = list(
@@ -65,7 +65,7 @@ obj/item/circuitboard/rdserver
/obj/item/circuitboard/telesci_pad
name = T_BOARD("telepad")
build_path = "/obj/machinery/telepad"
build_path = /obj/machinery/telepad
board_type = "machine"
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_MATERIAL = 3, TECH_BLUESPACE = 4)
req_components = list(
@@ -76,7 +76,7 @@ obj/item/circuitboard/rdserver
obj/item/circuitboard/ntnet_relay
name = "Circuit board (NTNet Quantum Relay)"
build_path = "/obj/machinery/ntnet_relay"
build_path = /obj/machinery/ntnet_relay
board_type = "machine"
origin_tech = list(TECH_DATA = 4)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
+3 -3
View File
@@ -5,7 +5,7 @@
/obj/item/circuitboard/shield_gen_ex
name = T_BOARD("hull shield generator")
board_type = "machine"
build_path = "/obj/machinery/shield_gen/external"
build_path = /obj/machinery/shield_gen/external
origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
req_components = list(
"/obj/item/stock_parts/manipulator/pico" = 2,
@@ -18,7 +18,7 @@
/obj/item/circuitboard/shield_gen
name = T_BOARD("bubble shield generator")
board_type = "machine"
build_path = "/obj/machinery/shield_gen"
build_path = /obj/machinery/shield_gen
origin_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
req_components = list(
"/obj/item/stock_parts/manipulator/pico" = 2,
@@ -31,7 +31,7 @@
/obj/item/circuitboard/shield_cap
name = T_BOARD("shield capacitor")
board_type = "machine"
build_path = "/obj/machinery/shield_capacitor"
build_path = /obj/machinery/shield_capacitor
origin_tech = list(TECH_MAGNET = 3, TECH_POWER = 4)
req_components = list(
"/obj/item/stock_parts/manipulator/pico" = 2,
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
+7 -7
View File
@@ -7,7 +7,7 @@
/obj/item/circuitboard/telecomms/receiver
name = T_BOARD("subspace receiver")
build_path = "/obj/machinery/telecomms/receiver"
build_path = /obj/machinery/telecomms/receiver
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3, TECH_BLUESPACE = 2)
req_components = list(
"/obj/item/stock_parts/subspace/ansible" = 1,
@@ -17,7 +17,7 @@
/obj/item/circuitboard/telecomms/hub
name = T_BOARD("hub mainframe")
build_path = "/obj/machinery/telecomms/hub"
build_path = /obj/machinery/telecomms/hub
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
req_components = list(
"/obj/item/stock_parts/manipulator" = 2,
@@ -26,7 +26,7 @@
/obj/item/circuitboard/telecomms/relay
name = T_BOARD("relay mainframe")
build_path = "/obj/machinery/telecomms/relay"
build_path = /obj/machinery/telecomms/relay
origin_tech = list(TECH_DATA = 3, TECH_ENGINEERING = 4, TECH_BLUESPACE = 3)
req_components = list(
"/obj/item/stock_parts/manipulator" = 2,
@@ -35,7 +35,7 @@
/obj/item/circuitboard/telecomms/bus
name = T_BOARD("bus mainframe")
build_path = "/obj/machinery/telecomms/bus"
build_path = /obj/machinery/telecomms/bus
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
req_components = list(
"/obj/item/stock_parts/manipulator" = 2,
@@ -44,7 +44,7 @@
/obj/item/circuitboard/telecomms/processor
name = T_BOARD("processor unit")
build_path = "/obj/machinery/telecomms/processor"
build_path = /obj/machinery/telecomms/processor
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
req_components = list(
"/obj/item/stock_parts/manipulator" = 3,
@@ -56,7 +56,7 @@
/obj/item/circuitboard/telecomms/server
name = T_BOARD("telecommunication server")
build_path = "/obj/machinery/telecomms/server"
build_path = /obj/machinery/telecomms/server
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4)
req_components = list(
"/obj/item/stock_parts/manipulator" = 2,
@@ -65,7 +65,7 @@
/obj/item/circuitboard/telecomms/broadcaster
name = T_BOARD("subspace broadcaster")
build_path = "/obj/machinery/telecomms/broadcaster"
build_path = /obj/machinery/telecomms/broadcaster
origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 4, TECH_BLUESPACE = 2)
req_components = list(
"/obj/item/stock_parts/manipulator" = 2,
code/game/objects/items/weapons/circuitboards/machinery/trashcompactor.dm
+1 -1
View File
@@ -4,7 +4,7 @@
/obj/item/circuitboard/crusher
name = T_BOARD("crusher")
build_path = "/obj/machinery/crusher_base"
build_path = /obj/machinery/crusher_base
board_type = "machine"
origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 1, TECH_MAGNET = 1, TECH_MATERIAL = 3)
req_components = list(
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
+2 -2
View File
@@ -30,7 +30,7 @@
/obj/item/circuitboard/unary_atmos/heater
name = T_BOARD("gas heating system")
build_path = "/obj/machinery/atmospherics/unary/heater"
build_path = /obj/machinery/atmospherics/unary/heater
origin_tech = list(TECH_POWER = 2, TECH_ENGINEERING = 1)
req_components = list(
"/obj/item/stack/cable_coil" = 5,
@@ -39,7 +39,7 @@
/obj/item/circuitboard/unary_atmos/cooler
name = T_BOARD("gas cooling system")
build_path = "/obj/machinery/atmospherics/unary/freezer"
build_path = /obj/machinery/atmospherics/unary/freezer
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 2)
req_components = list(
"/obj/item/stack/cable_coil" = 2,