Merge pull request #9741 from Baystation12/master

Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-06-08 09:56:24 +02:00
@@ -136,7 +136,6 @@
name = "Pompadour"
icon_state = "hair_pompadour"
gender = MALE
species_allowed = list("Human","Unathi")
quiff
name = "Quiff"
@@ -159,7 +158,6 @@
name = "Beehive"
icon_state = "hair_beehive"
gender = FEMALE
species_allowed = list("Human","Unathi")
beehive2
name = "Beehive 2"