From 0bf4fc091df9db9f279b399a52f665459f4f8b2b Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 8 Oct 2017 22:38:11 -0500
Subject: [PATCH] Update voice_change.dm

---
 .../diseases/advance/symptoms/voice_change.dm | 60 +++++++++----------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm
index c8ba639e48..5f0b83e5c8 100644
--- a/code/datums/diseases/advance/symptoms/voice_change.dm
+++ b/code/datums/diseases/advance/symptoms/voice_change.dm
@@ -1,30 +1,30 @@
-/*
-//////////////////////////////////////
-
-Voice Change
-
+/*
+//////////////////////////////////////
+
+Voice Change
+
 	Noticeable.
 	Lowers resistance.
-	Decreases stage speed.
+	Decreases stage speed.
 	Increased transmittable.
-	Fatal Level.
-
-Bonus
-	Changes the voice of the affected mob. Causing confusion in communication.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/voice_change
-
-	name = "Voice Change"
+	Fatal Level.
+
+Bonus
+	Changes the voice of the affected mob. Causing confusion in communication.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/voice_change
+
+	name = "Voice Change"
 	desc = "The virus alters the pitch and tone of the host's vocal cords, changing how their voice sounds."
 	stealth = -1
 	resistance = -2
 	stage_speed = -2
 	transmittable = 2
-	level = 6
-	severity = 2
+	level = 6
+	severity = 2
 	base_message_chance = 100
 	symptom_delay_min = 60
 	symptom_delay_max = 120
@@ -34,14 +34,10 @@ Bonus
 	threshold_desc = "<b>Transmission 14:</b> The host's language center of the brain is damaged, leading to complete inability to speak or understand any language.<br>\
 					  <b>Stage Speed 7:</b> Changes voice more often.<br>\
 					  <b>Stealth 3:</b> The symptom remains hidden until active."
-
+
 /datum/symptom/voice_change/Start(datum/disease/advance/A)
-<<<<<<< HEAD
-	..()
-=======
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["stealth"] >= 3)
 		suppress_warning = TRUE
 	if(A.properties["stage_rate"] >= 7) //faster change of voice
@@ -53,7 +49,7 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		var/datum/language_holder/mob_language = M.get_language_holder()
 		original_language = mob_language.copy()
-
+
 /datum/symptom/voice_change/Activate(datum/disease/advance/A)
 	if(!..())
 		return
@@ -61,7 +57,7 @@ Bonus
 	switch(A.stage)
 		if(1, 2, 3, 4)
 			if(prob(base_message_chance) && !suppress_warning)
-				to_chat(M, "<span class='warning'>[pick("Your throat hurts.", "You clear your throat.")]</span>")
+				to_chat(M, "<span class='warning'>[pick("Your throat hurts.", "You clear your throat.")]</span>")
 		else
 			if(ishuman(M))
 				var/mob/living/carbon/human/H = M
@@ -72,12 +68,12 @@ Bonus
 					H.grant_language(current_language)
 					var/datum/language_holder/mob_language = H.get_language_holder()
 					mob_language.only_speaks_language = current_language
-
-/datum/symptom/voice_change/End(datum/disease/advance/A)
-	..()
-	if(ishuman(A.affected_mob))
-		var/mob/living/carbon/human/H = A.affected_mob
-		H.UnsetSpecialVoice()
+
+/datum/symptom/voice_change/End(datum/disease/advance/A)
+	..()
+	if(ishuman(A.affected_mob))
+		var/mob/living/carbon/human/H = A.affected_mob
+		H.UnsetSpecialVoice()
 	if(scramble_language)
 		var/mob/living/M = A.affected_mob
 		M.copy_known_languages_from(original_language, TRUE)