From bb8af2785ee5ecaa3ce4ecdd09f5139fd401f831 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Wed, 30 Dec 2015 22:23:33 -0600 Subject: [PATCH] Guardian Naming --- .../mob/living/simple_animal/guardian/guardian.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index c4e5c7efb8c..11f93005d1f 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -638,16 +638,17 @@ user.verbs += /mob/living/proc/guardian_comm user.verbs += /mob/living/proc/guardian_recall user.verbs += /mob/living/proc/guardian_reset + var/picked_name = pick("Aries", "Leo", "Sagittarius", "Taurus", "Virgo", "Capricorn", "Gemini", "Libra", "Aquarius", "Cancer", "Scorpio", "Pisces") switch (theme) if("magic") - G.name = "[mob_name] [capitalize(picked_color)]" + G.name = "[picked_name] [capitalize(picked_color)]" G.color = color2hex(picked_color) - G.real_name = "[mob_name] [capitalize(picked_color)]" + G.real_name = "[picked_name] [capitalize(picked_color)]" user << "[G.magic_fluff_string]." if("tech") var/colour = pick("orange", "neon", "pink", "red", "blue", "green") - G.name = "[mob_name] [capitalize(colour)]" - G.real_name = "[mob_name] [capitalize(colour)]" + G.name = "[picked_name] [capitalize(colour)]" + G.real_name = "[picked_name] [capitalize(colour)]" G.icon_living = "parasite[colour]" G.icon_state = "parasite[colour]" G.icon_dead = "parasite[colour]"