diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm index dc10bb562b6..dc3d61ecc8a 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm @@ -13,6 +13,10 @@ "Rapala", "Neaera", "Stok", "Farwa", "Sobaka", "Wolpin", "Saru", "Sparra") + spawn_flags = SPECIES_CAN_JOIN + wikilink="https://wiki.vore-station.net/Promethean" + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + color_mult = 1 mob_size = MOB_MEDIUM //As of writing, original was MOB_SMALL - Allows normal swapping trashcan = 1 //They have goopy bodies. They can just dissolve things within them. diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 15904a65205..f29a4d39579 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -59,6 +59,8 @@ siemens_coefficient = 1.5 //Very bad zappy times rarity_value = 5 + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + has_organ = list( O_BRAIN = /obj/item/organ/internal/mmi_holder/posibrain/nano, O_ORCH = /obj/item/organ/internal/nano/orchestrator, @@ -170,7 +172,7 @@ H.forceMove(H.temporary_form.drop_location()) H.ckey = H.temporary_form.ckey QDEL_NULL(H.temporary_form) - + to_chat(H, "You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.") for(var/obj/item/organ/I in H.internal_organs) 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 520b984a0bd..10822a5f9c1 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 @@ -57,6 +57,8 @@ flags = NO_SCAN | NO_INFECT //Dying as a chimera is, quite literally, a death sentence. Well, if it wasn't for their revive, that is. appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + has_organ = list( //Same organ list as tajarans. O_HEART = /obj/item/organ/internal/heart, O_LUNGS = /obj/item/organ/internal/lungs, @@ -402,6 +404,8 @@ spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + flesh_color = "#AFA59E" //Gray-ish. Not sure if this is really needed, but eh. base_color = "#333333" //Blackish-gray blood_color = "#0952EF" //Spiders have blue blood. @@ -465,6 +469,8 @@ flesh_color = "#AFA59E" base_color = "#777777" + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", 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 4141eb8575a..730f6a52441 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 @@ -41,6 +41,8 @@ flesh_color = "#AFA59E" base_color = "#777777" + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", @@ -98,6 +100,8 @@ primitive_form = "Sobaka" + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -142,6 +146,8 @@ primitive_form = "Sparra" + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR @@ -190,6 +196,8 @@ blood_color = "#240bc4" color_mult = 1 + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", @@ -231,6 +239,8 @@ spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) + flesh_color = "#966464" base_color = "#B43214" @@ -247,6 +257,7 @@ min_age = 18 gluttonous = 0 inherent_verbs = list(/mob/living/proc/shred_limb) + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) descriptors = list() wikilink="https://wiki.vore-station.net/Unathi" @@ -260,6 +271,7 @@ gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm inherent_verbs = list(/mob/living/proc/shred_limb, /mob/living/carbon/human/proc/lick_wounds) heat_discomfort_level = 295 //Prevents heat discomfort spam at 20c + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) wikilink="https://wiki.vore-station.net/Tajaran" agility = 90 @@ -271,12 +283,14 @@ min_age = 18 reagent_tag = null assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) wikilink="https://wiki.vore-station.net/Skrell" /datum/species/zaddat spawn_flags = SPECIES_CAN_JOIN min_age = 18 gluttonous = 0 + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) descriptors = list() // no wiki link exists for Zaddat yet @@ -291,6 +305,7 @@ /datum/species/diona spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE min_age = 18 + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) wikilink="https://wiki.vore-station.net/Diona" /datum/species/teshari @@ -304,6 +319,7 @@ push_flags = ~HEAVY //Allows them to use micro step code. swap_flags = ~HEAVY gluttonous = 0 + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) descriptors = list() wikilink="https://wiki.vore-station.net/Teshari" agility = 90 @@ -315,16 +331,13 @@ /mob/living/proc/toggle_pass_table ) -/datum/species/shapeshifter/promethean - spawn_flags = SPECIES_CAN_JOIN - wikilink="https://wiki.vore-station.net/Promethean" - /datum/species/human color_mult = 1 icobase = 'icons/mob/human_races/r_human_vr.dmi' deform = 'icons/mob/human_races/r_def_human_vr.dmi' appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_EYE_COLOR min_age = 18 + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) base_color = "#EECEB3" wikilink="https://wiki.vore-station.net/Human" @@ -355,6 +368,7 @@ datum/species/harpy secondary_langs = list(LANGUAGE_BIRDSONG) name_language = null color_mult = 1 + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) inherent_verbs = list(/mob/living/proc/flying_toggle,/mob/living/proc/start_wings_hovering) min_age = 18 @@ -451,8 +465,7 @@ datum/species/harpy speech_bubble_appearance = "ghost" - genders = list(PLURAL, NEUTER) //no sexual dymorphism - ambiguous_genders = TRUE //but just in case + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) breath_type = null poison_type = null @@ -513,6 +526,7 @@ datum/species/harpy //primitive_form = "" //We don't have fennec-monkey sprites. spawn_flags = SPECIES_IS_RESTRICTED appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) flesh_color = "#AFA59E" base_color = "#333333" @@ -552,6 +566,7 @@ datum/species/harpy spawn_flags = SPECIES_IS_RESTRICTED appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR + genders = list(MALE, FEMALE, PLURAL, NEUTER, HERM) blood_color = "#12ff12" flesh_color = "#201730"