cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 06:28:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes suits usable with the icon state system.

Browse Source
This commit is contained in:
Zuhayr
2015-06-30 12:15:06 +09:30
parent 263f721f3e
commit b0a5705fa8
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/update_icons.dm
+10 -7
View File
@@ -642,12 +642,12 @@ var/global/list/damage_icon_parts = list()
if(head.icon_override)
t_icon = head.icon_override
else if(head.sprite_sheets && head.sprite_sheets[species.name])
t_icon = head.sprite_sheets[species.name]
t_icon = head.sprite_sheets[species.name]
else if(head.item_icons && (slot_head_str in head.item_icons))
t_icon = head.item_icons[slot_head_str]
else
t_icon = INV_HEAD_DEF_ICON
//Determine the state to use
var/t_state
if(head.item_state_slots && head.item_state_slots[slot_head_str])
@@ -656,7 +656,7 @@ var/global/list/damage_icon_parts = list()
t_state = head.item_state
else
t_state = head.icon_state
//Create the image
var/image/standing = image(icon = t_icon, icon_state = t_state)
@@ -709,12 +709,15 @@ var/global/list/damage_icon_parts = list()
var/image/standing
var/t_icon = INV_SUIT_DEF_ICON
if(wear_suit.icon_override)
standing = image("icon" = wear_suit.icon_override, "icon_state" = "[wear_suit.icon_state]")
t_icon = wear_suit.icon_override
else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.name])
standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]")
else
standing = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]")
t_icon = wear_suit.sprite_sheets[species.name]
else if(wear_suit.item_icons && wear_suit.item_icons[slot_wear_suit_str])
t_icon = wear_suit.item_icons[slot_wear_suit_str]
standing = image("icon" = t_icon, "icon_state" = "[wear_suit.icon_state]")
if( istype(wear_suit, /obj/item/clothing/suit/straight_jacket) )
drop_from_inventory(handcuffed)
code/modules/mob/update_icons.dm
+1 -1
View File
@@ -8,7 +8,7 @@
#define INV_R_HAND_DEF_ICON 'icons/mob/items/righthand.dmi'
#define INV_W_UNIFORM_DEF_ICON 'icons/mob/uniform.dmi'
#define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi'
#define INV_SUIT_DEF_ICON 'icons/mob/suit.dmi'
/mob/proc/regenerate_icons() //TODO: phase this out completely if possible
return