Master to dev merge.

This commit is contained in:
Zuhayr
2014-08-11 17:23:40 +09:30
67 changed files with 636 additions and 492 deletions

View File

@@ -665,7 +665,7 @@ datum/mind
if("tome")
var/mob/living/carbon/human/H = current
if (istype(H))
var/obj/item/weapon/tome/T = new(H)
var/obj/item/weapon/book/tome/T = new(H)
var/list/slots = list (
"backpack" = slot_in_backpack,
@@ -1129,7 +1129,7 @@ datum/mind
var/mob/living/carbon/human/H = current
if (istype(H))
var/obj/item/weapon/tome/T = new(H)
var/obj/item/weapon/book/tome/T = new(H)
var/list/slots = list (
"backpack" = slot_in_backpack,