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

Melting Snowflakes & (Adds/Changes Frills & Adds Body Markings)

Browse Source
This commit is contained in:
KasparoVy
2015-12-26 00:48:01 -05:00
parent 0f8f514671
commit be3bb885f2
13 changed files with 224 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/new_player/preferences_setup.dm
+14 -4
View File
@@ -248,9 +248,19 @@ datum/preferences
else
preview_icon.Blend(rgb(-s_tone, -s_tone, -s_tone), ICON_SUBTRACT)
//Body Markings
if(current_species && (current_species.bodyflags & HAS_MARKINGS))
var/datum/sprite_accessory/marking_style = marking_styles_list[m_style]
if(marking_style)
var/icon/markings_s = new/icon("icon" = marking_style.icon, "icon_state" = "[marking_style.icon_state]_s")
markings_s.Blend(rgb(r_markings, g_markings, b_markings), ICON_ADD)
preview_icon.Blend(markings_s, ICON_OVERLAY)
var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
if(hair_style)
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
@@ -264,7 +274,7 @@ datum/preferences
eyes_s.Blend(facial_s, ICON_OVERLAY)
//Horns
if(current_species && current_species.name == "Unathi")
if(current_species && (current_species.bodyflags & HAS_HORNS))
var/datum/sprite_accessory/horn_style = horn_styles_list[horns]
if(horn_style)
var/icon/horns_s = new/icon("icon" = horn_style.icon, "icon_state" = "[horn_style.icon_state]_s")
@@ -272,19 +282,19 @@ datum/preferences
eyes_s.Blend(horns_s, ICON_OVERLAY)
var/icon/underwear_s = null
if(underwear && current_species.clothing_flags & HAS_UNDERWEAR)
if(underwear && (current_species.clothing_flags & HAS_UNDERWEAR))
var/datum/sprite_accessory/underwear/U = underwear_list[underwear]
if(U)
underwear_s = new/icon(U.icon, "uw_[U.icon_state]_s", ICON_OVERLAY)
var/icon/undershirt_s = null
if(undershirt && current_species.clothing_flags & HAS_UNDERSHIRT)
if(undershirt && (current_species.clothing_flags & HAS_UNDERSHIRT))
var/datum/sprite_accessory/undershirt/U2 = undershirt_list[undershirt]
if(U2)
undershirt_s = new/icon(U2.icon, "us_[U2.icon_state]_s", ICON_OVERLAY)
var/icon/socks_s = null
if(socks && current_species.clothing_flags & HAS_SOCKS)
if(socks && (current_species.clothing_flags & HAS_SOCKS))
var/datum/sprite_accessory/socks/U3 = socks_list[socks]
if(U3)
socks_s = new/icon(U3.icon, "sk_[U3.icon_state]_s", ICON_OVERLAY)
code/modules/mob/new_player/sprite_accessories.dm
+75 -33
View File
@@ -564,25 +564,6 @@
*/
/datum/sprite_accessory/hair
una_spines_long
name = "Long Unathi Spines"
icon_state = "soghun_longspines"
species_allowed = list("Unathi")
una_spines_short
name = "Short Unathi Spines"
icon_state = "soghun_shortspines"
species_allowed = list("Unathi")
una_frills_long
name = "Long Unathi Frills"
icon_state = "soghun_longfrills"
species_allowed = list("Unathi")
una_frills_short
name = "Short Unathi Frills"
icon_state = "soghun_shortfrills"
species_allowed = list("Unathi")
una_horns
name = "Unathi Horns"
@@ -872,6 +853,8 @@
/datum/sprite_accessory/facial_hair
//Tajara
taj_sideburns
name = "Tajara Sideburns"
icon_state = "facial_sideburns"
@@ -902,6 +885,8 @@
icon_state = "facial_smallstache"
species_allowed = list("Tajaran")
//Vox
vox_colonel
name = "Vox Colonel Beard"
icon_state = "vox_colonel"
@@ -973,6 +958,51 @@
species_allowed = list("Vulpkanin")
gender = NEUTER
//Unathi
una_spines_long
name = "Long Unathi Spines"
icon_state = "soghun_longspines"
species_allowed = list("Unathi")
gender = NEUTER
una_spines_short
name = "Short Unathi Spines"
icon_state = "soghun_shortspines"
species_allowed = list("Unathi")
gender = NEUTER
una_frills_long
name = "Long Unathi Frills"
icon_state = "soghun_longfrills"
species_allowed = list("Unathi")
gender = NEUTER
una_frills_short
name = "Short Unathi Frills"
icon_state = "soghun_shortfrills"
species_allowed = list("Unathi")
gender = NEUTER
una_simple
name = "Simple"
icon_state = "soghun_longwebbed_frills"
species_allowed = list("Unathi")
gender = NEUTER
una_short
name = "Short"
icon_state = "soghun_shortwebbed_frills"
species_allowed = list("Unathi")
gender = NEUTER
una_aquatic
name = "Aquatic"
icon_state = "soghun_aquafrills"
species_allowed = list("Unathi")
gender = NEUTER
//skin styles - WIP
//going to have to re-integrate this with surgery
//let the icon_state hold an icon preview for now
@@ -1509,7 +1539,7 @@
/datum/sprite_accessory/horns/none
name = "None"
icon_state = "horns_none"
icon_state = "accessory_none"
/datum/sprite_accessory/horns/simple
name = "Simple"
@@ -1527,25 +1557,37 @@
name = "Ram"
icon_state = "horns_ram"
/* FRILLS */
/* BODY MARKINGS */
/datum/sprite_accessory/frills
/datum/sprite_accessory/body_markings
icon = 'icons/mob/body_accessory.dmi'
species_allowed = list("Unathi")
icon_state = null
/datum/sprite_accessory/frills/none
/datum/sprite_accessory/body_markings/none
name = "None"
icon_state = null
icon_state = "accessory_none"
/datum/sprite_accessory/frills/simple
name = "Simple"
icon_state = "simple"
/datum/sprite_accessory/body_markings/dstripe
name = "Dark Stripe"
icon_state = "markings_dstripe"
/datum/sprite_accessory/frills/short
name = "Short"
icon_state = "short"
/datum/sprite_accessory/body_markings/lstripe
name = "Light Stripe"
icon_state = "markings_lstripe"
/datum/sprite_accessory/frills/aquatic
name = "Aquatic"
icon_state = "aqua"
/datum/sprite_accessory/body_markings/dtiger
name = "Dark Tiger Body"
icon_state = "markings_dtiger"
/datum/sprite_accessory/body_markings/dtigerhead
name = "Dark Tiger Body + Head"
icon_state = "markings_dtigerhead"
/datum/sprite_accessory/body_markings/ltiger
name = "Light Tiger Body"
icon_state = "markings_ltiger"
/datum/sprite_accessory/body_markings/ltigerhead
name = "Light Tiger Body + Head"
icon_state = "markings_ltigerhead"