cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports Clothing Expansion Code from World Server

Browse Source
This commit is contained in:
Atermonera
2020-01-28 11:15:31 -08:00
committed by VirgoBot
parent 87d4a21676
commit 130d942a2d
25 changed files with 79 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
code/modules/mob/living/carbon/human/update_icons.dm
View File

@@ -580,7 +580,17 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(wear_suit && (wear_suit.flags_inv & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space/rig))
return //Wearing a suit that prevents uniform rendering
var/obj/item/clothing/under/under = w_uniform
var/uniform_sprite
if(under.index)
uniform_sprite = "[INV_W_UNIFORM_DEF_ICON]_[under.index].dmi"
else
uniform_sprite = "[INV_W_UNIFORM_DEF_ICON].dmi"
//Build a uniform sprite
<<<<<<< HEAD
//VOREStation Edit start.
var/icon/c_mask = null
if(tail_style && tail_style.clip_mask_icon && tail_style.clip_mask_state)
@@ -590,6 +600,9 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
overlays_standing[UNIFORM_LAYER] = w_uniform.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_w_uniform_str, default_icon = INV_W_UNIFORM_DEF_ICON, default_layer = UNIFORM_LAYER, clip_mask = c_mask)
//VOREStation Edit end.
=======
overlays_standing[UNIFORM_LAYER] = w_uniform.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_w_uniform_str, default_icon = uniform_sprite, default_layer = UNIFORM_LAYER)
>>>>>>> 3af55c5... Merge pull request #6651 from Cerebulon/ClothingExpansionPort
apply_layer(UNIFORM_LAYER)
/mob/living/carbon/human/update_inv_wear_id()
@@ -758,6 +771,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(!wear_suit)
return //No point, no suit.
<<<<<<< HEAD
// Part of splitting the suit sprites up
var/iconFile = INV_SUIT_DEF_ICON
var/obj/item/clothing/suit/S //VOREStation edit - break this var out a level for use below.
@@ -775,6 +789,17 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
c_mask = new /icon(tail_style.clip_mask_icon, tail_style.clip_mask_state)
overlays_standing[SUIT_LAYER] = wear_suit.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_wear_suit_str, default_icon = iconFile, default_layer = SUIT_LAYER, clip_mask = c_mask)
//VOREStation Edit end.
=======
var/obj/item/clothing/suit/suit = wear_suit
var/suit_sprite
if(suit.index)
suit_sprite = "[INV_SUIT_DEF_ICON]_[suit.index].dmi"
else
suit_sprite = "[INV_SUIT_DEF_ICON].dmi"
overlays_standing[SUIT_LAYER] = wear_suit.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_wear_suit_str, default_icon = suit_sprite, default_layer = SUIT_LAYER)
>>>>>>> 3af55c5... Merge pull request #6651 from Cerebulon/ClothingExpansionPort
apply_layer(SUIT_LAYER)