diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm
index 3e5b6ac2e1..4829920d4f 100644
--- a/code/datums/diseases/advance/symptoms/choking.dm
+++ b/code/datums/diseases/advance/symptoms/choking.dm
@@ -1,43 +1,39 @@
-/*
-//////////////////////////////////////
-
-Choking
-
-	Very very noticable.
-	Lowers resistance.
-	Decreases stage speed.
-	Decreases transmittablity tremendously.
-	Moderate Level.
-
-Bonus
-	Inflicts spikes of oxyloss
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/choking
-
-	name = "Choking"
+/*
+//////////////////////////////////////
+
+Choking
+
+	Very very noticable.
+	Lowers resistance.
+	Decreases stage speed.
+	Decreases transmittablity tremendously.
+	Moderate Level.
+
+Bonus
+	Inflicts spikes of oxyloss
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/choking
+
+	name = "Choking"
 	desc = "The virus causes inflammation of the host's air conduits, leading to intermittent choking."
-	stealth = -3
-	resistance = -2
-	stage_speed = -2
-	transmittable = -4
-	level = 3
-	severity = 3
+	stealth = -3
+	resistance = -2
+	stage_speed = -2
+	transmittable = -4
+	level = 3
+	severity = 3
 	base_message_chance = 15
 	symptom_delay_min = 10
 	symptom_delay_max = 30
 	threshold_desc = "<b>Stage Speed 8:</b> Causes choking more frequently.<br>\
 					  <b>Stealth 4:</b> The symptom remains hidden until active."
-
+
 /datum/symptom/choking/Start(datum/disease/advance/A)
-<<<<<<< HEAD
-	..()
-=======
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["stage_rate"] >= 8)
 		symptom_delay_min = 7
 		symptom_delay_max = 24
@@ -51,11 +47,11 @@ Bonus
 	switch(A.stage)
 		if(1, 2)
 			if(prob(base_message_chance) && !suppress_warning)
-				to_chat(M, "<span class='warning'>[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]</span>")
+				to_chat(M, "<span class='warning'>[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]</span>")
 		if(3, 4)
 			if(!suppress_warning)
 				to_chat(M, "<span class='warning'>[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]</span>")
-			else
+			else
 				to_chat(M, "<span class='warning'>You feel very [pick("dizzy","woozy","faint")].</span>") //fake bloodloss messages
 			Choke_stage_3_4(M, A)
 			M.emote("gasp")
@@ -63,54 +59,50 @@ Bonus
 			to_chat(M, "<span class='userdanger'>[pick("You're choking!", "You can't breathe!")]</span>")
 			Choke(M, A)
 			M.emote("gasp")
-
-/datum/symptom/choking/proc/Choke_stage_3_4(mob/living/M, datum/disease/advance/A)
+
+/datum/symptom/choking/proc/Choke_stage_3_4(mob/living/M, datum/disease/advance/A)
 	M.adjustOxyLoss(rand(6,13))
-	return 1
-
-/datum/symptom/choking/proc/Choke(mob/living/M, datum/disease/advance/A)
+	return 1
+
+/datum/symptom/choking/proc/Choke(mob/living/M, datum/disease/advance/A)
 	M.adjustOxyLoss(rand(10,18))
-	return 1
-
-/*
-//////////////////////////////////////
-
-Asphyxiation
-
-	Very very noticable.
-	Decreases stage speed.
-	Decreases transmittablity.
-
-Bonus
-	Inflicts large spikes of oxyloss
-	Introduces Asphyxiating drugs to the system
-	Causes cardiac arrest on dying victims.
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/asphyxiation
-
-	name = "Acute respiratory distress syndrome"
+	return 1
+
+/*
+//////////////////////////////////////
+
+Asphyxiation
+
+	Very very noticable.
+	Decreases stage speed.
+	Decreases transmittablity.
+
+Bonus
+	Inflicts large spikes of oxyloss
+	Introduces Asphyxiating drugs to the system
+	Causes cardiac arrest on dying victims.
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/asphyxiation
+
+	name = "Acute respiratory distress syndrome"
 	desc = "The virus causes shrinking of the host's lungs, causing severe asphyxiation. May also lead to heart attacks."
-	stealth = -2
-	resistance = -0
-	stage_speed = -1
-	transmittable = -2
-	level = 7
-	severity = 3
+	stealth = -2
+	resistance = -0
+	stage_speed = -1
+	transmittable = -2
+	level = 7
+	severity = 3
 	base_message_chance = 15
 	symptom_delay_min = 14
 	symptom_delay_max = 30
 	var/paralysis = FALSE
-
+
 /datum/symptom/asphyxiation/Start(datum/disease/advance/A)
-<<<<<<< HEAD
-	..()
-=======
 	if(!..())
 		return
->>>>>>> 1940af0... Fixes Start() of symptoms still working when neutered (#31435)
 	if(A.properties["stage_rate"] >= 8)
 		paralysis = TRUE
 	if(A.properties["transmission"] >= 8)
@@ -132,22 +124,22 @@ Bonus
 			if(M.getOxyLoss() >= 120)
 				M.visible_message("<span class='warning'>[M] stops breathing, as if their lungs have totally collapsed!</span>")
 				Asphyxiate_death(M, A)
-	return
-
-/datum/symptom/asphyxiation/proc/Asphyxiate_stage_3_4(mob/living/M, datum/disease/advance/A)
+	return
+
+/datum/symptom/asphyxiation/proc/Asphyxiate_stage_3_4(mob/living/M, datum/disease/advance/A)
 	var/get_damage = rand(10,15) * power
-	M.adjustOxyLoss(get_damage)
-	return 1
-
-/datum/symptom/asphyxiation/proc/Asphyxiate(mob/living/M, datum/disease/advance/A)
+	M.adjustOxyLoss(get_damage)
+	return 1
+
+/datum/symptom/asphyxiation/proc/Asphyxiate(mob/living/M, datum/disease/advance/A)
 	var/get_damage = rand(15,21) * power
-	M.adjustOxyLoss(get_damage)
+	M.adjustOxyLoss(get_damage)
 	if(paralysis)
 		M.reagents.add_reagent_list(list("pancuronium" = 3, "sodium_thiopental" = 3))
-	return 1
-
-/datum/symptom/asphyxiation/proc/Asphyxiate_death(mob/living/M, datum/disease/advance/A)
+	return 1
+
+/datum/symptom/asphyxiation/proc/Asphyxiate_death(mob/living/M, datum/disease/advance/A)
 	var/get_damage = rand(25,35) * power
-	M.adjustOxyLoss(get_damage)
-	M.adjustBrainLoss(get_damage/2)
-	return 1
+	M.adjustOxyLoss(get_damage)
+	M.adjustBrainLoss(get_damage/2)
+	return 1