Merge branch 'master' into DRAGONMECH

This commit is contained in:
Navier
2020-07-19 02:42:02 -04:00
committed by GitHub
88 changed files with 3924 additions and 1729 deletions
@@ -101,4 +101,9 @@
/datum/gear/santahatg
name = "Green Santa Hat"
category = SLOT_HEAD
path = /obj/item/clothing/head/christmashatg
path = /obj/item/clothing/head/christmashatg
/datum/gear/pharaohmhat
name = "Pharaoh Hat"
category = SLOT_HEAD
path = /obj/item/clothing/head/pharaoh