From 22c9bd416e9e0624fdfc639c63b65758b3cfc269 Mon Sep 17 00:00:00 2001 From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com> Date: Mon, 25 Feb 2019 12:03:07 +0100 Subject: [PATCH] changes vore eggtype to not mess with mob eggtype --- .../client/preference_setup/vore/03_egg.dm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/code/modules/client/preference_setup/vore/03_egg.dm b/code/modules/client/preference_setup/vore/03_egg.dm index 2567ca5021c..648b31b3995 100644 --- a/code/modules/client/preference_setup/vore/03_egg.dm +++ b/code/modules/client/preference_setup/vore/03_egg.dm @@ -12,7 +12,7 @@ var/XENOMORPH_EGG = "Xenomorph" // Define a place to save appearance in character setup /datum/preferences - var/egg_type = "Egg" //The egg type they have. + var/vore_egg_type = "Egg" //The egg type they have. // Definition of the stuff for the egg type. /datum/category_item/player_setup_item/vore/egg @@ -20,31 +20,31 @@ var/XENOMORPH_EGG = "Xenomorph" sort_order = 3 /datum/category_item/player_setup_item/vore/egg/load_character(var/savefile/S) - S["egg_type"] >> pref.egg_type + S["vore_egg_type"] >> pref.vore_egg_type /datum/category_item/player_setup_item/vore/egg/save_character(var/savefile/S) - S["egg_type"] << pref.egg_type + S["vore_egg_type"] << pref.vore_egg_type /datum/category_item/player_setup_item/vore/egg/sanitize_character() - var/valid_egg_types = global_egg_types - pref.egg_type = sanitize_inlist(pref.egg_type, valid_egg_types, initial(pref.egg_type)) + var/valid_vore_egg_types = global_vore_egg_types + pref.vore_egg_type = sanitize_inlist(pref.vore_egg_type, valid_vore_egg_types, initial(pref.vore_egg_type)) /datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character) - character.egg_type = pref.egg_type + character.vore_egg_type = pref.vore_egg_type /datum/category_item/player_setup_item/vore/egg/content(var/mob/user) . += "
" - . += " Egg Type: [pref.egg_type]
" + . += " Egg Type: [pref.vore_egg_type]
" /datum/category_item/player_setup_item/vore/egg/OnTopic(var/href, var/list/href_list, var/mob/user) if(!CanUseTopic(user)) return TOPIC_NOACTION - else if(href_list["egg_type"]) - var/list/egg_types = global_egg_types - var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.egg_type) as null|anything in egg_types + else if(href_list["vore_egg_type"]) + var/list/vore_egg_types = global_vore_egg_types + var/selection = input(user, "Choose your character's egg type:", "Character Preference", pref.vore_egg_type) as null|anything in vore_egg_types if(selection) - pref.egg_type = egg_types[selection] + pref.vore_egg_type = vore_egg_types[selection] return TOPIC_REFRESH else - return \ No newline at end of file + return