cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Markings expansion 2: Teshari boogaloo (#8865)

Browse Source 
* markings

* typo fixy
This commit is contained in:
Greenjoe12345
2023-01-03 01:06:35 +00:00
committed by GitHub
parent 7ce9daec79
commit 0c23067efa
8 changed files with 197 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/mob/living/carbon/human/species/station/teshari.dm
View File

@@ -107,10 +107,10 @@
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right),
BP_L_LEG = list("path" = /obj/item/organ/external/leg),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/teshari),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/teshari),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/teshari),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/teshari)
BP_L_HAND = list("path" = /obj/item/organ/external/hand),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right)
)
has_organ = list(

8
code/modules/mob/living/carbon/human/species/virtual_reality/opaque_form.dm
View File

@@ -94,10 +94,10 @@
BP_R_ARM = list("path" = /obj/item/organ/external/arm/right),
BP_L_LEG = list("path" = /obj/item/organ/external/leg),
BP_R_LEG = list("path" = /obj/item/organ/external/leg/right),
BP_L_HAND = list("path" = /obj/item/organ/external/hand/teshari),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right/teshari),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot/teshari),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right/teshari)
BP_L_HAND = list("path" = /obj/item/organ/external/hand),
BP_R_HAND = list("path" = /obj/item/organ/external/hand/right),
BP_L_FOOT = list("path" = /obj/item/organ/external/foot),
BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right)
)
/datum/species/shapeshifter/promethean/avatar/diona

176
code/modules/mob/new_player/sprite_accessories.dm
View File

@@ -3050,12 +3050,186 @@ shaved
//Tesh stuff.
/datum/sprite_accessory/marking/teshi_feathers
name = "Teshari limb feathers"
icon_state = "teshi_feathers"
body_parts = list(BP_R_HAND, BP_L_HAND, BP_R_FOOT, BP_L_FOOT)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_feathers/r_hand
name = "Teshari limb feathers (Right hand)"
body_parts = list(BP_R_HAND)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_feathers/l_hand
name = "Teshari limb feathers (Left hand)"
body_parts = list(BP_L_HAND)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_feathers/r_foot
name = "Teshari limb feathers (Right foot)"
body_parts = list(BP_R_FOOT)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_feathers/l_foot
name = "Teshari limb feathers (Left foot)"
body_parts = list(BP_L_FOOT)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_small_feathers
name = "Teshari small limb feathers"
icon_state = "teshi_sf"
body_parts = list(BP_R_HAND, BP_L_HAND, BP_R_FOOT, BP_L_FOOT)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_small_feathers/r_hand
name = "Teshari small limb feathers (Right hand)"
body_parts = list(BP_R_HAND)
/datum/sprite_accessory/marking/teshi_small_feathers/l_hand
name = "Teshari small limb feathers (Left hand)"
body_parts = list(BP_L_HAND)
/datum/sprite_accessory/marking/teshi_small_feathers/r_foot
name = "Teshari small limb feathers (Right foot)"
body_parts = list(BP_R_FOOT)
/datum/sprite_accessory/marking/teshi_small_feathers/l_foot
name = "Teshari small limb feathers (Left foot)"
body_parts = list(BP_L_FOOT)
/datum/sprite_accessory/marking/teshi_fluff
name = "Underfluff (Teshari)"
name = "Underfluff (Teshari) (Head, torso, groin and legs)"
icon_state = "teshi_fluff"
body_parts = list(BP_HEAD, BP_TORSO, BP_GROIN, BP_R_LEG, BP_L_LEG)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_fluff/head
name = "Underfluff (Teshari) (Head)"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/teshi_fluff/torso
name = "Underfluff (Teshari) (Torso)"
body_parts = list(BP_TORSO)
/datum/sprite_accessory/marking/teshi_fluff/groin
name = "Underfluff (Teshari) (Groin)"
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/teshi_fluff/r_leg
name = "Underfluff (Teshari) (Right leg)"
body_parts = list(BP_R_LEG)
/datum/sprite_accessory/marking/teshi_fluff/l_leg
name = "Underfluff (Teshari) (Left leg)"
body_parts = list(BP_L_LEG)
/datum/sprite_accessory/marking/teshi_coat
name = "Coat (Teshari) (Head, torso, limbs)"
icon_state = "teshi_coat"
body_parts = list(BP_HEAD, BP_TORSO, BP_R_ARM, BP_L_ARM, BP_R_LEG, BP_L_LEG)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_coat/head
name = "Coat (Teshari) (Head)"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/teshi_coat/torso
name = "Coat (Teshari) (Torso)"
body_parts = list(BP_TORSO)
/datum/sprite_accessory/marking/teshi_coat/r_arm
name = "Coat (Teshari) (Right arm)"
body_parts = list(BP_R_ARM)
/datum/sprite_accessory/marking/teshi_coat/l_arm
name = "Coat (Teshari) (Left arm)"
body_parts = list(BP_L_ARM)
/datum/sprite_accessory/marking/teshi_coat/r_leg
name = "Coat (Teshari) (Right leg)"
body_parts = list(BP_R_LEG)
/datum/sprite_accessory/marking/teshi_coat/l_leg
name = "Coat (Teshari) (Left leg)"
body_parts = list(BP_L_LEG)
/datum/sprite_accessory/marking/teshi_pattern_1
name = "Feather pattern 1 (Teshari)"
icon_state = "teshi_pattern_1"
body_parts = list(BP_HEAD, BP_TORSO, BP_GROIN, BP_L_LEG, BP_R_LEG, BP_L_HAND, BP_R_HAND)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_pattern_1/head
name = "Feather pattern 1 (Teshari) (Head)"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/teshi_pattern_1/torso
name = "Feather pattern 1 (Teshari) (Torso)"
body_parts = list(BP_TORSO)
/datum/sprite_accessory/marking/teshi_pattern_1/groin
name = "Feather pattern 1 (Teshari) (Groin)"
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/teshi_pattern_1/l_leg
name = "Feather pattern 1 (Teshari) (Left leg)"
body_parts = list(BP_L_LEG)
/datum/sprite_accessory/marking/teshi_pattern_1/r_leg
name = "Feather pattern 1 (Teshari) (Right leg)"
body_parts = list(BP_R_LEG)
/datum/sprite_accessory/marking/teshi_pattern_1/l_hand
name = "Feather pattern 1 (Teshari) (Left hand)"
body_parts = list(BP_L_HAND)
/datum/sprite_accessory/marking/teshi_pattern_1/r_hand
name = "Feather pattern 1 (Teshari) (Right hand)"
body_parts = list(BP_R_HAND)
/datum/sprite_accessory/marking/teshi_pattern_2
name = "Feather pattern 2 (Teshari)"
icon_state = "teshi_pattern_2"
body_parts = list(BP_HEAD, BP_TORSO, BP_GROIN, BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)
species_allowed = list(SPECIES_TESHARI)
/datum/sprite_accessory/marking/teshi_pattern_2/head
name = "Feather pattern 2 (Teshari) (Head)"
body_parts = list(BP_HEAD)
/datum/sprite_accessory/marking/teshi_pattern_2/torso
name = "Feather pattern 2 (Teshari) (Torso)"
body_parts = list(BP_TORSO)
/datum/sprite_accessory/marking/teshi_pattern_2/groin
name = "Feather pattern 2 (Teshari) (Groin)"
body_parts = list(BP_GROIN)
/datum/sprite_accessory/marking/teshi_pattern_2/l_leg
name = "Feather pattern 2 (Teshari) (Left leg)"
body_parts = list(BP_L_LEG)
/datum/sprite_accessory/marking/teshi_pattern_2/r_leg
name = "Feather pattern 2 (Teshari) (Right leg)"
body_parts = list(BP_R_LEG)
/datum/sprite_accessory/marking/teshi_pattern_2/l_arm
name = "Feather pattern 2 (Teshari) (Left arm)"
body_parts = list(BP_L_ARM)
/datum/sprite_accessory/marking/teshi_pattern_2/r_arm
name = "Feather pattern 2 (Teshari) (Right arm)"
body_parts = list(BP_R_ARM)
/datum/sprite_accessory/marking/teshi_pattern_2/l_hand
name = "Feather pattern 2 (Teshari) (Left hand)"
body_parts = list(BP_L_HAND)
/datum/sprite_accessory/marking/teshi_pattern_2/r_hand
name = "Feather pattern 2 (Teshari) (Right hand)"
body_parts = list(BP_R_HAND)
/datum/sprite_accessory/marking/teshi_heterochromia
name = "Heterochromia (Teshari) (right eye)"
icon_state = "teshi_heterochromia"

14
code/modules/mob/new_player/sprite_accessories_tail.dm
View File

@@ -262,6 +262,20 @@
extra_overlay = "seromitail_feathers_s"
species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
/datum/sprite_accessory/tail/special/tesharitail_pattern_1
name = "teshari tail (pattern 1)"
icon_state = "teshitail"
extra_overlay = "teshi_pattern_1"
species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
color_blend_mode = ICON_ADD
/datum/sprite_accessory/tail/special/tesharitail_pattern_2
name = "teshari tail (pattern 2)"
icon_state = "teshitail"
extra_overlay = "teshi_pattern_2"
species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3)
color_blend_mode = ICON_ADD
/datum/sprite_accessory/tail/special/tesharitail_noplume
name = "teshari tail, no plumage"
icon_state = "teshtail_noplume_s"

8
code/modules/organs/subtypes/teshari.dm
View File

@@ -1,8 +0,0 @@
/obj/item/organ/external/foot/teshari
body_hair = "feathers"
/obj/item/organ/external/foot/right/teshari
body_hair = "feathers"
/obj/item/organ/external/hand/teshari
body_hair = "feathers"
/obj/item/organ/external/hand/right/teshari
body_hair = "feathers"