Merge remote-tracking branch 'upstream/master' into heretics

This commit is contained in:
kiwedespars
2020-08-10 21:05:56 -07:00
7 changed files with 33 additions and 27 deletions
@@ -791,6 +791,10 @@
name = "Volaju"
icon_state = "hair_volaju"
/datum/sprite_accessory/hair/volajupompless
name = "Volaju (Alt)"
icon_state = "hair_volajupompless"
/datum/sprite_accessory/hair/wisp
name = "Wisp"
icon_state = "hair_wisp"