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

Guts Tails (for now), adds Horn Colour Customization, Fixes Icon Typo, Cuts Old File, Adds Species Checks

Browse Source 
Cuts tail markings to be implemented in another PR, adds the ability to
change the horn colour independent of the body colour and reworks the
code accordingly, drops the preferences_savefile.dm as it's unused
(@crazylemon64), adds some species checks just for uniformity
This commit is contained in:
KasparoVy
2015-12-27 19:43:12 -05:00
parent 8bbd18846d
commit abb528366e
9 changed files with 53 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/body_accessories.dm
-50
View File
@@ -128,53 +128,3 @@ var/global/list/body_accessory_by_species = list("None" = null)
icon_state = "vulptail5"
animated_icon_state = "vulptail5_a"
allowed_species = list("Vulpkanin")
//Unathi
/datum/body_accessory/tail/unathi_2
name = "Unathi Alt 1 (Smooth)"
icon_state = "liztail2"
animated_icon_state = "liztail2_a"
allowed_species = list("Unathi")
/datum/body_accessory/tail/unathi_3
name = "Unathi Alt 2 (Light)"
icon_state = "liztail3"
animated_icon_state = "liztail3_a"
allowed_species = list("Unathi")
/datum/body_accessory/tail/unathi_4
name = "Unathi Alt 3 (Dark Stripe)"
icon_state = "liztail4"
animated_icon_state = "liztail4_a"
allowed_species = list("Unathi")
/datum/body_accessory/tail/unathi_5
name = "Unathi Alt 4 (Light Stripe)"
icon_state = "liztail5"
animated_icon_state = "liztail5_a"
allowed_species = list("Unathi")
/datum/body_accessory/tail/unathi_6
name = "Unathi Alt 5 (Dark Tiger)"
icon_state = "liztail6"
animated_icon_state = "liztail6_a"
allowed_species = list("Unathi")
/datum/body_accessory/tail/unathi_7
name = "Unathi Alt 6 (Light Tiger)"
icon_state = "liztail7"
animated_icon_state = "liztail7_a"
allowed_species = list("Unathi")
/datum/body_accessory/tail/unathi_8
name = "Unathi Alt 7 (Aquatic)"
icon_state = "liztail8"
animated_icon_state = "liztail8_a"
allowed_species = list("Unathi")
code/modules/mob/living/carbon/human/human_defines.dm
+4 -1
View File
@@ -15,7 +15,10 @@
var/h_style = "Bald"
//Horns
var/horns = "None"
var/r_horns = 0
var/g_horns = 0
var/b_horns = 0
var/hn_style = "None"
//Facial hair colour and style
var/r_facial = 0
code/modules/mob/living/carbon/human/update_icons.dm
+3 -3
View File
@@ -408,13 +408,13 @@ var/global/list/damage_icon_parts = list()
//base icons
var/icon/horns_standing = new /icon('icons/mob/body_accessory.dmi',"accessory_none_s")
if(horns && !(head && (head.flags & BLOCKHEADHAIR) && !(isSynthetic()) && (src.species.bodyflags & HAS_HORNS)))
var/datum/sprite_accessory/horn_style = horn_styles_list[horns]
if(hn_style && !(head && (head.flags & BLOCKHEADHAIR) && !(isSynthetic()) && (src.species.bodyflags & HAS_HORNS)))
var/datum/sprite_accessory/horn_style = horn_styles_list[hn_style]
if(horn_style && horn_style.species_allowed)
if(src.species.name in horn_style.species_allowed)
var/icon/horns_s = new/icon("icon" = horn_style.icon, "icon_state" = "[horn_style.icon_state]_s")
if(horn_style.do_colouration)
horns_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
horns_s.Blend(rgb(r_horns, g_horns, b_horns), ICON_ADD)
horns_standing.Blend(horns_s, ICON_OVERLAY)
else
//warning("Invalid horns for [species.name]: [horns]")
code/modules/mob/new_player/preferences_setup.dm
+1 -1
View File
@@ -269,7 +269,7 @@ datum/preferences
//Horns
if(current_species && (current_species.bodyflags & HAS_HORNS))
var/datum/sprite_accessory/horn_style = horn_styles_list[horns]
var/datum/sprite_accessory/horn_style = horn_styles_list[hn_style]
if(horn_style)
var/icon/horns_s = new/icon("icon" = horn_style.icon, "icon_state" = "[horn_style.icon_state]_s")
horns_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)