From 6be5833826ff854f7e1ec710de22b9d4b292d766 Mon Sep 17 00:00:00 2001 From: wewman222 <77263223+wewman222@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:07:56 -0700 Subject: [PATCH] Taur fixes (#54) * taur bullshit help * taur bullshit help * taur bullshit * taur bullshit * taur bullshit * taur bullshit * taur bullshit * taur bullshit * female taur fixes * female taur fixes * female taur fixes * female taur fixes * female taur fixes * female taur fixes * Update mobs.dm --- code/__DEFINES/mobs.dm | 1 + code/modules/mob/dead/new_player/sprite_accessory/tails.dm | 3 ++- code/modules/mob/living/carbon/human/species.dm | 2 +- .../mob/living/carbon/human/species_types/furry/anthromacro.dm | 3 ++- .../mob/living/carbon/human/species_types/furry/anthromorph.dm | 3 ++- .../mob/living/carbon/human/species_types/furry/demihuman.dm | 3 ++- .../mob/living/carbon/human/species_types/furry/demimacro.dm | 3 ++- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 824117ec4..86648c9d3 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -326,6 +326,7 @@ #define OFFSET_ARMOR_F "wear_armorf" #define OFFSET_HANDS_F "handsf" #define OFFSET_UNDIES_F "underwearf" +#define OFFSET_TAUR_F "taurf" //MINOR TWEAKS/MISC #define AGE_MIN 18 //youngest a character can be 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 7e8a18183..5ac6fd3e0 100644 --- a/code/modules/mob/dead/new_player/sprite_accessory/tails.dm +++ b/code/modules/mob/dead/new_player/sprite_accessory/tails.dm @@ -368,4 +368,5 @@ 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) + generic_gender_feature_adjust(appearance_list, organ, bodypart, owner, OFFSET_TAUR, OFFSET_TAUR_F) + diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index ae746d370..c913cd097 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) OFFSET_CLOAK_F = list(0,0), OFFSET_FACEMASK_F = list(0,0), OFFSET_HEAD_F = list(0,0), \ OFFSET_FACE_F = list(0,0), OFFSET_BELT_F = list(0,0), OFFSET_BACK_F = list(0,0), \ OFFSET_NECK_F = list(0,0), OFFSET_MOUTH_F = list(0,0), OFFSET_PANTS_F = list(0,0), \ - OFFSET_SHIRT_F = list(0,0), OFFSET_ARMOR_F = list(0,0), OFFSET_UNDIES = list(0,0), OFFSET_UNDIES_F = list(0,0)) + OFFSET_SHIRT_F = list(0,0), OFFSET_ARMOR_F = list(0,0), OFFSET_UNDIES = list(0,0), OFFSET_UNDIES_F = list(0,0), OFFSET_TAUR = list(0,0), OFFSET_TAUR_F = list(0,0)) var/dam_icon var/dam_icon_f 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 764b29a02..5ade4babb 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,7 +36,8 @@ 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), \ + OFFSET_TAUR = list(-16,-1), OFFSET_TAUR_F = 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 6ac63905f..002956f0d 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,7 +34,8 @@ 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), \ + OFFSET_TAUR = list(-16,-1), OFFSET_TAUR_F = 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 d6a032c03..b675e0343 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,7 +33,8 @@ 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), \ + OFFSET_TAUR = list(-16,-1), OFFSET_TAUR_F = 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 33caeea20..e34d79c7c 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,7 +33,8 @@ 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), \ + OFFSET_TAUR = list(-16,-1), OFFSET_TAUR_F = 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)