Merge branch 'master' into kitsundevilwings

2018-06-12 07:57:15 +00:00
parent 8169c9256f ecd200a5bc
commit 5189199b50
201 changed files with 1443 additions and 1532 deletions
@@ -290,6 +290,12 @@ datum/gear/darksabresheath
 	path = 	/obj/item/custom/leechjar
 	ckeywhitelist = list("sgtryder")

+/datum/gear/darkarmor
+	name = "Dark Armor"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/clothing/suit/armor/vest/darkcarapace
+	ckeywhitelist = list("inferno707")
+
 /datum/gear/devilwings
 	name = "Strange Wings"
 	category = SLOT_NECK
@@ -48,6 +48,12 @@
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/that

+/datum/gear/flakhelm
+	name = "Flak Helmet"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/flakhelm
+	cost = 2
+
 //trek fancy Hats!
 /datum/gear/trekcap
 	name = "Federation Officer's Cap"
@@ -74,6 +74,12 @@
 	category = SLOT_WEAR_SUIT
 	path = /obj/item/clothing/suit/ianshirt

+/datum/gear/flakjack
+	name = "Flak Jacket"
+	category = SLOT_WEAR_SUIT
+	path = /obj/item/clothing/suit/flakjack
+	cost = 2
+
 /datum/gear/trekds9_coat
 	name = "DS9 Overcoat (use uniform)"
 	category = SLOT_WEAR_SUIT