diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 0ba6e5dc91b..f1793c1cc07 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -202,7 +202,7 @@ LAZYINITLIST(resistances) return resistances -/mob/proc/AddResistances(resistance) +/mob/proc/AddResistances(var/list/resistance) LAZYINITLIST(resistances) resistances |= resistance return TRUE diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm index 3d3b6e9e685..1f859da6069 100644 --- a/code/game/objects/effects/decals/Cleanable/misc.dm +++ b/code/game/objects/effects/decals/Cleanable/misc.dm @@ -132,10 +132,13 @@ icon_state += "-old" if(length(diseases)) viruses += diseases - if(prob(95)) - var/datum/disease/advance/new_disease = new /datum/disease/advance/random(rand(2, 5), rand(7, 9), 4) + if(prob(65)) + var/datum/disease/advance/new_disease = new /datum/disease/advance/random(rand(2, 4), rand(7, 9), 4) src.viruses += new_disease +/obj/effect/decal/cleanable/vomit/old/Crossed(mob/living/carbon/human/perp) + return // Don't spread our viruses + /obj/effect/decal/cleanable/tomato_smudge name = "tomato smudge" desc = "It's red." diff --git a/code/game/objects/items/devices/extrapolator.dm b/code/game/objects/items/devices/extrapolator.dm index 6308b28c1d3..d47e1c354c8 100644 --- a/code/game/objects/items/devices/extrapolator.dm +++ b/code/game/objects/items/devices/extrapolator.dm @@ -148,7 +148,6 @@ . = TRUE var/list/result = target?.extrapolator_act(user, target) var/list/diseases = result[EXTRAPOLATOR_RESULT_DISEASES] - var/show_message = FALSE if(!length(diseases)) return FALSE if(EXTRAPOLATOR_ACT_CHECK(result, EXTRAPOLATOR_ACT_PRIORITY_SPECIAL)) @@ -160,9 +159,6 @@ for(var/datum/disease/disease in diseases) if(istype(disease, /datum/disease/advance)) var/datum/disease/advance/advance_disease = disease - if(advance_disease.stealth >= maximum_stealth) - continue - show_message = TRUE var/list/properties if(global_flag_check(advance_disease.virus_modifiers, CARRIER)) LAZYADD(properties, "carrier") @@ -174,10 +170,7 @@ message += "[symptom.name]" else message += span_info("[disease.name], stage [disease.stage]/[disease.max_stages].") - if(show_message) - to_chat(user, examine_block(jointext(message, "\n")), avoid_highlighting = TRUE, trailing_newline = FALSE, type = MESSAGE_TYPE_INFO) - else - to_chat(user, span_notice("[icon2html(src, user)] \The [src] fails to return any data.")) + to_chat(user, examine_block(jointext(message, "\n")), avoid_highlighting = TRUE, trailing_newline = FALSE, type = MESSAGE_TYPE_INFO) /obj/item/extrapolator/proc/extrapolate(mob/living/user, atom/target, isolate = FALSE) . = FALSE