diff --git a/code/__defines/is_helpers.dm b/code/__defines/is_helpers.dm index 0e3ad06295..f529ad05bd 100644 --- a/code/__defines/is_helpers.dm +++ b/code/__defines/is_helpers.dm @@ -57,5 +57,3 @@ //#define isturf(D) istype(D, /turf) //Built in #define isopenspace(A) istype(A, /turf/simulated/open) #define isspace(A) istype(A, /turf/space) - -#define istaurtail(A) istype(A, /datum/sprite_accessory/tail/taur) diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index faa64d2a1c..282139e9df 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -224,7 +224,7 @@ var/global/list/string_slot_flags = list( ear_styles_list[path] = instance // Custom Tails - paths = subtypesof(/datum/sprite_accessory/tail) - /datum/sprite_accessory/tail/taur + paths = subtypesof(/datum/sprite_accessory/tail) for(var/path in paths) var/datum/sprite_accessory/tail/instance = new path() tail_styles_list[path] = instance diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9bd8510c0c..1466b8d441 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -802,7 +802,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. standing.color = color standing.layer = layer2use - if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits. + if(istype(clip_mask)) //For tails clipping off parts of uniforms and suits. standing.filters += filter(type = "alpha", icon = clip_mask) //Apply any special features diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index bf075564d8..06d802dcac 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -17,9 +17,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/g_ears3 = 30 // Ear tertiary color var/b_ears3 = 30 // Ear tertiary color var/tail_style // Type of selected tail style - var/r_tail = 30 // Tail/Taur color - var/g_tail = 30 // Tail/Taur color - var/b_tail = 30 // Tail/Taur color + var/r_tail = 30 // Tail color + var/g_tail = 30 // Tail color + var/b_tail = 30 // Tail color var/r_tail2 = 30 // For extra overlay. var/g_tail2 = 30 // For extra overlay. var/b_tail2 = 30 // For extra overlay. @@ -693,9 +693,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O reset_limbs() // Safety for species with incompatible manufacturers; easier than trying to do it case by case. pref.body_markings.Cut() // Basically same as above. - + pref.sanitize_body_styles() - + var/min_age = get_min_age() var/max_age = get_max_age() pref.age = max(min(pref.age, max_age), min_age) @@ -1146,7 +1146,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["tail_color"]) - var/new_tailc = input(user, "Choose your character's tail/taur colour:", "Character Preference", + var/new_tailc = input(user, "Choose your character's tail colour:", "Character Preference", rgb(pref.r_tail, pref.g_tail, pref.b_tail)) as color|null if(new_tailc) pref.r_tail = hex2num(copytext(new_tailc, 2, 4)) @@ -1155,7 +1155,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["tail_color2"]) - var/new_tailc2 = input(user, "Choose your character's secondary tail/taur colour:", "Character Preference", + var/new_tailc2 = input(user, "Choose your character's secondary tail colour:", "Character Preference", rgb(pref.r_tail2, pref.g_tail2, pref.b_tail2)) as color|null if(new_tailc2) pref.r_tail2 = hex2num(copytext(new_tailc2, 2, 4)) @@ -1164,7 +1164,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O return TOPIC_REFRESH_UPDATE_PREVIEW else if(href_list["tail_color3"]) - var/new_tailc3 = input(user, "Choose your character's tertiary tail/taur colour:", "Character Preference", + var/new_tailc3 = input(user, "Choose your character's tertiary tail colour:", "Character Preference", rgb(pref.r_tail3, pref.g_tail3, pref.b_tail3)) as color|null if(new_tailc3) pref.r_tail3 = hex2num(copytext(new_tailc3, 2, 4)) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 52df0be7a2..a108b743df 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -700,7 +700,6 @@ var/blood_overlay_type = "suit" blood_sprite_state = "suitblood" //Defaults to the suit's blood overlay, so that some blood renders instead of no blood. - var/taurized = FALSE siemens_coefficient = 0.9 w_class = ITEMSIZE_NORMAL preserve_item = 1 @@ -736,43 +735,6 @@ set_clothing_index() -/obj/item/clothing/suit/equipped(var/mob/user, var/slot) - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if((taurized && !istaurtail(H.tail_style)) || (!taurized && istaurtail(H.tail_style))) - taurize(user) - - return ..() - -/obj/item/clothing/suit/proc/taurize(var/mob/living/carbon/human/Taur) - if(istaurtail(Taur.tail_style)) - var/datum/sprite_accessory/tail/taur/taurtail = Taur.tail_style - if(taurtail.suit_sprites && (get_worn_icon_state(slot_wear_suit_str) in cached_icon_states(taurtail.suit_sprites))) - icon_override = taurtail.suit_sprites - taurized = TRUE - - if(!taurized) - icon_override = initial(icon_override) - taurized = FALSE - -// Taur suits need to be shifted so its centered on their taur half. -/obj/item/clothing/suit/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0,var/icon/clip_mask) - var/image/standing = ..() - if(taurized) //Special snowflake var on suits - standing.pixel_x = -16 - standing.layer = BODY_LAYER + 15 // 15 is above tail layer, so will not be covered by taurbody. - return standing - -/obj/item/clothing/suit/apply_accessories(var/image/standing) - if(LAZYLEN(accessories) && taurized) - for(var/obj/item/clothing/accessory/A in accessories) - var/image/I = new(A.get_mob_overlay()) - I.pixel_x = 16 //Opposite of the pixel_x on the suit (-16) from taurization to cancel it out and puts the accessory in the correct place on the body. - standing.add_overlay(I) - else - return ..() - - /////////////////////////////////////////////////////////////////////// //Under clothing /obj/item/clothing/under diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index a7dcc26b3e..2dc34e8e2f 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -273,9 +273,6 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() if(part.transparent) icon_key += "_t" - if(istype(tail_style, /datum/sprite_accessory/tail/taur)) - icon_key += tail_style.clip_mask_state - icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" var/icon/base_icon if(human_icon_cache[icon_key]) @@ -287,16 +284,6 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() 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. - Cutter = new(icon = tail_style.icon, icon_state = tail_style.clip_mask) - - 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) if(isnull(part) || part.is_stump()) continue @@ -608,8 +595,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() //Build a uniform sprite var/icon/c_mask = tail_style?.clip_mask if(c_mask) - var/obj/item/clothing/suit/S = wear_suit - if((wear_suit?.flags_inv & HIDETAIL) || (istype(S) && S.taurized)) // Reasons to not mask: 1. If you're wearing a suit that hides the tail or if you're wearing a taurized suit. + if((wear_suit?.flags_inv & HIDETAIL)) // Reason to not mask: You're wearing a suit that hides the tail c_mask = null overlays_standing[UNIFORM_LAYER] = w_uniform.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_w_uniform_str, default_icon = uniform_sprite, default_layer = UNIFORM_LAYER, clip_mask = c_mask) apply_layer(UNIFORM_LAYER) @@ -790,11 +776,6 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() suit_sprite = "[INV_SUIT_DEF_ICON].dmi" var/icon/c_mask = null - var/tail_is_rendered = (overlays_standing[TAIL_NORTH_LAYER] || overlays_standing[TAIL_SOUTH_LAYER]) - var/valid_clip_mask = tail_style?.clip_mask - - if(tail_is_rendered && valid_clip_mask && !(istype(suit) && suit.taurized)) //Clip the lower half of the suit off using the tail's clip mask for taurs since taur bodies aren't hidden. - c_mask = valid_clip_mask overlays_standing[SUIT_LAYER] = wear_suit.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_wear_suit_str, default_icon = suit_sprite, default_layer = SUIT_LAYER, clip_mask = c_mask) apply_layer(SUIT_LAYER) @@ -1151,7 +1132,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() return image(tail_s) //If you have a custom tail selected - if(tail_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL && !istaurtail(tail_style))) + if(tail_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) var/icon/tail_s = new/icon("icon" = tail_style.icon, "icon_state" = wagging && tail_style.ani_state ? tail_style.ani_state : tail_style.icon_state) if(tail_style.do_colouration) tail_s.Blend(rgb(src.r_tail, src.g_tail, src.b_tail), tail_style.color_blend_mode) @@ -1179,15 +1160,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() tail_s.Blend(overlay, ICON_OVERLAY) qdel(overlay) - if(istaurtail(tail_style)) - var/datum/sprite_accessory/tail/taur/taurtype = tail_style - if(taurtype.can_ride && !riding_datum) - riding_datum = new /datum/riding/taur(src) - verbs |= /mob/living/carbon/human/proc/taur_mount - verbs |= /mob/living/proc/toggle_rider_reins - return image(tail_s, "pixel_x" = -16) - else - return image(tail_s) + return image(tail_s) return null // TODO - Move this to where it should go ~Leshana diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index 4c1f104522..09dff80b8b 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -18,7 +18,7 @@ var/ani_state // State when wagging/animated var/extra_overlay_w // Wagging state for extra overlay var/extra_overlay2_w // Tertiary wagging. - 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/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 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 diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm deleted file mode 100644 index 2920dd4bfe..0000000000 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ /dev/null @@ -1,345 +0,0 @@ -/datum/riding/taur - keytype = /obj/item/material/twohanded/riding_crop // Crack! - nonhuman_key_exemption = FALSE // If true, nonhumans who can't hold keys don't need them, like borgs and simplemobs. - key_name = "a riding crop" // What the 'keys' for the thing being rided on would be called. - only_one_driver = TRUE // If true, only the person in 'front' (first on list of riding mobs) can drive. - -/datum/riding/taur/handle_vehicle_layer() - if(ridden.has_buckled_mobs()) - ridden.layer = initial(ridden.layer) - else - var/mob/living/L = ridden - if(!(istype(L) && (L.status_flags & HIDING))) - ridden.layer = initial(ridden.layer) - -/datum/riding/taur/ride_check(mob/living/M) - var/mob/living/L = ridden - if(L.stat) - force_dismount(M) - return FALSE - return TRUE - -/datum/riding/taur/force_dismount(mob/M) - . = ..() - ridden.visible_message("[M] stops riding [ridden]!") - -//Hoooo boy. -/datum/riding/taur/get_offsets(pass_index) // list(dir = x, y, layer) - var/mob/living/L = ridden - var/scale_x = L.icon_scale_x - var/scale_y = L.icon_scale_y - - var/list/values = list( - "[NORTH]" = list(0, 8*scale_y, ABOVE_MOB_LAYER), - "[SOUTH]" = list(0, 8*scale_y, BELOW_MOB_LAYER), - "[EAST]" = list(-10*scale_x, 8*scale_y, ABOVE_MOB_LAYER), - "[WEST]" = list(10*scale_x, 8*scale_y, ABOVE_MOB_LAYER)) - - return values - -//Human overrides for taur riding -/mob/living/carbon/human - max_buckled_mobs = 1 //Yeehaw - can_buckle = TRUE - buckle_movable = TRUE - buckle_lying = FALSE - -/mob/living/carbon/human/buckle_mob(mob/living/M, forced = FALSE, check_loc = TRUE) - if(forced) - return ..() // Skip our checks - if(!istaurtail(tail_style)) - return FALSE - else - var/datum/sprite_accessory/tail/taur/taurtype = tail_style - if(!taurtype.can_ride) - return FALSE - if(lying) - return FALSE - if(!ishuman(M)) - return FALSE - if(M in buckled_mobs) - return FALSE -// if(M.size_multiplier > size_multiplier * 1.2) -// to_chat(M,"This isn't a pony show! You need to be bigger for them to ride.") -// return FALSE - if(M.loc != src.loc) - if(M.Adjacent(src)) - M.forceMove(get_turf(src)) - - var/mob/living/carbon/human/H = M - - if(istaurtail(H.tail_style)) - to_chat(src,"Too many legs. TOO MANY LEGS!!") - return FALSE - - . = ..() - if(.) - buckled_mobs[M] = "riding" - -/mob/living/carbon/human/MouseDrop_T(mob/living/M, mob/living/user) //Prevention for forced relocation caused by can_buckle. Base proc has no other use. - return - -/mob/living/carbon/human/proc/taur_mount(var/mob/living/M in living_mobs(1)) - set name = "Taur Mount/Dismount" - set category = "Abilities" - set desc = "Let people ride on you." - - if(LAZYLEN(buckled_mobs)) - var/datum/riding/R = riding_datum - for(var/rider in buckled_mobs) - R.force_dismount(rider) - return - if (stat != CONSCIOUS) - return - if(!can_buckle || !istype(M) || !M.Adjacent(src) || M.buckled) - return - if(buckle_mob(M)) - visible_message("[M] starts riding [name]!") - -/mob/living/carbon/human/attack_hand(mob/user as mob) - if(LAZYLEN(buckled_mobs)) - //We're getting off! - if(user in buckled_mobs) - riding_datum.force_dismount(user) - //We're kicking everyone off! - if(user == src) - for(var/rider in buckled_mobs) - riding_datum.force_dismount(rider) - else - . = ..() - -/* -//////////////////////////// -/ =--------------------= / -/ == Taur Definitions == / -/ =--------------------= / -//////////////////////////// -*/ - -// Taur sprites are now a subtype of tail since they are mutually exclusive anyway. - -/datum/sprite_accessory/tail/taur - name = "You should not see this..." - icon = 'icons/mob/human_races/sprite_accessories/taurs.dmi' - do_colouration = 1 // Yes color, using tail color - color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY - - var/icon/suit_sprites = null //File for suit sprites, if any. - var/icon/under_sprites = null - - var/icon_sprite_tag // This is where we put stuff like _Horse, so we can assign icons easier. - - var/can_ride = FALSE //whether we're real rideable taur or just in that category. - - hide_body_parts = list(BP_L_LEG, BP_L_FOOT, BP_R_LEG, BP_R_FOOT) //Exclude pelvis just in case. - clip_mask_icon = 'icons/mob/human_races/sprite_accessories/taurs.dmi' - clip_mask_state = "taur_clip_mask_def" //Used to clip off the lower part of suits & uniforms. - whitelist_allowed = list() - -// Species-unique long tails/taurhalves - -// Tails/taurhalves for everyone - -/datum/sprite_accessory/tail/taur/wolf - name = "Wolf (Taur)" - icon_state = "wolf_s" - under_sprites = 'icons/mob/taursuits_wolf.dmi' - suit_sprites = 'icons/mob/taursuits_wolf.dmi' - icon_sprite_tag = "wolf" - -// /datum/sprite_accessory/tail/taur/fatwolf -// name = "Fat Wolf (Taur)" -// icon_state = "fatwolf_s" -// icon_sprite_tag = "wolf" //This could be modified later. - -/datum/sprite_accessory/tail/taur/wolf/wolf_2c - name = "Wolf dual-color (Taur)" - icon_state = "wolf_s" - extra_overlay = "wolf_markings" - //icon_sprite_tag = "wolf2c" - -// /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c -// name = "Fat Wolf dual-color (Taur)" -// icon_state = "fatwolf_s" -// extra_overlay = "fatwolf_markings" -// //icon_sprite_tag = "fatwolf2c" - -/datum/sprite_accessory/tail/taur/wolf/synthwolf - name = "SynthWolf dual-color (Taur)" - icon_state = "synthwolf_s" - extra_overlay = "synthwolf_markings" - //icon_sprite_tag = "synthwolf" - -/datum/sprite_accessory/tail/taur/naga - name = "Naga (Taur)" - icon_state = "naga_s" - suit_sprites = 'icons/mob/taursuits_naga.dmi' - //icon_sprite_tag = "naga" - -/datum/sprite_accessory/tail/taur/naga/naga_2c - name = "Naga dual-color (Taur)" - icon_state = "naga_s" - extra_overlay = "naga_markings" - //icon_sprite_tag = "naga2c" - -/datum/sprite_accessory/tail/taur/horse - name = "Horse (Taur)" - icon_state = "horse_s" - under_sprites = 'icons/mob/taursuits_horse.dmi' - suit_sprites = 'icons/mob/taursuits_horse.dmi' - icon_sprite_tag = "horse" - -/datum/sprite_accessory/tail/taur/horse/synthhorse - name = "SynthHorse dual-color (Taur)" - icon_state = "synthhorse_s" - extra_overlay = "synthhorse_markings" - //icon_sprite_tag = "synthhorse" - -/datum/sprite_accessory/tail/taur/cow - name = "Cow (Taur)" - icon_state = "cow_s" - suit_sprites = 'icons/mob/taursuits_cow.dmi' - icon_sprite_tag = "cow" - -/datum/sprite_accessory/tail/taur/deer - name = "Deer dual-color (Taur)" - icon_state = "deer_s" - extra_overlay = "deer_markings" - suit_sprites = 'icons/mob/taursuits_deer.dmi' - icon_sprite_tag = "deer" - -/datum/sprite_accessory/tail/taur/lizard - name = "Lizard (Taur)" - icon_state = "lizard_s" - suit_sprites = 'icons/mob/taursuits_lizard.dmi' - icon_sprite_tag = "lizard" - -/datum/sprite_accessory/tail/taur/lizard/lizard_2c - name = "Lizard dual-color (Taur)" - icon_state = "lizard_s" - extra_overlay = "lizard_markings" - //icon_sprite_tag = "lizard2c" - -/datum/sprite_accessory/tail/taur/lizard/synthlizard - name = "SynthLizard dual-color (Taur)" - icon_state = "synthlizard_s" - extra_overlay = "synthlizard_markings" - //icon_sprite_tag = "synthlizard" - -/datum/sprite_accessory/tail/taur/spider - name = "Spider (Taur)" - icon_state = "spider_s" - suit_sprites = 'icons/mob/taursuits_spider.dmi' - icon_sprite_tag = "spider" - -/datum/sprite_accessory/tail/taur/tents - name = "Tentacles (Taur)" - icon_state = "tent_s" - icon_sprite_tag = "tentacle" - can_ride = 0 - -/datum/sprite_accessory/tail/taur/feline - name = "Feline (Taur)" - icon_state = "feline_s" - suit_sprites = 'icons/mob/taursuits_feline.dmi' - icon_sprite_tag = "feline" - -// /datum/sprite_accessory/tail/taur/fatfeline -// name = "Fat Feline (Taur)" -// icon_state = "fatfeline_s" -// //icon_sprite_tag = "fatfeline" - -// /datum/sprite_accessory/tail/taur/fatfeline_wag -// name = "Fat Feline (Taur) (vwag)" -// icon_state = "fatfeline_s" -// ani_state = "fatfeline_w" - -/datum/sprite_accessory/tail/taur/feline/feline_2c - name = "Feline dual-color (Taur)" - icon_state = "feline_s" - extra_overlay = "feline_markings" - //icon_sprite_tag = "feline2c" - -/datum/sprite_accessory/tail/taur/feline/fatfeline_2c - name = "Fat Feline dual-color (Taur)" - icon_state = "fatfeline_s" - extra_overlay = "fatfeline_markings" - //icon_sprite_tag = "fatfeline2c" - -/datum/sprite_accessory/tail/taur/feline/synthfeline - name = "SynthFeline dual-color (Taur)" - icon_state = "synthfeline_s" - extra_overlay = "synthfeline_markings" - //icon_sprite_tag = "synthfeline" - -/datum/sprite_accessory/tail/taur/slug - name = "Slug (Taur)" - icon_state = "slug_s" - suit_sprites = 'icons/mob/taursuits_slug.dmi' - icon_sprite_tag = "slug" - -/datum/sprite_accessory/tail/taur/frog - name = "Frog (Taur)" - icon_state = "frog_s" - icon_sprite_tag = "frog" - -/datum/sprite_accessory/tail/taur/thicktentacles - name = "Thick Tentacles (Taur)" - icon_state = "tentacle_s" - can_ride = 0 - icon_sprite_tag = "thick_tentacles" - -/datum/sprite_accessory/tail/taur/drake //Enabling on request, no suit compatibility but then again see 2 above. - name = "Drake (Taur)" - icon_state = "drake_s" - extra_overlay = "drake_markings" - suit_sprites = 'icons/mob/taursuits_drake.dmi' - icon_sprite_tag = "drake" - -/datum/sprite_accessory/tail/taur/otie - name = "Otie (Taur)" - icon_state = "otie_s" - extra_overlay = "otie_markings" - suit_sprites = 'icons/mob/taursuits_otie.dmi' - icon_sprite_tag = "otie" - -/datum/sprite_accessory/tail/taur/alraune/alraune_2c - name = "Alraune (dual color)" - icon_state = "alraunecolor_s" - ani_state = "alraunecolor_closed_s" - ckeys_allowed = null - do_colouration = 1 - extra_overlay = "alraunecolor_markings" - extra_overlay_w = "alraunecolor_closed_markings" - clip_mask_state = "taur_clip_mask_alraune" - icon_sprite_tag = "alraune" - -/datum/sprite_accessory/tail/taur/wasp - name = "Wasp (dual color)" - icon_state = "wasp_s" - extra_overlay = "wasp_markings" - clip_mask_state = "taur_clip_mask_wasp" - icon_sprite_tag = "wasp" - -/datum/sprite_accessory/tail/taur/mermaid - name = "Mermaid (Taur)" - icon_state = "mermaid_s" - can_ride = 0 - icon_sprite_tag = "mermaid" - -/datum/sprite_accessory/tail/taur/shadekin_tail - name = "Shadekin Tail" - icon_state = "shadekin_s" - can_ride = 0 - hide_body_parts = null - clip_mask_icon = null - clip_mask_state = null - //species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c - name = "Shadekin Tail (dual color)" - extra_overlay = "shadekin_markings" - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long - name = "Shadekin Long Tail" - icon_state = "shadekin_long_s" diff --git a/icons/mob/human_races/sprite_accessories/taurs.dmi b/icons/mob/human_races/sprite_accessories/taurs.dmi deleted file mode 100644 index 9f8d0c689f..0000000000 Binary files a/icons/mob/human_races/sprite_accessories/taurs.dmi and /dev/null differ diff --git a/icons/mob/taursuits_cow.dmi b/icons/mob/taursuits_cow.dmi deleted file mode 100644 index ce592d5edb..0000000000 Binary files a/icons/mob/taursuits_cow.dmi and /dev/null differ diff --git a/icons/mob/taursuits_deer.dmi b/icons/mob/taursuits_deer.dmi deleted file mode 100644 index 6c53a6f4d0..0000000000 Binary files a/icons/mob/taursuits_deer.dmi and /dev/null differ diff --git a/icons/mob/taursuits_drake.dmi b/icons/mob/taursuits_drake.dmi deleted file mode 100644 index ca0db57532..0000000000 Binary files a/icons/mob/taursuits_drake.dmi and /dev/null differ diff --git a/icons/mob/taursuits_feline.dmi b/icons/mob/taursuits_feline.dmi deleted file mode 100644 index 1d4c597e02..0000000000 Binary files a/icons/mob/taursuits_feline.dmi and /dev/null differ diff --git a/icons/mob/taursuits_horse.dmi b/icons/mob/taursuits_horse.dmi deleted file mode 100644 index 4162463c69..0000000000 Binary files a/icons/mob/taursuits_horse.dmi and /dev/null differ diff --git a/icons/mob/taursuits_lizard.dmi b/icons/mob/taursuits_lizard.dmi deleted file mode 100644 index a6b9858f17..0000000000 Binary files a/icons/mob/taursuits_lizard.dmi and /dev/null differ diff --git a/icons/mob/taursuits_naga.dmi b/icons/mob/taursuits_naga.dmi deleted file mode 100644 index 7df326318c..0000000000 Binary files a/icons/mob/taursuits_naga.dmi and /dev/null differ diff --git a/icons/mob/taursuits_otie.dmi b/icons/mob/taursuits_otie.dmi deleted file mode 100644 index 06e083854e..0000000000 Binary files a/icons/mob/taursuits_otie.dmi and /dev/null differ diff --git a/icons/mob/taursuits_slug.dmi b/icons/mob/taursuits_slug.dmi deleted file mode 100644 index 98692375f3..0000000000 Binary files a/icons/mob/taursuits_slug.dmi and /dev/null differ diff --git a/icons/mob/taursuits_spider.dmi b/icons/mob/taursuits_spider.dmi deleted file mode 100644 index b8090eceaa..0000000000 Binary files a/icons/mob/taursuits_spider.dmi and /dev/null differ diff --git a/icons/mob/taursuits_wolf.dmi b/icons/mob/taursuits_wolf.dmi deleted file mode 100644 index 0f638ea6d3..0000000000 Binary files a/icons/mob/taursuits_wolf.dmi and /dev/null differ diff --git a/polaris.dme b/polaris.dme index e001e8c1d2..5f4be4cc24 100644 --- a/polaris.dme +++ b/polaris.dme @@ -2560,7 +2560,6 @@ #include "code\modules\mob\new_player\sprite_accessories_ear.dm" #include "code\modules\mob\new_player\sprite_accessories_extra.dm" #include "code\modules\mob\new_player\sprite_accessories_tail.dm" -#include "code\modules\mob\new_player\sprite_accessories_taur.dm" #include "code\modules\mob\new_player\sprite_accessories_wing.dm" #include "code\modules\modular_computers\laptop_vendor.dm" #include "code\modules\modular_computers\computers\modular_computer\core.dm"