From 631b98dad5c1ac612b2ca58b44d247bcfdff9a5c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 8 Oct 2017 22:37:02 -0500
Subject: [PATCH] Update hallucigen.dm

---
 .../diseases/advance/symptoms/hallucigen.dm   | 58 +++++++++----------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm
index 8869d868ce..76b92159d8 100644
--- a/code/datums/diseases/advance/symptoms/hallucigen.dm
+++ b/code/datums/diseases/advance/symptoms/hallucigen.dm
@@ -1,49 +1,45 @@
-/*
-//////////////////////////////////////
-
-Hallucigen
-
-	Very noticable.
-	Lowers resistance considerably.
-	Decreases stage speed.
-	Reduced transmittable.
-	Critical Level.
-
-Bonus
-	Makes the affected mob be hallucinated for short periods of time.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/hallucigen
-	name = "Hallucigen"
+/*
+//////////////////////////////////////
+
+Hallucigen
+
+	Very noticable.
+	Lowers resistance considerably.
+	Decreases stage speed.
+	Reduced transmittable.
+	Critical Level.
+
+Bonus
+	Makes the affected mob be hallucinated for short periods of time.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/hallucigen
+	name = "Hallucigen"
 	desc = "The virus stimulates the brain, causing occasional hallucinations."
-	stealth = -2
-	resistance = -3
-	stage_speed = -3
-	transmittable = -1
-	level = 5
-	severity = 3
+	stealth = -2
+	resistance = -3
+	stage_speed = -3
+	transmittable = -1
+	level = 5
+	severity = 3
 	base_message_chance = 25
 	symptom_delay_min = 25
 	symptom_delay_max = 90
 	var/fake_healthy = FALSE
 	threshold_desc = "<b>Stage Speed 7:</b> Increases the amount of hallucinations.<br>\
 					  <b>Stealth 4:</b> The virus mimics positive symptoms.."
-
+
 /datum/symptom/hallucigen/Start(datum/disease/advance/A)
-<<<<<<< HEAD
-	..()
-=======
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["stealth"] >= 4) //fake good symptom messages
 		fake_healthy = TRUE
 		base_message_chance = 50
 	if(A.properties["stage_rate"] >= 7) //stronger hallucinations
 		power = 2
-
+
 /datum/symptom/hallucigen/Activate(datum/disease/advance/A)
 	if(!..())
 		return