From 4bef69e32a6a396ddaa732c14ef0c3ee5d19c52c Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 26 Nov 2019 09:35:24 +1000 Subject: [PATCH] Adds black-eyed shadekin --- code/__defines/mobs_vr.dm | 7 +- .../carbon/human/species/shadekin/shadekin.dm | 7 +- .../human/species/station/station_vr.dm | 115 +++++++++++++++++- .../mob/new_player/sprite_accessories_vr.dm | 14 +-- code/modules/organs/subtypes/standard_vr.dm | 6 + .../appearance/sprite_accessories_taur_vr.dm | 2 +- .../vore/appearance/sprite_accessories_vr.dm | 4 +- 7 files changed, 140 insertions(+), 15 deletions(-) diff --git a/code/__defines/mobs_vr.dm b/code/__defines/mobs_vr.dm index 924b8b4814..99ff177e52 100644 --- a/code/__defines/mobs_vr.dm +++ b/code/__defines/mobs_vr.dm @@ -17,12 +17,15 @@ #define A_FRUIT "fruit gland" //species defines + +//station species #define SPECIES_AKULA "Akula" #define SPECIES_ALRAUNE "Alraune" #define SPECIES_NEVREAN "Nevrean" #define SPECIES_PROTEAN "Protean" #define SPECIES_RAPALA "Rapala" #define SPECIES_SERGAL "Sergal" +#define SPECIES_SHADEKIN_CREW "Black-Eyed Shadekin" #define SPECIES_VASILISSAN "Vasilissan" #define SPECIES_VULPKANIN "Vulpkanin" #define SPECIES_XENOCHIMERA "Xenochimera" @@ -30,11 +33,11 @@ #define SPECIES_ZORREN_FLAT "Flatland Zorren" #define SPECIES_ZORREN_HIGH "Highlander Zorren" #define SPECIES_CUSTOM "Custom Species" - +//monkey species #define SPECIES_MONKEY_AKULA "Sobaka" #define SPECIES_MONKEY_NEVREAN "Sparra" #define SPECIES_MONKEY_SERGAL "Saru" #define SPECIES_MONKEY_VULPKANIN "Wolpin" - +//event species #define SPECIES_WEREBEAST "Werebeast" #define SPECIES_SHADEKIN "Shadekin" diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index f2e7ad188b..aad75767cd 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -14,7 +14,10 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/shadekin) language = LANGUAGE_SHADEKIN - assisted_langs = list() + name_language = LANGUAGE_SHADEKIN + species_language = LANGUAGE_SHADEKIN + secondary_langs = list(LANGUAGE_SHADEKIN) + num_alternate_languages = 3 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws/shadekin, /datum/unarmed_attack/bite/sharp/shadekin) rarity_value = 15 //INTERDIMENSIONAL FLUFFERS @@ -51,6 +54,8 @@ base_color = "#f0f0f0" color_mult = 1 + inherent_verbs = list(/mob/living/proc/shred_limb) + has_glowing_eyes = TRUE death_message = "phases to somewhere far away!" 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 b1fae43ce2..ccc89934c7 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 @@ -410,6 +410,9 @@ base_color = "#EECEB3" wikilink="https://wiki.vore-station.net/Human" +/datum/species/human/vatgrown + spawn_flags = SPECIES_IS_RESTRICTED + /datum/species/vox gluttonous = 0 spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE @@ -460,5 +463,113 @@ datum/species/harpy "Your overheated skin itches." ) -/datum/species/human/vatgrown - spawn_flags = SPECIES_IS_RESTRICTED +/datum/species/crew_shadekin + name = SPECIES_SHADEKIN_CREW + name_plural = "Black-Eyed Shadekin" + icobase = 'icons/mob/human_races/r_shadekin_vr.dmi' + deform = 'icons/mob/human_races/r_shadekin_vr.dmi' + tail = "tail" + icobase_tail = 1 + blurb = "Very little is known about these creatures. They appear to be largely mammalian in appearance. \ + Seemingly very rare to encounter, there have been widespread myths of these creatures the galaxy over, \ + but next to no verifiable evidence to their existence. However, they have recently been more verifiably \ + documented in the Virgo system, following a mining bombardment of Virgo 3. The crew of NSB Adephagia have \ + taken to calling these creatures 'Shadekin', and the name has generally stuck and spread. " //TODO: Something more fitting for black-eyes + wikilink = "https://wiki.vore-station.net/Shadekin" + catalogue_data = list(/datum/category_item/catalogue/fauna/shadekin) + + language = LANGUAGE_SHADEKIN + name_language = LANGUAGE_SHADEKIN + species_language = LANGUAGE_SHADEKIN + secondary_langs = list(LANGUAGE_SHADEKIN) + num_alternate_languages = 3 + unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) + rarity_value = 5 //INTERDIMENSIONAL FLUFFERS + + siemens_coefficient = 0 + darksight = 10 + + slowdown = 1.1 + item_slowdown_mod = 1.5 + + total_health = 75 + brute_mod = 1.5 // Frail + burn_mod = 1.5 // Furry + blood_volume = 500 + hunger_factor = 0.2 + + warning_low_pressure = 50 + hazard_low_pressure = -1 + + warning_high_pressure = 300 + hazard_high_pressure = INFINITY + + cold_level_1 = -1 //Immune to cold + cold_level_2 = -1 + cold_level_3 = -1 + + heat_level_1 = 850 //Resistant to heat + heat_level_2 = 1000 + heat_level_3 = 1150 + + flags = NO_SCAN + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE + + reagent_tag = IS_SHADEKIN // for shadekin-unqiue chem interactions + + flesh_color = "#FFC896" + blood_color = "#A10808" + base_color = "#f0f0f0" + color_mult = 1 + + inherent_verbs = list(/mob/living/proc/shred_limb) + + has_glowing_eyes = TRUE + + male_cough_sounds = null + female_cough_sounds = null + male_sneeze_sound = null + female_sneeze_sound = null + + speech_bubble_appearance = "ghost" + + genders = list(PLURAL, NEUTER) //no sexual dymorphism + ambiguous_genders = TRUE //but just in case + + breath_type = null + poison_type = null + + appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_SKIN_COLOR | HAS_UNDERWEAR + + move_trail = /obj/effect/decal/cleanable/blood/tracks/paw + + has_organ = list( + O_HEART = /obj/item/organ/internal/heart, + O_VOICE = /obj/item/organ/internal/voicebox, + O_LIVER = /obj/item/organ/internal/liver, + O_KIDNEYS = /obj/item/organ/internal/kidneys, + O_BRAIN = /obj/item/organ/internal/brain, + O_EYES = /obj/item/organ/internal/eyes, + O_STOMACH = /obj/item/organ/internal/stomach, + O_INTESTINE = /obj/item/organ/internal/intestine + ) + + has_limbs = list( + BP_TORSO = list("path" = /obj/item/organ/external/chest), + BP_GROIN = list("path" = /obj/item/organ/external/groin), + BP_HEAD = list("path" = /obj/item/organ/external/head/vr/shadekin/crew), + BP_L_ARM = list("path" = /obj/item/organ/external/arm), + BP_R_ARM = list("path" = /obj/item/organ/external/arm/right), + BP_L_LEG = list("path" = /obj/item/organ/external/leg), + BP_R_LEG = list("path" = /obj/item/organ/external/leg/right), + BP_L_HAND = list("path" = /obj/item/organ/external/hand), + BP_R_HAND = list("path" = /obj/item/organ/external/hand/right), + BP_L_FOOT = list("path" = /obj/item/organ/external/foot), + BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right) + ) + +/datum/species/shadekin/get_bodytype() + return SPECIES_SHADEKIN + +/datum/species/shadekin/can_breathe_water() + return TRUE //they dont quite breathe \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 2c316175db..006a445bf4 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -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) //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_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. astolfo name = "Astolfo" @@ -481,7 +481,7 @@ icon = 'icons/mob/human_face_vr.dmi' icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_short" - species_allowed = list(SPECIES_SHADEKIN) + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) gender = NEUTER shadekin_hair_poofy @@ -489,7 +489,7 @@ icon = 'icons/mob/human_face_vr.dmi' icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_poofy" - species_allowed = list(SPECIES_SHADEKIN) + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) gender = NEUTER shadekin_hair_long @@ -497,7 +497,7 @@ icon = 'icons/mob/human_face_vr.dmi' icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_long" - species_allowed = list(SPECIES_SHADEKIN) + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) gender = NEUTER shadekin_hair_rivyr @@ -506,7 +506,7 @@ icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "shadekin_rivyr" ckeys_allowed = list("verysoft") - species_allowed = list(SPECIES_SHADEKIN) + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) gender = NEUTER /datum/sprite_accessory/facial_hair @@ -1096,7 +1096,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, SPECIES_SHADEKIN) //This lets all races use the default hairstyles. + 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. werewolf_nose name = "Werewolf nose" @@ -1135,4 +1135,4 @@ icon_state = "shadekin-snoot" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_SHADEKIN) \ No newline at end of file + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) \ No newline at end of file diff --git a/code/modules/organs/subtypes/standard_vr.dm b/code/modules/organs/subtypes/standard_vr.dm index 16f49361ae..ea4bf62727 100644 --- a/code/modules/organs/subtypes/standard_vr.dm +++ b/code/modules/organs/subtypes/standard_vr.dm @@ -68,3 +68,9 @@ eye_icons_vr = 'icons/mob/human_face_vr.dmi' eye_icon_vr = "eyes_shadekin" + +/obj/item/organ/external/head/vr/shadekin/crew + cannot_gib = 0 + cannot_amputate = 0 + + eye_icon_vr = "eyes_shadekin_station" diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index 1f82272c2a..3391aa7a48 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -167,7 +167,7 @@ clip_mask_icon = null clip_mask_state = null apply_restrictions = TRUE - species_allowed = list(SPECIES_SHADEKIN) + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) /datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c name = "Shadekin Tail dual-color (Shadekin)" diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index e3db39ec3c..ff2c109d32 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -39,7 +39,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY apply_restrictions = TRUE - species_allowed = list(SPECIES_SHADEKIN) + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) // Ears avaliable to anyone @@ -692,7 +692,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY apply_restrictions = TRUE - species_allowed = list(SPECIES_SHADEKIN) + species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) // Everyone tails