Merge pull request BoHBranch#1744 from Kaksisilma/Remember-No-Taur

Removes Taurs

baystation12.dme

@@ -3418,7 +3418,6 @@
 #include "maps\~unit_tests\unit_testing.dm"
 #include "modular_mithra\code\__defines\misc.dm"
 #include "modular_mithra\code\__defines\species.dm"
-#include "modular_mithra\code\_helpers\global_lists.dm"
 #include "modular_mithra\code\_onclick\click.dm"
 #include "modular_mithra\code\datums\mutable_appearance.dm"
 #include "modular_mithra\code\game\machinery\cryopod.dm"
@@ -3433,24 +3432,18 @@
 #include "modular_mithra\code\modules\mithra\preferences_vr.dm"
 #include "modular_mithra\code\modules\mithra\spawncheck.dm"
 #include "modular_mithra\code\modules\mithra\sprite_accessories_vr.dm"
-#include "modular_mithra\code\modules\mithra\taurbodies.dm"
 #include "modular_mithra\code\modules\mithra\traits.dm"
 #include "modular_mithra\code\modules\mithra\traits_negative.dm"
 #include "modular_mithra\code\modules\mithra\traits_neutral.dm"
 #include "modular_mithra\code\modules\mithra\traits_positive.dm"
 #include "modular_mithra\code\modules\mithra\update_icons_vr.dm"
 #include "modular_mithra\code\modules\mob\animations.dm"
 #include "modular_mithra\code\modules\mob\inventory.dm"
-#include "modular_mithra\code\modules\mob\living\carbon\human\species\trait_stuff\traits.dm"
-#include "modular_mithra\code\modules\mob\living\carbon\human\species\trait_stuff\weaver_abilities.dm"
-#include "modular_mithra\code\modules\mob\living\carbon\human\species\trait_stuff\weaver_constructions.dm"
-#include "modular_mithra\code\modules\mob\living\carbon\human\species\trait_stuff\weaver_objects.dm"
 #include "modular_mithra\code\modules\organs\robolimbs.dm"
 #include "modular_mithra\code\modules\reagents\reagent_containers\glass.dm"
 #include "modular_mithra\code\modules\research\designs.dm"
 #include "modular_mithra\code\modules\species\station\akula.dm"
 #include "modular_mithra\code\modules\species\station\custom.dm"
-#include "modular_mithra\code\modules\species\station\extreme_modder.dm"
 #include "modular_mithra\code\modules\species\station\human2.dm"
 #include "modular_mithra\code\modules\species\station\humanathi.dm"
 #include "modular_mithra\code\modules\species\station\sergal.dm"

code/__defines/mobs.dm

@@ -326,7 +326,6 @@
 
 #define SPECIES_AKULA         "Akula"
 #define SPECIES_CUSTOM        "Genemodder"
-/*#define SPECIES_ECUSTOM       "Aberration"*/
 #define SPECIES_VULP          "Vulpkanin"
 #define SPECIES_VASS          "Vasilissan"
 #define SPECIES_TAJ           "Tajaran"

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

@@ -81,8 +81,6 @@
 
 		handle_medical_side_effects()
 
-		process_weaver_silk()
-
 		if(!client && !mind)
 			species.handle_npc(src)
 
@@ -1165,11 +1163,3 @@
 	..()
 	if((CE_THIRDEYE in chem_effects) || (MUTATION_XRAY in mutations))
 		set_sight(sight|SEE_TURFS|SEE_MOBS|SEE_OBJS)
-
-/mob/living/carbon/human/proc/process_weaver_silk()
-	if(!species || !(species.is_weaver))
-		return
-
-	if(species.silk_reserve < species.silk_max_reserve && species.silk_production == TRUE && nutrition > 100)
-		species.silk_reserve = min(species.silk_reserve + 2, species.silk_max_reserve)
-		adjust_nutrition(-0.4)

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

@@ -233,7 +233,7 @@ var/global/list/damage_icon_parts = list()
 
 	// blend the individual damage states with our icons
 	for(var/obj/item/organ/external/O in organs)
-		if(isnull(O) || O.is_stump() || O.is_hidden_by_tail())
+		if(isnull(O) || O.is_stump())
 			continue
 
 		O.update_damstate()
@@ -309,7 +309,7 @@ var/global/list/damage_icon_parts = list()
 
 	for(var/organ_tag in species.has_limbs)
 		var/obj/item/organ/external/part = organs_by_name[organ_tag]
-		if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff.
+		if(isnull(part) || part.is_stump())
 			icon_key += "0"
 			continue
 		for(var/M in part.markings)
@@ -328,9 +328,6 @@ var/global/list/damage_icon_parts = list()
 				icon_key += "#000000"
 			for(var/M in part.markings)
 				icon_key += "[M][part.markings[M]["color"]]"
-			if(istype(tail_style, /datum/sprite_accessory/tail/taur))
-				if(tail_style.clip_mask) //VOREStation Edit.
-					icon_key += tail_style.clip_mask_state
 		if(BP_IS_ROBOTIC(part))
 			icon_key += "2[part.model ? "-[part.model]": ""]"
 		else if(part.status & ORGAN_DEAD)
@@ -349,20 +346,6 @@ var/global/list/damage_icon_parts = list()
 		var/obj/item/organ/external/chest = get_organ(BP_CHEST)
 		base_icon = chest.get_icon()
 
-		var/icon/Cutter = null
-
-		if(istype(tail_style, /datum/sprite_accessory/tail/taur))	// Tail icon 'cookie cutters' are filled in where icons are preserved. We need to invert that.
-			if(tail_style.clip_mask) //VOREStation Edit.
-				Cutter = new(icon = tail_style.icon, icon_state = tail_style.clip_mask_state)
-
-				Cutter.Blend("#000000", ICON_MULTIPLY)	// Make it all black.
-
-				Cutter.SwapColor("#00000000", "#FFFFFFFF")	// Everywhere empty, make white.
-				Cutter.SwapColor("#000000FF", "#00000000")	// Everywhere black, make empty.
-
-				Cutter.Blend("#000000", ICON_MULTIPLY)	// Black again.
-
-
 		for(var/obj/item/organ/external/part in (organs-chest))
 			var/icon/temp = part.get_icon()
 			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
@@ -386,35 +369,6 @@ var/global/list/damage_icon_parts = list()
 			else
 				base_icon.Blend(temp, ICON_OVERLAY)
 
-		for(var/obj/item/organ/external/part in organs)
-			if(isnull(part) || part.is_stump() || part.is_hidden_by_tail()) //VOREStation Edit allowing tails to prevent bodyparts rendering, granting more spriter freedom for taur/digitigrade stuff.
-				continue
-			var/icon/temp = part.get_icon(skeleton)
-
-			if((part.organ_tag in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)) && Cutter)
-				temp.Blend(Cutter, ICON_AND, x = -16)
-
-			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
-			//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)
-			if(part.icon_position & (LEFT | RIGHT))
-				var/icon/temp2 = new(species.icon_template ? species.icon_template : 'icons/mob/human.dmi', icon_state = "blank")
-				temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH)
-				temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH)
-				if(!(part.icon_position & LEFT))
-					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
-				if(!(part.icon_position & RIGHT))
-					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
-				base_icon.Blend(temp2, ICON_OVERLAY)
-				if(part.icon_position & LEFT)
-					temp2.Insert(new/icon(temp,dir=EAST),dir=EAST)
-				if(part.icon_position & RIGHT)
-					temp2.Insert(new/icon(temp,dir=WEST),dir=WEST)
-				base_icon.Blend(temp2, ICON_UNDERLAY)
-			else if(part.icon_position & UNDER)
-				base_icon.Blend(temp, ICON_UNDERLAY)
-			else
-				base_icon.Blend(temp, ICON_OVERLAY)
-
 		if(!skeleton)
 			if(husk)
 				base_icon.ColorTone(husk_color_mod)

code/modules/organs/external/_external.dm

@@ -1377,7 +1377,3 @@ obj/item/organ/external/proc/remove_clamps()
 		. += max_delay * 3/8
 	else if(BP_IS_ROBOTIC(src))
 		. += max_delay * CLAMP01(damage/max_damage)
-
-/obj/item/organ/external/proc/is_hidden_by_tail()
-	if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
-		return 1

code/modules/species/mantid/mantid.dm

@@ -145,7 +145,6 @@
 	max_age =               500
 	blood_volume =         1200
 	spawns_with_stack =       0
-	is_weaver = 1
 
 	pixel_offset_x =        -4
 	antaghud_offset_y =      18
@@ -172,15 +171,6 @@
 		TAG_RELIGION =  RELIGION_KHARMAANI
 	)
 
-	inherent_verbs = list(
-		/mob/living/carbon/human/proc/check_silk_amount,
-		/mob/living/carbon/human/proc/toggle_silk_production,
-		/mob/living/carbon/human/proc/weave_structure,
-		/mob/living/carbon/human/proc/weave_item
-		)
-
-	silk_color = "#99FFFF"
-
 /datum/species/mantid/gyne/attempt_grab(var/mob/living/carbon/human/grabber, var/mob/living/target)
 	if(grabber != target)
 		grabber.unEquip(grabber.l_hand)

code/modules/species/species.dm

@@ -66,12 +66,6 @@
 	var/min_age = 18
 	var/max_age = 70
 
-	var/is_weaver = FALSE
-	var/silk_production = FALSE
-	var/silk_reserve = 100
-	var/silk_max_reserve = 500
-	var/silk_color = "#FFFFFF"
-
 	// Speech vars.
 	var/assisted_langs = list()               // The languages the species can't speak without an assisted organ.
 	var/list/speech_sounds                    // A list of sounds to potentially play when speaking.

maps/torch/job/torch_jobs.dm

@@ -9,7 +9,6 @@
 		/datum/species/adherent = list(/datum/job/psiadvisor, /datum/job/liaison, /datum/job/bodyguard, /datum/job/adjudicator, /datum/job/bailiff, /datum/job/detective),
 		/datum/species/machine = list(/datum/job/psiadvisor),
 		/datum/species/diona   = list(/datum/job/captain, /datum/job/hop, /datum/job/hos, /datum/job/officer, /datum/job/warden, /datum/job/seccadet, /datum/job/sea, /datum/job/bodyguard, /datum/job/adjudicator, /datum/job/bailiff, /datum/job/squad_lead, /datum/job/combat_tech, /datum/job/grunt, /datum/job/combat_medic)
-		/*/datum/species/custom/aberration  = list(/datum/job/captain, /datum/job/hop)*/
 	)
 
 	allowed_jobs = list(/datum/job/captain, /datum/job/hop, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos,

modular_mithra/code/__defines/misc.dm

@@ -2,7 +2,4 @@
 
 //For custom species
 #define STARTING_SPECIES_POINTS 1
-#define MAX_SPECIES_TRAITS 5
-
-//taur helpers
-#define istaurtail(A)	istype(A, /datum/sprite_accessory/tail/taur)
+#define MAX_SPECIES_TRAITS 5

modular_mithra/code/modules/mithra/sprite_accessories_vr.dm

@@ -698,16 +698,8 @@
 	var/ani_state // State when wagging/animated
 	var/extra_overlay_w // Wagging state for extra overlay
 
-	var/list/hide_body_parts = list() //Uses organ tag defines. Bodyparts in this list do not have their icons rendered, allowing for more spriter freedom when doing taur/digitigrade stuff.
-
-	var/icon/clip_mask_icon = null //Icon file used for clip mask.
-	var/clip_mask_state = null //Icon state to generate clip mask. Clip mask is used to 'clip' off the lower part of clothing such as jumpsuits & full suits.
-	var/icon/clip_mask = null //Instantiated clip mask of given icon and state
-
 /datum/sprite_accessory/tail/New()
 	. = ..()
-	if(clip_mask_icon && clip_mask_state)
-		clip_mask = icon(icon = clip_mask_icon, icon_state = clip_mask_state)
 
 /datum/sprite_accessory/tail/invisible
 	name = "hide species-sprite tail"