diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 830d0ab693d..7a52a9f7662 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", "Xenomorph Hybrid") diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm b/code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm index 055e5f0f736..bdd6902e66d 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', + "Xenomorph Hybrid" = 'icons/mob/species/unathi/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' - ) \ No newline at end of file + "Promethean" = 'icons/mob/species/skrell/suit.dmi', + "Xenomorph Hybrid" = 'icons/mob/species/unathi/suit.dmi' + ) diff --git a/code/modules/clothing/spacesuits/void/void_vr.dm b/code/modules/clothing/spacesuits/void/void_vr.dm index a54af3f2f15..a1d34b7c5d2 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', + "Xenomorph Hybrid" = 'icons/mob/species/unathi/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', + "Xenomorph Hybrid" = 'icons/obj/clothing/species/unathi/hats.dmi' ) /obj/item/clothing/suit/space/void @@ -46,7 +48,8 @@ "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', + "Xenomorph Hybrid" = 'icons/mob/species/unathi/suit.dmi' ) @@ -70,4 +73,4 @@ // when the item is equipped in outer clothing slot. // This variable is normally used to set the icon_override when the suit is refitted, // however the species spritesheet now means we no longer need that anyway! - sprite_sheets_refit = list() \ No newline at end of file + sprite_sheets_refit = list() diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index fceb30b8220..20eeed488c9 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -37,4 +37,4 @@ syllables = list("rur","ya","cen","rawr","bar","kuk","tek","qat","uk","wu","vuh","tah","tch","schz","auch", \ "ist","ein","entch","zwichs","tut","mir","wo","bis","es","vor","nic","gro","lll","enem","zandt","tzch","noch", \ "hel","ischt","far","wa","baram","iereng","tech","lach","sam","mak","lich","gen","or","ag","eck","gec","stag","onn", \ - "bin","ket","jarl","vulf","einech","cresthz","azunein","ghzth") \ No newline at end of file + "bin","ket","jarl","vulf","einech","cresthz","azunein","ghzth") diff --git a/code/modules/mob/living/carbon/human/human_species_vr.dm b/code/modules/mob/living/carbon/human/human_species_vr.dm index 2b11db013ad..a7f7be7de6a 100644 --- a/code/modules/mob/living/carbon/human/human_species_vr.dm +++ b/code/modules/mob/living/carbon/human/human_species_vr.dm @@ -9,4 +9,7 @@ ..(new_loc, "Nevrean") /mob/living/carbon/human/xenochimera/New(var/new_loc) - ..(new_loc, "Xenochimera") \ No newline at end of file + ..(new_loc, "Xenochimera") + +/mob/living/carbon/human/xenohybrid/New(var/new_loc) + ..(new_loc, "Xenomorph Hybrid") 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 c0400899755..f6eb81a2e31 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 @@ -252,6 +252,47 @@ min_age = 17 max_age = 80 +/datum/species/xenohybrid + name = "Xenomorph Hybrid" + name_plural = "Xenomorphs" + icobase = 'icons/mob/human_races/r_xenomorph.dmi' + deform = 'icons/mob/human_races/r_def_xenomorph.dmi' + tail = "tail" + icobase_tail = 1 + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) + darksight = 4 //Better hunters in the dark. + hunger_factor = 0.1 //In exchange, they get hungry a tad faster. + num_alternate_languages = 2 + //secondary_langs = list("Sagaru") //No special language, yet. And I'm pretty sure this doesn't even work. + //name_language = "Sagaru" + //color_mult = 1 //Since it's a black sprite, it adds instead of multiplies. + + min_age = 17 + max_age = 80 + + blurb = "Xenomorphs hybrids are a mixture of xenomorph DNA and some other humanoid species. \ + Xenomorph hyrids mostly have had had their natural aggression removed due to the gene modification process \ + although there are some exceptions, such as when they are harmed. Most xenomorph hybrids are female, due to their natural xenomorph genes, \ + but there are multiple exceptions. All xenomorph hybrids have had their ability to lay eggs containing facehuggers \ + removed if they had the ability to, although hybrids that previously contained this ability is extremely rare." + + //primitive_form = "Sergaling" //No official sprite for them yet. + + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED + appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + + blood_color = "#12ff12" + flesh_color = "#201730" + base_color = "#201730" + + //reagent_tag = IS_SERGAL //No specific reagent tag. + + heat_discomfort_strings = list( + "Your chitin feels extremely warm.", + "You feel uncomfortably warm.", + "Your chitin feels hot." + ) + /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. @@ -274,4 +315,4 @@ 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 + appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index a8c35539834..146a7aa3b16 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -6,7 +6,7 @@ /datum/sprite_accessory/hair - species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera") //This lets all races use the default hairstyles. + species_allowed = list("Human","Skrell","Unathi","Tajara", "Teshari", "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Xenochimera", "Xenomorph Hybrid") //This lets all races use the default hairstyles. sergal_plain name = "Sergal Plain" @@ -299,4 +299,4 @@ name = "Default Vulpkanin skin" icon_state = "default" icon = 'icons/mob/human_races/r_vulpkanin.dmi' - species_allowed = list("Vulpkanin") \ No newline at end of file + species_allowed = list("Vulpkanin") diff --git a/icons/mob/human_races/r_def_xenomorph.dmi b/icons/mob/human_races/r_def_xenomorph.dmi new file mode 100644 index 00000000000..4074e25849d Binary files /dev/null and b/icons/mob/human_races/r_def_xenomorph.dmi differ diff --git a/icons/mob/human_races/r_xenomorph.dmi b/icons/mob/human_races/r_xenomorph.dmi new file mode 100644 index 00000000000..eceea3145f7 Binary files /dev/null and b/icons/mob/human_races/r_xenomorph.dmi differ