Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00
parent 467819beba b3e5513185
commit 6a575f19d1
661 changed files with 12019 additions and 10559 deletions
@@ -7,7 +7,7 @@
 	subspace_transmission = TRUE
 	canhear_range = 0 // can't hear headsets from very far away

-	slot_flags = SLOT_EARS
+	slot_flags = ITEM_SLOT_EARS
 	var/obj/item/encryptionkey/keyslot2 = null
 	dog_fashion = null