cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] More teshari, Vox, and Werebeast clothing fixes (#11934)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-07 11:52:01 -07:00
committed by GitHub
parent db5ebee41e
commit c4811238b8
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/game/objects/items.dm
View File

@@ -941,11 +941,16 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
if(icon_override)
return icon_override
///Local var to remember if we failed the species specific sprite or not. Also stores species specific sheet - if any - for use to use the default species icon.
var/species_sheet
//2: species-specific sprite sheets (skipped for inhands)
if(LAZYLEN(sprite_sheets) && !inhands)
var/sheet = sprite_sheets[body_type]
if(sheet && icon_exists(sheet, icon_state)) //Checks to make sure our custom sheet actually HAS the icon_state
return sheet
species_sheet = sprite_sheets[body_type]
if(species_sheet)
if(icon_exists(species_sheet, icon_state)) //Checks to make sure our custom sheet actually HAS the icon_state
return species_sheet
//3: slot-specific sprite sheets
if(LAZYLEN(item_icons))
@@ -955,17 +960,22 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type)
if(!icon_exists(sheet, icon_state))
log_debug("Item [src] is equippable on the [slot_name] but has no sprite for it!")
*/
return sheet
if(!species_sheet || (species_sheet && body_type != SPECIES_TESHARI && body_type != SPECIES_VOX && body_type != SPECIES_WEREBEAST)) //These three are too different to use a default slot specific sheet. Other species look fine using the standard human sprites.
return sheet
//4: item's default icon
if(default_worn_icon)
return default_worn_icon
//5: provided default_icon
//5: Use our species_sheet as a fallback if we have one. A 'default' sprite is better than nothing at all (or a misaligned sprite)
if(species_sheet)
return species_sheet
//6: provided default_icon
if(default_icon)
return default_icon
//6: give up
//7: give up
return
//Returns the state that should be used for the worn icon