Merge branch 'master' into gatofication2

code/modules/antagonists/abductor/abductee/abductee_objectives.dm

@@ -4,7 +4,7 @@
 /datum/objective/abductee/random
 
 /datum/objective/abductee/random/New()
-	explanation_text = pick(world.file2list("strings/abductee_objectives.txt"))
+	explanation_text = pick(world.file2list("GainStation13/strings/abductee_objectives.txt")) //GS13 Edit: Nanotrasen to GATO
 
 /datum/objective/abductee/steal
 	explanation_text = "Steal all"

code/modules/antagonists/disease/disease_event.dm

@@ -3,7 +3,7 @@
 	name = "Spawn Sentient Disease"
 	typepath = /datum/round_event/ghost_role/sentient_disease
 	weight = 7
-	max_occurrences = 1
+	max_occurrences = 0 //GS13 - removed midround pseudo-antags
 	min_players = 5
 	category = EVENT_CATEGORY_HEALTH
 	description = "Spawns a sentient disease, who wants to infect as many people as possible."

code/modules/antagonists/revenant/revenant_spawn_event.dm

@@ -4,7 +4,7 @@
 	name = "Spawn Revenant" // Did you mean 'griefghost'?
 	typepath = /datum/round_event/ghost_role/revenant
 	weight = 7
-	max_occurrences = 1
+	max_occurrences = 0 //GS13 tweak - no antags, thanks
 	min_players = 5
 	category = EVENT_CATEGORY_ENTITIES
 	description = "Spawns an angry, soul sucking ghost."

code/modules/antagonists/slaughter/slaughterevent.dm

@@ -2,7 +2,7 @@
 	name = "Spawn Slaughter Demon"
 	typepath = /datum/round_event/ghost_role/slaughter
 	weight = 1 //Very rare
-	max_occurrences = 1
+	max_occurrences = 0 //GS13 - no antags, thanks
 	earliest_start = 1 HOURS
 	min_players = 20
 	category = EVENT_CATEGORY_ENTITIES

code/modules/antagonists/swarmer/swarmer_event.dm

@@ -2,7 +2,7 @@
 	name = "Spawn Swarmer Shell"
 	typepath = /datum/round_event/spawn_swarmer
 	weight = 7
-	max_occurrences = 1 //Only once okay fam
+	max_occurrences = 0 //GS13 - no antags, thanks
 	earliest_start = 30 MINUTES
 	min_players = 35
 	dynamic_should_hijack = TRUE