Merge remote-tracking branch 'upstream/master' into barber-update

This commit is contained in:
Fox-McCloud
2015-11-05 19:42:41 -05:00
84 changed files with 15134 additions and 2254 deletions
+10
View File
@@ -147,6 +147,16 @@ var/list/uplink_items = list()
cost = 2
job = list("Chef")
//Chaplain
/datum/uplink_item/jobspecific/voodoo
name = "Voodoo Doll"
desc = "A doll created by Syndicate Witch Doctors. Ingredients: Something of the Thread, Something of the Head, Something of the Body, Something of the Dead, Secret Voodoo herbs, and Monosodium glutamate."
reference = "VD"
item = /obj/item/voodoo
cost = 13
job = list("Chaplain")
//Janitor
/datum/uplink_item/jobspecific/cautionsign