From 8a14bab2ee623ff365d320c8de80b7d3f1578d7f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 16 Oct 2017 06:10:06 -0500 Subject: [PATCH] Update update_icons.dm --- code/modules/mob/living/carbon/human/update_icons.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index ec1346be80..e02ba838e1 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -160,16 +160,11 @@ There are several things that need to be remembered: update_observer_view(wear_id) //TODO: add an icon file for ID slot stuff, so it's less snowflakey -<<<<<<< HEAD - overlays_standing[ID_LAYER] = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = ((wear_id.icon_override) ? wear_id.icon_override : 'icons/mob/mob.dmi')) -======= id_overlay = wear_id.build_worn_icon(state = wear_id.item_state, default_layer = ID_LAYER, default_icon_file = 'icons/mob/mob.dmi') if(OFFSET_ID in dna.species.offset_features) id_overlay.pixel_x += dna.species.offset_features[OFFSET_ID][1] id_overlay.pixel_y += dna.species.offset_features[OFFSET_ID][2] overlays_standing[ID_LAYER] = id_overlay ->>>>>>> 068f91e... Refactors species-based offsets, condenses all offsets into a single list, adds support for all other standing icons (#31642) - apply_overlay(ID_LAYER)