From 64d8354ec5e533f88838fc6b5e4b6e49f8feb65a Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 22 Feb 2016 23:38:45 -0500 Subject: [PATCH] ding --- .../modules/mob/living/carbon/brain/brain_item.dm | 1 - .../mob/living/carbon/human/human_attackhand.dm | 15 ++++++++------- .../mob/living/carbon/human/update_icons.dm | 8 ++++---- code/modules/surgery/implant.dm | 3 +++ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index c554071348b..e5263e5e9fb 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -73,7 +73,6 @@ if(istype(owner,/mob/living/carbon/human)) var/mob/living/carbon/human/H = owner H.update_hair(1) - ..() /obj/item/organ/internal/brain/insert(var/mob/living/target,special = 0) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 36e19df5f35..42b07e778e0 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -59,16 +59,17 @@ switch(M.a_intent) if(I_HELP) - if(can_operate(M)) + if(can_operate(src)) if(health >= config.health_threshold_crit) - if(M.surgeries.len) - for(var/datum/surgery/S in M.surgeries) + if(src.surgeries.len) + for(var/datum/surgery/S in src.surgeries) if(istype(S.get_surgery_step(), /datum/surgery_step/cavity/place_item)) + if(S.next_step(M, src)) + return 1 + else + help_shake_act(M) + add_logs(src, M, "shaked") return 1 - else - help_shake_act(M) - add_logs(src, M, "shaked") - return 1 if(health >= config.health_threshold_crit) help_shake_act(M) add_logs(src, M, "shaked") diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index ece7b05c3cc..e1bd629b1f8 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -456,9 +456,12 @@ var/global/list/damage_icon_parts = list() //base icons var/icon/hair_standing = new /icon('icons/mob/human_face.dmi',"bald_s") + //var/icon/debrained_s = new /icon("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s") if(h_style && !(head && (head.flags & BLOCKHEADHAIR) && !(isSynthetic()))) var/datum/sprite_accessory/hair_style = hair_styles_list[h_style] + //if(!src.get_int_organ(/obj/item/organ/internal/brain) && src.get_species() != "Machine" )//make it obvious we have NO BRAIN + // hair_standing.Blend(debrained_s, ICON_OVERLAY) if(hair_style && hair_style.species_allowed) if(src.species.name in hair_style.species_allowed) var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") @@ -470,10 +473,7 @@ var/global/list/damage_icon_parts = list() hair_standing.Blend(hair_s, ICON_OVERLAY) else //warning("Invalid h_style for [species.name]: [h_style]") - - if(!src.get_int_organ(/obj/item/organ/internal/brain) && src.get_species() != "Machine" )//make it obvious we have NO BRAIN - var/icon/debrained_s = new/icon("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s") - hair_standing.Blend(debrained_s, ICON_OVERLAY)//how does i overlay for fish? + //hair_standing.Blend(debrained_s, ICON_OVERLAY)//how does i overlay for fish? overlays_standing[HAIR_LAYER] = image(hair_standing) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index a27e5baea3e..5c773aa983c 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -160,6 +160,9 @@ "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) else if(IC) user.visible_message("[user] checks for items in [target]'s [target_zone].", "You check for items in [target]'s [target_zone]...") + else //no internal items..but we still need a message! + user.visible_message("[user] checks for items in [target]'s [target_zone].", "You check for items in [target]'s [target_zone]...") + target.custom_pain("The pain in your [target_zone] is living hell!",1) ..()