Merge branch 'master' into protean-rework

modular_chomp/code/modules/mob/living/carbon/human/update_icons.dm

@@ -1,9 +1,10 @@
 // Expand shoe layer to allow changing the icon for digi legs
 // For some reason, suit and uniform already has this funcitonality, but shoes do not.
 
-#define SHOES_LAYER_ALT			8		//Shoe-slot item (when set to be under uniform via verb)
-#define SHOES_LAYER				11		//Shoe-slot item
-#define VORE_BELLY_LAYER		31		//Should be the same that it is in update_icons.dm
+//Duplicate defines so the code below can compile. See non-modular update_icons.dm for proper placement.
+#define SHOES_LAYER_ALT			9		//Shoe-slot item (when set to be under uniform via verb)
+#define SHOES_LAYER				12		//Shoe-slot item
+#define VORE_BELLY_LAYER		32		//Should be the same that it is in update_icons.dm
 
 /mob/living/carbon/human/update_inv_shoes()
 	//. = ..()

modular_chomp/code/modules/mob/living/simple_mob/teppi.dm

@@ -0,0 +1,2 @@
+/mob/living/simple_mob/vore/alienanimals/teppi/baby
+	mob_size = MOB_MEDIUM

modular_chomp/code/modules/mob/new_player/sprite_accessories_extra.dm

@@ -0,0 +1,148 @@
+/datum/sprite_accessory/marking
+	var/hide_body_parts = list()
+
+/datum/sprite_accessory/marking/ch/anthrovirus_ra
+	name = "Anthro Virus (Right Arm)"
+	icon_state = "anthrovirus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_R_ARM,BP_R_HAND)
+	hide_body_parts = list(BP_R_ARM,BP_R_HAND)
+
+/datum/sprite_accessory/marking/ch/anthrovirus_la
+	name = "Anthro Virus (Left Arm)"
+	icon_state = "anthrovirus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_ARM,BP_L_HAND)
+	hide_body_parts = list(BP_L_ARM,BP_L_HAND)
+
+/datum/sprite_accessory/marking/ch/anthrovirus_rl
+	name = "Anthro Virus (Right Leg)"
+	icon_state = "anthrovirus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_R_LEG)
+	hide_body_parts = list(BP_R_LEG)
+
+/datum/sprite_accessory/marking/ch/anthrovirus_ll
+	name = "Anthro Virus (Left Leg)"
+	icon_state = "anthrovirus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_LEG)
+	hide_body_parts = list(BP_L_LEG)
+
+/datum/sprite_accessory/marking/ch/anthrovirus_rf
+	name = "Anthro Virus (Right Foot)"
+	icon_state = "anthrovirus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_R_FOOT)
+	hide_body_parts = list(BP_R_FOOT)
+
+/datum/sprite_accessory/marking/ch/anthrovirus_lf
+	name = "Anthro Virus (Left Foot)"
+	icon_state = "anthrovirus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_FOOT)
+	hide_body_parts = list(BP_L_FOOT)
+
+/datum/sprite_accessory/marking/ch/anthrovirus_t
+	name = "Anthro Virus (Torso)"
+	icon_state = "anthrovirus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO,BP_GROIN)
+	hide_body_parts = list(BP_TORSO,BP_GROIN)
+
+/datum/sprite_accessory/marking/ch/anthrovirus_h
+	name = "Anthro Virus (Head)"
+	icon_state = "anthrovirus"
+	body_parts = list(BP_HEAD)
+	color_blend_mode = ICON_MULTIPLY
+	hide_body_parts	= list(BP_HEAD)
+
+/datum/sprite_accessory/marking/ch/virus_ra
+	name = "Bacteriophage (Right Arm)"
+	icon_state = "virus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_R_ARM,BP_R_HAND)
+	hide_body_parts = list(BP_R_ARM,BP_R_HAND)
+
+/datum/sprite_accessory/marking/ch/virus_la
+	name = "Bacteriophage (Left Arm)"
+	icon_state = "virus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_ARM,BP_L_HAND)
+	hide_body_parts = list(BP_L_ARM,BP_L_HAND)
+
+/datum/sprite_accessory/marking/ch/virus_rl
+	name = "Bacteriophage (Right Leg)"
+	icon_state = "virus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_R_LEG,BP_R_FOOT)
+	hide_body_parts = list(BP_R_LEG,BP_R_FOOT)
+
+/datum/sprite_accessory/marking/ch/virus_ll
+	name = "Bacteriophage (Left Leg)"
+	icon_state = "virus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_L_LEG,BP_L_FOOT)
+	hide_body_parts = list(BP_L_LEG,BP_L_FOOT)
+
+/datum/sprite_accessory/marking/ch/virus_t
+	name = "Bacteriophage (Torso)"
+	icon_state = "virus"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_TORSO,BP_GROIN)
+	hide_body_parts = list(BP_TORSO,BP_GROIN)
+
+/datum/sprite_accessory/marking/ch/virus_g
+	name = "Bacteriophage (Groin)"
+	icon_state = "virusgroin" //this is separate so that the groin region can be hidden by the torso.
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_GROIN)
+	//hide_body_parts = list(BP_GROIN) this IS pretty low, even for the groin body part.
+
+/datum/sprite_accessory/marking/ch/virus_h
+	name = "Bacteriophage (Head)"
+	icon_state = "virus"
+	body_parts = list(BP_HEAD)
+	color_blend_mode = ICON_MULTIPLY
+	hide_body_parts	= list(BP_HEAD)
+
+/datum/sprite_accessory/marking/ch/tyranid
+	name = "Tyranid Bodytype (Use with Armor)"
+	icon_state = "tyranid"
+	color_blend_mode = ICON_MULTIPLY
+	hide_body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+
+/datum/sprite_accessory/marking/ch/tyranid_armor
+	name = "Tyranid Bodytype (Armor)"
+	icon_state = "tyranidarmor"
+	color_blend_mode = ICON_MULTIPLY
+	hide_body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+
+/datum/sprite_accessory/marking/ch/tyranid_legs
+	name = "Tyranid Legs (Use with Armor)"
+	icon_state = "tyranid"
+	color_blend_mode = ICON_MULTIPLY
+	hide_body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG)
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_GROIN)
+
+/datum/sprite_accessory/marking/ch/tyranid_legs_armor
+	name = "Tyranid Legs (Armor)"
+	icon_state = "tyranidarmor"
+	color_blend_mode = ICON_MULTIPLY
+	hide_body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG)
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_GROIN)
+
+/datum/sprite_accessory/marking/ch/sect_drone
+	name = "Sect Drone Bodytype"
+	icon_state = "sectdrone"
+	color_blend_mode = ICON_MULTIPLY
+	hide_body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+	body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_GROIN,BP_TORSO,BP_HEAD)
+
+/datum/sprite_accessory/marking/ch/sect_drone_eyes
+	name = "Sect Drone Eyes"
+	icon_state = "sectdrone_eyes"
+	color_blend_mode = ICON_MULTIPLY
+	body_parts = list(BP_HEAD)

modular_chomp/code/modules/mob/new_player/sprite_accessories_tail.dm

@@ -0,0 +1,22 @@
+/datum/sprite_accessory/tail/anthrovirus_tail
+	name = "Anthro Virus Tail"
+	icon = 'icons/mob/vore/tails_ch.dmi'
+	icon_state = "anthrovirustail_mark"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "anthrovirustail"
+
+/datum/sprite_accessory/tail/tyranid_tail
+	name = "Tyranid"
+	icon = 'icons/mob/vore/tails_ch.dmi'
+	icon_state = "tyranid"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
+/datum/sprite_accessory/tail/sectdrone_tail
+	name = "Sect Drone Tail (To use with bodytype-marking)"
+	icon = 'icons/mob/vore/tails_ch.dmi'
+	icon_state = "sectdrone_tail"
+	extra_overlay = "sectdrone_tail_mark"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY

modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm

@@ -4,3 +4,10 @@
 
 /datum/sprite_accessory/tail/taur/wolf
 	vore_tail_sprite_variant = "N"
+
+/datum/sprite_accessory/tail/taur/ch/longvirus
+	name = "Long Virus (Taur)"
+	icon_state = "longvirus_s"
+	extra_overlay = "longvirus_markings"
+	icon_sprite_tag = "virus"
+	//suit_sprites = 'icons/mob/taursuits_noodle.dmi' Aye, I've gotta sprite that shit.

modular_chomp/code/modules/mob/new_player/sprite_accessories_wing.dm

@@ -0,0 +1,7 @@
+/datum/sprite_accessory/wing/sect_drone //We should some day make a variable to make some wings not be able to fly
+	name = "Sect drone wings (To use with bodytype marking)"
+	desc = ""
+	icon = 'icons/mob/vore/wings_ch.dmi'
+	icon_state = "sectdrone_wing"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY