From 53a3644f48596a3b1ac7829994833cfaa25e7c86 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 8 Oct 2017 22:37:14 -0500
Subject: [PATCH] Update headache.dm

---
 .../diseases/advance/symptoms/headache.dm     | 62 +++++++++----------
 1 file changed, 29 insertions(+), 33 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm
index 7317ecfb88..3a8c82beed 100644
--- a/code/datums/diseases/advance/symptoms/headache.dm
+++ b/code/datums/diseases/advance/symptoms/headache.dm
@@ -1,45 +1,41 @@
-/*
-//////////////////////////////////////
-
-Headache
-
-	Noticable.
-	Highly resistant.
-	Increases stage speed.
-	Not transmittable.
-	Low Level.
-
-BONUS
-	Displays an annoying message!
-	Should be used for buffing your disease.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/headache
-
-	name = "Headache"
+/*
+//////////////////////////////////////
+
+Headache
+
+	Noticable.
+	Highly resistant.
+	Increases stage speed.
+	Not transmittable.
+	Low Level.
+
+BONUS
+	Displays an annoying message!
+	Should be used for buffing your disease.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/headache
+
+	name = "Headache"
 	desc = "The virus causes inflammation inside the brain, causing constant headaches."
-	stealth = -1
-	resistance = 4
-	stage_speed = 2
-	transmittable = 0
-	level = 1
-	severity = 1
+	stealth = -1
+	resistance = 4
+	stage_speed = 2
+	transmittable = 0
+	level = 1
+	severity = 1
 	base_message_chance = 100
 	symptom_delay_min = 15
 	symptom_delay_max = 30
 	threshold_desc = "<b>Stage Speed 6:</b> Headaches will cause severe pain, that weakens the host.<br>\
 					  <b>Stage Speed 9:</b> Headaches become less frequent but far more intense, preventing any action from the host.<br>\
 					  <b>Stealth 4:</b> Reduces headache frequency until later stages."
-
+
 /datum/symptom/headache/Start(datum/disease/advance/A)
-<<<<<<< HEAD
-	..()
-=======
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["stealth"] >= 4)
 		base_message_chance = 50
 	if(A.properties["stage_rate"] >= 6) //severe pain
@@ -61,4 +57,4 @@ BONUS
 		M.adjustStaminaLoss(25)
 	if(power >= 3 && A.stage >= 5)
 		to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
-		M.Stun(35)
\ No newline at end of file
+		M.Stun(35)