Conflict fix.

This commit is contained in:
Segrain
2013-10-21 04:37:28 +03:00
13 changed files with 426 additions and 404 deletions

View File

@@ -521,7 +521,6 @@
name = "Short Vox Quills"
icon_state = "vox_shortquills"
species_allowed = list("Vox")
do_colouration = 0
/datum/sprite_accessory/facial_hair