Corrects names of computers, code formatting, updated computer descriptions.

Everything in game/machinery/computers/ and modules/shuttles should now have properly (de)capitalized names. Computer, board and research names should now be coherent, too. Adds a research for employment records circuit board.
This commit is contained in:
Amunak
2014-12-14 05:00:38 +01:00
parent 429a898e72
commit 158573f066
35 changed files with 90 additions and 76 deletions

View File

@@ -2,8 +2,8 @@
//Construction Items
/obj/item/weapon/smes_coil
name = "Superconductive Magnetic Coil"
desc = "Heavy duty superconducting magnetic coil, mainly used in construction of SMES units."
name = "superconductive magnetic coil"
desc = "Heavy duty superconductive magnetic coil, mainly used in construction of SMES units."
icon = 'icons/obj/stock_parts.dmi'
icon_state = "smes_coil" // Just few icons patched together. If someone wants to make better icon, feel free to do so!
w_class = 4.0 // It's LARGE (backpack size)

View File

@@ -77,8 +77,8 @@ datum/design/New()
///////////////////Computer Boards///////////////////////////////////
datum/design/circuit
req_tech = list("programming" = 2)
build_type = IMPRINTER
req_tech = list("programming" = 2)
materials = list("$glass" = 2000, "sacid" = 20)
datum/design/circuit/AssembleDesignInfo()
@@ -109,11 +109,6 @@ datum/design/circuit/borgupload
req_tech = list("programming" = 4)
build_path = /obj/item/weapon/circuitboard/borgupload
datum/design/circuit/med_data
name = "medical records console"
id = "med_data"
build_path = /obj/item/weapon/circuitboard/med_data
datum/design/circuit/operating
name = "patient monitoring console"
id = "operating"
@@ -150,9 +145,19 @@ datum/design/circuit/teleconsole
id = "teleconsole"
req_tech = list("programming" = 3, "bluespace" = 2)
datum/design/circuit/emp_data
name = "employment records console"
id = "emp_data"
build_path = /obj/item/weapon/circuitboard/skills
datum/design/circuit/med_data
name = "medical records console"
id = "med_data"
build_path = /obj/item/weapon/circuitboard/med_data
datum/design/circuit/secdata
name = "security records console"
id = "secdata"
id = "sec_data"
build_path = /obj/item/weapon/circuitboard/secure_data
datum/design/circuit/atmosalerts
@@ -281,6 +286,29 @@ datum/design/circuit/aifixer
req_tech = list("programming" = 3, "biotech" = 2)
build_path = /obj/item/weapon/circuitboard/aifixer
///////////////////////////////////
/////////Shield Generators/////////
///////////////////////////////////
datum/design/shield
req_tech = list("bluespace" = 4, "phorontech" = 3)
materials = list("$glass" = 2000, "sacid" = 20, "$phoron" = 10000, "$diamond" = 5000, "$gold" = 10000)
datum/design/shield/bubble
name = "bubble shield generator"
id = "shield_gen"
build_path = "/obj/machinery/shield_gen/external"
datum/design/shield/hull
name = "hull shield generator"
id = "shield_gen_ex"
build_path = "/obj/machinery/shield_gen/external"
datum/design/shield/capacitor
name = "shield capacitor"
id = "shield_cap"
req_tech = list("magnets" = 3, "powerstorage" = 4)
build_path = "/obj/machinery/shield_gen/external"
///////////////////////////////////
//////////AI Module Disks//////////
///////////////////////////////////

View File

@@ -32,7 +32,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
*/
/obj/machinery/computer/rdconsole
name = "R&D Console"
name = "R&D control console"
icon_state = "rdcomp"
circuit = /obj/item/weapon/circuitboard/rdconsole
var/datum/research/files //Stores all the collected research data.

View File

@@ -4,6 +4,6 @@
shuttle_tag = "Vox Skipjack"
/obj/machinery/computer/shuttle_control/multi/syndicate
name = "Syndicate control console"
name = "mercenary shuttle control console"
req_access = list(access_syndicate)
shuttle_tag = "Mercenary"
shuttle_tag = "Mercenary"

View File

@@ -1,17 +1,17 @@
/obj/machinery/computer/shuttle_control/mining
name = "mining shuttle console"
name = "mining shuttle control console"
shuttle_tag = "Mining"
//req_access = list(access_mining)
circuit = /obj/item/weapon/circuitboard/mining_shuttle
/obj/machinery/computer/shuttle_control/engineering
name = "engineering shuttle console"
name = "engineering shuttle control console"
shuttle_tag = "Engineering"
//req_one_access_txt = "11;24"
circuit = /obj/item/weapon/circuitboard/engineering_shuttle
/obj/machinery/computer/shuttle_control/research
name = "research shuttle console"
name = "research shuttle control console"
shuttle_tag = "Research"
//req_access = list(access_research)
circuit = /obj/item/weapon/circuitboard/research_shuttle
circuit = /obj/item/weapon/circuitboard/research_shuttle

View File

@@ -126,4 +126,4 @@
//returns 1 if the shuttle has a valid arrive time
/datum/shuttle/proc/has_arrive_time()
return (moving_status == SHUTTLE_INTRANSIT)
return (moving_status == SHUTTLE_INTRANSIT)

View File

@@ -1,4 +1,3 @@
/datum/shuttle/ferry/emergency
//pass

View File

@@ -1,4 +1,3 @@
#define DOCK_ATTEMPT_TIMEOUT 200 //how long in ticks we wait before assuming the docking controller is broken or blown up.
/datum/shuttle/ferry

View File

@@ -1,8 +1,3 @@
/datum/shuttle/ferry/supply
var/away_location = 1 //the location to hide at while pretending to be in-transit
var/late_chance = 80
@@ -76,4 +71,4 @@
//returns the ETA in minutes
/datum/shuttle/ferry/supply/proc/eta_minutes()
var/ticksleft = arrive_time - world.time
return round(ticksleft/600,1)
return round(ticksleft/600,1)

View File

@@ -140,4 +140,4 @@
MS.short_jump(MS.last_departed, MS.destinations[choice])
MS.last_departed = MS.destinations[choice]
updateUsrDialog()
updateUsrDialog()