Revert "R&D Research Levels Unification"

This commit is contained in:
Fox-McCloud
2015-04-07 01:16:19 -04:00
parent 4e9daf6aa8
commit dec621eefd
44 changed files with 74 additions and 152 deletions
@@ -20,7 +20,7 @@ datum/design/shield_gen_ex
name = "Circuit Design (Experimental hull shield generator)"
desc = "Allows for the construction of circuit boards used to build an experimental hull shield generator."
id = "shield_gen"
req_tech = list("powerstorage" = 4, "magnets" = 3)
req_tech = list("bluespace" = 4, "plasmatech" = 3)
build_type = IMPRINTER
materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$gold" = 10000)
build_path = "/obj/machinery/shield_gen/external"
@@ -46,7 +46,7 @@ datum/design/shield_gen
name = "Circuit Design (Experimental shield generator)"
desc = "Allows for the construction of circuit boards used to build an experimental shield generator."
id = "shield_gen"
req_tech = list("powerstorage" = 4, "magnets" = 3)
req_tech = list("bluespace" = 4, "plasmatech" = 3)
build_type = IMPRINTER
materials = list("$glass" = 2000, "sacid" = 20, "$plasma" = 10000, "$diamond" = 5000, "$gold" = 10000)
build_path = "/obj/machinery/shield_gen/external"
-1
View File
@@ -31,7 +31,6 @@
//2 use active power
idle_power_usage = 20
active_power_usage = 100
origin_tech="bluespace=4;plasmatech=3"
/obj/machinery/shield_gen/New()
spawn(10)
@@ -2,14 +2,9 @@
//---------- external shield generator
//generates an energy field that loops around any built up area in space (is useless inside) halts movement and airflow, is blocked by walls, windows, airlocks etc
/obj/machinery/shield_gen/external
origin_tech="magnets=3;powerstorage=4"
/obj/machinery/shield_gen/external/New()
..()
/obj/machinery/shield_gen/external/get_shielded_turfs()
var
list