Conflict resolution again

This commit is contained in:
KasparoVy
2016-08-19 01:08:08 -04:00
73 changed files with 667 additions and 836 deletions
@@ -1985,8 +1985,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
character.age = age
character.b_type = b_type
character.change_eye_color(r_eyes, g_eyes, b_eyes)
//Head-specific
var/obj/item/organ/external/head/H = character.get_organ("head")
@@ -2115,6 +2113,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
message_admins("[key_name_admin(character)] has spawned with their gender as plural or neuter. Please notify coders.")
character.change_gender(MALE)
character.change_eye_color(r_eyes, g_eyes, b_eyes)
character.dna.ready_dna(character, flatten_SE = 0)
character.sync_organ_dna(assimilate=1)
character.UpdateAppearance()