From e5c2284213f2ee87dcedb6a1af0eb2bfe980686c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 9 Oct 2017 21:25:59 -0500
Subject: [PATCH] Update gbs.dm

---
 code/datums/diseases/gbs.dm | 45 +------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm
index 24d0ce15dc..71e4064676 100644
--- a/code/datums/diseases/gbs.dm
+++ b/code/datums/diseases/gbs.dm
@@ -1,45 +1,3 @@
-<<<<<<< HEAD
-/datum/disease/gbs
-	name = "GBS"
-	max_stages = 5
-	spread_text = "On contact"
-	spread_flags = CONTACT_GENERAL
-	cure_text = "Synaptizine & Sulfur"
-	cures = list("synaptizine","sulfur")
-	cure_chance = 15//higher chance to cure, since two reagents are required
-	agent = "Gravitokinetic Bipotential SADS+"
-	viable_mobtypes = list(/mob/living/carbon/human)
-	disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
-	permeability_mod = 1
-	severity = BIOHAZARD
-
-/datum/disease/gbs/stage_act()
-	..()
-	switch(stage)
-		if(2)
-			if(prob(45))
-				affected_mob.adjustToxLoss(5)
-				affected_mob.updatehealth()
-			if(prob(1))
-				affected_mob.emote("sneeze")
-		if(3)
-			if(prob(5))
-				affected_mob.emote("cough")
-			else if(prob(5))
-				affected_mob.emote("gasp")
-			if(prob(10))
-				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
-		if(4)
-			if(prob(10))
-				affected_mob.emote("cough")
-			affected_mob.adjustToxLoss(5)
-			affected_mob.updatehealth()
-		if(5)
-			to_chat(affected_mob, "<span class='danger'>Your body feels as if it's trying to rip itself open...</span>")
-			if(prob(50))
-				affected_mob.gib()
-		else
-=======
 /datum/disease/gbs
 	name = "GBS"
 	max_stages = 5
@@ -80,5 +38,4 @@
 			if(prob(50))
 				affected_mob.gib()
 		else
->>>>>>> db0c10e... Refactors virus spreading (#31066)
-			return
\ No newline at end of file
+			return