Skip to content

Commit

Permalink
ports Aurora tattoos, adds asym. socks (#6251)
Browse files Browse the repository at this point in the history 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
adds a bunch of tattoos (From Aurora)

![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/9f9bd1f8-f834-4745-8697-06e70e55bbc1)

splits up tiger stripes to each limb

adds asymmetrical stirrup socks 

![t4xp2J8CdG](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/c9b58b92-7d2d-407a-af34-62750534af81)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
request + tattoos
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add:tattoos
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
@FreeStylaLT
FreeStylaLT committed Jan 8, 2024
1 parent 2c6f089 commit 54cde8a
Show file tree
Hide file tree
Showing 4 changed files with 369 additions and 0 deletions.
9 changes: 9 additions & 0 deletions code/datums/underwear/socks.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,3 +443,12 @@
/datum/category_item/underwear/socks/pantyhose_rip_stirrup
name = "Ripped Pantyhose (Stirrup)"
icon_state = "pantyhose_ripped-stir"

/datum/category_item/underwear/socks/asymmetrical_thigh_stirrups
name = "Asymmetrical Thigh (Stirrup)"
icon_state = "socks_thigh_asym_stirrup"
has_color = TRUE

/datum/category_item/underwear/socks/asymmetrical_thigh_stirrups/reversed
name = "Asymmetrical Thigh (Stirrup) (Reversed)"
icon_state = "socks_thigh_asym_stirrup_r"
360 changes: 360 additions & 0 deletions code/modules/sprite_accessories/markings/tattoo.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,56 @@
icon_state = "tat_tiger"
body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN)

/datum/sprite_accessory/marking/tatoo/tat_tiger/l_foot
name = "Tattoo (Tiger Stripes, Left Foot)"
id = "tat_tiger-l_foot"
body_parts = list(BP_L_FOOT)

/datum/sprite_accessory/marking/tatoo/tat_tiger/r_foot
name = "Tattoo (Tiger Stripes, Right Foot)"
id = "tat_tiger-r_foot"
body_parts = list(BP_R_FOOT)

/datum/sprite_accessory/marking/tatoo/tat_tiger/l_leg
name = "Tattoo (Tiger Stripes, Left Leg)"
id = "tat_tiger-l_leg"
body_parts = list(BP_L_LEG)

/datum/sprite_accessory/marking/tatoo/tat_tiger/r_leg
name = "Tattoo (Tiger Stripes, Right Leg)"
id = "tat_tiger-r_leg"
body_parts = list(BP_R_LEG)

/datum/sprite_accessory/marking/tatoo/tat_tiger/groin
name = "Tattoo (Tiger Stripes, Groin)"
id = "tat_tiger-groin"
body_parts = list(BP_GROIN)

/datum/sprite_accessory/marking/tatoo/tat_tiger/torso
name = "Tattoo (Tiger Stripes, Torso)"
id = "tat_tiger-torso"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/tatoo/tat_tiger/l_arm
name = "Tattoo (Tiger Stripes, Left Arm)"
id = "tat_tiger-l_arm"
body_parts = list(BP_L_ARM)

/datum/sprite_accessory/marking/tatoo/tat_tiger/r_arm
name = "Tattoo (Tiger Stripes, Right Arm)"
id = "tat_tiger-r_arm"
body_parts = list(BP_R_ARM)

/datum/sprite_accessory/marking/tatoo/tat_tiger/r_hand
name = "Tattoo (Tiger Stripes, Right Hand)"
id = "tat_tiger-r_hand"
body_parts = list(BP_R_HAND)

/datum/sprite_accessory/marking/tatoo/tat_tiger/l_hand
name = "Tattoo (Tiger Stripes, Left Hand)"
id = "tat_tiger-l_hand"
body_parts = list(BP_L_HAND)

/datum/sprite_accessory/marking/tatoo/tat_inmon1
name = "Tattoo (Inmon, Variant 1)"
id = "marking_tattoo_groin_inmon"
Expand All @@ -82,3 +132,313 @@
id = "marking_tattoo_groin_inmon3"
icon_state = "tat_inmon3"
body_parts = list(BP_GROIN)

/datum/sprite_accessory/marking/tatoo/spelunker
name = "Tattoo (Spelunker, Body)"
id = "marking_tattoo_body_spelunker"
icon_state = "tat_spelunker"
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)

/datum/sprite_accessory/marking/tatoo/spelunker/l_leg
name = "Tattoo (Spelunker, Left Leg)"
id = "marking_tattoo_body_spelunker-l_leg"
body_parts = list(BP_L_LEG)

/datum/sprite_accessory/marking/tatoo/spelunker/r_leg
name = "Tattoo (Spelunker, Right Leg)"
id = "marking_tattoo_body_spelunker-r_leg"
body_parts = list(BP_R_LEG)

/datum/sprite_accessory/marking/tatoo/spelunker/head
name = "Tattoo (Spelunker, Head)"
id = "marking_tattoo_body_spelunker-head"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/spelunker/torso
name = "Tattoo (Spelunker, Torso)"
id = "marking_tattoo_body_spelunker-torso"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/tatoo/spelunker/r_arm
name = "Tattoo (Spelunker, Right Arm)"
id = "marking_tattoo_body_spelunker-r_arm"
body_parts = list(BP_R_ARM)

/datum/sprite_accessory/marking/tatoo/spelunker/l_arm
name = "Tattoo (Spelunker, Left Arm)"
id = "marking_tattoo_body_spelunker-l_arm"
body_parts = list(BP_L_ARM)

/datum/sprite_accessory/marking/tatoo/spelunker/groin
name = "Tattoo (Spelunker, Groin)"
id = "marking_tattoo_body_spelunker-groin"
body_parts = list(BP_GROIN)

/datum/sprite_accessory/marking/tatoo/delver
name = "Tattoo (Delver, Body)"
id = "marking_tattoo_body_delver"
icon_state = "tat_delver"
body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN,BP_HEAD)

/datum/sprite_accessory/marking/tatoo/delver/l_leg
name = "Tattoo (Delver, Left Leg)"
id = "marking_tattoo_body_delver-l_leg"
body_parts = list(BP_L_LEG)

/datum/sprite_accessory/marking/tatoo/delver/r_leg
name = "Tattoo (Delver, Right Leg)"
id = "marking_tattoo_body_delver-r_leg"
body_parts = list(BP_R_LEG)

/datum/sprite_accessory/marking/tatoo/delver/r_arm
name = "Tattoo (Delver, Right Arm)"
id = "marking_tattoo_body_delver-r_arm"
body_parts = list(BP_R_ARM)

/datum/sprite_accessory/marking/tatoo/delver/l_arm
name = "Tattoo (Delver, Left Arm)"
id = "marking_tattoo_body_delver-l_arm"
body_parts = list(BP_L_ARM)

/datum/sprite_accessory/marking/tatoo/delver/groin
name = "Tattoo (Delver, Groin)"
id = "marking_tattoo_body_delver-groin"
body_parts = list(BP_GROIN)

/datum/sprite_accessory/marking/tatoo/delver/torso
name = "Tattoo (Delver, Torso)"
id = "marking_tattoo_body_delver-torso"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/tatoo/delver/head
name = "Tattoo (Delver, Head)"
id = "marking_tattoo_body_delver-head"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/eye_mark
name = "Tattoo (Mark, Left Eye)"
id = "marking_tattoo_eye_mark_left"
icon_state = "tat_eye_tattoo_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/eye_mark/right
name = "Tattoo (Mark, Right Eye)"
id = "marking_tattoo_eye_mark_right"
icon_state = "tat_eye_tattoo_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/jaeger
name = "Tattoo (Jaeger, Right Head)"
id = "marking_tattoo_jaeger_r"
icon_state = "tat_jaeger_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/jaeger/left
name = "Tattoo (Jaeger, Left Head)"
id = "marking_tattoo_jaeger_l"
icon_state = "tat_jaeger_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/lujan
name = "Tattoo (Lujan, Right Head)"
id = "marking_tattoo_lujan_r"
icon_state = "tat_lujan_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/lujan/left
name = "Tattoo (Lujan, Left Head)"
id = "marking_tattoo_lujan_l"
icon_state = "tat_lujan_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/natasha
name = "Tattoo (Natasha, Left Head)"
id = "marking_tattoo_natasha_l"
icon_state = "tat_natasha_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/natasha/right
name = "Tattoo (Natasha, Right Head)"
id = "marking_tattoo_natasha_r"
icon_state = "tat_natasha_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/forrest
name = "Tattoo (Forrest, Right Head)"
id = "marking_tattoo_forrest_r"
icon_state = "tat_forrest_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/forrest/left
name = "Tattoo (Forrest, Left Head)"
id = "marking_tattoo_forrest_l"
icon_state = "tat_forrest_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/toshi
name = "Tattoo (Toshi, Left Head)"
id = "marking_tattoo_toshi_l"
icon_state = "tat_toshi_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/toshi/right
name = "Tattoo (Toshi, Right Head)"
id = "marking_tattoo_toshi_r"
icon_state = "tat_toshi_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/cheshire
name = "Tattoo (Cheshire, Right Head)"
id = "marking_tattoo_cheshire_r"
icon_state = "tat_cheshire_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/cheshire/left
name = "Tattoo (Cheshire, Left Head)"
id = "marking_tattoo_cheshire_l"
icon_state = "tat_cheshire_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/bindi
name = "Tattoo (Bindi, Head)"
id = "marking_tattoo_bindi"
icon_state = "tat_bindi"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/eyestripe
name = "Tattoo (Eyestripe, Head)"
id = "marking_tattoo_eyestripe"
icon_state = "tat_eyestripe"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/kater
name = "Tattoo (Kater, Right Head)"
id = "marking_tattoo_kater_r"
icon_state = "tat_kater_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/kater/left
name = "Tattoo (Kater, Left Head)"
id = "marking_tattoo_kater_l"
icon_state = "tat_kater_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/hunter
name = "Tattoo (Hunter, Right Head)"
id = "marking_tattoo_hunter_r"
icon_state = "tat_hunter_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/hunter/left
name = "Tattoo (Hunter, Left Head)"
id = "marking_tattoo_hunter_l"
icon_state = "tat_hunter_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/nosetripe
name = "Tattoo (Nosestripe, Head)"
id = "marking_tattoo_nosetripe"
icon_state = "tat_nosetripe"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/wingsback
name = "Tattoo (Wings Back, Torso)"
id = "marking_tattoo_wings_back"
icon_state = "tat_wingsback"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/tatoo/heartback
name = "Tattoo (Heart Back, Torso)"
id = "marking_tattoo_heart_back"
icon_state = "tat_heartback"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/tatoo/belly
name = "Tattoo (Belly, Torso)"
id = "marking_tattoo_belly"
icon_state = "tat_belly"
body_parts = list(BP_TORSO)

/datum/sprite_accessory/marking/tatoo/neck
name = "Tattoo (Thick Neck, Head)"
id = "marking_tattoo_thickneck"
icon_state = "tat_neckthickk"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/ear
name = "Tattoo (Ear Right, Head)"
id = "marking_tattoo_ear_r"
icon_state = "tat_ear_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/ear/left
name = "Tattoo (Ear Left, Head)"
id = "marking_tattoo_ear_l"
icon_state = "tat_ear_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/cheekspot
name = "Tattoo (Cheekspot Left, Head)"
id = "marking_tattoo_cheekspot_l"
icon_state = "tat_cheekspot_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/cheekspot/right
name = "Tattoo (Cheekspot Right, Head)"
id = "marking_tattoo_cheekspot_r"
icon_state = "tat_cheekspot_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/crow
name = "Tattoo (Crow Right, Head)"
id = "marking_tattoo_crow_r"
icon_state = "tat_crow_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/crow/left
name = "Tattoo (Crow Left, Head)"
id = "marking_tattoo_crow_l"
icon_state = "tat_crow_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/nosetape
name = "Tattoo (Nose, Head)"
id = "marking_tattoo_nose"
icon_state = "tat_nosetape"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/mouth
name = "Tattoo (Mouth Left, Head)"
id = "marking_tattoo_mouth_l"
icon_state = "tat_lipcorner_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/mouth/right
name = "Tattoo (Mouth Right, Head)"
id = "marking_tattoo_mouth_r"
icon_state = "tat_lipcorner_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/eye
name = "Tattoo (Eye Corner Right, Head)"
id = "marking_tattoo_eyecorner_r"
icon_state = "tat_eyecorner_r"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/eye/left
name = "Tattoo (Eye Corner Left, Head)"
id = "marking_tattoo_eyecorner_l"
icon_state = "tat_eyecorner_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/eyelash
name = "Tattoo (Eyelash Left, Head)"
id = "marking_tattoo_eyelash_l"
icon_state = "tat_eyelash_l"
body_parts = list(BP_HEAD)

/datum/sprite_accessory/marking/tatoo/eyelash/right
name = "Tattoo (Eyelash Right, Head)"
id = "marking_tattoo_eyelash_r"
icon_state = "tat_eyelash_r"
body_parts = list(BP_HEAD)
Binary file modified icons/mob/human.dmi
View file
Binary file not shown.
Binary file modified icons/mob/sprite_accessories/markings/tatoos.dmi
View file
Binary file not shown.

0 comments on commit 54cde8a

Please sign in to comment.