Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Conflicts:
	code/modules/events/infestation.dm

code/modules/events/brand_intelligence.dm

@@ -4,6 +4,7 @@
 	oneShot			= 1
 
 	var/list/obj/machinery/vending/vendingMachines = list()
+	var/list/obj/machinery/vending/infectedVendingMachines = list()
 	var/obj/machinery/vending/originMachine
 
 
@@ -28,20 +29,29 @@
 
 /datum/event/brand_intelligence/tick()
 	if(!vendingMachines.len || !originMachine || originMachine.shut_up)	//if every machine is infected, or if the original vending machine is missing or has it's voice switch flipped
+		end()
 		kill()
 		return
 
-	if(IsMultiple(activeFor, 3))
-		var/obj/machinery/vending/infectedMachine = pick(vendingMachines)
-		vendingMachines.Remove(infectedMachine)
-		infectedMachine.shut_up = 0
-		infectedMachine.shoot_inventory = 1
+	if(IsMultiple(activeFor, 5))
+		if(prob(25))
+			var/obj/machinery/vending/infectedMachine = pick(vendingMachines)
+			vendingMachines.Remove(infectedMachine)
+			infectedVendingMachines.Add(infectedMachine)
+			infectedMachine.shut_up = 0
+			infectedMachine.shoot_inventory = 1
 
-		if(IsMultiple(activeFor, 12))
-			originMachine.speak(pick("Try our aggressive new marketing strategies!", \
-									 "You should buy products to feed your lifestyle obession!", \
-									 "Consume!", \
-									 "Your money can buy happiness!", \
-									 "Engage direct marketing!", \
-									 "Advertising is legalized lying! But don't let that put you off our great deals!", \
-									 "You don't want to buy anything? Yeah, well I didn't want to buy your mom either."))
+			if(IsMultiple(activeFor, 12))
+				originMachine.speak(pick("Try our aggressive new marketing strategies!", \
+										 "You should buy products to feed your lifestyle obession!", \
+										 "Consume!", \
+										 "Your money can buy happiness!", \
+										 "Engage direct marketing!", \
+										 "Advertising is legalized lying! But don't let that put you off our great deals!", \
+										 "You don't want to buy anything? Yeah, well I didn't want to buy your mom either."))
+
+/datum/event/brand_intelligence/end()
+	for(var/obj/machinery/vending/infectedMachine in infectedVendingMachines)
+		if(prob(90))
+			infectedMachine.shut_up = 1
+			infectedMachine.shoot_inventory = 0

code/modules/events/carp_migration.dm

@@ -18,6 +18,7 @@
 
 /datum/event/carp_migration/end()
 	for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp)
-		var/turf/T = get_turf(C)
-		if(istype(T, /turf/space))
-			del(C)
+		if(!C.stat)
+			var/turf/T = get_turf(C)
+			if(istype(T, /turf/space))
+				del(C)

code/modules/events/event_dynamic.dm

@@ -43,7 +43,7 @@
 	possibleEvents[/datum/event/carp_migration] = 50 + 50 * active_with_role["Engineer"]
 	possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Janitor"]
 
-	possibleEvents[/datum/event/rogue_drone] = 50 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"]
+	possibleEvents[/datum/event/rogue_drone] = 25 + 25 * active_with_role["Engineer"] + 25 * active_with_role["Security"]
 	possibleEvents[/datum/event/infestation] = 50 + 25 * active_with_role["Janitor"]
 
 	possibleEvents[/datum/event/communications_blackout] = 50 + 25 * active_with_role["AI"] + active_with_role["Scientist"] * 25

code/modules/events/event_manager.dm

@@ -4,7 +4,6 @@ var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event
 
 var/eventTimeLower = 15000	//15 minutes
 var/eventTimeUpper = 30000	//30 minutes
-
 var/scheduledEvent = null
 
 
@@ -19,7 +18,7 @@ var/scheduledEvent = null
 /proc/checkEvent()
 	if(!scheduledEvent)
 		//more players = more time between events, less players = less time between events
-		var/playercount_modifier = 0.5
+		var/playercount_modifier = 1
 		switch(player_list.len)
 			if(0 to 10)
 				playercount_modifier = 1.2
@@ -63,4 +62,4 @@ var/scheduledEvent = null
 
 	if(ispath(type))
 		new type
-		message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1)
+		message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1)

code/modules/events/infestation.dm

@@ -92,6 +92,7 @@
 			var/turf/simulated/floor/T = pick(turfs)
 			turfs.Remove(T)
 			num--
+
 			
 			if(vermin == VERM_SPIDERS)
 				var/obj/effect/spider/spiderling/S = new(T)
@@ -100,6 +101,7 @@
 				var/spawn_type = pick(spawn_types)
 				new spawn_type(T)
 
+
 /datum/event/infestation/announce()
 	command_alert("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Vermin infestation")