From e5d8b15d011c818e8425d260f94fe63c2ad3e495 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Fri, 26 Jun 2015 20:33:55 +0200 Subject: [PATCH] Compilation fixes. --- code/modules/clothing/head/misc_special.dm | 3 +-- code/modules/mob/living/carbon/human/life.dm | 4 ++-- code/modules/mob/living/carbon/human/update_icons.dm | 10 ++++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 31c91fd3094..e7e3981b99a 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -151,8 +151,7 @@ var/icon/earbit = new/icon("icon" = 'icons/mob/head.dmi', "icon_state" = "kittyinner") ears.Blend(earbit, ICON_OVERLAY) - - item_icons[icon_head] = ears + /obj/item/clothing/head/richard name = "chicken mask" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 9edbd49331a..70af11f34b7 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -754,7 +754,7 @@ return thermal_protection_flags -/mob/living/carbon/human/proc/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to. +/mob/living/carbon/human/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to. var/thermal_protection_flags = get_heat_protection_flags(temperature) var/thermal_protection = 0.0 @@ -811,7 +811,7 @@ return thermal_protection_flags -/mob/living/carbon/human/proc/get_cold_protection(temperature) +/mob/living/carbon/human/get_cold_protection(temperature) if(COLD_RESISTANCE in mutations) return 1 //Fully protected from the cold. diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 49b5062aae6..cd3f0892304 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -636,24 +636,22 @@ var/global/list/damage_icon_parts = list() /mob/living/carbon/human/update_inv_head(var/update_icons=1) if(head) head.screen_loc = ui_head //TODO - + //Determine the icon to use var/t_icon = INV_HEAD_DEF_ICON if(head.icon_override) t_icon = head.icon_override else if(head.sprite_sheets && head.sprite_sheets[species.name]) t_icon = head.sprite_sheets[species.name] - else if(head.item_icons && (icon_head in head.item_icons)) - t_icon = head.item_icons[icon_head] - + //Determine the state to use var/t_state = head.icon_state if(head.item_state) t_state = head.item_state - + //Create the image var/image/standing = image(icon = t_icon, icon_state = t_state) - + if(head.blood_DNA) var/image/bloodsies = image("icon" = species.blood_mask, "icon_state" = "helmetblood") bloodsies.color = head.blood_color