Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop

This commit is contained in:
Poojawa
2018-03-20 23:00:12 -05:00
1355 changed files with 3112 additions and 2226 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/clothing/head
name = "head"
name = BODY_ZONE_HEAD
icon = 'icons/obj/clothing/hats.dmi'
icon_state = "top_hat"
item_state = "that"