diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm
index 867d6ba294f..34f6b679158 100644
--- a/code/modules/client/preference_setup/general/03_body.dm
+++ b/code/modules/client/preference_setup/general/03_body.dm
@@ -314,7 +314,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
out += "
Body Markings +
"
for(var/M in pref.body_markings)
- out += "[M] - Color"
+ out += "[M] [pref.body_markings.len > 1 ? "˄ ˅ " : ""]- Color"
out += HTML_RECT(pref.body_markings[M])
out += "
"
@@ -555,6 +555,25 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
pref.body_markings[new_marking] = "#000000" //New markings start black
return TOPIC_REFRESH_UPDATE_PREVIEW
+
+ else if(href_list["marking_up"])
+ var/M = href_list["marking_up"]
+ var/start = pref.body_markings.Find(M)
+ if(start != 1) //If we're not the beginning of the list, swap with the previous element.
+ moveElement(pref.body_markings, start, start-1)
+ else //But if we ARE, become the final element -ahead- of everything else.
+ moveElement(pref.body_markings, start, pref.body_markings.len+1)
+ return TOPIC_REFRESH_UPDATE_PREVIEW
+
+ else if(href_list["marking_down"])
+ var/M = href_list["marking_down"]
+ var/start = pref.body_markings.Find(M)
+ if(start != pref.body_markings.len) //If we're not the end of the list, swap with the next element.
+ moveElement(pref.body_markings, start, start+2)
+ else //But if we ARE, become the first element -behind- everything else.
+ moveElement(pref.body_markings, start, 1)
+ return TOPIC_REFRESH_UPDATE_PREVIEW
+
else if(href_list["marking_remove"])
var/M = href_list["marking_remove"]
pref.body_markings -= M
diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm
index 67da95d71c4..656cd7d9665 100644
--- a/code/modules/mob/abstract/new_player/sprite_accessories.dm
+++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm
@@ -2838,6 +2838,620 @@ Follow by example and make good judgement based on length which list to include
var/is_genetic = TRUE // If TRUE, the marking is considered genetic and is embedded into DNA.
var/is_painted = FALSE // If TRUE, the marking can be put on prosthetics/robolimbs.
+ aug_scalpports
+ name = "Augment (Scalp Ports)"
+ icon_state = "aug_scalpports"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ vertex_left
+ name = "Augment (Scalp Port, Vertex Left)"
+ icon_state = "aug_vertexport_l"
+
+ vertex_right
+ name = "Augment (Scalp Port, Vertex Right)"
+ icon_state = "aug_vertexport_r"
+
+ occipital_left
+ name = "Augment (Scalp Port, Occipital Left)"
+ icon_state = "aug_occipitalport_l"
+
+ occipital_right
+ name = "Augment (Scalp Port, Occipital Right)"
+ icon_state = "aug_occipitalport_r"
+
+ aug_scalpportsdiode
+ name = "Augment (Scalp Ports Diode)"
+ icon_state = "aug_scalpportsdiode"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ vertex_left
+ name = "Augment (Scalp Port Diode, Vertex Left )"
+ icon_state = "aug_vertexportdiode_l"
+
+ vertex_right
+ name = "Augment (Scalp Port Diode, Vertex Right)"
+ icon_state = "aug_vertexportdiode_r"
+
+ occipital_left
+ name = "Augment (Scalp Port Diode, Occipital Left)"
+ icon_state = "aug_occipitalportdiode_l"
+
+ occipital_right
+ name = "Augment (Scalp Port Diode, Occipital Right)"
+ icon_state = "aug_occipitalportdiode_r"
+
+ aug_backside_left
+ name = "Augment (Backside Left, Head)"
+ icon_state = "aug_backside_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ side_diode
+ name = "Augment (Backside Left Diode, Head)"
+ icon_state = "aug_sidediode_l"
+
+ aug_backside_right
+ name = "Augment (Backside Right, Head)"
+ icon_state = "aug_backside_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ side_diode
+ name = "Augment (Backside Right Diode, Head)"
+ icon_state = "aug_sidediode_r"
+
+ aug_side_deunan_left
+ name = "Augment (Deunan, Side Left)"
+ icon_state = "aug_sidedeunan_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ aug_side_deunan_right
+ name = "Augment (Deunan, Side Right)"
+ icon_state = "aug_sidedeunan_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ aug_side_kuze_left
+ name = "Augment (Kuze, Side Left)"
+ icon_state = "aug_sidekuze_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ side_diode
+ name = "Augment (Kuze Diode, Side Left)"
+ icon_state = "aug_sidekuzediode_l"
+
+ aug_side_kuze_right
+ name = "Augment (Kuze, Side Right)"
+ icon_state = "aug_sidekuze_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ side_diode
+ name = "Augment (Kuze Diode, Side Right)"
+ icon_state = "aug_sidekuzediode_r"
+
+ aug_side_kinzie_left
+ name = "Augment (Kinzie, Side Left)"
+ icon_state = "aug_sidekinzie_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ aug_side_kinzie_right
+ name = "Augment (Kinzie, Side Right)"
+ icon_state = "aug_sidekinzie_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ aug_side_shelly_left
+ name = "Augment (Shelly, Side Left)"
+ icon_state = "aug_sideshelly_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ aug_side_shelly_right
+ name = "Augment (Shelly, Side Right)"
+ icon_state = "aug_sideshelly_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ aug_chestports
+ name = "Augment (Chest Ports)"
+ icon_state = "aug_chestports"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ aug_abdomenports
+ name = "Augment (Abdomen Ports)"
+ icon_state = "aug_abdomenports"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ backstripe
+ name = "Back Stripe"
+ icon_state = "backstripe"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ spinemarks
+ name = "Back Stripe Marks"
+ icon_state = "backstripemarks"
+
+ bands
+ name = "Color Bands (All)"
+ icon_state = "bands"
+ body_parts = list(BP_L_LEG, BP_R_LEG, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND, BP_GROIN, BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell, /datum/species/diona, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ chest
+ name = "Color Bands (Torso)"
+ body_parts = list(BP_CHEST)
+
+ groin
+ name = "Color Bands (Groin)"
+ body_parts = list(BP_GROIN)
+
+ left_arm
+ name = "Color Bands (Left Arm)"
+ body_parts = list(BP_L_ARM)
+
+ right_arm
+ name = "Color Bands (Right Arm)"
+ body_parts = list(BP_R_ARM)
+
+ left_hand
+ name = "Color Bands (Left Hand)"
+ body_parts = list(BP_L_HAND)
+
+ right_hand
+ name = "Color Bands (Right Hand)"
+ body_parts = list(BP_R_HAND)
+
+ left_leg
+ name = "Color Bands (Left Leg)"
+ body_parts = list(BP_L_LEG)
+
+ right_leg
+ name = "Color Bands (Right Leg)"
+ body_parts = list(BP_R_LEG)
+
+ left_foot
+ name = "Color Bands (Left Foot)"
+ body_parts = list(BP_L_FOOT)
+ species_allowed = list(/datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ left_foot_human
+ name = "Color Bands (Left Foot)"
+ icon_state = "bandshuman"
+ body_parts = list(BP_L_FOOT)
+ species_allowed = list(/datum/species/human)
+
+ right_foot
+ name = "Color Bands (Right Foot)"
+ body_parts = list(BP_R_FOOT)
+ species_allowed = list(/datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ right_foot_human
+ name = "Color Bands (Right Foot)"
+ icon_state = "bandshuman"
+ body_parts = list(BP_R_FOOT)
+ species_allowed = list(/datum/species/human, /datum/species/machine/shell)
+
+ bandsface
+ name = "Color Bands (Face)"
+ icon_state = "bandsface"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ bandsface_human
+ name = "Color Bands (Face)"
+ icon_state = "bandshumanface"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell)
+
+ bindi
+ name = "Bindi"
+ icon_state = "bindi"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ blush
+ name = "Blush"
+ icon_state= "blush"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ cheekspot_left
+ name = "Cheek Spot (Left Cheek)"
+ icon_state = "cheekspot_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ cheekspot_right
+ name = "Cheek Spot (Right Cheek)"
+ icon_state = "cheekspot_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ cheshire_left
+ name = "Cheshire (Left Cheek)"
+ icon_state = "cheshire_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ cheshire_right
+ name = "Cheshire (Right Cheek)"
+ icon_state = "cheshire_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ crow_left
+ name = "Crow Mark (Left Eye)"
+ icon_state = "crow_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ crow_right
+ name = "Crow Mark (Right Eye)"
+ icon_state = "crow_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ ear_left
+ name = "Ear Cover (Left)"
+ icon_state = "ear_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell)
+
+ ear_right
+ name = "Ear Cover (Right)"
+ icon_state = "ear_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell)
+
+ eyestripe
+ name = "Eye Stripe"
+ icon_state = "eyestripe"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ eyecorner_left
+ name = "Eye Corner Left"
+ icon_state = "eyecorner_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ eyecorner_right
+ name = "Eye Corner Right"
+ icon_state = "eyecorner_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ eyelash_left
+ name = "Eyelash Left"
+ icon_state = "eyelash_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ eyelash_right
+ name = "Eyelash Right"
+ icon_state = "eyelash_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ lips
+ name = "Lips"
+ icon_state = "lips"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ lipcorner_left
+ name = "Lip Corner Left"
+ icon_state = "lipcorner_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ lipcorner_right
+ name = "Lip Corner Right"
+ icon_state = "lipcorner_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ lowercheek_left
+ name = "Lower Cheek Left"
+ icon_state = "lowercheek_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ lowercheek_left
+ name = "Lower Cheek Right"
+ icon_state = "lowercheek_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ neck
+ name = "Neck Cover"
+ icon_state = "neck"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ neckthick
+ name = "Neck Cover (Thick)"
+ icon_state = "neckthick"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ nosestripe
+ name = "Nose Stripe"
+ icon_state = "nosestripe"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ nosetape
+ name = "Nose Tape"
+ icon_state = "nosetape"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, "Vaurca")
+
+ scratch_abdomen_left
+ name = "Scratch, Abdomen Left"
+ icon_state = "scratch_abdomen_l"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ scratch_abdomen_right
+ name = "Scratch, Abdomen Right"
+ icon_state = "scratch_abdomen_r"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ scratch_abdomen_small_left
+ name = "Scratch, Abdomen Small Left"
+ icon_state = "scratch_abdomensmall_l"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ scratch_abdomen_small_right
+ name = "Scratch, Abdomen Small Right"
+ icon_state = "scratch_abdomensmall_r"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ scratch_back
+ name = "Scratch, Back"
+ icon_state = "scratch_back"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi, "Vaurca")
+
+ scratch_chest_left
+ name = "Scratch, Chest (Left)"
+ icon_state = "scratch_chest_l"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ scratch_chest_right
+ name = "Scratch, Chest (Right)"
+ icon_state = "scratch_chest_r"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_belly
+ name = "Tattoo (Belly)"
+ icon_state = "tat_belly"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_campbell_leftarm
+ name = "Tattoo (Campbell, Left Arm)"
+ icon_state = "tat_campbell"
+ body_parts = list(BP_L_ARM)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_campbell_rightarm
+ name = "Tattoo (Campbell, Right Arm)"
+ icon_state = "tat_campbell"
+ body_parts= list(BP_R_ARM)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_campbell_leftleg
+ name = "Tattoo (Campbell, Left Leg)"
+ icon_state = "tat_campbell"
+ body_parts= list(BP_L_LEG)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_campbell_rightleg
+ name = "Tattoo (Campbell, Right Leg)"
+ icon_state = "tat_campbell"
+ body_parts= list(BP_R_LEG)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_forrest_left
+ name = "Tattoo (Forrest, Left Eye)"
+ icon_state = "tat_forrest_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_forrest_right
+ name = "Tattoo (Forrest, Right Eye)"
+ icon_state = "tat_forrest_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_hive
+ name = "Tattoo (Hive, Back)"
+ icon_state = "tat_hive"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_heart
+ name = "Tattoo (Heart, Chest)"
+ icon_state = "tat_heart"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_heart_back
+ name = "Tattoo (Heart, Lower Back)"
+ icon_state = "tat_heartback"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell)
+
+ tat_hunter_left
+ name = "Tattoo (Hunter, Left Eye)"
+ icon_state = "tat_hunter_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_hunter_right
+ name = "Tattoo (Hunter, Right Eye)"
+ icon_state = "tat_hunter_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_jaeger_left
+ name = "Tattoo (Jaeger, Left Eye)"
+ icon_state = "tat_jaeger_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_jaeger_right
+ name = "Tattoo (Jaeger, Right Eye)"
+ icon_state = "tat_jaeger_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_kater_left
+ name = "Tattoo (Kater, Left Eye)"
+ icon_state = "tat_kater_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_kater_right
+ name = "Tattoo (Kater, Right Eye)"
+ icon_state = "tat_kater_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_lujan_left
+ name = "Tattoo (Lujan, Left Eye)"
+ icon_state = "tat_lujan_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_lujan_right
+ name = "Tattoo (Lujan, Right Eye)"
+ icon_state = "tat_lujan_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_natasha_left
+ name = "Tattoo (Natasha, Left Eye)"
+ icon_state = "tat_natasha_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_natasha_right
+ name = "Tattoo (Natasha, Right Eye)"
+ icon_state = "tat_natasha_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_nightling
+ name = "Tattoo (Nightling, Back)"
+ icon_state = "tat_nightling"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_silverburgh_left
+ name = "Tattoo (Silverburgh, Left Leg)"
+ icon_state = "tat_silverburgh"
+ body_parts = list(BP_L_LEG)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_silverburgh_right
+ name = "Tattoo (Silverburgh, Right Leg)"
+ icon_state = "tat_silverburgh"
+ body_parts = list(BP_R_LEG)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_tamoko
+ name = "Tattoo (Ta Moko, Face)"
+ icon_state = "tat_tamoko"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell)
+
+ tat_tiger
+ name = "Tattoo (Tiger Stripes, All)"
+ 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_GROIN,BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ chest
+ name = "Tattoo (Tiger Stripes, Chest)"
+ body_parts = list(BP_CHEST)
+
+ groin
+ name = "Tattoo (Tiger Stripes, Groin)"
+ body_parts = list(BP_GROIN)
+
+ left_arm
+ name = "Tattoo (Tiger Stripes, Left Arm)"
+ body_parts = list(BP_L_ARM)
+
+ right_arm
+ name = "Tattoo (Tiger Stripes, Right Arm)"
+ body_parts = list(BP_R_ARM)
+
+ left_hand
+ name = "Tattoo (Tiger Stripes, Left Hand)"
+ body_parts = list(BP_L_HAND)
+
+ right_hand
+ name = "Tattoo (Tiger Stripes, Right Hand)"
+ body_parts = list(BP_R_HAND)
+
+ left_leg
+ name = "Tattoo (Tiger Stripes, Left Leg)"
+ body_parts = list(BP_L_LEG)
+
+ right_leg
+ name = "Tattoo (Tiger Stripes, Right Leg)"
+ body_parts = list(BP_R_LEG)
+
+ left_foot
+ name = "Tattoo (Tiger Stripes, Left Foot)"
+ body_parts = list(BP_L_FOOT)
+
+ right_foot
+ name = "Tattoo (Tiger Stripes, Right Foot)"
+ body_parts = list(BP_R_FOOT)
+
+ tat_toshi_left
+ name = "Tattoo (Toshi, Left Eye)"
+ icon_state = "tat_toshi_l"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_toshi_right
+ name = "Tattoo (Volgin, Right Eye)"
+ icon_state = "tat_toshi_r"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
+ tat_wings_back
+ name = "Tattoo (Wings, Lower Back)"
+ icon_state = "tat_wingsback"
+ body_parts = list(BP_CHEST)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell)
+
+ tigerhead
+ name = "Tiger Stripes (Head, Minor)"
+ icon_state = "tigerhead"
+ body_parts = list(BP_HEAD)
+ species_allowed = list(/datum/species/human, /datum/species/diona, /datum/species/machine/shell, /datum/species/skrell, /datum/species/tajaran, /datum/species/tajaran/zhan_khazan, /datum/species/tajaran/m_sai, /datum/species/unathi)
+
tiger_stripes
name = "Tiger Stripes (Tajara)"
icon_state = "tiger"
diff --git a/html/changelogs/mattatlas-thecomeback.yml b/html/changelogs/mattatlas-thecomeback.yml
new file mode 100644
index 00000000000..8b501e042a1
--- /dev/null
+++ b/html/changelogs/mattatlas-thecomeback.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Mwahahaha, MattAtlas
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Added a lot of new body markings such as tattoos and augments for humans and other speciess."
diff --git a/icons/mob/human_races/markings.dmi b/icons/mob/human_races/markings.dmi
index 9f3475a6232..14c85914234 100644
Binary files a/icons/mob/human_races/markings.dmi and b/icons/mob/human_races/markings.dmi differ