diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm
index 6b84e88dfb..f0178576bf 100644
--- a/code/datums/diseases/advance/symptoms/cough.dm
+++ b/code/datums/diseases/advance/symptoms/cough.dm
@@ -1,79 +1,39 @@
-/*
-//////////////////////////////////////
-
-Coughing
-
-	Noticable.
-	Little Resistance.
-	Doesn't increase stage speed much.
-	Transmittable.
-	Low Level.
-
-BONUS
-	Will force the affected mob to drop small items!
-
-//////////////////////////////////////
-*/
-
-/datum/symptom/cough
-
-	name = "Cough"
+/*
+//////////////////////////////////////
+
+Coughing
+
+	Noticable.
+	Little Resistance.
+	Doesn't increase stage speed much.
+	Transmittable.
+	Low Level.
+
+BONUS
+	Will force the affected mob to drop small items!
+
+//////////////////////////////////////
+*/
+
+/datum/symptom/cough
+
+	name = "Cough"
 	desc = "The virus irritates the throat of the host, causing occasional coughing."
-	stealth = -1
-	resistance = 3
-	stage_speed = 1
-	transmittable = 2
-	level = 1
-	severity = 1
-	base_message_chance = 15
-	symptom_delay_min = 2
-	symptom_delay_max = 15
-	var/infective = FALSE
+	stealth = -1
+	resistance = 3
+	stage_speed = 1
+	transmittable = 2
+	level = 1
+	severity = 1
+	base_message_chance = 15
+	symptom_delay_min = 2
+	symptom_delay_max = 15
+	var/infective = FALSE
 	threshold_desc = "<b>Resistance 3:</b> Host will drop small items when coughing.<br>\
 					  <b>Resistance 10:</b> Occasionally causes coughing fits that stun the host.<br>\
 					  <b>Stage Speed 6:</b> Increases cough frequency.<br>\
 					  <b>If Airborne:</b> Coughing will infect bystanders.<br>\
 					  <b>Stealth 4:</b> The symptom remains hidden until active."
-<<<<<<< HEAD
-
-/datum/symptom/cough/Start(datum/disease/advance/A)
-	..()
-	if(A.properties["stealth"] >= 4)
-		suppress_warning = TRUE
-	if(A.spread_flags &= AIRBORNE) //infect bystanders
-		infective = TRUE
-	if(A.properties["resistance"] >= 3) //strong enough to drop items
-		power = 1.5
-	if(A.properties["resistance"] >= 10) //strong enough to stun (rarely)
-		power = 2
-	if(A.properties["stage_rate"] >= 6) //cough more often
-		symptom_delay_max = 10
-
-/datum/symptom/cough/Activate(datum/disease/advance/A)
-	if(!..())
-		return
-	var/mob/living/M = A.affected_mob
-	switch(A.stage)
-		if(1, 2, 3)
-			if(prob(base_message_chance) && !suppress_warning)
-				to_chat(M, "<span notice='warning'>[pick("You swallow excess mucus.", "You lightly cough.")]</span>")
-		else
-			M.emote("cough")
-			if(power >= 1.5)
-				var/obj/item/I = M.get_active_held_item()
-				if(I && I.w_class == WEIGHT_CLASS_TINY)
-					M.drop_item()
-			if(power >= 2 && prob(10))
-				to_chat(M, "<span notice='userdanger'>[pick("You have a coughing fit!", "You can't stop coughing!")]</span>")
-				M.Stun(20)
-				M.emote("cough")
-				addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 6)
-				addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 12)
-				addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 18)
-			if(infective)
-				A.spread(1)
-
-=======
 
 /datum/symptom/cough/Start(datum/disease/advance/A)
 	..()
@@ -112,4 +72,3 @@ BONUS
 			if(infective)
 				A.spread(1)
 
->>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)