cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vox versions of the new tattoos.

Browse Source
This commit is contained in:
KasparoVy
2016-07-26 02:37:29 -04:00
parent b12d33554c
commit 861d873fac
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences.dm
+3 -3
View File
@@ -302,7 +302,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
dat += "<b>Head Markings:</b> "
dat += "<a href='?_src_=prefs;preference=m_style_head;task=input'>[marking_styles["head"]]</a>"
dat += "<a href='?_src_=prefs;preference=m_head_colour;task=input'>Color</a> [color_square(hex2num(copytext(marking_colours["head"], 2, 4)), hex2num(copytext(marking_colours["head"], 4, 6)), hex2num(copytext(marking_colours["head"], 6, 8)))]<br>"
if(species in list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell")) //Species with body markings/tattoos.
if(species in list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell", "Vox")) //Species with body markings/tattoos.
var/list/marking_styles = params2list(m_styles)
var/list/marking_colours = params2list(m_colours)
marking_colours["body"] = sanitize_hexcolor(marking_colours["body"])
@@ -1484,7 +1484,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
m_colours = list2params(marking_colours)
if("m_style_body")
if(species in list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell")) //Species with body markings/tattoos.
if(species in list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell", "Vox")) //Species with body markings/tattoos.
var/list/valid_markings = list()
valid_markings["None"] = marking_styles_list["None"]
for(var/markingstyle in marking_styles_list)
@@ -1503,7 +1503,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
m_styles = list2params(marking_styles)
if("m_body_colour")
if(species in list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell")) //Species with body markings/tattoos.
if(species in list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell", "Vox")) //Species with body markings/tattoos.
var/input = "Choose the colour of your your character's body markings:"
var/list/marking_colours = params2list(m_colours)
marking_colours["body"] = sanitize_hexcolor(marking_colours["body"])
code/modules/mob/living/carbon/human/species/station.dm
+1 -1
View File
@@ -285,7 +285,7 @@
flags = NO_SCAN | IS_WHITELISTED
clothing_flags = HAS_SOCKS
dietflags = DIET_OMNI
bodyflags = HAS_ICON_SKIN_TONE | HAS_TAIL | TAIL_WAGGING | TAIL_OVERLAPPED | HAS_TAIL_MARKINGS
bodyflags = HAS_ICON_SKIN_TONE | HAS_TAIL | TAIL_WAGGING | TAIL_OVERLAPPED | HAS_BODY_MARKINGS | HAS_TAIL_MARKINGS
blood_color = "#2299FC"
flesh_color = "#808D11"
code/modules/mob/new_player/sprite_accessories.dm
+15
View File
@@ -2245,16 +2245,31 @@
species_allowed = list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell")
icon_state = "markings_tattoo_heart"
/datum/sprite_accessory/body_markings/tattoo/heart_vox
name = "Vox Heart Tattoo"
species_allowed = list("Vox")
icon_state = "markings_tattoo_heart_vox"
/datum/sprite_accessory/body_markings/tattoo/hive
name = "Hive Tattoo"
species_allowed = list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell")
icon_state = "markings_tattoo_hive"
/datum/sprite_accessory/body_markings/tattoo/hive_vox
name = "Vox Hive Tattoo"
species_allowed = list("Vox")
icon_state = "markings_tattoo_hive_vox"
/datum/sprite_accessory/body_markings/tattoo/nightling
name = "Nightling Tattoo"
species_allowed = list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell")
icon_state = "markings_tattoo_nightling"
/datum/sprite_accessory/body_markings/tattoo/nightling_vox
name = "Vox Nightling Tattoo"
species_allowed = list("Vox")
icon_state = "markings_tattoo_nightling_vox"
/datum/sprite_accessory/body_markings/tail
name = "Tail Markings"
species_allowed = list()