From 2720b2990824ce343ce344dace1d13c08a07c648 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 2 Jan 2018 15:47:56 -0600 Subject: [PATCH] Update sensory.dm --- code/datums/diseases/advance/symptoms/sensory.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 04ec142ac8..b744fcb3af 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -58,8 +58,6 @@ C.cure_trauma_type(BRAIN_TRAUMA_SPECIAL) if(prob(10) && C.has_trauma_type(BRAIN_TRAUMA_MILD)) C.cure_trauma_type(BRAIN_TRAUMA_MILD) -<<<<<<< HEAD -======= if(trauma_heal_severe && prob(10) && C.has_trauma_type(BRAIN_TRAUMA_SEVERE)) C.cure_trauma_type(BRAIN_TRAUMA_SEVERE) @@ -108,4 +106,3 @@ else if(prob(base_message_chance)) to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]") ->>>>>>> 52668a6... Makes some virology symptoms more worth using (#33986)