diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index d932c6232..824117ec4 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -308,6 +308,7 @@ #define OFFSET_ARMOR "wear_armor" #define OFFSET_HANDS "hands" #define OFFSET_UNDIES "underwear" +#define OFFSET_TAUR "taur" #define OFFSET_ID_F "wear_ringf" #define OFFSET_GLOVES_F "glovesf" diff --git a/code/modules/client/customizer/customizers/organ/tail.dm b/code/modules/client/customizer/customizers/organ/tail.dm index 0b063a68f..a7a11d80c 100644 --- a/code/modules/client/customizer/customizers/organ/tail.dm +++ b/code/modules/client/customizer/customizers/organ/tail.dm @@ -145,6 +145,12 @@ /datum/sprite_accessory/tail/lizard/dtiger, /datum/sprite_accessory/tail/lizard/ltiger, /datum/sprite_accessory/tail/lizard/spikes, + /datum/sprite_accessory/tail/taur/snake, + /datum/sprite_accessory/tail/taur/wolf, + /datum/sprite_accessory/tail/taur/feline, + /datum/sprite_accessory/tail/taur/fatsnake, + /datum/sprite_accessory/tail/taur/spider, + /datum/sprite_accessory/tail/taur/sect, ) /datum/customizer/organ/tail/anthro @@ -209,4 +215,10 @@ /datum/sprite_accessory/tail/lizard/dtiger, /datum/sprite_accessory/tail/lizard/ltiger, /datum/sprite_accessory/tail/lizard/spikes, + /datum/sprite_accessory/tail/taur/snake, + /datum/sprite_accessory/tail/taur/wolf, + /datum/sprite_accessory/tail/taur/feline, + /datum/sprite_accessory/tail/taur/fatsnake, + /datum/sprite_accessory/tail/taur/spider, + /datum/sprite_accessory/tail/taur/sect, ) diff --git a/code/modules/mob/dead/new_player/sprite_accessory/tails.dm b/code/modules/mob/dead/new_player/sprite_accessory/tails.dm index 7b9f69ba4..7e8a18183 100644 --- a/code/modules/mob/dead/new_player/sprite_accessory/tails.dm +++ b/code/modules/mob/dead/new_player/sprite_accessory/tails.dm @@ -334,3 +334,38 @@ icon_state = "hearttail" color_key_defaults = list(KEY_SKIN_COLOR) can_wag = TRUE + +//TAUR BULLSHIT HELP + +/datum/sprite_accessory/tail/taur/snake + name = "Snake Taur" + icon = 'icons/mob/sprite_accessory/tails/naga.dmi' + icon_state = "naga_s" + +/datum/sprite_accessory/tail/taur/wolf + name = "Wolf Taur" + icon = 'icons/mob/sprite_accessory/tails/wolf.dmi' + icon_state = "wolf_s" + +/datum/sprite_accessory/tail/taur/spider + name = "Drider" + icon = 'icons/mob/sprite_accessory/tails/spider.dmi' + icon_state = "spider_s" + +/datum/sprite_accessory/tail/taur/feline + name = "Feline Taur" + icon = 'icons/mob/sprite_accessory/tails/feline.dmi' + icon_state = "feline_s" + +/datum/sprite_accessory/tail/taur/fatsnake + name = "Fat Snake Taur" + icon = 'icons/mob/sprite_accessory/tails/fatnaga.dmi' + icon_state = "fatnaga_s" + +/datum/sprite_accessory/tail/taur/sect + name = "Bug Taur" + icon = 'icons/mob/sprite_accessory/tails/sectdrone.dmi' + icon_state = "sect_drone" + +/datum/sprite_accessory/tail/taur/adjust_appearance_list(list/appearance_list, obj/item/organ/organ, obj/item/bodypart/bodypart, mob/living/carbon/owner) + generic_gender_feature_adjust(appearance_list, organ, bodypart, owner, OFFSET_TAUR) diff --git a/code/modules/mob/living/carbon/human/species_types/furry/anthromacro.dm b/code/modules/mob/living/carbon/human/species_types/furry/anthromacro.dm index 675a78913..764b29a02 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/anthromacro.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/anthromacro.dm @@ -36,6 +36,7 @@ OFFSET_FACE_F = list(0,-1), OFFSET_BELT_F = list(0,0), OFFSET_BACK_F = list(0,-1), \ OFFSET_NECK_F = list(0,-1), OFFSET_MOUTH_F = list(0,-1), OFFSET_PANTS_F = list(0,0), \ OFFSET_SHIRT_F = list(0,0), OFFSET_ARMOR_F = list(0,0), OFFSET_UNDIES_F = list(0,-1), \ + OFFSET_TAUR = list(-16,-1), \ ) specstats = list("strength" = 0, "perception" = 1, "intelligence" = -1, "constitution" = 0, "endurance" = 1, "speed" = -1, "fortune" = 0) specstats_f = list("strength" = -1, "perception" = 0, "intelligence" = 2, "constitution" = -1, "endurance" = 0, "speed" = 1, "fortune" = 0) diff --git a/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm b/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm index 80cb4467c..6ac63905f 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm @@ -34,6 +34,7 @@ OFFSET_FACE_F = list(0,-1), OFFSET_BELT_F = list(0,0), OFFSET_BACK_F = list(0,-1), \ OFFSET_NECK_F = list(0,-1), OFFSET_MOUTH_F = list(0,-1), OFFSET_PANTS_F = list(0,0), \ OFFSET_SHIRT_F = list(0,0), OFFSET_ARMOR_F = list(0,0), OFFSET_UNDIES_F = list(0,-1), \ + OFFSET_TAUR = list(-16,-1), \ ) specstats = list("strength" = 0, "perception" = 1, "intelligence" = -1, "constitution" = 0, "endurance" = 1, "speed" = -1, "fortune" = 0) specstats_f = list("strength" = -1, "perception" = 0, "intelligence" = 2, "constitution" = -1, "endurance" = 0, "speed" = 1, "fortune" = 0) diff --git a/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm b/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm index 84385b018..d6a032c03 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm @@ -33,6 +33,7 @@ OFFSET_FACE_F = list(0,-1), OFFSET_BELT_F = list(0,0), OFFSET_BACK_F = list(0,-1), \ OFFSET_NECK_F = list(0,-1), OFFSET_MOUTH_F = list(0,-1), OFFSET_PANTS_F = list(0,0), \ OFFSET_SHIRT_F = list(0,0), OFFSET_ARMOR_F = list(0,0), OFFSET_UNDIES_F = list(0,-1), \ + OFFSET_TAUR = list(-16,-1), \ ) specstats = list("strength" = 0, "perception" = 1, "intelligence" = -1, "constitution" = 0, "endurance" = 1, "speed" = -1, "fortune" = 0) specstats_f = list("strength" = -1, "perception" = 0, "intelligence" = 2, "constitution" = -1, "endurance" = 0, "speed" = 1, "fortune" = 0) diff --git a/code/modules/mob/living/carbon/human/species_types/furry/demimacro.dm b/code/modules/mob/living/carbon/human/species_types/furry/demimacro.dm index 138fb525a..33caeea20 100644 --- a/code/modules/mob/living/carbon/human/species_types/furry/demimacro.dm +++ b/code/modules/mob/living/carbon/human/species_types/furry/demimacro.dm @@ -33,6 +33,7 @@ OFFSET_FACE_F = list(0,-1), OFFSET_BELT_F = list(0,0), OFFSET_BACK_F = list(0,-1), \ OFFSET_NECK_F = list(0,-1), OFFSET_MOUTH_F = list(0,-1), OFFSET_PANTS_F = list(0,0), \ OFFSET_SHIRT_F = list(0,0), OFFSET_ARMOR_F = list(0,0), OFFSET_UNDIES_F = list(0,-1), \ + OFFSET_TAUR = list(-16,-1), \ ) specstats = list("strength" = 0, "perception" = 1, "intelligence" = -1, "constitution" = 0, "endurance" = 1, "speed" = -1, "fortune" = 0) specstats_f = list("strength" = -1, "perception" = 0, "intelligence" = 2, "constitution" = -1, "endurance" = 0, "speed" = 1, "fortune" = 0) diff --git a/icons/mob/sprite_accessory/tails/fatnaga.dmi b/icons/mob/sprite_accessory/tails/fatnaga.dmi new file mode 100644 index 000000000..4dfd77a49 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/fatnaga.dmi differ diff --git a/icons/mob/sprite_accessory/tails/feline.dmi b/icons/mob/sprite_accessory/tails/feline.dmi new file mode 100644 index 000000000..eb25c14ea Binary files /dev/null and b/icons/mob/sprite_accessory/tails/feline.dmi differ diff --git a/icons/mob/sprite_accessory/tails/naga.dmi b/icons/mob/sprite_accessory/tails/naga.dmi new file mode 100644 index 000000000..adad0bb37 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/naga.dmi differ diff --git a/icons/mob/sprite_accessory/tails/sectdrone.dmi b/icons/mob/sprite_accessory/tails/sectdrone.dmi new file mode 100644 index 000000000..d44eedfc2 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/sectdrone.dmi differ diff --git a/icons/mob/sprite_accessory/tails/spider.dmi b/icons/mob/sprite_accessory/tails/spider.dmi new file mode 100644 index 000000000..50ba78564 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/spider.dmi differ diff --git a/icons/mob/sprite_accessory/tails/wolf.dmi b/icons/mob/sprite_accessory/tails/wolf.dmi new file mode 100644 index 000000000..2b3568c48 Binary files /dev/null and b/icons/mob/sprite_accessory/tails/wolf.dmi differ