Merge pull request #746 from jack-fractal/write-research-debug

R&D Research Levels Unification
This commit is contained in:
ZomgPonies
2015-04-06 23:28:27 -04:00
44 changed files with 152 additions and 74 deletions
+2 -2
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
w_class = 3
origin_tech = "biotech=3"
origin_tech = "programming=2;biotech=3"
var/list/construction_cost = list("metal"=1000,"glass"=500)
var/construction_time = 75
@@ -114,7 +114,7 @@
/obj/item/device/mmi/radio_enabled
name = "Radio-enabled Man-Machine Interface"
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity. This one comes with a built-in radio."
origin_tech = "biotech=4"
origin_tech = "programming=2;biotech=4"
var/obj/item/device/radio/radio = null//Let's give it a radio.
@@ -179,7 +179,7 @@
w_class = 2.0
throw_speed = 5
throw_range = 10
origin_tech = "magnets=1;biotech=1"
origin_tech = "programming=2;magnets=2;biotech=2"
var/mode = 1;
/obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)