Merge branch 'master' into crazycatgirls

2018-02-14 12:33:45 -05:00
parent 440e39ed68 a13d41a675
commit 56e81d3a4f
317 changed files with 3809 additions and 7976 deletions
@@ -180,7 +180,7 @@
 	category = slot_hands
 	path = /obj/item/storage/backpack/satchel/carrot
 	ckeywhitelist = list("improvedname")
-
+  
 /datum/gear/naomisweater
 	name = "worn black sweater"
 	category = slot_w_uniform
@@ -191,4 +191,10 @@
 	name = "worn pet collar"
 	category = slot_neck
 	path = /obj/item/clothing/neck/petcollar/naomi
-	ckeywhitelist = list("technicalmagi")
+	ckeywhitelist = list("technicalmagi")
+  
+/datum/gear/gladiator
+    name = "Gladiator Armor"
+    category = slot_wear_suit
+    path = /obj/item/clothing/under/gladiator
+    ckeywhitelist = list("aroche")