From e7edc8da0e090318d4e3a8d58ef8432092cba366 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sat, 2 Jul 2016 16:46:14 -0400 Subject: [PATCH 1/7] Adds xenomorph player egg sprites. Sprited by: Swat43 --- icons/obj/egg_vr.dmi | Bin 3589 -> 6235 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/egg_vr.dmi b/icons/obj/egg_vr.dmi index 12b7691765cb747657b7b2dc02e23ff41c3311b4..c54ac62b10bb19e90955637eff02aed6d1efc780 100644 GIT binary patch literal 6235 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 P2eLe7YhGn~I{tqE4{8Wh From 13d75315bbc5846960d79ca39f66eb9e1258d539 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sat, 2 Jul 2016 20:52:07 -0400 Subject: [PATCH 2/7] Adds in selectable egg TF, reverts #382, a few tf fixes. --- code/_helpers/global_lists_vr.dm | 12 + .../crates_lockers/closets/egg_vr.dm | 8 + .../client/preference_setup/vore/03_egg.dm | 49 +++ .../living/carbon/human/species/species_vr.dm | 5 - .../species/station/station_special_vr.dm | 1 - .../human/species/station/station_vr.dm | 11 - code/modules/vore/eating/bellymodes_vr.dm | 310 ++++++++++-------- code/modules/vore/eating/living_vr.dm | 1 + vorestation.dme | 1 + 9 files changed, 250 insertions(+), 148 deletions(-) create mode 100644 code/modules/client/preference_setup/vore/03_egg.dm diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 3222e52c2d..edbc267079 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -79,6 +79,18 @@ var/global/list/struggle_sounds = list( "Squish4" = 'sound/vore/squish4.ogg') +var/global/list/global_egg_types = list( + "Unathi" = UNATHI_EGG, + "Tajaran" = TAJARAN_EGG, + "Akula" = AKULA_EGG, + "Skrell" = SKRELL_EGG, + "Sergal" = SERGAL_EGG, + "Human" = HUMAN_EGG, + "Slime" = SLIME_EGG, + "Egg" = EGG_EGG, + "Xenochimera" = XENOCHIMERA_EGG, + "Xenomorph" = XENOMORPH_EGG) + /hook/startup/proc/init_vore_datum_ref_lists() var/paths diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm index 9e54eea395..aeed53a996 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -90,6 +90,14 @@ icon_closed = "egg_scree" icon_opened = "egg_scree_open" +/obj/structure/closet/secure_closet/egg/xenomorph + name = "Xenomorph egg" + desc = "Some type of pitch black egg. It has a slimy exterior coating." + icon_state = "egg_xenomorph" + icon_closed = "egg_xenomorph" + icon_opened = "egg_xenomorph_open" + + //In case anyone stumbles upon this, MAJOR thanks to Vorrakul and Nightwing. Without them, this wouldn't be a reality. //Also, huge thanks for Ace for helping me through with this and getting me to work at my full potential instead of tapping out early, along with coding advice. //Additionally, huge thanks to the entire Virgo community for giving suggestions about egg TF, the sprites, descriptions, etc etc. Cheers to everyone. Also, you should totally eat Cadence. ~CK diff --git a/code/modules/client/preference_setup/vore/03_egg.dm b/code/modules/client/preference_setup/vore/03_egg.dm new file mode 100644 index 0000000000..51d36960bd --- /dev/null +++ b/code/modules/client/preference_setup/vore/03_egg.dm @@ -0,0 +1,49 @@ +var/UNATHI_EGG = "Unathi" +var/TAJARAN_EGG = "Tajaran" +var/AKULA_EGG = "Akula" +var/SKRELL_EGG = "Skrell" +var/SERGAL_EGG = "Sergal" +var/HUMAN_EGG = "Human" +var/SLIME_EGG = "Slime" +var/EGG_EGG = "Egg" +var/XENOCHIMERA_EGG = "Xenochimera" +var/XENOMORPH_EGG = "Xenomorph" + +// Define a place to save appearance in character setup +/datum/preferences + var/egg_type = "Egg" //The egg type they have. + +// Definition of the stuff for the egg type. +/datum/category_item/player_setup_item/vore/egg + name = "Egg appearance." + sort_order = 3 + +/datum/category_item/player_setup_item/vore/egg/load_character(var/savefile/S) + S["egg_type"] >> pref.egg_type + +/datum/category_item/player_setup_item/vore/egg/save_character(var/savefile/S) + S["egg_type"] << pref.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)) + +/datum/category_item/player_setup_item/vore/egg/copy_to_mob(var/mob/living/carbon/human/character) + character.egg_type = pref.egg_type + +/datum/category_item/player_setup_item/vore/egg/content(var/mob/user) + . += "
" + . += " Egg Type: [pref.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 + if(selection) + pref.egg_type = egg_types[selection] + return TOPIC_REFRESH + else + return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index 6e1e1f04a5..0cb198842c 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -7,11 +7,6 @@ //tails only, since tails would wag when dead if you used this var/icobase_tail = 0 - - //This is used for egg TF. It decides what type of egg the person will lay when they TF. - //Default to the normal and bland "egg" just in case a race isn't defined. - var/egg_type = "egg" - //This is so that if a race is using the chimera revive they can't use it more than once. //Shouldn't really be seen in play too often, but it's case an admin event happens and they give a non chimera the chimera revive. Only one person can use the chimera revive at a time per race. var/reviving = 0 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index db7ba4d6fe..296b784c88 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -15,7 +15,6 @@ //color_mult = 1 //It seemed to work fine in testing, but I've been informed it's unneeded. tail = "tail" //Scree's tail. Can be disabled in the vore tab by choosing "hide species specific tail sprite" icobase_tail = 1 - egg_type = "Scree" //Scree egg. inherent_verbs = list(/mob/living/carbon/human/proc/begin_reconstitute_form) min_age = 17 diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 59fd8d9ee1..4bd531d30b 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -15,7 +15,6 @@ secondary_langs = list("Sagaru") name_language = "Sagaru" color_mult = 1 - egg_type = "Sergal" min_age = 17 max_age = 80 @@ -62,7 +61,6 @@ secondary_langs = list("Skrellian") name_language = "Skrellian" color_mult = 1 - egg_type = "Akula" min_age = 17 max_age = 80 @@ -102,7 +100,6 @@ secondary_langs = list("Birdsong") name_language = "Birdsong" color_mult = 1 - egg_type = "Nevrean" min_age = 17 max_age = 80 @@ -137,7 +134,6 @@ num_alternate_languages = 2 secondary_langs = list("Siik'tajr") name_language = "Siik'tajr" - egg_type = "Tajaran" //Placeholder. min_age = 17 max_age = 80 @@ -182,7 +178,6 @@ num_alternate_languages = 2 secondary_langs = list("Siik'tajr") name_language = "Siik'tajr" - egg_type = "Tajaran" //Placeholder. min_age = 17 max_age = 80 @@ -234,7 +229,6 @@ gluttonous = 1 num_alternate_languages = 2 color_mult = 1 - egg_type = "Tajaran" //also placeholder. because I see other things using it blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ @@ -269,15 +263,12 @@ // egg_type = "Vulpkanin" /datum/species/unathi - egg_type = "Unathi" spawn_flags = SPECIES_CAN_JOIN //Species_can_join is the only spawn flag all the races get, so that none of them will be whitelist only if whitelist is enabled. /datum/species/tajaran - egg_type = "Tajaran" spawn_flags = SPECIES_CAN_JOIN /datum/species/skrell - egg_type = "Skrell" spawn_flags = SPECIES_CAN_JOIN /datum/species/diona @@ -287,8 +278,6 @@ spawn_flags = SPECIES_CAN_JOIN /datum/species/shapeshifter/promethean - egg_type = "Slime" spawn_flags = SPECIES_CAN_JOIN /datum/species/human - egg_type = "Human" diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index fb8c32486d..4e14582dcb 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -325,7 +325,6 @@ continue var/mob/living/carbon/human/O = owner - var/turf/T = get_turf(O) if (O.custom_species) var/defined_species = O.custom_species @@ -351,64 +350,70 @@ P.update_hair() P.update_body() P.update_tail_showing() - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." for(var/mob/living/M in internal_contents) internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + J.name = "[defined_species] egg" + J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." @@ -436,55 +441,57 @@ P.update_hair() P.update_body() P.update_tail_showing() - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "Unathi egg" internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "Tajaran egg" internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "Akula egg" internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "Skrell egg" internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "Segal egg" internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "Human egg" internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "Slime egg" internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Egg" internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) P.forceMove(J) - J.name = "Scree egg" - J.desc = "This egg has a very unique look to it." internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Odd egg" //Something went wrong. Since the default is "egg", they shouldn't see this. internal_contents -= P @@ -497,7 +504,6 @@ continue var/mob/living/carbon/human/O = owner - var/turf/T = get_turf(O) if (O.custom_species) var/defined_species = O.custom_species @@ -515,63 +521,69 @@ owner << "You tingle as you make noticeable changes to your captive's body." P.update_hair() P.update_body() - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + J.name = "[defined_species] egg" + J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." @@ -592,55 +604,59 @@ owner << "You tingle as you make noticeable changes to your captive's body." P.update_hair() P.update_body() - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "Unathi egg" internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "Tajaran egg" internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "Akula egg" internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "Skrell egg" internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "Segal egg" internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "Human egg" internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "Slime egg" internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Egg" internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + J.name = "Xenochimera egg" P.forceMove(J) - J.name = "Scree egg" - J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) + P.forceMove(J) + J.name = "Xenomorph egg" internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Odd egg" //Something went wrong. Since the default is "egg", they shouldn't see this. internal_contents -= P @@ -653,7 +669,6 @@ continue var/mob/living/carbon/human/O = owner - var/turf/T = get_turf(O) if (O.custom_species) var/defined_species = O.custom_species @@ -672,63 +687,69 @@ owner << "Your body feels strange as you alter your captive's gender." P.update_hair() P.update_body() - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + J.name = "[defined_species] egg" + J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." @@ -747,55 +768,59 @@ P.gender = MALE P << "Your body feels very strange..." owner << "You feel strange as you alter your captive's gender." - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "Unathi egg" internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "Tajaran egg" internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "Akula egg" internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "Skrell egg" internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "Segal egg" internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "Human egg" internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "Slime egg" internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Egg" internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) P.forceMove(J) J.name = "Scree egg" - J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) + P.forceMove(J) + J.name = "Xenomorph egg" internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Odd egg" //Something went wrong. Since the default is "egg", they shouldn't see this. internal_contents -= P @@ -808,7 +833,6 @@ continue var/mob/living/carbon/human/O = owner - var/turf/T = get_turf(O) if (O.custom_species) @@ -828,63 +852,69 @@ owner << "You feels strange as you alter your captive's gender." P.update_hair() P.update_body() - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + J.name = "[defined_species] egg" + J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." @@ -905,55 +935,57 @@ P << "Your body feels very strange..." P.update_hair() P.update_body() - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "Unathi egg" internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "Tajaran egg" internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "Akula egg" internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "Skrell egg" internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "Segal egg" internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "Human egg" internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "Slime egg" internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Egg" internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) P.forceMove(J) - J.name = "Scree egg" - J.desc = "This egg has a very unique look to it." internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Odd egg" //Something went wrong. Since the default is "egg", they shouldn't see this. internal_contents -= P @@ -967,64 +999,75 @@ continue var/mob/living/carbon/human/O = owner - var/turf/T = get_turf(O) if (O.custom_species) var/defined_species = O.custom_species P << "You lose sensation of your body, feeling only the warmth around you as you're encased in an egg. " owner << "Your body shifts as you encase [P] in an egg." - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." for(var/mob/living/M in internal_contents) internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) + P.forceMove(J) + J.name = "[defined_species] egg" + J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) + P.forceMove(J) + J.name = "[defined_species] egg" + J.desc = "This egg has a very unique look to it." + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "[defined_species] egg" J.desc = "This egg has a very unique look to it." @@ -1032,54 +1075,59 @@ else P << "You lose sensation of your body, feeling only the warmth around you as you're encased in an egg. " owner << "Your body shifts as you encase [P] in an egg." - switch(O.species.egg_type) + switch(O.egg_type) if("Unathi") - var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(T.loc) + var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) P.forceMove(J) J.name = "Unathi egg" internal_contents -= P if("Tajaran") - var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(T.loc) + var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc) P.forceMove(J) J.name = "Tajaran egg" internal_contents -= P if("Akula") - var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(T.loc) + var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc) P.forceMove(J) J.name = "Akula egg" internal_contents -= P if("Skrell") - var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(T.loc) + var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc) P.forceMove(J) J.name = "Skrell egg" internal_contents -= P if("Sergal") - var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(T.loc) + var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc) P.forceMove(J) J.name = "Segal egg" internal_contents -= P if("Human") - var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(T.loc) + var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc) P.forceMove(J) J.name = "Human egg" internal_contents -= P if("Slime") - var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(T.loc) + var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc) P.forceMove(J) J.name = "Slime egg" internal_contents -= P if("Egg") - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Egg" internal_contents -= P - if("Scree") - var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(T.loc) + if("Xenochimera") + var/obj/structure/closet/secure_closet/egg/scree/J = new /obj/structure/closet/secure_closet/egg/scree(O.loc) P.forceMove(J) - J.name = "Scree egg" + J.name = "Xenochimera egg" + internal_contents -= P + if("Xenomorph") + var/obj/structure/closet/secure_closet/egg/xenomorph/J = new /obj/structure/closet/secure_closet/egg/xenomorph(O.loc) + P.forceMove(J) + J.name = "Xenomorph egg" internal_contents -= P else - var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(T.loc) + var/obj/structure/closet/secure_closet/egg/J = new /obj/structure/closet/secure_closet/egg(O.loc) P.forceMove(J) J.name = "Odd egg" //Something went wrong. Since the default is "egg", they shouldn't see this. internal_contents -= P diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index f8e5b9e0e9..3cdf97ad0c 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -7,6 +7,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. // // Hook for generic creation of stuff on new creatures diff --git a/vorestation.dme b/vorestation.dme index cf58888b1a..77d2e11f86 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1107,6 +1107,7 @@ #include "code\modules\client\preference_setup\skills\skills.dm" #include "code\modules\client\preference_setup\vore\01_ears.dm" #include "code\modules\client\preference_setup\vore\02_size.dm" +#include "code\modules\client\preference_setup\vore\03_egg.dm" #include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\clothing.dm" #include "code\modules\clothing\clothing_accessories.dm" From 3d35b13653d7ef548bc7b0efd9b31177f1453511 Mon Sep 17 00:00:00 2001 From: killer653 Date: Thu, 30 Jun 2016 09:32:12 -0400 Subject: [PATCH 3/7] Brings back the floorlength braid. --- code/modules/mob/new_player/sprite_accessories_vr.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index c23ed81484..a7b88c016e 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -32,6 +32,10 @@ icon_state = "serg_fairytail" species_allowed = list("Sergal") + braid + name = "Floorlength Braid" + icon_state = "hair_braid" //Trust me, it's better this way. + bald name = "Bald" icon_state = "bald" From 43a7f8bad2265b69d49526d013084135d19cd12c Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 3 Jul 2016 00:08:58 -0400 Subject: [PATCH 4/7] Fixes the sprites not updating after TF --- code/modules/vore/eating/bellymodes_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 4e14582dcb..2986fc0d3d 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -310,6 +310,7 @@ P.update_hair() P.update_body() P.update_tail_showing() + P.updateicon() if(O.nutrition > 0) O.nutrition -= 2 @@ -350,6 +351,7 @@ P.update_hair() P.update_body() P.update_tail_showing() + P.updateicon() switch(O.egg_type) if("Unathi") var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) @@ -441,6 +443,7 @@ P.update_hair() P.update_body() P.update_tail_showing() + P.updateicon() switch(O.egg_type) if("Unathi") var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc) From 4822804911f49617a71b0fa12dce1d705cb2733b Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 3 Jul 2016 19:00:55 -0400 Subject: [PATCH 5/7] Fixes conflicts --- .../human/species/station/station_vr.dm | 72 +++++++++---------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 4bd531d30b..c040089975 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -28,7 +28,7 @@ lifespan, but due to their lust for violence, only a handful have ever survived beyond the age of 80, such as the infamous and \ legendary General Rain Silves who is claimed to have lived to 5000." - primitive_form = "Farwa" //POLARISTODO - Add other monkeytypes + primitive_form = "Sergaling" spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -73,7 +73,7 @@ surviving in open air for long periods of time. However, Akula even today still require a high humidity environment to avoid drying out \ after a few days, which would make life on an arid world like Virgo-Prime nearly impossible if it were not for Skrellean technology to aid them." - primitive_form = "Farwa" //POLARISTODO - Add other monkeytypes + primitive_form = "Sobaka" spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -104,9 +104,13 @@ min_age = 17 max_age = 80 - blurb = "Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus. " + blurb = "Nevreans are a race of avian and dinosaur-like creatures living on Tal. They belong to a group of races that hails from Eltus, \ + in the Vilous system. Unlike sergals whom they share a star system with, their species is a very peaceful one. They possess remarkable \ + intelligence and very skillful hands that are put use for constructing precision instruments, but tire-out fast when repeatedly working \ + over and over again. Consequently, they struggle to make copies of same things. Both genders have a voice that echoes a lot. Their natural \ + tone oscillates between tenor and soprano. They are excessively noisy when they quarrel in their native language." - primitive_form = "Farwa" //POLARISTODO - Add other monkeytypes + primitive_form = "Sparra" spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -129,7 +133,6 @@ deform = 'icons/mob/human_races/r_def_fox.dmi' tail = "tail" icobase_tail = 1 - //primitive_form = /mob/living/carbon/monkey/tajara //We don't have fennec-monkey sprites. unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) num_alternate_languages = 2 secondary_langs = list("Siik'tajr") @@ -138,13 +141,13 @@ min_age = 17 max_age = 80 - blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, and the other with longer fur that is a bit more vibrant. \ - The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that is where most of their settlements are located. \ - The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be hired by the Trans-Stellar Corporations. \ - The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or mountainous areas, \ - they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ - the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they seem to have adjusted better to their new lives. \ - Though similar fox-like beings have been seen they are different than the Zorren." + blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \ + and the other with longer fur that is a bit more vibrant. The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that \ + is where most of their settlements are located. The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be \ + hired by the Trans-Stellar Corporations. The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or \ + mountainous areas, they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ + the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they seem to \ + have adjusted better to their new lives. Though similar fox-like beings have been seen they are different than the Zorren." /* VOREStation Removal cold_level_1 = 200 //Default 260 cold_level_2 = 140 //Default 200 @@ -154,6 +157,8 @@ heat_level_2 = 380 //Default 400 heat_level_3 = 800 //Default 1000 */ + //primitive_form = "" //We don't have fox-monkey sprites. + spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR flesh_color = "#AFA59E" @@ -173,7 +178,6 @@ deform = 'icons/mob/human_races/r_def_fennec.dmi' tail = "tail" icobase_tail = 1 - //primitive_form = /mob/living/carbon/monkey/tajara //We don't have fennec-monkey sprites. unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) num_alternate_languages = 2 secondary_langs = list("Siik'tajr") @@ -182,13 +186,13 @@ min_age = 17 max_age = 80 - blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, and the other with longer fur that is a bit more vibrant. \ - The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that is where most of their settlements are located. \ - The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be hired by the Trans-Stellar Corporations. \ - The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or mountainous areas, \ - they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ - the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they seem to have adjusted better to their new lives. \ - Though similar fox-like beings have been seen they are different than the Zorren." + blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \ + and the other with longer fur that is a bit more vibrant. The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that is \ + where most of their settlements are located. The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be \ + hired by the Trans-Stellar Corporations. The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or \ + mountainous areas, they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \ + the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they \ + seem to have adjusted better to their new lives. Though similar fox-like beings have been seen they are different than the Zorren." /* VOREStation Removal cold_level_1 = 280 //Default 260 - Lower is better cold_level_2 = 220 //Default 200 @@ -198,6 +202,7 @@ heat_level_2 = 500 //Default 400 heat_level_3 = 1100 //Default 1000 */ + //primitive_form = "" //We don't have fennec-monkey sprites. spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -226,7 +231,7 @@ tail_animation = 'icons/mob/species/vulpkanin/tail.dmi' // probably need more than just one of each, but w/e unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) darksight = 5 //worse than cats, but better than lizards. -- Poojawa - gluttonous = 1 +// gluttonous = 1 num_alternate_languages = 2 color_mult = 1 @@ -236,32 +241,17 @@ to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \ which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." -// flags = HAS_LIPS -// clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS + primitive_form = "Wolpin" + spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR -/* bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR // Paradise stuff dietflags = DIET_OMNI + flesh_color = "#966464" base_color = "#B43214" - butt_sprite = "vulp" */ min_age = 17 max_age = 80 -/* // I figured both of these things aren't exactly needed - Poojawa - - allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken, - /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble) - - suicide_messages = list( - "is attempting to bite their tongue off!", - "is jamming their claws into their eye sockets!", - "is twisting their own neck!", - "is holding their breath!") */ - -//datum/species/vulpkanin //just to write it out, no idea where any of it goes -- Pooj -// egg_type = "Vulpkanin" - /datum/species/unathi spawn_flags = SPECIES_CAN_JOIN //Species_can_join is the only spawn flag all the races get, so that none of them will be whitelist only if whitelist is enabled. @@ -281,3 +271,7 @@ spawn_flags = SPECIES_CAN_JOIN /datum/species/human + color_mult = 1 + icobase = 'icons/mob/human_races/r_human_vr.dmi' + deform = 'icons/mob/human_races/r_def_human_vr.dmi' + appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR \ No newline at end of file From e55d5c690029368a5fdb4180020d47d16289bccc Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 3 Jul 2016 19:05:55 -0400 Subject: [PATCH 6/7] AHHHHHHHHHHHHH --- .../carbon/human/species/station/station_vr.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 1338a5c350..c040089975 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -15,7 +15,6 @@ secondary_langs = list("Sagaru") name_language = "Sagaru" color_mult = 1 - egg_type = "Sergal" min_age = 17 max_age = 80 @@ -62,7 +61,6 @@ secondary_langs = list("Skrellian") name_language = "Skrellian" color_mult = 1 - egg_type = "Akula" min_age = 17 max_age = 80 @@ -102,7 +100,6 @@ secondary_langs = list("Birdsong") name_language = "Birdsong" color_mult = 1 - egg_type = "Nevrean" min_age = 17 max_age = 80 @@ -140,7 +137,6 @@ num_alternate_languages = 2 secondary_langs = list("Siik'tajr") name_language = "Siik'tajr" - egg_type = "Tajaran" //Placeholder. min_age = 17 max_age = 80 @@ -186,7 +182,6 @@ num_alternate_languages = 2 secondary_langs = list("Siik'tajr") name_language = "Siik'tajr" - egg_type = "Tajaran" //Placeholder. min_age = 17 max_age = 80 @@ -239,7 +234,6 @@ // gluttonous = 1 num_alternate_languages = 2 color_mult = 1 - egg_type = "Tajaran" //also placeholder. because I see other things using it blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ @@ -258,19 +252,13 @@ min_age = 17 max_age = 80 -//datum/species/vulpkanin //just to write it out, no idea where any of it goes -- Pooj -// egg_type = "Vulpkanin" - /datum/species/unathi - egg_type = "Unathi" spawn_flags = SPECIES_CAN_JOIN //Species_can_join is the only spawn flag all the races get, so that none of them will be whitelist only if whitelist is enabled. /datum/species/tajaran - egg_type = "Tajaran" spawn_flags = SPECIES_CAN_JOIN /datum/species/skrell - egg_type = "Skrell" spawn_flags = SPECIES_CAN_JOIN /datum/species/diona @@ -280,11 +268,9 @@ spawn_flags = SPECIES_CAN_JOIN /datum/species/shapeshifter/promethean - egg_type = "Slime" spawn_flags = SPECIES_CAN_JOIN /datum/species/human - egg_type = "Human" color_mult = 1 icobase = 'icons/mob/human_races/r_human_vr.dmi' deform = 'icons/mob/human_races/r_def_human_vr.dmi' From 6e747f6f2da7a561263b3c902601936e5cb7817c Mon Sep 17 00:00:00 2001 From: killer653 Date: Sun, 3 Jul 2016 19:11:30 -0400 Subject: [PATCH 7/7] Another fix since github is bad. --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index 77d2e11f86..a1b5e3ee09 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1455,6 +1455,7 @@ #include "code\modules\mob\living\carbon\human\human_damage.dm" #include "code\modules\mob\living\carbon\human\human_defense.dm" #include "code\modules\mob\living\carbon\human\human_defines.dm" +#include "code\modules\mob\living\carbon\human\human_defines_vr.dm" #include "code\modules\mob\living\carbon\human\human_helpers.dm" #include "code\modules\mob\living\carbon\human\human_movement.dm" #include "code\modules\mob\living\carbon\human\human_organs.dm"