cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 04:34:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Helmets now show only certain hairstyles

Browse Source
This commit is contained in:
Anewbe
2018-09-05 19:43:24 -05:00
parent 4cebe1cfb9
commit b109cfae42
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/update_icons.dm
+5 -1
View File
@@ -406,8 +406,12 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
face_standing.Blend(facial_s, ICON_OVERLAY)
if(h_style && !(head && (head.flags_inv & BLOCKHEADHAIR)))
if(h_style)
var/datum/sprite_accessory/hair/hair_style = hair_styles_list[h_style]
if(head && (head.flags_inv & BLOCKHEADHAIR))
if(!(hair_style.flags & HAIR_VERY_SHORT))
hair_style = hair_styles_list["Short Hair"]
if(hair_style && (src.species.get_bodytype(src) in hair_style.species_allowed))
var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
var/icon/hair_s_add = new/icon("icon" = hair_style.icon_add, "icon_state" = "[hair_style.icon_state]_s")
code/modules/mob/new_player/sprite_accessories.dm
+3 -3
View File
@@ -133,7 +133,7 @@
ponytail1
name = "Ponytail 1"
icon_state = "hair_ponytail"
flags = HAIR_TIEABLE
flags = HAIR_TIEABLE|HAIR_VERY_SHORT
ponytail2
name = "Ponytail 2"
@@ -158,12 +158,12 @@
ponytail6
name = "Ponytail 6"
icon_state = "hair_ponytail6"
flags = HAIR_TIEABLE
flags = HAIR_TIEABLE|HAIR_VERY_SHORT
fringetail
name = "Fringetail"
icon_state = "hair_fringetail"
flags = HAIR_TIEABLE
flags = HAIR_TIEABLE|HAIR_VERY_SHORT
sideponytail
name = "Side Ponytail"