Merge branch 'master' into cum

This commit is contained in:
Timothy Teakettle
2020-08-11 18:30:30 +01:00
committed by GitHub
86 changed files with 8896 additions and 306 deletions
@@ -192,7 +192,13 @@
extra = TRUE
extra_color_src = MUTCOLORS3
/datum/sprite_accessory/snouts/mam_snouts/lcanid
/datum/sprite_accessory/mam_snouts/skulldog
name = "Skulldog"
icon_state = "skulldog"
extra = TRUE
extra_color_src = MATRIXED
/datum/sprite_accessory/mam_snouts/lcanid
name = "Mammal, Long"
icon_state = "lcanid"