Merge remote-tracking branch 'upstream/master'

This commit is contained in:
TheFurryFeline
2019-11-06 12:00:32 -05:00
20 changed files with 3369 additions and 3023 deletions
@@ -271,6 +271,12 @@
display_name = "rabbit ears"
path = /obj/item/clothing/head/rabbitears
//CHOMPStation Addition Start - TFF 17/10/19 - Add Nurse Hat for one point, no job lock
/datum/gear/head/nurse_hat
display_name = "hat, nurse"
path = /obj/item/clothing/head/nursehat
//CHOMPStation Addition End
/datum/gear/head/beanie
display_name = "beanie"
path = /obj/item/clothing/head/beanie