Bandastation species: Tajaran

code/modules/mob/living/carbon/human/dummy.dm

@@ -121,6 +121,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	target.dna.features["pod_hair"] = get_consistent_feature_entry(SSaccessories.pod_hair_list)
 	target.dna.features["caps"] = get_consistent_feature_entry(SSaccessories.caps_list)
 	// BANDA STATION EDIT START
+	// vulpkanin
 	target.dna.features["vulpkanin_body_markings"] = get_consistent_feature_entry(SSaccessories.vulpkanin_body_markings_list)
 	target.dna.features["vulpkanin_head_markings"] = get_consistent_feature_entry(SSaccessories.vulpkanin_head_markings_list)
 	target.dna.features["vulpkanin_head_accessories"] = get_consistent_feature_entry(SSaccessories.vulpkanin_head_accessories_list)
@@ -132,6 +133,16 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 	target.dna.features["furcolor_third"] = COLOR_WHITE
 	target.dna.features["furcolor_fourth"] = COLOR_WHITE
 	target.dna.features["furcolor_fifth"] = COLOR_WHITE
+	// tajaran
+	target.dna.features["tajaran_body_markings"] = get_consistent_feature_entry(SSaccessories.tajaran_body_markings_list)
+	target.dna.features["tajaran_head_markings"] = get_consistent_feature_entry(SSaccessories.tajaran_head_markings_list)
+	target.dna.features["tail_tajaran"] = get_consistent_feature_entry(SSaccessories.tails_list_tajaran)
+	target.dna.features["tajaran_tail_markings"] = get_consistent_feature_entry(SSaccessories.tajaran_tail_markings_list)
+	target.dna.features["tajaran_facial_hair"] = get_consistent_feature_entry(SSaccessories.tajaran_facial_hair_list)
+	target.dna.features["furcolor_tajaran_first"] = COLOR_WHITE
+	target.dna.features["furcolor_tajaran_second"] = COLOR_WHITE
+	target.dna.features["furcolor_tajaran_third"] = COLOR_WHITE
+	target.dna.features["furcolor_tajaran_fourth"] = COLOR_WHITE
 	// BANDA STATION EDIT STOP
 	target.dna.initialize_dna(create_mutation_blocks = FALSE, randomize_features = FALSE)
 	// UF and UI are nondeterministic, even though the features are the same some blocks will randomize slightly

code/modules/mob/living/carbon/human/human_update_icons.dm

@@ -394,13 +394,14 @@
 		// BANDASTATION EDIT START - SPECIES CLOTHING ICONS
 		var/list/icon_files_species = list(
 			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi',
+			"tajaran" = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/head.dmi',
 		)
 
 		var/mutant_override = FALSE
 
 		var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_head.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_head.species_bodytype]
@@ -463,13 +464,14 @@
 		// BANDASTATION EDIT START - SPECIES CLOTHING ICONS
 		var/list/icon_files_species = list(
 			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi',
+			"tajaran" = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/suit.dmi',
 		)
 
 		var/mutant_override = FALSE
 
 		var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_chest.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_chest.species_bodytype]
@@ -508,7 +510,7 @@
 			if(hud_used.hud_shown)
 				client.screen += r_store
 			update_observer_view(r_store)
-
+	// BANDASTATION EDIT START - SPECIES CLOTHING ICONS
 /mob/living/carbon/human/update_worn_mask(update_obscured = TRUE)
 	remove_overlay(FACEMASK_LAYER)
 
@@ -533,13 +535,14 @@
 		var/icon_file = 'icons/mob/clothing/mask.dmi'
 		var/list/icon_files_species = list(
 			"vulpkanin" = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/mask.dmi',
+			"tajaran" = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/mask.dmi',
 		)
 
 		var/mutant_override = FALSE
 
 		var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
 		if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])
 			icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]
 			mutant_override = TRUE
 		else if(bodypart_head.species_bodytype in icon_files_species)
 			icon_file = icon_files_species[bodypart_head.species_bodytype]
@@ -551,6 +554,7 @@
 
 		var/mutable_appearance/mask_overlay = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = icon_file, override_file = mutant_override ? icon_file : null)
 		my_head.worn_mask_offset?.apply_offset(mask_overlay)
+	// BANDASTATION EDIT STOP - SPECIES CLOTHING ICONS
 		overlays_standing[FACEMASK_LAYER] = mask_overlay
 
 	apply_overlay(FACEMASK_LAYER)

config/bandastation/bandastation_config.txt

@@ -17,6 +17,7 @@
 
 ## Bandastation Races
 ROUNDSTART_RACES vulpkanin
+ROUNDSTART_RACES tajaran
 
 #MIN_THREAT_TO_ROUNDSTART_PERCENT 30
 #MAX_THREAT_TO_ROUNDSTART_PERCENT 60
@@ -32,4 +33,4 @@ ROUNDSTART_RACES vulpkanin
 ## If players are able to create crew transfer vote
 #ALLOW_CREW_TRANSFER_VOTE
 ## If automatic crew transfer is enabled
-#ENABLE_AUTOMATIC_CREW_TRANSFER
+#ENABLE_AUTOMATIC_CREW_TRANSFER

modular_bandastation/emote_panel/code/_emote_defines.dm

@@ -129,6 +129,11 @@
 #define EMOTE_HUMAN_WHIP 			"Ударить хвостом"
 #define EMOTE_HUMAN_BARK			"Гавкнуть"
 #define EMOTE_HUMAN_WBARK			"Дважды гавкнуть"
+#define EMOTE_HUMAN_MEOW			"Мяукнуть"
+#define EMOTE_HUMAN_MOW				"Мяукнуть раздражённо"
+#define EMOTE_HUMAN_PURRR			"Мурчать дольше"
+#define EMOTE_HUMAN_PUR				"Мурчать кратко"
+#define EMOTE_HUMAN_HISST			"Шипеть"
 
 /// Carbon Emotes
 #define EMOTE_CARBON_BLINK 			"Моргать"

modular_bandastation/emote_panel/code/emote_verbs.dm

@@ -496,3 +496,34 @@
 	set name = "◦ " + EMOTE_SHIVER + " "
 	set category = "Эмоции"
 	emote("shiver", intentional = TRUE)
+
+// MARK: Tajaran emotes
+/mob/living/carbon/human/species/tajaran/proc/emote_meow()
+  set name = "▷ " + EMOTE_HUMAN_MEOW + " "
+  set category = "Эмоции"
+  emote("meow_t", intentional = TRUE)
+
+/mob/living/carbon/human/species/tajaran/proc/emote_mow()
+  set name = "▷ " + EMOTE_HUMAN_MOW + " "
+  set category = "Эмоции"
+  emote("mow", intentional = TRUE)
+
+/mob/living/carbon/human/species/tajaran/proc/emote_purr()
+  set name = "▷ " + EMOTE_HUMAN_PURR + " "
+  set category = "Эмоции"
+  emote("purr_t", intentional = TRUE)
+
+/mob/living/carbon/human/species/tajaran/proc/emote_pur()
+  set name = "▷ " + EMOTE_HUMAN_PUR + " "
+  set category = "Эмоции"
+  emote("pur", intentional = TRUE)
+
+/mob/living/carbon/human/species/tajaran/proc/emote_purrr()
+  set name = "▷ " + EMOTE_HUMAN_PURRR + " "
+  set category = "Эмоции"
+  emote("purrr", intentional = TRUE)
+
+/mob/living/carbon/human/species/tajaran/proc/emote_hiss_t()
+  set name = "▷ " + EMOTE_HUMAN_HISST + " "
+  set category = "Эмоции"
+  emote("hiss_t", intentional = TRUE)

modular_bandastation/emote_panel/code/emotes.dm

@@ -13,11 +13,10 @@
 		return 'modular_bandastation/emote_panel/audio/male/sniff_male.ogg'
 
 /datum/emote/living/carbon/scratch/New()
-	mob_type_allowed_typecache += list(/mob/living/carbon/human)
-	. = ..()
-
-// Vulpkanin
+  mob_type_allowed_typecache += list(/mob/living/carbon/human)
+  . = ..()
 
+// MARK: Vulpkanin emotes
 /datum/emote/living/carbon/human/vulpkanin/can_run_emote(mob/user, status_check = TRUE, intentional = FALSE)
 	var/organ = user.get_organ_slot(ORGAN_SLOT_TONGUE)
 	if(istype(organ, /obj/item/organ/tongue/vulpkanin))
@@ -83,3 +82,77 @@
 	vary = TRUE
 	cooldown = 2 SECONDS
 	sound = 'modular_bandastation/emote_panel/audio/wbark.ogg'
+
+// MARK: Tajaran emotes
+/datum/emote/living/carbon/human/tajaran/can_run_emote(mob/user, status_check = TRUE, intentional, params)
+  if(!istype(user.get_organ_slot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/tajaran))
+    return FALSE
+  return ..()
+
+/datum/emote/living/carbon/human/tajaran/emote_meow
+	name = "Мяукнуть"
+	key = "meow_t"
+	key_third_person = "meows"
+	message = "мяукает."
+	message_mime = "бесшумно мяукает."
+	message_param = "мяукает на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	vary = TRUE
+	cooldown = 4 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/tajaran/tajaran_meow.ogg'
+
+/datum/emote/living/carbon/human/tajaran/emote_mow
+	name = "Мяукнуть раздражённо"
+	key = "mow"
+	key_third_person = "mows"
+	message = "раздражённо мяукает."
+	message_mime = "бесшумно раздражённо мяукает."
+	message_param = "раздражённо мяукает на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	vary = TRUE
+	cooldown = 4 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/tajaran/tajaran_annoyed_meow.ogg'
+
+/datum/emote/living/carbon/human/tajaran/emote_purr
+	name = "Мурчать"
+	key = "purr_t"
+	key_third_person = "purrs"
+	message = "мурчит."
+	message_mime = "бесшумно мурчит."
+	message_param = "мурчит на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	cooldown = 4 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/tajaran/tajaran_purr.ogg'
+
+/datum/emote/living/carbon/human/tajaran/emote_pur
+	name = "Мурчать кратко"
+	key = "pur"
+	key_third_person = "purs"
+	message = "кратко мурчит."
+	message_mime = "бесшумно кратко мурчит."
+	message_param = "кратко мурчит на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	cooldown = 4 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/tajaran/tajaran_purr_short.ogg'
+
+/datum/emote/living/carbon/human/tajaran/emote_purrr
+	name = "Мурчать дольше"
+	key = "purrr"
+	key_third_person = "purrrs"
+	message = "длительно мурчит."
+	message_mime = "бесшумно длительно мурчит."
+	message_param = "длительно мурчит на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	cooldown = 4 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/tajaran/tajaran_purr_long.ogg'
+
+/datum/emote/living/carbon/human/tajaran/emote_hiss_t
+	name = "Шипеть"
+	key = "hiss_t"
+	key_third_person = "hisses"
+	message = "шипит."
+	message_mime = "бесшумно шипит."
+	message_param = "шипит на %t."
+	emote_type = EMOTE_AUDIBLE | EMOTE_VISIBLE
+	cooldown = 4 SECONDS
+	sound = 'modular_bandastation/emote_panel/audio/tajaran/tajaran_hiss.ogg'

modular_bandastation/species/_species.dm

@@ -1,4 +1,4 @@
 /datum/modpack/species
 	name = "Species"
 	desc = "Добавление архитектуры для новых видов и конфигурирования существующих."
-	author = "Nlaysi, Podvaldeda"
+	author = "Nlaysi, Podvaldeda, Dekupich"

modular_bandastation/species/_species.dme

@@ -9,15 +9,22 @@
 
 #include "code/human/species/skills.dm"
 #include "code/human/species_type/vulpkanin.dm"
+#include "code/human/species_type/tajaran.dm"
 #include "code/human/sprite_accessories/hair.dm"
 #include "code/human/sprite_accessories/vulpkanin.dm"
+#include "code/human/sprite_accessories/tajaran.dm"
 #include "code/human/carbon.dm"
 
 #include "code/preferences/species_features/vulpkanin.dm"
+#include "code/preferences/species_features/tajaran.dm"
 
 #include "code/reagents/mutation.dm"
 
 #include "code/surgery/bodyparts/vulpkanin_bodyparts.dm"
+#include "code/surgery/bodyparts/tajaran_bodyparts.dm"
+
 #include "code/surgery/organs/external/vulpkanin_external.dm"
 #include "code/surgery/organs/internal/vulpkanin_internal.dm"
+#include "code/surgery/organs/external/tajaran_external.dm"
+#include "code/surgery/organs/internal/tajaran_internal.dm"
 #include "code/surgery/organs/limbgrower_designs.dm"

modular_bandastation/species/code/_defines.dm

@@ -1,8 +1,7 @@
+// vulpkanin
 #define SPECIES_VULPKANIN "vulpkanin"
 #define BUTT_SPRITE_VULPKANIN "vulpkanin"
-
 #define DEFAULT_SPRITE_LIST "default_sprites"
-
 #define DNA_VULPKANIN_BODY_MARKINGS DNA_FEATURE_BLOCKS + 1
 #define DNA_VULPKANIN_HEAD_MARKINGS DNA_FEATURE_BLOCKS + 2
 #define DNA_VULPKANIN_HEAD_ACCESSORIES DNA_FEATURE_BLOCKS + 3
@@ -15,29 +14,60 @@
 #define DNA_FURCOLOR_4 DNA_FEATURE_BLOCKS + 10
 #define DNA_FURCOLOR_5 DNA_FEATURE_BLOCKS + 11
 
-#define DNA_MODULAR_BLOCKS_COUNT 11
+// tajaran
+#define SPECIES_TAJARAN "tajaran"
+#define DNA_TAJARAN_BODY_MARKINGS DNA_FEATURE_BLOCKS + 12
+#define DNA_TAJARAN_HEAD_MARKINGS DNA_FEATURE_BLOCKS + 13
+#define DNA_TAJARAN_TAIL DNA_FEATURE_BLOCKS + 14
+#define DNA_TAJARAN_TAIL_MARKINGS DNA_FEATURE_BLOCKS + 15
+#define DNA_TAJARAN_FACIAL_HAIR DNA_FEATURE_BLOCKS + 16
+#define DNA_FURCOLOR_TAJARAN_1 DNA_FEATURE_BLOCKS + 17
+#define DNA_FURCOLOR_TAJARAN_2 DNA_FEATURE_BLOCKS + 18
+#define DNA_FURCOLOR_TAJARAN_3 DNA_FEATURE_BLOCKS + 19
+#define DNA_FURCOLOR_TAJARAN_4 DNA_FEATURE_BLOCKS + 20
+
+#define DNA_MODULAR_BLOCKS_COUNT 20
 
 #define HEAD_VULPKANIN (1<<16)
+#define HEAD_TAJARAN (1<<17)
 
 GLOBAL_LIST_INIT(first_names_female_vulp, world.file2list("strings/names/first_female_vulp.txt"))
 GLOBAL_LIST_INIT(first_names_male_vulp, world.file2list("strings/names/first_male_vulp.txt"))
 GLOBAL_LIST_INIT(last_names_vulp, world.file2list("strings/names/last_vulp.txt"))
 
+GLOBAL_LIST_INIT(first_names_female_tajaran, world.file2list("strings/names/first_female_tajaran.txt"))
+GLOBAL_LIST_INIT(first_names_male_tajaran, world.file2list("strings/names/first_male_tajaran.txt"))
+GLOBAL_LIST_INIT(last_names_tajaran, world.file2list("strings/names/last_tajaran.txt"))
+
 /datum/controller/subsystem/accessories
+	// vulpkanin
 	var/list/vulpkanin_body_markings_list
 	var/list/vulpkanin_head_markings_list
 	var/list/vulpkanin_head_accessories_list
 	var/list/tails_list_vulpkanin
 	var/list/vulpkanin_tail_markings_list
 	var/list/vulpkanin_facial_hair_list
+	// tajaran
+	var/list/tajaran_body_markings_list
+	var/list/tajaran_head_markings_list
+	var/list/tails_list_tajaran
+	var/list/tajaran_tail_markings_list
+	var/list/tajaran_facial_hair_list
 
 /datum/controller/subsystem/accessories/proc/init_modular_lists()
+	// vulpkanin
 	vulpkanin_body_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_body_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	vulpkanin_head_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_head_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	vulpkanin_head_accessories_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_head_accessories, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	tails_list_vulpkanin = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/vulpkanin, add_blank = FALSE)[DEFAULT_SPRITE_LIST]
 	vulpkanin_tail_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_tail_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 	vulpkanin_facial_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/vulpkanin_facial_hair, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	// tajaran
+	tajaran_body_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tajaran_body_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	tajaran_head_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tajaran_head_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	tails_list_tajaran = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/tajaran, add_blank = FALSE)[DEFAULT_SPRITE_LIST]
+	tajaran_tail_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tajaran_tail_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+	tajaran_facial_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tajaran_facial_hair, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
 
 /datum/controller/subsystem/accessories/PreInit()
 	..()

modular_bandastation/species/code/clothing/items.dm

@@ -4,24 +4,29 @@
 /obj/item/clothing/head/mod
 	worn_icon_species = list(
 		SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi',
+		SPECIES_TAJARAN = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/modsuits.dmi',
 	)
 
 /obj/item/clothing/suit/mod
 	worn_icon_species = list(
 		SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modsuits.dmi',
+		SPECIES_TAJARAN = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/modsuits.dmi',
 	)
 
 /obj/item/mod/module
 	worn_icon_species = list(
 		SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/modules.dmi',
+		SPECIES_TAJARAN = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/modules.dmi',
 	)
 
 /obj/item/clothing/suit
 	worn_icon_species = list(
 		SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/suit.dmi',
+		SPECIES_TAJARAN = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/suit.dmi',
 	)
 
 /obj/item/clothing/head
 	worn_icon_species = list(
 		SPECIES_VULPKANIN = 'modular_bandastation/species/icons/mob/species/vulpkanin/clothing/head.dmi',
+		SPECIES_TAJARAN = 'modular_bandastation/species/icons/mob/species/tajaran/clothing/head.dmi',
 	)