Merge branch 'master' into fuckatmos

This commit is contained in:
deathride58
2019-06-07 04:38:47 -04:00
committed by GitHub
201 changed files with 4784 additions and 1787 deletions
@@ -959,6 +959,13 @@
name = "Eevee"
icon_state = "eevee"
/datum/sprite_accessory/mam_ears/elf
name = "Elf"
icon_state = "elf"
color_src = MUTCOLORS3
/datum/sprite_accessory/mam_ears/elephant
name = "Elephant"
icon_state = "elephant"
@@ -1497,6 +1504,12 @@ datum/sprite_accessory/mam_tails/insect
icon_state = "cow"
taur_mode = HOOF_TAURIC
/datum/sprite_accessory/taur/deer
name = "Deer"
icon_state = "deer"
taur_mode = HOOF_TAURIC
color_src = MUTCOLORS
/datum/sprite_accessory/taur/drake
name = "Drake"
icon_state = "drake"