Merge branch 'master' into dev

This commit is contained in:
Mloc-Argent
2013-11-04 10:46:13 +00:00
29 changed files with 11595 additions and 11501 deletions

View File

@@ -101,7 +101,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
user << "\The [name] must be linked to an R&D console first!"
return 1
if (O.is_open_container())
return 1
return 0
if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond) && !istype(O, /obj/item/stack/sheet/mineral/uranium))
user << "\red You cannot insert this item into the [name]!"
return 1

View File

@@ -99,6 +99,7 @@ Note: Must be placed within 3 tiles of the R&D Console
spawn(10)
icon_state = "d_analyzer_l"
busy = 0
return 1
return
//For testing purposes only.