Merge branch 'master' into upstream-merge-29651

This commit is contained in:
LetterJay
2017-08-14 19:37:09 -05:00
committed by GitHub
235 changed files with 3377 additions and 1056 deletions
-2
View File
@@ -1,5 +1,3 @@
/obj/item/clothing/head/centhat
name = "\improper Centcom hat"
icon_state = "centcom"