diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 7edcf5f089..2a89c0bb8a 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -308,7 +308,6 @@ GLOBAL_LIST_INIT(advance_cures, list( var/s = safepick(symptoms) if(s) NeuterSymptom(s) - Refresh(TRUE) // Falter the disease, making it non-spreadable. /datum/disease/advance/proc/Falter() diff --git a/code/datums/diseases/advance/symptoms/blobspores.dm b/code/datums/diseases/advance/symptoms/blobspores.dm index a996e1c2ed..0c7005c02f 100644 --- a/code/datums/diseases/advance/symptoms/blobspores.dm +++ b/code/datums/diseases/advance/symptoms/blobspores.dm @@ -92,6 +92,8 @@ BONUS /datum/symptom/blobspores/OnDeath(datum/disease/advance/A) if(!..()) return + if(!ready_to_pop) + return var/mob/living/M = A.affected_mob M.visible_message(span_danger("[M] starts swelling grotesquely!")) addtimer(CALLBACK(src, PROC_REF(pop), A, M), 10 SECONDS) @@ -107,9 +109,8 @@ BONUS if(node_blob) blob_options += /obj/structure/blob/node var/pick_blob = pick(blob_options) - if(ready_to_pop) - for(var/i in 1 to rand(1, 6)) - new /mob/living/simple_mob/blob/spore(M.loc) - new pick_blob(M.loc) + for(var/i in 1 to rand(1, 6)) + new /mob/living/simple_mob/blob/spore(M.loc) + new pick_blob(M.loc) M.visible_message(span_danger("A huge mass of blob and blob spores burst out of [M]!")) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 0518d5b9db..b447cdf8de 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -124,7 +124,7 @@ if(prob(5) && bruteheal) if(H.stat != DEAD) to_chat(H, span_userdanger("You retch, and a splatter of gore escapes your gullet!")) - H.vomit(lost_nutrition = 0, blood = TRUE, stun = FALSE) + H.do_vomit(lost_nutrition = 0, blood = TRUE, stun = FALSE) // Spitting tumors go here! IF they get up-ported. if(tetsuo) var/list/missing = H.get_missing_limbs() diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index 14f6ce18ee..6500d2e2c2 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -62,7 +62,7 @@ Bonus if(!unsafe || A.stage < 4) to_chat(M, span_warning(pick("You feel cold.", "You shiver."))) else - to_chat(M, span_userdanger(pick("You fel your blood run cold.", "You feel ice in your veins.", "You feel like you can't heat up.", "You shiver violently."))) + to_chat(M, span_userdanger(pick("You feel your blood run cold.", "You feel ice in your veins.", "You feel like you can't heat up.", "You shiver violently."))) set_body_temp(M, A) /datum/symptom/shivering/proc/set_body_temp(var/mob/living/carbon/H, datum/disease/advance/A) diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm index 5f90b7bd21..7cbac050b3 100644 --- a/code/datums/diseases/advance/symptoms/stimulant.dm +++ b/code/datums/diseases/advance/symptoms/stimulant.dm @@ -24,8 +24,8 @@ Bonus transmission = -3 level = 8 severity = 1 - symptom_delay_min = 1 - symptom_delay_max = 1 + symptom_delay_min = 25 SECONDS + symptom_delay_max = 35 SECONDS var/clearacc = FALSE @@ -72,18 +72,15 @@ Bonus H.drowsyness = max(0, H.drowsyness - 10 * power) H.AdjustSleeping(-10 * power) H.AdjustStunned(-10 * power) - if(prob(power) && prob(50)) - if(H.stat) - H.emote("twitch") - H.make_jittery(2 * power) - H.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) - to_chat(H, span_notice("[pick("You feel nevervous...", "You feel anxious.", "You feel like everything is moving in slow motion.")]")) + H.emote("twitch") + H.reagents.add_reagent(REAGENT_ID_HYPERZINE, 5) + if(prob(base_message_chance)) + to_chat(H, span_notice("[pick("You feel nervous...", "You feel anxious.", "You feel like everything is moving in slow motion.")]")) if(H.nutrition > 150 - (30 * power)) H.nutrition = max(150 - (30 * power), H.nutrition - (2 * power)) if(prob(25)) H.make_jittery(2 * power) if(clearacc) if(prob(power) && prob(50)) - if(H.stat) - H.emote("scream") - H.hallucination = min(20, H.hallucination + (5 * power)) + H.emote("scream") + H.hallucination = min(20, H.hallucination + (5 * power))