From e630b0a8cd5d2456b2fc63dcb5ea0691ee68efb4 Mon Sep 17 00:00:00 2001 From: Bone White Date: Tue, 27 Jan 2015 04:38:59 +0000 Subject: [PATCH] Virology fixes & mutation disabling 1) Viruses no longer mutate in mobs. 2) Fixed a runtime error with IS_SYNTHETIC check in activate() 3) Antibody Analyzer has a green sprite, to make it easier to distinguish from the Health Analyzer --- code/modules/virus2/disease2.dm | 13 ++++++++----- code/modules/virus2/items_devices.dm | 2 +- icons/obj/device.dmi | Bin 26019 -> 26313 bytes 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/virus2/disease2.dm b/code/modules/virus2/disease2.dm index 41787ac3ef9..c744a41d6d2 100644 --- a/code/modules/virus2/disease2.dm +++ b/code/modules/virus2/disease2.dm @@ -58,15 +58,18 @@ return var/mob/living/carbon/human/MS = mob - if(MS && (MS.species.flags & IS_SYNTHETIC)) - return + if(istype(MS)) + if(MS.species.flags & IS_SYNTHETIC) + return if(stage <= 1 && clicks == 0) // with a certain chance, the mob may become immune to the disease before it starts properly if(prob(5)) mob.antibodies |= antigen - if(mob.radiation > 50) - if(prob(1)) - majormutateinactivate(mob) + +// NO MORE MUTATING IN MOBS - Bone White +// if(mob.radiation > 50) +// if(prob(1)) +// majormutateinactivate(mob) //Space antibiotics stop disease completely if(mob.reagents.has_reagent("spaceacillin")) diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm index 914622c96f5..ce3d83d2df5 100644 --- a/code/modules/virus2/items_devices.dm +++ b/code/modules/virus2/items_devices.dm @@ -3,7 +3,7 @@ /obj/item/device/antibody_scanner name = "\improper Antibody Scanner" desc = "Scans living beings for antibodies in their blood." - icon_state = "health" + icon_state = "antibody" w_class = 2.0 item_state = "electronic" flags = FPRINT | TABLEPASS | CONDUCT diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 977071c5f4d282c00b6b5e34022978933c659719..c44bceb4655e13728a7233d8915de3651b7fa019 100644 GIT binary patch delta 4345 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 S`ECc|KNl?R&LPiur~DuL_5T3? delta 4049 zcmZWs2T+qs*G{BL5fmu`0)Bu<5fBUk0tQ7vL7IhLMd=Wc-tr<`Kq)r@N|hpAdM|Pz zRHX<3L4&l=gM{7^Ams})cmDb3|956*&+aqlyl3|8KF_=TL*V>D@H+|cj~dC|GrW=( zODaHc*mqI8>^dOe_2`kffHhwoGlTGBpwr}i&>5uqYtVytpt!Ehdv8_eO8X_F9U08b z&JpC@vz{0aTo4$&;LfR+sOL*CB@8c?O~_#G8OU7JD`yIL;rzOGqGQ9hr6EAcwnDD5 zrzbw{{89Ej@fI!C{^w#6VZg&+rR05yXL*n$2mLslIL!1$5%|Yi?Oco1aOifxikjS z>w0B6Ix~U>SpIRdF7-HU3h?D3RkQZTt zz|6J5LtP!$7;g(C^jr>4)qGNZ3s|wde2lDKc~>};;B?%bY1lwWGn)2!pOiJP->_Q# z8){$@LHIhxQHHk*!`u)7Ae_8WXL%}>k)b(db;@zs**E88A3gR`^nMgKkCffRuhpOT(QX@Dj-4>`YMT0iDrBBb-3gVSeQ{}q z#WWFh*yU^Px4~qpaHU;NL}}M$A1|X4@khnICV1y#Ed-OVi+8YioAlUCX|$ow!AQ*nYj>*0RZ zxE0~Cez+xTRth`kesMw40+VDzVyQZdjn)93=gNxG0 z{%6~mUUSX8*`4Aig`q#fuV{< z71j4oy4!)akd|HQz?)^PY1#TrD@t~&s-WQcTx0aqMWK1K)(6Wnnln%_K=|F?U8=cp z@4evC(i>XPk%T-gJsWJer{q$x0U{Fp;U)E{!)sq&+K;QX<0!Euj@e zhJ5hO^^Lp$lKkLpeWzvgfg*_5(I%a{e_26?#LiPP^mUQtnu3BEVQmexeH2P|BYG79 zhM6j>>ZuAgd9}4k>+2pV3U-x^HZ5If#Dx8vcRHIJw6ruS?^>t##V0%j+$5afvbS$| z2Ay?-Av`8Cvp452r1*Js3-U9Vs|zO|+M6SD;`J?PF#+04sBC4n!IO3tJ>)m7MCZ2J z_cod-=SwuNx$&1kwH|=SXU)s*fgpguN3b!+P7EHNeXzJgV8W%UcnG{|D>Yg>`nfry zQRBqPa!weOo13duQBtC~)NIV#yf-Yj1`msBnw=dSGpZ~QqcP2%M4q=2y&qU-8j01v z-c~{GIGnZ~%fxn3TH9>dLMRO?BrNf`;bwVFr%@G}yRU8nM{DeO%OhpE1`sQW7m%P8 z+a?v-Y?N&mm)0P~l|FP#!-W=6t$R)e2ArrC)4eoz2)*riUG*y8CNSmLwEEY$W931n zmDc?OA7sUgqLR}S6JH84ducNTN8C2&RDo%8T|C@kF1WgGBtg2faD=M~gK3qlWX?|N z1-lc%m#?mK_+#YT04ThE9nOf zrYq+I#6E*BRBC;?zo9|L#xKq=HaId#%FKjvh`1K?idRz)XmgcsnyPTobjPa;Cn__5 z)z#G>whjGf8a?1dYm^`orR-~PHP@ABV7Wt4{|*Ns%4=JigCoWJXLy!jafb5Ap)u!8 zXa9w!%yn6S1eI5j?

_aG*N~$YoV` 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