From 7d6f22ae2e15d3e540981749db3585c2fa038b71 Mon Sep 17 00:00:00 2001 From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com> Date: Mon, 25 Feb 2019 11:13:40 +0100 Subject: [PATCH 1/5] gives back egg_type to nurse spider --- .../living/simple_mob/subtypes/animal/giant_spider/nurse.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm index b159b6dd87d..2215bf9cfa4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/nurse.dm @@ -23,7 +23,7 @@ var/fed = 0 // Counter for how many egg laying 'charges' the spider has. var/egg_inject_chance = 25 // One in four chance to get eggs. - egg_type = /obj/effect/spider/eggcluster/small //VORESTATION AI TEMPORARY EDIT + var/egg_type = /obj/effect/spider/eggcluster/small var/web_type = /obj/effect/spider/stickyweb/dark @@ -227,4 +227,4 @@ if(istype(the_target, /obj)) var/obj/O = the_target if(!O.anchored) - return TRUE \ No newline at end of file + return TRUE From f1e9a1c7b822fdd96af7567407331146ee7a4c3b Mon Sep 17 00:00:00 2001 From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com> Date: Mon, 25 Feb 2019 11:57:27 +0100 Subject: [PATCH 2/5] Changes vore eggtype to not mess with simple_mobs --- code/modules/vore/eating/living_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index cb0b64ba135..772d008dd0a 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -9,7 +9,7 @@ var/weight = 137 // Weight for mobs for weightgain system var/weight_gain = 1 // How fast you gain weight var/weight_loss = 0.5 // How fast you lose weight - var/egg_type = "egg" // Default egg type. + var/vore_egg_type = "egg" // Default egg type. var/feral = 0 // How feral the mob is, if at all. Does nothing for non xenochimera at the moment. var/reviving = 0 // Only used for creatures that have the xenochimera regen ability, so far. var/metabolism = 0.0015 From 628ae84c15b0a0cf6f4abe4b36bfe6288b2b003b Mon Sep 17 00:00:00 2001 From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com> Date: Mon, 25 Feb 2019 11:58:14 +0100 Subject: [PATCH 3/5] Changes eggtype to not mess with simple_mobs --- code/modules/vore/eating/transforming_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/vore/eating/transforming_vr.dm b/code/modules/vore/eating/transforming_vr.dm index b978bf8963c..a3ad00ab7a8 100644 --- a/code/modules/vore/eating/transforming_vr.dm +++ b/code/modules/vore/eating/transforming_vr.dm @@ -252,13 +252,13 @@ var/egg_path = /obj/structure/closet/secure_closet/egg var/egg_name = "odd egg" - if(O.egg_type in tf_egg_types) - egg_path = tf_egg_types[O.egg_type] - egg_name = "[O.egg_type] egg" + if(O.vore_egg_type in tf_vore_egg_types) + egg_path = tf_vore_egg_types[O.vore_egg_type] + egg_name = "[O.vore_egg_type] egg" var/obj/structure/closet/secure_closet/egg/egg = new egg_path(src) M.forceMove(egg) egg.name = egg_name if(message) to_chat(M, "You lose sensation of your body, feeling only the warmth around you as you're encased in an egg.") - to_chat(O, "Your body shifts as you encase [M] in an egg.") \ No newline at end of file + to_chat(O, "Your body shifts as you encase [M] in an egg.") From f982ffa53cf53c0c15b287ad5b9e57bf6ac8a493 Mon Sep 17 00:00:00 2001 From: Sebbe9123 <31856346+Sebbe9123@users.noreply.github.com> Date: Mon, 25 Feb 2019 11:59:24 +0100 Subject: [PATCH 4/5] changes eggtypes to not mess with mob eggtypes. --- code/_helpers/global_lists_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 09911f47617..a8ea0821244 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -94,7 +94,7 @@ var/global/list/struggle_sounds = list( "Squish4" = 'sound/vore/squish4.ogg') -var/global/list/global_egg_types = list( +var/global/list/global_vore_egg_types = list( "Unathi" = UNATHI_EGG, "Tajaran" = TAJARAN_EGG, "Akula" = AKULA_EGG, @@ -107,7 +107,7 @@ var/global/list/global_egg_types = list( "Xenochimera" = XENOCHIMERA_EGG, "Xenomorph" = XENOMORPH_EGG) -var/global/list/tf_egg_types = list( +var/global/list/tf_vore_egg_types = list( "Unathi" = /obj/structure/closet/secure_closet/egg/unathi, "Tajara" = /obj/structure/closet/secure_closet/egg/tajaran, "Akula" = /obj/structure/closet/secure_closet/egg/shark, 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 5/5] 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