Merged master to dev, manually fixed merge issues in map, may be some left.

This commit is contained in:
Zuhayr
2014-06-11 18:11:41 +09:30
45 changed files with 458 additions and 351 deletions

View File

@@ -157,7 +157,7 @@
var/obj/item/weapon/paper/P = new(usr.loc)
P.name = "Autopsy Data ([target_name])"
P.info = "<tt>[scan_data]</tt>"
P.overlays += "paper_words"
P.icon_state = "paper_words"
if(istype(usr,/mob/living/carbon))
// place the item in the usr's hand if possible