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

POLARIS: Sometimes items have this set to null because they are bad.

Browse Source
This commit is contained in:
Arokha Sieyes
2018-03-17 21:27:46 -04:00
parent 14bdc519e4
commit 54d06dbef0
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -727,14 +727,16 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
return icon_override return icon_override
//2: species-specific sprite sheets (skipped for inhands) //2: species-specific sprite sheets (skipped for inhands)
var/sheet = sprite_sheets[body_type] if(LAZYLEN(sprite_sheets))
if(sheet && !inhands) var/sheet = sprite_sheets[body_type]
return sheet if(sheet && !inhands)
return sheet
//3: slot-specific sprite sheets //3: slot-specific sprite sheets
sheet = item_icons[slot_name] if(LAZYLEN(item_icons))
if(sheet) var/sheet = item_icons[slot_name]
return sheet if(sheet)
return sheet
//4: item's default icon //4: item's default icon
if(default_worn_icon) if(default_worn_icon)
@@ -751,9 +753,10 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
/obj/item/proc/get_worn_icon_state(var/slot_name) /obj/item/proc/get_worn_icon_state(var/slot_name)
//1: slot-specific sprite sheets //1: slot-specific sprite sheets
var/state = item_state_slots[slot_name] if(LAZYLEN(item_state_slots))
if(state) var/state = item_state_slots[slot_name]
return state if(state)
return state
//2: item_state variable //2: item_state variable
if(item_state) if(item_state)