From d779253ba1c772037ec78a00d7265c6d997050c8 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Sat, 2 Nov 2013 23:53:23 +0400 Subject: [PATCH] Made robolimbs into overlays instead of grayscaling limb icon. --- .../mob/living/carbon/human/update_icons.dm | 3 --- code/modules/organs/organ_external.dm | 19 ++++++++++-------- icons/mob/human_races/robotic.dmi | Bin 0 -> 1547 bytes 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 icons/mob/human_races/robotic.dmi diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 7d76cc91b4..2df59683b0 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -252,9 +252,6 @@ proc/get_damage_icon_part(damage_state, body_part) else temp = part.get_icon() - if(part.status & ORGAN_ROBOT) - temp.GrayScale() - if(part.status & ORGAN_DEAD) temp.ColorTone(necrosis_color_mod) temp.SetIntensity(0.7) diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index bbf1728084..d037a44112 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -181,7 +181,7 @@ var/result = update_icon() return result - + /* This function completely restores a damaged organ to perfect condition. */ @@ -191,21 +191,21 @@ This function completely restores a damaged organ to perfect condition. perma_injury = 0 brute_dam = 0 burn_dam = 0 - + // handle internal organs for(var/datum/organ/internal/current_organ in internal_organs) current_organ.rejuvenate() - + // remove embedded objects and drop them on the floor for(var/obj/implanted_object in implants) if(!istype(implanted_object,/obj/item/weapon/implant)) // We don't want to remove REAL implants. Just shrapnel etc. implanted_object.loc = owner.loc implants -= implanted_object - + owner.updatehealth() update_icon() - - + + /datum/organ/external/proc/createwound(var/type = CUT, var/damage) if(damage == 0) return @@ -619,10 +619,13 @@ This function completely restores a damaged organ to perfect condition. return 0 /datum/organ/external/get_icon(gender="") + if (status & ORGAN_ROBOT) + return new /icon('icons/mob/human_races/robotic.dmi', "[icon_name][gender ? "_[gender]" : ""]") + if (status & ORGAN_MUTATED) return new /icon(owner.deform_icon, "[icon_name][gender ? "_[gender]" : ""]") - else - return new /icon(owner.race_icon, "[icon_name][gender ? "_[gender]" : ""]") + + return new /icon(owner.race_icon, "[icon_name][gender ? "_[gender]" : ""]") /datum/organ/external/proc/is_usable() diff --git a/icons/mob/human_races/robotic.dmi b/icons/mob/human_races/robotic.dmi new file mode 100644 index 0000000000000000000000000000000000000000..46100b45545a04194bd53fce036754799e01ebbc GIT binary patch literal 1547 zcmY+EdpOg39LIksw+-i<2;DD37fF#sCX0?Cxr~hwPl_&TW+G-oovEm-lF7Y7Y-OF5 zu;NEILo8i>ZlyKF!6cVqKO1MBr}Olj&mZ5<=l##?`~E!N_w&8z<@u+M_A+e%0Ccdf z&OQL3q8tH{rke8XDRe!gY=K@LIG6hR`W-uVFc=J>P)HyU*lf0&o10#O&V0Dl{A(+~ zYMw|Wx;Q)A*x1C7$sh=d#p2&`bTAli#iHu#-!L}LXR+Mf-6<4`pPwJz-(Sg8 z;wz+ghLlYu#>dka*wfz`t`ubnI6{o`5lUF}v8b41q*DNJChziFd+q0zNOe&cnt`2q z+tFQu%0#vrTxu9syQX=#{UC_7irEC2Hrx$a^FD_W_vtIbFFpUHTx5(2{!ZPEC7r#HJpmf67NBkp`Dziv^}tXPmMxT+Lsj{S1{Bx#zG_ zxIBB>2|L6Zvaej#P79`yR0m2VqYyM1Hcczn6C&6zz8o@J1OSUTSZ62PnY@ww_JljO z$bH+EerI}g7fWpH^9N_a{_f)1PLg?-KF`x^;A?J8nZDwg02S)Q*Hvx{hRE)@a364OfzqQ`C-n4W1FfB3_~ z5$L)N38*dM0duR80_fq9M}SpzTQtW<*592~rd_A%wT`ZXx(Qb>N>Y+Qi7r+gU?yf;-rmr2yt4_S*cf6jbUc_gZFSyHMZnz)W zgG>I@61&9U%?a9WL~d~=NP6GG8d>tu^bzz;>lb=qiZa7lG>{(qfYx)BjLn7b51pw& z^ixl2SkZTZ82PoQkZe4}jDs(!jyLGxHgW~raE;FXvwIqvuye+~QeA&}np}I#z27H# zbX!G`%5kMURirApd+g%45sy7{+91@#Yda|#`9MRIWUEdf5^M|?H5+&>OXlE{YZxW+ z|C<3sdW{!x^4qzH+f}xifyvEVFsbe@bMYo3cu3_6PD*sOLaNILq_N!;?3&0k%h%a{JJ zCOFdH1cHf4v_alDdOJZ2+0+*nC5mHNCQ`gK0aF zjbECoQBwVpb7X9ITz9@U+`jkID+q32{H45dmxrE^T}z<=4+G+3y>JfdRiLaL(H}>qooEVL-40227!*w zy0tw$XlCG>e7#9g+m}a6+zqGtbYHiLA()bkfSm;SA;Rm&<0v}QkZ;7SjIMqJ5jcFe zXN&lEL3N3k49ofkCd)osTrG_v>!AvB-_H}`dEYhSX|zhoM0dd$VsbEbX&A6<_-m*W_V=hDwj`EmcIw>oVw4efM?7qcLEjN=ODi1HFJJK8{UQDKz9 za-+x$2p+_3E6Fr{tYEy_(a{=g@>v)EE(cVrU57VLWm(RsHDkZmLz{d zOR>@ZaZOE~{Xwq-I}ua=h-yzdnq~-Jfsg5dxrymprD<-Dganm!B)+0GG3kWDdJnn| zlBBG4v2?S{(b!D)RaiHQXR;}l&C921UR;4z+2xpY2PR3qZL^BD-YBbDIzt@he&eCJ o7N6sSA7l-Hb^nD%>8N#LtLKb)h{iq9>_U>TE}qU6n9#HT0z&@mGynhq literal 0 HcmV?d00001