From 82002c1c46fd521a421fa7c7b5f7f2cbf4eaaa74 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 12 Sep 2015 15:33:59 -0700 Subject: [PATCH] Get rid of pointless get_ procs --- code/modules/mob/living/carbon/human/body_accessories.dm | 7 +------ code/modules/mob/living/carbon/human/update_icons.dm | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index 8abe9d92331..a242e02e241 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -1,3 +1,4 @@ + var/global/list/body_accessory_by_name = list("None" = null) /hook/startup/proc/initalize_body_accessories() @@ -60,12 +61,6 @@ var/global/list/body_accessory_by_species = list("None" = null) /datum/body_accessory/proc/try_restrictions(var/mob/living/carbon/human/H) return 1 -/datum/body_accessory/proc/get_pixel_x(var/mob/living/carbon/human/H) - return pixel_x_offset - -/datum/body_accessory/proc/get_pixel_y(var/mob/living/carbon/human/H) - return pixel_y_offset - /datum/body_accessory/proc/get_animated_icon() //return animated if it has it, return static if it does not. if(animated_icon) return animated_icon diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 771a2a79e85..ea0e4197314 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -913,7 +913,7 @@ var/global/list/damage_icon_parts = list() var/icon/accessory_s = new/icon("icon" = body_accessory.icon, "icon_state" = body_accessory.icon_state) accessory_s.Blend(rgb(r_skin, g_skin, b_skin), body_accessory.blend_mode) - overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.get_pixel_x(src), "pixel_y" = body_accessory.get_pixel_y(src)) + overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) else if(species.tail && species.bodyflags & HAS_TAIL) //no tailless tajaran @@ -934,7 +934,7 @@ var/global/list/damage_icon_parts = list() var/icon/accessory_s = new/icon("icon" = body_accessory.get_animated_icon(), "icon_state" = body_accessory.get_animated_icon_state()) accessory_s.Blend(rgb(r_skin, g_skin, b_skin), body_accessory.blend_mode) - overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.get_pixel_x(src), "pixel_y" = body_accessory.get_pixel_y(src)) + overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) else if(species.tail && species.bodyflags & HAS_TAIL) var/icon/tailw_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]w_s")