mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Fixes #9326
This commit is contained in:
@@ -9,30 +9,31 @@
|
|||||||
var/slot = "decor"
|
var/slot = "decor"
|
||||||
var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to
|
var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to
|
||||||
var/image/inv_overlay = null //overlay used when attached to clothing.
|
var/image/inv_overlay = null //overlay used when attached to clothing.
|
||||||
var/image/inv_overlay_mob = null
|
var/image/mob_overlay = null
|
||||||
var/overlay_state = null
|
var/overlay_state = null
|
||||||
|
|
||||||
/obj/item/clothing/accessory/proc/get_inv_overlay()
|
/obj/item/clothing/accessory/proc/get_inv_overlay()
|
||||||
if(!inv_overlay)
|
if(!inv_overlay)
|
||||||
|
if(!mob_overlay)
|
||||||
|
get_mob_overlay()
|
||||||
|
|
||||||
var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
|
var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
|
||||||
if(icon_override)
|
if(icon_override)
|
||||||
if("[tmp_icon_state]_tie" in icon_states(icon_override))
|
if("[tmp_icon_state]_tie" in icon_states(icon_override))
|
||||||
tmp_icon_state = "[tmp_icon_state]_tie"
|
tmp_icon_state = "[tmp_icon_state]_tie"
|
||||||
inv_overlay = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]")
|
inv_overlay = image(icon = mob_overlay.icon, icon_state = tmp_icon_state, dir = SOUTH)
|
||||||
else
|
|
||||||
inv_overlay = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[tmp_icon_state]")
|
|
||||||
return inv_overlay
|
return inv_overlay
|
||||||
|
|
||||||
/obj/item/clothing/accessory/proc/get_inv_mob_overlay()
|
/obj/item/clothing/accessory/proc/get_mob_overlay()
|
||||||
if(!inv_overlay_mob)
|
if(!mob_overlay)
|
||||||
var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
|
var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
|
||||||
if(icon_override)
|
if(icon_override)
|
||||||
if("[tmp_icon_state]_mob" in icon_states(icon_override))
|
if("[tmp_icon_state]_mob" in icon_states(icon_override))
|
||||||
tmp_icon_state = "[tmp_icon_state]_mob"
|
tmp_icon_state = "[tmp_icon_state]_mob"
|
||||||
inv_overlay_mob = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]")
|
mob_overlay = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]")
|
||||||
else
|
else
|
||||||
inv_overlay_mob = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[tmp_icon_state]")
|
mob_overlay = image("icon" = INV_ACCESSORIES_DEF_ICON, "icon_state" = "[tmp_icon_state]")
|
||||||
return inv_overlay_mob
|
return mob_overlay
|
||||||
|
|
||||||
//when user attached an accessory to S
|
//when user attached an accessory to S
|
||||||
/obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/under/S, mob/user as mob)
|
/obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/under/S, mob/user as mob)
|
||||||
|
|||||||
@@ -497,7 +497,7 @@ var/global/list/damage_icon_parts = list()
|
|||||||
var/obj/item/clothing/under/under = w_uniform
|
var/obj/item/clothing/under/under = w_uniform
|
||||||
if(under.accessories.len)
|
if(under.accessories.len)
|
||||||
for(var/obj/item/clothing/accessory/A in under.accessories)
|
for(var/obj/item/clothing/accessory/A in under.accessories)
|
||||||
standing.overlays |= A.get_inv_mob_overlay()
|
standing.overlays |= A.get_mob_overlay()
|
||||||
|
|
||||||
overlays_standing[UNIFORM_LAYER] = standing
|
overlays_standing[UNIFORM_LAYER] = standing
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,15 +1,6 @@
|
|||||||
//Most of these are defined at this level to reduce on checks elsewhere in the code.
|
//Most of these are defined at this level to reduce on checks elsewhere in the code.
|
||||||
//Having them here also makes for a nice reference list of the various overlay-updating procs available
|
//Having them here also makes for a nice reference list of the various overlay-updating procs available
|
||||||
|
|
||||||
//default item on-mob icons
|
|
||||||
#define INV_HEAD_DEF_ICON 'icons/mob/head.dmi'
|
|
||||||
#define INV_BACK_DEF_ICON 'icons/mob/back.dmi'
|
|
||||||
#define INV_L_HAND_DEF_ICON 'icons/mob/items/lefthand.dmi'
|
|
||||||
#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'
|
|
||||||
|
|
||||||
|
|
||||||
/mob/proc/regenerate_icons() //TODO: phase this out completely if possible
|
/mob/proc/regenerate_icons() //TODO: phase this out completely if possible
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -974,6 +974,14 @@ var/list/be_special_flags = list(
|
|||||||
#define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi'
|
#define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//default item on-mob icons
|
||||||
|
#define INV_HEAD_DEF_ICON 'icons/mob/head.dmi'
|
||||||
|
#define INV_BACK_DEF_ICON 'icons/mob/back.dmi'
|
||||||
|
#define INV_L_HAND_DEF_ICON 'icons/mob/items/lefthand.dmi'
|
||||||
|
#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 SHARD_SHARD "shard"
|
#define SHARD_SHARD "shard"
|
||||||
#define SHARD_SHRAPNEL "shrapnel"
|
#define SHARD_SHRAPNEL "shrapnel"
|
||||||
#define SHARD_STONE_PIECE "piece"
|
#define SHARD_STONE_PIECE "piece"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB |
Reference in New Issue
Block a user