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.
2017-06-26 05:57:59 -05:00
parent 5587f72510 3f92d14933
commit b4473bedb2
8 changed files with 66 additions and 4 deletions
@@ -879,3 +879,11 @@
 /obj/item/weapon/storage/box/silver_sulf/PopulateContents()
 	for(var/i in 1 to 7)
 		new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src)
+
+
+/obj/item/weapon/storage/box/fountainpens
+	name = "box of fountain pens"
+
+/obj/item/weapon/storage/box/fountainpens/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/weapon/pen/fountain(src)