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

Fixes Part Two

Browse Source
This commit is contained in:
Unknown
2019-05-02 03:47:11 -04:00
parent c50b5f5596
commit d22f668012
2 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -32,37 +32,38 @@
return inv_overlay return inv_overlay
/obj/item/clothing/accessory/proc/get_mob_overlay() /obj/item/clothing/accessory/proc/get_mob_overlay()
if(!mob_overlay || has_suit.loc != wearer) if(!istype(loc,/obj/item/clothing/)) //don't need special handling if it's worn as normal item.
var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]" return ..()
if(ishuman(has_suit.loc)) var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]"
wearer = has_suit.loc if(ishuman(has_suit.loc))
else wearer = has_suit.loc
wearer = null else
wearer = null
if(istype(loc,/obj/item/clothing/under)) if(istype(loc,/obj/item/clothing/under))
var/obj/item/clothing/under/C = loc var/obj/item/clothing/under/C = loc
if(on_rolled["down"] && C.rolled_down > 0) if(on_rolled["down"] && C.rolled_down > 0)
tmp_icon_state = on_rolled["down"] tmp_icon_state = on_rolled["down"]
else if(on_rolled["rolled"] && C.rolled_sleeves > 0) else if(on_rolled["rolled"] && C.rolled_sleeves > 0)
tmp_icon_state = on_rolled["rolled"] tmp_icon_state = on_rolled["rolled"]
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"
mob_overlay = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]") mob_overlay = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]")
else if(wearer && sprite_sheets[wearer.species.get_bodytype(wearer)]) //Teshari can finally into webbing, too! else if(wearer && sprite_sheets[wearer.species.get_bodytype(wearer)]) //Teshari can finally into webbing, too!
mob_overlay = image("icon" = sprite_sheets[wearer.species.get_bodytype(wearer)], "icon_state" = "[tmp_icon_state]") mob_overlay = image("icon" = sprite_sheets[wearer.species.get_bodytype(wearer)], "icon_state" = "[tmp_icon_state]")
else else
mob_overlay = image("icon" = INV_ACCESSORIES_DEF_ICON, "icon_state" = "[tmp_icon_state]") mob_overlay = image("icon" = INV_ACCESSORIES_DEF_ICON, "icon_state" = "[tmp_icon_state]")
if(addblends) if(addblends)
var/icon/base = new/icon("icon" = mob_overlay.icon, "icon_state" = mob_overlay.icon_state) var/icon/base = new/icon("icon" = mob_overlay.icon, "icon_state" = mob_overlay.icon_state)
var/addblend_icon = new/icon("icon" = mob_overlay.icon, "icon_state" = src.addblends) var/addblend_icon = new/icon("icon" = mob_overlay.icon, "icon_state" = src.addblends)
if(color) if(color)
base.Blend(src.color, ICON_MULTIPLY) base.Blend(src.color, ICON_MULTIPLY)
base.Blend(addblend_icon, ICON_ADD) base.Blend(addblend_icon, ICON_ADD)
mob_overlay = image(base) mob_overlay = image(base)
else else
mob_overlay.color = src.color mob_overlay.color = src.color
return mob_overlay return mob_overlay

BIN
icons/mob/ties.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB