From ac93d0e6cda33ee88280fbe7541c04d3af444258 Mon Sep 17 00:00:00 2001 From: Verkister Date: Fri, 29 Jan 2021 20:03:31 +0200 Subject: [PATCH] Fixes the setup button --- code/_helpers/global_lists_vr.dm | 31 +++++++++++++++++++ .../client/preference_setup/vore/03_egg.dm | 6 ++-- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 6af71afacfb..7a49e8b3875 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -107,6 +107,37 @@ var/global/list/fancy_release_sounds = list( "None" = null ) +var/global/list/global_vore_egg_types = list( + "Unathi", + "Tajara", + "Akula", + "Skrell", + "Sergal", + "Nevrean", + "Human", + "Slime", + "Egg", + "Xenochimera", + "Xenomorph", + "Chocolate", + "Boney", + "Slime glob", + "Chicken", + "Synthetic", + "Cooking error", + "Escape pod", + "Web cocoon", + "Bug cocoon", + "Rock", + "Yellow", + "Blue", + "Green", + "Orange", + "Purple", + "Red", + "Rainbow", + "Spotted pink") + var/global/list/tf_vore_egg_types = list( "Unathi" = /obj/item/weapon/storage/vore_egg/unathi, "Tajara" = /obj/item/weapon/storage/vore_egg/tajaran, diff --git a/code/modules/client/preference_setup/vore/03_egg.dm b/code/modules/client/preference_setup/vore/03_egg.dm index b01cc1c26e6..6c090478d5e 100644 --- a/code/modules/client/preference_setup/vore/03_egg.dm +++ b/code/modules/client/preference_setup/vore/03_egg.dm @@ -14,7 +14,7 @@ S["vore_egg_type"] << pref.vore_egg_type /datum/category_item/player_setup_item/vore/egg/sanitize_character() - pref.vore_egg_type = sanitize_inlist(pref.vore_egg_type, tf_vore_egg_types, initial(pref.vore_egg_type)) + pref.vore_egg_type = sanitize_inlist(pref.vore_egg_type, global_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.vore_egg_type = pref.vore_egg_type @@ -28,10 +28,10 @@ return TOPIC_NOACTION else if(href_list["vore_egg_type"]) - var/list/vore_egg_types = tf_vore_egg_types + 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.vore_egg_type = vore_egg_types[selection] + pref.vore_egg_type = selection return TOPIC_REFRESH else return