From a428559a30125d92664dbc8806b8914f2e0aab30 Mon Sep 17 00:00:00 2001 From: erwgd Date: Sat, 26 Nov 2016 00:09:06 +0000 Subject: [PATCH] plasmaman/random_name gets gender parameter Moved Rand Roman from random plasmaman name proc to plasmaman_name proc --- code/__HELPERS/mobs.dm | 2 +- code/__HELPERS/names.dm | 2 +- code/modules/mob/living/carbon/human/species_types.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index d2a1d3e67f7..960d07cd04d 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -109,7 +109,7 @@ /proc/random_unique_plasmaman_name(attempts_to_find_unique_name=10) for(var/i=1, i<=attempts_to_find_unique_name, i++) - . = capitalize(plasmaman_name()) + " " + "\Roman[rand(1,99)]" + . = capitalize(plasmaman_name()) if(i != attempts_to_find_unique_name && !findname(.)) break diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 9b28e1f3359..6d29be2bf97 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -5,7 +5,7 @@ return "[pick(lizard_names_female)]-[pick(lizard_names_female)]" /proc/plasmaman_name() - return "[pick(plasmaman_names)]" + return "[pick(plasmaman_names)] \Roman[rand(1,99)]" var/church_name = null /proc/church_name() diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 6b7cfae7478..f7a7cb1dc12 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -802,7 +802,7 @@ var/global/image/plasmaman_on_fire = image("icon"='icons/mob/OnFire.dmi', "icon_ return 0 return ..() -/datum/species/plasmaman/random_name(unique,lastname) +/datum/species/plasmaman/random_name(gender,unique,lastname) if(unique) return random_unique_plasmaman_name()