diff --git a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
new file mode 100644
index 0000000000..7acfaa26de
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm
@@ -0,0 +1,88 @@
+/obj/structure/closet/secure_closet/egg
+ name = "egg"
+ desc = "It's an egg; it's smooth to the touch." //This is the default egg.
+ icon = 'icons/obj/egg_vr.dmi'
+ icon_state = "egg"
+ density = 0 //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
+ icon_closed = "egg"
+ icon_opened = "egg_open"
+ icon_locked = "egg"
+ open_sound = 'sound/vore/schlorp.ogg'
+ close_sound = 'sound/vore/schlorp.ogg'
+ opened = 0
+ welded = 0 //Don't touch this.
+ health = 100
+
+/obj/structure/closet/secure_closet/egg/attackby(obj/item/weapon/W, mob/user as mob) //This also prevents crew from welding the eggs and making them unable to be opened.
+ if(istype(W, /obj/item/weapon/weldingtool))
+ src.dump_contents()
+ del(src)
+
+
+
+/obj/structure/closet/secure_closet/egg/unathi
+ name = "unathi egg"
+ desc = "Some species of Unathi apparently lay soft-shelled eggs!"
+ icon_state = "egg_unathi"
+ icon_closed = "egg_unathi"
+ icon_opened = "egg_unathi_open"
+
+/obj/structure/closet/secure_closet/egg/nevrean
+ name = "nevarean egg"
+ desc = "Most Nevareans lay hard-shelled eggs!"
+ icon_state = "egg_nevarean"
+ icon_closed = "egg_nevarean"
+ icon_opened = "egg_nevarean_open"
+
+/obj/structure/closet/secure_closet/egg/human
+ name = "human egg"
+ desc = "Some humans lay eggs that are--wait, what?"
+ icon_state = "egg_human"
+ icon_closed = "egg_human"
+ icon_opened = "egg_human_open"
+
+/obj/structure/closet/secure_closet/egg/tajaran
+ name = "tajaran egg"
+ desc = "Apparently that's what a Tajaran egg looks like. Weird."
+ icon_state = "egg_tajaran"
+ icon_closed = "egg_tajaran"
+ icon_opened = "egg_tajaran_open"
+
+/obj/structure/closet/secure_closet/egg/skrell
+ name = "skrell egg"
+ desc = "Its soft and squishy"
+ icon_state = "egg_skrell"
+ icon_closed = "egg_skrell"
+ icon_opened = "egg_skrell_open"
+
+/obj/structure/closet/secure_closet/egg/shark
+ name = "akula egg"
+ desc = "Its soft and slimy to the touch"
+ icon = 'icons/obj/closet.dmi'
+ icon_closed = "egg_akula"
+ icon_opened = "egg_akula_open"
+
+/obj/structure/closet/secure_closet/egg/sergal
+ name = "sergal egg"
+ desc = "An egg with a slightly fuzzy exterior, and a hard layer beneath."
+ icon_state = "egg_sergal"
+ icon_closed = "egg_sergal"
+ icon_opened = "egg_sergal_open"
+
+/obj/structure/closet/secure_closet/egg/slime
+ name = "slime egg"
+ desc = "An egg with a soft and squishy interior, coated with slime."
+ icon_state = "egg_slime"
+ icon_closed = "egg_slime"
+ icon_opened = "egg_slime_open"
+
+/obj/structure/closet/secure_closet/egg/special //Not actually used, but the sprites are in, and it's there in case any admins need to spawn in the egg for any specific reasons.
+ name = "special egg"
+ desc = "This egg has a very unique look to it."
+ icon_state = "egg_unique"
+ icon_closed = "egg_unique"
+ icon_opened = "egg_unique_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/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm
index dc0f247aac..fa2d2fc1d6 100644
--- a/code/modules/mob/living/carbon/human/species/species_vr.dm
+++ b/code/modules/mob/living/carbon/human/species/species_vr.dm
@@ -5,4 +5,9 @@
//This is for overriding tail rendering with a specific icon in icobase, for static
//tails only, since tails would wag when dead if you used this
- var/icobase_tail = 0
\ No newline at end of file
+ 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"
\ No newline at end of file
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 b58b30e885..6121839bc0 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,6 +15,7 @@
secondary_langs = list("Sagaru")
name_language = "Sagaru"
color_mult = 1
+ egg_type = "Sergal"
min_age = 17
max_age = 80
@@ -61,6 +62,7 @@
secondary_langs = list("Skrellian")
name_language = "Skrellian"
color_mult = 1
+ egg_type = "Akula"
min_age = 17
max_age = 80
@@ -100,6 +102,7 @@
secondary_langs = list("Birdsong")
name_language = "Birdsong"
color_mult = 1
+ egg_type = "Nevrean"
min_age = 17
max_age = 80
@@ -120,4 +123,22 @@
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
"Your overheated skin itches."
- )
\ No newline at end of file
+ )
+
+
+
+
+/datum/species/unathi
+ egg_type = "Unathi"
+
+/datum/species/tajaran
+ egg_type = "Tajaran"
+
+/datum/species/skrell
+ egg_type = "Skrell"
+
+/datum/species/shapeshifter/promethean
+ egg_type = "Slime"
+
+/datum/species/human
+ egg_type = "Human"
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_modules_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules_vr.dm
index e6d298cee2..99ca1f2884 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules_vr.dm
@@ -27,6 +27,7 @@
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.icon_state = "k9"
R.pixel_x = -16
+ R.old_x = -16
..()
/obj/item/weapon/robot_module/knine/respawn_consumable(var/mob/living/silicon/robot/R, var/amount)
@@ -67,5 +68,6 @@
R.icon = 'icons/mob/widerobot_vr.dmi'
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.icon_state = "medihound"
- R.pixel_x = -16
+ R.pixel_x = -16
+ R.old_x = -16
..()
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm
new file mode 100644
index 0000000000..5eac847c67
--- /dev/null
+++ b/code/modules/mob/living/silicon/robot/robot_vr.dm
@@ -0,0 +1,32 @@
+/mob/living/silicon/robot/updateicon()
+ overlays.Cut()
+ if(stat == CONSCIOUS)
+ overlays += "eyes-[module_sprites[icontype]]"
+ if(sleeper_g == 1)
+ overlays += "sleeper_g"
+ if(sleeper_r == 1)
+ overlays += "sleeper_r"
+
+ if(opened)
+ var/panelprefix = custom_sprite ? src.ckey : "ov"
+ if(wiresexposed)
+ overlays += "[panelprefix]-openpanel +w"
+ else if(cell)
+ overlays += "[panelprefix]-openpanel +c"
+ else
+ overlays += "[panelprefix]-openpanel -c"
+
+ if(module_active && istype(module_active,/obj/item/borg/combat/shield))
+ overlays += "[module_sprites[icontype]]-shield"
+
+ if(modtype == "Combat")
+ if(module_active && istype(module_active,/obj/item/borg/combat/mobility))
+ icon_state = "[module_sprites[icontype]]-roll"
+ else
+ icon_state = module_sprites[icontype]
+ return
+ if(stat == 0)
+ if(sleeper_g == 1)
+ overlays += "sleeper_g"
+ if(sleeper_r == 1)
+ overlays += "sleeper_r"
diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm
index 6a7ad4705c..1abf740af0 100644
--- a/code/modules/vore/eating/bellymodes_vr.dm
+++ b/code/modules/vore/eating/bellymodes_vr.dm
@@ -117,8 +117,6 @@
M.nutrition += 1
return
-/* POLARISTODO - Depends on Taurs, and egg objects.
-
///////////////////////////// DM_TRANSFORM_MALE /////////////////////////////
if(digest_mode == DM_TRANSFORM_MALE && ishuman(owner))
for (var/mob/living/carbon/human/P in internal_contents)
@@ -139,13 +137,13 @@
owner << "Your belly feels warm as your womb makes subtle changes to your captive's body."
P.update_body()
- if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin)
+ if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.r_facial != O.r_facial || P.g_facial != O.g_facial || P.b_facial != O.b_facial)
P.r_hair = O.r_hair
- P.r_facial = O.r_hair
+ P.r_facial = O.r_facial
P.g_hair = O.g_hair
- P.g_facial = O.g_hair
+ P.g_facial = O.g_facial
P.b_hair = O.b_hair
- P.b_facial = O.b_hair
+ P.b_facial = O.b_facial
P.r_skin = O.r_skin
P.g_skin = O.g_skin
P.b_skin = O.b_skin
@@ -233,13 +231,13 @@
owner << "Your belly feels warm as your womb makes subtle changes to your captive's body."
P.update_body()
- if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin)
+ if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.r_facial != O.r_facial || P.g_facial != O.g_facial || P.b_facial != O.b_facial)
P.r_hair = O.r_hair
- P.r_facial = O.r_hair
+ P.r_facial = O.r_facial
P.g_hair = O.g_hair
- P.g_facial = O.g_hair
+ P.g_facial = O.g_facial
P.b_hair = O.b_hair
- P.b_facial = O.b_hair
+ P.b_facial = O.b_facial
P.r_skin = O.r_skin
P.g_skin = O.g_skin
P.b_skin = O.b_skin
@@ -274,13 +272,13 @@
owner << "Your belly feels warm as your womb makes subtle changes to your captive's body."
P.update_body()
- if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin)
+ if(TFmodify == 2 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.r_facial != O.r_facial || P.g_facial != O.g_facial || P.b_facial != O.b_facial)
P.r_hair = O.r_hair
- P.r_facial = O.r_hair
+ P.r_facial = O.r_facial
P.g_hair = O.g_hair
- P.g_facial = O.g_hair
+ P.g_facial = O.g_facial
P.b_hair = O.b_hair
- P.b_facial = O.b_hair
+ P.b_facial = O.b_facial
P.r_skin = O.r_skin
P.g_skin = O.g_skin
P.b_skin = O.b_skin
@@ -293,20 +291,21 @@
//No idea how to work with that one, species system got changed a lot
//Also this makes it similar to the previous one until fixed
- if(TFmodify == 3 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.taur != O.taur || P.r_taur != O.r_taur || P.g_taur != O.g_taur || P.b_taur != O.b_taur)
+ if(TFmodify == 3 && P.r_hair != O.r_hair || P.g_hair != O.g_hair || P.b_hair != O.b_hair || P.r_skin != O.r_skin || P.g_skin != O.g_skin || P.b_skin != O.b_skin || P.tail_style != O.tail_style || P.r_tail != O.r_tail || P.g_tail != O.g_tail || P.b_tail != O.b_tail || P.ear_style != O.ear_style || P.r_facial != O.r_facial || P.g_facial != O.g_facial || P.b_facial != O.b_facial)
P.r_hair = O.r_hair
- P.r_facial = O.r_hair
+ P.r_facial = O.r_facial
P.g_hair = O.g_hair
- P.g_facial = O.g_hair
+ P.g_facial = O.g_facial
P.b_hair = O.b_hair
- P.b_facial = O.b_hair
+ P.b_facial = O.b_facial
P.r_skin = O.r_skin
P.g_skin = O.g_skin
P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
+ P.tail_style = O.tail_style
+ P.r_tail = O.r_tail
+ P.g_tail = O.g_tail
+ P.b_tail = O.b_tail
+ P.ear_style = O.ear_style
P.h_style = "Bedhead"
P.species = O.species
P << "You lose sensation of your body, feeling only the warmth of the womb... "
@@ -330,439 +329,155 @@
var/mob/living/carbon/human/O = owner
- if(O.species.name == "Unathi")
- var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Tajara")
- var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Skrell")
- var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Sergal")
- var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
-
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Akula")
- var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Nevrean")
- var/obj/structure/closet/secure_closet/egg/nevrean/J = new /obj/structure/closet/secure_closet/egg/nevrean(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Human")
- var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
-
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Slime Person")
- var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.taur = O.taur
- P.r_taur = O.r_taur
- P.g_taur = O.g_taur
- P.b_taur = O.b_taur
- P.h_style = "Bedhead"
- P.species = O.species
- P.custom_species = O.custom_species
- P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
- owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
- P.update_hair()
- P.update_body()
- P.update_tail_showing()
- P.loc = J
- J.name = "[defined_species] egg"
+ if (O.custom_species)
+ var/defined_species = O.custom_species
+ P.r_hair = O.r_hair //Made all these line up
+ P.r_facial = O.r_facial //So you can ea
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.tail_style = O.tail_style
+ P.r_tail = O.r_tail
+ P.g_tail = O.g_tail
+ P.b_tail = O.b_tail
+ P.ear_style = O.ear_style
+ P.h_style = "Bedhead"
+ P.species = O.species
+ P.custom_species = O.custom_species
+ P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
+ owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
+ P.update_hair()
+ P.update_body()
+ P.update_tail_showing()
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(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(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
+ P.r_hair = O.r_hair
+ P.r_facial = O.r_facial
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.tail_style = O.tail_style
+ P.r_tail = O.r_tail
+ P.g_tail = O.g_tail
+ P.b_tail = O.b_tail
+ P.ear_style = O.ear_style
+ P.h_style = "Bedhead"
+ P.species = O.species
+ P.custom_species = O.custom_species
+ P << "You lose sensation of your body, feeling only the warmth of the womb as you're encased in an egg. "
+ owner << "Your belly shifts as your womb makes dramatic changes to your captive's body as you encase them in an egg."
+ P.update_hair()
+ P.update_body()
+ P.update_tail_showing()
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(O.loc)
+ P.forceMove(J)
+ J.name = "Egg"
+ internal_contents -= P
+ else
+ 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
return
///////////////////////////// DM_TRANSFORM_KEEP_GENDER_EGG /////////////////////////////
@@ -773,326 +488,139 @@
var/mob/living/carbon/human/O = owner
- if(O.species.name == "Unathi")
- var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
+ if (O.custom_species)
+ var/defined_species = O.custom_species
+ P.r_hair = O.r_hair
+ P.r_facial = O.r_facial
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.h_style = "Bedhead"
+ P << "Your body tingles all over..."
+ owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
+ P.update_hair()
+ P.update_body()
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(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(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/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Tajara")
- var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Skrell")
- var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Sergal")
- var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Akula")
- var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Nevrean")
- var/obj/structure/closet/secure_closet/egg/nevrean/J = new /obj/structure/closet/secure_closet/egg/nevrean(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Human")
- var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
-
- if(O.species.name == "Slime Person")
- var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P << "Your body tingles all over..."
- owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
- P.update_hair()
- P.update_body()
- P.loc = J
- J.name = "[defined_species] egg"
+ else
+ P.r_hair = O.r_hair
+ P.r_facial = O.r_facial
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.h_style = "Bedhead"
+ P << "Your body tingles all over..."
+ owner << "Your belly tingles as your womb makes noticeable changes to your captive's body."
+ P.update_hair()
+ P.update_body()
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(O.loc)
+ P.forceMove(J)
+ J.name = "Egg"
+ internal_contents -= P
+ else
+ 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
return
///////////////////////////// DM_TRANSFORM_MALE_EGG /////////////////////////////
@@ -1103,341 +631,138 @@
var/mob/living/carbon/human/O = owner
- if(O.species.name == "Unathi")
- var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Tajara")
- var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Skrell")
- var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Sergal")
- var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Akula")
- var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Nevrean")
- var/obj/structure/closet/secure_closet/egg/nevrean/J = new /obj/structure/closet/secure_closet/egg/nevrean(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Human")
- var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Slime Person")
- var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = MALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
+ if (O.custom_species)
+ var/defined_species = O.custom_species
+ P.r_hair = O.r_hair
+ P.r_facial = O.r_facial
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.h_style = "Bedhead"
+ P.gender = MALE
+ P << "Your body feels very strange..."
+ owner << "Your belly feels strange as your womb alters your captive's gender."
+ P.update_hair()
+ P.update_body()
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(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(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
+ P.r_hair = O.r_hair
+ P.r_facial = O.r_facial
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.h_style = "Bedhead"
+ P.gender = MALE
+ P << "Your body feels very strange..."
+ owner << "Your belly feels strange as your womb alters your captive's gender."
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(O.loc)
+ P.forceMove(J)
+ J.name = "Egg"
+ internal_contents -= P
+ else
+ 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
return
///////////////////////////// DM_TRANSFORM_FEMALE_EGG /////////////////////////////
@@ -1448,341 +773,139 @@
var/mob/living/carbon/human/O = owner
- if(O.species.name == "Unathi")
- var/obj/structure/closet/secure_closet/egg/unathi/J = new /obj/structure/closet/secure_closet/egg/unathi(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- if(O.species.name == "Tajara")
- var/obj/structure/closet/secure_closet/egg/tajaran/J = new /obj/structure/closet/secure_closet/egg/tajaran(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Skrell")
- var/obj/structure/closet/secure_closet/egg/skrell/J = new /obj/structure/closet/secure_closet/egg/skrell(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Sergal")
- var/obj/structure/closet/secure_closet/egg/sergal/J = new /obj/structure/closet/secure_closet/egg/sergal(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Akula")
- var/obj/structure/closet/secure_closet/egg/shark/J = new /obj/structure/closet/secure_closet/egg/shark(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Nevrean")
- var/obj/structure/closet/secure_closet/egg/nevrean/J = new /obj/structure/closet/secure_closet/egg/nevrean(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Human")
- var/obj/structure/closet/secure_closet/egg/human/J = new /obj/structure/closet/secure_closet/egg/human(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
-
- if(O.species.name == "Slime Person")
- var/obj/structure/closet/secure_closet/egg/slime/J = new /obj/structure/closet/secure_closet/egg/slime(O.loc)
- if (O.custom_species)
- var/defined_species = O.custom_species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- J.desc = "This egg has a very unique look to it."
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
- else
- var/defined_species = O.species
- P.r_hair = O.r_hair
- P.r_facial = O.r_hair
- P.g_hair = O.g_hair
- P.g_facial = O.g_hair
- P.b_hair = O.b_hair
- P.b_facial = O.b_hair
- P.r_skin = O.r_skin
- P.g_skin = O.g_skin
- P.b_skin = O.b_skin
- P.h_style = "Bedhead"
- P.gender = FEMALE
- P.loc = J
- J.name = "[defined_species] egg"
- P << "Your body feels very strange..."
- owner << "Your belly feels strange as your womb alters your captive's gender."
- P.update_hair()
- P.update_body()
+ if (O.custom_species)
+ var/defined_species = O.custom_species
+ P.r_hair = O.r_hair
+ P.r_facial = O.r_facial
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.h_style = "Bedhead"
+ P.gender = FEMALE
+ P << "Your body feels very strange..."
+ owner << "Your belly feels strange as your womb alters your captive's gender."
+ P.update_hair()
+ P.update_body()
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(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(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
+ P.r_hair = O.r_hair
+ P.r_facial = O.r_facial
+ P.g_hair = O.g_hair
+ P.g_facial = O.g_facial
+ P.b_hair = O.b_hair
+ P.b_facial = O.b_facial
+ P.r_skin = O.r_skin
+ P.g_skin = O.g_skin
+ P.b_skin = O.b_skin
+ P.h_style = "Bedhead"
+ P.gender = FEMALE
+ owner << "Your belly feels strange as your womb alters your captive's gender."
+ P << "Your body feels very strange..."
+ P.update_hair()
+ P.update_body()
+ switch(O.species.egg_type)
+ if("Unathi")
+ 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(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(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(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(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(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(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(O.loc)
+ P.forceMove(J)
+ J.name = "Egg"
+ internal_contents -= P
+ else
+ 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
return
-
-*/
diff --git a/icons/mob/species/sergal/suit_vr.dmi b/icons/mob/species/sergal/suit_vr.dmi
index 380309935a..31705ebf61 100644
Binary files a/icons/mob/species/sergal/suit_vr.dmi and b/icons/mob/species/sergal/suit_vr.dmi differ
diff --git a/icons/obj/egg_vr.dmi b/icons/obj/egg_vr.dmi
new file mode 100644
index 0000000000..82640245a2
Binary files /dev/null and b/icons/obj/egg_vr.dmi differ
diff --git a/vorestation.dme b/vorestation.dme
index 358c0bad9e..d73ba8b163 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -833,6 +833,7 @@
#include "code\game\objects\structures\crates_lockers\largecrate.dm"
#include "code\game\objects\structures\crates_lockers\closets\coffin.dm"
#include "code\game\objects\structures\crates_lockers\closets\crittercrate.dm"
+#include "code\game\objects\structures\crates_lockers\closets\egg_vr.dm"
#include "code\game\objects\structures\crates_lockers\closets\fireaxe.dm"
#include "code\game\objects\structures\crates_lockers\closets\fitness.dm"
#include "code\game\objects\structures\crates_lockers\closets\gimmick.dm"
@@ -1483,6 +1484,7 @@
#include "code\modules\mob\living\silicon\robot\robot_modules.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules_vr.dm"
#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
+#include "code\modules\mob\living\silicon\robot\robot_vr.dm"
#include "code\modules\mob\living\silicon\robot\syndicate.dm"
#include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm"
#include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm"