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

Merge pull request #13159 from Heroman3003/taursuit2

Browse Source 
Fixes issues with taurs and belts/suits. Again.
This commit is contained in:
Casey
2022-06-24 22:23:10 -04:00
committed by GitHub
parent f6f20d5c76 7c4572e339
commit 66c15be11f
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
-2
View File
@@ -812,8 +812,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
standing.alpha = alpha
standing.color = color
standing.layer = layer2use
if(istype(clip_mask)) //VOREStation Edit - For taur bodies/tails clipping off parts of uniforms and suits.
standing.filters += filter(type = "alpha", icon = clip_mask)
if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits.
standing.filters += filter(type = "alpha", icon = clip_mask)
code/game/objects/items/weapons/storage/belt.dm
+4 -1
View File
@@ -32,7 +32,10 @@
for(var/obj/item/i in contents)
var/i_state = i.item_state
if(!i_state) i_state = i.icon_state
standing.add_overlay(image(icon = INV_BELT_DEF_ICON, icon_state = i_state))
var/image/add_icon = image(icon = INV_BELT_DEF_ICON, icon_state = i_state)
if(istype(clip_mask)) //For taur bodies/tails clipping off parts of uniforms and suits.
standing.filters += filter(type = "alpha", icon = clip_mask)
standing.add_overlay(add_icon)
return standing
/obj/item/weapon/storage/update_icon()
code/modules/clothing/clothing.dm
+1 -1
View File
@@ -778,7 +778,7 @@
var/image/standing = ..()
if(taurized) //Special snowflake var on suits
standing.pixel_x = -16
standing.layer = BODY_LAYER + 15 // 15 is above tail layer, so will not be covered by taurbody.
standing.layer = BODY_LAYER + 16 // 16 is above tail layer, so will not be covered by taurbody.
return standing
/obj/item/clothing/suit/apply_accessories(var/image/standing)
code/modules/mob/living/carbon/human/update_icons.dm
+8 -3
View File
@@ -807,8 +807,11 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(ubelt.show_above_suit)
belt_layer = BELT_LAYER_ALT
var/icon/c_mask = tail_style?.clip_mask
//NB: this uses a var from above
overlays_standing[belt_layer] = belt.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_belt_str, default_icon = INV_BELT_DEF_ICON, default_layer = belt_layer)
overlays_standing[belt_layer] = belt.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_belt_str, default_icon = INV_BELT_DEF_ICON, default_layer = belt_layer, clip_mask = c_mask)
apply_layer(belt_layer)
@@ -961,7 +964,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(tail_alt && tail_layer == TAIL_NORTH_LAYER)
tail_layer = TAIL_NORTH_LAYER_ALT
if(src.tail_style && src.tail_style.clip_mask_state)
tail_layer = TAIL_SOUTH_LAYER // Use default, let clip mask handle everything
tail_layer = TAIL_NORTH_LAYER // Use default, let clip mask handle everything
var/image/tail_image = get_tail_image()
if(tail_image)
@@ -1004,7 +1007,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(tail_alt && tail_layer == TAIL_NORTH_LAYER)
tail_layer = TAIL_NORTH_LAYER_ALT
if(src.tail_style && src.tail_style.clip_mask_state)
tail_layer = TAIL_SOUTH_LAYER // Use default, let clip mask handle everything
tail_layer = TAIL_NORTH_LAYER // Use default, let clip mask handle everything
var/image/tail_overlay = overlays_standing[tail_layer]
remove_layer(TAIL_NORTH_LAYER)
@@ -1028,6 +1031,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
var/t_state = "[species.get_tail(src)]_once"
var/tail_layer = GET_TAIL_LAYER
if(src.tail_style && src.tail_style.clip_mask_state)
tail_layer = TAIL_NORTH_LAYER // Use default, let clip mask handle everything
var/image/tail_overlay = overlays_standing[tail_layer]
if(tail_overlay && tail_overlay.icon_state == t_state)