Merge branch 'master' into assu

2019-10-28 19:02:48 +03:00
parent 203509b405 935af3c21f
commit ad00e6b36a
81 changed files with 1403 additions and 2305 deletions
@@ -452,3 +452,9 @@ datum/gear/darksabresheath
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/flight
 	ckeywhitelist = list("maxlynchy")
+
+/datum/gear/onionneck
+	name = "Onion Necklace"
+	category = SLOT_NECK
+	path = /obj/item/clothing/neck/necklace/onion
+	ckeywhitelist = list("cdrcross")