Yogvoxneo

code/__DEFINES/DNA.dm

@@ -99,7 +99,7 @@
 #define DNA_HAIR_STYLE_BLOCK		7
 
 /// This number needs to equal the total number of DNA blocks
-#define DNA_FEATURE_BLOCKS 22
+#define DNA_FEATURE_BLOCKS 28
 
 #define DNA_MUTANT_COLOR_BLOCK 1
 #define DNA_ETHEREAL_COLOR_BLOCK 2
@@ -124,6 +124,12 @@
 #define DNA_PRETERNIS_WEATHERING_BLOCK 20
 #define DNA_PRETERNIS_ANTENNA_BLOCK 21
 #define DNA_PRETERNIS_EYE_BLOCK 22
+#define DNA_VOX_QUILLS_BLOCK 23
+#define DNA_VOX_FACIAL_QUILLS_BLOCK 24
+#define DNA_VOX_TAIL_MARKINGS_BLOCK 25
+#define DNA_VOX_BODY_MARKINGS_BLOCK 26
+#define DNA_VOX_SKIN_TONE_BLOCK 27
+#define DNA_MUTANT_COLOR_SECONDARY 28
 
 #define DNA_SEQUENCE_LENGTH			4
 #define DNA_MUTATION_BLOCKS			8
@@ -188,6 +194,9 @@
 /// has a tail
 #define HAS_TAIL		27
 #define NONANITES		28
+#define HAIRCOLOR		29
+#define FACEHAIRCOLOR	30
+#define MUTCOLORS_SECONDARY		31
 
 //organ slots
 #define ORGAN_SLOT_BRAIN "brain"

code/__DEFINES/colors.dm

@@ -354,6 +354,7 @@
 
 /// Color used for default blood
 #define COLOR_BLOOD "#CC0000"
+#define COLOR_BLOOD_VOX "#2299FC"
 
 GLOBAL_LIST_INIT(cable_colors, list(
 	CABLE_COLOR_BLUE = CABLE_HEX_COLOR_BLUE,
@@ -372,6 +373,14 @@ GLOBAL_LIST_INIT(cable_colors, list(
 #define COLOR_INPUT_DISABLED "#F0F0F0"
 #define COLOR_INPUT_ENABLED "#D3B5B5"
 
+//Color blending modes
+#define COLOR_BLEND_MULTIPLY "multiply"
+#define COLOR_BLEND_ADD "add"
+
+//Color matrix
+#define COLOR_MATRIX_ADD(color) list(COLOR_RED, COLOR_VIBRANT_LIME, COLOR_BLUE, color)
+#define COLOR_MATRIX_OVERLAY(color) list(COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, color)
+
 /// Change color to red on ANSI terminal output, if enabled with -DANSICOLORS.
 #ifdef ANSICOLORS
 #define TEST_OUTPUT_RED(text) "\x1B\x5B1;31m[text]\x1B\x5B0m"

code/__DEFINES/is_helpers.dm

@@ -93,6 +93,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 #define issnail(A) (is_species(A, /datum/species/snail))
 #define isandroid(A) (is_species(A, /datum/species/android))
 #define isdummy(A) (istype(A, /mob/living/carbon/human/dummy))
+#define isvox(A) (is_species(A, /datum/species/vox))
 
 //more carbon mobs
 #define ismonkey(A) (istype(A, /mob/living/carbon/monkey))

code/__DEFINES/mobs.dm

@@ -105,6 +105,10 @@
 #define ALIEN_BODYPART "alien"
 #define LARVA_BODYPART "larva"
 #define DEVIL_BODYPART "devil"
+
+#define SPECIES_VOX "vox"
+#define SPECIES_MOTH "moth"
+
 /*see __DEFINES/inventory.dm for bodypart bitflag defines*/
 
 // Health/damage defines for carbon mobs

code/__DEFINES/species_clothing_paths.dm

@@ -0,0 +1,19 @@
+//HUMAN PATHS
+///The dmi for humanoid uniforms
+#define DEFAULT_UNIFORM_FILE 'icons/mob/clothing/uniform/uniform.dmi'
+///The dmi for humanoid shoes
+#define DEFAULT_SHOES_FILE 'icons/mob/clothing/feet/feet.dmi'
+///The dmi for humanoid oversuits
+#define DEFAULT_SUIT_FILE 'icons/mob/clothing/suit/suit.dmi'
+
+//VOX PATHS
+#define VOX_MASK_FILE 'icons/mob/clothing/species/vox/mask.dmi'
+#define VOX_HEAD_FILE 'icons/mob/clothing/species/vox/head.dmi'
+#define VOX_BACK_FILE 'icons/mob/clothing/species/vox/back.dmi'
+#define VOX_EARS_FILE 'icons/mob/clothing/species/vox/ears.dmi'
+#define VOX_EYES_FILE 'icons/mob/clothing/species/vox/eyes.dmi'
+#define VOX_SHOES_FILE 'icons/mob/clothing/species/vox/shoes.dmi'
+#define VOX_GLOVES_FILE 'icons/mob/clothing/species/vox/gloves.dmi'
+#define VOX_HELMET_FILE 'icons/mob/clothing/species/vox/helmet.dmi'
+#define VOX_SUIT_FILE 'icons/mob/clothing/species/vox/suit.dmi'
+#define VOX_UNIFORM_FILE 'icons/mob/clothing/species/vox/uniform.dmi'

code/__HELPERS/global_lists.dm

@@ -45,6 +45,15 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_screens, GLOB.ipc_screens_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
+	// Vox bodyparts
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_quills, GLOB.vox_quills_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_facial_quills, GLOB.vox_facial_quills_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_tails, GLOB.vox_tails_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_body_markings, GLOB.vox_body_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_tail_markings, GLOB.vox_tail_markings_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails_animated/vox, GLOB.animated_vox_tails_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_tail_markings_animated, GLOB.animated_vox_tail_markings_list)
+
 
 
 

code/__HELPERS/icons.dm

@@ -228,10 +228,13 @@ world
 /icon/proc/Greyify()
 	MapColors(0.75,0.3,0.3, 0.6,0.75,0.6, 0.10,0.10,0.50, 0,0,0)
 
-/icon/proc/ColorTone(tone)
-	Greyify()
+/icon/proc/ColorTone(tone, grayscale = FALSE)
+	if(grayscale)
+		GrayScale()
+	else
+		Greyify()
 
-	var/list/TONE = ReadRGB(tone)
+	var/list/TONE = rgb2num(tone)
 	var/gray = round(TONE[1]*0.3 + TONE[2]*0.59 + TONE[3]*0.11, 1)
 
 	var/icon/upper = (255-gray) ? new(src) : null

code/__HELPERS/mobs.dm

@@ -95,10 +95,21 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_antennas, GLOB.ipc_antennas_list)
 	if(!GLOB.ipc_chassis_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/ipc_chassis, GLOB.ipc_chassis_list)
+	if(!GLOB.vox_quills_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_quills, GLOB.vox_quills_list)
+	if(!GLOB.vox_facial_quills_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_facial_quills, GLOB.vox_facial_quills_list)
+	if(!GLOB.vox_tails_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_tails, GLOB.vox_tails_list)
+	if(!GLOB.vox_body_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_body_markings, GLOB.vox_body_markings_list)
+	if(!GLOB.vox_tail_markings_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/vox_tail_markings, GLOB.vox_tail_markings_list)
 
 	//For now we will always return none for tail_human and ears.		this shit was unreadable if you do somethign like this make it at least readable
 	return(list(
 		"mcolor" = "#[pick("7F","FF")][pick("7F","FF")][pick("7F","FF")]",
+		"mcolor_secondary" = "#[pick("7F","FF")][pick("7F","FF")][pick("7F","FF")]",
 		"gradientstyle" = random_hair_gradient_style(10),
 		"gradientcolor" = "#[pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")]",
 		"tail_lizard" = pick(GLOB.tails_list_lizard),
@@ -126,7 +137,12 @@
 		"pod_hair" = pick(GLOB.pod_hair_list),
 		"ipc_screen" = pick(GLOB.ipc_screens_list),
 		"ipc_antenna" = pick(GLOB.ipc_antennas_list),
-		"ipc_chassis" = pick(GLOB.ipc_chassis_list)
+		"ipc_chassis" = pick(GLOB.ipc_chassis_list),
+		"vox_skin_tone" = pick(GLOB.vox_skin_tones),
+		"vox_quills" = pick(GLOB.vox_quills_list),
+		"vox_facial_quills" = pick(GLOB.vox_facial_quills_list),
+		"vox_body_markings" = pick(GLOB.vox_body_markings_list),
+		"vox_tail_markings" = pick(GLOB.vox_tail_markings_list)
 	))
 
 /proc/random_hair_style(gender)
@@ -191,6 +207,13 @@
 		if(!findname(.))
 			break
 
+/proc/random_unique_vox_name(attempts_to_find_unique_name=10)
+	for(var/i in 1 to attempts_to_find_unique_name)
+		. = capitalize(vox_name())
+
+		if(!findname(.))
+			break
+
 /proc/random_unique_ethereal_name(attempts_to_find_unique_name=10)
 	for(var/i in 1 to attempts_to_find_unique_name)
 		. = capitalize(ethereal_name())
@@ -260,6 +283,18 @@ GLOBAL_LIST_INIT(skin_tone_names, list(
 	"mixed4" = "Macadamia",
 ))
 
+GLOBAL_LIST_INIT(vox_skin_tones, sortList(list(
+	"lime",
+	"crimson",
+	"nebula",
+	"azure",
+	"emerald",
+	"brown",
+	"plum",
+	"grey",
+	"mossy"
+	)))
+
 GLOBAL_LIST_EMPTY(species_list)
 
 /proc/age2agedescription(age)

code/__HELPERS/names.dm

@@ -49,6 +49,13 @@
 /proc/plasmaman_name()
 	return "[pick(GLOB.plasmaman_names)] \Roman[rand(1,99)]"
 
+/proc/vox_name()
+	var/sounds = rand(2,8)
+	var/vox_name = ""
+	for(var/sound in 1 to sounds)
+		vox_name += pick("ti","hi","ki","ya","ta","ha","ka","yi","chi","cha","kah")
+	return vox_name
+
 /proc/moth_name()
 	return "[pick(GLOB.moth_first)] [pick(GLOB.moth_last)]"
 

code/_globalvars/lists/flavor_misc.dm

@@ -27,6 +27,14 @@ GLOBAL_LIST_EMPTY(frills_list)
 GLOBAL_LIST_EMPTY(spines_list)
 GLOBAL_LIST_EMPTY(legs_list)
 GLOBAL_LIST_EMPTY(animated_spines_list)
+	// Vox
+GLOBAL_LIST_EMPTY(vox_quills_list)
+GLOBAL_LIST_EMPTY(vox_facial_quills_list)
+GLOBAL_LIST_EMPTY(vox_tails_list)
+GLOBAL_LIST_EMPTY(vox_body_markings_list)
+GLOBAL_LIST_EMPTY(vox_tail_markings_list)
+GLOBAL_LIST_EMPTY(animated_vox_tails_list)
+GLOBAL_LIST_EMPTY(animated_vox_tail_markings_list)
 	//Polysmorph
 GLOBAL_LIST_EMPTY(tails_list_polysmorph)
 GLOBAL_LIST_EMPTY(teeth_list)

code/_globalvars/lists/maintenance_loot.dm

@@ -80,12 +80,14 @@ GLOBAL_LIST_INIT(maintenance_loot_traditional,list(
 	/obj/item/clothing/mask/breath = W_UNCOMMON,
 	/obj/item/tank/internals/air = W_COMMON,
 	/obj/item/tank/internals/anesthetic = W_RARE,
+	/obj/item/tank/internals/nitrogen = W_RARE,
 	/obj/item/tank/internals/emergency_oxygen = W_UNCOMMON,
 	/obj/item/tank/internals/emergency_oxygen/empty = W_UNCOMMON,
 	/obj/item/tank/internals/emergency_oxygen/engi = W_RARE,
 	/obj/item/tank/internals/emergency_oxygen/engi/empty = W_RARE,
 	/obj/item/tank/internals/emergency_oxygen/double = W_MYTHICAL,
 	/obj/item/tank/internals/emergency_oxygen/double/empty = W_MYTHICAL,
+	/obj/item/tank/internals/emergency_oxygen/vox = W_MYTHICAL,
 	/obj/item/tank/internals/ipc_coolant = W_RARE,
 	/obj/item/tank/internals/ipc_coolant/empty = W_RARE,
 	/obj/item/tank/internals/plasma = W_LEGENDARY,
@@ -365,6 +367,7 @@ GLOBAL_LIST_INIT(maintenance_loot_traditional,list(
 	/obj/item/stack/sheet/animalhide/gorilla = W_RARE,
 	/obj/item/stack/sheet/animalhide/human = W_RARE,
 	/obj/item/stack/sheet/animalhide/lizard = W_RARE,
+	/obj/item/stack/sheet/animalhide/vox = W_RARE,
 	/obj/item/stack/sheet/animalhide/monkey = W_RARE,
 	/obj/item/stack/sheet/animalhide/xeno = W_RARE,
 	/obj/item/storage/bag/money = W_RARE,
@@ -578,6 +581,7 @@ GLOBAL_LIST_INIT(maintenance_loot_makeshift,list(
 	/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine = W_MYTHICAL,
 	/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/gorilla = W_MYTHICAL,
 	/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard = W_MYTHICAL,
+	/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/vox = W_MYTHICAL,
 	/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/moth = W_MYTHICAL,
 	/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant = W_MYTHICAL,
 	/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow = W_MYTHICAL,
@@ -655,7 +659,7 @@ GLOBAL_LIST_INIT(maintenance_loot_minor,list(
 	/obj/item/storage/box/cups = W_RARE,
 	/obj/item/storage/box/drinkingglasses = W_UNCOMMON,
 	/obj/item/storage/box/gloves = W_RARE,
-	/obj/item/storage/box/hug/survival = W_UNCOMMON,
+	/obj/item/storage/box/survival/hug = W_UNCOMMON,
 	/obj/item/storage/box/masks = W_RARE,
 	/obj/item/storage/box/pillbottles = W_RARE,
 	/obj/item/storage/box/rxglasses = W_RARE,
@@ -760,7 +764,6 @@ GLOBAL_LIST_INIT(maintenance_loot_minor,list(
 	/obj/item/storage/box/hug/medical = W_MYTHICAL,
 	/obj/item/storage/box/mixedcubes = W_RARE,
 	/obj/item/storage/box/monkeycubes = W_RARE,
-	/obj/item/storage/box/plasmaman = W_RARE,
 	/obj/item/storage/box/smart_metal_foam = W_RARE,
 	/obj/item/storage/firstaid = W_MYTHICAL,
 	/obj/item/storage/firstaid/ancient = W_MYTHICAL,

code/controllers/subsystem/traumas.dm

@@ -138,7 +138,10 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/clothing/suit/chickensuit, /obj/item/clothing/head/chicken,
 						/obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/owl, /obj/item/clothing/mask/gas/owl_mask,
 						/obj/item/clothing/under/griffin, /obj/item/clothing/shoes/griffin, /obj/item/clothing/head/griffin,
-						/obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom)),
+						/obj/item/clothing/head/helmet/space/freedom, /obj/item/clothing/suit/space/freedom, /obj/item/toy/plush/voxplushie,
+						/obj/item/clothing/mask/breath/vox, /obj/item/clothing/suit/space/vox, /obj/item/clothing/head/helmet/space/vox,
+						/obj/item/clothing/shoes/magboots/vox, /obj/item/clothing/gloves/color/yellow/vox, /obj/item/flag/species/vox, /obj/item/stack/sheet/animalhide/vox,
+						/obj/item/organ/tail/vox)),
 
 					   "anime" = typecacheof(list(/obj/item/clothing/under/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
 					   /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
@@ -161,7 +164,8 @@ SUBSYSTEM_DEF(traumas)
 						  "the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)),
 						  "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod,
 						  /datum/species/shadow, /datum/species/polysmorph)),
-						  "anime" = typecacheof(list(/datum/species/human/felinid))
+						  "anime" = typecacheof(list(/datum/species/human/felinid)),
+						  "birds" = typecacheof(list(/datum/species/vox))
 						 )
 
 	return SS_INIT_SUCCESS

code/datums/blood_types.dm

@@ -60,6 +60,10 @@
 	color = LIGHT_COLOR_BLUEGREEN
 	compatible_types = list(/datum/blood_type/lizard)
 
+/datum/blood_type/vox
+	name = "V"
+	color = COLOR_BLOOD_VOX
+	compatible_types = list(/datum/blood_type/vox)
 
 /datum/blood_type/universal/synthetic //Blood for preterni
 	name = "Synthetic"

code/datums/components/bloodysoles.dm

@@ -215,7 +215,7 @@ Like its parent but can be applied to carbon mobs instead of clothing items
 */
 
 /datum/component/bloodysoles/feet
-	var/static/mutable_appearance/bloody_feet
+	var/mutable_appearance/bloody_feet
 
 /datum/component/bloodysoles/feet/Initialize()
 	if(!iscarbon(parent))
@@ -236,6 +236,11 @@ Like its parent but can be applied to carbon mobs instead of clothing items
 /datum/component/bloodysoles/feet/update_icon()
 	. = list()
 	if(ishuman(wielder))// Monkeys get no bloody feet :(
+		var/obj/item/bodypart/l_leg/left_leg = wielder.get_bodypart(BODY_ZONE_L_LEG)
+		var/obj/item/bodypart/r_leg/right_leg = wielder.get_bodypart(BODY_ZONE_R_LEG)
+		if(left_leg?.species_id == right_leg?.species_id)
+			if(icon_exists(bloody_feet.icon, "shoeblood_[left_leg.species_id]"))
+				bloody_feet.icon_state = "shoeblood_[left_leg.species_id]"
 		if(HAS_BLOOD_DNA(wielder))
 			bloody_feet.color = get_blood_dna_color(wielder.return_blood_DNA())
 			. += bloody_feet

code/datums/diseases/advance/symptoms/shedding.dm

@@ -44,14 +44,13 @@ BONUS
 					to_chat(H, span_warning("Your hair starts to fall out in clumps..."))
 					addtimer(CALLBACK(src, PROC_REF(Shed), H, FALSE), 50)
 			if(5)
-				if(!(H.facial_hair_style == "Shaved") || !(H.hair_style == "Bald"))
+				if(!(H.facial_hair_style == "Shaved") || !(H.hair_style == "Bald") || !(H.hair_style == "None"))
 					to_chat(H, span_warning("Your hair starts to fall out in clumps..."))
 					addtimer(CALLBACK(src, PROC_REF(Shed), H, TRUE), 50)
 
 /datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald)
 	if(fullbald)
-		H.facial_hair_style = "Shaved"
-		H.hair_style = "Bald"
+		H.dna.species.go_bald()
 	else
 		H.hair_style = "Balding Hair"
 	H.update_hair()