From 9304ae1a38b55562cedbcc75c4f2ee196966e054 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 9 Oct 2017 21:26:20 -0500
Subject: [PATCH] Update pierrot_throat.dm

---
 code/datums/diseases/pierrot_throat.dm | 27 --------------------------
 1 file changed, 27 deletions(-)

diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm
index ab57b25ff9..89dce44536 100644
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -1,29 +1,3 @@
-<<<<<<< HEAD
-/datum/disease/pierrot_throat
-	name = "Pierrot's Throat"
-	max_stages = 4
-	spread_text = "Airborne"
-	cure_text = "Banana products, especially banana bread."
-	cures = list("banana")
-	cure_chance = 75
-	agent = "H0NI<42 Virus"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	permeability_mod = 0.75
-	desc = "If left untreated the subject will probably drive others to insanity."
-	severity = MEDIUM
-
-/datum/disease/pierrot_throat/stage_act()
-	..()
-	switch(stage)
-		if(1)
-			if(prob(10)) to_chat(affected_mob, "<span class='danger'>You feel a little silly.</span>")
-		if(2)
-			if(prob(10)) to_chat(affected_mob, "<span class='danger'>You start seeing rainbows.</span>")
-		if(3)
-			if(prob(10)) to_chat(affected_mob, "<span class='danger'>Your thoughts are interrupted by a loud <b>HONK!</b></span>")
-		if(4)
-			if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
-=======
 /datum/disease/pierrot_throat
 	name = "Pierrot's Throat"
 	max_stages = 4
@@ -52,4 +26,3 @@
 		if(4)
 			if(prob(5))
 				affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )
->>>>>>> db0c10e... Refactors virus spreading (#31066)