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

Adjust masks to fit monitor heads. (#31773)

Browse Source 
* Adjust masks to fit monitor heads.

* Remove duplicate var. Thanks, linters!

* Tweak west-facing lucha masks.
This commit is contained in:
Alan
2026-04-05 01:16:32 -04:00
committed by GitHub
parent c53bc3fd2d
commit e9fcd1b035
9 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/special/facehugger.dm
+1
View File
@@ -5,6 +5,7 @@
icon = 'icons/mob/alien.dmi'
icon_state = "facehugger"
inhand_icon_state = "facehugger"
icon_monitor = 'icons/mob/clothing/species/machine/monitor/mask.dmi'
w_class = WEIGHT_CLASS_TINY //note: can be picked up by aliens unlike most other items of w_class below 4
throw_range = 5
tint = 3
code/modules/mob/living/carbon/human/human_update_icons.dm
+4 -2
View File
@@ -849,7 +849,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
var/obj/item/organ/external/head/head_organ = get_organ("head")
var/datum/robolimb/robohead = head_organ.is_robotic() ? GLOB.all_robolimbs[head_organ.model] : null
var/obj/item/clothing/head/head_clothes
if(istype(head, /obj/item/clothing/head))
if(istype(head, /obj/item/clothing))
head_clothes = head
var/worn_icon = (head_clothes && robohead && robohead.is_monitor ? head_clothes.icon_monitor : FALSE) || listgetindex(head.sprite_sheets, dna.species.sprite_sheet_name) || head.worn_icon || 'icons/mob/clothing/head.dmi'
@@ -984,13 +984,15 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
update_hud_wear_mask(wear_mask)
if(!(check_obscured_slots() & ITEM_SLOT_MASK) && !HAS_TRAIT(wear_mask, TRAIT_NO_WORN_ICON))
var/obj/item/organ/external/head/head_organ = get_organ("head")
var/datum/robolimb/robohead = head_organ.is_robotic() ? GLOB.all_robolimbs[head_organ.model] : null
if(!istype(head_organ))
return // Nothing to update here
var/datum/sprite_accessory/alt_heads/alternate_head
if(head_organ.alt_head && head_organ.alt_head != "None")
alternate_head = GLOB.alt_heads_list[head_organ.alt_head]
var/icon/worn_icon = new(listgetindex(wear_mask.sprite_sheets, dna.species.sprite_sheet_name) || wear_mask.worn_icon || 'icons/mob/clothing/mask.dmi')
var/obj/item/clothing/worn_mask = wear_mask
var/icon/worn_icon = new(listgetindex(wear_mask.sprite_sheets, dna.species.sprite_sheet_name) || (robohead && robohead.is_monitor ? worn_mask.icon_monitor : FALSE) || wear_mask.worn_icon || 'icons/mob/clothing/mask.dmi')
var/worn_icon_state = wear_mask.worn_icon_state || wear_mask.icon_state
if(alternate_head && ("[worn_icon_state]_[alternate_head.suffix]" in worn_icon.IconStates()))
worn_icon_state += "_[alternate_head.suffix]"