From a949c80feea2ded4191c5e5a9e9c7d64200466d5 Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Mon, 6 Jul 2015 21:47:30 -0600 Subject: [PATCH] Fixes Race Swap Runtime - Fixes Race Swap Runtime - Staff of change now assigns lizard name when appropriate --- code/modules/events/wizard/race.dm | 3 +-- code/modules/projectiles/projectile/magic.dm | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/events/wizard/race.dm b/code/modules/events/wizard/race.dm index 28691f84a10..54c3cbf6877 100644 --- a/code/modules/events/wizard/race.dm +++ b/code/modules/events/wizard/race.dm @@ -22,9 +22,8 @@ for(var/mob/living/carbon/human/H in mob_list) //yes, even the dead if(H.dna) - if(new_species.id != H.dna.species.id) //Change their name if their species changes - H.real_name = new_species.random_name(H.gender,1) hardset_dna(H, null, null, null, null, new_species) + H.real_name = new_species.random_name(H.gender,1) H.regenerate_icons() H << "You feel somehow... different?" if(!all_the_same) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index ec2bbcdae6c..7d1f44bc60b 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -232,6 +232,7 @@ if(!S.dangerous_existence) all_species += speciestype hardset_dna(H, null, null, null, null, pick(all_species)) + H.dna.species.random_name(H.gender,1) H.update_icons() else return