Merge branch 'master' into voiced-skeletons

This commit is contained in:
Jack Edge
2016-05-13 18:37:23 +01:00
124 changed files with 2392 additions and 1918 deletions
+11 -1
View File
@@ -829,6 +829,14 @@
/obj/item/pizzabox/vegetable)
crate_name = "pizza crate"
/datum/supply_pack/organic/cream_piee
name = "High-yield Clown-grade Cream Pie Crate"
cost = 6000
contains = list(/obj/item/weapon/storage/backpack/dufflebag/clown/cream_pie)
crate_name = "party equipment crate"
contraband = TRUE
access = access_theatre
/datum/supply_pack/organic/monkey
name = "Monkey Crate"
cost = 2000
@@ -1198,7 +1206,9 @@
/obj/item/weapon/folder/red,
/obj/item/weapon/folder/yellow,
/obj/item/weapon/clipboard,
/obj/item/weapon/clipboard)
/obj/item/weapon/clipboard,
/obj/item/weapon/stamp,
/obj/item/weapon/stamp/denied)
crate_name = "bureaucracy crate"
/datum/supply_pack/misc/toner