cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

ding

Browse Source
This commit is contained in:
Aurorablade
2016-02-22 23:38:45 -05:00
parent d861d86edd
commit 64d8354ec5
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/brain/brain_item.dm
-1
View File
@@ -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)
code/modules/mob/living/carbon/human/human_attackhand.dm
+8 -7
View File
@@ -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")
code/modules/mob/living/carbon/human/update_icons.dm
+4 -4
View File
@@ -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)