Committing a new event, rampant brand intelligence. Thanks Callans for the idea.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5518 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/events/blob.dm

@@ -12,7 +12,9 @@
 
 /datum/event/blob/start()
 	var/turf/T = pick(blobstart)
-	if(!T)	kill()
+	if(!T)
+		kill()
+		return
 	Blob = new /obj/effect/blob/core(T, 200)
 	Blob.Life()
 	Blob.Life()
@@ -20,6 +22,8 @@
 
 
 /datum/event/blob/tick()
-	if(!Blob)	kill()
+	if(!Blob)
+		kill()
+		return
 	if(IsMultiple(activeFor, 3))
 		Blob.Life()

code/modules/events/brand_intelligence.dm

@@ -0,0 +1,46 @@
+/datum/event/brand_intelligence
+	announceWhen	= 5
+	endWhen			= 1000	//Ends when all vending machines are subverted anyway.
+	oneShot			= 1
+
+	var/list/obj/machinery/vending/vendingMachines = list()
+	var/obj/machinery/vending/originMachine
+
+
+/datum/event/brand_intelligence/announce()
+	command_alert("Rampant brand intelligence has been detected aboard [station_name()], please stand-by.", "Machine Learning Alert")
+
+
+/datum/event/brand_intelligence/start()
+	for(var/obj/machinery/vending/V in machines)
+		if(V.z != 1)	continue
+		vendingMachines.Add(V)
+
+	if(!vendingMachines.len)
+		kill()
+		return
+
+	originMachine = pick(vendingMachines)
+	vendingMachines.Remove(originMachine)
+	originMachine.shut_up = 0
+	originMachine.shoot_inventory = 1
+
+
+/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
+		kill()
+		return
+
+	if(IsMultiple(activeFor, 3))
+		var/obj/machinery/vending/infectedMachine = pick(vendingMachines)
+		vendingMachines.Remove(infectedMachine)
+		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!", \
+									 ""))

code/modules/events/prison_break.dm

@@ -12,6 +12,7 @@
 		command_alert("Gr3y.T1d3 virus detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.", "Security Alert")
 	else
 		world.log << "ERROR: Could not initate grey-tide. Unable find prison or brig area."
+		kill()
 
 
 /datum/event/prison_break/start()

tgstation.dme

@@ -721,6 +721,7 @@
 #include "code\modules\detectivework\scanner.dm"
 #include "code\modules\events\alien_infestation.dm"
 #include "code\modules\events\blob.dm"
+#include "code\modules\events\brand_intelligence.dm"
 #include "code\modules\events\carp_migration.dm"
 #include "code\modules\events\communications_blackout.dm"
 #include "code\modules\events\disease_outbreak.dm"