Update spontaneous_appendicitis.dm

code/modules/events/spontaneous_appendicitis.dm

@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-/datum/round_event_control/spontaneous_appendicitis
-	name = "Spontaneous Appendicitis"
-	typepath = /datum/round_event/spontaneous_appendicitis
-	weight = 20
-	max_occurrences = 4
-	earliest_start = 6000
-	min_players = 5 // To make your chance of getting help a bit higher.
-
-/datum/round_event/spontaneous_appendicitis/start()
-	for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list))
-=======
 /datum/round_event_control/spontaneous_appendicitis
 	name = "Spontaneous Appendicitis"
 	typepath = /datum/round_event/spontaneous_appendicitis
@@ -23,7 +11,6 @@
 
 /datum/round_event/spontaneous_appendicitis/start()
 	for(var/mob/living/carbon/human/H in shuffle(GLOB.living_mob_list))
->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)
 		if(!H.client)
 			continue
 		if(H.stat == DEAD)
@@ -35,8 +22,8 @@
 			foundAlready = TRUE
 			break
 		if(foundAlready)
-			continue
-
-		var/datum/disease/D = new /datum/disease/appendicitis
-		H.ForceContractDisease(D)
-		break
+			continue
+
+		var/datum/disease/D = new /datum/disease/appendicitis
+		H.ForceContractDisease(D)
+		break