cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 03:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speculative fix for some head sprite bugs (#4326)

Browse Source 
changes:

Helmets no longer cover eyes and now cover hair by default.
Mask, hair, and helmet sprites will now all be updated if one of them changes. This should fix issues with hair being visible when it shouldn't be, and masks mysteriously disappearing.
Fixes #3326.
This commit is contained in:
Lohikar
2018-02-26 13:26:58 -06:00
committed by Erki
parent dbf31178c7
commit 2f36c20ee8
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/head/helmet.dm
View File

@@ -9,7 +9,7 @@
item_flags = THICKMATERIAL
body_parts_covered = HEAD
armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)
flags_inv = HIDEEARS|HIDEEYES
flags_inv = HIDEEARS|BLOCKHEADHAIR
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HEAD

12
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -733,7 +733,7 @@ There are several things that need to be remembered:
if(update_icons) update_icons()
/mob/living/carbon/human/update_inv_head(var/update_icons=1)
/mob/living/carbon/human/update_inv_head(update_icons = TRUE, recurse = TRUE)
if (QDELING(src))
return
@@ -781,6 +781,10 @@ There are several things that need to be remembered:
overlays_raw[HEAD_LAYER] = ovr || standing
if (recurse)
update_hair(FALSE)
update_inv_wear_mask(FALSE, FALSE)
if(update_icons)
update_icons()
@@ -905,7 +909,7 @@ There are several things that need to be remembered:
update_icons()
/mob/living/carbon/human/update_inv_wear_mask(var/update_icons=1)
/mob/living/carbon/human/update_inv_wear_mask(update_icons = TRUE, recurse = TRUE)
if (QDELING(src))
return
@@ -939,6 +943,10 @@ There are several things that need to be remembered:
overlays_raw[FACEMASK_LAYER] = ovr || standing
if (recurse)
update_inv_head(FALSE, FALSE)
update_hair(FALSE)
if(update_icons)
update_icons()