Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382

[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
This commit is contained in:
LetterJay
2017-06-26 05:57:59 -05:00
committed by GitHub
8 changed files with 66 additions and 4 deletions
+7
View File
@@ -1423,6 +1423,7 @@
/obj/item/weapon/pen/fourcolor,
/obj/item/weapon/pen/fourcolor,
/obj/item/weapon/pen,
/obj/item/weapon/pen/fountain,
/obj/item/weapon/pen/blue,
/obj/item/weapon/pen/red,
/obj/item/weapon/folder/blue,
@@ -1434,6 +1435,12 @@
/obj/item/weapon/stamp/denied)
crate_name = "bureaucracy crate"
/datum/supply_pack/misc/fountainpens
name = "Calligraphy Crate"
cost = 700
contains = list(/obj/item/weapon/storage/box/fountainpens)
crate_type = /obj/structure/closet/crate/wooden
/datum/supply_pack/misc/toner
name = "Toner Crate"
cost = 1000