mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Roll-down-jumpsuit now works properly with custom items, icon_override and (hopefully) species variants.
This commit is contained in:
@@ -396,10 +396,28 @@ BLIND // can't see anything
|
|||||||
else
|
else
|
||||||
worn_state = icon_state
|
worn_state = icon_state
|
||||||
|
|
||||||
//autodetect rollability
|
/obj/item/clothing/under/proc/update_rolldown_status()
|
||||||
if(rolled_down < 0)
|
|
||||||
if((worn_state + "_d_s") in icon_states('icons/mob/uniform.dmi'))
|
var/mob/living/carbon/human/H
|
||||||
|
if(istype(src.loc, /mob/living/carbon/human))
|
||||||
|
H = src.loc
|
||||||
|
|
||||||
|
var/icon/under_icon
|
||||||
|
if(icon_override)
|
||||||
|
under_icon = icon_override
|
||||||
|
else if(H && sprite_sheets && sprite_sheets[H.species.name])
|
||||||
|
under_icon = sprite_sheets[H.species.name]
|
||||||
|
else if(item_icons && item_icons[slot_w_uniform_str])
|
||||||
|
under_icon = item_icons[slot_w_uniform_str]
|
||||||
|
else
|
||||||
|
under_icon = INV_W_UNIFORM_DEF_ICON
|
||||||
|
|
||||||
|
if((worn_state + "_d_s") in icon_states(under_icon))
|
||||||
|
if(rolled_down != 1)
|
||||||
rolled_down = 0
|
rolled_down = 0
|
||||||
|
else
|
||||||
|
rolled_down = -1
|
||||||
|
if(H) update_clothing_icon()
|
||||||
|
|
||||||
/obj/item/clothing/under/update_clothing_icon()
|
/obj/item/clothing/under/update_clothing_icon()
|
||||||
if (ismob(src.loc))
|
if (ismob(src.loc))
|
||||||
@@ -542,7 +560,8 @@ BLIND // can't see anything
|
|||||||
if(!istype(usr, /mob/living)) return
|
if(!istype(usr, /mob/living)) return
|
||||||
if(usr.stat) return
|
if(usr.stat) return
|
||||||
|
|
||||||
if(rolled_down < 0)
|
update_rolldown_status()
|
||||||
|
if(rolled_down == -1)
|
||||||
usr << "<span class='notice'>You cannot roll down [src]!</span>"
|
usr << "<span class='notice'>You cannot roll down [src]!</span>"
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -61,6 +61,10 @@
|
|||||||
item.item_state = null
|
item.item_state = null
|
||||||
item.icon_override = CUSTOM_ITEM_MOB
|
item.icon_override = CUSTOM_ITEM_MOB
|
||||||
|
|
||||||
|
var/obj/item/clothing/under/U = item
|
||||||
|
if(istype(U))
|
||||||
|
U.update_rolldown_status()
|
||||||
|
|
||||||
// Kits are dumb so this is going to have to be hardcoded/snowflake.
|
// Kits are dumb so this is going to have to be hardcoded/snowflake.
|
||||||
if(istype(item, /obj/item/device/kit))
|
if(istype(item, /obj/item/device/kit))
|
||||||
var/obj/item/device/kit/K = item
|
var/obj/item/device/kit/K = item
|
||||||
|
|||||||
Reference in New Issue
Block a user