Better way of calling material and tech name

This commit is contained in:
Robertha89
2015-10-10 12:11:19 +02:00
parent acb9ae2c4b
commit acb55613d4
2 changed files with 7 additions and 31 deletions
+2 -25
View File
@@ -144,31 +144,8 @@
if(origin_tech)
msg += "<span class='notice'>Testing potentials:</span><BR>"
var/list/techlvls = params2list(origin_tech)
var/tech = null
for(var/T in techlvls) //This needs to use the better names.
tech = T
switch(tech)
if("materials")
tech = "Materials Research"
if("engineering")
tech = "Engineering Research"
if("plasmatech")
tech = "Plasma Research"
if("powerstorage")
tech = "Power Manipulation Technology"
if("bluespace")
tech = "'Blue-space' Research"
if("biotech")
tech = "Biological Technology"
if("combat")
tech = "Combat Systems Research"
if("magnets")
tech = "Electromagnetic Spectrum Research"
if("programming")
tech = "Data Theory Research"
if("syndicate")
tech = "Illegal Technologies Research"
msg += "Tech: [tech] | Magnitude: [techlvls[T]] <BR>"
msg += "Tech: [CallTechName(T)] | Magnitude: [techlvls[T]] <BR>"
msg += "Research reliability: [reliability]% <BR>"
if(crit_fail)
msg += "<span class='danger'>Critical failure detected in subject!</span><BR>"
@@ -179,7 +156,7 @@
if(materials.len)
msg += "<span class='notice'>Extractable materials:<BR>"
for(var/mat in materials)
msg += "[capitalize(copytext(mat, 2))]<BR>" //Capitize first word, remove the "$"
msg += "[CallMaterialName(mat)]<BR>" //Capitize first word, remove the "$"
else
msg += "<span class='danger'>No extractable materials detected.</span><BR>"
msg += "*--------*"
+5 -6
View File
@@ -54,7 +54,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/selected_category
var/list/datum/design/matching_designs = list() //for the search function
/obj/machinery/computer/rdconsole/proc/CallTechName(var/ID) //A simple helper proc to find the name of a tech with a given ID.
/proc/CallTechName(ID) //A simple helper proc to find the name of a tech with a given ID.
var/datum/tech/check_tech
var/return_name = null
for(var/T in subtypesof(/datum/tech))
@@ -68,7 +68,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
return return_name
/obj/machinery/computer/rdconsole/proc/CallMaterialName(var/ID)
proc/CallMaterialName(ID)
var/datum/reagent/temp_reagent
var/return_name = null
if (copytext(ID, 1, 2) == "$")
@@ -183,7 +183,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
return 1
if(!allowed(usr) && !isobserver(usr))
return 1
@@ -1115,7 +1115,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "</tr></table></div>"
return dat
/obj/machinery/computer/rdconsole/core
name = "Core R&D Console"
desc = "A console used to interface with R&D tools."
@@ -1126,7 +1126,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
desc = "A console used to interface with R&D tools."
id = 2
req_access = list(access_robotics)
/obj/machinery/computer/rdconsole/experiment
name = "E.X.P.E.R.I-MENTOR R&D Console"
desc = "A console used to interface with R&D tools."
@@ -1137,4 +1137,3 @@ won't update every console in existence) but it's more of a hassle to do. Also,
desc = "A console used to interface with R&D tools."
id = 4
req_access = list(access_mechanic)