Fix conflicts.

This commit is contained in:
davipatury
2017-03-08 12:57:45 -03:00
122 changed files with 1071 additions and 1027 deletions
@@ -223,6 +223,7 @@
data["specimen"] = owner.species.name
data["gender"] = owner.gender
data["has_gender"] = owner.species.has_gender
data["change_race"] = can_change(APPEARANCE_RACE)
if(data["change_race"])
var/species[0]