[BOUNTY] [TEST-MERGE ONLY] Teshari

code/__DEFINES/mobs.dm

@@ -181,6 +181,9 @@
 /// A bit nasty, but I can't think of another way to do this. Owners of this limb will not render shoes.
 #define BODYSHAPE_HIDE_SHOES (1<<11)
 
+/// Teshari limbs. They are very much not normally shaped, so they need an entire bodytype.
+#define BODYSHAPE_TESHARI (1<<12)
+
 /// BREAKER: Numeric -> text for use in defines
 #define BODYSHAPE_HUMANOID_T "1"
 #define BODYSHAPE_MONKEY_T "2"
@@ -189,6 +192,7 @@
 #define BODYSHAPE_TAUR_SNAKE_T "256"
 #define BODYSHAPE_TAUR_HOOF_T "512"
 #define BODYSHAPE_TAUR_PAW_T "1024"
+#define BODYSHAPE_TESHARI_T "4096"
 /// DOPPLER SHIFT ADDITION END
 
 #define BODYTYPE_BIOSCRAMBLE_INCOMPATIBLE (BODYTYPE_ROBOTIC | BODYTYPE_LARVA_PLACEHOLDER | BODYTYPE_GOLEM | BODYTYPE_PEG)
@@ -490,6 +494,7 @@
 #define OFFSET_SUIT "suit"
 #define OFFSET_NECK "neck"
 #define OFFSET_HELD "held"
+#define OFFSET_ACCESSORY "accessory" // Doppler edit - addition
 
 //MINOR TWEAKS/MISC
 #define AGE_MIN 18 //youngest a character can be

code/__DEFINES/~doppler_defines/_autogen_clothing_defines.dm

@@ -0,0 +1,79 @@
+// These COLORPIXEL defines indicate the pixel position on the base sprite of a clothing piece from which the color will be taken for autogenerated clothing See: [autogen_clothing.dm].
+#define GLASSES_COLORPIXEL_X_1 10
+#define GLASSES_COLORPIXEL_Y_1 16
+#define GLASSES_COLORPIXEL_X_2 18
+#define GLASSES_COLORPIXEL_Y_2 16
+
+#define GLOVES_COLORPIXEL_X_1 10
+#define GLOVES_COLORPIXEL_Y_1 13
+
+#define SCARF_COLORPIXEL_X_1 15
+#define SCARF_COLORPIXEL_Y_1 19
+
+#define TIE_COLORPIXEL_X_1 16
+#define TIE_COLORPIXEL_Y_1 20
+
+#define SHOES_COLORPIXEL_X_1 13
+#define SHOES_COLORPIXEL_Y_1 3
+
+#define SPACESUIT_COLORPIXEL_X_1 10
+#define SPACESUIT_COLORPIXEL_Y_1 20
+
+#define MODSUIT_COLORPIXEL_X_1 10
+#define MODSUIT_COLORPIXEL_Y_1 20
+#define MODSUIT_COLORPIXEL_X_2 14
+#define MODSUIT_COLORPIXEL_Y_2 15
+#define MODSUIT_COLORPIXEL_X_3 22
+#define MODSUIT_COLORPIXEL_Y_3 12
+
+#define MODCONTROL_COLORPIXEL_X_1 13
+#define MODCONTROL_COLORPIXEL_Y_1 10
+
+#define COAT_COLORPIXEL_X_1 13
+#define COAT_COLORPIXEL_Y_1 15
+
+#define ARMOR_COLORPIXEL_X_1 14
+#define ARMOR_COLORPIXEL_Y_1 18
+
+#define CLOAK_COLORPIXEL_X_1 11
+#define CLOAK_COLORPIXEL_Y_1 15
+#define CLOAK_COLORPIXEL_X_2 12
+#define CLOAK_COLORPIXEL_Y_2 22
+
+#define MANTLE_COLORPIXEL_X_1 10
+#define MANTLE_COLORPIXEL_Y_1 20
+#define MANTLE_COLORPIXEL_X_2 15
+#define MANTLE_COLORPIXEL_Y_2 20
+
+#define UNDER_COLORPIXEL_X_1 15
+#define UNDER_COLORPIXEL_Y_1 17
+#define UNDER_COLORPIXEL_X_2 10
+#define UNDER_COLORPIXEL_Y_2 19
+#define UNDER_COLORPIXEL_X_3 15
+#define UNDER_COLORPIXEL_Y_3 10
+
+#define THICKROBE_COLORPIXEL_X_1 16
+#define THICKROBE_COLORPIXEL_Y_1 9
+#define JACKET_COLORPIXEL_X_1 14
+#define JACKET_COLORPIXEL_Y_1 16
+#define LONGCOAT_COLORPIXEL_X_1 13
+#define LONGCOAT_COLORPIXEL_Y_1 20
+#define THICKROBE_COLORPIXEL_X_2 14
+#define THICKROBE_COLORPIXEL_Y_2 19
+#define JACKET_COLORPIXEL_X_2 14
+#define JACKET_COLORPIXEL_Y_2 21
+#define THICKROBE_COLORPIXEL_X_3 13
+#define THICKROBE_COLORPIXEL_Y_3 19
+#define THICKROBE_COLORPIXEL_X_4 8
+#define THICKROBE_COLORPIXEL_Y_4 16
+#define LONGCOAT_COLORPIXEL_X_4 19
+#define LONGCOAT_COLORPIXEL_Y_4 17
+#define JACKET_COLORPIXEL_X_4 9
+#define JACKET_COLORPIXEL_Y_4 15
+#define THICKROBE_COLORPIXEL_X_5 16
+#define THICKROBE_COLORPIXEL_Y_5 12
+#define THICKROBE_COLORPIXEL_X_6 16
+#define THICKROBE_COLORPIXEL_Y_6 20
+
+#define BACK_COLORPIXEL_X_1 13
+#define BACK_COLORPIXEL_Y_1 18

code/__DEFINES/~doppler_defines/is_helpers.dm

@@ -5,3 +5,4 @@
 #define issnail(A) (is_species(A, /datum/species/snail))
 #define ishemophage(A) (is_species(A, /datum/species/human/genemod/hemophage))
 #define isramatan(A) (is_species(A, /datum/species/ramatan))
+#define isteshari(A) (is_species(A, /datum/species/teshari))

code/__DEFINES/~doppler_defines/mobs.dm

@@ -7,6 +7,7 @@
 #define BODYPART_ICON_SNAIL 'modular_doppler/modular_species/species_types/snails/icons/bodyparts/snail_bodyparts.dmi'
 #define BODYPART_ICON_ROUNDSTARTSLIME 'modular_doppler/modular_species/species_types/slimes/icons/bodyparts.dmi'
 #define BODYPART_ICON_TAUR 'modular_doppler/taurs/icons/taur_invisible_legs.dmi'
+#define BODYPART_ICON_TESHARI 'modular_doppler/modular_species/species_types/teshari/icons/teshari_parts_greyscale.dmi'
 
 #define DIGI_HOOF "Hooved Legs"
 #define DIGI_TALON "Taloned Legs"

code/__DEFINES/~doppler_defines/mutant_blacklists.dm

@@ -1,5 +1,6 @@
 GLOBAL_LIST_INIT(species_blacklist_no_mutant, list(
 	/datum/species/human,
+	/datum/species/teshari, // tesh have special ears and tails
 	))
 
 GLOBAL_LIST_INIT(species_blacklist_no_humanoid, list(

code/__DEFINES/~doppler_defines/mutant_variations.dm

@@ -19,6 +19,7 @@
 #define MOUSE "mouse"
 #define ROACH "roach"
 #define BAT "bat"
+#define TESHARI "teshari"
 
 ///	This list gets read by the dropdown pref when a player chooses what type of sprite accessory to access
 GLOBAL_LIST_INIT(mutant_variations, list(
@@ -36,6 +37,7 @@ GLOBAL_LIST_INIT(mutant_variations, list(
 	LIZARD,
 	MONKEY,
 	MOUSE,
+	// no TESHARI - TESHARI is handled specially in tail.dm
 ))
 
 ///	This list gets read by the animalistic preference for genemod and anthros

code/__DEFINES/~doppler_defines/species.dm

@@ -6,3 +6,4 @@
 #define SPECIES_HEMOPHAGE "hemophage"
 #define SPECIES_SLIMESTART "slimehybrid"
 #define SPECIES_HOLOSYNTH "holosynth"
+#define SPECIES_TESHARI "teshari"

code/__DEFINES/~doppler_defines/teshari.dm

@@ -0,0 +1,4 @@
+#define TESHARI_PUNCH_LOW 2 // Lower bound punch damage
+#define TESHARI_PUNCH_HIGH 6
+#define TESHARI_BURN_MODIFIER 1.25 // They take more damage from practically everything
+#define TESHARI_BRUTE_MODIFIER 1.2

code/game/objects/structures/tables_racks.dm

@@ -571,7 +571,7 @@
 /obj/structure/table/glass/proc/check_break(mob/living/M)
 	if(is_flipped)
 		return FALSE
-	if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND))
+	if(M.has_gravity() && M.mob_size > MOB_SIZE_SMALL && !(M.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) && (!isteshari(M))) // Doppler edit addition - Teshari can tablerun without breaking glass tables
 		table_shatter(M)
 
 /obj/structure/table/glass/proc/table_shatter(mob/living/victim)

code/modules/clothing/under/_under.dm

@@ -103,7 +103,7 @@
 	if(damaged_clothes)
 		. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
 	if(accessory_overlay)
-		. += accessory_overlay
+		. += modify_accessory_overlay() // DOPPLER EDIT CHANGE - ORIGINAL: . += accessory_overlay
 
 /obj/item/clothing/under/separate_worn_overlays(mutable_appearance/standing, mutable_appearance/draw_target, isinhands = FALSE, icon_file)
 	. = ..()

code/modules/clothing/under/accessories/_accessories.dm

@@ -126,7 +126,19 @@
 
 /obj/item/clothing/accessory/proc/generate_accessory_overlay(obj/item/clothing/under/attached_to)
 	SHOULD_CALL_PARENT(TRUE)
-	var/mutable_appearance/appearance = mutable_appearance(worn_icon, icon_state)
+	// DOPPLER EDIT BEGIN
+	var/local_worn_icon = worn_icon
+	var/mob/living/carbon/human/human_wearer = attached_to.loc
+	if (istype(human_wearer))
+		for(var/shape in supported_bodyshapes)
+			if(human_wearer.bodyshape & shape)
+				var/potential_file = bodyshape_icon_files["[shape]"]
+				if (icon_exists(potential_file, icon_state))
+					local_worn_icon = bodyshape_icon_files["[shape]"]
+					if (shape != BODYSHAPE_HUMANOID) // EVERYTHING has this
+						break
+	// DOPPLER EDIT END
+	var/mutable_appearance/appearance = mutable_appearance(local_worn_icon, icon_state) // DOPPLER SHIFT EDIT
 	appearance.alpha = alpha
 	appearance.color = color
 	return appearance