Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Taur Bullshit #52

Merged
merged 8 commits into from
Oct 29, 2024
Merged

Taur Bullshit #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b29d1c8
taur bullshit
wewman222 Oct 29, 2024
958381f
taur bullshit
wewman222 Oct 29, 2024
e430025
taur bullshit
wewman222 Oct 29, 2024
f43e26d
taur bullshit
wewman222 Oct 29, 2024
dc6508b
taur bullshit
wewman222 Oct 29, 2024
72ba58c
taur bullshit
wewman222 Oct 29, 2024
c16bd06
taur bullshit
wewman222 Oct 29, 2024
89ab13e
taur bullshit
wewman222 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 12 additions & 0 deletions code/modules/client/customizer/customizers/organ/tail.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
35 changes: 35 additions & 0 deletions code/modules/mob/dead/new_player/sprite_accessory/tails.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/species_types/furry/anthromacro.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/species_types/furry/anthromorph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/species_types/furry/demihuman.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/species_types/furry/demimacro.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file added icons/mob/sprite_accessory/tails/fatnaga.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/mob/sprite_accessory/tails/feline.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/mob/sprite_accessory/tails/naga.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/mob/sprite_accessory/tails/sectdrone.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/mob/sprite_accessory/tails/spider.dmi
View file
Open in desktop
Binary file not shown.
Binary file added icons/mob/sprite_accessory/tails/wolf.dmi
View file
Open in desktop
Binary file not shown.
Loading