cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6683 from Novacat/nova-heterochromia

Browse Source 
Species consolidation
This commit is contained in:
Novacat
2020-03-19 18:55:54 -04:00
committed by GitHub
parent 935b2baca5 db16b17224
commit 4cd077019f
14 changed files with 141 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/__defines/mobs_vr.dm
View File

@@ -29,9 +29,7 @@
#define SPECIES_VASILISSAN "Vasilissan"
#define SPECIES_VULPKANIN "Vulpkanin"
#define SPECIES_XENOCHIMERA "Xenochimera"
#define SPECIES_XENOHYBRID "Xenomorph Hybrid"
#define SPECIES_ZORREN_FLAT "Flatland Zorren"
#define SPECIES_ZORREN_HIGH "Highlander Zorren"
#define SPECIES_ZORREN_HIGH "Zorren"
#define SPECIES_CUSTOM "Custom Species"
//monkey species
#define SPECIES_MONKEY_AKULA "Sobaka"
@@ -41,3 +39,6 @@
//event species
#define SPECIES_WEREBEAST "Werebeast"
#define SPECIES_SHADEKIN "Shadekin"
//custom species base sprites
#define SPECIES_FENNEC "Fennec"
#define SPECIES_XENOHYBRID "Xenohybrid"

3
code/_helpers/global_lists_vr.dm
View File

@@ -470,6 +470,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
// Custom species icon bases
var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //Just ones that won't work well.
var/list/whitelisted_icons = list(SPECIES_FENNEC,SPECIES_XENOHYBRID) //Include these anyway
for(var/species_name in GLOB.playable_species)
if(species_name in blacklisted_icons)
continue
@@ -477,5 +478,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
if(S.spawn_flags & SPECIES_IS_WHITELISTED)
continue
custom_species_bases += species_name
for(var/species_name in whitelisted_icons)
custom_species_bases += species_name
return 1 // Hooks must return 1

4
code/game/machinery/suit_storage_unit.dm
View File

@@ -588,7 +588,7 @@
//Departments that the cycler can paint suits to look like.
var/list/departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot") //VORESTATION EDIT
//Species that the suits can be configured to fit.
var/list/species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Xenochimera","Vasilissan", "Rapala") //VORESTATION EDIT
var/list/species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH) //VORESTATION EDIT
var/target_department
var/target_species
@@ -767,7 +767,7 @@
//Clear the access reqs, disable the safeties, and open up all paintjobs.
to_chat(user, "<span class='danger'>You run the sequencer across the interface, corrupting the operating protocols.</span>")
departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Crowd Control","Emergency Medical Response","^%###^%$", "Charring")
species = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_UNATHI,SPECIES_TAJ, SPECIES_TESHARI, "Nevrean", "Akula", "Sergal", "Flatland Zorren", "Highlander Zorren", "Vulpkanin", "Promethean", "Xenomorph Hybrid", "Vasilissan", "Rapala") //VORESTATION EDIT
species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_ALRAUNE, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_SERGAL, SPECIES_VASILISSAN, SPECIES_VULPKANIN, SPECIES_ZORREN_HIGH) //VORESTATION EDIT
emagged = 1
safeties = 0

3
code/game/machinery/suit_storage_unit_vr.dm
View File

@@ -12,9 +12,6 @@
SPECIES_SERGAL,
SPECIES_VASILISSAN,
SPECIES_VULPKANIN,
SPECIES_XENOCHIMERA,
SPECIES_XENOHYBRID,
SPECIES_ZORREN_FLAT,
SPECIES_ZORREN_HIGH
)

15
code/modules/catalogue/catalogue_data_vr.dm
View File

@@ -40,26 +40,11 @@
desc = ""
value = CATALOGUER_REWARD_TRIVIAL
/datum/category_item/catalogue/fauna/xenohybrid
name = "Sapients - Xenomorph Hybrid"
desc = ""
value = CATALOGUER_REWARD_TRIVIAL
/datum/category_item/catalogue/fauna/zorren
name = "Sapients - Zorren"
desc = ""
value = CATALOGUER_REWARD_TRIVIAL
/datum/category_item/catalogue/fauna/highzorren
name = "Sapients - Highlander Zorren"
desc = ""
value = CATALOGUER_REWARD_TRIVIAL
/datum/category_item/catalogue/fauna/flatzorren
name = "Sapients - Flatlander Zorren"
desc = ""
value = CATALOGUER_REWARD_TRIVIAL
/datum/category_item/catalogue/fauna/shadekin
name = "Sapients - Shadekin"
desc = ""

18
code/modules/clothing/clothing.dm
View File

@@ -102,8 +102,14 @@
//Set species_restricted list
switch(target_species)
//VOREStation Edit Start
if(SPECIES_HUMAN, SPECIES_SKRELL) //humanoid bodytypes
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN) //skrell/humans can wear each other's suits
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
if(SPECIES_UNATHI)
species_restricted = list(SPECIES_UNATHI, SPECIES_XENOHYBRID)
if(SPECIES_ZORREN_HIGH)
species_restricted = list(SPECIES_ZORREN_HIGH, SPECIES_FENNEC)
//VOREStation Edit End
else
species_restricted = list(target_species)
@@ -122,8 +128,16 @@
//Set species_restricted list
switch(target_species)
//VOREStation Edit Start
if(SPECIES_HUMAN)
species_restricted = list(SPECIES_HUMAN, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
if(SPECIES_SKRELL)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN) //skrell helmets fit humans too
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
if(SPECIES_UNATHI)
species_restricted = list(SPECIES_UNATHI, SPECIES_XENOHYBRID)
if(SPECIES_ZORREN_HIGH)
species_restricted = list(SPECIES_ZORREN_HIGH, SPECIES_FENNEC)
//VOREStation Edit End
else
species_restricted = list(target_species)

12
code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
View File

@@ -6,11 +6,9 @@
SPECIES_NEVREAN = 'icons/mob/species/nevrean/helmet_vr.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/helmet_vr.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/helmet_vr.dmi',
SPECIES_ZORREN_FLAT = 'icons/mob/species/fennec/helmet_vr.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/helmet_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/helmet.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_VOX = 'icons/mob/species/vox/head.dmi',
SPECIES_TESHARI = 'icons/mob/species/seromi/head.dmi'
)
@@ -25,23 +23,21 @@
SPECIES_NEVREAN = 'icons/mob/species/nevrean/suit_vr.dmi',
SPECIES_AKULA = 'icons/mob/species/akula/suit_vr.dmi',
SPECIES_SERGAL = 'icons/mob/species/sergal/suit_vr.dmi',
SPECIES_ZORREN_FLAT = 'icons/mob/species/fennec/suit_vr.dmi',
SPECIES_ZORREN_HIGH = 'icons/mob/species/fox/suit_vr.dmi',
SPECIES_VULPKANIN = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_PROMETHEAN = 'icons/mob/species/skrell/suit.dmi',
SPECIES_XENOHYBRID = 'icons/mob/species/unathi/suit.dmi',
SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
SPECIES_TESHARI = 'icons/mob/species/seromi/suit.dmi'
)
/obj/item/clothing/head/helmet/space/rig
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
/obj/item/clothing/gloves/gauntlets/rig
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
/obj/item/clothing/shoes/magboots/rig
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
/obj/item/clothing/suit/space/rig
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_XENOHYBRID, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_TAJ, SPECIES_UNATHI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_PROMETHEAN, SPECIES_VOX, SPECIES_TESHARI, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_ALRAUNE)

4
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -13,7 +13,7 @@
// flags_inv = HIDEEARS|BLOCKHAIR
//Species-specific stuff.
species_restricted = list("Human", "Promethean")
species_restricted = list(SPECIES_HUMAN, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) //VOREStation Edit
sprite_sheets_refit = list(
SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
@@ -42,7 +42,7 @@
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 10 * ONE_ATMOSPHERE
species_restricted = list("Human", SPECIES_SKRELL, "Promethean")
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) //VOREStation Edit
sprite_sheets_refit = list(
SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',

25
code/modules/clothing/spacesuits/void/void_vr.dm
View File

@@ -14,11 +14,9 @@
"Nevrean" = 'icons/mob/species/nevrean/helmet_vr.dmi',
"Akula" = 'icons/mob/species/akula/helmet_vr.dmi',
"Sergal" = 'icons/mob/species/sergal/helmet_vr.dmi',
"Flatland Zorren" = 'icons/mob/species/fennec/helmet_vr.dmi',
"Highlander Zorren" = 'icons/mob/species/fox/helmet_vr.dmi',
"Zorren" = 'icons/mob/species/fox/helmet_vr.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Promethean" = 'icons/mob/species/skrell/helmet.dmi',
"Xenomorph Hybrid" = 'icons/mob/species/unathi/helmet.dmi'
"Promethean" = 'icons/mob/species/skrell/helmet.dmi'
)
sprite_sheets_obj = list(
@@ -29,11 +27,9 @@
"Nevrean" = 'icons/obj/clothing/species/nevrean/hats.dmi',
"Akula" = 'icons/obj/clothing/species/akula/hats.dmi',
"Sergal" = 'icons/obj/clothing/species/sergal/hats.dmi',
"Flatland Zorren" = 'icons/obj/clothing/species/fennec/hats.dmi',
"Highlander Zorren" = 'icons/obj/clothing/species/fox/hats.dmi',
"Zorren" = 'icons/obj/clothing/species/fox/hats.dmi',
"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/hats.dmi',
"Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi',
"Xenomorph Hybrid" = 'icons/obj/clothing/species/unathi/hats.dmi'
"Promethean" = 'icons/obj/clothing/species/skrell/hats.dmi'
)
/obj/item/clothing/suit/space/void
@@ -45,11 +41,9 @@
"Nevrean" = 'icons/mob/species/nevrean/suit_vr.dmi',
"Akula" = 'icons/mob/species/akula/suit_vr.dmi',
"Sergal" = 'icons/mob/species/sergal/suit_vr.dmi',
"Flatland Zorren" = 'icons/mob/species/fennec/suit_vr.dmi',
"Highlander Zorren" = 'icons/mob/species/fox/suit_vr.dmi',
"Zorren" = 'icons/mob/species/fox/suit_vr.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Promethean" = 'icons/mob/species/skrell/suit.dmi',
"Xenomorph Hybrid" = 'icons/mob/species/unathi/suit.dmi'
"Promethean" = 'icons/mob/species/skrell/suit.dmi'
)
@@ -62,8 +56,7 @@
"Nevrean" = 'icons/obj/clothing/species/nevrean/suits.dmi',
"Akula" = 'icons/obj/clothing/species/akula/suits.dmi',
"Sergal" = 'icons/obj/clothing/species/sergal/suits.dmi',
"Flatland Zorren" = 'icons/obj/clothing/species/fennec/suits.dmi',
"Highlander Zorren" = 'icons/obj/clothing/species/fox/suits.dmi',
"Zorren" = 'icons/obj/clothing/species/fox/suits.dmi',
"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi',
"Promethean" = 'icons/obj/clothing/species/skrell/suits.dmi'
)
@@ -90,8 +83,6 @@
SPECIES_VASILISSAN,
SPECIES_VULPKANIN,
SPECIES_XENOCHIMERA,
SPECIES_XENOHYBRID,
SPECIES_ZORREN_FLAT,
SPECIES_ZORREN_HIGH
)
/obj/item/clothing/suit/space/void/explorer/Initialize()
@@ -114,8 +105,6 @@
SPECIES_VASILISSAN,
SPECIES_VULPKANIN,
SPECIES_XENOCHIMERA,
SPECIES_XENOHYBRID,
SPECIES_ZORREN_FLAT,
SPECIES_ZORREN_HIGH
)
/obj/item/clothing/head/helmet/space/void/explorer/Initialize()

3
code/modules/mob/living/carbon/human/human_species_vr.dm
View File

@@ -14,9 +14,6 @@
/mob/living/carbon/human/xenochimera/New(var/new_loc)
..(new_loc, "Xenochimera")
/mob/living/carbon/human/xenohybrid/New(var/new_loc)
..(new_loc, "Xenomorph Hybrid")
/mob/living/carbon/human/spider/New(var/new_loc)
..(new_loc, "Vasilissan")

4
code/modules/mob/living/carbon/human/species/station/prometheans_vr.dm
View File

@@ -8,8 +8,8 @@
valid_transform_species = list(
"Human", "Unathi", "Tajara", "Skrell",
"Diona", "Teshari", "Monkey","Sergal",
"Akula","Nevrean","Highlander Zorren",
"Flatland Zorren", "Vulpkanin", "Vasilissan",
"Akula","Nevrean","Zorren",
"Fennec", "Vulpkanin", "Vasilissan",
"Rapala", "Neaera", "Stok", "Farwa", "Sobaka",
"Wolpin", "Saru", "Sparra")

161
code/modules/mob/living/carbon/human/species/station/station_vr.dm
View File

@@ -179,8 +179,7 @@
have adjusted better to their new lives. Though similar fox-like beings have been seen they are different than the Zorren."
wikilink="https://wiki.vore-station.net/Zorren"
catalogue_data = list(/datum/category_item/catalogue/fauna/zorren,
/datum/category_item/catalogue/fauna/highzorren)
catalogue_data = list(/datum/category_item/catalogue/fauna/zorren)
//primitive_form = "" //We don't have fox-monkey sprites.
@@ -198,51 +197,6 @@
)
inherent_verbs = list(/mob/living/proc/shred_limb)
/datum/species/fl_zorren
name = SPECIES_ZORREN_FLAT
name_plural = "Zorren"
icobase = 'icons/mob/human_races/r_fennec_vr.dmi'
deform = 'icons/mob/human_races/r_def_fennec.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)
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_TERMINUS)
name_language = LANGUAGE_TERMINUS
inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds)
min_age = 18
max_age = 80
blurb = "The fox-like Zorren are native to Virgo-Prime, however there are two distinct varieties of Zorren one with large ears and shorter fur, \
and the other with longer fur that is a bit more vibrant. The long-eared, short-furred Zorren have come to be known as Flatland Zorren as that is \
where most of their settlements are located. The Flatland Zorren are somewhat tribal and shamanistic as they have only recently started to be \
hired by the Trans-Stellar Corporations. The other variety of Zorren are known as Highland Zorren as they frequently settle in hilly and/or \
mountainous areas, they have a differing societal structure than the Flatland Zorren having a more feudal social structure, like the Flatland Zorren, \
the Highland Zorren have also only recently been hired by the Trans-Stellar Corporations, but thanks to the different social structure they \
seem to have adjusted better to their new lives. Though similar fox-like beings have been seen they are different than the Zorren."
wikilink="https://wiki.vore-station.net/Zorren"
catalogue_data = list(/datum/category_item/catalogue/fauna/zorren,
/datum/category_item/catalogue/fauna/flatzorren)
//primitive_form = "" //We don't have fennec-monkey sprites.
spawn_flags = SPECIES_CAN_JOIN
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
flesh_color = "#AFA59E"
base_color = "#333333"
blood_color = "#240bc4"
color_mult = 1
inherent_verbs = list(/mob/living/proc/shred_limb)
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
"Your overheated skin itches."
)
/datum/species/vulpkanin
name = SPECIES_VULPKANIN
name_plural = "Vulpkanin"
@@ -283,45 +237,6 @@
min_age = 18
max_age = 80
/datum/species/xenohybrid
name = SPECIES_XENOHYBRID
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
min_age = 18
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."
catalogue_data = list(/datum/category_item/catalogue/fauna/xenohybrid)
// No wiki page for xenohybrids at present
//primitive_form = "" //None for these guys
spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
blood_color = "#12ff12"
flesh_color = "#201730"
base_color = "#201730"
heat_discomfort_strings = list(
"Your chitin feels extremely warm.",
"You feel uncomfortably warm.",
"Your chitin feels hot."
)
inherent_verbs = list(/mob/living/proc/shred_limb)
/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.
icobase = 'icons/mob/human_races/r_lizard_vr.dmi'
@@ -572,4 +487,76 @@ datum/species/harpy
return SPECIES_SHADEKIN
/datum/species/shadekin/can_breathe_water()
return TRUE //they dont quite breathe
return TRUE //they dont quite breathe
//These species are not really species but are just there for custom species selection
/datum/species/fl_zorren
name = SPECIES_FENNEC
name_plural = "Fennec"
icobase = 'icons/mob/human_races/r_fennec_vr.dmi'
deform = 'icons/mob/human_races/r_def_fennec.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)
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_TERMINUS)
name_language = LANGUAGE_TERMINUS
inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds)
min_age = 18
max_age = 80
//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
flesh_color = "#AFA59E"
base_color = "#333333"
blood_color = "#240bc4"
color_mult = 1
inherent_verbs = list(/mob/living/proc/shred_limb)
heat_discomfort_strings = list(
"Your fur prickles in the heat.",
"You feel uncomfortably warm.",
"Your overheated skin itches."
)
/datum/species/xenohybrid
name = SPECIES_XENOHYBRID
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
min_age = 18
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."
// No wiki page for xenohybrids at present
//primitive_form = "" //None for these guys
spawn_flags = SPECIES_IS_RESTRICTED
appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR
blood_color = "#12ff12"
flesh_color = "#201730"
base_color = "#201730"
heat_discomfort_strings = list(
"Your chitin feels extremely warm.",
"You feel uncomfortably warm.",
"Your chitin feels hot."
)
inherent_verbs = list(/mob/living/proc/shred_limb)

52
code/modules/mob/new_player/sprite_accessories_vr.dm
View File

@@ -8,7 +8,7 @@
//var/icon_add = 'icons/mob/human_face.dmi' //Already defined in sprite_accessories.dm line 49.
var/color_blend_mode = ICON_MULTIPLY
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use the default hairstyles.
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use the default hairstyles.
astolfo
name = "Astolfo"
@@ -87,14 +87,14 @@
name = "Bald"
icon_state = "bald"
gender = MALE
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //Lets all the races be bald if they want.
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //Lets all the races be bald if they want.
ponytail6_fixed //Eggnerd's done with waiting for upstream fixes lmao.
name = "Ponytail 6 but fixed"
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "hair_ponytail6"
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA,SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST)
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST)
una_hood
name = "Cobra Hood"
@@ -326,7 +326,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "kajam"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_keid
@@ -334,7 +334,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "keid"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_adhara
@@ -342,7 +342,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "adhara"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_kleeia
@@ -350,7 +350,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "kleeia"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_mizar
@@ -358,7 +358,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "mizar"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_apollo
@@ -366,7 +366,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "apollo"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_belle
@@ -374,7 +374,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "belle"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_bun
@@ -382,7 +382,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "bun"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_jagged
@@ -390,7 +390,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "jagged"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_curl
@@ -398,7 +398,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "curl"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_hawk
@@ -406,7 +406,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "hawk"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_anita
@@ -414,7 +414,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "anita"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_short
@@ -422,7 +422,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "short"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
vulp_hair_spike
@@ -430,7 +430,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "spike"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
gender = NEUTER
//xeno stuffs
@@ -439,7 +439,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_drone"
species_allowed = list(SPECIES_XENOHYBRID)
species_allowed = list(SPECIES_CUSTOM)
gender = NEUTER
// figure this one out for better coloring
xeno_head_sentinel_color
@@ -447,7 +447,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_sentinel"
species_allowed = list(SPECIES_XENOHYBRID)
species_allowed = list(SPECIES_CUSTOM)
gender = NEUTER
xeno_head_queen_color
@@ -455,7 +455,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_queen"
species_allowed = list(SPECIES_XENOHYBRID)
species_allowed = list(SPECIES_CUSTOM)
gender = NEUTER
xeno_head_hunter_color
@@ -463,7 +463,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_hunter"
species_allowed = list(SPECIES_XENOHYBRID)
species_allowed = list(SPECIES_CUSTOM)
gender = NEUTER
xeno_head_praetorian_color
@@ -471,7 +471,7 @@
icon = 'icons/mob/human_face_vr.dmi'
icon_add = 'icons/mob/human_face_vr_add.dmi'
icon_state = "cxeno_praetorian"
species_allowed = list(SPECIES_XENOHYBRID)
species_allowed = list(SPECIES_CUSTOM)
gender = NEUTER
// Shadekin stuffs
@@ -512,20 +512,20 @@
/datum/sprite_accessory/facial_hair
icon = 'icons/mob/human_face_or_vr.dmi'
var/color_blend_mode = ICON_MULTIPLY
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This lets all races use the facial hair styles.
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This lets all races use the facial hair styles.
shaved
name = "Shaved"
icon_state = "bald"
gender = NEUTER
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This needed to be manually defined, apparantly.
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This needed to be manually defined, apparantly.
neck_fluff
name = "Neck Fluff"
icon = 'icons/mob/human_face_or_vr.dmi'
icon_state = "facial_neckfluff"
gender = NEUTER
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST)
species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST)
vulp_none
name = "None"
@@ -1090,7 +1090,7 @@
name = "Heterochromia"
icon_state = "heterochromia"
body_parts = list(BP_HEAD)
species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_ZORREN_FLAT, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This lets all races use the default hairstyles.
species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This lets all races use the default hairstyles.
werewolf_nose
name = "Werewolf nose"

9
code/modules/vore/eating/leave_remains_vr.dm
View File

@@ -46,7 +46,7 @@
if(SPECIES_SERGAL)
new /obj/item/weapon/digestion_remains/skull/sergal(src,owner)
skull_amount--
if(SPECIES_ZORREN_FLAT || SPECIES_ZORREN_HIGH)
if(SPECIES_ZORREN_HIGH)
new /obj/item/weapon/digestion_remains/skull/zorren(src,owner)
skull_amount--
if(SPECIES_NEVREAN)
@@ -58,9 +58,6 @@
if(SPECIES_VOX)
new /obj/item/weapon/digestion_remains/skull/vox(src,owner)
skull_amount--
if(SPECIES_XENOHYBRID)
new /obj/item/weapon/digestion_remains/skull/xenohybrid(src,owner)
skull_amount--
if(skull_amount && H.species.selects_bodytype) //We still haven't found correct skull...
if(H.species.base_species == SPECIES_HUMAN)
new /obj/item/weapon/digestion_remains/skull/unknown(src,owner)
@@ -157,7 +154,3 @@
/obj/item/weapon/digestion_remains/skull/unknown/anthro
icon_state = "skull_taj"
/obj/item/weapon/digestion_remains/skull/xenohybrid
desc = "A bleached skull. It looks very weakened. Seems like it belonged to something with an elongated head."
icon_state = "skull_xenohybrid"