From 646ef4563e951816c5b1a9d0963e575030a0f3d1 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 4 Mar 2015 12:24:47 -0500 Subject: [PATCH] Removed old snowflake bloodcode references --- .../mob/living/carbon/human/human_defense.dm | 20 +++---------------- .../mob/living/carbon/human/update_icons.dm | 8 ++++---- code/setup.dm | 4 +--- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 7906eac6111..e5145332701 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -435,30 +435,16 @@ emp_act add_blood(source) bloody_hands = amount bloody_hands_mob = source - if(istype(source,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = source - if(H.species.bloodflags & BLOOD_GREEN) - update_inv_gloves(1,1) //updates on-mob overlays for bloody hands and/or bloody gloves - else - update_inv_gloves(1,0) //updates on-mob overlays for bloody hands and/or bloody gloves - else - update_inv_gloves(1,0) //updates on-mob overlays for bloody hands and/or bloody gloves + update_inv_gloves(1) //updates on-mob overlays for bloody hands and/or bloody gloves /mob/living/carbon/human/proc/bloody_body(var/mob/living/source) if(wear_suit) wear_suit.add_blood(source) - update_inv_wear_suit(0,0) + update_inv_wear_suit(0) return if(w_uniform) w_uniform.add_blood(source) - if(istype(source,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = source - if(H.species.bloodflags & BLOOD_GREEN) - update_inv_w_uniform(1,1) - else - update_inv_w_uniform(1,0) - else - update_inv_w_uniform(1,0) + update_inv_w_uniform(1) /mob/living/carbon/human/proc/handle_suit_punctures(var/damtype, var/damage) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index f88577f2597..bde2a71847e 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -587,7 +587,7 @@ proc/get_damage_icon_part(damage_state, body_part) /* --------------------------------------- */ //vvvvvv UPDATE_INV PROCS vvvvvv -/mob/living/carbon/human/update_inv_w_uniform(var/update_icons=1,var/green=0) +/mob/living/carbon/human/update_inv_w_uniform(var/update_icons=1) if(w_uniform && istype(w_uniform, /obj/item/clothing/under) ) w_uniform.screen_loc = ui_iclothing var/t_color = w_uniform._color @@ -651,7 +651,7 @@ proc/get_damage_icon_part(damage_state, body_part) if(update_icons) update_icons() -/mob/living/carbon/human/update_inv_gloves(var/update_icons=1,var/green=0) +/mob/living/carbon/human/update_inv_gloves(var/update_icons=1) if(gloves) var/t_state = gloves.item_state if(!t_state) t_state = gloves.icon_state @@ -724,7 +724,7 @@ proc/get_damage_icon_part(damage_state, body_part) overlays_standing[EARS_LAYER] = null if(update_icons) update_icons() -/mob/living/carbon/human/update_inv_shoes(var/update_icons=1,var/green=0) +/mob/living/carbon/human/update_inv_shoes(var/update_icons=1) if(shoes) var/image/standing @@ -765,7 +765,7 @@ proc/get_damage_icon_part(damage_state, body_part) if(update_icons) update_icons() -/mob/living/carbon/human/update_inv_head(var/update_icons=1,var/green=0) +/mob/living/carbon/human/update_inv_head(var/update_icons=1) if(head) head.screen_loc = ui_head //TODO var/image/standing diff --git a/code/setup.dm b/code/setup.dm index c18d1ac0d12..544d879df9d 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -835,9 +835,7 @@ var/list/restricted_camera_networks = list( //Those networks can only be accesse #define NO_INTORGANS 32768 //Species Blood Flags -#define BLOOD_GREEN 1 -#define BLOOD_BLUE 2 -#define BLOOD_SLIME 4 +#define BLOOD_SLIME 1 //Species Body Flags #define FEET_CLAWS 1 #define FEET_PADDED 2