diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 830d0ab693..5d0926ff1e 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,2 +1,2 @@ /obj/machinery/suit_cycler - species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean") \ No newline at end of file + species = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenochimera") \ No newline at end of file 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 7acfaa26de..ddfe55bebd 100644 --- a/code/game/objects/structures/crates_lockers/closets/egg_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/egg_vr.dm @@ -83,6 +83,13 @@ icon_closed = "egg_unique" icon_opened = "egg_unique_open" +/obj/structure/closet/secure_closet/egg/scree + name = "Chimera egg" + desc = "...You don't know what type of creature layed this egg." + icon_state = "egg_scree" + icon_closed = "egg_scree" + icon_opened = "egg_scree_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/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index 055e5f0f73..8f933c39eb 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm @@ -9,7 +9,8 @@ "Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi', "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi', "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Promethean" = 'icons/mob/species/skrell/helmet.dmi' + "Promethean" = 'icons/mob/species/skrell/helmet.dmi', + "Xenochimera" = 'icons/mob/species/tajaran/helmet.dmi' ) @@ -25,5 +26,6 @@ "Flatland Zorren" = 'icons/mob/species/fennec/suit_vr.dmi', "Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi', "Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi', - "Promethean" = 'icons/mob/species/skrell/suit.dmi' + "Promethean" = 'icons/mob/species/skrell/suit.dmi', + "Xenochimera" = 'icons/mob/species/tajaran/suit.dmi' ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index a54af3f2f1..f8e336190b 100644 --- a/code/modules/clothing/spacesuits/void/void_vr.dm +++ b/code/modules/clothing/spacesuits/void/void_vr.dm @@ -17,7 +17,8 @@ "Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi', "Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi', "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi', - "Promethean" = 'icons/mob/species/skrell/helmet.dmi' + "Promethean" = 'icons/mob/species/skrell/helmet.dmi', + "Xenochimera" = 'icons/mob/species/tajaran/helmet.dmi' ) sprite_sheets_obj = list( @@ -31,7 +32,8 @@ "Flatland Zorren" = 'icons/obj/clothing/species/fennec/hats.dmi', "Highlander Zorren" = 'icons/obj/clothing/species/fox/hats.dmi', "Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/hats.dmi', - "Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi' + "Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi', + "Xenochimera" = 'icons/obj/clothing/species/tajaran/hats.dmi' ) /obj/item/clothing/suit/space/void 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 93d91a8ce0..9670c67738 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 @@ -4,16 +4,16 @@ -/datum/species/chimera //Scree's race. - name = "Chimera" - name_plural = "Chimeras" - icobase = 'icons/mob/human_races/r_tajaran.dmi' //Tajara basis, as it has working skin color. Replace with human when sprites are edited & available. +/datum/species/xenochimera //Scree's race. + name = "Xenochimera" + name_plural = "Xenochimeras" + icobase = 'icons/mob/human_races/r_tajaran.dmi' //Tajara basis, as it has working skin color. deform = 'icons/mob/human_races/r_def_tajaran.dmi' unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite) num_alternate_languages = 2 secondary_langs = list("Sol Common") color_mult = 1 - egg_type = "Sergal" //Placeholder egg. + egg_type = "Scree" //Scree egg. inherent_verbs = list(/mob/living/carbon/human/verb/chimera_revive) min_age = 17 diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 72b07dc18d..8e96045d7d 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -403,6 +403,13 @@ 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(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) diff --git a/icons/obj/egg_vr.dmi b/icons/obj/egg_vr.dmi index 82640245a2..12b7691765 100644 Binary files a/icons/obj/egg_vr.dmi and b/icons/obj/egg_vr.dmi differ