From d2448ebc1449bc8b5e37b772ec39dffafdf133fb Mon Sep 17 00:00:00 2001
From: alex-gh <alexgh@sempto.net>
Date: Sun, 9 Mar 2014 13:42:57 +0100
Subject: [PATCH] Changed RBI to be less round ending

---
 code/game/machinery/vending.dm                   |  6 ++++--
 .../events/tgevents/brand_intelligence.dm        | 16 ++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index bed2f78b663..8ab731302f3 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -43,6 +43,8 @@
 	//var/emagged = 0			//Ignores if somebody doesn't have card access to that machine.
 	var/seconds_electrified = 0	//Shock customers like an airlock.
 	var/shoot_inventory = 0		//Fire items at customers! We're broken!
+	var/shoot_speed = 3			//How hard are we firing the items?
+	var/shoot_chance = 2		//How often are we firing the items?
 	var/shut_up = 0				//Stop spouting those godawful pitches!
 	var/extended_inventory = 0	//can we access the hidden inventory?
 	var/scan_id = 1
@@ -463,7 +465,7 @@
 		src.speak(slogan)
 		src.last_slogan = world.time
 
-	if(src.shoot_inventory && prob(2))
+	if(src.shoot_inventory && prob(shoot_chance))
 		src.throw_item()
 
 	return
@@ -529,7 +531,7 @@
 	if (!throw_item)
 		return 0
 	spawn(0)
-		throw_item.throw_at(target, 16, 3)
+		throw_item.throw_at(target, 16, shoot_speed)
 	src.visible_message("\red <b>[src] launches [throw_item.name] at [target.name]!</b>")
 	return 1
 
diff --git a/code/modules/events/tgevents/brand_intelligence.dm b/code/modules/events/tgevents/brand_intelligence.dm
index 390a23b628e..b759258bb6c 100644
--- a/code/modules/events/tgevents/brand_intelligence.dm
+++ b/code/modules/events/tgevents/brand_intelligence.dm
@@ -25,9 +25,6 @@
 	originMachine.shut_up = 0
 	originMachine.shoot_inventory = 1
 
-	scaling_factor = num_players() / 60	//Tweak this value to change the number of hostile machines. Lower value = more hostile machines.
-
-
 
 /datum/event/brand_intelligence/tick()
 	if(!originMachine || originMachine.shut_up || !originMachine.powered())	//if the original vending machine is missing or has it's voice switch flipped
@@ -41,17 +38,8 @@
 
 	if(!vendingMachines.len)	//if every machine is infected
 		for(var/obj/machinery/vending/upriser in infectedMachines)
-			if(prob(25)) return
-			if(prob(60 * scaling_factor))
-				var/mob/living/simple_animal/hostile/mimic/M = new(upriser.loc)
-				M.name = upriser.name
-				M.icon = upriser.icon
-				M.icon_state = initial(upriser.icon_state)
-			else
-				explosion(upriser.loc, 2, 2, 3, 5)
-				sleep(50)	//return control to lessen lag
-			del(upriser)
-
+			upriser.shoot_speed = 40	//Ouch! May be too much, needs play testing.
+			upriser.shoot_chance = 15
 		kill()
 		return