Merge branch 'master' into tgui-medical

This commit is contained in:
mochi
2020-09-15 12:46:30 +02:00
532 changed files with 13408 additions and 4181 deletions
@@ -166,7 +166,3 @@
/datum/gear/hat/flowerpin
display_name = "hair flower"
path = /obj/item/clothing/head/hairflower
/datum/gear/hat/kitty
display_name = "kitty headband"
path = /obj/item/clothing/head/kitty