Merge remote-tracking branch 'upstream/master' into dev-freeze

This commit is contained in:
PsiOmega
2015-03-01 21:13:38 +01:00
2 changed files with 187 additions and 187 deletions

View File

@@ -678,7 +678,7 @@
taj_sideburns
name = "Tajara Sideburns"
icon_state = "facial_mutton"
icon_state = "facial_sideburns"
species_allowed = list("Tajara")
taj_mutton