From 5d529c8086ad95752beba8cb3e6006eea5d7057a Mon Sep 17 00:00:00 2001 From: Markolie Date: Wed, 25 Feb 2015 22:07:23 +0100 Subject: [PATCH] Plant-B-Gone now affects Diona nymphs. Dionas now heal toxin/fire damage. --- code/modules/mob/living/carbon/human/life.dm | 10 ++++++---- code/modules/reagents/Chemistry-Reagents.dm | 7 +++++++ icons/mob/human_races/r_diona.dmi | Bin 2650 -> 2836 bytes 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c25fa8e0e25..6fa2497139d 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -914,10 +914,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc traumatic_shock -= light_amount if(species.flags & IS_PLANT) - if(nutrition > 500) - nutrition = 500 - if(light_amount >= 5) //if there's enough light, heal - adjustBruteLoss(-(light_amount)) + if(nutrition > 450) + nutrition = 450 + if(light_amount >= 3) //if there's enough light, heal + adjustBruteLoss(-(light_amount/2)) + adjustFireLoss(-(light_amount/2)) + adjustToxLoss(-(light_amount)) adjustOxyLoss(-(light_amount)) //TODO: heal wounds, heal broken limbs. diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 9af338ba608..11d79cf5fa8 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1435,6 +1435,13 @@ datum H.adjustToxLoss(50) ..() return + if(ismonkey(M)) + var/mob/living/carbon/monkey/MO = M + if(MO.dna) + if(MO.dna.mutantrace == "plant") //plantmen monkeys (diona) take EVEN MORE damage + MO.adjustToxLoss(100) + ..() + return plasma name = "Plasma" diff --git a/icons/mob/human_races/r_diona.dmi b/icons/mob/human_races/r_diona.dmi index c09acaa953844bf97d494e0d1005a9477ab9c8a8..f83948951ea2a9d7076e606c76fd4751fdbc7378 100644 GIT binary patch delta 2770 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 delta 2583 zcmV+y3h4Ee7TOe$77GC22m=5B0NbBPVv!+Cf3kX1Sad{Xb7OL8aCB*JZU6vyoQ={u z3d1lA2H@E~g-Q0(*V?5dlnl)kjKNRpL?F8@y?vcz=v1stf=|Cds1?`#HjJXX5By~? z1(?M}oOgT9-a%(yn$wXpZ-VoAYf@I(l(IpoaB4Wy0n;+XnMF03r9S*rBq@|$&6*HK ze_{?H%!HlMIKoPbLTLdqA&kT_U;n#n0*=vQ(6iLyD2~^B!*4}U<_F)43=F+2P+_c9R-kk zhiHRTqyh|TINQ*%LN!9zhytAxLlgz)n*DRa9xd z6^#et7=VO3Eszmu8F&;BSphrk1E`|HB0~bMEB3cgmMirHS25=&fQ5d6CV-uK7q!#% zYgUmZteL=3>MxXY-ldenP6(8Nf4d&aNoXfr-NU5RKts28H)R6L%HmGbD{r)=J=K~i z&>-$LP?s~zUOD4llj-;KvITb>$8j9TaU92S9LI4S$8lbd!#z|+m!DTy{txh?TP6Pp zV2y2V;otJj@{a&k*iJz(9Y4^KQCOtulHX@P>_`;9+E3#e1wb_21UeiMe`NXX0(AK& z^f*Fnv(IBNlS12o{H**g|AY?t8}0KLt#Uxylk6$^{DU6PKq)fSgkiOnY+zC@E*{ z{{ARDfB(7058(PM{sB-TYe2cbKL!9)gG<()PJHniH9v$JKOkL_<{tnlAU&4u?~ej? z;0)=i^#E$S2#LC|)JMWSegHjJ`~x6G4i7Wm-yd?Nfshf4Za*dke*_xnii^d&eIAz% zKJU<@`Tl+or^zaReX$<}H04{r=C%DF{p@aFi%ah7x0=3!F=c z0PP(TZPbl@WNMA#Q8yqAZxh?zh?pz|&^~0tD)15@4!n{64&439aU92S9LI4S$8j9T zahz`i!#{AayoKr?&`7gWp!)N$O!U=1p!IvhKy3R5i~$zIf4a*40WAe^7g2polI|Zc z45;<;$o>Jj8OfoVr{xxAAE|J9K%53q4*>!hJ3b^-6(A1-R)FooaX!%q0>d4+t$>nL zF9*sXu?_zi1J_QO>Kz~g4dC_^Z`kWKjFfAc>70Lzs**39j~bwp#LNm_M6O0jDM=<*E*o<9EoO96Ok#SyaPe`b@^ z-Ck-q+D%;l^z2RulIi^Lj^ZB>t7`0@(*oDl0OUzu>5u$K5Af{Rp@Dg$vMfhvdQQ*` ze!0qD3hd^%ZEnQ+wb>2+RPgHM=+(qPr*?MIt*T0&KTKlXVN}f!*aLdoL znB2f6UsA#l)!Xe6fp4bkp{w~~E8lR35tjkve~Axic=I|S_i&ot3mcY{5ikY5y3VIw zD1P4{@}X(H`7F+{rvtnNh#_(O00JJ9;pSd z+ARO_@eBA=bBaG|_=+$>InR#B;pk-A04H=>&U0R`$;yT@b~{9f(%*fQUTYJk^$Z01DNmo`R>avVpa zF}sXB`BXslvt`0$1iPv~i(u_x=wbXwIv_y%q-azCYYlWy!@?_!;VZ|-EtI5;x&}jr z9E_b5Cde@uZ_AfbtEe1z@an_rDVISHgsPivF}%s?(J$VlXg{BW$${#uOl=Qif4i&m zn{fW6mk;Zyss4M2HJY9}!b3GYJ%3^2c>6pC_0W5&=iV?MmniZfAT*-M(MDbK20!0E z&j*4DRSiY9`|&u?Ysm8TE)c4HT=n-p-9G;=U&+17pBkO4N51mY^X>B=@|6;HeJ`~w z-}vd-_W2L_Y8iX5Lj`q?f3e?}&*e7#{?G2gznhapLpl4rZXCmJZk|8&U+wuHeqGj{ zSDN}68S0(4iB({w**43Mt$?mM%-P1!`t2*+#wxtL2DVmUXa(2|y@G!Wdo1B2cYyA) tJzt5DtH0(vr?J_4Rc`wfeqAPi0qgiX&KfGLh5!Hn07*qoM6N<$0fO-P4o?68